diff --git a/app/src/main/java/com/example/cosmosclient/views/Signin.java b/app/src/main/java/com/example/cosmosclient/views/Signin.java
deleted file mode 100644
index 3b1cc5b..0000000
--- a/app/src/main/java/com/example/cosmosclient/views/Signin.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 Signin {
-    @POST("users/{uId}/login")
-    Call<login> loginList(@Path("uId") String uId, @Query("pw") String pw);
-}
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 fc4cd06..d95f002 100644
--- a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
@@ -48,22 +48,22 @@
                 .addConverterFactory(JacksonConverterFactory.create())
                 .build();
         //interfaceから実装を取得
-        final Signin signin = retrofit.create(Signin.class);
+        final SigninService signinService = retrofit.create(SigninService.class);
 
         //Sign inボタンの処理
         SigninButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 //APIに値を送信
-                Call<login> call = signin.loginList(NameText.getText().toString(), PasswordText.getText().toString());
+                Call<SigninResponse> call = signinService.loginList(NameText.getText().toString(), PasswordText.getText().toString());
 
                 //サーバからのレスポンス
-                call.enqueue(new Callback<login>() {
+                call.enqueue(new Callback<SigninResponse>() {
                     //成功時
                     @Override
-                    public void onResponse(Call<login> call, Response<login> response) {
+                    public void onResponse(Call<SigninResponse> call, Response<SigninResponse> response) {
                         if (response.isSuccessful()) {
-                            login result = response.body();
+                            SigninResponse result = response.body();
                             Intent intent = new Intent(getApplication(), GroupList.class);
                             //intent.putExtra("UserInfomation",result);
                             Toast.makeText(SigninActivity.this,
@@ -81,7 +81,7 @@
 
                     //失敗時
                     @Override
-                    public void onFailure(Call<login> call, Throwable t) {
+                    public void onFailure(Call<SigninResponse> call, Throwable t) {
                         //t.printStackTrace();
                         Toast.makeText(SigninActivity.this,
                                 "ユーザIDもしくはパスワードが間違っています",Toast.LENGTH_SHORT).show();
diff --git a/app/src/main/java/com/example/cosmosclient/views/SigninResponse.java b/app/src/main/java/com/example/cosmosclient/views/SigninResponse.java
new file mode 100644
index 0000000..c47556d
--- /dev/null
+++ b/app/src/main/java/com/example/cosmosclient/views/SigninResponse.java
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000..84dcb18
--- /dev/null
+++ b/app/src/main/java/com/example/cosmosclient/views/SigninService.java
@@ -0,0 +1,11 @@
+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/Signup.java b/app/src/main/java/com/example/cosmosclient/views/Signup.java
deleted file mode 100644
index ba90f00..0000000
--- a/app/src/main/java/com/example/cosmosclient/views/Signup.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.example.cosmosclient.views;
-
-import retrofit2.Call;
-import retrofit2.http.Field;
-import retrofit2.http.FormUrlEncoded;
-import retrofit2.http.POST;
-
-public interface Signup {
-    @POST("users")
-    @FormUrlEncoded
-    //icon-image一応入れてる
-    Call<User> listUser(@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/SignupActivity.java b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
index 06c461c..d535c50 100644
--- a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
@@ -13,8 +13,6 @@
 import com.example.cosmosclient.R;
 
 
-import java.util.regex.Pattern;
-
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -39,7 +37,7 @@
                 .addConverterFactory(JacksonConverterFactory.create())
                 .build();
         //interfaceから実装を取得
-        final Signup signup = retrofit.create(Signup.class);
+        final SignupService signupService = retrofit.create(SignupService.class);
 
         //各種idを取得
         Button LoginButton = findViewById(R.id.LoginButton);
@@ -71,16 +69,16 @@
                 }
 
                 //API呼び出しのための値入力
-                Call<User> call = signup.listUser(NameText.getText().toString(),
+                Call<SignupResponse> call = signupService.listUser(NameText.getText().toString(),
                         PasswordText.getText().toString(),"https://yumenavi.info/live/2018/photo/k/s015980019.jpg");
 
                 //サーバからデータ受け取り
-                call.enqueue(new Callback<User>() {
+                call.enqueue(new Callback<SignupResponse>() {
                     //成功時
                     @Override
-                    public void onResponse(Call<User> call, Response<User> response) {
+                    public void onResponse(Call<SignupResponse> call, Response<SignupResponse> response) {
                         if (response.isSuccessful()) {
-                            User result = response.body();
+                            SignupResponse result = response.body();
                             Intent intent = new Intent(getApplication(), GroupList.class);
                             //intent.putExtra("UserInfomation",result);
 
@@ -104,7 +102,7 @@
 
                     //失敗時
                     @Override
-                    public void onFailure(Call<User> call, Throwable t) {
+                    public void onFailure(Call<SignupResponse> call, Throwable t) {
                         t.printStackTrace();
                         Toast.makeText(SignupActivity.this,
                                 "アカウント作成失敗",Toast.LENGTH_SHORT);
diff --git a/app/src/main/java/com/example/cosmosclient/views/SignupResponse.java b/app/src/main/java/com/example/cosmosclient/views/SignupResponse.java
new file mode 100644
index 0000000..963dfce
--- /dev/null
+++ b/app/src/main/java/com/example/cosmosclient/views/SignupResponse.java
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 0000000..af96268
--- /dev/null
+++ b/app/src/main/java/com/example/cosmosclient/views/SignupService.java
@@ -0,0 +1,12 @@
+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> listUser(@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/User.java b/app/src/main/java/com/example/cosmosclient/views/User.java
deleted file mode 100644
index b31da01..0000000
--- a/app/src/main/java/com/example/cosmosclient/views/User.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.example.cosmosclient.views;
-
-import java.util.List;
-
-public class User {
-    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/login.java b/app/src/main/java/com/example/cosmosclient/views/login.java
deleted file mode 100644
index 6533ecf..0000000
--- a/app/src/main/java/com/example/cosmosclient/views/login.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.example.cosmosclient.views;
-
-public class login {
-    public String token;
-}