diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index eb553d9..d948d2b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Acanthus">
-        <activity android:name=".views.LoginScreenActivity">
+        <activity android:name=".views.Login.LoginScreenActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/Login/LoginScreenActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/Login/LoginScreenActivity.java
new file mode 100644
index 0000000..b3241af
--- /dev/null
+++ b/app/src/main/java/org/ntlab/acanthus_client/views/Login/LoginScreenActivity.java
@@ -0,0 +1,75 @@
+package org.ntlab.acanthus_client.views.Login;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import org.ntlab.acanthus_client.R;
+import org.ntlab.acanthus_client.resources.accounts.LoginRest;
+import org.ntlab.acanthus_client.views.MainActivity;
+import org.ntlab.acanthus_client.views.Main_menu_ui.home.HomeFragment;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+import retrofit2.Retrofit;
+import retrofit2.converter.jackson.JacksonConverterFactory;
+
+//-----------------------------------------------------------------
+// ログイン画面
+public class LoginScreenActivity extends AppCompatActivity {
+    private EditText editNameTextView;
+    private EditText editPasswordTextView;
+    private Button loginButton;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Retrofit retrofit = new Retrofit.Builder()
+                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/")
+                .addConverterFactory(JacksonConverterFactory.create())
+                .build();
+
+        final LoginRest loginRest = retrofit.create(LoginRest.class);
+
+        setContentView(R.layout.activity_login_screen);
+        initView();
+
+        loginButton.setOnClickListener(v -> {
+
+            Call<Boolean> call = loginRest.hasLoginToken("1", "abc0");
+            call.enqueue(new Callback<Boolean>() {
+                @Override
+                public void onResponse(Call<Boolean> call, Response<Boolean> response) {
+                    if (response.isSuccessful()) {
+                        loginButton.setText("success");
+                        Intent intent = new Intent(getApplication(), MainActivity.class);
+                        startActivity(intent);
+                        finish();
+                    } else loginButton.setText("faild");
+                }
+
+                @Override
+                public void onFailure(Call<Boolean> call, Throwable t) {
+                    loginButton.setText("failure");
+                }
+            });
+        });
+
+    }
+
+    //-----------------------------------------------------------------
+    //-----------------------------------------------------------------
+    // 各種Viewの初期化
+    private void initView() {
+        editNameTextView = findViewById(R.id.input_user_name);
+        editPasswordTextView = findViewById(R.id.input_password);
+        loginButton = (Button) findViewById(R.id.login_button);
+    }
+    //-----------------------------------------------------------------
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/LoginScreenActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/LoginScreenActivity.java
deleted file mode 100644
index 118f37a..0000000
--- a/app/src/main/java/org/ntlab/acanthus_client/views/LoginScreenActivity.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.ntlab.acanthus_client.views;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.TextView;
-
-import org.ntlab.acanthus_client.R;
-import org.ntlab.acanthus_client.resources.accounts.LoginRest;
-import org.ntlab.acanthus_client.views.Main_menu_ui.home.HomeFragment;
-
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-import retrofit2.Retrofit;
-import retrofit2.converter.jackson.JacksonConverterFactory;
-
-public class LoginScreenActivity extends AppCompatActivity {
-    private static final String TAG = "LoginActivity";
-    private EditText editNameTextView;
-    private EditText editPasswordTextView;
-    private Button loginButton;
-
-    private void initView() {
-        editNameTextView = findViewById(R.id.input_user_name);
-        editPasswordTextView = findViewById(R.id.input_password);
-        loginButton = (Button) findViewById(R.id.login_button);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Retrofit retrofit = new Retrofit.Builder()
-                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/")
-                .addConverterFactory(JacksonConverterFactory.create())
-                .build();
-
-        final LoginRest loginRest = retrofit.create(LoginRest.class);
-
-        setContentView(R.layout.activity_login_screen);
-        initView();
-
-        loginButton.setOnClickListener(v -> {
-
-            Call<Boolean> call = loginRest.hasLoginToken("1", "abc0");
-            call.enqueue(new Callback<Boolean>() {
-                @Override
-                public void onResponse(Call<Boolean> call, Response<Boolean> response) {
-                    if (response.isSuccessful()) {
-                        loginButton.setText("success");
-                        Intent intent = new Intent(getApplication(), MainActivity.class);
-                        startActivity(intent);
-                        finish();
-                    }
-                    else loginButton.setText("faild");
-                }
-
-                @Override
-                public void onFailure(Call<Boolean> call, Throwable t) {
-                    loginButton.setText("failure");
-                }
-            });
-        });
-
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login_screen.xml b/app/src/main/res/layout/activity_login_screen.xml
index 24c6556..001ad7e 100644
--- a/app/src/main/res/layout/activity_login_screen.xml
+++ b/app/src/main/res/layout/activity_login_screen.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.LoginScreenActivity">
+    tools:context=".views.Login.LoginScreenActivity">
 
     <TextView
         android:id="@+id/txt_name"