diff --git a/pom.xml b/pom.xml
index 3a07d9f..e9ff549 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>bskyblock.addon</groupId>
+	<groupId>world.bentobox</groupId>
 	<artifactId>Level</artifactId>
 	<version>0.1.0-SNAPSHOT</version>
 
diff --git a/src/main/java/bentobox/addon/level/Level.java b/src/main/java/world/bentobox/level/Level.java
similarity index 93%
rename from src/main/java/bentobox/addon/level/Level.java
rename to src/main/java/world/bentobox/level/Level.java
index 4d0a4b6..8b6e32c 100644
--- a/src/main/java/bentobox/addon/level/Level.java
+++ b/src/main/java/world/bentobox/level/Level.java
@@ -1,4 +1,4 @@
-package bentobox.addon.level;
+package world.bentobox.level;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -6,14 +6,14 @@ import java.util.UUID;
 
 import org.bukkit.World;
 
-import bentobox.addon.level.commands.AdminLevel;
-import bentobox.addon.level.commands.AdminTop;
-import bentobox.addon.level.commands.IslandLevel;
-import bentobox.addon.level.commands.IslandTop;
-import bentobox.addon.level.config.Settings;
-import bentobox.addon.level.database.object.LevelsData;
-import bentobox.addon.level.listeners.JoinLeaveListener;
-import bentobox.addon.level.listeners.NewIslandListener;
+import world.bentobox.level.commands.AdminLevel;
+import world.bentobox.level.commands.AdminTop;
+import world.bentobox.level.commands.IslandLevel;
+import world.bentobox.level.commands.IslandTop;
+import world.bentobox.level.config.Settings;
+import world.bentobox.level.objects.LevelsData;
+import world.bentobox.level.listeners.JoinLeaveListener;
+import world.bentobox.level.listeners.NewIslandListener;
 import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
diff --git a/src/main/java/bentobox/addon/level/LevelPresenter.java b/src/main/java/world/bentobox/level/LevelPresenter.java
similarity index 97%
rename from src/main/java/bentobox/addon/level/LevelPresenter.java
rename to src/main/java/world/bentobox/level/LevelPresenter.java
index 6ed5c54..a150e0d 100644
--- a/src/main/java/bentobox/addon/level/LevelPresenter.java
+++ b/src/main/java/world/bentobox/level/LevelPresenter.java
@@ -1,4 +1,4 @@
-package bentobox.addon.level;
+package world.bentobox.level;
 
 import java.util.Calendar;
 import java.util.HashMap;
@@ -6,7 +6,7 @@ import java.util.UUID;
 
 import org.bukkit.World;
 
-import bentobox.addon.level.calculators.PlayerLevel;
+import world.bentobox.level.calculators.PlayerLevel;
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.user.User;
 
diff --git a/src/main/java/bentobox/addon/level/TopTen.java b/src/main/java/world/bentobox/level/TopTen.java
similarity index 98%
rename from src/main/java/bentobox/addon/level/TopTen.java
rename to src/main/java/world/bentobox/level/TopTen.java
index 08aca00..12e1f64 100644
--- a/src/main/java/bentobox/addon/level/TopTen.java
+++ b/src/main/java/world/bentobox/level/TopTen.java
@@ -1,4 +1,4 @@
-package bentobox.addon.level;
+package world.bentobox.level;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -14,7 +14,7 @@ import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 
-import bentobox.addon.level.database.object.TopTenData;
+import world.bentobox.level.objects.TopTenData;
 import world.bentobox.bentobox.api.panels.PanelItem;
 import world.bentobox.bentobox.api.panels.builders.PanelBuilder;
 import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
diff --git a/src/main/java/bentobox/addon/level/calculators/CalcIslandLevel.java b/src/main/java/world/bentobox/level/calculators/CalcIslandLevel.java
similarity index 99%
rename from src/main/java/bentobox/addon/level/calculators/CalcIslandLevel.java
rename to src/main/java/world/bentobox/level/calculators/CalcIslandLevel.java
index 71736c1..179e0e1 100644
--- a/src/main/java/bentobox/addon/level/calculators/CalcIslandLevel.java
+++ b/src/main/java/world/bentobox/level/calculators/CalcIslandLevel.java
@@ -1,4 +1,4 @@
-package bentobox.addon.level.calculators;
+package world.bentobox.level.calculators;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -19,7 +19,7 @@ import com.google.common.collect.Multiset;
 import com.google.common.collect.Multiset.Entry;
 import com.google.common.collect.Multisets;
 
-import bentobox.addon.level.Level;
+import world.bentobox.level.Level;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.util.Pair;
 import world.bentobox.bentobox.util.Util;
diff --git a/src/main/java/bentobox/addon/level/calculators/PlayerLevel.java b/src/main/java/world/bentobox/level/calculators/PlayerLevel.java
similarity index 92%
rename from src/main/java/bentobox/addon/level/calculators/PlayerLevel.java
rename to src/main/java/world/bentobox/level/calculators/PlayerLevel.java
index ee3da75..a874e8a 100644
--- a/src/main/java/bentobox/addon/level/calculators/PlayerLevel.java
+++ b/src/main/java/world/bentobox/level/calculators/PlayerLevel.java
@@ -1,13 +1,13 @@
-package bentobox.addon.level.calculators;
+package world.bentobox.level.calculators;
 
 import java.util.UUID;
 
 import org.bukkit.World;
 
-import bentobox.addon.level.Level;
-import bentobox.addon.level.calculators.CalcIslandLevel.Results;
-import bentobox.addon.level.event.IslandLevelCalculatedEvent;
-import bentobox.addon.level.event.IslandPreLevelEvent;
+import world.bentobox.level.Level;
+import world.bentobox.level.calculators.CalcIslandLevel.Results;
+import world.bentobox.level.event.IslandLevelCalculatedEvent;
+import world.bentobox.level.event.IslandPreLevelEvent;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 
diff --git a/src/main/java/bentobox/addon/level/commands/AdminLevel.java b/src/main/java/world/bentobox/level/commands/AdminLevel.java
similarity index 94%
rename from src/main/java/bentobox/addon/level/commands/AdminLevel.java
rename to src/main/java/world/bentobox/level/commands/AdminLevel.java
index eb2c7ba..77239fe 100644
--- a/src/main/java/bentobox/addon/level/commands/AdminLevel.java
+++ b/src/main/java/world/bentobox/level/commands/AdminLevel.java
@@ -1,9 +1,9 @@
-package bentobox.addon.level.commands;
+package world.bentobox.level.commands;
 
 import java.util.List;
 import java.util.UUID;
 
-import bentobox.addon.level.Level;
+import world.bentobox.level.Level;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
 
diff --git a/src/main/java/bentobox/addon/level/commands/AdminTop.java b/src/main/java/world/bentobox/level/commands/AdminTop.java
similarity index 96%
rename from src/main/java/bentobox/addon/level/commands/AdminTop.java
rename to src/main/java/world/bentobox/level/commands/AdminTop.java
index 6644098..31be8cf 100644
--- a/src/main/java/bentobox/addon/level/commands/AdminTop.java
+++ b/src/main/java/world/bentobox/level/commands/AdminTop.java
@@ -1,4 +1,4 @@
-package bentobox.addon.level.commands;
+package world.bentobox.level.commands;
 
 import java.util.List;
 import java.util.Map.Entry;
@@ -6,7 +6,7 @@ import java.util.UUID;
 
 import org.bukkit.World;
 
-import bentobox.addon.level.Level;
+import world.bentobox.level.Level;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
diff --git a/src/main/java/bentobox/addon/level/commands/IslandLevel.java b/src/main/java/world/bentobox/level/commands/IslandLevel.java
similarity index 95%
rename from src/main/java/bentobox/addon/level/commands/IslandLevel.java
rename to src/main/java/world/bentobox/level/commands/IslandLevel.java
index 7620cd4..2effe67 100644
--- a/src/main/java/bentobox/addon/level/commands/IslandLevel.java
+++ b/src/main/java/world/bentobox/level/commands/IslandLevel.java
@@ -1,9 +1,9 @@
-package bentobox.addon.level.commands;
+package world.bentobox.level.commands;
 
 import java.util.List;
 import java.util.UUID;
 
-import bentobox.addon.level.Level;
+import world.bentobox.level.Level;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
 
diff --git a/src/main/java/bentobox/addon/level/commands/IslandTop.java b/src/main/java/world/bentobox/level/commands/IslandTop.java
similarity index 90%
rename from src/main/java/bentobox/addon/level/commands/IslandTop.java
rename to src/main/java/world/bentobox/level/commands/IslandTop.java
index 5b3616e..aec6312 100644
--- a/src/main/java/bentobox/addon/level/commands/IslandTop.java
+++ b/src/main/java/world/bentobox/level/commands/IslandTop.java
@@ -1,8 +1,8 @@
-package bentobox.addon.level.commands;
+package world.bentobox.level.commands;
 
 import java.util.List;
 
-import bentobox.addon.level.Level;
+import world.bentobox.level.Level;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
 
diff --git a/src/main/java/bentobox/addon/level/config/Settings.java b/src/main/java/world/bentobox/level/config/Settings.java
similarity index 99%
rename from src/main/java/bentobox/addon/level/config/Settings.java
rename to src/main/java/world/bentobox/level/config/Settings.java
index 0036e20..c308317 100644
--- a/src/main/java/bentobox/addon/level/config/Settings.java
+++ b/src/main/java/world/bentobox/level/config/Settings.java
@@ -1,4 +1,4 @@
-package bentobox.addon.level.config;
+package world.bentobox.level.config;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -8,7 +8,7 @@ import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.configuration.ConfigurationSection;
 
-import bentobox.addon.level.Level;
+import world.bentobox.level.Level;
 
 public class Settings {
 
diff --git a/src/main/java/bentobox/addon/level/event/IslandLevelCalculatedEvent.java b/src/main/java/world/bentobox/level/event/IslandLevelCalculatedEvent.java
similarity index 93%
rename from src/main/java/bentobox/addon/level/event/IslandLevelCalculatedEvent.java
rename to src/main/java/world/bentobox/level/event/IslandLevelCalculatedEvent.java
index 384de00..c6b100a 100644
--- a/src/main/java/bentobox/addon/level/event/IslandLevelCalculatedEvent.java
+++ b/src/main/java/world/bentobox/level/event/IslandLevelCalculatedEvent.java
@@ -1,8 +1,8 @@
-package bentobox.addon.level.event;
+package world.bentobox.level.event;
 
 import java.util.UUID;
 
-import bentobox.addon.level.calculators.CalcIslandLevel.Results;
+import world.bentobox.level.calculators.CalcIslandLevel.Results;
 import world.bentobox.bentobox.api.events.IslandBaseEvent;
 import world.bentobox.bentobox.database.objects.Island;
 
diff --git a/src/main/java/bentobox/addon/level/event/IslandPreLevelEvent.java b/src/main/java/world/bentobox/level/event/IslandPreLevelEvent.java
similarity index 95%
rename from src/main/java/bentobox/addon/level/event/IslandPreLevelEvent.java
rename to src/main/java/world/bentobox/level/event/IslandPreLevelEvent.java
index 75bed67..b48003b 100644
--- a/src/main/java/bentobox/addon/level/event/IslandPreLevelEvent.java
+++ b/src/main/java/world/bentobox/level/event/IslandPreLevelEvent.java
@@ -1,4 +1,4 @@
-package bentobox.addon.level.event;
+package world.bentobox.level.event;
 
 import java.util.UUID;
 
diff --git a/src/main/java/bentobox/addon/level/event/TopTenClick.java b/src/main/java/world/bentobox/level/event/TopTenClick.java
similarity index 96%
rename from src/main/java/bentobox/addon/level/event/TopTenClick.java
rename to src/main/java/world/bentobox/level/event/TopTenClick.java
index b54d21a..a04d352 100644
--- a/src/main/java/bentobox/addon/level/event/TopTenClick.java
+++ b/src/main/java/world/bentobox/level/event/TopTenClick.java
@@ -1,4 +1,4 @@
-package bentobox.addon.level.event;
+package world.bentobox.level.event;
 
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
diff --git a/src/main/java/bentobox/addon/level/listeners/JoinLeaveListener.java b/src/main/java/world/bentobox/level/listeners/JoinLeaveListener.java
similarity index 92%
rename from src/main/java/bentobox/addon/level/listeners/JoinLeaveListener.java
rename to src/main/java/world/bentobox/level/listeners/JoinLeaveListener.java
index d5e8361..217c0cd 100644
--- a/src/main/java/bentobox/addon/level/listeners/JoinLeaveListener.java
+++ b/src/main/java/world/bentobox/level/listeners/JoinLeaveListener.java
@@ -1,4 +1,4 @@
-package bentobox.addon.level.listeners;
+package world.bentobox.level.listeners;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -6,7 +6,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
-import bentobox.addon.level.Level;
+import world.bentobox.level.Level;
 
 /**
  * Listens for when players join and leave
diff --git a/src/main/java/bentobox/addon/level/listeners/NewIslandListener.java b/src/main/java/world/bentobox/level/listeners/NewIslandListener.java
similarity index 91%
rename from src/main/java/bentobox/addon/level/listeners/NewIslandListener.java
rename to src/main/java/world/bentobox/level/listeners/NewIslandListener.java
index 731338c..9b9e463 100644
--- a/src/main/java/bentobox/addon/level/listeners/NewIslandListener.java
+++ b/src/main/java/world/bentobox/level/listeners/NewIslandListener.java
@@ -1,4 +1,4 @@
-package bentobox.addon.level.listeners;
+package world.bentobox.level.listeners;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -7,8 +7,8 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
-import bentobox.addon.level.Level;
-import bentobox.addon.level.calculators.CalcIslandLevel;
+import world.bentobox.level.Level;
+import world.bentobox.level.calculators.CalcIslandLevel;
 import world.bentobox.bentobox.api.events.island.IslandEvent.IslandCreatedEvent;
 import world.bentobox.bentobox.api.events.island.IslandEvent.IslandResettedEvent;
 import world.bentobox.bentobox.database.objects.Island;
diff --git a/src/main/java/bentobox/addon/level/database/object/LevelsData.java b/src/main/java/world/bentobox/level/objects/LevelsData.java
similarity index 98%
rename from src/main/java/bentobox/addon/level/database/object/LevelsData.java
rename to src/main/java/world/bentobox/level/objects/LevelsData.java
index 4680847..a45c15f 100644
--- a/src/main/java/bentobox/addon/level/database/object/LevelsData.java
+++ b/src/main/java/world/bentobox/level/objects/LevelsData.java
@@ -1,4 +1,4 @@
-package bentobox.addon.level.database.object;
+package world.bentobox.level.objects;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/bentobox/addon/level/database/object/TopTenData.java b/src/main/java/world/bentobox/level/objects/TopTenData.java
similarity index 97%
rename from src/main/java/bentobox/addon/level/database/object/TopTenData.java
rename to src/main/java/world/bentobox/level/objects/TopTenData.java
index f0d8dcc..4ad4648 100644
--- a/src/main/java/bentobox/addon/level/database/object/TopTenData.java
+++ b/src/main/java/world/bentobox/level/objects/TopTenData.java
@@ -1,4 +1,4 @@
-package bentobox.addon.level.database.object;
+package world.bentobox.level.objects;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;
diff --git a/src/main/resources/addon.yml b/src/main/resources/addon.yml
index 72edea2..5706751 100755
--- a/src/main/resources/addon.yml
+++ b/src/main/resources/addon.yml
@@ -1,5 +1,5 @@
-name: BentoBox-Level
-main: bentobox.addon.level.Level
+name: Level
+main: world.bentobox.level.Level
 version: ${version}
 
 softdepend: AcidIsland, BSkyBlock
diff --git a/src/test/java/bentobox/addon/level/LevelPresenterTest.java b/src/test/java/world/bentobox/level/LevelPresenterTest.java
similarity index 85%
rename from src/test/java/bentobox/addon/level/LevelPresenterTest.java
rename to src/test/java/world/bentobox/level/LevelPresenterTest.java
index bc05976..e47eb6f 100644
--- a/src/test/java/bentobox/addon/level/LevelPresenterTest.java
+++ b/src/test/java/world/bentobox/level/LevelPresenterTest.java
@@ -1,4 +1,4 @@
-package bentobox.addon.level;
+package world.bentobox.level;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -15,7 +15,7 @@ import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import bentobox.addon.level.calculators.PlayerLevel;
+import world.bentobox.level.calculators.PlayerLevel;
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.managers.IslandWorldManager;
@@ -55,7 +55,7 @@ public class LevelPresenterTest {
     }
 
     /**
-     * Test method for {@link bentobox.addon.level.LevelPresenter#LevelPresenter(bentobox.addon.level.Level, world.bentobox.bentobox.BentoBox)}.
+     * Test method for {@link LevelPresenter#LevelPresenter(Level, world.bentobox.bentobox.BentoBox)}.
      */
     @Test
     public void testLevelPresenter() {
@@ -63,7 +63,7 @@ public class LevelPresenterTest {
     }
 
     /**
-     * Test method for {@link bentobox.addon.level.LevelPresenter#calculateIslandLevel(org.bukkit.World, world.bentobox.bentobox.api.user.User, java.util.UUID)}.
+     * Test method for {@link LevelPresenter#calculateIslandLevel(org.bukkit.World, world.bentobox.bentobox.api.user.User, java.util.UUID)}.
      */
     @Test
     public void testCalculateIslandLevel() {