diff --git a/app/src/main/java/me/impy/aegis/MainActivity.java b/app/src/main/java/me/impy/aegis/MainActivity.java
index 362ed427..baa5b6e9 100644
--- a/app/src/main/java/me/impy/aegis/MainActivity.java
+++ b/app/src/main/java/me/impy/aegis/MainActivity.java
@@ -36,7 +36,7 @@ import java.util.List;
 import me.impy.aegis.crypto.MasterKey;
 import me.impy.aegis.db.DatabaseEntry;
 import me.impy.aegis.db.DatabaseManager;
-import me.impy.aegis.ext.DatabaseImporter;
+import me.impy.aegis.importers.DatabaseImporter;
 import me.impy.aegis.helpers.SimpleItemTouchHelperCallback;
 import me.impy.aegis.util.ByteInputStream;
 
@@ -337,8 +337,7 @@ public class MainActivity extends AppCompatActivity {
         return bottomDialog;
     }
 
-    private void deleteProfile(int position)
-    {
+    private void deleteProfile(int position) {
         KeyProfile profile = _keyProfiles.get(position);
         new AlertDialog.Builder(MainActivity.this)
             .setTitle("Delete entry")
diff --git a/app/src/main/java/me/impy/aegis/db/Database.java b/app/src/main/java/me/impy/aegis/db/Database.java
index aee0ae66..67d4bca9 100644
--- a/app/src/main/java/me/impy/aegis/db/Database.java
+++ b/app/src/main/java/me/impy/aegis/db/Database.java
@@ -4,6 +4,7 @@ import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class Database {
@@ -49,6 +50,6 @@ public class Database {
     }
 
     public List<DatabaseEntry> getKeys() {
-        return _entries;
+        return Collections.unmodifiableList(_entries);
     }
 }
diff --git a/app/src/main/java/me/impy/aegis/db/DatabaseFile.java b/app/src/main/java/me/impy/aegis/db/DatabaseFile.java
index a127c5f5..efd4861f 100644
--- a/app/src/main/java/me/impy/aegis/db/DatabaseFile.java
+++ b/app/src/main/java/me/impy/aegis/db/DatabaseFile.java
@@ -193,7 +193,7 @@ public class DatabaseFile {
     }
 
     private static class section {
-        public byte ID;
-        public byte[] Data;
+        byte ID;
+        byte[] Data;
     }
 }
diff --git a/app/src/main/java/me/impy/aegis/ext/AegisImporter.java b/app/src/main/java/me/impy/aegis/importers/AegisImporter.java
similarity index 94%
rename from app/src/main/java/me/impy/aegis/ext/AegisImporter.java
rename to app/src/main/java/me/impy/aegis/importers/AegisImporter.java
index 4b866bda..b5e9ebc4 100644
--- a/app/src/main/java/me/impy/aegis/ext/AegisImporter.java
+++ b/app/src/main/java/me/impy/aegis/importers/AegisImporter.java
@@ -1,4 +1,4 @@
-package me.impy.aegis.ext;
+package me.impy.aegis.importers;
 
 import java.util.List;
 
diff --git a/app/src/main/java/me/impy/aegis/ext/DatabaseImporter.java b/app/src/main/java/me/impy/aegis/importers/DatabaseImporter.java
similarity index 97%
rename from app/src/main/java/me/impy/aegis/ext/DatabaseImporter.java
rename to app/src/main/java/me/impy/aegis/importers/DatabaseImporter.java
index c2fe84b0..18f7be83 100644
--- a/app/src/main/java/me/impy/aegis/ext/DatabaseImporter.java
+++ b/app/src/main/java/me/impy/aegis/importers/DatabaseImporter.java
@@ -1,4 +1,4 @@
-package me.impy.aegis.ext;
+package me.impy.aegis.importers;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/app/src/main/java/me/impy/aegis/ext/FreeOTPImporter.java b/app/src/main/java/me/impy/aegis/importers/FreeOTPImporter.java
similarity index 98%
rename from app/src/main/java/me/impy/aegis/ext/FreeOTPImporter.java
rename to app/src/main/java/me/impy/aegis/importers/FreeOTPImporter.java
index 9d13216c..e74f9c2c 100644
--- a/app/src/main/java/me/impy/aegis/ext/FreeOTPImporter.java
+++ b/app/src/main/java/me/impy/aegis/importers/FreeOTPImporter.java
@@ -1,4 +1,4 @@
-package me.impy.aegis.ext;
+package me.impy.aegis.importers;
 
 import android.util.Xml;
 
@@ -22,8 +22,8 @@ public class FreeOTPImporter extends DatabaseImporter {
     }
 
     private static class Entry {
-        public String Name;
-        public String Value;
+        String Name;
+        String Value;
     }
 
     @Override