diff --git a/.gitignore b/.gitignore
index 6cc80a0..1aa6f8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,11 @@
-*.iml
-.gradle
-/local.properties
-/keystore.properties
-.DS_Store
-/build
+/.gradle
 /captures
-.externalNativeBuild
-.cxx
-local.properties
-/libs/**/build
-/buildSrc/build
-/app-deps/libs
\ No newline at end of file
+
+# Configuration files
+
+/keystore.properties
+/local.properties
+
+# macOS
+
+.DS_Store
diff --git a/.idea/.gitignore b/.idea/.gitignore
index c9924ab..0d51aca 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,10 +1,13 @@
-# Default ignored files
 /shelf
 /caches
 /libraries
-/modules.xml
-/workspace.xml
-/navEditor.xml
 /assetWizardSettings.xml
 /deploymentTargetDropDown.xml
-/runConfigurations.xml
\ No newline at end of file
+/gradle.xml
+/misc.xml
+/modules.xml
+/navEditor.xml
+/runConfigurations.xml
+/workspace.xml
+
+**/*.iml
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 589fc6c..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT">
-            <builds>
-              <build path="$PROJECT_DIR$/buildSrc" name="buildSrc">
-                <projects>
-                  <project path="$PROJECT_DIR$/buildSrc" />
-                </projects>
-              </build>
-            </builds>
-          </compositeBuild>
-        </compositeConfiguration>
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="/usr/share/java/gradle" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/app-common" />
-            <option value="$PROJECT_DIR$/app-deps" />
-            <option value="$PROJECT_DIR$/app-unpriv" />
-            <option value="$PROJECT_DIR$/buildSrc" />
-            <option value="$PROJECT_DIR$/libs" />
-            <option value="$PROJECT_DIR$/libs/hidden-apis-shim" />
-            <option value="$PROJECT_DIR$/libs/hidden-apis-stub" />
-            <option value="$PROJECT_DIR$/libs/lpac-jni" />
-          </set>
-        </option>
-        <option name="resolveExternalAnnotations" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index a1f9d9f..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<project version="4">
-  <component name="DesignSurface">
-    <option name="filePathToZoomLevelMap">
-      <map>
-        <entry key="app/src/main/res/drawable/ic_add.xml" value="0.2015" />
-        <entry key="app/src/main/res/layout/activity_main.xml" value="0.19375" />
-        <entry key="app/src/main/res/layout/euicc_profile.xml" value="0.19375" />
-        <entry key="app/src/main/res/layout/fragment_euicc.xml" value="0.19375" />
-        <entry key="app/src/main/res/layout/fragment_profile_download.xml" value="0.19375" />
-        <entry key="app/src/main/res/layout/fragment_profile_rename.xml" value="0.19375" />
-        <entry key="app/src/main/res/menu/activity_main.xml" value="0.19375" />
-        <entry key="app/src/main/res/menu/activity_main_slot_spinner.xml" value="0.19375" />
-        <entry key="app/src/main/res/menu/fragment_profile_download.xml" value="0.19375" />
-        <entry key="app/src/main/res/menu/fragment_profile_rename.xml" value="0.19375" />
-        <entry key="app/src/main/res/menu/profile_options.xml" value="0.19375" />
-      </map>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/app-deps/.gitignore b/app-deps/.gitignore
index 42afabf..c23e5a2 100644
--- a/app-deps/.gitignore
+++ b/app-deps/.gitignore
@@ -1 +1,2 @@
-/build
\ No newline at end of file
+/build
+/libs
\ No newline at end of file
diff --git a/buildSrc/.gitignore b/buildSrc/.gitignore
new file mode 100644
index 0000000..6fbe8a4
--- /dev/null
+++ b/buildSrc/.gitignore
@@ -0,0 +1,2 @@
+/.gradle
+/build
\ No newline at end of file
diff --git a/libs/lpac-jni/.gitignore b/libs/lpac-jni/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/libs/lpac-jni/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file