diff --git a/app/src/main/java/com/regis/cosnier/emu48/AppCompatPreferenceActivity.java b/app/src/main/java/org/emulator/forty/eight/AppCompatPreferenceActivity.java
similarity index 95%
rename from app/src/main/java/com/regis/cosnier/emu48/AppCompatPreferenceActivity.java
rename to app/src/main/java/org/emulator/forty/eight/AppCompatPreferenceActivity.java
index e997e3f..ee7eb4c 100644
--- a/app/src/main/java/com/regis/cosnier/emu48/AppCompatPreferenceActivity.java
+++ b/app/src/main/java/org/emulator/forty/eight/AppCompatPreferenceActivity.java
@@ -1,4 +1,4 @@
-package com.regis.cosnier.emu48;
+package org.emulator.forty.eight;
 
 import android.content.res.Configuration;
 import android.os.Bundle;
diff --git a/app/src/main/java/com/regis/cosnier/emu48/InfoActivity.java b/app/src/main/java/org/emulator/forty/eight/InfoActivity.java
similarity index 94%
rename from app/src/main/java/com/regis/cosnier/emu48/InfoActivity.java
rename to app/src/main/java/org/emulator/forty/eight/InfoActivity.java
index d543b90..30a0ba1 100644
--- a/app/src/main/java/com/regis/cosnier/emu48/InfoActivity.java
+++ b/app/src/main/java/org/emulator/forty/eight/InfoActivity.java
@@ -1,4 +1,4 @@
-package com.regis.cosnier.emu48;
+package org.emulator.forty.eight;
 
 import android.app.ActionBar;
 import android.app.Activity;
@@ -9,6 +9,8 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.TextView;
 
+import org.emulator.forty.eight.R;
+
 import java.io.IOException;
 import java.io.InputStream;
 
diff --git a/app/src/main/java/com/regis/cosnier/emu48/InfoWebActivity.java b/app/src/main/java/org/emulator/forty/eight/InfoWebActivity.java
similarity index 91%
rename from app/src/main/java/com/regis/cosnier/emu48/InfoWebActivity.java
rename to app/src/main/java/org/emulator/forty/eight/InfoWebActivity.java
index 3cbfe2b..7903346 100644
--- a/app/src/main/java/com/regis/cosnier/emu48/InfoWebActivity.java
+++ b/app/src/main/java/org/emulator/forty/eight/InfoWebActivity.java
@@ -1,13 +1,13 @@
-package com.regis.cosnier.emu48;
+package org.emulator.forty.eight;
 
 import android.app.Activity;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
 import android.webkit.WebView;
 
+import org.emulator.forty.eight.R;
+
 public class InfoWebActivity extends Activity {
 
 	@Override
diff --git a/app/src/main/java/com/regis/cosnier/emu48/MainActivity.java b/app/src/main/java/org/emulator/forty/eight/MainActivity.java
similarity index 96%
rename from app/src/main/java/com/regis/cosnier/emu48/MainActivity.java
rename to app/src/main/java/org/emulator/forty/eight/MainActivity.java
index 7dbe764..eaeaf57 100644
--- a/app/src/main/java/com/regis/cosnier/emu48/MainActivity.java
+++ b/app/src/main/java/org/emulator/forty/eight/MainActivity.java
@@ -1,7 +1,6 @@
-package com.regis.cosnier.emu48;
+package org.emulator.forty.eight;
 
 import android.Manifest;
-import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.ClipData;
 import android.content.ClipboardManager;
@@ -16,10 +15,8 @@ import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Environment;
 import android.os.ParcelFileDescriptor;
 import android.preference.PreferenceManager;
-import android.provider.MediaStore;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -27,25 +24,21 @@ import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import android.widget.Toast;
 
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.navigation.NavigationView;
 import com.google.android.material.snackbar.Snackbar;
+import org.emulator.forty.eight.R;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
-import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Locale;
diff --git a/app/src/main/java/com/regis/cosnier/emu48/MainScreenView.java b/app/src/main/java/org/emulator/forty/eight/MainScreenView.java
similarity index 97%
rename from app/src/main/java/com/regis/cosnier/emu48/MainScreenView.java
rename to app/src/main/java/org/emulator/forty/eight/MainScreenView.java
index 72a9cca..25e67ad 100644
--- a/app/src/main/java/com/regis/cosnier/emu48/MainScreenView.java
+++ b/app/src/main/java/org/emulator/forty/eight/MainScreenView.java
@@ -1,9 +1,8 @@
-package com.regis.cosnier.emu48;
+package org.emulator.forty.eight;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
-import android.content.res.AssetManager;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
diff --git a/app/src/main/java/com/regis/cosnier/emu48/NativeLib.java b/app/src/main/java/org/emulator/forty/eight/NativeLib.java
similarity index 91%
rename from app/src/main/java/com/regis/cosnier/emu48/NativeLib.java
rename to app/src/main/java/org/emulator/forty/eight/NativeLib.java
index d6f4492..998c823 100644
--- a/app/src/main/java/com/regis/cosnier/emu48/NativeLib.java
+++ b/app/src/main/java/org/emulator/forty/eight/NativeLib.java
@@ -1,10 +1,7 @@
-package com.regis.cosnier.emu48;
+package org.emulator.forty.eight;
 
 import android.content.res.AssetManager;
 import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.os.ParcelFileDescriptor;
-import android.view.View;
 
 public class NativeLib {
 
diff --git a/app/src/main/java/com/regis/cosnier/emu48/SeekBarPreference.java b/app/src/main/java/org/emulator/forty/eight/SeekBarPreference.java
similarity index 96%
rename from app/src/main/java/com/regis/cosnier/emu48/SeekBarPreference.java
rename to app/src/main/java/org/emulator/forty/eight/SeekBarPreference.java
index 6ab5ab0..3f852da 100644
--- a/app/src/main/java/com/regis/cosnier/emu48/SeekBarPreference.java
+++ b/app/src/main/java/org/emulator/forty/eight/SeekBarPreference.java
@@ -1,4 +1,4 @@
-package com.regis.cosnier.emu48;
+package org.emulator.forty.eight;
 
 import android.content.Context;
 import android.content.DialogInterface;
diff --git a/app/src/main/java/com/regis/cosnier/emu48/SettingsActivity.java b/app/src/main/java/org/emulator/forty/eight/SettingsActivity.java
similarity index 97%
rename from app/src/main/java/com/regis/cosnier/emu48/SettingsActivity.java
rename to app/src/main/java/org/emulator/forty/eight/SettingsActivity.java
index ddcd23a..adb1bfb 100644
--- a/app/src/main/java/com/regis/cosnier/emu48/SettingsActivity.java
+++ b/app/src/main/java/org/emulator/forty/eight/SettingsActivity.java
@@ -1,4 +1,4 @@
-package com.regis.cosnier.emu48;
+package org.emulator.forty.eight;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -18,6 +18,8 @@ import android.preference.PreferenceManager;
 import android.provider.OpenableColumns;
 import android.view.MenuItem;
 
+import org.emulator.forty.eight.R;
+
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.core.app.NavUtils;