diff --git a/pom.xml b/pom.xml
index 385280f..8e63d2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@
         <!-- bStats -->
         <dependency>
             <groupId>org.bstats</groupId>
-            <artifactId>bstats-bukkit</artifactId>
+            <artifactId>bstats-bukkit-lite</artifactId>
             <version>1.7</version>
             <scope>compile</scope>
         </dependency>
@@ -104,16 +104,12 @@
 
     <build>
         <finalName>${project.artifactId}</finalName>
-        <defaultGoal>clean compile resources:resources package shade:shade</defaultGoal>
+        <defaultGoal>clean package</defaultGoal>
 
         <resources>
             <resource>
-                <targetPath>.</targetPath>
+                <directory>src/main/resources</directory>
                 <filtering>true</filtering>
-                <directory>${basedir}</directory>
-                <includes>
-                    <include>plugin.yml</include>
-                </includes>
             </resource>
         </resources>
 
@@ -144,15 +140,24 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>3.2.2</version>
                 <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
                     <artifactSet>
                         <includes>
                             <include>org.bstats:*</include>
                         </includes>
                     </artifactSet>
+                    <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>META-INF/</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
                     <relocations>
                         <relocation>
                             <pattern>org.bstats</pattern>
-                            <shadedPattern>io.github.a5h73y.Carz</shadedPattern>
+                            <shadedPattern>io.github.a5h73y.carz</shadedPattern>
                         </relocation>
                     </relocations>
                 </configuration>
diff --git a/src/main/java/io/github/a5h73y/Carz.java b/src/main/java/io/github/a5h73y/carz/Carz.java
similarity index 65%
rename from src/main/java/io/github/a5h73y/Carz.java
rename to src/main/java/io/github/a5h73y/carz/Carz.java
index 9f0e3c8..19b7ded 100644
--- a/src/main/java/io/github/a5h73y/Carz.java
+++ b/src/main/java/io/github/a5h73y/carz/Carz.java
@@ -1,24 +1,26 @@
-package io.github.a5h73y;
-
-import io.github.a5h73y.commands.CarzAutoTabCompleter;
-import io.github.a5h73y.commands.CarzCommands;
-import io.github.a5h73y.commands.CarzConsoleCommands;
-import io.github.a5h73y.configuration.Settings;
-import io.github.a5h73y.controllers.CarController;
-import io.github.a5h73y.controllers.FuelController;
-import io.github.a5h73y.listeners.PlayerListener;
-import io.github.a5h73y.listeners.SignListener;
-import io.github.a5h73y.listeners.VehicleListener;
-import io.github.a5h73y.other.CarzUpdater;
-import io.github.a5h73y.plugin.BountifulAPI;
-import io.github.a5h73y.plugin.EconomyAPI;
-import io.github.a5h73y.utility.ItemMetaUtils;
-import io.github.a5h73y.utility.TranslationUtils;
-import org.bstats.bukkit.Metrics;
+package io.github.a5h73y.carz;
+
+import io.github.a5h73y.carz.commands.CarzAutoTabCompleter;
+import io.github.a5h73y.carz.commands.CarzCommands;
+import io.github.a5h73y.carz.commands.CarzConsoleCommands;
+import io.github.a5h73y.carz.configuration.Settings;
+import io.github.a5h73y.carz.controllers.CarController;
+import io.github.a5h73y.carz.controllers.FuelController;
+import io.github.a5h73y.carz.listeners.PlayerListener;
+import io.github.a5h73y.carz.listeners.SignListener;
+import io.github.a5h73y.carz.listeners.VehicleListener;
+import io.github.a5h73y.carz.other.CarzUpdater;
+import io.github.a5h73y.carz.other.PluginUtils;
+import io.github.a5h73y.carz.plugin.BountifulAPI;
+import io.github.a5h73y.carz.plugin.EconomyAPI;
+import io.github.a5h73y.carz.utility.ItemMetaUtils;
+import io.github.a5h73y.carz.utility.TranslationUtils;
+import org.bstats.bukkit.MetricsLite;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class Carz extends JavaPlugin {
 
+    private static final int PLUGIN_ID = 42269;
     private static Carz instance;
 
     private BountifulAPI bountifulAPI;
@@ -48,10 +50,16 @@ public void onEnable() {
         setupPlugins();
 
         getLogger().info("Enabled Carz v" + getDescription().getVersion());
-        new Metrics(this, 42269);
+        new MetricsLite(this, PLUGIN_ID);
         updatePlugin();
     }
 
+    @Override
+    public void onDisable() {
+        PluginUtils.log("Disabled Carz v" + getDescription().getVersion());
+        instance = null;
+    }
+
     private void setupPlugins() {
         bountifulAPI = new BountifulAPI();
         economyAPI = new EconomyAPI();
@@ -77,7 +85,7 @@ public static String getPrefix() {
 
     private void updatePlugin() {
         if (getConfig().getBoolean("Other.UpdateCheck")) {
-            new CarzUpdater(this, 42269, this.getFile(), CarzUpdater.UpdateType.DEFAULT, true);
+            new CarzUpdater(this, PLUGIN_ID, this.getFile(), CarzUpdater.UpdateType.DEFAULT, true);
         }
     }
 
diff --git a/src/main/java/io/github/a5h73y/commands/CarzAutoTabCompleter.java b/src/main/java/io/github/a5h73y/carz/commands/CarzAutoTabCompleter.java
similarity index 89%
rename from src/main/java/io/github/a5h73y/commands/CarzAutoTabCompleter.java
rename to src/main/java/io/github/a5h73y/carz/commands/CarzAutoTabCompleter.java
index 34b2f81..bca0241 100644
--- a/src/main/java/io/github/a5h73y/commands/CarzAutoTabCompleter.java
+++ b/src/main/java/io/github/a5h73y/carz/commands/CarzAutoTabCompleter.java
@@ -1,13 +1,13 @@
-package io.github.a5h73y.commands;
+package io.github.a5h73y.carz.commands;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import io.github.a5h73y.Carz;
-import io.github.a5h73y.enums.Commands;
-import io.github.a5h73y.enums.Permissions;
-import io.github.a5h73y.other.AbstractPluginReceiver;
-import io.github.a5h73y.utility.PermissionUtils;
+import io.github.a5h73y.carz.Carz;
+import io.github.a5h73y.carz.enums.Commands;
+import io.github.a5h73y.carz.enums.Permissions;
+import io.github.a5h73y.carz.other.AbstractPluginReceiver;
+import io.github.a5h73y.carz.utility.PermissionUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
diff --git a/src/main/java/io/github/a5h73y/commands/CarzCommands.java b/src/main/java/io/github/a5h73y/carz/commands/CarzCommands.java
similarity index 87%
rename from src/main/java/io/github/a5h73y/commands/CarzCommands.java
rename to src/main/java/io/github/a5h73y/carz/commands/CarzCommands.java
index 64fbcc7..3decfef 100644
--- a/src/main/java/io/github/a5h73y/commands/CarzCommands.java
+++ b/src/main/java/io/github/a5h73y/carz/commands/CarzCommands.java
@@ -1,24 +1,24 @@
-package io.github.a5h73y.commands;
-
-import io.github.a5h73y.Carz;
-import io.github.a5h73y.conversation.CreateCarTypeConversation;
-import io.github.a5h73y.enums.Commands;
-import io.github.a5h73y.enums.Permissions;
-import io.github.a5h73y.enums.VehicleDetailKey;
-import io.github.a5h73y.model.Car;
-import io.github.a5h73y.other.AbstractPluginReceiver;
-import io.github.a5h73y.other.CarzHelp;
-import io.github.a5h73y.other.DelayTasks;
-import io.github.a5h73y.other.PluginUtils;
-import io.github.a5h73y.purchases.CarPurchase;
-import io.github.a5h73y.purchases.Purchasable;
-import io.github.a5h73y.purchases.RefuelPurchase;
-import io.github.a5h73y.purchases.UpgradePurchase;
-import io.github.a5h73y.utility.CarUtils;
-import io.github.a5h73y.utility.PermissionUtils;
-import io.github.a5h73y.utility.StringUtils;
-import io.github.a5h73y.utility.TranslationUtils;
-import io.github.a5h73y.utility.ValidationUtils;
+package io.github.a5h73y.carz.commands;
+
+import io.github.a5h73y.carz.Carz;
+import io.github.a5h73y.carz.conversation.CreateCarTypeConversation;
+import io.github.a5h73y.carz.enums.Commands;
+import io.github.a5h73y.carz.enums.Permissions;
+import io.github.a5h73y.carz.enums.VehicleDetailKey;
+import io.github.a5h73y.carz.model.Car;
+import io.github.a5h73y.carz.other.AbstractPluginReceiver;
+import io.github.a5h73y.carz.other.CarzHelp;
+import io.github.a5h73y.carz.other.DelayTasks;
+import io.github.a5h73y.carz.other.PluginUtils;
+import io.github.a5h73y.carz.purchases.CarPurchase;
+import io.github.a5h73y.carz.purchases.Purchasable;
+import io.github.a5h73y.carz.purchases.RefuelPurchase;
+import io.github.a5h73y.carz.purchases.UpgradePurchase;
+import io.github.a5h73y.carz.utility.CarUtils;
+import io.github.a5h73y.carz.utility.PermissionUtils;
+import io.github.a5h73y.carz.utility.StringUtils;
+import io.github.a5h73y.carz.utility.TranslationUtils;
+import io.github.a5h73y.carz.utility.ValidationUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -27,7 +27,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Vehicle;
 
-import static io.github.a5h73y.controllers.CarController.DEFAULT_CAR;
+import static io.github.a5h73y.carz.controllers.CarController.DEFAULT_CAR;
 
 /**
  * Player-related Carz commands handling.
diff --git a/src/main/java/io/github/a5h73y/commands/CarzConsoleCommands.java b/src/main/java/io/github/a5h73y/carz/commands/CarzConsoleCommands.java
similarity index 86%
rename from src/main/java/io/github/a5h73y/commands/CarzConsoleCommands.java
rename to src/main/java/io/github/a5h73y/carz/commands/CarzConsoleCommands.java
index dc392e6..a0d2bee 100644
--- a/src/main/java/io/github/a5h73y/commands/CarzConsoleCommands.java
+++ b/src/main/java/io/github/a5h73y/carz/commands/CarzConsoleCommands.java
@@ -1,12 +1,12 @@
-package io.github.a5h73y.commands;
-
-import io.github.a5h73y.Carz;
-import io.github.a5h73y.conversation.CreateCarTypeConversation;
-import io.github.a5h73y.enums.Commands;
-import io.github.a5h73y.other.AbstractPluginReceiver;
-import io.github.a5h73y.other.PluginUtils;
-import io.github.a5h73y.utility.CarUtils;
-import io.github.a5h73y.utility.TranslationUtils;
+package io.github.a5h73y.carz.commands;
+
+import io.github.a5h73y.carz.Carz;
+import io.github.a5h73y.carz.conversation.CreateCarTypeConversation;
+import io.github.a5h73y.carz.enums.Commands;
+import io.github.a5h73y.carz.other.AbstractPluginReceiver;
+import io.github.a5h73y.carz.other.PluginUtils;
+import io.github.a5h73y.carz.utility.CarUtils;
+import io.github.a5h73y.carz.utility.TranslationUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -15,7 +15,7 @@
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
 
-import static io.github.a5h73y.controllers.CarController.DEFAULT_CAR;
+import static io.github.a5h73y.carz.controllers.CarController.DEFAULT_CAR;
 
 /**
  * Console-related Carz commands handling.
diff --git a/src/main/java/io/github/a5h73y/configuration/Settings.java b/src/main/java/io/github/a5h73y/carz/configuration/Settings.java
similarity index 97%
rename from src/main/java/io/github/a5h73y/configuration/Settings.java
rename to src/main/java/io/github/a5h73y/carz/configuration/Settings.java
index b8166e7..e7ed905 100644
--- a/src/main/java/io/github/a5h73y/configuration/Settings.java
+++ b/src/main/java/io/github/a5h73y/carz/configuration/Settings.java
@@ -1,14 +1,14 @@
-package io.github.a5h73y.configuration;
+package io.github.a5h73y.carz.configuration;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 
-import io.github.a5h73y.Carz;
-import io.github.a5h73y.other.AbstractPluginReceiver;
-import io.github.a5h73y.other.PluginUtils;
-import io.github.a5h73y.utility.TranslationUtils;
+import io.github.a5h73y.carz.Carz;
+import io.github.a5h73y.carz.other.AbstractPluginReceiver;
+import io.github.a5h73y.carz.other.PluginUtils;
+import io.github.a5h73y.carz.utility.TranslationUtils;
 import org.bukkit.Material;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
diff --git a/src/main/java/io/github/a5h73y/controllers/CarController.java b/src/main/java/io/github/a5h73y/carz/controllers/CarController.java
similarity index 84%
rename from src/main/java/io/github/a5h73y/controllers/CarController.java
rename to src/main/java/io/github/a5h73y/carz/controllers/CarController.java
index e19c815..04a276c 100644
--- a/src/main/java/io/github/a5h73y/controllers/CarController.java
+++ b/src/main/java/io/github/a5h73y/carz/controllers/CarController.java
@@ -1,28 +1,24 @@
-package io.github.a5h73y.controllers;
+package io.github.a5h73y.carz.controllers;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import io.github.a5h73y.Carz;
-import io.github.a5h73y.enums.Permissions;
-import io.github.a5h73y.model.Car;
-import io.github.a5h73y.model.CarDetails;
-import io.github.a5h73y.other.AbstractPluginReceiver;
-import io.github.a5h73y.utility.CarUtils;
-import io.github.a5h73y.utility.EffectUtils;
-import io.github.a5h73y.utility.PermissionUtils;
-import io.github.a5h73y.utility.TranslationUtils;
+import io.github.a5h73y.carz.Carz;
+import io.github.a5h73y.carz.enums.Permissions;
+import io.github.a5h73y.carz.enums.VehicleDetailKey;
+import io.github.a5h73y.carz.model.Car;
+import io.github.a5h73y.carz.model.CarDetails;
+import io.github.a5h73y.carz.other.AbstractPluginReceiver;
+import io.github.a5h73y.carz.utility.CarUtils;
+import io.github.a5h73y.carz.utility.EffectUtils;
+import io.github.a5h73y.carz.utility.PermissionUtils;
+import io.github.a5h73y.carz.utility.TranslationUtils;
 import org.bukkit.Effect;
 import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Vehicle;
 
-import static io.github.a5h73y.enums.VehicleDetailKey.VEHICLE_FUEL;
-import static io.github.a5h73y.enums.VehicleDetailKey.VEHICLE_OWNER;
-import static io.github.a5h73y.enums.VehicleDetailKey.VEHICLE_SPEED;
-import static io.github.a5h73y.enums.VehicleDetailKey.VEHICLE_TYPE;
-
 /**
  * All Car related functionality.
  */
@@ -65,14 +61,14 @@ public void populateCarTypes() {
      * @param vehicle vehicle the player is driving
      */
     public void startDriving(String playerName, Vehicle vehicle) {
-        String carType = carz.getItemMetaUtils().getValue(VEHICLE_TYPE, vehicle);
+        String carType = carz.getItemMetaUtils().getValue(VehicleDetailKey.VEHICLE_TYPE, vehicle);
         Car car = getOrCreateCar(vehicle.getEntityId(), carType);
 
-        if (carz.getItemMetaUtils().has(VEHICLE_SPEED, vehicle)) {
-            car.setMaxSpeed(Double.parseDouble(carz.getItemMetaUtils().getValue(VEHICLE_SPEED, vehicle)));
+        if (carz.getItemMetaUtils().has(VehicleDetailKey.VEHICLE_SPEED, vehicle)) {
+            car.setMaxSpeed(Double.parseDouble(carz.getItemMetaUtils().getValue(VehicleDetailKey.VEHICLE_SPEED, vehicle)));
         }
-        if (carz.getItemMetaUtils().has(VEHICLE_FUEL, vehicle)) {
-            car.setCurrentFuel(Double.parseDouble(carz.getItemMetaUtils().getValue(VEHICLE_FUEL, vehicle)));
+        if (carz.getItemMetaUtils().has(VehicleDetailKey.VEHICLE_FUEL, vehicle)) {
+            car.setCurrentFuel(Double.parseDouble(carz.getItemMetaUtils().getValue(VehicleDetailKey.VEHICLE_FUEL, vehicle)));
         }
 
         playersDriving.put(playerName, car.getEntityId());
@@ -173,7 +169,7 @@ public void stashCar(Player player, Vehicle vehicle) {
             return;
         }
 
-        String owner = carz.getItemMetaUtils().getValue(VEHICLE_OWNER, vehicle);
+        String owner = carz.getItemMetaUtils().getValue(VehicleDetailKey.VEHICLE_OWNER, vehicle);
 
         if (!player.getName().equals(owner) && !PermissionUtils.hasStrictPermission(player, Permissions.ADMIN)) {
             return;
@@ -219,7 +215,7 @@ private void upgradeCarSpeed(Vehicle vehicle) {
         }
 
         car.setMaxSpeed(currentMax + upgradeAmount);
-        carz.getItemMetaUtils().setValue(VEHICLE_SPEED, vehicle, String.valueOf(car.getMaxSpeed()));
+        carz.getItemMetaUtils().setValue(VehicleDetailKey.VEHICLE_SPEED, vehicle, String.valueOf(car.getMaxSpeed()));
     }
 
     public Map<String, CarDetails> getCarTypes() {
diff --git a/src/main/java/io/github/a5h73y/controllers/FuelController.java b/src/main/java/io/github/a5h73y/carz/controllers/FuelController.java
similarity index 92%
rename from src/main/java/io/github/a5h73y/controllers/FuelController.java
rename to src/main/java/io/github/a5h73y/carz/controllers/FuelController.java
index 6cc0bf1..561c13c 100644
--- a/src/main/java/io/github/a5h73y/controllers/FuelController.java
+++ b/src/main/java/io/github/a5h73y/carz/controllers/FuelController.java
@@ -1,9 +1,9 @@
-package io.github.a5h73y.controllers;
+package io.github.a5h73y.carz.controllers;
 
-import io.github.a5h73y.Carz;
-import io.github.a5h73y.model.Car;
-import io.github.a5h73y.other.AbstractPluginReceiver;
-import io.github.a5h73y.utility.TranslationUtils;
+import io.github.a5h73y.carz.Carz;
+import io.github.a5h73y.carz.model.Car;
+import io.github.a5h73y.carz.other.AbstractPluginReceiver;
+import io.github.a5h73y.carz.utility.TranslationUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/io/github/a5h73y/conversation/CarzConversation.java b/src/main/java/io/github/a5h73y/carz/conversation/CarzConversation.java
similarity index 95%
rename from src/main/java/io/github/a5h73y/conversation/CarzConversation.java
rename to src/main/java/io/github/a5h73y/carz/conversation/CarzConversation.java
index 1f78494..c7bbc37 100644
--- a/src/main/java/io/github/a5h73y/conversation/CarzConversation.java
+++ b/src/main/java/io/github/a5h73y/carz/conversation/CarzConversation.java
@@ -1,6 +1,6 @@
-package io.github.a5h73y.conversation;
+package io.github.a5h73y.carz.conversation;
 
-import io.github.a5h73y.Carz;
+import io.github.a5h73y.carz.Carz;
 import org.bukkit.ChatColor;
 import org.bukkit.conversations.Conversable;
 import org.bukkit.conversations.Conversation;
diff --git a/src/main/java/io/github/a5h73y/conversation/CreateCarTypeConversation.java b/src/main/java/io/github/a5h73y/carz/conversation/CreateCarTypeConversation.java
similarity index 97%
rename from src/main/java/io/github/a5h73y/conversation/CreateCarTypeConversation.java
rename to src/main/java/io/github/a5h73y/carz/conversation/CreateCarTypeConversation.java
index d061232..52b36b0 100644
--- a/src/main/java/io/github/a5h73y/conversation/CreateCarTypeConversation.java
+++ b/src/main/java/io/github/a5h73y/carz/conversation/CreateCarTypeConversation.java
@@ -1,4 +1,4 @@
-package io.github.a5h73y.conversation;
+package io.github.a5h73y.carz.conversation;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -6,8 +6,8 @@
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import io.github.a5h73y.Carz;
-import io.github.a5h73y.utility.ValidationUtils;
+import io.github.a5h73y.carz.Carz;
+import io.github.a5h73y.carz.utility.ValidationUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.configuration.file.FileConfiguration;
diff --git a/src/main/java/io/github/a5h73y/enums/Commands.java b/src/main/java/io/github/a5h73y/carz/enums/Commands.java
similarity index 92%
rename from src/main/java/io/github/a5h73y/enums/Commands.java
rename to src/main/java/io/github/a5h73y/carz/enums/Commands.java
index ab3ec8f..d933ebc 100644
--- a/src/main/java/io/github/a5h73y/enums/Commands.java
+++ b/src/main/java/io/github/a5h73y/carz/enums/Commands.java
@@ -1,4 +1,4 @@
-package io.github.a5h73y.enums;
+package io.github.a5h73y.carz.enums;
 
 /**
  * The configurable Commands.
diff --git a/src/main/java/io/github/a5h73y/enums/Permissions.java b/src/main/java/io/github/a5h73y/carz/enums/Permissions.java
similarity index 92%
rename from src/main/java/io/github/a5h73y/enums/Permissions.java
rename to src/main/java/io/github/a5h73y/carz/enums/Permissions.java
index c5a3c50..f6c59c2 100644
--- a/src/main/java/io/github/a5h73y/enums/Permissions.java
+++ b/src/main/java/io/github/a5h73y/carz/enums/Permissions.java
@@ -1,4 +1,4 @@
-package io.github.a5h73y.enums;
+package io.github.a5h73y.carz.enums;
 
 /**
  * All Carz related permissions.
diff --git a/src/main/java/io/github/a5h73y/enums/VehicleDetailKey.java b/src/main/java/io/github/a5h73y/carz/enums/VehicleDetailKey.java
similarity index 88%
rename from src/main/java/io/github/a5h73y/enums/VehicleDetailKey.java
rename to src/main/java/io/github/a5h73y/carz/enums/VehicleDetailKey.java
index 494e573..0ba5515 100644
--- a/src/main/java/io/github/a5h73y/enums/VehicleDetailKey.java
+++ b/src/main/java/io/github/a5h73y/carz/enums/VehicleDetailKey.java
@@ -1,6 +1,6 @@
-package io.github.a5h73y.enums;
+package io.github.a5h73y.carz.enums;
 
-import io.github.a5h73y.Carz;
+import io.github.a5h73y.carz.Carz;
 import org.bukkit.NamespacedKey;
 
 public enum VehicleDetailKey {
diff --git a/src/main/java/io/github/a5h73y/listeners/PlayerListener.java b/src/main/java/io/github/a5h73y/carz/listeners/PlayerListener.java
similarity index 74%
rename from src/main/java/io/github/a5h73y/listeners/PlayerListener.java
rename to src/main/java/io/github/a5h73y/carz/listeners/PlayerListener.java
index 5ee9b5a..610cdd0 100644
--- a/src/main/java/io/github/a5h73y/listeners/PlayerListener.java
+++ b/src/main/java/io/github/a5h73y/carz/listeners/PlayerListener.java
@@ -1,13 +1,14 @@
-package io.github.a5h73y.listeners;
-
-import io.github.a5h73y.Carz;
-import io.github.a5h73y.enums.Permissions;
-import io.github.a5h73y.other.AbstractPluginReceiver;
-import io.github.a5h73y.other.DelayTasks;
-import io.github.a5h73y.other.XMaterial;
-import io.github.a5h73y.utility.PermissionUtils;
-import io.github.a5h73y.utility.PlayerUtils;
-import io.github.a5h73y.utility.TranslationUtils;
+package io.github.a5h73y.carz.listeners;
+
+import io.github.a5h73y.carz.Carz;
+import io.github.a5h73y.carz.enums.Permissions;
+import io.github.a5h73y.carz.enums.VehicleDetailKey;
+import io.github.a5h73y.carz.other.AbstractPluginReceiver;
+import io.github.a5h73y.carz.other.DelayTasks;
+import io.github.a5h73y.carz.other.XMaterial;
+import io.github.a5h73y.carz.utility.PermissionUtils;
+import io.github.a5h73y.carz.utility.PlayerUtils;
+import io.github.a5h73y.carz.utility.TranslationUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -20,9 +21,6 @@
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 
-import static io.github.a5h73y.enums.VehicleDetailKey.VEHICLE_OWNER;
-import static io.github.a5h73y.enums.VehicleDetailKey.VEHICLE_TYPE;
-
 public class PlayerListener extends AbstractPluginReceiver implements Listener {
 
     public PlayerListener(Carz carz) {
@@ -58,7 +56,7 @@ public void onPlaceMinecart(PlayerInteractEvent event) {
 
         ItemStack carInHand = PlayerUtils.getItemStackInPlayersHand(player);
 
-        if (!carInHand.hasItemMeta() || !carz.getItemMetaUtils().has(VEHICLE_TYPE, carInHand)) {
+        if (!carInHand.hasItemMeta() || !carz.getItemMetaUtils().has(VehicleDetailKey.VEHICLE_TYPE, carInHand)) {
             return;
         }
 
@@ -66,8 +64,8 @@ public void onPlaceMinecart(PlayerInteractEvent event) {
             return;
         }
 
-        if (carz.getItemMetaUtils().has(VEHICLE_OWNER, carInHand)) {
-            String owner = carz.getItemMetaUtils().getValue(VEHICLE_OWNER, carInHand);
+        if (carz.getItemMetaUtils().has(VehicleDetailKey.VEHICLE_OWNER, carInHand)) {
+            String owner = carz.getItemMetaUtils().getValue(VehicleDetailKey.VEHICLE_OWNER, carInHand);
 
             if (!owner.equalsIgnoreCase(player.getName())) {
                 TranslationUtils.sendTranslation("Error.Owned", player);
@@ -80,7 +78,7 @@ public void onPlaceMinecart(PlayerInteractEvent event) {
 
         carz.getItemMetaUtils().transferNamespaceKeyValues(carInHand.getItemMeta(), spawnedCar);
 
-        String vehicleType = carz.getItemMetaUtils().getValue(VEHICLE_TYPE, spawnedCar);
+        String vehicleType = carz.getItemMetaUtils().getValue(VehicleDetailKey.VEHICLE_TYPE, spawnedCar);
         Material fillMaterial = carz.getCarController().getCarTypes().get(vehicleType).getFillMaterial();
 
         if (fillMaterial != null && fillMaterial != Material.AIR) {
diff --git a/src/main/java/io/github/a5h73y/listeners/SignListener.java b/src/main/java/io/github/a5h73y/carz/listeners/SignListener.java
similarity index 90%
rename from src/main/java/io/github/a5h73y/listeners/SignListener.java
rename to src/main/java/io/github/a5h73y/carz/listeners/SignListener.java
index 3b55f0b..9359890 100644
--- a/src/main/java/io/github/a5h73y/listeners/SignListener.java
+++ b/src/main/java/io/github/a5h73y/carz/listeners/SignListener.java
@@ -1,16 +1,16 @@
-package io.github.a5h73y.listeners;
-
-import io.github.a5h73y.Carz;
-import io.github.a5h73y.enums.Permissions;
-import io.github.a5h73y.model.Car;
-import io.github.a5h73y.other.AbstractPluginReceiver;
-import io.github.a5h73y.purchases.CarPurchase;
-import io.github.a5h73y.purchases.RefuelPurchase;
-import io.github.a5h73y.purchases.UpgradePurchase;
-import io.github.a5h73y.utility.PermissionUtils;
-import io.github.a5h73y.utility.StringUtils;
-import io.github.a5h73y.utility.TranslationUtils;
-import io.github.a5h73y.utility.ValidationUtils;
+package io.github.a5h73y.carz.listeners;
+
+import io.github.a5h73y.carz.Carz;
+import io.github.a5h73y.carz.enums.Permissions;
+import io.github.a5h73y.carz.model.Car;
+import io.github.a5h73y.carz.other.AbstractPluginReceiver;
+import io.github.a5h73y.carz.purchases.CarPurchase;
+import io.github.a5h73y.carz.purchases.RefuelPurchase;
+import io.github.a5h73y.carz.purchases.UpgradePurchase;
+import io.github.a5h73y.carz.utility.PermissionUtils;
+import io.github.a5h73y.carz.utility.StringUtils;
+import io.github.a5h73y.carz.utility.TranslationUtils;
+import io.github.a5h73y.carz.utility.ValidationUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.block.Sign;
 import org.bukkit.block.data.type.WallSign;
@@ -21,7 +21,7 @@
 import org.bukkit.event.block.SignChangeEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 
-import static io.github.a5h73y.controllers.CarController.DEFAULT_CAR;
+import static io.github.a5h73y.carz.controllers.CarController.DEFAULT_CAR;
 
 public class SignListener extends AbstractPluginReceiver implements Listener {
 
diff --git a/src/main/java/io/github/a5h73y/listeners/VehicleListener.java b/src/main/java/io/github/a5h73y/carz/listeners/VehicleListener.java
similarity index 95%
rename from src/main/java/io/github/a5h73y/listeners/VehicleListener.java
rename to src/main/java/io/github/a5h73y/carz/listeners/VehicleListener.java
index 7b2d6ca..a164ee2 100644
--- a/src/main/java/io/github/a5h73y/listeners/VehicleListener.java
+++ b/src/main/java/io/github/a5h73y/carz/listeners/VehicleListener.java
@@ -1,14 +1,14 @@
-package io.github.a5h73y.listeners;
-
-import io.github.a5h73y.Carz;
-import io.github.a5h73y.enums.Permissions;
-import io.github.a5h73y.model.Car;
-import io.github.a5h73y.other.AbstractPluginReceiver;
-import io.github.a5h73y.other.DelayTasks;
-import io.github.a5h73y.utility.PermissionUtils;
-import io.github.a5h73y.utility.PlayerUtils;
-import io.github.a5h73y.utility.TranslationUtils;
-import io.github.a5h73y.utility.ValidationUtils;
+package io.github.a5h73y.carz.listeners;
+
+import io.github.a5h73y.carz.Carz;
+import io.github.a5h73y.carz.enums.Permissions;
+import io.github.a5h73y.carz.model.Car;
+import io.github.a5h73y.carz.other.AbstractPluginReceiver;
+import io.github.a5h73y.carz.other.DelayTasks;
+import io.github.a5h73y.carz.utility.PermissionUtils;
+import io.github.a5h73y.carz.utility.PlayerUtils;
+import io.github.a5h73y.carz.utility.TranslationUtils;
+import io.github.a5h73y.carz.utility.ValidationUtils;
 import org.bukkit.Effect;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -32,8 +32,8 @@
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.util.Vector;
 
-import static io.github.a5h73y.enums.VehicleDetailKey.VEHICLE_FUEL;
-import static io.github.a5h73y.enums.VehicleDetailKey.VEHICLE_OWNER;
+import static io.github.a5h73y.carz.enums.VehicleDetailKey.VEHICLE_FUEL;
+import static io.github.a5h73y.carz.enums.VehicleDetailKey.VEHICLE_OWNER;
 
 /**
  * Vehicle related events.
diff --git a/src/main/java/io/github/a5h73y/model/Car.java b/src/main/java/io/github/a5h73y/carz/model/Car.java
similarity index 91%
rename from src/main/java/io/github/a5h73y/model/Car.java
rename to src/main/java/io/github/a5h73y/carz/model/Car.java
index cf4a129..0e49ee8 100644
--- a/src/main/java/io/github/a5h73y/model/Car.java
+++ b/src/main/java/io/github/a5h73y/carz/model/Car.java
@@ -1,8 +1,8 @@
-package io.github.a5h73y.model;
+package io.github.a5h73y.carz.model;
 
-import io.github.a5h73y.Carz;
-import io.github.a5h73y.controllers.CarController;
-import io.github.a5h73y.utility.StringUtils;
+import io.github.a5h73y.carz.Carz;
+import io.github.a5h73y.carz.controllers.CarController;
+import io.github.a5h73y.carz.utility.StringUtils;
 
 public class Car {
 
diff --git a/src/main/java/io/github/a5h73y/model/CarDetails.java b/src/main/java/io/github/a5h73y/carz/model/CarDetails.java
similarity index 97%
rename from src/main/java/io/github/a5h73y/model/CarDetails.java
rename to src/main/java/io/github/a5h73y/carz/model/CarDetails.java
index 26ed45b..1e1d257 100644
--- a/src/main/java/io/github/a5h73y/model/CarDetails.java
+++ b/src/main/java/io/github/a5h73y/carz/model/CarDetails.java
@@ -1,4 +1,4 @@
-package io.github.a5h73y.model;
+package io.github.a5h73y.carz.model;
 
 import org.bukkit.Material;
 
diff --git a/src/main/java/io/github/a5h73y/other/AbstractPluginReceiver.java b/src/main/java/io/github/a5h73y/carz/other/AbstractPluginReceiver.java
similarity index 76%
rename from src/main/java/io/github/a5h73y/other/AbstractPluginReceiver.java
rename to src/main/java/io/github/a5h73y/carz/other/AbstractPluginReceiver.java
index f5c2c3b..2662eaf 100644
--- a/src/main/java/io/github/a5h73y/other/AbstractPluginReceiver.java
+++ b/src/main/java/io/github/a5h73y/carz/other/AbstractPluginReceiver.java
@@ -1,6 +1,6 @@
-package io.github.a5h73y.other;
+package io.github.a5h73y.carz.other;
 
-import io.github.a5h73y.Carz;
+import io.github.a5h73y.carz.Carz;
 
 /**
  * Ensure the concrete class receives an instance of the Carz plugin.
diff --git a/src/main/java/io/github/a5h73y/other/CarzHelp.java b/src/main/java/io/github/a5h73y/carz/other/CarzHelp.java
similarity index 90%
rename from src/main/java/io/github/a5h73y/other/CarzHelp.java
rename to src/main/java/io/github/a5h73y/carz/other/CarzHelp.java
index dc095a2..7087a8c 100644
--- a/src/main/java/io/github/a5h73y/other/CarzHelp.java
+++ b/src/main/java/io/github/a5h73y/carz/other/CarzHelp.java
@@ -1,10 +1,10 @@
-package io.github.a5h73y.other;
+package io.github.a5h73y.carz.other;
 
-import io.github.a5h73y.Carz;
-import io.github.a5h73y.enums.Commands;
-import io.github.a5h73y.enums.Permissions;
-import io.github.a5h73y.utility.PermissionUtils;
-import io.github.a5h73y.utility.StringUtils;
+import io.github.a5h73y.carz.Carz;
+import io.github.a5h73y.carz.enums.Commands;
+import io.github.a5h73y.carz.enums.Permissions;
+import io.github.a5h73y.carz.utility.PermissionUtils;
+import io.github.a5h73y.carz.utility.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/io/github/a5h73y/other/CarzUpdater.java b/src/main/java/io/github/a5h73y/carz/other/CarzUpdater.java
similarity index 99%
rename from src/main/java/io/github/a5h73y/other/CarzUpdater.java
rename to src/main/java/io/github/a5h73y/carz/other/CarzUpdater.java
index 60365dc..e381f61 100644
--- a/src/main/java/io/github/a5h73y/other/CarzUpdater.java
+++ b/src/main/java/io/github/a5h73y/carz/other/CarzUpdater.java
@@ -1,4 +1,4 @@
-package io.github.a5h73y.other;
+package io.github.a5h73y.carz.other;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
diff --git a/src/main/java/io/github/a5h73y/other/DelayTasks.java b/src/main/java/io/github/a5h73y/carz/other/DelayTasks.java
similarity index 95%
rename from src/main/java/io/github/a5h73y/other/DelayTasks.java
rename to src/main/java/io/github/a5h73y/carz/other/DelayTasks.java
index 9c2832a..53fd4a5 100644
--- a/src/main/java/io/github/a5h73y/other/DelayTasks.java
+++ b/src/main/java/io/github/a5h73y/carz/other/DelayTasks.java
@@ -1,9 +1,9 @@
-package io.github.a5h73y.other;
+package io.github.a5h73y.carz.other;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import io.github.a5h73y.Carz;
+import io.github.a5h73y.carz.Carz;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
diff --git a/src/main/java/io/github/a5h73y/other/PluginUtils.java b/src/main/java/io/github/a5h73y/carz/other/PluginUtils.java
similarity index 95%
rename from src/main/java/io/github/a5h73y/other/PluginUtils.java
rename to src/main/java/io/github/a5h73y/carz/other/PluginUtils.java
index 9cb9c64..18c8cca 100644
--- a/src/main/java/io/github/a5h73y/other/PluginUtils.java
+++ b/src/main/java/io/github/a5h73y/carz/other/PluginUtils.java
@@ -1,12 +1,12 @@
-package io.github.a5h73y.other;
+package io.github.a5h73y.carz.other;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import io.github.a5h73y.Carz;
-import io.github.a5h73y.enums.Commands;
-import io.github.a5h73y.utility.TranslationUtils;
+import io.github.a5h73y.carz.Carz;
+import io.github.a5h73y.carz.enums.Commands;
+import io.github.a5h73y.carz.utility.TranslationUtils;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 
diff --git a/src/main/java/io/github/a5h73y/other/XMaterial.java b/src/main/java/io/github/a5h73y/carz/other/XMaterial.java
similarity index 99%
rename from src/main/java/io/github/a5h73y/other/XMaterial.java
rename to src/main/java/io/github/a5h73y/carz/other/XMaterial.java
index eb62cdf..56b28a3 100644
--- a/src/main/java/io/github/a5h73y/other/XMaterial.java
+++ b/src/main/java/io/github/a5h73y/carz/other/XMaterial.java
@@ -1,4 +1,4 @@
-package io.github.a5h73y.other;
+package io.github.a5h73y.carz.other;
 
 /**
  * The MIT License (MIT)
diff --git a/src/main/java/io/github/a5h73y/plugin/BountifulAPI.java b/src/main/java/io/github/a5h73y/carz/plugin/BountifulAPI.java
similarity index 89%
rename from src/main/java/io/github/a5h73y/plugin/BountifulAPI.java
rename to src/main/java/io/github/a5h73y/carz/plugin/BountifulAPI.java
index c2069af..a8f667e 100644
--- a/src/main/java/io/github/a5h73y/plugin/BountifulAPI.java
+++ b/src/main/java/io/github/a5h73y/carz/plugin/BountifulAPI.java
@@ -1,6 +1,6 @@
-package io.github.a5h73y.plugin;
+package io.github.a5h73y.carz.plugin;
 
-import io.github.a5h73y.Carz;
+import io.github.a5h73y.carz.Carz;
 import org.bukkit.entity.Player;
 
 public class BountifulAPI extends PluginWrapper {
diff --git a/src/main/java/io/github/a5h73y/plugin/EconomyAPI.java b/src/main/java/io/github/a5h73y/carz/plugin/EconomyAPI.java
similarity index 95%
rename from src/main/java/io/github/a5h73y/plugin/EconomyAPI.java
rename to src/main/java/io/github/a5h73y/carz/plugin/EconomyAPI.java
index 1611811..aa981e9 100644
--- a/src/main/java/io/github/a5h73y/plugin/EconomyAPI.java
+++ b/src/main/java/io/github/a5h73y/carz/plugin/EconomyAPI.java
@@ -1,13 +1,13 @@
-package io.github.a5h73y.plugin;
+package io.github.a5h73y.carz.plugin;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import io.github.a5h73y.Carz;
-import io.github.a5h73y.other.PluginUtils;
-import io.github.a5h73y.purchases.Purchasable;
-import io.github.a5h73y.utility.StringUtils;
-import io.github.a5h73y.utility.TranslationUtils;
+import io.github.a5h73y.carz.Carz;
+import io.github.a5h73y.carz.other.PluginUtils;
+import io.github.a5h73y.carz.purchases.Purchasable;
+import io.github.a5h73y.carz.utility.StringUtils;
+import io.github.a5h73y.carz.utility.TranslationUtils;
 import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.economy.EconomyResponse;
 import org.bukkit.configuration.file.FileConfiguration;
diff --git a/src/main/java/io/github/a5h73y/plugin/PluginWrapper.java b/src/main/java/io/github/a5h73y/carz/plugin/PluginWrapper.java
similarity index 92%
rename from src/main/java/io/github/a5h73y/plugin/PluginWrapper.java
rename to src/main/java/io/github/a5h73y/carz/plugin/PluginWrapper.java
index 64b9c30..a70c132 100644
--- a/src/main/java/io/github/a5h73y/plugin/PluginWrapper.java
+++ b/src/main/java/io/github/a5h73y/carz/plugin/PluginWrapper.java
@@ -1,7 +1,7 @@
-package io.github.a5h73y.plugin;
+package io.github.a5h73y.carz.plugin;
 
-import io.github.a5h73y.Carz;
-import io.github.a5h73y.other.PluginUtils;
+import io.github.a5h73y.carz.Carz;
+import io.github.a5h73y.carz.other.PluginUtils;
 import org.bukkit.plugin.Plugin;
 
 import static org.bukkit.Bukkit.getServer;
diff --git a/src/main/java/io/github/a5h73y/purchases/CarPurchase.java b/src/main/java/io/github/a5h73y/carz/purchases/CarPurchase.java
similarity index 84%
rename from src/main/java/io/github/a5h73y/purchases/CarPurchase.java
rename to src/main/java/io/github/a5h73y/carz/purchases/CarPurchase.java
index b202e50..408678d 100644
--- a/src/main/java/io/github/a5h73y/purchases/CarPurchase.java
+++ b/src/main/java/io/github/a5h73y/carz/purchases/CarPurchase.java
@@ -1,9 +1,9 @@
-package io.github.a5h73y.purchases;
+package io.github.a5h73y.carz.purchases;
 
-import io.github.a5h73y.Carz;
-import io.github.a5h73y.utility.CarUtils;
-import io.github.a5h73y.utility.StringUtils;
-import io.github.a5h73y.utility.TranslationUtils;
+import io.github.a5h73y.carz.Carz;
+import io.github.a5h73y.carz.utility.CarUtils;
+import io.github.a5h73y.carz.utility.StringUtils;
+import io.github.a5h73y.carz.utility.TranslationUtils;
 import org.bukkit.entity.Player;
 
 public class CarPurchase extends Purchasable {
diff --git a/src/main/java/io/github/a5h73y/purchases/Purchasable.java b/src/main/java/io/github/a5h73y/carz/purchases/Purchasable.java
similarity index 97%
rename from src/main/java/io/github/a5h73y/purchases/Purchasable.java
rename to src/main/java/io/github/a5h73y/carz/purchases/Purchasable.java
index da368cb..afdbf8f 100644
--- a/src/main/java/io/github/a5h73y/purchases/Purchasable.java
+++ b/src/main/java/io/github/a5h73y/carz/purchases/Purchasable.java
@@ -1,4 +1,4 @@
-package io.github.a5h73y.purchases;
+package io.github.a5h73y.carz.purchases;
 
 import org.bukkit.entity.Player;
 
diff --git a/src/main/java/io/github/a5h73y/purchases/RefuelPurchase.java b/src/main/java/io/github/a5h73y/carz/purchases/RefuelPurchase.java
similarity index 87%
rename from src/main/java/io/github/a5h73y/purchases/RefuelPurchase.java
rename to src/main/java/io/github/a5h73y/carz/purchases/RefuelPurchase.java
index 6dc5121..0a1c3c3 100644
--- a/src/main/java/io/github/a5h73y/purchases/RefuelPurchase.java
+++ b/src/main/java/io/github/a5h73y/carz/purchases/RefuelPurchase.java
@@ -1,8 +1,8 @@
-package io.github.a5h73y.purchases;
+package io.github.a5h73y.carz.purchases;
 
-import io.github.a5h73y.Carz;
-import io.github.a5h73y.model.Car;
-import io.github.a5h73y.utility.TranslationUtils;
+import io.github.a5h73y.carz.Carz;
+import io.github.a5h73y.carz.model.Car;
+import io.github.a5h73y.carz.utility.TranslationUtils;
 import org.bukkit.entity.Player;
 
 public class RefuelPurchase extends Purchasable {
diff --git a/src/main/java/io/github/a5h73y/purchases/UpgradePurchase.java b/src/main/java/io/github/a5h73y/carz/purchases/UpgradePurchase.java
similarity index 89%
rename from src/main/java/io/github/a5h73y/purchases/UpgradePurchase.java
rename to src/main/java/io/github/a5h73y/carz/purchases/UpgradePurchase.java
index 035a335..09bc188 100644
--- a/src/main/java/io/github/a5h73y/purchases/UpgradePurchase.java
+++ b/src/main/java/io/github/a5h73y/carz/purchases/UpgradePurchase.java
@@ -1,8 +1,8 @@
-package io.github.a5h73y.purchases;
+package io.github.a5h73y.carz.purchases;
 
-import io.github.a5h73y.Carz;
-import io.github.a5h73y.model.Car;
-import io.github.a5h73y.utility.TranslationUtils;
+import io.github.a5h73y.carz.Carz;
+import io.github.a5h73y.carz.model.Car;
+import io.github.a5h73y.carz.utility.TranslationUtils;
 import org.bukkit.entity.Player;
 
 public class UpgradePurchase extends Purchasable {
diff --git a/src/main/java/io/github/a5h73y/utility/CarUtils.java b/src/main/java/io/github/a5h73y/carz/utility/CarUtils.java
similarity index 90%
rename from src/main/java/io/github/a5h73y/utility/CarUtils.java
rename to src/main/java/io/github/a5h73y/carz/utility/CarUtils.java
index a4c0092..c87d778 100644
--- a/src/main/java/io/github/a5h73y/utility/CarUtils.java
+++ b/src/main/java/io/github/a5h73y/carz/utility/CarUtils.java
@@ -1,6 +1,6 @@
-package io.github.a5h73y.utility;
+package io.github.a5h73y.carz.utility;
 
-import io.github.a5h73y.Carz;
+import io.github.a5h73y.carz.Carz;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -11,8 +11,8 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
-import static io.github.a5h73y.enums.VehicleDetailKey.VEHICLE_OWNER;
-import static io.github.a5h73y.enums.VehicleDetailKey.VEHICLE_TYPE;
+import static io.github.a5h73y.carz.enums.VehicleDetailKey.VEHICLE_OWNER;
+import static io.github.a5h73y.carz.enums.VehicleDetailKey.VEHICLE_TYPE;
 
 public class CarUtils {
 
diff --git a/src/main/java/io/github/a5h73y/utility/EffectUtils.java b/src/main/java/io/github/a5h73y/carz/utility/EffectUtils.java
similarity index 92%
rename from src/main/java/io/github/a5h73y/utility/EffectUtils.java
rename to src/main/java/io/github/a5h73y/carz/utility/EffectUtils.java
index 48abc4a..999a472 100644
--- a/src/main/java/io/github/a5h73y/utility/EffectUtils.java
+++ b/src/main/java/io/github/a5h73y/carz/utility/EffectUtils.java
@@ -1,6 +1,6 @@
-package io.github.a5h73y.utility;
+package io.github.a5h73y.carz.utility;
 
-import io.github.a5h73y.Carz;
+import io.github.a5h73y.carz.Carz;
 import org.bukkit.Effect;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/io/github/a5h73y/utility/ItemMetaUtils.java b/src/main/java/io/github/a5h73y/carz/utility/ItemMetaUtils.java
similarity index 95%
rename from src/main/java/io/github/a5h73y/utility/ItemMetaUtils.java
rename to src/main/java/io/github/a5h73y/carz/utility/ItemMetaUtils.java
index a9f5038..ba372f5 100644
--- a/src/main/java/io/github/a5h73y/utility/ItemMetaUtils.java
+++ b/src/main/java/io/github/a5h73y/carz/utility/ItemMetaUtils.java
@@ -1,6 +1,6 @@
-package io.github.a5h73y.utility;
+package io.github.a5h73y.carz.utility;
 
-import io.github.a5h73y.enums.VehicleDetailKey;
+import io.github.a5h73y.carz.enums.VehicleDetailKey;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataHolder;
diff --git a/src/main/java/io/github/a5h73y/utility/PermissionUtils.java b/src/main/java/io/github/a5h73y/carz/utility/PermissionUtils.java
similarity index 92%
rename from src/main/java/io/github/a5h73y/utility/PermissionUtils.java
rename to src/main/java/io/github/a5h73y/carz/utility/PermissionUtils.java
index d35a169..7275200 100644
--- a/src/main/java/io/github/a5h73y/utility/PermissionUtils.java
+++ b/src/main/java/io/github/a5h73y/carz/utility/PermissionUtils.java
@@ -1,7 +1,7 @@
-package io.github.a5h73y.utility;
+package io.github.a5h73y.carz.utility;
 
-import io.github.a5h73y.Carz;
-import io.github.a5h73y.enums.Permissions;
+import io.github.a5h73y.carz.Carz;
+import io.github.a5h73y.carz.enums.Permissions;
 import org.bukkit.entity.Player;
 
 public class PermissionUtils {
diff --git a/src/main/java/io/github/a5h73y/utility/PlayerUtils.java b/src/main/java/io/github/a5h73y/carz/utility/PlayerUtils.java
similarity index 96%
rename from src/main/java/io/github/a5h73y/utility/PlayerUtils.java
rename to src/main/java/io/github/a5h73y/carz/utility/PlayerUtils.java
index ef4552a..ffb88ac 100644
--- a/src/main/java/io/github/a5h73y/utility/PlayerUtils.java
+++ b/src/main/java/io/github/a5h73y/carz/utility/PlayerUtils.java
@@ -1,4 +1,4 @@
-package io.github.a5h73y.utility;
+package io.github.a5h73y.carz.utility;
 
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/io/github/a5h73y/utility/StringUtils.java b/src/main/java/io/github/a5h73y/carz/utility/StringUtils.java
similarity index 95%
rename from src/main/java/io/github/a5h73y/utility/StringUtils.java
rename to src/main/java/io/github/a5h73y/carz/utility/StringUtils.java
index e9c8078..3444a8d 100644
--- a/src/main/java/io/github/a5h73y/utility/StringUtils.java
+++ b/src/main/java/io/github/a5h73y/carz/utility/StringUtils.java
@@ -1,4 +1,4 @@
-package io.github.a5h73y.utility;
+package io.github.a5h73y.carz.utility;
 
 import org.bukkit.ChatColor;
 
diff --git a/src/main/java/io/github/a5h73y/utility/TranslationUtils.java b/src/main/java/io/github/a5h73y/carz/utility/TranslationUtils.java
similarity index 92%
rename from src/main/java/io/github/a5h73y/utility/TranslationUtils.java
rename to src/main/java/io/github/a5h73y/carz/utility/TranslationUtils.java
index eb2598c..a136c25 100644
--- a/src/main/java/io/github/a5h73y/utility/TranslationUtils.java
+++ b/src/main/java/io/github/a5h73y/carz/utility/TranslationUtils.java
@@ -1,9 +1,9 @@
-package io.github.a5h73y.utility;
+package io.github.a5h73y.carz.utility;
 
-import io.github.a5h73y.Carz;
+import io.github.a5h73y.carz.Carz;
 import org.bukkit.command.CommandSender;
 
-import static io.github.a5h73y.utility.StringUtils.colour;
+import static io.github.a5h73y.carz.utility.StringUtils.colour;
 
 public class TranslationUtils {
 
diff --git a/src/main/java/io/github/a5h73y/utility/ValidationUtils.java b/src/main/java/io/github/a5h73y/carz/utility/ValidationUtils.java
similarity index 95%
rename from src/main/java/io/github/a5h73y/utility/ValidationUtils.java
rename to src/main/java/io/github/a5h73y/carz/utility/ValidationUtils.java
index 5ad1b3d..a5f07a2 100644
--- a/src/main/java/io/github/a5h73y/utility/ValidationUtils.java
+++ b/src/main/java/io/github/a5h73y/carz/utility/ValidationUtils.java
@@ -1,10 +1,10 @@
-package io.github.a5h73y.utility;
+package io.github.a5h73y.carz.utility;
 
-import io.github.a5h73y.Carz;
-import io.github.a5h73y.enums.Permissions;
-import io.github.a5h73y.enums.VehicleDetailKey;
-import io.github.a5h73y.model.Car;
-import io.github.a5h73y.other.XMaterial;
+import io.github.a5h73y.carz.Carz;
+import io.github.a5h73y.carz.enums.Permissions;
+import io.github.a5h73y.carz.enums.VehicleDetailKey;
+import io.github.a5h73y.carz.model.Car;
+import io.github.a5h73y.carz.other.XMaterial;
 import org.bukkit.Material;
 import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Player;
@@ -122,7 +122,7 @@ public static boolean canPurchaseCar(Player player, String carType, boolean chec
 	public static boolean canPurchaseUpgrade(Player player) {
 		return canPurchaseUpgrade(player, true);
 	}
-	
+
 	/**
 	 * Check to see if the player is currently able to purchase an upgrade
 	 * This includes checking the permission status
diff --git a/plugin.yml b/src/main/resources/plugin.yml
similarity index 57%
rename from plugin.yml
rename to src/main/resources/plugin.yml
index 0bd9d91..26c16d4 100644
--- a/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,10 +1,10 @@
 name: Carz
-version: "7.0"
-description: Drive in Minecraft
+version: ${project.version}
+description: ${project.description}
 softdepend: [Vault, BountifulAPI]
 author: A5H73Y
-main: io.github.a5h73y.Carz
-api-version: "1.13"
+main: io.github.a5h73y.carz.Carz
+api-version: "1.14"
 commands:
   carz:
     description: Carz commands