diff --git a/Plan/src/main/java/com/djrapitops/plan/Plan.java b/Plan/src/main/java/com/djrapitops/plan/Plan.java
index f7cc21512..7c5019663 100644
--- a/Plan/src/main/java/com/djrapitops/plan/Plan.java
+++ b/Plan/src/main/java/com/djrapitops/plan/Plan.java
@@ -55,9 +55,9 @@ import main.java.com.djrapitops.plan.systems.listeners.*;
 import main.java.com.djrapitops.plan.systems.processing.Processor;
 import main.java.com.djrapitops.plan.systems.processing.importing.importers.OfflinePlayerImporter;
 import main.java.com.djrapitops.plan.systems.queue.ProcessingQueue;
-import main.java.com.djrapitops.plan.systems.store.FileSystem;
-import main.java.com.djrapitops.plan.systems.store.config.ConfigSystem;
-import main.java.com.djrapitops.plan.systems.store.database.DBSystem;
+import main.java.com.djrapitops.plan.systems.file.FileSystem;
+import main.java.com.djrapitops.plan.systems.file.config.ConfigSystem;
+import main.java.com.djrapitops.plan.systems.file.database.DBSystem;
 import main.java.com.djrapitops.plan.systems.tasks.TPSCountTimer;
 import main.java.com.djrapitops.plan.systems.webserver.WebServer;
 import main.java.com.djrapitops.plan.systems.webserver.WebServerSystem;
diff --git a/Plan/src/main/java/com/djrapitops/plan/PlanBungee.java b/Plan/src/main/java/com/djrapitops/plan/PlanBungee.java
index dcf9c2fb6..a5cbf627d 100644
--- a/Plan/src/main/java/com/djrapitops/plan/PlanBungee.java
+++ b/Plan/src/main/java/com/djrapitops/plan/PlanBungee.java
@@ -30,9 +30,9 @@ import main.java.com.djrapitops.plan.systems.info.server.BungeeServerInfoManager
 import main.java.com.djrapitops.plan.systems.listeners.BungeePlayerListener;
 import main.java.com.djrapitops.plan.systems.processing.Processor;
 import main.java.com.djrapitops.plan.systems.queue.ProcessingQueue;
-import main.java.com.djrapitops.plan.systems.store.FileSystem;
-import main.java.com.djrapitops.plan.systems.store.config.ConfigSystem;
-import main.java.com.djrapitops.plan.systems.store.database.DBSystem;
+import main.java.com.djrapitops.plan.systems.file.FileSystem;
+import main.java.com.djrapitops.plan.systems.file.config.ConfigSystem;
+import main.java.com.djrapitops.plan.systems.file.database.DBSystem;
 import main.java.com.djrapitops.plan.systems.tasks.TPSCountTimer;
 import main.java.com.djrapitops.plan.systems.webserver.WebServer;
 import main.java.com.djrapitops.plan.systems.webserver.WebServerSystem;
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/plugin/PluginsConfigSection.java b/Plan/src/main/java/com/djrapitops/plan/data/plugin/PluginsConfigSection.java
index 669101ea3..507df7550 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/plugin/PluginsConfigSection.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/plugin/PluginsConfigSection.java
@@ -2,7 +2,7 @@ package main.java.com.djrapitops.plan.data.plugin;
 
 import com.djrapitops.plugin.api.config.ConfigNode;
 import com.djrapitops.plugin.api.utility.log.Log;
-import main.java.com.djrapitops.plan.systems.store.config.ConfigSystem;
+import main.java.com.djrapitops.plan.systems.file.config.ConfigSystem;
 
 import java.io.IOException;
 
diff --git a/Plan/src/main/java/com/djrapitops/plan/settings/Settings.java b/Plan/src/main/java/com/djrapitops/plan/settings/Settings.java
index 3ac86f5f5..54302be4b 100644
--- a/Plan/src/main/java/com/djrapitops/plan/settings/Settings.java
+++ b/Plan/src/main/java/com/djrapitops/plan/settings/Settings.java
@@ -2,7 +2,7 @@ package main.java.com.djrapitops.plan.settings;
 
 import com.djrapitops.plugin.api.Check;
 import com.djrapitops.plugin.api.config.Config;
-import main.java.com.djrapitops.plan.systems.store.config.ConfigSystem;
+import main.java.com.djrapitops.plan.systems.file.config.ConfigSystem;
 
 import java.util.List;
 
diff --git a/Plan/src/main/java/com/djrapitops/plan/settings/WorldAliasSettings.java b/Plan/src/main/java/com/djrapitops/plan/settings/WorldAliasSettings.java
index 82f3d7cfa..303cfd482 100644
--- a/Plan/src/main/java/com/djrapitops/plan/settings/WorldAliasSettings.java
+++ b/Plan/src/main/java/com/djrapitops/plan/settings/WorldAliasSettings.java
@@ -8,7 +8,7 @@ import com.djrapitops.plugin.api.config.Config;
 import com.djrapitops.plugin.api.config.ConfigNode;
 import com.djrapitops.plugin.api.utility.log.Log;
 import com.djrapitops.plugin.utilities.Verify;
-import main.java.com.djrapitops.plan.systems.store.config.ConfigSystem;
+import main.java.com.djrapitops.plan.systems.file.config.ConfigSystem;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/Plan/src/main/java/com/djrapitops/plan/settings/locale/Locale.java b/Plan/src/main/java/com/djrapitops/plan/settings/locale/Locale.java
index 03b150317..4dc7292fd 100644
--- a/Plan/src/main/java/com/djrapitops/plan/settings/locale/Locale.java
+++ b/Plan/src/main/java/com/djrapitops/plan/settings/locale/Locale.java
@@ -8,8 +8,8 @@ import com.djrapitops.plugin.settings.DefaultMessages;
 import com.djrapitops.plugin.utilities.Verify;
 import main.java.com.djrapitops.plan.settings.Permissions;
 import main.java.com.djrapitops.plan.settings.Settings;
-import main.java.com.djrapitops.plan.systems.store.FileSystem;
-import main.java.com.djrapitops.plan.systems.store.config.ConfigSystem;
+import main.java.com.djrapitops.plan.systems.file.FileSystem;
+import main.java.com.djrapitops.plan.systems.file.config.ConfigSystem;
 import main.java.com.djrapitops.plan.utilities.MiscUtils;
 import main.java.com.djrapitops.plan.utilities.comparators.LocaleEntryComparator;
 import main.java.com.djrapitops.plan.utilities.comparators.StringLengthComparator;
diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/Systems.java b/Plan/src/main/java/com/djrapitops/plan/systems/Systems.java
index e2e561a29..b31776837 100644
--- a/Plan/src/main/java/com/djrapitops/plan/systems/Systems.java
+++ b/Plan/src/main/java/com/djrapitops/plan/systems/Systems.java
@@ -7,13 +7,13 @@ package main.java.com.djrapitops.plan.systems;
 import com.djrapitops.plugin.api.utility.log.Log;
 import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.PlanBungee;
-import main.java.com.djrapitops.plan.systems.store.FileSystem;
-import main.java.com.djrapitops.plan.systems.store.config.ConfigSystem;
-import main.java.com.djrapitops.plan.systems.store.config.PlanBungeeConfigSystem;
-import main.java.com.djrapitops.plan.systems.store.config.PlanConfigSystem;
-import main.java.com.djrapitops.plan.systems.store.database.DBSystem;
-import main.java.com.djrapitops.plan.systems.store.database.PlanBungeeDBSystem;
-import main.java.com.djrapitops.plan.systems.store.database.PlanDBSystem;
+import main.java.com.djrapitops.plan.systems.file.FileSystem;
+import main.java.com.djrapitops.plan.systems.file.config.ConfigSystem;
+import main.java.com.djrapitops.plan.systems.file.config.PlanBungeeConfigSystem;
+import main.java.com.djrapitops.plan.systems.file.config.PlanConfigSystem;
+import main.java.com.djrapitops.plan.systems.file.database.DBSystem;
+import main.java.com.djrapitops.plan.systems.file.database.PlanBungeeDBSystem;
+import main.java.com.djrapitops.plan.systems.file.database.PlanDBSystem;
 import main.java.com.djrapitops.plan.systems.webserver.WebServerSystem;
 import main.java.com.djrapitops.plan.utilities.MiscUtils;
 import org.apache.commons.lang3.ArrayUtils;
diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/store/FileSystem.java b/Plan/src/main/java/com/djrapitops/plan/systems/file/FileSystem.java
similarity index 96%
rename from Plan/src/main/java/com/djrapitops/plan/systems/store/FileSystem.java
rename to Plan/src/main/java/com/djrapitops/plan/systems/file/FileSystem.java
index a668b7adc..ed5b48946 100644
--- a/Plan/src/main/java/com/djrapitops/plan/systems/store/FileSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/systems/file/FileSystem.java
@@ -2,7 +2,7 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package main.java.com.djrapitops.plan.systems.store;
+package main.java.com.djrapitops.plan.systems.file;
 
 import main.java.com.djrapitops.plan.api.IPlan;
 import main.java.com.djrapitops.plan.api.exceptions.PlanEnableException;
diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/store/config/ConfigSystem.java b/Plan/src/main/java/com/djrapitops/plan/systems/file/config/ConfigSystem.java
similarity index 92%
rename from Plan/src/main/java/com/djrapitops/plan/systems/store/config/ConfigSystem.java
rename to Plan/src/main/java/com/djrapitops/plan/systems/file/config/ConfigSystem.java
index d78cbe7e3..ec375c1d6 100644
--- a/Plan/src/main/java/com/djrapitops/plan/systems/store/config/ConfigSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/systems/file/config/ConfigSystem.java
@@ -2,14 +2,14 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package main.java.com.djrapitops.plan.systems.store.config;
+package main.java.com.djrapitops.plan.systems.file.config;
 
 import com.djrapitops.plugin.api.config.Config;
 import com.djrapitops.plugin.api.utility.log.Log;
 import main.java.com.djrapitops.plan.api.exceptions.PlanEnableException;
 import main.java.com.djrapitops.plan.systems.SubSystem;
 import main.java.com.djrapitops.plan.systems.Systems;
-import main.java.com.djrapitops.plan.systems.store.FileSystem;
+import main.java.com.djrapitops.plan.systems.file.FileSystem;
 
 import java.io.IOException;
 
diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/store/config/PlanBungeeConfigSystem.java b/Plan/src/main/java/com/djrapitops/plan/systems/file/config/PlanBungeeConfigSystem.java
similarity index 79%
rename from Plan/src/main/java/com/djrapitops/plan/systems/store/config/PlanBungeeConfigSystem.java
rename to Plan/src/main/java/com/djrapitops/plan/systems/file/config/PlanBungeeConfigSystem.java
index f9496777c..6c0603db3 100644
--- a/Plan/src/main/java/com/djrapitops/plan/systems/store/config/PlanBungeeConfigSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/systems/file/config/PlanBungeeConfigSystem.java
@@ -2,9 +2,9 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package main.java.com.djrapitops.plan.systems.store.config;
+package main.java.com.djrapitops.plan.systems.file.config;
 
-import main.java.com.djrapitops.plan.systems.store.FileSystem;
+import main.java.com.djrapitops.plan.systems.file.FileSystem;
 
 import java.io.IOException;
 
diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/store/config/PlanConfigSystem.java b/Plan/src/main/java/com/djrapitops/plan/systems/file/config/PlanConfigSystem.java
similarity index 78%
rename from Plan/src/main/java/com/djrapitops/plan/systems/store/config/PlanConfigSystem.java
rename to Plan/src/main/java/com/djrapitops/plan/systems/file/config/PlanConfigSystem.java
index b8f637b02..4999cbc8c 100644
--- a/Plan/src/main/java/com/djrapitops/plan/systems/store/config/PlanConfigSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/systems/file/config/PlanConfigSystem.java
@@ -2,9 +2,9 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package main.java.com.djrapitops.plan.systems.store.config;
+package main.java.com.djrapitops.plan.systems.file.config;
 
-import main.java.com.djrapitops.plan.systems.store.FileSystem;
+import main.java.com.djrapitops.plan.systems.file.FileSystem;
 
 import java.io.IOException;
 
diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/store/database/DBSystem.java b/Plan/src/main/java/com/djrapitops/plan/systems/file/database/DBSystem.java
similarity index 97%
rename from Plan/src/main/java/com/djrapitops/plan/systems/store/database/DBSystem.java
rename to Plan/src/main/java/com/djrapitops/plan/systems/file/database/DBSystem.java
index 3bec338fe..2598976a0 100644
--- a/Plan/src/main/java/com/djrapitops/plan/systems/store/database/DBSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/systems/file/database/DBSystem.java
@@ -2,7 +2,7 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package main.java.com.djrapitops.plan.systems.store.database;
+package main.java.com.djrapitops.plan.systems.file.database;
 
 import com.djrapitops.plugin.api.Benchmark;
 import com.djrapitops.plugin.api.utility.log.Log;
diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/store/database/PlanBungeeDBSystem.java b/Plan/src/main/java/com/djrapitops/plan/systems/file/database/PlanBungeeDBSystem.java
similarity index 90%
rename from Plan/src/main/java/com/djrapitops/plan/systems/store/database/PlanBungeeDBSystem.java
rename to Plan/src/main/java/com/djrapitops/plan/systems/file/database/PlanBungeeDBSystem.java
index 189a8c6f2..0dde6d687 100644
--- a/Plan/src/main/java/com/djrapitops/plan/systems/store/database/PlanBungeeDBSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/systems/file/database/PlanBungeeDBSystem.java
@@ -2,7 +2,7 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package main.java.com.djrapitops.plan.systems.store.database;
+package main.java.com.djrapitops.plan.systems.file.database;
 
 import main.java.com.djrapitops.plan.api.exceptions.DatabaseInitException;
 import main.java.com.djrapitops.plan.database.databases.MySQLDB;
diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/store/database/PlanDBSystem.java b/Plan/src/main/java/com/djrapitops/plan/systems/file/database/PlanDBSystem.java
similarity index 93%
rename from Plan/src/main/java/com/djrapitops/plan/systems/store/database/PlanDBSystem.java
rename to Plan/src/main/java/com/djrapitops/plan/systems/file/database/PlanDBSystem.java
index cc9ea0d00..a91d2634c 100644
--- a/Plan/src/main/java/com/djrapitops/plan/systems/store/database/PlanDBSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/systems/file/database/PlanDBSystem.java
@@ -2,7 +2,7 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package main.java.com.djrapitops.plan.systems.store.database;
+package main.java.com.djrapitops.plan.systems.file.database;
 
 import main.java.com.djrapitops.plan.api.exceptions.DatabaseInitException;
 import main.java.com.djrapitops.plan.database.databases.MySQLDB;
diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/ManageUtils.java b/Plan/src/main/java/com/djrapitops/plan/utilities/ManageUtils.java
index 155007365..81613de5a 100644
--- a/Plan/src/main/java/com/djrapitops/plan/utilities/ManageUtils.java
+++ b/Plan/src/main/java/com/djrapitops/plan/utilities/ManageUtils.java
@@ -6,7 +6,7 @@ import main.java.com.djrapitops.plan.api.exceptions.DatabaseInitException;
 import main.java.com.djrapitops.plan.database.Database;
 import main.java.com.djrapitops.plan.database.databases.SQLiteDB;
 import main.java.com.djrapitops.plan.database.tables.move.BatchOperationTable;
-import main.java.com.djrapitops.plan.systems.store.database.DBSystem;
+import main.java.com.djrapitops.plan.systems.file.database.DBSystem;
 
 import java.sql.SQLException;
 import java.util.*;
diff --git a/Plan/test/test/java/utils/testsystem/TestConfigSystem.java b/Plan/test/test/java/utils/testsystem/TestConfigSystem.java
index 080b93357..ad02855ea 100644
--- a/Plan/test/test/java/utils/testsystem/TestConfigSystem.java
+++ b/Plan/test/test/java/utils/testsystem/TestConfigSystem.java
@@ -4,7 +4,7 @@
  */
 package test.java.utils.testsystem;
 
-import main.java.com.djrapitops.plan.systems.store.config.ConfigSystem;
+import main.java.com.djrapitops.plan.systems.file.config.ConfigSystem;
 
 import java.io.File;
 import java.io.FileInputStream;