diff --git a/app/src/main/java/com/example/cosmosclient/app/Cosmos.java b/app/src/main/java/com/example/cosmosclient/app/Cosmos.java
index e855ba0..3065ed9 100644
--- a/app/src/main/java/com/example/cosmosclient/app/Cosmos.java
+++ b/app/src/main/java/com/example/cosmosclient/app/Cosmos.java
@@ -2,6 +2,22 @@
 
 import android.app.Application;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class Cosmos extends Application {
+    private List<String> token;
+
+    public Cosmos(){
+        this.token = new ArrayList<String>();
+    }
+
+    public void setToken(List<String> token){
+        this.token = token;
+    }
+
+    public List<String> getToken(){
+        return new ArrayList<String>(token);
+    }
 
 }
diff --git a/app/src/main/java/com/example/cosmosclient/entities/SigninResponse.java b/app/src/main/java/com/example/cosmosclient/entities/SigninResponse.java
new file mode 100644
index 0000000..269b78a
--- /dev/null
+++ b/app/src/main/java/com/example/cosmosclient/entities/SigninResponse.java
@@ -0,0 +1,7 @@
+package com.example.cosmosclient.entities;
+
+import java.util.List;
+
+public class SigninResponse {
+    public List<String> token;
+}
diff --git a/app/src/main/java/com/example/cosmosclient/entities/SignupResponse.java b/app/src/main/java/com/example/cosmosclient/entities/SignupResponse.java
new file mode 100644
index 0000000..4a52150
--- /dev/null
+++ b/app/src/main/java/com/example/cosmosclient/entities/SignupResponse.java
@@ -0,0 +1,15 @@
+package com.example.cosmosclient.entities;
+
+import java.util.List;
+
+public class SignupResponse {
+    public String uId;
+    public String name;
+    public String pw;
+    public String uri;
+    public List<String> token;
+    public String iconUri;
+    public boolean login;
+
+
+}
diff --git a/app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java b/app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java
new file mode 100644
index 0000000..6635b43
--- /dev/null
+++ b/app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java
@@ -0,0 +1,4 @@
+package com.example.cosmosclient.resources;
+
+public interface GroupsRest {
+}
diff --git a/app/src/main/java/com/example/cosmosclient/resources/UsersRest.java b/app/src/main/java/com/example/cosmosclient/resources/UsersRest.java
new file mode 100644
index 0000000..d4ddb3e
--- /dev/null
+++ b/app/src/main/java/com/example/cosmosclient/resources/UsersRest.java
@@ -0,0 +1,21 @@
+package com.example.cosmosclient.resources;
+
+import com.example.cosmosclient.entities.SigninResponse;
+import com.example.cosmosclient.entities.SignupResponse;
+
+import retrofit2.Call;
+import retrofit2.http.Field;
+import retrofit2.http.FormUrlEncoded;
+import retrofit2.http.POST;
+import retrofit2.http.Path;
+import retrofit2.http.Query;
+
+public interface UsersRest {
+    @POST("users/{uId}/login")
+    Call<SigninResponse> loginList(@Path("uId") String uId, @Query("pw") String pw);
+
+    @POST("users")
+    @FormUrlEncoded
+    Call<SignupResponse> createUser(@Field("name") String name, @Field("pw") String pw, @Field("icon-image") String icon_image);
+
+}
diff --git a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
index d95f002..05bfc17 100644
--- a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
@@ -11,6 +11,9 @@
 import android.widget.Toast;
 
 import com.example.cosmosclient.R;
+import com.example.cosmosclient.app.Cosmos;
+import com.example.cosmosclient.entities.SigninResponse;
+import com.example.cosmosclient.resources.UsersRest;
 
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -31,16 +34,16 @@
         //各種IDを取得
         SigninButton = findViewById(R.id.SigninButton);
         Button SignupButton = findViewById(R.id.SignupButton);
-        final EditText NameText = findViewById(R.id.NameText);
+        final EditText UserIdText = findViewById(R.id.UserIdText);
         final EditText PasswordText = findViewById(R.id.PasswordText);
         Button ForgotPasswordButton = findViewById(R.id.ForgotPasswordButton);
 
         //ボタン無効化
-        SigninButton.setEnabled(false);
-
-        //TextWatcherで入力監視
-        NameText.addTextChangedListener(new SigninActivity.GenericTextWatcher(NameText));
-        PasswordText.addTextChangedListener(new SigninActivity.GenericTextWatcher(PasswordText));
+//        SigninButton.setEnabled(false);
+//
+//        //TextWatcherで入力監視
+//        UserIdText.addTextChangedListener(new SigninActivity.GenericTextWatcher(UserIdText));
+//        PasswordText.addTextChangedListener(new SigninActivity.GenericTextWatcher(PasswordText));
 
         //retrofitの処理
         final Retrofit retrofit = new Retrofit.Builder()
@@ -48,14 +51,14 @@
                 .addConverterFactory(JacksonConverterFactory.create())
                 .build();
         //interfaceから実装を取得
-        final SigninService signinService = retrofit.create(SigninService.class);
+        final UsersRest signinService = retrofit.create(UsersRest.class);
 
         //Sign inボタンの処理
         SigninButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 //APIに値を送信
-                Call<SigninResponse> call = signinService.loginList(NameText.getText().toString(), PasswordText.getText().toString());
+                Call<SigninResponse> call = signinService.loginList(UserIdText.getText().toString(), PasswordText.getText().toString());
 
                 //サーバからのレスポンス
                 call.enqueue(new Callback<SigninResponse>() {
@@ -64,12 +67,15 @@
                     public void onResponse(Call<SigninResponse> call, Response<SigninResponse> response) {
                         if (response.isSuccessful()) {
                             SigninResponse result = response.body();
+
+                            //app/Cosmosに情報保存
+                            Cosmos app = (Cosmos)getApplication();
+                            app.setToken(result.token);
+
                             Intent intent = new Intent(getApplication(), GroupList.class);
-                            //intent.putExtra("UserInfomation",result);
+                            startActivity(intent);
                             Toast.makeText(SigninActivity.this,
                                     "ログインしました", Toast.LENGTH_SHORT).show();
-
-                            startActivity(intent);
                             finish();
 
                         }else{
@@ -126,7 +132,7 @@
         @Override
         public void afterTextChanged(Editable s){
             switch(view.getId()) {
-                case R.id.NameText:
+                case R.id.UserIdText:
                     if (s.length() > 0) {
                         uIdEnable = true;
                     } else {
@@ -142,7 +148,7 @@
                     break;
             }
             //ボタン有効＆無効
-            if(uIdEnable && pwEnable ){
+            if(uIdEnable && pwEnable){
                 SigninButton.setEnabled(true);
             }else{
                 SigninButton.setEnabled(false);
diff --git a/app/src/main/java/com/example/cosmosclient/views/SigninResponse.java b/app/src/main/java/com/example/cosmosclient/views/SigninResponse.java
deleted file mode 100644
index c47556d..0000000
--- a/app/src/main/java/com/example/cosmosclient/views/SigninResponse.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.example.cosmosclient.views;
-
-public class SigninResponse {
-    public String token;
-}
diff --git a/app/src/main/java/com/example/cosmosclient/views/SigninService.java b/app/src/main/java/com/example/cosmosclient/views/SigninService.java
deleted file mode 100644
index 84dcb18..0000000
--- a/app/src/main/java/com/example/cosmosclient/views/SigninService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.example.cosmosclient.views;
-
-import retrofit2.Call;
-import retrofit2.http.POST;
-import retrofit2.http.Path;
-import retrofit2.http.Query;
-
-public interface SigninService {
-    @POST("users/{uId}/login")
-    Call<SigninResponse> loginList(@Path("uId") String uId, @Query("pw") String pw);
-}
diff --git a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
index b3cffe2..ec129b1 100644
--- a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
@@ -11,6 +11,9 @@
 import android.widget.Toast;
 
 import com.example.cosmosclient.R;
+import com.example.cosmosclient.app.Cosmos;
+import com.example.cosmosclient.entities.SignupResponse;
+import com.example.cosmosclient.resources.UsersRest;
 
 
 import retrofit2.Call;
@@ -20,7 +23,6 @@
 import retrofit2.converter.jackson.JacksonConverterFactory;
 
 public class SignupActivity extends AppCompatActivity{
-//    public static final String UserInfomation="com.example.cosmosclient.views";
     private boolean nameEnable;
     private boolean pwEnable;
     private boolean cpwEnable;
@@ -37,7 +39,7 @@
                 .addConverterFactory(JacksonConverterFactory.create())
                 .build();
         //interfaceから実装を取得
-        final SignupService signupService = retrofit.create(SignupService.class);
+        final UsersRest signupService = retrofit.create(UsersRest.class);
 
         //各種idを取得
         Button LoginButton = findViewById(R.id.LoginButton);
@@ -45,14 +47,14 @@
         final EditText NameText = findViewById(R.id.NameText);
         final EditText PasswordText = findViewById(R.id.PasswordText);
         final EditText ConfirmPasswordText = findViewById(R.id.ConfirmPasswordText);
-
-        //入力欄監視
-        NameText.addTextChangedListener(new GenericTextWatcher(NameText));
-        PasswordText.addTextChangedListener(new GenericTextWatcher(PasswordText));
-        ConfirmPasswordText.addTextChangedListener(new GenericTextWatcher(ConfirmPasswordText));
-
-        //アカウント登録ボタン無効化
-        MakeAccountButton.setEnabled(false);
+//
+//        //入力欄監視
+//        NameText.addTextChangedListener(new GenericTextWatcher(NameText));
+//        PasswordText.addTextChangedListener(new GenericTextWatcher(PasswordText));
+//        ConfirmPasswordText.addTextChangedListener(new GenericTextWatcher(ConfirmPasswordText));
+//
+//        //アカウント登録ボタン無効化
+//        MakeAccountButton.setEnabled(false);
 
         //Make Accountボタンの処理
         MakeAccountButton.setOnClickListener(new View.OnClickListener(){
@@ -79,18 +81,23 @@
                     public void onResponse(Call<SignupResponse> call, Response<SignupResponse> response) {
                         if (response.isSuccessful()) {
                             SignupResponse result = response.body();
+
+                            Cosmos app = (Cosmos)getApplication();
+                            app.setToken(result.token);
+
                             Intent intent = new Intent(getApplication(), GroupList.class);
-                            //intent.putExtra("UserInfomation",result);
 
                             //test
-                            System.out.println(result.uId);
-                            System.out.println(result.name);
-                            System.out.println(result.uri);
-                            System.out.println(result.token);
-                            System.out.println(result.iconUri);
-                            System.out.println(result.pw);
+//                            System.out.println(result.uId);
+//                            System.out.println(result.name);
+//                            System.out.println(result.uri);
+//                            System.out.println(result.token);
+//                            System.out.println(result.iconUri);
+//                            System.out.println(result.pw);
 
                             startActivity(intent);
+                            Toast.makeText(SignupActivity.this,
+                                    "アカウントを作成しました",Toast.LENGTH_SHORT);
                             finish();
 
                         }else{
diff --git a/app/src/main/java/com/example/cosmosclient/views/SignupResponse.java b/app/src/main/java/com/example/cosmosclient/views/SignupResponse.java
deleted file mode 100644
index 963dfce..0000000
--- a/app/src/main/java/com/example/cosmosclient/views/SignupResponse.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.example.cosmosclient.views;
-
-import java.util.List;
-
-public class SignupResponse {
-    public String uId;
-    public String name;
-    public String pw;
-    public String uri;
-    public List<String> token;
-    public String iconUri;
-    public boolean login;
-
-
-}
diff --git a/app/src/main/java/com/example/cosmosclient/views/SignupService.java b/app/src/main/java/com/example/cosmosclient/views/SignupService.java
deleted file mode 100644
index 2ac3075..0000000
--- a/app/src/main/java/com/example/cosmosclient/views/SignupService.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.example.cosmosclient.views;
-
-import retrofit2.Call;
-import retrofit2.http.Field;
-import retrofit2.http.FormUrlEncoded;
-import retrofit2.http.POST;
-
-public interface SignupService {
-    @POST("users")
-    @FormUrlEncoded
-    Call<SignupResponse> createUser(@Field("name") String name, @Field("pw") String pw, @Field("icon-image") String icon_image);
-}
diff --git a/app/src/main/res/layout/activity_signin.xml b/app/src/main/res/layout/activity_signin.xml
index 94e7a79..6b37c3c 100644
--- a/app/src/main/res/layout/activity_signin.xml
+++ b/app/src/main/res/layout/activity_signin.xml
@@ -39,10 +39,10 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.445"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/NameText" />
+        app:layout_constraintTop_toBottomOf="@+id/UserIdText" />
 
     <EditText
-        android:id="@+id/NameText"
+        android:id="@+id/UserIdText"
         android:layout_width="294dp"
         android:layout_height="41dp"
         android:layout_marginStart="8dp"
@@ -52,7 +52,7 @@
         android:layout_marginRight="8dp"
         android:autofillHints=""
         android:ems="10"
-        android:hint="@string/e_mail_address"
+        android:hint="@string/user_id"
         android:inputType="text"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.445"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7d0f4d7..17e807a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,6 +2,7 @@
     <string name="app_name">CosmosClient</string>
     <string name="or">or</string>
     <string name="e_mail_address">ユーザー名</string>
+    <string name="user_id">ユーザーID</string>
     <string name="password">パスワード</string>
     <string name="confirm_password">パスワードの確認</string>
     <string name="sign_up">新規登録</string>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ff18aab..7c22eb8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue May 28 15:35:44 JST 2019
+#Thu May 23 16:30:34 JST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip