diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bbe8375..8d35d74 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
         android:required="false" />
 
     <application
-        android:name=".cactusClient.Cactus"
+        android:name=".CactusCleanArchitecture.Entities.Cactus"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginController.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginController.java
index 945db6f..df57536 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginController.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginController.java
@@ -9,7 +9,7 @@
 import org.ntlab.radishforandroidstudio.R;
 
 /**
- * 入力したデータをString型に変換し、入力判定を行うクラス
+ * Loginボタンを押したときの処理
  *
  * @author n-konishi
  */
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginPresenter.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginPresenter.java
index 0336a1d..52f548b 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginPresenter.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginPresenter.java
@@ -11,20 +11,9 @@
  */
 
 public class LoginPresenter implements LoginPresenterBoundary {
-//    private FragmentManager manager;
-
-//    private CactusConnection loginConnection;
     private LoginFragmentConnection loginConnection;
-//    private FragmentActivity fragmentActivity;
 
     public LoginPresenter() {
-//        this.fragmentActivity = fragmentActivity;
-//        this.manager = fragmentManager;
-
-//        LoginControllerBoundary userLoginBoundary = null;
-//        LoginUseCases loginUseCases = new LoginUseCases(userLoginBoundary);
-//        String login_URL = loginUseCases.userLoginURL();
-//        loginConnection = new CactusConnection(login_URL);
         loginConnection = new LoginFragmentConnection();
     }
 
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginResponseControllerController.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginResponseControllerController.java
index a5bfe86..cefef85 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginResponseControllerController.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginResponseControllerController.java
@@ -6,14 +6,14 @@
 import net.arnx.jsonic.JSON;
 import net.arnx.jsonic.TypeReference;
 
+import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.Cactus;
+import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.URIAddressedAccount;
 import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases.LoginResponseControllerBoundary;
 import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases.LoginResponseUseCase;
-import org.ntlab.radishforandroidstudio.cactusClient.Cactus;
-import org.ntlab.radishforandroidstudio.cactusClient.models.account.URIAddressedAccount;
 
 public class LoginResponseControllerController implements LoginResponseControllerBoundary {
-    private final FragmentActivity fragmentActivity;
-    private final FragmentManager manager;
+    private FragmentActivity fragmentActivity;
+    private FragmentManager manager;
 
     public LoginResponseControllerController(FragmentActivity fragmentActivity, FragmentManager manager) {
         this.fragmentActivity = fragmentActivity;
@@ -24,9 +24,10 @@
     public void onResponse(String response) {
         URIAddressedAccount lac = JSON.decode(response, new TypeReference<URIAddressedAccount>() {});
         System.out.println(response);
+
         LoginResponsePresenter loginResponsePresenter = new LoginResponsePresenter(fragmentActivity, manager);
         LoginResponseUseCase loginResponseUseCase = new LoginResponseUseCase((Cactus) (fragmentActivity.getApplication()), loginResponsePresenter);
         loginResponseUseCase.inputData(lac);
         loginResponseUseCase.proc();
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginResponsePresenter.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginResponsePresenter.java
index bfd800a..e402415 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginResponsePresenter.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Controller/LoginResponsePresenter.java
@@ -18,7 +18,7 @@
         this.manager = manager;
     }
 
-    public void successed() {
+    public void succeeded() {
         Toast.makeText(fragmentActivity, "ログインに成功しました。", Toast.LENGTH_SHORT).show();
 
         //画面遷移
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/Account.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/Account.java
new file mode 100644
index 0000000..7653584
--- /dev/null
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/Account.java
@@ -0,0 +1,75 @@
+package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities;
+
+import net.arnx.jsonic.JSONHint;
+
+public class Account {
+    private String id, name, token, pass, uniqueID;
+    private boolean login = false;
+    private Account(){
+    }
+
+    public Account(String userID, String userName, String userPass, String uniqueID) {
+        setId(userID);
+        setName(userName);
+        setPass(userPass);
+        setUniqueID(uniqueID);
+        formToken();
+        login = true;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @JSONHint(ignore=true)
+    public String getPass() {
+        return pass;
+    }
+
+    public void setPass(String pass) {
+        this.pass = pass;
+    }
+
+    public boolean isLogin() {
+        return login;
+    }
+
+    public void setLogin(boolean login) {
+        this.login = login;
+    }
+
+    public void setToken(String token){
+        this.token = token;
+
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public String formToken() {
+        token = RandomStringGenerator.generateRandomString(64, RandomStringGenerator.ALPHA_NUMERIC);
+        return token;
+    }
+
+    @JSONHint(ignore=true)
+    public String getUniqueID() {
+        return uniqueID;
+    }
+
+    public void setUniqueID(String uniqueID) {
+        this.uniqueID = uniqueID;
+    }
+}
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/Cactus.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/Cactus.java
new file mode 100644
index 0000000..7da98dd
--- /dev/null
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/Cactus.java
@@ -0,0 +1,73 @@
+package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities;
+
+
+import android.app.Activity;
+import android.app.Application;
+import android.os.Bundle;
+
+public class Cactus extends Application {
+
+    private Account myAccount = null;
+
+    private URIAddressedAccount addressedAccount;
+
+    public Cactus() {
+
+        registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() {
+            @Override
+            public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+
+            }
+
+            @Override
+            public void onActivityStarted(Activity activity) {
+
+
+            }
+
+            @Override
+            public void onActivityResumed(Activity activity) {
+
+            }
+
+            @Override
+            public void onActivityPaused(Activity activity) {
+
+            }
+
+            @Override
+            public void onActivityStopped(Activity activity) {
+
+            }
+
+            @Override
+            public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+
+            }
+
+            @Override
+            public void onActivityDestroyed(Activity activity) {
+
+            }
+        });
+    }
+
+    //MyAccountの追加
+    public Account getMyAccount() {
+        return myAccount;
+    }
+
+    public void setMyAccount(Account ac) {
+        myAccount = ac;
+    }
+
+    public URIAddressedAccount getAddressedAccount() {
+        return addressedAccount;
+    }
+
+    public void setAddressedAccount(URIAddressedAccount addressedAccount) {
+        this.addressedAccount = addressedAccount;
+    }
+}
+
+
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/CactusAPIEntity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/CactusAPIEntity.java
deleted file mode 100644
index 7f63d7f..0000000
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/CactusAPIEntity.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities;
-
-/**
- * WebからRestAPIを取得するためのクラス
- *
- * @author n-konisi
- */
-
-public interface CactusAPIEntity {
-
-    String API_BASE_URI ="http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/";
-}
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/CactusConnection.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/CactusConnection.java
deleted file mode 100644
index 9863aab..0000000
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/CactusConnection.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities;
-
-import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection;
-
-/**
- * Cactus上で使用する基本HttpAsyncConnectionのクラス
- *
- * @author n-konishi
- */
-
-public class CactusConnection extends HttpAsyncConnection {
-    public CactusConnection(String url) {
-        super(url);
-    }
-
-
-}
-
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/CactusConnectionEntity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/CactusConnectionEntity.java
deleted file mode 100644
index 059af44..0000000
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/CactusConnectionEntity.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities;
-
-/**
- * CactusのAPIのURLを保持するクラス
- *
- * @author n-konishi
- */
-
-public class CactusConnectionEntity implements CactusAPIEntity {
-
-    private String LOGIN_URL = API_BASE_URI +"accounts";
-
-    public String getLOGIN_URL() {
-        return LOGIN_URL;
-    }
-
-}
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/CactusUserEntity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/CactusUserEntity.java
deleted file mode 100644
index 7629c39..0000000
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/CactusUserEntity.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities;
-
-/**
- * Userのデータ(account情報)を保持するEntityクラス
- *
- * @author n-konishi
- */
-public class CactusUserEntity {
-    private String userId;
-    private String userPass;
-
-    public CactusUserEntity() {
-
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public String getUserPass() {
-        return userPass;
-    }
-
-    public void setUserPass(String userPass) {
-        this.userPass = userPass;
-    }
-}
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/RandomStringGenerator.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/RandomStringGenerator.java
new file mode 100644
index 0000000..937a4bd
--- /dev/null
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/RandomStringGenerator.java
@@ -0,0 +1,29 @@
+package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities;
+
+import org.apache.commons.lang3.RandomStringUtils;
+
+import java.util.Set;
+
+public class RandomStringGenerator {
+    public static final String ALPHA_NUMERIC = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+
+    private RandomStringGenerator() {
+
+    }
+
+    static public String generateRandomString(int num, String seed) {
+        return RandomStringUtils.random(num, seed);
+    }
+
+    static public boolean checkString(String str, Set<String> set) {
+        return set.contains(str);
+    }
+
+    static public String generateUniqueString(int num, String seed, Set<String> set) {
+        String str;
+        do {
+            str = generateRandomString(num, seed);
+        } while (checkString(str, set));
+        return str;
+    }
+}
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/URIAddressedAccount.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/URIAddressedAccount.java
new file mode 100644
index 0000000..c1b0ab3
--- /dev/null
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/Entities/URIAddressedAccount.java
@@ -0,0 +1,39 @@
+package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities;
+
+import java.net.URI;
+
+public class URIAddressedAccount {
+    private URI uri;
+    private Account account;
+
+    private URIAddressedAccount() {
+        // JSONDecode時の呼び出し用
+    }
+
+    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/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginControllerBoundary.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginControllerBoundary.java
deleted file mode 100644
index a23b5c2..0000000
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginControllerBoundary.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases;
-
-/**
- * 入力情報をInputUserPresenterからUserLoginUserCaseに
- * 情報を渡すためのInterfaceクラス
- *
- * @author n-konishi
- */
-
-public interface LoginControllerBoundary {
-
-    String getUserId();
-
-    String getUserPass();
-
-}
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginPresenterBoundary.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginPresenterBoundary.java
index 9d9624f..2694225 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginPresenterBoundary.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginPresenterBoundary.java
@@ -1,7 +1,7 @@
 package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases;
 
 /**
- * UserLoginUseCaseからUserLoginControllerに
+ * IDとPassの
  * 情報を渡すためのInterfaceクラス
  *
  * @author n-konishi
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginResponsePresenterBoundary.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginResponsePresenterBoundary.java
index df05b65..85f971b 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginResponsePresenterBoundary.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginResponsePresenterBoundary.java
@@ -1,6 +1,7 @@
 package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases;
 
 public interface LoginResponsePresenterBoundary {
-    public void successed();
-    public void failed();
+    void succeeded();
+
+    void failed();
 }
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginResponseUseCase.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginResponseUseCase.java
index 52142f7..9acc0cb 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginResponseUseCase.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginResponseUseCase.java
@@ -1,8 +1,8 @@
 package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases;
 
-import org.ntlab.radishforandroidstudio.cactusClient.Cactus;
-import org.ntlab.radishforandroidstudio.cactusClient.models.account.Account;
-import org.ntlab.radishforandroidstudio.cactusClient.models.account.URIAddressedAccount;
+import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.Cactus;
+import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.Account;
+import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.URIAddressedAccount;
 
 public class LoginResponseUseCase {
     private Cactus cactus;
@@ -26,7 +26,7 @@
             cactus.setMyAccount(user);
             cactus.setAddressedAccount(lac);
 
-            userLoginResponsePresenter.successed();
+            userLoginResponsePresenter.succeeded();
         } else {
             userLoginResponsePresenter.failed();
         }
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginUseCases.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginUseCases.java
index e6d0d74..e8f173f 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginUseCases.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/UseCases/LoginUseCases.java
@@ -1,28 +1,17 @@
 package org.ntlab.radishforandroidstudio.CactusCleanArchitecture.UseCases;
 
-import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.CactusConnectionEntity;
-import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.CactusUserEntity;
-
 /**
  * Userのログイン情報のデータの流れを調整するクラス
  */
 
 public class LoginUseCases {
-
-    private String LOGIN_URL;
-    private CactusConnectionEntity cactusConnectionEntity;
-//    private LoginControllerBoundary userLoginBoundary;
-
     private String userID;
     private String userPass;
     private LoginPresenterBoundary userLoginPresenter;
-    private CactusUserEntity cactusUserEntity;
 
     public LoginUseCases(LoginPresenterBoundary userLoginPresenter) {
-//        this.userLoginBoundary = userLoginBound;
         //Entityに情報をセットする
         this.userLoginPresenter = userLoginPresenter;
-//        cactusUserEntity = new CactusUserEntity();
     }
 
     public void inputData(String userID, String userPass) {
@@ -33,27 +22,4 @@
     public void proc() {
         userLoginPresenter.send(userID, userPass);
     }
-
-//    public String userLoginURL() {
-//        cactusConnectionEntity = new CactusConnectionEntity();
-//        LOGIN_URL = cactusConnectionEntity.getLOGIN_URL();
-//        return LOGIN_URL;
-//    }
-//
-//
-//    @Override
-//    public String getUserID() {
-////        userID = userLoginBoundary.getUserId();
-//        cactusUserEntity.setUserId(userID);
-//        return userID;
-//    }
-//
-//    @Override
-//    public String getUserPass() {
-////        userPass = userLoginBoundary.getUserPass();
-//        cactusUserEntity.setUserPass(userPass);
-//        return userPass;
-//    }
-
-
 }
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/View/LoginFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/View/LoginFragment.java
index 31d3a2e..e9587ac 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/View/LoginFragment.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/CactusCleanArchitecture/View/LoginFragment.java
@@ -2,7 +2,6 @@
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.view.LayoutInflater;
@@ -16,21 +15,21 @@
 
 
 public class LoginFragment extends Fragment {
-    LoginController loginController;
+    private LoginController loginController;
+    private View view;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        FragmentActivity fragmentActivity = getActivity();
+        view = inflater.inflate(R.layout.login_fragment, container, false);
         loginController = new LoginController(getActivity(), getFragmentManager());
-        return inflater.inflate(R.layout.login_fragment, container, false);
+        return view;
     }
 
     @Override
     public void onStart() {
         super.onStart();
 
-        Button button = (Button) getActivity().findViewById(R.id.signUP1);
+        Button button = view.findViewById(R.id.signUP1);
         button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -41,27 +40,8 @@
                 transaction.commit();
             }
         });
-        Button loginButton = (Button) getActivity().findViewById(R.id.login);
+        Button loginButton = view.findViewById(R.id.login);
         loginButton.setOnClickListener(loginController);
-//        loginButton.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View view) {
-//                EditText userName = getActivity().findViewById(R.id.inputUserName);
-//                EditText passWord = getActivity().findViewById(R.id.checkPassword);
-//                FragmentActivity fragmentActivity = getActivity();
-//                FragmentManager manager = getFragmentManager();
-//
-//                //動作
-////                loginController.inputData(userName.getText().toString(), passWord.getText().toString());
-//                LoginPresenter userLoginPresenter = new LoginPresenter();
-//                LoginUseCases userLoginUseCases = new LoginUseCases(userLoginPresenter);
-//                userLoginUseCases.inputData(userName.getText().toString(), passWord.getText().toString());
-//
-//                //通信
-//                LoginResponseControllerController userLoginResponseController = new LoginResponseControllerController(fragmentActivity, manager);
-//                userLoginPresenter.setFollowingController(userLoginResponseController);
-//                userLoginUseCases.proc();
-//            }
-//        });
+
     }
 }
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java
deleted file mode 100644
index 8e7ce84..0000000
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.ntlab.radishforandroidstudio.cactusClient;
-
-
-import android.app.Activity;
-import android.app.Application;
-import android.os.Bundle;
-
-import org.ntlab.radishforandroidstudio.cactusClient.models.account.Account;
-import org.ntlab.radishforandroidstudio.cactusClient.models.account.URIAddressedAccount;
-
-public class Cactus extends Application {
-
-    private Account myAccount = null;
-
-    private URIAddressedAccount addressedAccount;
-
-    public Cactus() {
-
-        registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() {
-            @Override
-            public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
-
-            }
-
-            @Override
-            public void onActivityStarted(Activity activity) {
-
-
-            }
-
-            @Override
-            public void onActivityResumed(Activity activity) {
-
-            }
-
-            @Override
-            public void onActivityPaused(Activity activity) {
-
-            }
-
-            @Override
-            public void onActivityStopped(Activity activity) {
-
-            }
-
-            @Override
-            public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
-
-            }
-
-            @Override
-            public void onActivityDestroyed(Activity activity) {
-
-            }
-        });
-    }
-
-    //MyAccountの追加
-    public Account getMyAccount() {
-        return myAccount;
-    }
-
-    public void setMyAccount(Account ac) {
-        myAccount = ac;
-    }
-
-    public URIAddressedAccount getAddressedAccount() {
-        return addressedAccount;
-    }
-
-    public void setAddressedAccount(URIAddressedAccount addressedAccount) {
-        this.addressedAccount = addressedAccount;
-    }
-}
-
-
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/account/Account.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/account/Account.java
deleted file mode 100644
index 58fd9a1..0000000
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/account/Account.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.ntlab.radishforandroidstudio.cactusClient.models.account;
-
-import net.arnx.jsonic.JSONHint;
-
-public class Account {
-    private String id, name, token, pass, uniqueID;
-    private boolean login = false;
-    private Account(){
-    }
-
-    public Account(String userID, String userName, String userPass, String uniqueID) {
-        setId(userID);
-        setName(userName);
-        setPass(userPass);
-        setUniqueID(uniqueID);
-        formToken();
-        login = true;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JSONHint(ignore=true)
-    public String getPass() {
-        return pass;
-    }
-
-    public void setPass(String pass) {
-        this.pass = pass;
-    }
-
-    public boolean isLogin() {
-        return login;
-    }
-
-    public void setLogin(boolean login) {
-        this.login = login;
-    }
-
-    public void setToken(String token){
-        this.token = token;
-
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public String formToken() {
-        token = RandomStringGenerator.generateRandomString(64, RandomStringGenerator.ALPHA_NUMERIC);
-        return token;
-    }
-
-    @JSONHint(ignore=true)
-    public String getUniqueID() {
-        return uniqueID;
-    }
-
-    public void setUniqueID(String uniqueID) {
-        this.uniqueID = uniqueID;
-    }
-}
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/account/Character.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/account/Character.java
index f31cf33..89b27b8 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/account/Character.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/account/Character.java
@@ -3,6 +3,7 @@
 
 import net.arnx.jsonic.JSONHint;
 
+import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.RandomStringGenerator;
 import org.ntlab.radishforandroidstudio.cactusClient.models.instance.Area;
 import org.ntlab.radishforandroidstudio.cactusClient.models.instance.Instance;
 import org.ntlab.radishforandroidstudio.cactusClient.models.instance.Instances;
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/account/RandomStringGenerator.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/account/RandomStringGenerator.java
deleted file mode 100644
index 0858b29..0000000
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/account/RandomStringGenerator.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.ntlab.radishforandroidstudio.cactusClient.models.account;
-
-import org.apache.commons.lang3.RandomStringUtils;
-
-import java.util.Set;
-
-public class RandomStringGenerator {
-    public static final String ALPHA_NUMERIC = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-    private RandomStringGenerator() {
-
-    }
-
-    static public String generateRandomString(int num, String seed) {
-        return RandomStringUtils.random(num, seed);
-    }
-
-    static public boolean checkString(String str, Set<String> set) {
-        return set.contains(str);
-    }
-
-    static public String generateUniqueString(int num, String seed, Set<String> set) {
-        String str;
-        do {
-            str = generateRandomString(num, seed);
-        } while (checkString(str, set));
-        return str;
-    }
-}
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/account/URIAddressedAccount.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/account/URIAddressedAccount.java
deleted file mode 100644
index 2b633f3..0000000
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/account/URIAddressedAccount.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.ntlab.radishforandroidstudio.cactusClient.models.account;
-
-import java.net.URI;
-
-public class URIAddressedAccount {
-    private URI uri;
-    private Account account;
-
-    private URIAddressedAccount() {
-        // JSONDecode時の呼び出し用
-    }
-
-    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/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/instance/Instance.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/instance/Instance.java
index 0af6456..98819c4 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/instance/Instance.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/instance/Instance.java
@@ -6,7 +6,7 @@
 import org.ntlab.radishforandroidstudio.cactusClient.models.model.Entity;
 import org.ntlab.radishforandroidstudio.cactusClient.models.object.MovableObject;
 import org.ntlab.radishforandroidstudio.cactusClient.models.account.Character;
-import org.ntlab.radishforandroidstudio.cactusClient.models.account.RandomStringGenerator;
+import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.RandomStringGenerator;
 import org.ntlab.radishforandroidstudio.framework.model3D.Object3D;
 import org.ntlab.radishforandroidstudio.framework.model3D.Position3D;
 import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D;
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/instance/Instances.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/instance/Instances.java
index 9efef94..0fc74e3 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/instance/Instances.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/instance/Instances.java
@@ -1,7 +1,7 @@
 package org.ntlab.radishforandroidstudio.cactusClient.models.instance;
 
 
-import org.ntlab.radishforandroidstudio.cactusClient.models.account.RandomStringGenerator;
+import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.RandomStringGenerator;
 import org.ntlab.radishforandroidstudio.cactusClient.models.player.Player;
 import org.ntlab.radishforandroidstudio.cactusClient.models.state.CameraState;
 import org.ntlab.radishforandroidstudio.cactusClient.models.state.EmoteState;
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java
index 4486399..316968c 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java
@@ -18,10 +18,10 @@
 import net.arnx.jsonic.TypeReference;
 
 import org.ntlab.radishforandroidstudio.R;
-import org.ntlab.radishforandroidstudio.cactusClient.Cactus;
+import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.Cactus;
 import org.ntlab.radishforandroidstudio.cactusClient.connections.CharactersFragmentConnection;
 import org.ntlab.radishforandroidstudio.cactusClient.connections.PlayersConnection;
-import org.ntlab.radishforandroidstudio.cactusClient.models.account.Account;
+import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.Account;
 import org.ntlab.radishforandroidstudio.cactusClient.models.account.Character;
 import org.ntlab.radishforandroidstudio.cactusClient.models.player.Player;
 import org.ntlab.radishforandroidstudio.framework.network.CallBack;
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java
index 5b0b2cf..9411856 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java
@@ -17,7 +17,7 @@
 import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.View.LoginFragment;
 import org.ntlab.radishforandroidstudio.R;
 import org.ntlab.radishforandroidstudio.cactusClient.connections.SignUpFragmentConnection;
-import org.ntlab.radishforandroidstudio.cactusClient.models.account.URIAddressedAccount;
+import org.ntlab.radishforandroidstudio.CactusCleanArchitecture.Entities.URIAddressedAccount;
 import org.ntlab.radishforandroidstudio.framework.network.CallBack;
 
 public class SignUpFragment extends Fragment {