diff --git a/app/build.gradle b/app/build.gradle
index e3730acc..71800eae 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,7 @@ android {
     compileSdkVersion 29
     buildToolsVersion "29.0.0"
     defaultConfig {
-        applicationId "emu.lightswitch.lightswitch"
+        applicationId "lightswitch.emu"
         minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1dece4ef..284ef0fb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
-          package="emu.lightswitch.lightswitch">
+          package="emu.lightswitch">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_INTERNAL_STORAGE"/>
@@ -19,7 +19,7 @@
                   android:parentActivityName=".MainActivity">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
-                    android:value="emu.lightswitch.lightswitch.MainActivity"/>
+                    android:value="emu.lightswitch.MainActivity"/>
         </activity>
         <activity
                 android:name=".SettingsActivity"
@@ -27,7 +27,7 @@
                 android:parentActivityName=".MainActivity">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
-                    android:value="emu.lightswitch.lightswitch.MainActivity"/>
+                    android:value="emu.lightswitch.MainActivity"/>
         </activity>
         <activity android:name=".MainActivity">
             <intent-filter>
diff --git a/app/src/main/java/emu/lightswitch/lightswitch/GameAdapter.java b/app/src/main/java/emu/lightswitch/GameAdapter.java
similarity index 99%
rename from app/src/main/java/emu/lightswitch/lightswitch/GameAdapter.java
rename to app/src/main/java/emu/lightswitch/GameAdapter.java
index 6725756d..edb1b9c6 100644
--- a/app/src/main/java/emu/lightswitch/lightswitch/GameAdapter.java
+++ b/app/src/main/java/emu/lightswitch/GameAdapter.java
@@ -1,4 +1,4 @@
-package emu.lightswitch.lightswitch;
+package emu.lightswitch;
 
 import android.app.Dialog;
 import android.content.Context;
diff --git a/app/src/main/java/emu/lightswitch/lightswitch/HeaderAdapter.java b/app/src/main/java/emu/lightswitch/HeaderAdapter.java
similarity index 99%
rename from app/src/main/java/emu/lightswitch/lightswitch/HeaderAdapter.java
rename to app/src/main/java/emu/lightswitch/HeaderAdapter.java
index 35e0d169..0f522f85 100644
--- a/app/src/main/java/emu/lightswitch/lightswitch/HeaderAdapter.java
+++ b/app/src/main/java/emu/lightswitch/HeaderAdapter.java
@@ -1,4 +1,4 @@
-package emu.lightswitch.lightswitch;
+package emu.lightswitch;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
diff --git a/app/src/main/java/emu/lightswitch/lightswitch/LogActivity.java b/app/src/main/java/emu/lightswitch/LogActivity.java
similarity index 99%
rename from app/src/main/java/emu/lightswitch/lightswitch/LogActivity.java
rename to app/src/main/java/emu/lightswitch/LogActivity.java
index 775c6375..bd2a0d02 100644
--- a/app/src/main/java/emu/lightswitch/lightswitch/LogActivity.java
+++ b/app/src/main/java/emu/lightswitch/LogActivity.java
@@ -1,4 +1,4 @@
-package emu.lightswitch.lightswitch;
+package emu.lightswitch;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
diff --git a/app/src/main/java/emu/lightswitch/lightswitch/LogAdapter.java b/app/src/main/java/emu/lightswitch/LogAdapter.java
similarity index 99%
rename from app/src/main/java/emu/lightswitch/lightswitch/LogAdapter.java
rename to app/src/main/java/emu/lightswitch/LogAdapter.java
index f85cefbb..638cf209 100644
--- a/app/src/main/java/emu/lightswitch/lightswitch/LogAdapter.java
+++ b/app/src/main/java/emu/lightswitch/LogAdapter.java
@@ -1,4 +1,4 @@
-package emu.lightswitch.lightswitch;
+package emu.lightswitch;
 
 import android.content.ClipData;
 import android.content.ClipboardManager;
diff --git a/app/src/main/java/emu/lightswitch/lightswitch/MainActivity.java b/app/src/main/java/emu/lightswitch/MainActivity.java
similarity index 99%
rename from app/src/main/java/emu/lightswitch/lightswitch/MainActivity.java
rename to app/src/main/java/emu/lightswitch/MainActivity.java
index 6885f137..291a4b20 100644
--- a/app/src/main/java/emu/lightswitch/lightswitch/MainActivity.java
+++ b/app/src/main/java/emu/lightswitch/MainActivity.java
@@ -1,4 +1,4 @@
-package emu.lightswitch.lightswitch;
+package emu.lightswitch;
 
 import android.Manifest;
 import android.content.Intent;
diff --git a/app/src/main/java/emu/lightswitch/lightswitch/NroLoader.java b/app/src/main/java/emu/lightswitch/NroLoader.java
similarity index 98%
rename from app/src/main/java/emu/lightswitch/lightswitch/NroLoader.java
rename to app/src/main/java/emu/lightswitch/NroLoader.java
index 76928472..7b1ce305 100644
--- a/app/src/main/java/emu/lightswitch/lightswitch/NroLoader.java
+++ b/app/src/main/java/emu/lightswitch/NroLoader.java
@@ -1,4 +1,4 @@
-package emu.lightswitch.lightswitch;
+package emu.lightswitch;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
diff --git a/app/src/main/java/emu/lightswitch/lightswitch/SettingsActivity.java b/app/src/main/java/emu/lightswitch/SettingsActivity.java
similarity index 96%
rename from app/src/main/java/emu/lightswitch/lightswitch/SettingsActivity.java
rename to app/src/main/java/emu/lightswitch/SettingsActivity.java
index 12313e6e..50b054ba 100644
--- a/app/src/main/java/emu/lightswitch/lightswitch/SettingsActivity.java
+++ b/app/src/main/java/emu/lightswitch/SettingsActivity.java
@@ -1,4 +1,4 @@
-package emu.lightswitch.lightswitch;
+package emu.lightswitch;
 
 import android.os.Bundle;
 import androidx.appcompat.app.ActionBar;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 27db1002..bb559eae 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">Lightswitch</string>
+    <string name="app_name">LightSwitch</string>
     <!-- Common -->
     <string name="search">Search</string>
     <!-- Toolbar Main -->