diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 50b7942..397d855 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".activity.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/kotlin/jackall/moncalc/MainActivity.kt b/app/src/main/kotlin/jackall/moncalc/MainActivity.kt
deleted file mode 100644
index a811093..0000000
--- a/app/src/main/kotlin/jackall/moncalc/MainActivity.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package jackall.moncalc
-
-import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-
-class MainActivity : AppCompatActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-    }
-}
diff --git a/app/src/main/kotlin/jackall/moncalc/activity/MainActivity.kt b/app/src/main/kotlin/jackall/moncalc/activity/MainActivity.kt
new file mode 100644
index 0000000..ad79a60
--- /dev/null
+++ b/app/src/main/kotlin/jackall/moncalc/activity/MainActivity.kt
@@ -0,0 +1,13 @@
+package jackall.moncalc.activity
+
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+import jackall.moncalc.R
+
+class MainActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2b8614d..334fc21 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="jackall.moncalc.MainActivity">
+    tools:context="jackall.moncalc.activity.MainActivity">
 
     <TextView
         android:layout_width="wrap_content"