diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/database/Database.java b/plugin/src/main/java/lol/pyr/znpcsplus/storage/database/Database.java
similarity index 68%
rename from plugin/src/main/java/lol/pyr/znpcsplus/database/Database.java
rename to plugin/src/main/java/lol/pyr/znpcsplus/storage/database/Database.java
index 7e50526..1794abd 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/database/Database.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/storage/database/Database.java
@@ -1,11 +1,11 @@
-package lol.pyr.znpcsplus.database;
+package lol.pyr.znpcsplus.storage.database;
 
 import java.sql.Connection;
 import java.util.logging.Logger;
 
 public abstract class Database {
-    Logger logger;
-    Connection connection;
+    protected final Logger logger;
+    protected Connection connection;
     public Database(Logger logger){
         this.logger = logger;
     }
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/database/SQLite.java b/plugin/src/main/java/lol/pyr/znpcsplus/storage/sqlite/SQLite.java
similarity index 95%
rename from plugin/src/main/java/lol/pyr/znpcsplus/database/SQLite.java
rename to plugin/src/main/java/lol/pyr/znpcsplus/storage/sqlite/SQLite.java
index 7c4fa64..344e038 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/database/SQLite.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/storage/sqlite/SQLite.java
@@ -1,4 +1,6 @@
-package lol.pyr.znpcsplus.database;
+package lol.pyr.znpcsplus.storage.sqlite;
+
+import lol.pyr.znpcsplus.storage.database.Database;
 
 import java.io.File;
 import java.io.IOException;
@@ -6,9 +8,8 @@ import java.sql.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-
 public class SQLite extends Database{
-    File dbFile;
+    private final File dbFile;
     public SQLite(File file, Logger logger){
         super(logger);
         dbFile = file;
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/storage/sqlite/SQLiteStorage.java b/plugin/src/main/java/lol/pyr/znpcsplus/storage/sqlite/SQLiteStorage.java
index 854f6c4..0519236 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/storage/sqlite/SQLiteStorage.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/storage/sqlite/SQLiteStorage.java
@@ -2,7 +2,6 @@ package lol.pyr.znpcsplus.storage.sqlite;
 
 import lol.pyr.znpcsplus.api.entity.EntityProperty;
 import lol.pyr.znpcsplus.config.ConfigManager;
-import lol.pyr.znpcsplus.database.SQLite;
 import lol.pyr.znpcsplus.entity.EntityPropertyImpl;
 import lol.pyr.znpcsplus.entity.EntityPropertyRegistryImpl;
 import lol.pyr.znpcsplus.entity.PropertySerializer;