diff --git a/Addon-TimedRTP/pom.xml b/Addon-TimedRTP/pom.xml
new file mode 100644
index 0000000..a35f980
--- /dev/null
+++ b/Addon-TimedRTP/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>BetterRTP</artifactId>
+        <groupId>me.SuperRonanCraft</groupId>
+        <version>2.14.5</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>Addon-TimedRTP</artifactId>
+    <version>1.0</version>
+    <build>
+        <finalName>${project.parent.artifactId}-${project.name}-${project.version}</finalName>
+    </build>
+</project>
\ No newline at end of file
diff --git a/Addon-TimedRTP/src/main/java/me/SuperRonanCraft/BetterRTP/Addon/TimedRTP/Main.java b/Addon-TimedRTP/src/main/java/me/SuperRonanCraft/BetterRTP/Addon/TimedRTP/Main.java
new file mode 100644
index 0000000..a01ba1c
--- /dev/null
+++ b/Addon-TimedRTP/src/main/java/me/SuperRonanCraft/BetterRTP/Addon/TimedRTP/Main.java
@@ -0,0 +1,8 @@
+package me.SuperRonanCraft.BetterRTP.Addon.TimedRTP;
+
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class Main extends JavaPlugin {
+
+
+}
diff --git a/Main/pom.xml b/Main/pom.xml
new file mode 100644
index 0000000..5af8a51
--- /dev/null
+++ b/Main/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>BetterRTP</artifactId>
+        <groupId>me.SuperRonanCraft</groupId>
+        <version>2.14.5</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>Main</artifactId>
+
+    <build>
+        <finalName>${project.parent.artifactId}-${project.parent.version}</finalName>
+        <plugins>
+            <plugin>
+                <!-- Shade PaperLib into project -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.1.1</version>
+                <configuration>
+                    <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
+                    <relocations>
+                        <relocation>
+                            <pattern>io.papermc.lib</pattern>
+                            <shadedPattern>me.SuperRonanCraft.BetterRTP.paperlib</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>hack-binary</id>
+                        <phase>clean</phase>
+                        <configuration>
+                            <file>${basedir}/LocalJars/Residence4.9.1.9.jar</file>
+                            <repositoryLayout>default</repositoryLayout>
+                            <groupId>com.bekvon.bukkit</groupId>
+                            <artifactId>residence</artifactId>
+                            <version>4.9.1.9</version>
+                            <packaging>jar</packaging>
+                            <generatePom>true</generatePom>
+                        </configuration>
+                        <goals>
+                            <goal>install-file</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/Main.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/Main.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/Main.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/Main.java
index a82b014..5864380 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/Main.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/Main.java
@@ -4,14 +4,14 @@ import me.SuperRonanCraft.BetterRTP.player.PlayerInfo;
 import me.SuperRonanCraft.BetterRTP.player.commands.Commands;
 import me.SuperRonanCraft.BetterRTP.player.events.Listener;
 import me.SuperRonanCraft.BetterRTP.player.rtp.RTP;
-import me.SuperRonanCraft.BetterRTP.references.depends.DepEconomy;
 import me.SuperRonanCraft.BetterRTP.references.Permissions;
-import me.SuperRonanCraft.BetterRTP.references.Updater;
+import me.SuperRonanCraft.BetterRTP.references.depends.DepEconomy;
 import me.SuperRonanCraft.BetterRTP.references.file.Files;
 import me.SuperRonanCraft.BetterRTP.references.file.Messages;
 import me.SuperRonanCraft.BetterRTP.references.invs.RTPInventories;
 import me.SuperRonanCraft.BetterRTP.references.settings.Settings;
 import me.SuperRonanCraft.BetterRTP.references.web.Metrics;
+import me.SuperRonanCraft.BetterRTP.references.Updater;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.java.JavaPlugin;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/PlayerInfo.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/PlayerInfo.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/PlayerInfo.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/PlayerInfo.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/CommandTypes.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/CommandTypes.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/CommandTypes.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/CommandTypes.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/Commands.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/Commands.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/Commands.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/Commands.java
index 3c2d6a1..4341f65 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/Commands.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/Commands.java
@@ -1,8 +1,8 @@
 package me.SuperRonanCraft.BetterRTP.player.commands;
 
+import me.SuperRonanCraft.BetterRTP.player.rtp.RTP_TYPE;
 import me.SuperRonanCraft.BetterRTP.Main;
 import me.SuperRonanCraft.BetterRTP.player.rtp.RTPCooldown;
-import me.SuperRonanCraft.BetterRTP.player.rtp.RTP_TYPE;
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
 import org.bukkit.block.Biome;
 import org.bukkit.command.CommandSender;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/RTPCommand.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/RTPCommand.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/RTPCommand.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/RTPCommand.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/RTPCommandHelpable.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/RTPCommandHelpable.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/RTPCommandHelpable.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/RTPCommandHelpable.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdBiome.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdBiome.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdBiome.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdBiome.java
index 486579a..c8690bd 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdBiome.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdBiome.java
@@ -1,9 +1,9 @@
 package me.SuperRonanCraft.BetterRTP.player.commands.types;
 
-import me.SuperRonanCraft.BetterRTP.player.commands.Commands;
 import me.SuperRonanCraft.BetterRTP.Main;
-import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
+import me.SuperRonanCraft.BetterRTP.player.commands.Commands;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
+import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
 import org.bukkit.command.CommandSender;
 
 import java.util.ArrayList;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdEdit.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdEdit.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdEdit.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdEdit.java
index b420f2d..d617559 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdEdit.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdEdit.java
@@ -1,9 +1,9 @@
 package me.SuperRonanCraft.BetterRTP.player.commands.types;
 
 import me.SuperRonanCraft.BetterRTP.Main;
-import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
+import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdHelp.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdHelp.java
similarity index 98%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdHelp.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdHelp.java
index 067b12d..21238d9 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdHelp.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdHelp.java
@@ -1,12 +1,11 @@
 package me.SuperRonanCraft.BetterRTP.player.commands.types;
 
-import me.SuperRonanCraft.BetterRTP.Main;
 import me.SuperRonanCraft.BetterRTP.player.commands.CommandTypes;
-import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
 import me.SuperRonanCraft.BetterRTP.references.file.Messages;
+import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdInfo.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdInfo.java
similarity index 98%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdInfo.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdInfo.java
index 525aeb9..656c09a 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdInfo.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdInfo.java
@@ -3,13 +3,11 @@ package me.SuperRonanCraft.BetterRTP.player.commands.types;
 import me.SuperRonanCraft.BetterRTP.Main;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
 import me.SuperRonanCraft.BetterRTP.player.rtp.RTPParticles;
-import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
-import me.SuperRonanCraft.BetterRTP.references.worlds.RTPWorld;
-import me.SuperRonanCraft.BetterRTP.references.worlds.WORLD_TYPE;
 import me.SuperRonanCraft.BetterRTP.references.worlds.WorldPlayer;
+import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
+import me.SuperRonanCraft.BetterRTP.references.worlds.WORLD_TYPE;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
-import org.bukkit.WorldBorder;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.potion.PotionEffectType;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java
index d4db393..a215859 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java
@@ -3,9 +3,9 @@ package me.SuperRonanCraft.BetterRTP.player.commands.types;
 import me.SuperRonanCraft.BetterRTP.Main;
 import me.SuperRonanCraft.BetterRTP.player.commands.CommandTypes;
 import me.SuperRonanCraft.BetterRTP.player.commands.Commands;
-import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
 import me.SuperRonanCraft.BetterRTP.player.rtp.RTP_TYPE;
+import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdReload.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdReload.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdReload.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdReload.java
index 0808772..fac771a 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdReload.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdReload.java
@@ -1,8 +1,8 @@
 package me.SuperRonanCraft.BetterRTP.player.commands.types;
 
 import me.SuperRonanCraft.BetterRTP.Main;
-import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
+import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
 import org.bukkit.command.CommandSender;
 
 import java.util.List;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdSettings.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdSettings.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdSettings.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdSettings.java
index 642e6ff..e6ae9c3 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdSettings.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdSettings.java
@@ -1,8 +1,8 @@
 package me.SuperRonanCraft.BetterRTP.player.commands.types;
 
+import me.SuperRonanCraft.BetterRTP.Main;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
 import me.SuperRonanCraft.BetterRTP.references.invs.RTP_INV_SETTINGS;
-import me.SuperRonanCraft.BetterRTP.Main;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdTest.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdTest.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdTest.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdTest.java
index 4186b02..98eeb3c 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdTest.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdTest.java
@@ -1,8 +1,8 @@
 package me.SuperRonanCraft.BetterRTP.player.commands.types;
 
 import me.SuperRonanCraft.BetterRTP.Main;
-import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
+import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdVersion.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdVersion.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdVersion.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdVersion.java
index 85dfecb..04291a1 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdVersion.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdVersion.java
@@ -1,8 +1,8 @@
 package me.SuperRonanCraft.BetterRTP.player.commands.types;
 
+import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
 import me.SuperRonanCraft.BetterRTP.Main;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
-import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
 import org.bukkit.command.CommandSender;
 
 import java.util.List;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdWorld.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdWorld.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdWorld.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdWorld.java
index 3385212..1877470 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdWorld.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdWorld.java
@@ -1,10 +1,10 @@
 package me.SuperRonanCraft.BetterRTP.player.commands.types;
 
+import me.SuperRonanCraft.BetterRTP.player.commands.Commands;
+import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
 import me.SuperRonanCraft.BetterRTP.Main;
 import me.SuperRonanCraft.BetterRTP.player.commands.CommandTypes;
-import me.SuperRonanCraft.BetterRTP.player.commands.Commands;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
-import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Click.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Click.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Click.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Click.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Interact.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Interact.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Interact.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Interact.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Leave.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Leave.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Leave.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Leave.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Listener.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Listener.java
similarity index 97%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Listener.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Listener.java
index fbff0c6..d21d235 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Listener.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Listener.java
@@ -7,7 +7,6 @@ import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.event.server.PluginEnableEvent;
 import org.bukkit.plugin.PluginManager;
 
 public class Listener implements org.bukkit.event.Listener {
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/PluginEnable.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/PluginEnable.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/events/PluginEnable.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/PluginEnable.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP.java
index 10dee32..91c9b80 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP.java
@@ -1,7 +1,7 @@
 package me.SuperRonanCraft.BetterRTP.player.rtp;
 
-import me.SuperRonanCraft.BetterRTP.Main;
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
+import me.SuperRonanCraft.BetterRTP.Main;
 import me.SuperRonanCraft.BetterRTP.references.worlds.*;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPCooldown.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPCooldown.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPCooldown.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPCooldown.java
index e45545d..345f54a 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPCooldown.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPCooldown.java
@@ -1,7 +1,7 @@
 package me.SuperRonanCraft.BetterRTP.player.rtp;
 
-import me.SuperRonanCraft.BetterRTP.Main;
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
+import me.SuperRonanCraft.BetterRTP.Main;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java
similarity index 97%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java
index 925e3d2..796c937 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java
@@ -1,6 +1,5 @@
 package me.SuperRonanCraft.BetterRTP.player.rtp;
 
-import me.SuperRonanCraft.BetterRTP.references.worlds.WorldPlayer;
 import me.SuperRonanCraft.BetterRTP.Main;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPParticles.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPParticles.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPParticles.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPParticles.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPermissionGroup.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPermissionGroup.java
similarity index 99%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPermissionGroup.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPermissionGroup.java
index 761571f..293436f 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPermissionGroup.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPermissionGroup.java
@@ -1,10 +1,9 @@
 package me.SuperRonanCraft.BetterRTP.player.rtp;
 
-import me.SuperRonanCraft.BetterRTP.Main;
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
+import me.SuperRonanCraft.BetterRTP.Main;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
 
 import java.util.*;
 
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java
similarity index 98%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java
index d232c68..a47a6f7 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java
@@ -1,8 +1,8 @@
 package me.SuperRonanCraft.BetterRTP.player.rtp;
 
+import me.SuperRonanCraft.BetterRTP.references.worlds.WorldPlayer;
 import io.papermc.lib.PaperLib;
 import me.SuperRonanCraft.BetterRTP.Main;
-import me.SuperRonanCraft.BetterRTP.references.worlds.*;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.World;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPluginValidation.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPluginValidation.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPluginValidation.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPluginValidation.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPotions.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPotions.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPotions.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPotions.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPSounds.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPSounds.java
similarity index 94%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPSounds.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPSounds.java
index d1ec326..5349694 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPSounds.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPSounds.java
@@ -2,9 +2,7 @@ package me.SuperRonanCraft.BetterRTP.player.rtp;
 
 import me.SuperRonanCraft.BetterRTP.Main;
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
-import org.bukkit.Bukkit;
 import org.bukkit.Sound;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 
 public class RTPSounds {
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTitles.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTitles.java
similarity index 98%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTitles.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTitles.java
index 1fa3c25..ddaace5 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTitles.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTitles.java
@@ -2,7 +2,6 @@ package me.SuperRonanCraft.BetterRTP.player.rtp;
 
 import me.SuperRonanCraft.BetterRTP.Main;
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
-import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP_TYPE.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP_TYPE.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP_TYPE.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP_TYPE.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/Permissions.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/Permissions.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/Permissions.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/Permissions.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/Updater.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/Updater.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/Updater.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/Updater.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepEconomy.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepEconomy.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepEconomy.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepEconomy.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepPerms.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepPerms.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepPerms.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepPerms.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/EcoFile.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/EcoFile.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/file/EcoFile.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/EcoFile.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/FileBasics.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/FileBasics.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/file/FileBasics.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/FileBasics.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/Files.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/Files.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/file/Files.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/Files.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/LangFile.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/LangFile.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/file/LangFile.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/LangFile.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/Messages.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/Messages.java
similarity index 99%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/file/Messages.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/Messages.java
index d5fd02d..a905178 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/Messages.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/Messages.java
@@ -1,12 +1,9 @@
 package me.SuperRonanCraft.BetterRTP.references.file;
 
 import me.SuperRonanCraft.BetterRTP.Main;
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.Sound;
 import org.bukkit.command.CommandSender;
 
-import java.util.Arrays;
 import java.util.List;
 
 public class Messages {
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTPInventories.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTPInventories.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTPInventories.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTPInventories.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTP_INV_SETTINGS.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTP_INV_SETTINGS.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTP_INV_SETTINGS.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTP_INV_SETTINGS.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTP_SETTINGS.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTP_SETTINGS.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTP_SETTINGS.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTP_SETTINGS.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTPInventory.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTPInventory.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTPInventory.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTPInventory.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTPInventory_Defaults.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTPInventory_Defaults.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTPInventory_Defaults.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTPInventory_Defaults.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTP_INV_ITEMS.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTP_INV_ITEMS.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTP_INV_ITEMS.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTP_INV_ITEMS.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvBlacklist.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvBlacklist.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvBlacklist.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvBlacklist.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvCoordinates.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvCoordinates.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvCoordinates.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvCoordinates.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvMain.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvMain.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvMain.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvMain.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvWorlds.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvWorlds.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvWorlds.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvWorlds.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/Settings.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/Settings.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/Settings.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/Settings.java
index ad4a4f5..f145ad5 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/Settings.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/Settings.java
@@ -1,7 +1,7 @@
 package me.SuperRonanCraft.BetterRTP.references.settings;
 
-import me.SuperRonanCraft.BetterRTP.Main;
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
+import me.SuperRonanCraft.BetterRTP.Main;
 
 public class Settings {
 
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/SoftDepends.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/SoftDepends.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/SoftDepends.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/SoftDepends.java
index 4a268aa..0ebf585 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/SoftDepends.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/SoftDepends.java
@@ -1,7 +1,7 @@
 package me.SuperRonanCraft.BetterRTP.references.settings;
 
-import me.SuperRonanCraft.BetterRTP.Main;
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
+import me.SuperRonanCraft.BetterRTP.Main;
 import org.bukkit.Bukkit;
 
 import java.util.logging.Level;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/web/Metrics.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/web/Metrics.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/web/Metrics.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/web/Metrics.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/RTPWorld.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/RTPWorld.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/RTPWorld.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/RTPWorld.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WORLD_TYPE.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WORLD_TYPE.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WORLD_TYPE.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WORLD_TYPE.java
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldCustom.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldCustom.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldCustom.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldCustom.java
index fd772d6..f400014 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldCustom.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldCustom.java
@@ -1,7 +1,7 @@
 package me.SuperRonanCraft.BetterRTP.references.worlds;
 
-import me.SuperRonanCraft.BetterRTP.Main;
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
+import me.SuperRonanCraft.BetterRTP.Main;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldDefault.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldDefault.java
similarity index 98%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldDefault.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldDefault.java
index ddf19d5..1971795 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldDefault.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldDefault.java
@@ -1,12 +1,11 @@
 package me.SuperRonanCraft.BetterRTP.references.worlds;
 
 
-import me.SuperRonanCraft.BetterRTP.Main;
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
+import me.SuperRonanCraft.BetterRTP.Main;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 
-import java.util.HashMap;
 import java.util.List;
 
 public class WorldDefault implements RTPWorld {
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldPlayer.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldPlayer.java
similarity index 100%
rename from src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldPlayer.java
rename to Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldPlayer.java
index 931188d..c7ab0bb 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldPlayer.java
+++ b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldPlayer.java
@@ -1,7 +1,7 @@
 package me.SuperRonanCraft.BetterRTP.references.worlds;
 
-import me.SuperRonanCraft.BetterRTP.Main;
 import me.SuperRonanCraft.BetterRTP.player.rtp.RTPPermissionGroup;
+import me.SuperRonanCraft.BetterRTP.Main;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.WorldBorder;
diff --git a/src/main/resources/config.yml b/Main/src/main/resources/config.yml
similarity index 100%
rename from src/main/resources/config.yml
rename to Main/src/main/resources/config.yml
diff --git a/src/main/resources/economy.yml b/Main/src/main/resources/economy.yml
similarity index 100%
rename from src/main/resources/economy.yml
rename to Main/src/main/resources/economy.yml
diff --git a/src/main/resources/effects.yml b/Main/src/main/resources/effects.yml
similarity index 100%
rename from src/main/resources/effects.yml
rename to Main/src/main/resources/effects.yml
diff --git a/src/main/resources/lang/README.md b/Main/src/main/resources/lang/README.md
similarity index 100%
rename from src/main/resources/lang/README.md
rename to Main/src/main/resources/lang/README.md
diff --git a/src/main/resources/lang/chs.yml b/Main/src/main/resources/lang/chs.yml
similarity index 100%
rename from src/main/resources/lang/chs.yml
rename to Main/src/main/resources/lang/chs.yml
diff --git a/src/main/resources/lang/cht.yml b/Main/src/main/resources/lang/cht.yml
similarity index 98%
rename from src/main/resources/lang/cht.yml
rename to Main/src/main/resources/lang/cht.yml
index dcf6f29..423aaf2 100644
--- a/src/main/resources/lang/cht.yml
+++ b/Main/src/main/resources/lang/cht.yml
@@ -1,58 +1,58 @@
-# Translation author: OasisAkari (GitHub)
-Messages:
-  Prefix: '&7[&6BetterRTP&7] '
-  Success: ## Placeholders! %x% %y% 和 %z% 是玩家要被傳送到的對應 x y z 座標! #
-    Paid: '&a您花費了&c$%price%&7，被傳送到了&7 x=%x% y=%y% z=%z%。一共嘗試&f%attempts%&7次！'
-    Bypass: '&a您被傳送到了&7 x=%x% y=%y% z=%z%。一共嘗試&f%attempts%&7次！'
-    Loading: '&a已定位安全位置! &7正在讀取區塊...'
-#    Teleport: '&aTeleporting... &fplease wait while we find a safe location!'
-  Failed:
-    Price: '&c您的資金不夠了！&7您需要有$%price%&7才能嘗試RTP！'
-    NotSafe: '&c由於%attempts%次嘗試內未能找到適合的地方傳送，&7您未被傳送！'
-#    Hunger: '&cCould not rtp because you are... &7too hungry&c, eat something fella!'
-  Other:
-    Success: '&a%player%被傳送到了&7 x=%x% y=%y% z=%z%。一共嘗試&f%attempts%&7次！'
-    NotSafe: '&c由於%attempts%次嘗試內未能找到適合的地方傳送，&7%player%未被傳送！'
-    Biome: '&c看上去&7%biome%&c生態域不存在，&7試試使用Tab清單查找吧！'
-  Reload: '&e配置成功重新加載！'
-  NoPermission:
-    Basic: '&c抱歉，&7您沒有權限使用此指令！'
-    World: '&c抱歉，&7您不能在%world%世界傳送！'
-  ## %world% 是玩家嘗試傳送到但設定已禁用的世界! #
-  DisabledWorld: '&c%world%世界已被禁止使用此指令，&7您無法傳送！'
-  Cooldown: '&c抱歉，&7您需要在&c%time%&7秒後才能嘗試傳送！'
-  Locked: '&cSorry! &7You''ve used up all your RTP''s!'
-  Invalid: '&c無效的參數，請使用''/%command% help''查看幫助。'
-  NotOnline: '&c玩家&7%player%&c不在線！'
-  Delay: '&a即將在&f%time%&a秒後傳送，請站好！'
-  Moved: '&c您移動了，&7RTP被取消了！'
-  NotExist: '&c看上去&7%world%&c世界並不存在！'
-  Already: '&c哎呦！&7看上去您已經在傳送中了，耐心一點點！'
-  Sign: '&7指令標記已創建！&7指令為''&f/rtp %command%&7'''
-#  Edit:
-#    Error: '&cError! &7Invalid input provided!'
-#    Set: '&bSuccess! &7%type% set to %value%'
-#    Remove: '&cRemoved! &7You removed the Custom World %world%'
-
-Help:
-#  Prefix: '&e&m-----&6&l BetterRTP &8| Help &e&m-----'
-  Main: ' &7- &e/%command% &7- 把您隨機傳送！'
-  Biome: ' &7- &e/%command% biome <生態域1, 生態域2...> &7- 在這些指定的生態域中隨機傳送。'
-#  Edit: ' &7- &e/%command% edit <default/world> [args...] &7- Edit some plugin settings'
-  Help: ' &7- &e/%command% help &7- 打開幫助菜單。'
-#  Info: ' &7- &e/%command% info [world/particles/shapes/potion_effects] &7- View specific information about plugin parameters'
-  Player: ' &7- &e/%command% player <玩家> [世界] [生態域1，生態域2...] &7- 指定一個玩家隨機傳送。'
-  Reload: ' &7- &e/%command% reload &7- 重新讀取插件設定。'
-#  Settings: ' &7- &e/%command% settings &7- Pull up a gui and edit some settings'
-#  Test: ' &7- &e/%command% test &7- Test out plugin effects after a teleport without moving'
-#  Version: ' &7- &e/%command% version &7- View currently running version'
-  World: ' &7- &e/%command% world <世界> [生態域1, 生態域2...] &7- 在其他世界隨機傳送。'
-
-Usage:
-  Player: '&cUsage&7: /%command% player <玩家> [世界] [生態域1, 生態域2]'
-  World: '&cUsage&7: /%command% world <世界> [生態域1, 生態域2...]'
-  Biome: '&cUsage&7: /%command% biome <生態域1, 生態域2...>'
-#  Edit:
-#    Base: '&cUsage&7: /%command% edit <default/world> [args...]'
-#    Default: '&cUsage&7: /%command% edit default <max/min/useworldborder/center> <value>'
+# Translation author: OasisAkari (GitHub)
+Messages:
+  Prefix: '&7[&6BetterRTP&7] '
+  Success: ## Placeholders! %x% %y% 和 %z% 是玩家要被傳送到的對應 x y z 座標! #
+    Paid: '&a您花費了&c$%price%&7，被傳送到了&7 x=%x% y=%y% z=%z%。一共嘗試&f%attempts%&7次！'
+    Bypass: '&a您被傳送到了&7 x=%x% y=%y% z=%z%。一共嘗試&f%attempts%&7次！'
+    Loading: '&a已定位安全位置! &7正在讀取區塊...'
+#    Teleport: '&aTeleporting... &fplease wait while we find a safe location!'
+  Failed:
+    Price: '&c您的資金不夠了！&7您需要有$%price%&7才能嘗試RTP！'
+    NotSafe: '&c由於%attempts%次嘗試內未能找到適合的地方傳送，&7您未被傳送！'
+#    Hunger: '&cCould not rtp because you are... &7too hungry&c, eat something fella!'
+  Other:
+    Success: '&a%player%被傳送到了&7 x=%x% y=%y% z=%z%。一共嘗試&f%attempts%&7次！'
+    NotSafe: '&c由於%attempts%次嘗試內未能找到適合的地方傳送，&7%player%未被傳送！'
+    Biome: '&c看上去&7%biome%&c生態域不存在，&7試試使用Tab清單查找吧！'
+  Reload: '&e配置成功重新加載！'
+  NoPermission:
+    Basic: '&c抱歉，&7您沒有權限使用此指令！'
+    World: '&c抱歉，&7您不能在%world%世界傳送！'
+  ## %world% 是玩家嘗試傳送到但設定已禁用的世界! #
+  DisabledWorld: '&c%world%世界已被禁止使用此指令，&7您無法傳送！'
+  Cooldown: '&c抱歉，&7您需要在&c%time%&7秒後才能嘗試傳送！'
+  Locked: '&cSorry! &7You''ve used up all your RTP''s!'
+  Invalid: '&c無效的參數，請使用''/%command% help''查看幫助。'
+  NotOnline: '&c玩家&7%player%&c不在線！'
+  Delay: '&a即將在&f%time%&a秒後傳送，請站好！'
+  Moved: '&c您移動了，&7RTP被取消了！'
+  NotExist: '&c看上去&7%world%&c世界並不存在！'
+  Already: '&c哎呦！&7看上去您已經在傳送中了，耐心一點點！'
+  Sign: '&7指令標記已創建！&7指令為''&f/rtp %command%&7'''
+#  Edit:
+#    Error: '&cError! &7Invalid input provided!'
+#    Set: '&bSuccess! &7%type% set to %value%'
+#    Remove: '&cRemoved! &7You removed the Custom World %world%'
+
+Help:
+#  Prefix: '&e&m-----&6&l BetterRTP &8| Help &e&m-----'
+  Main: ' &7- &e/%command% &7- 把您隨機傳送！'
+  Biome: ' &7- &e/%command% biome <生態域1, 生態域2...> &7- 在這些指定的生態域中隨機傳送。'
+#  Edit: ' &7- &e/%command% edit <default/world> [args...] &7- Edit some plugin settings'
+  Help: ' &7- &e/%command% help &7- 打開幫助菜單。'
+#  Info: ' &7- &e/%command% info [world/particles/shapes/potion_effects] &7- View specific information about plugin parameters'
+  Player: ' &7- &e/%command% player <玩家> [世界] [生態域1，生態域2...] &7- 指定一個玩家隨機傳送。'
+  Reload: ' &7- &e/%command% reload &7- 重新讀取插件設定。'
+#  Settings: ' &7- &e/%command% settings &7- Pull up a gui and edit some settings'
+#  Test: ' &7- &e/%command% test &7- Test out plugin effects after a teleport without moving'
+#  Version: ' &7- &e/%command% version &7- View currently running version'
+  World: ' &7- &e/%command% world <世界> [生態域1, 生態域2...] &7- 在其他世界隨機傳送。'
+
+Usage:
+  Player: '&cUsage&7: /%command% player <玩家> [世界] [生態域1, 生態域2]'
+  World: '&cUsage&7: /%command% world <世界> [生態域1, 生態域2...]'
+  Biome: '&cUsage&7: /%command% biome <生態域1, 生態域2...>'
+#  Edit:
+#    Base: '&cUsage&7: /%command% edit <default/world> [args...]'
+#    Default: '&cUsage&7: /%command% edit default <max/min/useworldborder/center> <value>'
 #    World: '&cUsage&7: /%command% edit world <world> <max/min/useworldborder/center> <value>'
\ No newline at end of file
diff --git a/src/main/resources/lang/cs.yml b/Main/src/main/resources/lang/cs.yml
similarity index 100%
rename from src/main/resources/lang/cs.yml
rename to Main/src/main/resources/lang/cs.yml
diff --git a/src/main/resources/lang/du.yml b/Main/src/main/resources/lang/du.yml
similarity index 100%
rename from src/main/resources/lang/du.yml
rename to Main/src/main/resources/lang/du.yml
diff --git a/src/main/resources/lang/en.yml b/Main/src/main/resources/lang/en.yml
similarity index 100%
rename from src/main/resources/lang/en.yml
rename to Main/src/main/resources/lang/en.yml
diff --git a/src/main/resources/lang/es.yml b/Main/src/main/resources/lang/es.yml
similarity index 100%
rename from src/main/resources/lang/es.yml
rename to Main/src/main/resources/lang/es.yml
diff --git a/src/main/resources/lang/fr.yml b/Main/src/main/resources/lang/fr.yml
similarity index 100%
rename from src/main/resources/lang/fr.yml
rename to Main/src/main/resources/lang/fr.yml
diff --git a/src/main/resources/lang/ja.yml b/Main/src/main/resources/lang/ja.yml
similarity index 100%
rename from src/main/resources/lang/ja.yml
rename to Main/src/main/resources/lang/ja.yml
diff --git a/src/main/resources/lang/ru.yml b/Main/src/main/resources/lang/ru.yml
similarity index 100%
rename from src/main/resources/lang/ru.yml
rename to Main/src/main/resources/lang/ru.yml
diff --git a/src/main/resources/locations.yml b/Main/src/main/resources/locations.yml
similarity index 100%
rename from src/main/resources/locations.yml
rename to Main/src/main/resources/locations.yml
diff --git a/src/main/resources/permissions.yml b/Main/src/main/resources/permissions.yml
similarity index 100%
rename from src/main/resources/permissions.yml
rename to Main/src/main/resources/permissions.yml
diff --git a/src/main/resources/plugin.yml b/Main/src/main/resources/plugin.yml
similarity index 100%
rename from src/main/resources/plugin.yml
rename to Main/src/main/resources/plugin.yml
diff --git a/src/main/resources/signs.yml b/Main/src/main/resources/signs.yml
similarity index 100%
rename from src/main/resources/signs.yml
rename to Main/src/main/resources/signs.yml
diff --git a/README.md b/README.md
index ed1d747..17d014e 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 </p>
 
 ## Where's the Lang files?/Want to Contribute translating?  
-All language files are located [here](src/main/resources/lang)
+All language files are located [here](BetterRTP-Main/src/main/resources/lang)
 feel free to fork one of the language files and help translate!
 
 ## Libraries
diff --git a/pom.xml b/pom.xml
index 5fa1cfc..e3c1882 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,13 @@
 
     <groupId>me.SuperRonanCraft</groupId>
     <artifactId>BetterRTP</artifactId>
-    <version>2.14.4</version>
+    <packaging>pom</packaging>
+    <version>2.14.5</version>
+
+    <modules>
+        <module>Addon-TimedRTP</module>
+        <module>Main</module>
+    </modules>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -15,62 +21,16 @@
 
     <build>
         <plugins>
-            <plugin>
-                <!-- Shade PaperLib into project -->
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.1</version>
-                <configuration>
-                    <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
-                    <relocations>
-                        <relocation>
-                            <pattern>io.papermc.lib</pattern>
-                            <shadedPattern>me.SuperRonanCraft.BetterRTP.paperlib</shadedPattern>
-                        </relocation>
-                    </relocations>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <!-- Local Server Building -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>3.2.0</version>
                 <configuration>
-                    <outputDirectory>../../Java/plugins</outputDirectory>
+                    <outputDirectory>../../../Java/plugins</outputDirectory>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-install-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>hack-binary</id>
-                        <phase>clean</phase>
-                        <configuration>
-                            <file>${basedir}/LocalJars/Residence4.9.1.9.jar</file>
-                            <repositoryLayout>default</repositoryLayout>
-                            <groupId>com.bekvon.bukkit</groupId>
-                            <artifactId>residence</artifactId>
-                            <version>4.9.1.9</version>
-                            <packaging>jar</packaging>
-                            <generatePom>true</generatePom>
-                        </configuration>
-                        <goals>
-                            <goal>install-file</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
-
     </build>
 
     <repositories>