diff --git a/src/main/java/cactusServer/entities/Account.java b/src/main/java/cactusServer/entities/Account.java
index 47912c3..86f9c7d 100644
--- a/src/main/java/cactusServer/entities/Account.java
+++ b/src/main/java/cactusServer/entities/Account.java
@@ -6,7 +6,7 @@
 import cactusServer.utils.RandomStringGenerator;
 import net.arnx.jsonic.JSONHint;
 
-public class Account extends Entity {
+public class Account {
 	private String id, name, token, pass, uniqueID;
 	private boolean login = false;
 
diff --git a/src/main/java/cactusServer/entities/URIAddressedAccount.java b/src/main/java/cactusServer/entities/URIAddressedAccount.java
new file mode 100644
index 0000000..9d14e65
--- /dev/null
+++ b/src/main/java/cactusServer/entities/URIAddressedAccount.java
@@ -0,0 +1,39 @@
+package cactusServer.entities;
+
+import java.net.URI;
+
+public class URIAddressedAccount{
+	private URI uri;
+	private Account account;
+	
+	private URIAddressedAccount() {
+		// JSONDecode���̌Ăяo���p
+	}
+	
+	public URIAddressedAccount(URI uri, Account body) {
+		setAccount(body);
+		setUri(uri);
+	}
+	
+	public URIAddressedAccount(String str, Account body) {
+		setAccount(body);
+		setUri(URI.create(str));
+	}
+	
+	public URI getUri() {
+		return uri;
+	}
+
+	public void setUri(URI uri) {
+		this.uri = uri;
+	}
+
+	public Account getAccount() {
+		return account;
+	}
+
+	public void setAccount(Account account) {
+		this.account = account;
+	}
+
+}
diff --git a/src/main/java/cactusServer/entities/URIAddressedEntity.java b/src/main/java/cactusServer/entities/URIAddressedEntity.java
deleted file mode 100644
index 96a2444..0000000
--- a/src/main/java/cactusServer/entities/URIAddressedEntity.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package cactusServer.entities;
-
-import java.net.URI;
-
-public class URIAddressedEntity extends AddressedEntity {
-	private URI uri;
-	
-	private URIAddressedEntity() {
-		// JSONDecode���̌Ăяo���p
-	}
-	
-	public URIAddressedEntity(URI uri, Entity body) {
-		super(body);
-		setUri(uri);
-	}
-	
-	public URIAddressedEntity(String str, Entity body) {
-		super(body);
-		setUri(URI.create(str));
-	}
-	
-	public URI getUri() {
-		return uri;
-	}
-
-	public void setUri(URI uri) {
-		this.uri = uri;
-	}
-
-}
diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java
index fcee254..3ca95c3 100644
--- a/src/main/java/cactusServer/models/Accounts.java
+++ b/src/main/java/cactusServer/models/Accounts.java
@@ -26,7 +26,7 @@
 		return theInstance;
 	}
 
-	public URIAddressedEntity createAcount(String userID, String userName, String userPass) {
+	public URIAddressedAccount createAcount(String userID, String userName, String userPass) {
 		if (!userIDSet.add(userID))
 			return null;
 		String uniqueID = RandomStringGenerator.generateUniqueString(12, RandomStringGenerator.ALPHA_NUMERIC,
@@ -34,7 +34,7 @@
 		uniqueIDSet.add(uniqueID);
 		Account newAccount = new Account(userID, userName, userPass, uniqueID);
 		accounts.add(newAccount);
-		return new URIAddressedEntity("/CactusServer/rest/accounts/" + uniqueID, newAccount);
+		return new URIAddressedAccount("/CactusServer/rest/accounts/" + uniqueID, newAccount);
 	}
 
 	public Account getAccountToken(String token) {
@@ -81,11 +81,11 @@
 		return null;
 	}
 
-	public URIAddressedEntity loginAccount(String userID, String userPass) {
+	public URIAddressedAccount loginAccount(String userID, String userPass) {
 		if (getAccountByID(userID) != null && getAccountByID(userID).getPass().equals(userPass)) {
 			Accounts.getInstance().getAccountByID(userID).setLogin(true);
 			Accounts.getInstance().getAccountByID(userID).formToken();
-			return new URIAddressedEntity(
+			return new URIAddressedAccount(
 					"/CactusServer/rest/accounts/" + Accounts.getInstance().getAccountByID(userID).getUniqueID(),
 					Accounts.getInstance().getAccountByID(userID));
 		} else {
diff --git a/src/main/java/cactusServer/resources/AccountsRest.java b/src/main/java/cactusServer/resources/AccountsRest.java
index f9b8d34..1ecb7a7 100644
--- a/src/main/java/cactusServer/resources/AccountsRest.java
+++ b/src/main/java/cactusServer/resources/AccountsRest.java
@@ -12,8 +12,8 @@
 public class AccountsRest {
 	@PUT
 	@Produces(MediaType.APPLICATION_JSON)
-	public URIAddressedEntity loginAccount(@FormParam("userID") String userID, @FormParam("userPass") String userPass) {
-		URIAddressedEntity session = Accounts.getInstance().loginAccount(userID, userPass);
+	public URIAddressedAccount loginAccount(@FormParam("userID") String userID, @FormParam("userPass") String userPass) {
+		URIAddressedAccount session = Accounts.getInstance().loginAccount(userID, userPass);
 		if (session != null) {
 			return session;
 		} else {
@@ -30,9 +30,9 @@
 
 	@POST
 	@Produces(MediaType.APPLICATION_JSON)
-	public URIAddressedEntity createAccount(@FormParam("userID") String userID, @FormParam("userName") String userName,
+	public URIAddressedAccount createAccount(@FormParam("userID") String userID, @FormParam("userName") String userName,
 			@FormParam("userPass") String userPass) {
-		URIAddressedEntity editAccount = Accounts.getInstance().createAcount(userID, userName, userPass);
+		URIAddressedAccount editAccount = Accounts.getInstance().createAcount(userID, userName, userPass);
 		if (editAccount != null) {
 			return editAccount;
 		} else {