diff --git a/app/src/main/java/com/example/cosmosclient/entities/CreateGroupResponse.java b/app/src/main/java/com/example/cosmosclient/entities/CreateGroupResponse.java
new file mode 100644
index 0000000..2cf3fec
--- /dev/null
+++ b/app/src/main/java/com/example/cosmosclient/entities/CreateGroupResponse.java
@@ -0,0 +1,11 @@
+package com.example.cosmosclient.entities;
+
+import java.util.ArrayList;
+
+public class CreateGroupResponse {
+    public String gId;
+    public String uri;
+    public String name;
+    public ArrayList<User> members= new ArrayList<>();
+    public ArrayList<Request> request = new ArrayList<>();
+}
diff --git a/app/src/main/java/com/example/cosmosclient/entities/Group.java b/app/src/main/java/com/example/cosmosclient/entities/Group.java
index 701930a..9e728a3 100644
--- a/app/src/main/java/com/example/cosmosclient/entities/Group.java
+++ b/app/src/main/java/com/example/cosmosclient/entities/Group.java
@@ -1,19 +1,16 @@
 package com.example.cosmosclient.entities;
 
-import com.example.cosmosclient.jsons.RidUriJson;
-import com.example.cosmosclient.jsons.UidUriJson;
-
 import java.util.ArrayList;
+import java.util.Set;
 
 public class Group {
     private String gId;
     private String uri, name;
-    // Userどうする
-    private ArrayList<UidUriJson> members = new ArrayList<>();
-
-    private ArrayList<RidUriJson> requests = new ArrayList<>();
-//  private Set<User> members = new HashSet<>();
-//    private Set<Request> requests;
+    /*   Userどうするか
+    private ArrayList<User> members;
+    */
+    //private ArrayList<Request> requests;
+    private Set<Request> requests;
 
     public Group(){
 
@@ -57,65 +54,37 @@
         return name;
     }
 
-//    public Set<Request> getRequests(){
-//        return requests;
-//    }
-//
-//    public void setRequests(Set<Request> requests){
-//        this.requests = requests;
-//    }
-
-    public void addRequests(RidUriJson request){
-        requests.add(request);
-    }
-
-//    public ArrayList<Request> getRequestsList(){
-//        ArrayList<Request> list = new ArrayList<Request>(getRequests());
-//        return list;
-//    }
-
-        public ArrayList<RidUriJson> getRequestsList(){
-        ArrayList<RidUriJson> list = new ArrayList<RidUriJson>(getRequests());
-        return list;
-    }
-
-//    public void setMembers(Set<User> members){
-//        this.members= members;
-//    }
-//
-//    public Set<User> getMembers(){
-//        return members;
-//    }
-
-        public void setMembers(ArrayList<UidUriJson> members){
-        this.members= members;
-    }
-
-    public ArrayList<UidUriJson> getMembers(){
-        return members;
-    }
-        public ArrayList<RidUriJson> getRequests(){
+    public Set<Request> getRequests(){
         return requests;
     }
 
-    public void setRequests(ArrayList<RidUriJson> requests){
+    public void setRequests(Set<Request> requests){
         this.requests = requests;
     }
 
+    public void addRequests(Request request){
+        requests.add(request);
+    }
+
+    public ArrayList<Request> getRequestsList(){
+        ArrayList<Request> list = new ArrayList<Request>(getRequests());
+        return list;
+    }
+
     /*メンバー*/
-//    public ArrayList<User> getMembersList(){
-//        return null;
-//    }
-//
-//    public void addMemberByUid(String uId){
-//
-//        members.add(user);
-//    }
-//
-//    public DeleteResult deleteMember(String uid){
-//        members.remove(members.indexOf(uid));
-//        return null;
-//    }
+    //public ArrayList<User> getMembersList(){
+    //    return null;
+    //}
+
+    //public void addMemberByUid(String uId){
+    //
+    //    members.add(user);
+    //}
+
+    //public DeleteResult deleteMember(String uid){
+    //    members.remove(members.indexOf(uid));
+    //    return null;
+    //}
 
     /*リクエスト*/
 
diff --git a/app/src/main/java/com/example/cosmosclient/entities/User.java b/app/src/main/java/com/example/cosmosclient/entities/User.java
new file mode 100644
index 0000000..7d07fa4
--- /dev/null
+++ b/app/src/main/java/com/example/cosmosclient/entities/User.java
@@ -0,0 +1,118 @@
+package com.example.cosmosclient.entities;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class User {
+    /**
+     * USER用のクラス
+     *
+     * @param uId string //LONGに変更
+     * @param uri String
+     * @param name String
+     * @param iconUri String iconの保存先
+     * @param login Boolean トークンが存在するか否か
+     * @param groups Set<Group> 所属するグループ
+     * @param tokens String userが持トークン一覧
+     *
+     * TODO: Tokenのデータベース接続
+     * TODO: tokenの持ち方要検討
+     */
+
+    public String uId, uri, name, iconUri;
+    public boolean login = true;
+    public Set<Group> groups = new HashSet<>();//HashSetでいいのかな？
+    //仕様ではStringを返すため
+    //public Set<Token> tokens = new HashSet<>();
+    //public Set<String> tokens = new HashSet<>();
+    public String token;
+    private String dummyToken = "a9965652-c2ec-4a0d-a78a-b457e8b2deca";
+
+    public User() {
+
+    }
+    public User(String name, String uId, String uri, String iconUri) {
+        setuId(uId);
+        setUri(uri);
+        setName(name);
+        setIconUri(iconUri);
+        setToken(this.dummyToken);
+        //addToken(this.dummyToken);
+        this.login = true;
+    }
+
+    public String getuId() {
+        return uId;
+    }
+
+    public void setuId(String uId) {
+        this.uId = uId;
+    }
+
+    public String getUri() {
+        return uri;
+    }
+
+    public void setUri(String uri) {
+        this.uri = uri;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getIconUri() {
+        return iconUri;
+    }
+
+    public void setIconUri(String iconUri) {
+        this.iconUri = iconUri;
+    }
+
+    public boolean getLogin() {
+        return login;
+    }
+
+    public void setLogin(boolean login) {
+        this.login = login;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    /*
+     * //仕様ではStringで返すため
+     * public Set<String> getTokens(){
+     *     return tokens;
+     * }
+     * public void setTokens(Set<String> tokens){
+     *     this.tokens=tokens;
+     * }
+     * public void addToken (String token){
+     *     tokens.add(token);
+     * }
+     */
+
+    public Set<Group> getGroups() {
+        return groups;
+    }
+
+    public void setGroups(Set<Group> groups) {
+        this.groups = groups;
+    }
+
+    public void addGroups(Group group){
+        //テスト用
+        //Group group = Groups.getInstance().getGroupByGid(gId);
+        groups.add(group);
+    }
+}
diff --git a/app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java b/app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java
index 52bbefd..d1d8943 100644
--- a/app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java
+++ b/app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java
@@ -1,5 +1,6 @@
 package com.example.cosmosclient.resources;
 
+import com.example.cosmosclient.entities.CreateGroupResponse;
 import com.example.cosmosclient.entities.Group;
 
 import retrofit2.Call;
@@ -10,5 +11,5 @@
 public interface GroupsRest {
     @POST("groups")
     @FormUrlEncoded
-    Call<Group> createGroup(@Field("name") String name,@Field("uId") String uId,@Field("token") String token);
+    Call<CreateGroupResponse> createGroup(@Field("name") String name, @Field("uId") String uId, @Field("token") String token);
 }
diff --git a/app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java b/app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java
index 64c23d6..6aee5c9 100644
--- a/app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java
@@ -15,6 +15,7 @@
 
 import com.example.cosmosclient.R;
 import com.example.cosmosclient.app.Cosmos;
+import com.example.cosmosclient.entities.CreateGroupResponse;
 import com.example.cosmosclient.entities.Group;
 import com.example.cosmosclient.resources.GroupsRest;
 
@@ -71,14 +72,14 @@
                     }
                 }, 1000L);
 
-                Call<Group> createGroup = createGroupService.createGroup(groupNameText.getText().toString(), uId, token);
+                Call<CreateGroupResponse> createGroup = createGroupService.createGroup(groupNameText.getText().toString(), uId, token);
 
-                createGroup.enqueue(new Callback<Group>() {
+                createGroup.enqueue(new Callback<CreateGroupResponse>() {
                     @Override
-                    public void onResponse(Call<Group> call, Response<Group> response) {
+                    public void onResponse(Call<CreateGroupResponse> call, Response<CreateGroupResponse> response) {
                         if (response.isSuccessful()) {
                             //成功時
-                            Group result = response.body();
+                            CreateGroupResponse result = response.body();
                             Intent intent = new Intent(getApplication(), RequestListActivity.class);
 
 
@@ -101,7 +102,7 @@
                     }
 
                     @Override
-                    public void onFailure(Call<Group> call, Throwable t) {
+                    public void onFailure(Call<CreateGroupResponse> call, Throwable t) {
                         //失敗時
                         t.printStackTrace();
                         Toast.makeText(CreateGroupActivity.this,