diff --git a/app/src/main/java/com/example/cosmosclient/entities/Request.java b/app/src/main/java/com/example/cosmosclient/entities/Request.java
new file mode 100644
index 0000000..b4ccf6e
--- /dev/null
+++ b/app/src/main/java/com/example/cosmosclient/entities/Request.java
@@ -0,0 +1,50 @@
+package com.example.cosmosclient.entities;
+
+import java.util.Date;
+
+public class Request {
+
+    private String product;
+    private Date deadline;
+    private String location;
+    private String name;
+
+    public Request(String product, Date deadline, String location, String name) {
+        this.product = product;
+        this.deadline = deadline;
+        this.location = location;
+        this.name = name;
+    }
+
+    public String getProduct() {
+        return product;
+    }
+
+    public void setProduct(String product) {
+        this.product = product;
+    }
+
+    public Date getDeadline() {
+        return deadline;
+    }
+
+    public void setDeadline(Date deadline) {
+        this.deadline = deadline;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java b/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java
index 5be0e67..bef866a 100644
--- a/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java
@@ -12,13 +12,14 @@
 import android.widget.TextView;
 
 import com.example.cosmosclient.R;
+import com.example.cosmosclient.entities.Request;
 
+import java.sql.Date;
 import java.util.ArrayList;
-import java.util.Date;
 
 
 public class AddRequestActivity extends AppCompatActivity {
-    private RequestList requestList;
+    private Request requestList;
 
     private EditText editTextProduct;
 
@@ -41,7 +42,7 @@
                  // エディットテキストのテキストを取得
                  String inputProduct = editTextProduct.getText().toString();
                  // 取得したテキストを TextView に張り付ける
-                 RequestList requestlist = (new RequestList(inputProduct, new Date(2019, 6, 7), "スーパー", "a-hongo"));
+                 Request requestlist = (new Request(inputProduct, new Date(2019, 6, 7), "スーパー", "a-hongo"));
                  startActivity(new Intent(AddRequestActivity.this, RequestListActivity.class));
              }
          });
diff --git a/app/src/main/java/com/example/cosmosclient/views/GroupList.java b/app/src/main/java/com/example/cosmosclient/views/GroupList.java
deleted file mode 100644
index a905987..0000000
--- a/app/src/main/java/com/example/cosmosclient/views/GroupList.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.example.cosmosclient.views;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.view.View;
-import android.support.v4.view.GravityCompat;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.view.MenuItem;
-import android.support.design.widget.NavigationView;
-import android.support.v4.widget.DrawerLayout;
-
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.view.Menu;
-import android.widget.TextView;
-
-import com.example.cosmosclient.R;
-
-public class GroupList extends AppCompatActivity
-        implements NavigationView.OnNavigationItemSelectedListener {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_group_list);
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-
-        /* とりあえずの画面遷移なので変更するかも */
-        TextView group1 = findViewById(R.id.group1);
-        group1.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Intent intent=new Intent(GroupList.this, com.example.cosmosclient.views.RequestListActivity.class);
-                startActivity(intent);
-            }
-        });
-
-
-        DrawerLayout drawer = findViewById(R.id.drawer_layout);
-        NavigationView navigationView = findViewById(R.id.nav_view);
-        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
-                this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
-        drawer.addDrawerListener(toggle);
-        toggle.syncState();
-        navigationView.setNavigationItemSelectedListener(this);
-    }
-
-    @Override
-    public void onBackPressed() {
-        DrawerLayout drawer = findViewById(R.id.drawer_layout);
-        if (drawer.isDrawerOpen(GravityCompat.START)) {
-            drawer.closeDrawer(GravityCompat.START);
-        } else {
-            super.onBackPressed();
-        }
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.group_list, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        int id = item.getItemId();
-
-        //noinspection SimplifiableIfStatement
-        if (id == R.id.action_settings) {
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    @SuppressWarnings("StatementWithEmptyBody")
-    @Override
-    public boolean onNavigationItemSelected(MenuItem item) {
-
-
-        // Handle navigation view item clicks here.
-        int id = item.getItemId();
-        if ( id == R.id.createNewGroupButton){
-
-        } else if (id == R.id.joinGroupButton){
-            Intent intent=new Intent(GroupList.this, com.example.cosmosclient.views.JoinGroupActionsActivity.class);
-            startActivity(intent);
-        } else if (id == R.id.signOutButton){
-            Intent intent=new Intent(GroupList.this, com.example.cosmosclient.views.SigninActivity.class);
-            startActivity(intent);
-        }
-/*
-        if (id == R.id.nav_home) {
-            // Handle the camera action
-        } else if (id == R.id.nav_gallery) {
-
-        } else if (id == R.id.nav_slideshow) {
-
-        } else if (id == R.id.nav_tools) {
-
-        } else if (id == R.id.nav_share) {
-
-        } else if (id == R.id.nav_send) {
-
-        }
-*/
-        DrawerLayout drawer = findViewById(R.id.drawer_layout);
-        drawer.closeDrawer(GravityCompat.START);
-        return true;
-    }
-}
diff --git a/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java b/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java
new file mode 100644
index 0000000..c7515bf
--- /dev/null
+++ b/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java
@@ -0,0 +1,116 @@
+package com.example.cosmosclient.views;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.support.v4.view.GravityCompat;
+import android.support.v7.app.ActionBarDrawerToggle;
+import android.view.MenuItem;
+import android.support.design.widget.NavigationView;
+import android.support.v4.widget.DrawerLayout;
+
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.widget.TextView;
+
+import com.example.cosmosclient.R;
+
+public class GroupListActivity extends AppCompatActivity
+        implements NavigationView.OnNavigationItemSelectedListener {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_group_list);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        /* とりあえずの画面遷移なので変更するかも */
+        TextView group1 = findViewById(R.id.group1);
+        group1.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent=new Intent(GroupListActivity.this, com.example.cosmosclient.views.RequestListActivity.class);
+                startActivity(intent);
+            }
+        });
+
+
+        DrawerLayout drawer = findViewById(R.id.drawer_layout);
+        NavigationView navigationView = findViewById(R.id.nav_view);
+        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
+                this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
+        drawer.addDrawerListener(toggle);
+        toggle.syncState();
+        navigationView.setNavigationItemSelectedListener(this);
+    }
+
+    @Override
+    public void onBackPressed() {
+        DrawerLayout drawer = findViewById(R.id.drawer_layout);
+        if (drawer.isDrawerOpen(GravityCompat.START)) {
+            drawer.closeDrawer(GravityCompat.START);
+        } else {
+            super.onBackPressed();
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.group_list, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+
+        //noinspection SimplifiableIfStatement
+        if (id == R.id.action_settings) {
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    @SuppressWarnings("StatementWithEmptyBody")
+    @Override
+    public boolean onNavigationItemSelected(MenuItem item) {
+
+
+        // Handle navigation view item clicks here.
+        int id = item.getItemId();
+        if ( id == R.id.createNewGroupButton){
+
+        } else if (id == R.id.joinGroupButton){
+            Intent intent=new Intent(GroupListActivity.this, com.example.cosmosclient.views.JoinGroupActionsActivity.class);
+            startActivity(intent);
+        } else if (id == R.id.signOutButton){
+            Intent intent=new Intent(GroupListActivity.this, com.example.cosmosclient.views.SigninActivity.class);
+            startActivity(intent);
+        }
+/*
+        if (id == R.id.nav_home) {
+            // Handle the camera action
+        } else if (id == R.id.nav_gallery) {
+
+        } else if (id == R.id.nav_slideshow) {
+
+        } else if (id == R.id.nav_tools) {
+
+        } else if (id == R.id.nav_share) {
+
+        } else if (id == R.id.nav_send) {
+
+        }
+*/
+        DrawerLayout drawer = findViewById(R.id.drawer_layout);
+        drawer.closeDrawer(GravityCompat.START);
+        return true;
+    }
+}
diff --git a/app/src/main/java/com/example/cosmosclient/views/RequestList.java b/app/src/main/java/com/example/cosmosclient/views/RequestList.java
deleted file mode 100644
index 8cea439..0000000
--- a/app/src/main/java/com/example/cosmosclient/views/RequestList.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.example.cosmosclient.views;
-
-import java.util.Date;
-
-public class RequestList {
-    private String product;
-    private Date deadline;
-    private String location;
-    private String name;
-
-    public RequestList(String product, Date deadline, String location, String name) {
-        this.product = product;
-        this.deadline = deadline;
-        this.location = location;
-        this.name = name;
-    }
-
-    public String getProduct() {
-        return product;
-    }
-
-    public void setProduct(String product) {
-        this.product = product;
-    }
-
-    public Date getDeadline() {
-        return deadline;
-    }
-
-    public void setDeadline(Date deadline) {
-        this.deadline = deadline;
-    }
-
-    public String getLocation() {
-        return location;
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
diff --git a/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java b/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java
index 79a38eb..0f54465 100644
--- a/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java
@@ -21,6 +21,7 @@
 import android.widget.Toast;
 
 import com.example.cosmosclient.R;
+import com.example.cosmosclient.entities.Request;
 
 import java.text.Collator;
 import java.util.ArrayList;
@@ -37,7 +38,7 @@
     Toast toast; //動作テスト用
 
     //Request List
-    public static ArrayList<RequestList> requestlist = new ArrayList<>();
+    public static ArrayList<Request> requestlist = new ArrayList<>();
 
     //Color制御
     boolean productColorFlag = true; //買うもの (true:白, false:黒)
@@ -151,25 +152,25 @@
     };
 
     //productSortComparator
-    public Comparator<RequestList> productSortComparator = new Comparator<RequestList>() {
+    public Comparator<Request> productSortComparator = new Comparator<Request>() {
         @Override
-        public int compare(RequestList r1, RequestList r2) {
+        public int compare(Request r1, Request r2) {
             return collator.compare(r1.getProduct().toString(), r2.getProduct().toString());
         }
     };
 
     //deadlineSortComparator
-    public Comparator<RequestList> deadlineSortComparator = new Comparator<RequestList>() {
+    public Comparator<Request> deadlineSortComparator = new Comparator<Request>() {
         @Override
-        public int compare(RequestList r1, RequestList r2) {
+        public int compare(Request r1, Request r2) {
             return r1.getDeadline().compareTo(r2.getDeadline());
         }
     };
 
     //deadlineReverseComparator
-    public Comparator<RequestList> deadlineReverseComparator = new Comparator<RequestList>() {
+    public Comparator<Request> deadlineReverseComparator = new Comparator<Request>() {
         @Override
-        public int compare(RequestList r1, RequestList r2) {
+        public int compare(Request r1, Request r2) {
             if (r1.getDeadline() == null || r2.getDeadline() == null)
                 return 0;
             if(r1.getDeadline().getDate() >= r2.getDeadline().getDate() || r1.getDeadline().getMonth() < r2.getDeadline().getMonth())
@@ -181,9 +182,9 @@
     };
 
     //locationSortComparator
-    public Comparator<RequestList> locationSortComparator = new Comparator<RequestList>() {
+    public Comparator<Request> locationSortComparator = new Comparator<Request>() {
         @Override
-        public int compare(RequestList r1, RequestList r2) {
+        public int compare(Request r1, Request r2) {
             return r1.getLocation().compareTo(r2.getLocation());
         }
     };
@@ -201,8 +202,8 @@
             public void onClick(View view) {
                 Snackbar.make(view, "Next Add Request Activity", Snackbar.LENGTH_LONG)
                         .setAction("Action", null).show();
-                startActivity(new Intent(RequestListActivity.this, AddRequestActivity.class));
 
+                startActivity(new Intent(RequestListActivity.this, AddRequestActivity.class));
             }
         });
 
@@ -217,9 +218,9 @@
         navigationView.setNavigationItemSelectedListener(this);
 
         //Add Request
-        requestlist.add(new RequestList("わさび", new Date(2019, 6, 7), "スーパー", "a-hongo"));
-        requestlist.add(new RequestList("ケーキ" , new Date(2019, 6, 6), "ダニエル", "t-sugisawa"));
-        requestlist.add(new RequestList("からし", new Date(2018, 6, 4), "コンビニ", "n-kande"));
+        requestlist.add(new Request("わさび", new Date(2019, 6, 7), "スーパー", "a-hongo"));
+        requestlist.add(new Request("ケーキ" , new Date(2019, 6, 6), "ダニエル", "t-sugisawa"));
+        requestlist.add(new Request("からし", new Date(2018, 6, 4), "コンビニ", "n-kande"));
 
         //Add RequestList Table
         AddRequestListTable(requestlist);
@@ -262,7 +263,7 @@
         return true;
     }
 
-    private int ConvertMonth(int i, ArrayList<RequestList> requestList) {
+    private int ConvertMonth(int i, ArrayList<Request> requestList) {
         if(requestList.get(i).getDeadline().getMonth() == 0) {
             return 12;
         } else {
@@ -270,7 +271,7 @@
         }
     }
 
-    private void AddRequestListTable(ArrayList<RequestList> requestList) {
+    private void AddRequestListTable(ArrayList<Request> requestList) {
         Date now = new Date();
         for (int i = 0; i < requestList.size(); i++) {
             TableRow tableRow = new TableRow(this);
@@ -328,29 +329,29 @@
         }
     }
 
-    private ArrayList<RequestList> SortProduct() {
-        ArrayList<RequestList> productsortRequestlist =  (ArrayList<RequestList>) requestlist.clone();
+    private ArrayList<Request> SortProduct() {
+        ArrayList<Request> productsortRequestlist =  (ArrayList<Request>) requestlist.clone();
 
         Collections.sort(productsortRequestlist, productSortComparator);
         return productsortRequestlist;
     }
 
-    private ArrayList<RequestList> SortDeadline() {
-        ArrayList<RequestList> deadlinesortRequestlist =  (ArrayList<RequestList>) requestlist.clone();
+    private ArrayList<Request> SortDeadline() {
+        ArrayList<Request> deadlinesortRequestlist =  (ArrayList<Request>) requestlist.clone();
 
         Collections.sort(deadlinesortRequestlist, deadlineSortComparator);
         return deadlinesortRequestlist;
     }
 
-    private ArrayList<RequestList> ReverseDeadline() {
-        ArrayList<RequestList> deadlinesortRequestlist =  (ArrayList<RequestList>) requestlist.clone();
+    private ArrayList<Request> ReverseDeadline() {
+        ArrayList<Request> deadlinesortRequestlist =  (ArrayList<Request>) requestlist.clone();
 
         Collections.sort(deadlinesortRequestlist, deadlineReverseComparator);
         return deadlinesortRequestlist;
     }
 
-    private ArrayList<RequestList> SortLocation() {
-        ArrayList<RequestList> locationsortRequestlist =  (ArrayList<RequestList>) requestlist.clone();
+    private ArrayList<Request> SortLocation() {
+        ArrayList<Request> locationsortRequestlist =  (ArrayList<Request>) requestlist.clone();
 
         Collections.sort(locationsortRequestlist, locationSortComparator);
         return locationsortRequestlist;
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 05bfc17..2cbe6b6 100644
--- a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
@@ -72,7 +72,7 @@
                             Cosmos app = (Cosmos)getApplication();
                             app.setToken(result.token);
 
-                            Intent intent = new Intent(getApplication(), GroupList.class);
+                            Intent intent = new Intent(getApplication(), GroupListActivity.class);
                             startActivity(intent);
                             Toast.makeText(SigninActivity.this,
                                     "ログインしました", Toast.LENGTH_SHORT).show();
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 ec129b1..e130633 100644
--- a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
@@ -85,7 +85,7 @@
                             Cosmos app = (Cosmos)getApplication();
                             app.setToken(result.token);
 
-                            Intent intent = new Intent(getApplication(), GroupList.class);
+                            Intent intent = new Intent(getApplication(), GroupListActivity.class);
 
                             //test
 //                            System.out.println(result.uId);
diff --git a/app/src/main/res/layout/app_bar_group_list.xml b/app/src/main/res/layout/app_bar_group_list.xml
index 2cecaa1..a992778 100644
--- a/app/src/main/res/layout/app_bar_group_list.xml
+++ b/app/src/main/res/layout/app_bar_group_list.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".views.GroupList">
+    tools:context=".views.GroupListActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/content_group_list.xml b/app/src/main/res/layout/content_group_list.xml
index f5435db..44667b0 100644
--- a/app/src/main/res/layout/content_group_list.xml
+++ b/app/src/main/res/layout/content_group_list.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context=".views.GroupList"
+    tools:context=".views.GroupListActivity"
     tools:showIn="@layout/app_bar_group_list">
 
     <GridView