android: Rename app package from citra_android to citra_emu.

- There is already a conflicting name on the Play Store.

src/android/app/build.gradle

@@ -28,7 +28,7 @@ android {
 
     defaultConfig {
         // TODO If this is ever modified, change application_id in strings.xml
-        applicationId "org.citra.citra_android"
+        applicationId "org.citra.citra_emu"
         minSdkVersion 21
         targetSdkVersion 28
         versionCode autoVersion

src/android/app/src/androidTest/java/org/citra/citra_emu/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android;
+package org.citra.citra_emu;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("org.citra.citra_android", appContext.getPackageName());
+        assertEquals("org.citra.citra_emu", appContext.getPackageName());
     }
 }

src/android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.citra.citra_android">
+    package="org.citra.citra_emu">
     <uses-feature
         android:name="android.hardware.touchscreen"
         android:required="false"/>
@@ -19,7 +19,7 @@
 
 
     <application
-        android:name=".CitraApplication"
+        android:name="org.citra.citra_emu.CitraApplication"
         android:label="@string/app_name"
         android:icon="@mipmap/ic_launcher"
         android:allowBackup="true"
@@ -30,7 +30,7 @@
         <meta-data android:name="android.max_aspect" android:value="2.1" />
 
         <activity
-            android:name=".ui.main.MainActivity"
+            android:name="org.citra.citra_emu.ui.main.MainActivity"
             android:theme="@style/Citra">
 
             <!-- This intentfilter marks this Activity as the one that gets launched from Home screen. -->
@@ -42,7 +42,7 @@
         </activity>
 
         <activity
-            android:name=".ui.main.TvMainActivity"
+            android:name="org.citra.citra_emu.ui.main.TvMainActivity"
             android:theme="@style/CitraTv">
 
             <!-- This intentfilter marks this Activity as the one that gets launched from Home screen. -->
@@ -54,17 +54,17 @@
         </activity>
 
         <activity
-            android:name=".ui.settings.SettingsActivity"
+            android:name="org.citra.citra_emu.ui.settings.SettingsActivity"
             android:theme="@style/CitraSettings"
             android:label="@string/preferences_settings"/>
 
         <activity
-            android:name=".activities.EmulationActivity"
+            android:name="org.citra.citra_emu.activities.EmulationActivity"
             android:theme="@style/CitraEmulation"
             android:launchMode="singleTop"/>
 
         <activity
-            android:name=".activities.CustomFilePickerActivity"
+            android:name="org.citra.citra_emu.activities.CustomFilePickerActivity"
             android:label="@string/app_name"
             android:theme="@style/FilePickerTheme">
             <intent-filter>
@@ -73,10 +73,10 @@
             </intent-filter>
         </activity>
 
-        <service android:name=".services.DirectoryInitializationService"/>
+        <service android:name="org.citra.citra_emu.services.DirectoryInitializationService"/>
 
         <provider
-            android:name=".model.GameProvider"
+            android:name="org.citra.citra_emu.model.GameProvider"
             android:authorities="${applicationId}.provider"
             android:enabled="true"
             android:exported="false">

src/android/app/src/main/java/org/citra/citra_android/ui/input/gamecube/ControllerFragment.java

@@ -1,5 +0,0 @@
-package org.citra.citra_android.ui.input.gamecube;
-
-
-public class ControllerFragment {
-}

src/android/app/src/main/java/org/citra/citra_android/ui/input/gamecube/ControllerFragmentPresenter.java

@@ -1,5 +0,0 @@
-package org.citra.citra_android.ui.input.gamecube;
-
-
-public class ControllerFragmentPresenter {
-}

src/android/app/src/main/java/org/citra/citra_android/ui/input/gamecube/ControllerFragmentView.java

@@ -1,5 +0,0 @@
-package org.citra.citra_android.ui.input.gamecube;
-
-
-public interface ControllerFragmentView {
-}

src/android/app/src/main/java/org/citra/citra_emu/CitraApplication.java

@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-package org.citra.citra_android;
+package org.citra.citra_emu;
 
 import android.app.Application;
 import android.app.NotificationChannel;
@@ -10,9 +10,9 @@ import android.app.NotificationManager;
 import android.content.Context;
 import android.os.Build;
 
-import org.citra.citra_android.model.GameDatabase;
+import org.citra.citra_emu.model.GameDatabase;
-import org.citra.citra_android.services.DirectoryInitializationService;
+import org.citra.citra_emu.services.DirectoryInitializationService;
-import org.citra.citra_android.utils.PermissionsHandler;
+import org.citra.citra_emu.utils.PermissionsHandler;
 
 public class CitraApplication extends Application {
     public static GameDatabase databaseHelper;

src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.java

@@ -4,7 +4,7 @@
  * Refer to the license.txt file included.
  */
 
-package org.citra.citra_android;
+package org.citra.citra_emu;
 
 import android.app.AlertDialog;
 import android.content.res.Configuration;
@@ -16,9 +16,9 @@ import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import org.citra.citra_android.activities.EmulationActivity;
+import org.citra.citra_emu.activities.EmulationActivity;
-import org.citra.citra_android.utils.EmulationMenuSettings;
+import org.citra.citra_emu.utils.EmulationMenuSettings;
-import org.citra.citra_android.utils.Log;
+import org.citra.citra_emu.utils.Log;
 
 import java.lang.ref.WeakReference;
 

src/android/app/src/main/java/org/citra/citra_emu/activities/CustomFilePickerActivity.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.activities;
+package org.citra.citra_emu.activities;
 
 import android.content.Intent;
 import android.os.Environment;
@@ -7,7 +7,7 @@ import android.support.annotation.Nullable;
 import com.nononsenseapps.filepicker.AbstractFilePickerFragment;
 import com.nononsenseapps.filepicker.FilePickerActivity;
 
-import org.citra.citra_android.fragments.CustomFilePickerFragment;
+import org.citra.citra_emu.fragments.CustomFilePickerFragment;
 
 import java.io.File;
 

src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.activities;
+package org.citra.citra_emu.activities;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -32,15 +32,15 @@ import android.widget.TextView;
 import com.squareup.picasso.Callback;
 import com.squareup.picasso.Picasso;
 
-import org.citra.citra_android.NativeLibrary;
+import org.citra.citra_emu.NativeLibrary;
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.fragments.EmulationFragment;
+import org.citra.citra_emu.fragments.EmulationFragment;
-import org.citra.citra_android.fragments.MenuFragment;
+import org.citra.citra_emu.fragments.MenuFragment;
-import org.citra.citra_android.model.settings.view.InputBindingSetting;
+import org.citra.citra_emu.model.settings.view.InputBindingSetting;
-import org.citra.citra_android.ui.main.MainPresenter;
+import org.citra.citra_emu.ui.main.MainPresenter;
-import org.citra.citra_android.utils.Animations;
+import org.citra.citra_emu.utils.Animations;
-import org.citra.citra_android.utils.ControllerMappingHelper;
+import org.citra.citra_emu.utils.ControllerMappingHelper;
-import org.citra.citra_android.utils.EmulationMenuSettings;
+import org.citra.citra_emu.utils.EmulationMenuSettings;
 
 import java.lang.annotation.Retention;
 import java.util.List;

src/android/app/src/main/java/org/citra/citra_emu/adapters/GameAdapter.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.adapters;
+package org.citra.citra_emu.adapters;
 
 import android.database.Cursor;
 import android.database.DataSetObserver;
@@ -15,12 +15,12 @@ import android.view.ViewGroup;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.activities.EmulationActivity;
+import org.citra.citra_emu.activities.EmulationActivity;
-import org.citra.citra_android.model.GameDatabase;
+import org.citra.citra_emu.model.GameDatabase;
-import org.citra.citra_android.utils.Log;
+import org.citra.citra_emu.utils.Log;
-import org.citra.citra_android.utils.PicassoUtils;
+import org.citra.citra_emu.utils.PicassoUtils;
-import org.citra.citra_android.viewholders.GameViewHolder;
+import org.citra.citra_emu.viewholders.GameViewHolder;
 
 /**
  * This adapter gets its information from a database Cursor. This fact, paired with the usage of

src/android/app/src/main/java/org/citra/citra_emu/adapters/GameRowPresenter.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.adapters;
+package org.citra.citra_emu.adapters;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -8,10 +8,10 @@ import android.support.v4.content.ContextCompat;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.model.Game;
+import org.citra.citra_emu.model.Game;
-import org.citra.citra_android.utils.PicassoUtils;
+import org.citra.citra_emu.utils.PicassoUtils;
-import org.citra.citra_android.viewholders.TvGameViewHolder;
+import org.citra.citra_emu.viewholders.TvGameViewHolder;
 
 /**
  * The Leanback library / docs call this a Presenter, but it works very

src/android/app/src/main/java/org/citra/citra_emu/adapters/SettingsRowPresenter.java

@@ -1,12 +1,12 @@
-package org.citra.citra_android.adapters;
+package org.citra.citra_emu.adapters;
 
 import android.content.res.Resources;
 import android.support.v17.leanback.widget.ImageCardView;
 import android.support.v17.leanback.widget.Presenter;
 import android.view.ViewGroup;
 
-import org.citra.citra_android.model.TvSettingsItem;
+import org.citra.citra_emu.model.TvSettingsItem;
-import org.citra.citra_android.viewholders.TvSettingsViewHolder;
+import org.citra.citra_emu.viewholders.TvSettingsViewHolder;
 
 public final class SettingsRowPresenter extends Presenter {
     public Presenter.ViewHolder onCreateViewHolder(ViewGroup parent) {

src/android/app/src/main/java/org/citra/citra_emu/dialogs/GameDetailsDialog.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.dialogs;
+package org.citra.citra_emu.dialogs;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -11,8 +11,8 @@ import android.widget.TextView;
 
 import com.squareup.picasso.Picasso;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.activities.EmulationActivity;
+import org.citra.citra_emu.activities.EmulationActivity;
 
 import de.hdodenhof.circleimageview.CircleImageView;
 

src/android/app/src/main/java/org/citra/citra_emu/dialogs/MotionAlertDialog.java

@@ -1,17 +1,13 @@
-package org.citra.citra_android.dialogs;
+package org.citra.citra_emu.dialogs;
 
 import android.app.AlertDialog;
 import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Vibrator;
-import android.preference.PreferenceManager;
 import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 
-import org.citra.citra_android.model.settings.view.InputBindingSetting;
+import org.citra.citra_emu.model.settings.view.InputBindingSetting;
-import org.citra.citra_android.utils.ControllerMappingHelper;
+import org.citra.citra_emu.utils.Log;
-import org.citra.citra_android.utils.Log;
 
 import java.util.ArrayList;
 import java.util.List;

src/android/app/src/main/java/org/citra/citra_emu/fragments/CustomFilePickerFragment.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.fragments;
+package org.citra.citra_emu.fragments;
 
 import android.net.Uri;
 import android.support.annotation.NonNull;
@@ -11,7 +11,7 @@ import android.widget.TextView;
 
 import com.nononsenseapps.filepicker.FilePickerFragment;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
 
 import java.io.File;
 

src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.fragments;
+package org.citra.citra_emu.fragments;
 
 import android.content.Context;
 import android.content.IntentFilter;
@@ -18,15 +18,15 @@ import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.citra.citra_android.NativeLibrary;
+import org.citra.citra_emu.NativeLibrary;
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.activities.EmulationActivity;
+import org.citra.citra_emu.activities.EmulationActivity;
-import org.citra.citra_android.overlay.InputOverlay;
+import org.citra.citra_emu.overlay.InputOverlay;
-import org.citra.citra_android.services.DirectoryInitializationService;
+import org.citra.citra_emu.services.DirectoryInitializationService;
-import org.citra.citra_android.services.DirectoryInitializationService.DirectoryInitializationState;
+import org.citra.citra_emu.services.DirectoryInitializationService.DirectoryInitializationState;
-import org.citra.citra_android.utils.DirectoryStateReceiver;
+import org.citra.citra_emu.utils.DirectoryStateReceiver;
-import org.citra.citra_android.utils.EmulationMenuSettings;
+import org.citra.citra_emu.utils.EmulationMenuSettings;
-import org.citra.citra_android.utils.Log;
+import org.citra.citra_emu.utils.Log;
 
 public final class EmulationFragment extends Fragment implements SurfaceHolder.Callback {
     private static final String KEY_GAMEPATH = "gamepath";

src/android/app/src/main/java/org/citra/citra_emu/fragments/MenuFragment.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.fragments;
+package org.citra.citra_emu.fragments;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -11,8 +11,8 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.activities.EmulationActivity;
+import org.citra.citra_emu.activities.EmulationActivity;
 
 public final class MenuFragment extends Fragment implements View.OnClickListener {
     private static final String KEY_TITLE = "title";

src/android/app/src/main/java/org/citra/citra_emu/model/Game.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.model;
+package org.citra.citra_emu.model;
 
 import android.content.ContentValues;
 import android.database.Cursor;

src/android/app/src/main/java/org/citra/citra_emu/model/GameDatabase.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.model;
+package org.citra.citra_emu.model;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -6,8 +6,8 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
-import org.citra.citra_android.NativeLibrary;
+import org.citra.citra_emu.NativeLibrary;
-import org.citra.citra_android.utils.Log;
+import org.citra.citra_emu.utils.Log;
 
 import java.io.File;
 import java.util.Arrays;

src/android/app/src/main/java/org/citra/citra_emu/model/GameProvider.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.model;
+package org.citra.citra_emu.model;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
@@ -7,8 +7,8 @@ import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 import android.support.annotation.NonNull;
 
-import org.citra.citra_android.BuildConfig;
+import org.citra.citra_emu.BuildConfig;
-import org.citra.citra_android.utils.Log;
+import org.citra.citra_emu.utils.Log;
 
 /**
  * Provides an interface allowing Activities to interact with the SQLite database.

src/android/app/src/main/java/org/citra/citra_emu/model/TvSettingsItem.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.model;
+package org.citra.citra_emu.model;
 
 public final class TvSettingsItem {
     private final int mItemId;

src/android/app/src/main/java/org/citra/citra_emu/model/settings/BooleanSetting.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.model.settings;
+package org.citra.citra_emu.model.settings;
 
 public final class BooleanSetting extends Setting {
     private boolean mValue;

src/android/app/src/main/java/org/citra/citra_emu/model/settings/FloatSetting.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.model.settings;
+package org.citra.citra_emu.model.settings;
 
 public final class FloatSetting extends Setting {
     private float mValue;

src/android/app/src/main/java/org/citra/citra_emu/model/settings/IntSetting.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.model.settings;
+package org.citra.citra_emu.model.settings;
 
 public final class IntSetting extends Setting {
     private int mValue;

src/android/app/src/main/java/org/citra/citra_emu/model/settings/Setting.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.model.settings;
+package org.citra.citra_emu.model.settings;
 
 /**
  * Abstraction for a setting item as read from / written to Dolphin's configuration ini files.

src/android/app/src/main/java/org/citra/citra_emu/model/settings/SettingSection.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.model.settings;
+package org.citra.citra_emu.model.settings;
 
 import java.util.HashMap;
 

src/android/app/src/main/java/org/citra/citra_emu/model/settings/StringSetting.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.model.settings;
+package org.citra.citra_emu.model.settings;
 
 public final class StringSetting extends Setting {
     private String mValue;

src/android/app/src/main/java/org/citra/citra_emu/model/settings/view/CheckBoxSetting.java

@@ -1,8 +1,8 @@
-package org.citra.citra_android.model.settings.view;
+package org.citra.citra_emu.model.settings.view;
 
-import org.citra.citra_android.model.settings.IntSetting;
+import org.citra.citra_emu.model.settings.IntSetting;
-import org.citra.citra_android.model.settings.Setting;
+import org.citra.citra_emu.model.settings.Setting;
-import org.citra.citra_android.ui.settings.SettingsFragmentView;
+import org.citra.citra_emu.ui.settings.SettingsFragmentView;
 
 public final class CheckBoxSetting extends SettingsItem {
     private boolean mDefaultValue;

src/android/app/src/main/java/org/citra/citra_emu/model/settings/view/DateTimeSetting.java

@@ -1,7 +1,7 @@
-package org.citra.citra_android.model.settings.view;
+package org.citra.citra_emu.model.settings.view;
 
-import org.citra.citra_android.model.settings.Setting;
+import org.citra.citra_emu.model.settings.Setting;
-import org.citra.citra_android.model.settings.StringSetting;
+import org.citra.citra_emu.model.settings.StringSetting;
 
 public final class DateTimeSetting extends SettingsItem {
     private String mDefaultValue;

src/android/app/src/main/java/org/citra/citra_emu/model/settings/view/HeaderSetting.java

@@ -1,6 +1,6 @@
-package org.citra.citra_android.model.settings.view;
+package org.citra.citra_emu.model.settings.view;
 
-import org.citra.citra_android.model.settings.Setting;
+import org.citra.citra_emu.model.settings.Setting;
 
 public final class HeaderSetting extends SettingsItem {
     public HeaderSetting(String key, Setting setting, int titleId, int descriptionId) {

src/android/app/src/main/java/org/citra/citra_emu/model/settings/view/InputBindingSetting.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.model.settings.view;
+package org.citra.citra_emu.model.settings.view;
 
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
@@ -6,12 +6,12 @@ import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.widget.Toast;
 
-import org.citra.citra_android.NativeLibrary;
+import org.citra.citra_emu.NativeLibrary;
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.CitraApplication;
+import org.citra.citra_emu.CitraApplication;
-import org.citra.citra_android.model.settings.Setting;
+import org.citra.citra_emu.model.settings.Setting;
-import org.citra.citra_android.model.settings.StringSetting;
+import org.citra.citra_emu.model.settings.StringSetting;
-import org.citra.citra_android.utils.SettingsFile;
+import org.citra.citra_emu.utils.SettingsFile;
 
 public final class InputBindingSetting extends SettingsItem {
     private static final String INPUT_MAPPING_PREFIX = "InputMapping";

src/android/app/src/main/java/org/citra/citra_emu/model/settings/view/SettingsItem.java

@@ -1,6 +1,6 @@
-package org.citra.citra_android.model.settings.view;
+package org.citra.citra_emu.model.settings.view;
 
-import org.citra.citra_android.model.settings.Setting;
+import org.citra.citra_emu.model.settings.Setting;
 
 /**
  * ViewModel abstraction for an Item in the RecyclerView powering SettingsFragments.
@@ -97,7 +97,7 @@ public abstract class SettingsItem {
     }
 
     /**
-     * Used by {@link org.citra.citra_android.ui.settings.SettingsAdapter}'s onCreateViewHolder()
+     * Used by {@link org.citra.citra_emu.ui.settings.SettingsAdapter}'s onCreateViewHolder()
      * method to determine which type of ViewHolder should be created.
      *
      * @return An integer (ideally, one of the constants defined in this file)

src/android/app/src/main/java/org/citra/citra_emu/model/settings/view/SingleChoiceSetting.java

@@ -1,7 +1,7 @@
-package org.citra.citra_android.model.settings.view;
+package org.citra.citra_emu.model.settings.view;
 
-import org.citra.citra_android.model.settings.IntSetting;
+import org.citra.citra_emu.model.settings.IntSetting;
-import org.citra.citra_android.model.settings.Setting;
+import org.citra.citra_emu.model.settings.Setting;
 
 public final class SingleChoiceSetting extends SettingsItem {
     private int mDefaultValue;

src/android/app/src/main/java/org/citra/citra_emu/model/settings/view/SliderSetting.java

@@ -1,10 +1,10 @@
-package org.citra.citra_android.model.settings.view;
+package org.citra.citra_emu.model.settings.view;
 
-import org.citra.citra_android.model.settings.FloatSetting;
+import org.citra.citra_emu.model.settings.FloatSetting;
-import org.citra.citra_android.model.settings.IntSetting;
+import org.citra.citra_emu.model.settings.IntSetting;
-import org.citra.citra_android.model.settings.Setting;
+import org.citra.citra_emu.model.settings.Setting;
-import org.citra.citra_android.utils.Log;
+import org.citra.citra_emu.utils.Log;
-import org.citra.citra_android.utils.SettingsFile;
+import org.citra.citra_emu.utils.SettingsFile;
 
 public final class SliderSetting extends SettingsItem {
     private int mMin;

src/android/app/src/main/java/org/citra/citra_emu/model/settings/view/SubmenuSetting.java

@@ -1,6 +1,6 @@
-package org.citra.citra_android.model.settings.view;
+package org.citra.citra_emu.model.settings.view;
 
-import org.citra.citra_android.model.settings.Setting;
+import org.citra.citra_emu.model.settings.Setting;
 
 public final class SubmenuSetting extends SettingsItem {
     private String mMenuKey;

src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.java

@@ -4,7 +4,7 @@
  * Refer to the license.txt file included.
  */
 
-package org.citra.citra_android.overlay;
+package org.citra.citra_emu.overlay;
 
 import android.app.Activity;
 import android.content.Context;
@@ -25,11 +25,11 @@ import android.view.SurfaceView;
 import android.view.View;
 import android.view.View.OnTouchListener;
 
-import org.citra.citra_android.NativeLibrary;
+import org.citra.citra_emu.NativeLibrary;
-import org.citra.citra_android.NativeLibrary.ButtonState;
+import org.citra.citra_emu.NativeLibrary.ButtonState;
-import org.citra.citra_android.NativeLibrary.ButtonType;
+import org.citra.citra_emu.NativeLibrary.ButtonType;
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.utils.EmulationMenuSettings;
+import org.citra.citra_emu.utils.EmulationMenuSettings;
 
 import java.util.HashSet;
 import java.util.Set;

src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableButton.java

@@ -4,7 +4,7 @@
  * Refer to the license.txt file included.
  */
 
-package org.citra.citra_android.overlay;
+package org.citra.citra_emu.overlay;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;

src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableDpad.java

@@ -4,7 +4,7 @@
  * Refer to the license.txt file included.
  */
 
-package org.citra.citra_android.overlay;
+package org.citra.citra_emu.overlay;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;

src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableJoystick.java

@@ -4,7 +4,7 @@
  * Refer to the license.txt file included.
  */
 
-package org.citra.citra_android.overlay;
+package org.citra.citra_emu.overlay;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -13,7 +13,7 @@ import android.graphics.Rect;
 import android.graphics.drawable.BitmapDrawable;
 import android.view.MotionEvent;
 
-import org.citra.citra_android.NativeLibrary.ButtonType;
+import org.citra.citra_emu.NativeLibrary.ButtonType;
 
 /**
  * Custom {@link BitmapDrawable} that is capable

src/android/app/src/main/java/org/citra/citra_emu/services/DirectoryInitializationService.java

@@ -4,7 +4,7 @@
  * Refer to the license.txt file included.
  */
 
-package org.citra.citra_android.services;
+package org.citra.citra_emu.services;
 
 import android.app.IntentService;
 import android.content.Context;
@@ -14,9 +14,9 @@ import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.support.v4.content.LocalBroadcastManager;
 
-import org.citra.citra_android.NativeLibrary;
+import org.citra.citra_emu.NativeLibrary;
-import org.citra.citra_android.utils.Log;
+import org.citra.citra_emu.utils.Log;
-import org.citra.citra_android.utils.PermissionsHandler;
+import org.citra.citra_emu.utils.PermissionsHandler;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  * from the Dolphin APK to the external file system.
  */
 public final class DirectoryInitializationService extends IntentService {
-    public static final String BROADCAST_ACTION = "org.citra.citra_android.BROADCAST";
+    public static final String BROADCAST_ACTION = "org.citra.citra_emu.BROADCAST";
 
     public static final String EXTRA_STATE = "directoryState";
     private static volatile DirectoryInitializationState directoryState = null;

src/android/app/src/main/java/org/citra/citra_emu/services/USBPermService.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.services;
+package org.citra.citra_emu.services;
 
 import android.app.IntentService;
 import android.content.Intent;

src/android/app/src/main/java/org/citra/citra_emu/ui/DividerItemDecoration.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.ui;
+package org.citra.citra_emu.ui;
 
 import android.content.Context;
 import android.content.res.TypedArray;

src/android/app/src/main/java/org/citra/citra_emu/ui/NVidiaShieldWorkaroundView.java

@@ -4,7 +4,7 @@
  * Refer to the license.txt file included.
  */
 
-package org.citra.citra_android.ui;
+package org.citra.citra_emu.ui;
 
 import android.content.Context;
 import android.util.AttributeSet;

src/android/app/src/main/java/org/citra/citra_emu/ui/input/gamecube/ControllerFragment.java

@@ -0,0 +1,5 @@
+package org.citra.citra_emu.ui.input.gamecube;
+
+
+public class ControllerFragment {
+}

src/android/app/src/main/java/org/citra/citra_emu/ui/input/gamecube/ControllerFragmentPresenter.java

@@ -0,0 +1,5 @@
+package org.citra.citra_emu.ui.input.gamecube;
+
+
+public class ControllerFragmentPresenter {
+}

src/android/app/src/main/java/org/citra/citra_emu/ui/input/gamecube/ControllerFragmentView.java

@@ -0,0 +1,5 @@
+package org.citra.citra_emu.ui.input.gamecube;
+
+
+public interface ControllerFragmentView {
+}

src/android/app/src/main/java/org/citra/citra_emu/ui/main/CustomTitleView.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.ui.main;
+package org.citra.citra_emu.ui.main;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -9,7 +9,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
 
 public class CustomTitleView extends LinearLayout implements TitleViewAdapter.Provider {
     private final TextView mTitleView;

src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java

@@ -1,11 +1,10 @@
-package org.citra.citra_android.ui.main;
+package org.citra.citra_emu.ui.main;
 
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
@@ -13,17 +12,17 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.Toast;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.activities.EmulationActivity;
+import org.citra.citra_emu.activities.EmulationActivity;
-import org.citra.citra_android.model.GameProvider;
+import org.citra.citra_emu.model.GameProvider;
-import org.citra.citra_android.services.DirectoryInitializationService;
+import org.citra.citra_emu.services.DirectoryInitializationService;
-import org.citra.citra_android.ui.platform.PlatformGamesFragment;
+import org.citra.citra_emu.ui.platform.PlatformGamesFragment;
-import org.citra.citra_android.ui.platform.PlatformGamesView;
+import org.citra.citra_emu.ui.platform.PlatformGamesView;
-import org.citra.citra_android.ui.settings.SettingsActivity;
+import org.citra.citra_emu.ui.settings.SettingsActivity;
-import org.citra.citra_android.utils.AddDirectoryHelper;
+import org.citra.citra_emu.utils.AddDirectoryHelper;
-import org.citra.citra_android.utils.FileBrowserHelper;
+import org.citra.citra_emu.utils.FileBrowserHelper;
-import org.citra.citra_android.utils.PermissionsHandler;
+import org.citra.citra_emu.utils.PermissionsHandler;
-import org.citra.citra_android.utils.StartupHandler;
+import org.citra.citra_emu.utils.StartupHandler;
 
 /**
  * The main Activity of the Lollipop style UI. Manages several PlatformGamesFragments, which

src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainPresenter.java

@@ -1,12 +1,12 @@
-package org.citra.citra_android.ui.main;
+package org.citra.citra_emu.ui.main;
 
 
-import org.citra.citra_android.BuildConfig;
+import org.citra.citra_emu.BuildConfig;
-import org.citra.citra_android.CitraApplication;
+import org.citra.citra_emu.CitraApplication;
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.model.GameDatabase;
+import org.citra.citra_emu.model.GameDatabase;
-import org.citra.citra_android.utils.AddDirectoryHelper;
+import org.citra.citra_emu.utils.AddDirectoryHelper;
-import org.citra.citra_android.utils.SettingsFile;
+import org.citra.citra_emu.utils.SettingsFile;
 
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;

src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainView.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.ui.main;
+package org.citra.citra_emu.ui.main;
 
 import android.database.Cursor;
 

src/android/app/src/main/java/org/citra/citra_emu/ui/main/TvMainActivity.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.ui.main;
+package org.citra.citra_emu.ui.main;
 
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -17,19 +17,19 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.content.ContextCompat;
 import android.widget.Toast;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.activities.EmulationActivity;
+import org.citra.citra_emu.activities.EmulationActivity;
-import org.citra.citra_android.adapters.GameRowPresenter;
+import org.citra.citra_emu.adapters.GameRowPresenter;
-import org.citra.citra_android.adapters.SettingsRowPresenter;
+import org.citra.citra_emu.adapters.SettingsRowPresenter;
-import org.citra.citra_android.model.Game;
+import org.citra.citra_emu.model.Game;
-import org.citra.citra_android.model.TvSettingsItem;
+import org.citra.citra_emu.model.TvSettingsItem;
-import org.citra.citra_android.services.DirectoryInitializationService;
+import org.citra.citra_emu.services.DirectoryInitializationService;
-import org.citra.citra_android.ui.settings.SettingsActivity;
+import org.citra.citra_emu.ui.settings.SettingsActivity;
-import org.citra.citra_android.utils.AddDirectoryHelper;
+import org.citra.citra_emu.utils.AddDirectoryHelper;
-import org.citra.citra_android.utils.FileBrowserHelper;
+import org.citra.citra_emu.utils.FileBrowserHelper;
-import org.citra.citra_android.utils.PermissionsHandler;
+import org.citra.citra_emu.utils.PermissionsHandler;
-import org.citra.citra_android.utils.StartupHandler;
+import org.citra.citra_emu.utils.StartupHandler;
-import org.citra.citra_android.viewholders.TvGameViewHolder;
+import org.citra.citra_emu.viewholders.TvGameViewHolder;
 
 public final class TvMainActivity extends FragmentActivity implements MainView {
     private MainPresenter mPresenter = new MainPresenter(this);

src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesFragment.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.ui.platform;
+package org.citra.citra_emu.ui.platform;
 
 import android.database.Cursor;
 import android.os.Bundle;
@@ -11,10 +11,10 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import org.citra.citra_android.CitraApplication;
+import org.citra.citra_emu.CitraApplication;
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.adapters.GameAdapter;
+import org.citra.citra_emu.adapters.GameAdapter;
-import org.citra.citra_android.model.GameDatabase;
+import org.citra.citra_emu.model.GameDatabase;
 
 public final class PlatformGamesFragment extends Fragment implements PlatformGamesView {
     private PlatformGamesPresenter mPresenter = new PlatformGamesPresenter(this);

src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesPresenter.java

@@ -1,9 +1,9 @@
-package org.citra.citra_android.ui.platform;
+package org.citra.citra_emu.ui.platform;
 
 
-import org.citra.citra_android.CitraApplication;
+import org.citra.citra_emu.CitraApplication;
-import org.citra.citra_android.model.GameDatabase;
+import org.citra.citra_emu.model.GameDatabase;
-import org.citra.citra_android.utils.Log;
+import org.citra.citra_emu.utils.Log;
 
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;

src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesView.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.ui.platform;
+package org.citra.citra_emu.ui.platform;
 
 import android.database.Cursor;
 

src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsActivity.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.ui.settings;
+package org.citra.citra_emu.ui.settings;
 
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -14,10 +14,10 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.Toast;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.model.settings.SettingSection;
+import org.citra.citra_emu.model.settings.SettingSection;
-import org.citra.citra_android.services.DirectoryInitializationService;
+import org.citra.citra_emu.services.DirectoryInitializationService;
-import org.citra.citra_android.utils.DirectoryStateReceiver;
+import org.citra.citra_emu.utils.DirectoryStateReceiver;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsActivityPresenter.java

@@ -1,16 +1,15 @@
-package org.citra.citra_android.ui.settings;
+package org.citra.citra_emu.ui.settings;
 
 import android.content.IntentFilter;
 import android.os.Bundle;
 import android.text.TextUtils;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.model.settings.SettingSection;
-import org.citra.citra_android.model.settings.SettingSection;
+import org.citra.citra_emu.services.DirectoryInitializationService;
-import org.citra.citra_android.services.DirectoryInitializationService;
+import org.citra.citra_emu.services.DirectoryInitializationService.DirectoryInitializationState;
-import org.citra.citra_android.services.DirectoryInitializationService.DirectoryInitializationState;
+import org.citra.citra_emu.utils.DirectoryStateReceiver;
-import org.citra.citra_android.utils.DirectoryStateReceiver;
+import org.citra.citra_emu.utils.Log;
-import org.citra.citra_android.utils.Log;
+import org.citra.citra_emu.utils.SettingsFile;
-import org.citra.citra_android.utils.SettingsFile;
 
 import java.io.File;
 import java.util.ArrayList;

src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsActivityView.java

@@ -1,9 +1,9 @@
-package org.citra.citra_android.ui.settings;
+package org.citra.citra_emu.ui.settings;
 
 import android.content.IntentFilter;
 
-import org.citra.citra_android.model.settings.SettingSection;
+import org.citra.citra_emu.model.settings.SettingSection;
-import org.citra.citra_android.utils.DirectoryStateReceiver;
+import org.citra.citra_emu.utils.DirectoryStateReceiver;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsAdapter.java

@@ -1,9 +1,7 @@
-package org.citra.citra_android.ui.settings;
+package org.citra.citra_emu.ui.settings;
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -14,27 +12,27 @@ import android.widget.TimePicker;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.dialogs.MotionAlertDialog;
+import org.citra.citra_emu.dialogs.MotionAlertDialog;
-import org.citra.citra_android.model.settings.FloatSetting;
+import org.citra.citra_emu.model.settings.FloatSetting;
-import org.citra.citra_android.model.settings.IntSetting;
+import org.citra.citra_emu.model.settings.IntSetting;
-import org.citra.citra_android.model.settings.StringSetting;
+import org.citra.citra_emu.model.settings.StringSetting;
-import org.citra.citra_android.model.settings.view.CheckBoxSetting;
+import org.citra.citra_emu.model.settings.view.CheckBoxSetting;
-import org.citra.citra_android.model.settings.view.DateTimeSetting;
+import org.citra.citra_emu.model.settings.view.DateTimeSetting;
-import org.citra.citra_android.model.settings.view.InputBindingSetting;
+import org.citra.citra_emu.model.settings.view.InputBindingSetting;
-import org.citra.citra_android.model.settings.view.SettingsItem;
+import org.citra.citra_emu.model.settings.view.SettingsItem;
-import org.citra.citra_android.model.settings.view.SingleChoiceSetting;
+import org.citra.citra_emu.model.settings.view.SingleChoiceSetting;
-import org.citra.citra_android.model.settings.view.SliderSetting;
+import org.citra.citra_emu.model.settings.view.SliderSetting;
-import org.citra.citra_android.model.settings.view.SubmenuSetting;
+import org.citra.citra_emu.model.settings.view.SubmenuSetting;
-import org.citra.citra_android.ui.settings.viewholder.CheckBoxSettingViewHolder;
+import org.citra.citra_emu.ui.settings.viewholder.CheckBoxSettingViewHolder;
-import org.citra.citra_android.ui.settings.viewholder.DateTimeViewHolder;
+import org.citra.citra_emu.ui.settings.viewholder.DateTimeViewHolder;
-import org.citra.citra_android.ui.settings.viewholder.HeaderViewHolder;
+import org.citra.citra_emu.ui.settings.viewholder.HeaderViewHolder;
-import org.citra.citra_android.ui.settings.viewholder.InputBindingSettingViewHolder;
+import org.citra.citra_emu.ui.settings.viewholder.InputBindingSettingViewHolder;
-import org.citra.citra_android.ui.settings.viewholder.SettingViewHolder;
+import org.citra.citra_emu.ui.settings.viewholder.SettingViewHolder;
-import org.citra.citra_android.ui.settings.viewholder.SingleChoiceViewHolder;
+import org.citra.citra_emu.ui.settings.viewholder.SingleChoiceViewHolder;
-import org.citra.citra_android.ui.settings.viewholder.SliderViewHolder;
+import org.citra.citra_emu.ui.settings.viewholder.SliderViewHolder;
-import org.citra.citra_android.ui.settings.viewholder.SubmenuViewHolder;
+import org.citra.citra_emu.ui.settings.viewholder.SubmenuViewHolder;
-import org.citra.citra_android.utils.Log;
+import org.citra.citra_emu.utils.Log;
 
 import java.util.ArrayList;
 

src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsFragment.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.ui.settings;
+package org.citra.citra_emu.ui.settings;
 
 import android.app.Activity;
 import android.content.Context;
@@ -11,12 +11,12 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.model.settings.Setting;
+import org.citra.citra_emu.model.settings.Setting;
-import org.citra.citra_android.model.settings.SettingSection;
+import org.citra.citra_emu.model.settings.SettingSection;
-import org.citra.citra_android.model.settings.view.SettingsItem;
+import org.citra.citra_emu.model.settings.view.SettingsItem;
-import org.citra.citra_android.ui.DividerItemDecoration;
+import org.citra.citra_emu.ui.DividerItemDecoration;
-import org.citra.citra_android.utils.SettingsFile;
+import org.citra.citra_emu.utils.SettingsFile;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsFragmentPresenter.java

@@ -1,19 +1,19 @@
-package org.citra.citra_android.ui.settings;
+package org.citra.citra_emu.ui.settings;
 
 import android.text.TextUtils;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.model.settings.Setting;
+import org.citra.citra_emu.model.settings.Setting;
-import org.citra.citra_android.model.settings.SettingSection;
+import org.citra.citra_emu.model.settings.SettingSection;
-import org.citra.citra_android.model.settings.view.CheckBoxSetting;
+import org.citra.citra_emu.model.settings.view.CheckBoxSetting;
-import org.citra.citra_android.model.settings.view.DateTimeSetting;
+import org.citra.citra_emu.model.settings.view.DateTimeSetting;
-import org.citra.citra_android.model.settings.view.HeaderSetting;
+import org.citra.citra_emu.model.settings.view.HeaderSetting;
-import org.citra.citra_android.model.settings.view.InputBindingSetting;
+import org.citra.citra_emu.model.settings.view.InputBindingSetting;
-import org.citra.citra_android.model.settings.view.SettingsItem;
+import org.citra.citra_emu.model.settings.view.SettingsItem;
-import org.citra.citra_android.model.settings.view.SingleChoiceSetting;
+import org.citra.citra_emu.model.settings.view.SingleChoiceSetting;
-import org.citra.citra_android.model.settings.view.SliderSetting;
+import org.citra.citra_emu.model.settings.view.SliderSetting;
-import org.citra.citra_android.model.settings.view.SubmenuSetting;
+import org.citra.citra_emu.model.settings.view.SubmenuSetting;
-import org.citra.citra_android.utils.SettingsFile;
+import org.citra.citra_emu.utils.SettingsFile;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsFragmentView.java

@@ -1,10 +1,10 @@
-package org.citra.citra_android.ui.settings;
+package org.citra.citra_emu.ui.settings;
 
 import android.support.v4.app.FragmentActivity;
 
-import org.citra.citra_android.model.settings.Setting;
+import org.citra.citra_emu.model.settings.Setting;
-import org.citra.citra_android.model.settings.SettingSection;
+import org.citra.citra_emu.model.settings.SettingSection;
-import org.citra.citra_android.model.settings.view.SettingsItem;
+import org.citra.citra_emu.model.settings.view.SettingsItem;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsFrameLayout.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.ui.settings;
+package org.citra.citra_emu.ui.settings;
 
 import android.content.Context;
 import android.util.AttributeSet;

src/android/app/src/main/java/org/citra/citra_emu/ui/settings/viewholder/CheckBoxSettingViewHolder.java

@@ -1,13 +1,13 @@
-package org.citra.citra_android.ui.settings.viewholder;
+package org.citra.citra_emu.ui.settings.viewholder;
 
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.TextView;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.model.settings.view.CheckBoxSetting;
+import org.citra.citra_emu.model.settings.view.CheckBoxSetting;
-import org.citra.citra_android.model.settings.view.SettingsItem;
+import org.citra.citra_emu.model.settings.view.SettingsItem;
-import org.citra.citra_android.ui.settings.SettingsAdapter;
+import org.citra.citra_emu.ui.settings.SettingsAdapter;
 
 public final class CheckBoxSettingViewHolder extends SettingViewHolder {
     private CheckBoxSetting mItem;

src/android/app/src/main/java/org/citra/citra_emu/ui/settings/viewholder/DateTimeViewHolder.java

@@ -1,13 +1,13 @@
-package org.citra.citra_android.ui.settings.viewholder;
+package org.citra.citra_emu.ui.settings.viewholder;
 
 import android.view.View;
 import android.widget.TextView;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.model.settings.view.DateTimeSetting;
+import org.citra.citra_emu.model.settings.view.DateTimeSetting;
-import org.citra.citra_android.model.settings.view.SettingsItem;
+import org.citra.citra_emu.model.settings.view.SettingsItem;
-import org.citra.citra_android.ui.settings.SettingsAdapter;
+import org.citra.citra_emu.ui.settings.SettingsAdapter;
-import org.citra.citra_android.utils.Log;
+import org.citra.citra_emu.utils.Log;
 
 public final class DateTimeViewHolder extends SettingViewHolder {
     private DateTimeSetting mItem;

src/android/app/src/main/java/org/citra/citra_emu/ui/settings/viewholder/HeaderViewHolder.java

@@ -1,11 +1,11 @@
-package org.citra.citra_android.ui.settings.viewholder;
+package org.citra.citra_emu.ui.settings.viewholder;
 
 import android.view.View;
 import android.widget.TextView;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.model.settings.view.SettingsItem;
+import org.citra.citra_emu.model.settings.view.SettingsItem;
-import org.citra.citra_android.ui.settings.SettingsAdapter;
+import org.citra.citra_emu.ui.settings.SettingsAdapter;
 
 public final class HeaderViewHolder extends SettingViewHolder {
     private TextView mHeaderName;

src/android/app/src/main/java/org/citra/citra_emu/ui/settings/viewholder/InputBindingSettingViewHolder.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.ui.settings.viewholder;
+package org.citra.citra_emu.ui.settings.viewholder;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -6,10 +6,10 @@ import android.preference.PreferenceManager;
 import android.view.View;
 import android.widget.TextView;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.model.settings.view.InputBindingSetting;
+import org.citra.citra_emu.model.settings.view.InputBindingSetting;
-import org.citra.citra_android.model.settings.view.SettingsItem;
+import org.citra.citra_emu.model.settings.view.SettingsItem;
-import org.citra.citra_android.ui.settings.SettingsAdapter;
+import org.citra.citra_emu.ui.settings.SettingsAdapter;
 
 public final class InputBindingSettingViewHolder extends SettingViewHolder {
     private InputBindingSetting mItem;

src/android/app/src/main/java/org/citra/citra_emu/ui/settings/viewholder/SettingViewHolder.java

@@ -1,10 +1,10 @@
-package org.citra.citra_android.ui.settings.viewholder;
+package org.citra.citra_emu.ui.settings.viewholder;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
-import org.citra.citra_android.model.settings.view.SettingsItem;
+import org.citra.citra_emu.model.settings.view.SettingsItem;
-import org.citra.citra_android.ui.settings.SettingsAdapter;
+import org.citra.citra_emu.ui.settings.SettingsAdapter;
 
 public abstract class SettingViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
     private SettingsAdapter mAdapter;

src/android/app/src/main/java/org/citra/citra_emu/ui/settings/viewholder/SingleChoiceViewHolder.java

@@ -1,13 +1,13 @@
-package org.citra.citra_android.ui.settings.viewholder;
+package org.citra.citra_emu.ui.settings.viewholder;
 
 import android.content.res.Resources;
 import android.view.View;
 import android.widget.TextView;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.model.settings.view.SettingsItem;
+import org.citra.citra_emu.model.settings.view.SettingsItem;
-import org.citra.citra_android.model.settings.view.SingleChoiceSetting;
+import org.citra.citra_emu.model.settings.view.SingleChoiceSetting;
-import org.citra.citra_android.ui.settings.SettingsAdapter;
+import org.citra.citra_emu.ui.settings.SettingsAdapter;
 
 public final class SingleChoiceViewHolder extends SettingViewHolder {
     private SettingsItem mItem;

src/android/app/src/main/java/org/citra/citra_emu/ui/settings/viewholder/SliderViewHolder.java

@@ -1,12 +1,12 @@
-package org.citra.citra_android.ui.settings.viewholder;
+package org.citra.citra_emu.ui.settings.viewholder;
 
 import android.view.View;
 import android.widget.TextView;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.model.settings.view.SettingsItem;
+import org.citra.citra_emu.model.settings.view.SettingsItem;
-import org.citra.citra_android.model.settings.view.SliderSetting;
+import org.citra.citra_emu.model.settings.view.SliderSetting;
-import org.citra.citra_android.ui.settings.SettingsAdapter;
+import org.citra.citra_emu.ui.settings.SettingsAdapter;
 
 public final class SliderViewHolder extends SettingViewHolder {
     private SliderSetting mItem;

src/android/app/src/main/java/org/citra/citra_emu/ui/settings/viewholder/SubmenuViewHolder.java

@@ -1,12 +1,12 @@
-package org.citra.citra_android.ui.settings.viewholder;
+package org.citra.citra_emu.ui.settings.viewholder;
 
 import android.view.View;
 import android.widget.TextView;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.model.settings.view.SettingsItem;
+import org.citra.citra_emu.model.settings.view.SettingsItem;
-import org.citra.citra_android.model.settings.view.SubmenuSetting;
+import org.citra.citra_emu.model.settings.view.SubmenuSetting;
-import org.citra.citra_android.ui.settings.SettingsAdapter;
+import org.citra.citra_emu.ui.settings.SettingsAdapter;
 
 public final class SubmenuViewHolder extends SettingViewHolder {
     private SubmenuSetting mItem;

src/android/app/src/main/java/org/citra/citra_emu/utils/AddDirectoryHelper.java

@@ -1,12 +1,12 @@
-package org.citra.citra_android.utils;
+package org.citra.citra_emu.utils;
 
 import android.content.AsyncQueryHandler;
 import android.content.ContentValues;
 import android.content.Context;
 import android.net.Uri;
 
-import org.citra.citra_android.model.GameDatabase;
+import org.citra.citra_emu.model.GameDatabase;
-import org.citra.citra_android.model.GameProvider;
+import org.citra.citra_emu.model.GameProvider;
 
 public class AddDirectoryHelper {
     private Context mContext;

src/android/app/src/main/java/org/citra/citra_emu/utils/Animations.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.utils;
+package org.citra.citra_emu.utils;
 
 import android.view.View;
 import android.view.ViewPropertyAnimator;

src/android/app/src/main/java/org/citra/citra_emu/utils/ControllerMappingHelper.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.utils;
+package org.citra.citra_emu.utils;
 
 import android.view.InputDevice;
 import android.view.KeyEvent;

src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryStateReceiver.java

@@ -1,11 +1,11 @@
-package org.citra.citra_android.utils;
+package org.citra.citra_emu.utils;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import org.citra.citra_android.services.DirectoryInitializationService;
+import org.citra.citra_emu.services.DirectoryInitializationService;
-import org.citra.citra_android.services.DirectoryInitializationService.DirectoryInitializationState;
+import org.citra.citra_emu.services.DirectoryInitializationService.DirectoryInitializationState;
 
 import rx.functions.Action1;
 

src/android/app/src/main/java/org/citra/citra_emu/utils/EGLHelper.java

@@ -4,11 +4,11 @@
  * Refer to the license.txt file included.
  */
 
-package org.citra.citra_android.utils;
+package org.citra.citra_emu.utils;
 
 import android.opengl.GLES30;
 
-import org.citra.citra_android.NativeLibrary;
+import org.citra.citra_emu.NativeLibrary;
 
 import javax.microedition.khronos.egl.EGL10;
 import javax.microedition.khronos.egl.EGLConfig;

src/android/app/src/main/java/org/citra/citra_emu/utils/EmulationMenuSettings.java

@@ -1,9 +1,9 @@
-package org.citra.citra_android.utils;
+package org.citra.citra_emu.utils;
 
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
-import org.citra.citra_android.CitraApplication;
+import org.citra.citra_emu.CitraApplication;
 
 public class EmulationMenuSettings {
     private static SharedPreferences mPreferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.getAppContext());

src/android/app/src/main/java/org/citra/citra_emu/utils/FileBrowserHelper.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.utils;
+package org.citra.citra_emu.utils;
 
 import android.content.Intent;
 import android.net.Uri;
@@ -9,7 +9,7 @@ import android.support.v4.app.FragmentActivity;
 import com.nononsenseapps.filepicker.FilePickerActivity;
 import com.nononsenseapps.filepicker.Utils;
 
-import org.citra.citra_android.activities.CustomFilePickerActivity;
+import org.citra.citra_emu.activities.CustomFilePickerActivity;
 
 import java.io.File;
 import java.util.List;

src/android/app/src/main/java/org/citra/citra_emu/utils/GameBannerRequestHandler.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.utils;
+package org.citra.citra_emu.utils;
 
 import android.graphics.Bitmap;
 
@@ -6,7 +6,7 @@ import com.squareup.picasso.Picasso;
 import com.squareup.picasso.Request;
 import com.squareup.picasso.RequestHandler;
 
-import org.citra.citra_android.NativeLibrary;
+import org.citra.citra_emu.NativeLibrary;
 
 import java.nio.IntBuffer;
 

src/android/app/src/main/java/org/citra/citra_emu/utils/Java_GCAdapter.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.utils;
+package org.citra.citra_emu.utils;
 
 import android.app.Activity;
 import android.app.PendingIntent;
@@ -13,8 +13,8 @@ import android.hardware.usb.UsbInterface;
 import android.hardware.usb.UsbManager;
 import android.widget.Toast;
 
-import org.citra.citra_android.NativeLibrary;
+import org.citra.citra_emu.NativeLibrary;
-import org.citra.citra_android.services.USBPermService;
+import org.citra.citra_emu.services.USBPermService;
 
 import java.util.HashMap;
 import java.util.Map;

src/android/app/src/main/java/org/citra/citra_emu/utils/Log.java

@@ -1,6 +1,6 @@
-package org.citra.citra_android.utils;
+package org.citra.citra_emu.utils;
 
-import org.citra.citra_android.BuildConfig;
+import org.citra.citra_emu.BuildConfig;
 
 /**
  * Contains methods that call through to {@link android.util.Log}, but

src/android/app/src/main/java/org/citra/citra_emu/utils/PermissionsHandler.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.utils;
+package org.citra.citra_emu.utils;
 
 import android.annotation.TargetApi;
 import android.content.Context;

src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoRoundedCornersTransformation.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.utils;
+package org.citra.citra_emu.utils;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapShader;

src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoUtils.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.utils;
+package org.citra.citra_emu.utils;
 
 import android.graphics.Bitmap;
 import android.net.Uri;
@@ -6,8 +6,7 @@ import android.widget.ImageView;
 
 import com.squareup.picasso.Picasso;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.utils.PicassoRoundedCornersTransformation;
 
 public class PicassoUtils {
     public static void loadGameBanner(ImageView imageView, String gamePath) {

src/android/app/src/main/java/org/citra/citra_emu/utils/SettingsFile.java

@@ -1,14 +1,14 @@
-package org.citra.citra_android.utils;
+package org.citra.citra_emu.utils;
 
 import android.support.annotation.NonNull;
 
-import org.citra.citra_android.model.settings.FloatSetting;
+import org.citra.citra_emu.model.settings.FloatSetting;
-import org.citra.citra_android.model.settings.IntSetting;
+import org.citra.citra_emu.model.settings.IntSetting;
-import org.citra.citra_android.model.settings.Setting;
+import org.citra.citra_emu.model.settings.Setting;
-import org.citra.citra_android.model.settings.SettingSection;
+import org.citra.citra_emu.model.settings.SettingSection;
-import org.citra.citra_android.model.settings.StringSetting;
+import org.citra.citra_emu.model.settings.StringSetting;
-import org.citra.citra_android.services.DirectoryInitializationService;
+import org.citra.citra_emu.services.DirectoryInitializationService;
-import org.citra.citra_android.ui.settings.SettingsActivityView;
+import org.citra.citra_emu.ui.settings.SettingsActivityView;
 import org.ini4j.Wini;
 
 import java.io.BufferedReader;

src/android/app/src/main/java/org/citra/citra_emu/utils/StartupHandler.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.utils;
+package org.citra.citra_emu.utils;
 
 import android.app.AlertDialog;
 import android.content.Intent;
@@ -6,8 +6,8 @@ import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.text.TextUtils;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
-import org.citra.citra_android.activities.EmulationActivity;
+import org.citra.citra_emu.activities.EmulationActivity;
 
 public final class StartupHandler {
     private static void handlePermissionsCheck(FragmentActivity parent) {

src/android/app/src/main/java/org/citra/citra_emu/viewholders/GameViewHolder.java

@@ -1,11 +1,11 @@
-package org.citra.citra_android.viewholders;
+package org.citra.citra_emu.viewholders;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.citra.citra_android.R;
+import org.citra.citra_emu.R;
 
 /**
  * A simple class that stores references to views so that the GameAdapter doesn't need to

src/android/app/src/main/java/org/citra/citra_emu/viewholders/TvGameViewHolder.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.viewholders;
+package org.citra.citra_emu.viewholders;
 
 import android.support.v17.leanback.widget.ImageCardView;
 import android.support.v17.leanback.widget.Presenter;

src/android/app/src/main/java/org/citra/citra_emu/viewholders/TvSettingsViewHolder.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android.viewholders;
+package org.citra.citra_emu.viewholders;
 
 import android.support.v17.leanback.widget.ImageCardView;
 import android.support.v17.leanback.widget.Presenter;

src/android/app/src/main/jni/id_cache.cpp

@@ -96,7 +96,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) {
     LOG_INFO(Frontend, "Logging backend initialised");
 
     // Initialize Java methods
-    const jclass native_library_class = env->FindClass("org/citra/citra_android/NativeLibrary");
+    const jclass native_library_class = env->FindClass("org/citra/citra_emu/NativeLibrary");
     s_native_library_class = reinterpret_cast<jclass>(env->NewGlobalRef(native_library_class));
     s_display_alert_msg = env->GetStaticMethodID(s_native_library_class, "displayAlertMsg",
                                                  "(Ljava/lang/String;Ljava/lang/String;Z)Z");

src/android/app/src/main/jni/native.cpp

@@ -174,7 +174,7 @@ static Core::System::ResultStatus RunCitra(const std::string& filepath) {
     return Core::System::ResultStatus::Success;
 }
 
-void Java_org_citra_citra_1android_NativeLibrary_SurfaceChanged(JNIEnv* env, jobject obj,
+void Java_org_citra_citra_1emu_NativeLibrary_SurfaceChanged(JNIEnv* env, jobject obj,
                                                                 jobject surf) {
     s_surf = ANativeWindow_fromSurface(env, surf);
 
@@ -185,7 +185,7 @@ void Java_org_citra_citra_1android_NativeLibrary_SurfaceChanged(JNIEnv* env, job
     LOG_INFO(Frontend, "Surface changed");
 }
 
-void Java_org_citra_citra_1android_NativeLibrary_SurfaceDestroyed(JNIEnv* env, jobject obj) {
+void Java_org_citra_citra_1emu_NativeLibrary_SurfaceDestroyed(JNIEnv* env, jobject obj) {
     ANativeWindow_release(s_surf);
     s_surf = nullptr;
     if (window) {
@@ -193,13 +193,13 @@ void Java_org_citra_citra_1android_NativeLibrary_SurfaceDestroyed(JNIEnv* env, j
     }
 }
 
-void Java_org_citra_citra_1android_NativeLibrary_NotifyOrientationChange(
+void Java_org_citra_citra_1emu_NativeLibrary_NotifyOrientationChange(
     JNIEnv* env, jobject obj, jint layout_option, jboolean is_portrait_mode) {
     Settings::values.layout_option = static_cast<Settings::LayoutOption>(layout_option);
     VideoCore::g_renderer->UpdateCurrentFramebufferLayout(is_portrait_mode);
 }
 
-void Java_org_citra_citra_1android_NativeLibrary_SwapScreens(JNIEnv* env, jobject obj,
+void Java_org_citra_citra_1emu_NativeLibrary_SwapScreens(JNIEnv* env, jobject obj,
                                                              jboolean swap_screens,
                                                              jboolean is_portrait_mode) {
     Settings::values.swap_screen = swap_screens;
@@ -208,31 +208,31 @@ void Java_org_citra_citra_1android_NativeLibrary_SwapScreens(JNIEnv* env, jobjec
     }
 }
 
-void Java_org_citra_citra_1android_NativeLibrary_SetUserDirectory(JNIEnv* env, jobject obj,
+void Java_org_citra_citra_1emu_NativeLibrary_SetUserDirectory(JNIEnv* env, jobject obj,
                                                                   jstring jDirectory) {
     FileUtil::SetCurrentDir(GetJString(env, jDirectory));
 }
 
-void Java_org_citra_citra_1android_NativeLibrary_UnPauseEmulation(JNIEnv* env, jobject obj) {
+void Java_org_citra_citra_1emu_NativeLibrary_UnPauseEmulation(JNIEnv* env, jobject obj) {
     pause_emulation = false;
     running_cv.notify_all();
 }
 
-void Java_org_citra_citra_1android_NativeLibrary_PauseEmulation(JNIEnv* env, jobject obj) {
+void Java_org_citra_citra_1emu_NativeLibrary_PauseEmulation(JNIEnv* env, jobject obj) {
     pause_emulation = true;
 }
 
-void Java_org_citra_citra_1android_NativeLibrary_StopEmulation(JNIEnv* env, jobject obj) {
+void Java_org_citra_citra_1emu_NativeLibrary_StopEmulation(JNIEnv* env, jobject obj) {
     is_running = false;
     pause_emulation = false;
     running_cv.notify_all();
 }
 
-jboolean Java_org_citra_citra_1android_NativeLibrary_IsRunning(JNIEnv* env, jobject obj) {
+jboolean Java_org_citra_citra_1emu_NativeLibrary_IsRunning(JNIEnv* env, jobject obj) {
     return static_cast<jboolean>(is_running);
 }
 
-jboolean Java_org_citra_citra_1android_NativeLibrary_onGamePadEvent(JNIEnv* env, jobject obj,
+jboolean Java_org_citra_citra_1emu_NativeLibrary_onGamePadEvent(JNIEnv* env, jobject obj,
                                                                     jstring jDevice, jint button,
                                                                     jint pressed) {
     bool consumed{};
@@ -245,7 +245,7 @@ jboolean Java_org_citra_citra_1android_NativeLibrary_onGamePadEvent(JNIEnv* env,
     return static_cast<jboolean>(consumed);
 }
 
-jboolean Java_org_citra_citra_1android_NativeLibrary_onGamePadMoveEvent(JNIEnv* env, jobject obj,
+jboolean Java_org_citra_citra_1emu_NativeLibrary_onGamePadMoveEvent(JNIEnv* env, jobject obj,
                                                                         jstring jDevice, jint Axis,
                                                                         jfloat x, jfloat y) {
     // Clamp joystick movement to supported minimum and maximum
@@ -255,7 +255,7 @@ jboolean Java_org_citra_citra_1android_NativeLibrary_onGamePadMoveEvent(JNIEnv*
     return static_cast<jboolean>(InputManager::AnalogHandler()->MoveJoystick(Axis, x, y));
 }
 
-jboolean Java_org_citra_citra_1android_NativeLibrary_onGamePadAxisEvent(JNIEnv* env, jobject obj,
+jboolean Java_org_citra_citra_1emu_NativeLibrary_onGamePadAxisEvent(JNIEnv* env, jobject obj,
                                                                         jstring jDevice,
                                                                         jint axis_id,
                                                                         jfloat axis_val) {
@@ -263,17 +263,17 @@ jboolean Java_org_citra_citra_1android_NativeLibrary_onGamePadAxisEvent(JNIEnv*
         InputManager::ButtonHandler()->AnalogButtonEvent(axis_id, axis_val));
 }
 
-void Java_org_citra_citra_1android_NativeLibrary_onTouchEvent(JNIEnv* env, jobject obj, jfloat x,
+void Java_org_citra_citra_1emu_NativeLibrary_onTouchEvent(JNIEnv* env, jobject obj, jfloat x,
                                                               jfloat y, jboolean pressed) {
     window->OnTouchEvent((int)x, (int)y, (bool)pressed);
 }
 
-void Java_org_citra_citra_1android_NativeLibrary_onTouchMoved(JNIEnv* env, jobject obj, jfloat x,
+void Java_org_citra_citra_1emu_NativeLibrary_onTouchMoved(JNIEnv* env, jobject obj, jfloat x,
                                                               jfloat y) {
     window->OnTouchMoved((int)x, (int)y);
 }
 
-jintArray Java_org_citra_citra_1android_NativeLibrary_GetBanner(JNIEnv* env, jobject obj,
+jintArray Java_org_citra_citra_1emu_NativeLibrary_GetBanner(JNIEnv* env, jobject obj,
                                                                 jstring jFilepath) {
     std::string filepath = GetJString(env, jFilepath);
 
@@ -289,7 +289,7 @@ jintArray Java_org_citra_citra_1android_NativeLibrary_GetBanner(JNIEnv* env, job
     return Banner;
 }
 
-jstring Java_org_citra_citra_1android_NativeLibrary_GetTitle(JNIEnv* env, jobject obj,
+jstring Java_org_citra_citra_1emu_NativeLibrary_GetTitle(JNIEnv* env, jobject obj,
                                                              jstring jFilepath) {
     std::string filepath = GetJString(env, jFilepath);
 
@@ -302,22 +302,22 @@ jstring Java_org_citra_citra_1android_NativeLibrary_GetTitle(JNIEnv* env, jobjec
     return env->NewStringUTF(Common::UTF16ToUTF8(Title).data());
 }
 
-jstring Java_org_citra_citra_1android_NativeLibrary_GetDescription(JNIEnv* env, jobject obj,
+jstring Java_org_citra_citra_1emu_NativeLibrary_GetDescription(JNIEnv* env, jobject obj,
                                                                    jstring jFilename) {
     return jFilename;
 }
 
-jstring Java_org_citra_citra_1android_NativeLibrary_GetGameId(JNIEnv* env, jobject obj,
+jstring Java_org_citra_citra_1emu_NativeLibrary_GetGameId(JNIEnv* env, jobject obj,
                                                               jstring jFilename) {
     return jFilename;
 }
 
-jint Java_org_citra_citra_1android_NativeLibrary_GetCountry(JNIEnv* env, jobject obj,
+jint Java_org_citra_citra_1emu_NativeLibrary_GetCountry(JNIEnv* env, jobject obj,
                                                             jstring jFilename) {
     return 0;
 }
 
-jstring Java_org_citra_citra_1android_NativeLibrary_GetCompany(JNIEnv* env, jobject obj,
+jstring Java_org_citra_citra_1emu_NativeLibrary_GetCompany(JNIEnv* env, jobject obj,
                                                                jstring jFilepath) {
     std::string filepath = GetJString(env, jFilepath);
 
@@ -330,72 +330,72 @@ jstring Java_org_citra_citra_1android_NativeLibrary_GetCompany(JNIEnv* env, jobj
     return env->NewStringUTF(Common::UTF16ToUTF8(Publisher).data());
 }
 
-jlong Java_org_citra_citra_1android_NativeLibrary_GetFilesize(JNIEnv* env, jobject obj,
+jlong Java_org_citra_citra_1emu_NativeLibrary_GetFilesize(JNIEnv* env, jobject obj,
                                                               jstring jFilename) {
     return 0;
 }
 
-jstring Java_org_citra_citra_1android_NativeLibrary_GetVersionString(JNIEnv* env, jobject obj) {
+jstring Java_org_citra_citra_1emu_NativeLibrary_GetVersionString(JNIEnv* env, jobject obj) {
     return nullptr;
 }
 
-jstring Java_org_citra_citra_1android_NativeLibrary_GetGitRevision(JNIEnv* env, jobject obj) {
+jstring Java_org_citra_citra_1emu_NativeLibrary_GetGitRevision(JNIEnv* env, jobject obj) {
     return nullptr;
 }
 
-void Java_org_citra_citra_1android_NativeLibrary_SaveScreenShot(JNIEnv* env, jobject obj) {}
+void Java_org_citra_citra_1emu_NativeLibrary_SaveScreenShot(JNIEnv* env, jobject obj) {}
 
-void Java_org_citra_citra_1android_NativeLibrary_eglBindAPI(JNIEnv* env, jobject obj, jint api) {}
+void Java_org_citra_citra_1emu_NativeLibrary_eglBindAPI(JNIEnv* env, jobject obj, jint api) {}
 
-jstring Java_org_citra_citra_1android_NativeLibrary_GetConfig(JNIEnv* env, jobject obj,
+jstring Java_org_citra_citra_1emu_NativeLibrary_GetConfig(JNIEnv* env, jobject obj,
                                                               jstring jFile, jstring jSection,
                                                               jstring jKey, jstring jDefault) {
     return nullptr;
 }
 
-void Java_org_citra_citra_1android_NativeLibrary_SetConfig(JNIEnv* env, jobject obj, jstring jFile,
+void Java_org_citra_citra_1emu_NativeLibrary_SetConfig(JNIEnv* env, jobject obj, jstring jFile,
                                                            jstring jSection, jstring jKey,
                                                            jstring jValue) {}
 
-void Java_org_citra_citra_1android_NativeLibrary_SetFilename(JNIEnv* env, jobject obj,
+void Java_org_citra_citra_1emu_NativeLibrary_SetFilename(JNIEnv* env, jobject obj,
                                                              jstring jFile) {}
 
-void Java_org_citra_citra_1android_NativeLibrary_SaveState(JNIEnv* env, jobject obj, jint slot,
+void Java_org_citra_citra_1emu_NativeLibrary_SaveState(JNIEnv* env, jobject obj, jint slot,
                                                            jboolean wait) {}
 
-void Java_org_citra_citra_1android_NativeLibrary_SaveStateAs(JNIEnv* env, jobject obj, jstring path,
+void Java_org_citra_citra_1emu_NativeLibrary_SaveStateAs(JNIEnv* env, jobject obj, jstring path,
                                                              jboolean wait) {}
 
-void Java_org_citra_citra_1android_NativeLibrary_LoadState(JNIEnv* env, jobject obj, jint slot) {}
+void Java_org_citra_citra_1emu_NativeLibrary_LoadState(JNIEnv* env, jobject obj, jint slot) {}
 
-void Java_org_citra_citra_1android_NativeLibrary_LoadStateAs(JNIEnv* env, jobject obj,
+void Java_org_citra_citra_1emu_NativeLibrary_LoadStateAs(JNIEnv* env, jobject obj,
                                                              jstring path) {}
 
-void Java_org_citra_citra_1android_services_DirectoryInitializationService_CreateUserDirectories(
+void Java_org_citra_citra_1emu_services_DirectoryInitializationService_CreateUserDirectories(
     JNIEnv* env, jobject obj) {}
 
-jstring Java_org_citra_citra_1android_NativeLibrary_GetUserDirectory(JNIEnv* env, jobject obj) {
+jstring Java_org_citra_citra_1emu_NativeLibrary_GetUserDirectory(JNIEnv* env, jobject obj) {
 
     return nullptr;
 }
 
-void Java_org_citra_citra_1android_NativeLibrary_CreateConfigFile() {
+void Java_org_citra_citra_1emu_NativeLibrary_CreateConfigFile() {
     new Config();
 }
 
-jint Java_org_citra_citra_1android_NativeLibrary_DefaultCPUCore(JNIEnv* env, jobject obj) {
+jint Java_org_citra_citra_1emu_NativeLibrary_DefaultCPUCore(JNIEnv* env, jobject obj) {
     return 0;
 }
 
-void Java_org_citra_citra_1android_NativeLibrary_SetProfiling(JNIEnv* env, jobject obj,
+void Java_org_citra_citra_1emu_NativeLibrary_SetProfiling(JNIEnv* env, jobject obj,
                                                               jboolean enable) {}
 
-void Java_org_citra_citra_1android_NativeLibrary_WriteProfileResults(JNIEnv* env, jobject obj) {}
+void Java_org_citra_citra_1emu_NativeLibrary_WriteProfileResults(JNIEnv* env, jobject obj) {}
 
-void Java_org_citra_citra_1android_NativeLibrary_Run__Ljava_lang_String_2Ljava_lang_String_2Z(
+void Java_org_citra_citra_1emu_NativeLibrary_Run__Ljava_lang_String_2Ljava_lang_String_2Z(
     JNIEnv* env, jobject obj, jstring jFile, jstring jSavestate, jboolean jDeleteSavestate) {}
 
-jstring Java_org_citra_citra_1android_NativeLibrary_GetUserSetting(JNIEnv* env, jclass type,
+jstring Java_org_citra_citra_1emu_NativeLibrary_GetUserSetting(JNIEnv* env, jclass type,
                                                                    jstring gameID_,
                                                                    jstring Section_, jstring Key_) {
     const char* gameID = env->GetStringUTFChars(gameID_, 0);
@@ -411,7 +411,7 @@ jstring Java_org_citra_citra_1android_NativeLibrary_GetUserSetting(JNIEnv* env,
     return env->NewStringUTF("");
 }
 
-void Java_org_citra_citra_1android_NativeLibrary_SetUserSetting(JNIEnv* env, jclass type,
+void Java_org_citra_citra_1emu_NativeLibrary_SetUserSetting(JNIEnv* env, jclass type,
                                                                 jstring gameID_, jstring Section_,
                                                                 jstring Key_, jstring Value_) {
     const char* gameID = env->GetStringUTFChars(gameID_, 0);
@@ -427,7 +427,7 @@ void Java_org_citra_citra_1android_NativeLibrary_SetUserSetting(JNIEnv* env, jcl
     env->ReleaseStringUTFChars(Value_, Value);
 }
 
-void Java_org_citra_citra_1android_NativeLibrary_InitGameIni(JNIEnv* env, jclass type,
+void Java_org_citra_citra_1emu_NativeLibrary_InitGameIni(JNIEnv* env, jclass type,
                                                              jstring gameID_) {
     const char* gameID = env->GetStringUTFChars(gameID_, 0);
 
@@ -436,7 +436,7 @@ void Java_org_citra_citra_1android_NativeLibrary_InitGameIni(JNIEnv* env, jclass
     env->ReleaseStringUTFChars(gameID_, gameID);
 }
 
-jdoubleArray Java_org_citra_citra_1android_NativeLibrary_GetPerfStats(JNIEnv* env, jclass type) {
+jdoubleArray Java_org_citra_citra_1emu_NativeLibrary_GetPerfStats(JNIEnv* env, jclass type) {
     auto& core = Core::System::GetInstance();
     jdoubleArray jstats = env->NewDoubleArray(4);
 
@@ -453,14 +453,14 @@ jdoubleArray Java_org_citra_citra_1android_NativeLibrary_GetPerfStats(JNIEnv* en
     return jstats;
 }
 
-void Java_org_citra_citra_1android_services_DirectoryInitializationService_SetSysDirectory(
+void Java_org_citra_citra_1emu_services_DirectoryInitializationService_SetSysDirectory(
     JNIEnv* env, jclass type, jstring path_) {
     const char* path = env->GetStringUTFChars(path_, 0);
 
     env->ReleaseStringUTFChars(path_, path);
 }
 
-void Java_org_citra_citra_1android_NativeLibrary_Run__Ljava_lang_String_2(JNIEnv* env, jclass type,
+void Java_org_citra_citra_1emu_NativeLibrary_Run__Ljava_lang_String_2(JNIEnv* env, jclass type,
                                                                           jstring path_) {
     const std::string path = GetJString(env, path_);
 

src/android/app/src/main/jni/native.h

@@ -9,164 +9,164 @@
 extern "C" {
 #endif
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_UnPauseEmulation(JNIEnv* env,
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_UnPauseEmulation(JNIEnv* env,
                                                                                     jobject obj);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_PauseEmulation(JNIEnv* env,
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_PauseEmulation(JNIEnv* env,
                                                                                   jobject obj);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_StopEmulation(JNIEnv* env,
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_StopEmulation(JNIEnv* env,
                                                                                  jobject obj);
 
-JNIEXPORT jboolean JNICALL Java_org_citra_citra_1android_NativeLibrary_IsRunning(JNIEnv* env,
+JNIEXPORT jboolean JNICALL Java_org_citra_citra_1emu_NativeLibrary_IsRunning(JNIEnv* env,
                                                                                  jobject obj);
 
-JNIEXPORT jboolean JNICALL Java_org_citra_citra_1android_NativeLibrary_onGamePadEvent(
+JNIEXPORT jboolean JNICALL Java_org_citra_citra_1emu_NativeLibrary_onGamePadEvent(
     JNIEnv* env, jobject obj, jstring jDevice, jint Button, jint Action);
 
-JNIEXPORT jboolean JNICALL Java_org_citra_citra_1android_NativeLibrary_onGamePadMoveEvent(
+JNIEXPORT jboolean JNICALL Java_org_citra_citra_1emu_NativeLibrary_onGamePadMoveEvent(
     JNIEnv* env, jobject obj, jstring jDevice, jint Axis, jfloat x, jfloat y);
 
-JNIEXPORT jboolean JNICALL Java_org_citra_citra_1android_NativeLibrary_onGamePadAxisEvent(
+JNIEXPORT jboolean JNICALL Java_org_citra_citra_1emu_NativeLibrary_onGamePadAxisEvent(
     JNIEnv* env, jobject obj, jstring jDevice, jint axis_id, jfloat axis_val);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_onTouchEvent(JNIEnv* env,
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_onTouchEvent(JNIEnv* env,
                                                                                 jobject obj,
                                                                                 jfloat x, jfloat y,
                                                                                 jboolean pressed);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_onTouchMoved(JNIEnv* env,
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_onTouchMoved(JNIEnv* env,
                                                                                 jobject obj,
                                                                                 jfloat x, jfloat y);
 
-JNIEXPORT jintArray JNICALL Java_org_citra_citra_1android_NativeLibrary_GetBanner(JNIEnv* env,
+JNIEXPORT jintArray JNICALL Java_org_citra_citra_1emu_NativeLibrary_GetBanner(JNIEnv* env,
                                                                                   jobject obj,
                                                                                   jstring jFile);
 
-JNIEXPORT jstring JNICALL Java_org_citra_citra_1android_NativeLibrary_GetTitle(JNIEnv* env,
+JNIEXPORT jstring JNICALL Java_org_citra_citra_1emu_NativeLibrary_GetTitle(JNIEnv* env,
                                                                                jobject obj,
                                                                                jstring jFilename);
 
-JNIEXPORT jstring JNICALL Java_org_citra_citra_1android_NativeLibrary_GetDescription(
+JNIEXPORT jstring JNICALL Java_org_citra_citra_1emu_NativeLibrary_GetDescription(
     JNIEnv* env, jobject obj, jstring jFilename);
 
-JNIEXPORT jstring JNICALL Java_org_citra_citra_1android_NativeLibrary_GetGameId(JNIEnv* env,
+JNIEXPORT jstring JNICALL Java_org_citra_citra_1emu_NativeLibrary_GetGameId(JNIEnv* env,
                                                                                 jobject obj,
                                                                                 jstring jFilename);
 
-JNIEXPORT jint JNICALL Java_org_citra_citra_1android_NativeLibrary_GetCountry(JNIEnv* env,
+JNIEXPORT jint JNICALL Java_org_citra_citra_1emu_NativeLibrary_GetCountry(JNIEnv* env,
                                                                               jobject obj,
                                                                               jstring jFilename);
 
-JNIEXPORT jstring JNICALL Java_org_citra_citra_1android_NativeLibrary_GetCompany(JNIEnv* env,
+JNIEXPORT jstring JNICALL Java_org_citra_citra_1emu_NativeLibrary_GetCompany(JNIEnv* env,
                                                                                  jobject obj,
                                                                                  jstring jFilename);
 
-JNIEXPORT jlong JNICALL Java_org_citra_citra_1android_NativeLibrary_GetFilesize(JNIEnv* env,
+JNIEXPORT jlong JNICALL Java_org_citra_citra_1emu_NativeLibrary_GetFilesize(JNIEnv* env,
                                                                                 jobject obj,
                                                                                 jstring jFilename);
 
-JNIEXPORT jstring JNICALL Java_org_citra_citra_1android_NativeLibrary_GetVersionString(JNIEnv* env,
+JNIEXPORT jstring JNICALL Java_org_citra_citra_1emu_NativeLibrary_GetVersionString(JNIEnv* env,
                                                                                        jobject obj);
 
-JNIEXPORT jstring JNICALL Java_org_citra_citra_1android_NativeLibrary_GetGitRevision(JNIEnv* env,
+JNIEXPORT jstring JNICALL Java_org_citra_citra_1emu_NativeLibrary_GetGitRevision(JNIEnv* env,
                                                                                      jobject obj);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_SaveScreenShot(JNIEnv* env,
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_SaveScreenShot(JNIEnv* env,
                                                                                   jobject obj);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_eglBindAPI(JNIEnv* env,
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_eglBindAPI(JNIEnv* env,
                                                                               jobject obj,
                                                                               jint api);
 
-JNIEXPORT jstring JNICALL Java_org_citra_citra_1android_NativeLibrary_GetConfig(
+JNIEXPORT jstring JNICALL Java_org_citra_citra_1emu_NativeLibrary_GetConfig(
     JNIEnv* env, jobject obj, jstring jFile, jstring jSection, jstring jKey, jstring jDefault);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_SetConfig(
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_SetConfig(
     JNIEnv* env, jobject obj, jstring jFile, jstring jSection, jstring jKey, jstring jValue);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_SetFilename(JNIEnv* env,
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_SetFilename(JNIEnv* env,
                                                                                jobject obj,
                                                                                jstring jFile);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_SaveState(JNIEnv* env,
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_SaveState(JNIEnv* env,
                                                                              jobject obj, jint slot,
                                                                              jboolean wait);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_SaveStateAs(JNIEnv* env,
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_SaveStateAs(JNIEnv* env,
                                                                                jobject obj,
                                                                                jstring path,
                                                                                jboolean wait);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_LoadState(JNIEnv* env,
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_LoadState(JNIEnv* env,
                                                                              jobject obj,
                                                                              jint slot);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_LoadStateAs(JNIEnv* env,
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_LoadStateAs(JNIEnv* env,
                                                                                jobject obj,
                                                                                jstring path);
 
 JNIEXPORT void JNICALL
-Java_org_citra_citra_1android_services_DirectoryInitializationService_CreateUserDirectories(
+Java_org_citra_citra_1emu_services_DirectoryInitializationService_CreateUserDirectories(
     JNIEnv* env, jobject obj);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_SetUserDirectory(
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_SetUserDirectory(
     JNIEnv* env, jobject obj, jstring jDirectory);
 
 JNIEXPORT void JNICALL
-Java_org_citra_citra_1android_services_DirectoryInitializationService_SetSysDirectory(
+Java_org_citra_citra_1emu_services_DirectoryInitializationService_SetSysDirectory(
     JNIEnv* env, jclass type, jstring path_);
 
-JNIEXPORT jstring JNICALL Java_org_citra_citra_1android_NativeLibrary_GetUserDirectory(JNIEnv* env,
+JNIEXPORT jstring JNICALL Java_org_citra_citra_1emu_NativeLibrary_GetUserDirectory(JNIEnv* env,
                                                                                        jobject obj);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_SetSysDirectory(JNIEnv* env,
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_SetSysDirectory(JNIEnv* env,
                                                                                    jobject obj,
                                                                                    jstring path);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_CreateConfigFile();
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_CreateConfigFile();
 
-JNIEXPORT jint JNICALL Java_org_citra_citra_1android_NativeLibrary_DefaultCPUCore(JNIEnv* env,
+JNIEXPORT jint JNICALL Java_org_citra_citra_1emu_NativeLibrary_DefaultCPUCore(JNIEnv* env,
                                                                                   jobject obj);
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_SetProfiling(JNIEnv* env,
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_SetProfiling(JNIEnv* env,
                                                                                 jobject obj,
                                                                                 jboolean enable);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_WriteProfileResults(JNIEnv* env,
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_WriteProfileResults(JNIEnv* env,
                                                                                        jobject obj);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_NotifyOrientationChange(
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_NotifyOrientationChange(
     JNIEnv* env, jobject obj, jint layout_option, jboolean is_portrait_mode);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_SwapScreens(
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_SwapScreens(
     JNIEnv* env, jobject obj, jboolean swap_screens, jboolean is_portrait_mode);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_Run__Ljava_lang_String_2(
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_Run__Ljava_lang_String_2(
     JNIEnv* env, jclass type, jstring path_);
 
 JNIEXPORT void JNICALL
-Java_org_citra_citra_1android_NativeLibrary_Run__Ljava_lang_String_2Ljava_lang_String_2Z(
+Java_org_citra_citra_1emu_NativeLibrary_Run__Ljava_lang_String_2Ljava_lang_String_2Z(
     JNIEnv* env, jobject obj, jstring jFile, jstring jSavestate, jboolean jDeleteSavestate);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_SurfaceChanged(JNIEnv* env,
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_SurfaceChanged(JNIEnv* env,
                                                                                   jobject obj,
                                                                                   jobject surf);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_SurfaceDestroyed(JNIEnv* env,
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_SurfaceDestroyed(JNIEnv* env,
                                                                                     jobject obj);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_InitGameIni(JNIEnv* env,
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_InitGameIni(JNIEnv* env,
                                                                                jclass type,
                                                                                jstring gameID_);
 
-JNIEXPORT void JNICALL Java_org_citra_citra_1android_NativeLibrary_SetUserSetting(
+JNIEXPORT void JNICALL Java_org_citra_citra_1emu_NativeLibrary_SetUserSetting(
     JNIEnv* env, jclass type, jstring gameID_, jstring Section_, jstring Key_, jstring Value_);
 
-JNIEXPORT jstring JNICALL Java_org_citra_citra_1android_NativeLibrary_GetUserSetting(
+JNIEXPORT jstring JNICALL Java_org_citra_citra_1emu_NativeLibrary_GetUserSetting(
     JNIEnv* env, jclass type, jstring gameID_, jstring Section_, jstring Key_);
 
 JNIEXPORT jdoubleArray JNICALL
-Java_org_citra_citra_1android_NativeLibrary_GetPerfStats(JNIEnv* env, jclass type);
+Java_org_citra_citra_1emu_NativeLibrary_GetPerfStats(JNIEnv* env, jclass type);
 
 #ifdef __cplusplus
 }

src/android/app/src/main/res/layout-television/activity_emulation.xml

@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
-    <org.citra.citra_android.ui.NVidiaShieldWorkaroundView
+    <org.citra.citra_emu.ui.NVidiaShieldWorkaroundView
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 

src/android/app/src/main/res/layout/fragment_emulation.xml

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:keepScreenOn="true"
-    tools:context="org.citra.citra_android.fragments.EmulationFragment">
+    tools:context="org.citra.citra_emu.fragments.EmulationFragment">
 
     <!-- This is what everything is rendered to during emulation -->
     <SurfaceView
@@ -14,7 +14,7 @@
         android:focusableInTouchMode="false" />
 
     <!-- This is the onscreen input overlay -->
-    <org.citra.citra_android.overlay.InputOverlay
+    <org.citra.citra_emu.overlay.InputOverlay
         android:id="@+id/surface_input_overlay"
         android:layout_height="match_parent"
         android:layout_width="match_parent"

src/android/app/src/main/res/layout/fragment_settings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.citra.citra_android.ui.settings.SettingsFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<org.citra.citra_emu.ui.settings.SettingsFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
                                                            android:layout_width="match_parent"
                                                            android:layout_height="match_parent">
 
@@ -9,4 +9,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
-</org.citra.citra_android.ui.settings.SettingsFrameLayout>
+</org.citra.citra_emu.ui.settings.SettingsFrameLayout>

src/android/app/src/main/res/layout/titleview.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.citra.citra_android.ui.main.CustomTitleView
+<org.citra.citra_emu.ui.main.CustomTitleView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/browse_title_group"
     android:layout_width="match_parent"

src/android/app/src/main/res/menu/menu_emulation.xml

@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:tools="http://schemas.android.com/tools"
       xmlns:app="http://schemas.android.com/apk/res-auto"
-      tools:context="org.citra.citra_android.activities.EmulationActivity">
+      tools:context="org.citra.citra_emu.activities.EmulationActivity">
 
     <item
         android:id="@+id/menu_emulation_configure_controls"

src/android/app/src/test/java/org/citra/citra_emu/ExampleUnitTest.java

@@ -1,4 +1,4 @@
-package org.citra.citra_android;
+package org.citra.citra_emu;
 
 import org.junit.Test;