diff --git a/pom.xml b/pom.xml
index 45bef11..36de0af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,8 +48,8 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>us.tastybento</groupId>
-			<artifactId>bskyblock</artifactId>
+			<groupId>world.bentobox</groupId>
+			<artifactId>bentobox</artifactId>
 			<version>LATEST</version>
 			<scope>provided</scope>
 		</dependency>
diff --git a/src/main/java/bskyblock/addon/challenges/ChallengesAddon.java b/src/main/java/bskyblock/addon/challenges/ChallengesAddon.java
index 39ebec5..b937286 100644
--- a/src/main/java/bskyblock/addon/challenges/ChallengesAddon.java
+++ b/src/main/java/bskyblock/addon/challenges/ChallengesAddon.java
@@ -4,8 +4,8 @@ import org.bukkit.Bukkit;
 
 import bskyblock.addon.challenges.commands.ChallengesCommand;
 import bskyblock.addon.challenges.commands.admin.ChallengesAdminImportCommand;
-import us.tastybento.bskyblock.api.addons.Addon;
-import us.tastybento.bskyblock.api.commands.CompositeCommand;
+import world.bentobox.bbox.api.addons.Addon;
+import world.bentobox.bbox.api.commands.CompositeCommand;
 
 /**
  * Add-on to BSkyBlock that enables challenges
@@ -37,16 +37,23 @@ public class ChallengesAddon extends Addon {
         getServer().getScheduler().runTask(getBSkyBlock(), () -> {
             this.getBSkyBlock().getAddonsManager().getAddonByName("AcidIsland").ifPresent(a -> {
                 CompositeCommand acidIslandCmd = getBSkyBlock().getCommandsManager().getCommand("ai");
-                new ChallengesCommand(this, acidIslandCmd);
-                CompositeCommand acidCmd = getBSkyBlock().getCommandsManager().getCommand("acid");
-                new ChallengesAdminImportCommand(this, acidCmd);
+                if (acidIslandCmd != null) {
+                    new ChallengesCommand(this, acidIslandCmd);
+                    CompositeCommand acidCmd = getBSkyBlock().getCommandsManager().getCommand("acid");
+                    new ChallengesAdminImportCommand(this, acidCmd);
+                }
+            });
+            this.getBSkyBlock().getAddonsManager().getAddonByName("BSkyBlock").ifPresent(a -> {
+                // BSkyBlock hook in
+                CompositeCommand bsbIslandCmd = getBSkyBlock().getCommandsManager().getCommand("island");
+                if (bsbIslandCmd != null) {
+                    new ChallengesCommand(this, bsbIslandCmd);
+                    CompositeCommand bsbAdminCmd = getBSkyBlock().getCommandsManager().getCommand("bsbadmin");
+                    new ChallengesAdminImportCommand(this, bsbAdminCmd);
+                }
             });
         });
-        // BSkyBlock hook in
-        CompositeCommand bsbIslandCmd = getBSkyBlock().getCommandsManager().getCommand("island");
-        new ChallengesCommand(this, bsbIslandCmd);
-        CompositeCommand bsbAdminCmd = getBSkyBlock().getCommandsManager().getCommand("bsbadmin");
-        new ChallengesAdminImportCommand(this, bsbAdminCmd);
+
         // Done
     }
 
diff --git a/src/main/java/bskyblock/addon/challenges/ChallengesManager.java b/src/main/java/bskyblock/addon/challenges/ChallengesManager.java
index e58dad0..d4c60cd 100644
--- a/src/main/java/bskyblock/addon/challenges/ChallengesManager.java
+++ b/src/main/java/bskyblock/addon/challenges/ChallengesManager.java
@@ -26,10 +26,10 @@ import bskyblock.addon.challenges.database.object.Challenges;
 import bskyblock.addon.challenges.database.object.Challenges.ChallengeType;
 import bskyblock.addon.challenges.database.object.PlayerData;
 import bskyblock.addon.challenges.panel.ChallengesPanels;
-import us.tastybento.bskyblock.api.configuration.BSBConfig;
-import us.tastybento.bskyblock.api.user.User;
-import us.tastybento.bskyblock.database.BSBDatabase;
-import us.tastybento.bskyblock.util.Util;
+import world.bentobox.bbox.api.configuration.BSBConfig;
+import world.bentobox.bbox.api.user.User;
+import world.bentobox.bbox.database.BSBDatabase;
+import world.bentobox.bbox.util.Util;
 
 public class ChallengesManager {
 
diff --git a/src/main/java/bskyblock/addon/challenges/FreshSqueezedChallenges.java b/src/main/java/bskyblock/addon/challenges/FreshSqueezedChallenges.java
index 693c14f..ab4f075 100644
--- a/src/main/java/bskyblock/addon/challenges/FreshSqueezedChallenges.java
+++ b/src/main/java/bskyblock/addon/challenges/FreshSqueezedChallenges.java
@@ -18,8 +18,8 @@ import org.bukkit.inventory.ItemStack;
 
 import bskyblock.addon.challenges.database.object.ChallengeLevels;
 import bskyblock.addon.challenges.database.object.Challenges;
-import us.tastybento.bskyblock.api.user.User;
-import us.tastybento.bskyblock.util.Util;
+import world.bentobox.bbox.api.user.User;
+import world.bentobox.bbox.util.Util;
 
 /**
  * Imports challenges
diff --git a/src/main/java/bskyblock/addon/challenges/commands/ChallengesCommand.java b/src/main/java/bskyblock/addon/challenges/commands/ChallengesCommand.java
index e4e5deb..3fc073d 100644
--- a/src/main/java/bskyblock/addon/challenges/commands/ChallengesCommand.java
+++ b/src/main/java/bskyblock/addon/challenges/commands/ChallengesCommand.java
@@ -4,8 +4,8 @@ import java.util.List;
 
 import bskyblock.addon.challenges.ChallengesAddon;
 import bskyblock.addon.challenges.panel.ChallengesPanels;
-import us.tastybento.bskyblock.api.commands.CompositeCommand;
-import us.tastybento.bskyblock.api.user.User;
+import world.bentobox.bbox.api.commands.CompositeCommand;
+import world.bentobox.bbox.api.user.User;
 
 public class ChallengesCommand extends CompositeCommand {
     public static final String CHALLENGE_COMMAND = "challenges";
diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/ChallengesAdminImportCommand.java b/src/main/java/bskyblock/addon/challenges/commands/admin/ChallengesAdminImportCommand.java
index 51f968a..8e9229b 100644
--- a/src/main/java/bskyblock/addon/challenges/commands/admin/ChallengesAdminImportCommand.java
+++ b/src/main/java/bskyblock/addon/challenges/commands/admin/ChallengesAdminImportCommand.java
@@ -5,9 +5,9 @@ import java.util.List;
 import java.util.Optional;
 
 import bskyblock.addon.challenges.ChallengesAddon;
-import us.tastybento.bskyblock.api.commands.CompositeCommand;
-import us.tastybento.bskyblock.api.user.User;
-import us.tastybento.bskyblock.util.Util;
+import world.bentobox.bbox.api.commands.CompositeCommand;
+import world.bentobox.bbox.api.user.User;
+import world.bentobox.bbox.util.Util;
 
 public class ChallengesAdminImportCommand extends CompositeCommand {
 
diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/CreateChallenge.java b/src/main/java/bskyblock/addon/challenges/commands/admin/CreateChallenge.java
index 8a477ff..5ae9e41 100644
--- a/src/main/java/bskyblock/addon/challenges/commands/admin/CreateChallenge.java
+++ b/src/main/java/bskyblock/addon/challenges/commands/admin/CreateChallenge.java
@@ -4,9 +4,9 @@ import java.util.List;
 
 import bskyblock.addon.challenges.ChallengesAddon;
 import bskyblock.addon.challenges.panel.CreateChallengeListener;
-import us.tastybento.bskyblock.api.commands.CompositeCommand;
-import us.tastybento.bskyblock.api.panels.builders.PanelBuilder;
-import us.tastybento.bskyblock.api.user.User;
+import world.bentobox.bbox.api.commands.CompositeCommand;
+import world.bentobox.bbox.api.panels.builders.PanelBuilder;
+import world.bentobox.bbox.api.user.User;
 
 public class CreateChallenge extends CompositeCommand {
 
diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/CreateSurrounding.java b/src/main/java/bskyblock/addon/challenges/commands/admin/CreateSurrounding.java
index d5dae4c..4e95c33 100644
--- a/src/main/java/bskyblock/addon/challenges/commands/admin/CreateSurrounding.java
+++ b/src/main/java/bskyblock/addon/challenges/commands/admin/CreateSurrounding.java
@@ -17,9 +17,9 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
 import bskyblock.addon.challenges.ChallengesAddon;
-import us.tastybento.bskyblock.api.commands.CompositeCommand;
-import us.tastybento.bskyblock.api.user.User;
-import us.tastybento.bskyblock.util.Util;
+import world.bentobox.bbox.api.commands.CompositeCommand;
+import world.bentobox.bbox.api.user.User;
+import world.bentobox.bbox.util.Util;
 
 /**
  * Command to create a surrounding type challenge
diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/MakeLevel.java b/src/main/java/bskyblock/addon/challenges/commands/admin/MakeLevel.java
index 0cf1d4b..ce8feee 100644
--- a/src/main/java/bskyblock/addon/challenges/commands/admin/MakeLevel.java
+++ b/src/main/java/bskyblock/addon/challenges/commands/admin/MakeLevel.java
@@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin;
 import java.util.List;
 
 import bskyblock.addon.challenges.ChallengesAddon;
-import us.tastybento.bskyblock.api.commands.CompositeCommand;
-import us.tastybento.bskyblock.api.user.User;
+import world.bentobox.bbox.api.commands.CompositeCommand;
+import world.bentobox.bbox.api.user.User;
 
 /**
  * @author tastybento
@@ -45,7 +45,7 @@ public class MakeLevel extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#setup()
+     * @see world.bentobox.bbox.api.commands.BSBCommand#setup()
      */
     @Override
     public void setup() {
@@ -54,7 +54,7 @@ public class MakeLevel extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#execute(us.tastybento.bskyblock.api.commands.User, java.util.List)
+     * @see world.bentobox.bbox.api.commands.BSBCommand#execute(world.bentobox.bbox.api.commands.User, java.util.List)
      */
     @Override
     public boolean execute(User user, String label, List<String> args) {
diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetDeployed.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SetDeployed.java
index 9061147..be35a71 100644
--- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetDeployed.java
+++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SetDeployed.java
@@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin;
 import java.util.List;
 
 import bskyblock.addon.challenges.ChallengesAddon;
-import us.tastybento.bskyblock.api.commands.CompositeCommand;
-import us.tastybento.bskyblock.api.user.User;
+import world.bentobox.bbox.api.commands.CompositeCommand;
+import world.bentobox.bbox.api.user.User;
 
 /**
  * @author tastybento
@@ -45,7 +45,7 @@ public class SetDeployed extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#setup()
+     * @see world.bentobox.bbox.api.commands.BSBCommand#setup()
      */
     @Override
     public void setup() {
@@ -54,7 +54,7 @@ public class SetDeployed extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#execute(us.tastybento.bskyblock.api.commands.User, java.util.List)
+     * @see world.bentobox.bbox.api.commands.BSBCommand#execute(world.bentobox.bbox.api.commands.User, java.util.List)
      */
     @Override
     public boolean execute(User user, String label, List<String> args) {
diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetDescription.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SetDescription.java
index 714495f..9fcd67f 100644
--- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetDescription.java
+++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SetDescription.java
@@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin;
 import java.util.List;
 
 import bskyblock.addon.challenges.ChallengesAddon;
-import us.tastybento.bskyblock.api.commands.CompositeCommand;
-import us.tastybento.bskyblock.api.user.User;
+import world.bentobox.bbox.api.commands.CompositeCommand;
+import world.bentobox.bbox.api.user.User;
 
 /**
  * @author tastybento
@@ -45,7 +45,7 @@ public class SetDescription extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#setup()
+     * @see world.bentobox.bbox.api.commands.BSBCommand#setup()
      */
     @Override
     public void setup() {
@@ -54,7 +54,7 @@ public class SetDescription extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#execute(us.tastybento.bskyblock.api.commands.User, java.util.List)
+     * @see world.bentobox.bbox.api.commands.BSBCommand#execute(world.bentobox.bbox.api.commands.User, java.util.List)
      */
     @Override
     public boolean execute(User user, String label, List<String> args) {
diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetExp.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SetExp.java
index 4994a00..a270d01 100644
--- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetExp.java
+++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SetExp.java
@@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin;
 import java.util.List;
 
 import bskyblock.addon.challenges.ChallengesAddon;
-import us.tastybento.bskyblock.api.commands.CompositeCommand;
-import us.tastybento.bskyblock.api.user.User;
+import world.bentobox.bbox.api.commands.CompositeCommand;
+import world.bentobox.bbox.api.user.User;
 
 /**
  * @author tastybento
@@ -45,7 +45,7 @@ public class SetExp extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#setup()
+     * @see world.bentobox.bbox.api.commands.BSBCommand#setup()
      */
     @Override
     public void setup() {
@@ -54,7 +54,7 @@ public class SetExp extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#execute(us.tastybento.bskyblock.api.commands.User, java.util.List)
+     * @see world.bentobox.bbox.api.commands.BSBCommand#execute(world.bentobox.bbox.api.commands.User, java.util.List)
      */
     @Override
     public boolean execute(User user, String label, List<String> args) {
diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetFriendlyName.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SetFriendlyName.java
index a99022c..263263b 100644
--- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetFriendlyName.java
+++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SetFriendlyName.java
@@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin;
 import java.util.List;
 
 import bskyblock.addon.challenges.ChallengesAddon;
-import us.tastybento.bskyblock.api.commands.CompositeCommand;
-import us.tastybento.bskyblock.api.user.User;
+import world.bentobox.bbox.api.commands.CompositeCommand;
+import world.bentobox.bbox.api.user.User;
 
 /**
  * @author tastybento
@@ -45,7 +45,7 @@ public class SetFriendlyName extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#setup()
+     * @see world.bentobox.bbox.api.commands.BSBCommand#setup()
      */
     @Override
     public void setup() {
@@ -54,7 +54,7 @@ public class SetFriendlyName extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#execute(us.tastybento.bskyblock.api.commands.User, java.util.List)
+     * @see world.bentobox.bbox.api.commands.BSBCommand#execute(world.bentobox.bbox.api.commands.User, java.util.List)
      */
     @Override
     public boolean execute(User user, String label, List<String> args) {
diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetIcon.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SetIcon.java
index d9ce8c4..b0cfe38 100644
--- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetIcon.java
+++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SetIcon.java
@@ -9,8 +9,8 @@ import org.bukkit.inventory.ItemStack;
 
 import bskyblock.addon.challenges.ChallengesAddon;
 import bskyblock.addon.challenges.database.object.Challenges;
-import us.tastybento.bskyblock.api.commands.CompositeCommand;
-import us.tastybento.bskyblock.api.user.User;
+import world.bentobox.bbox.api.commands.CompositeCommand;
+import world.bentobox.bbox.api.user.User;
 
 /**
  * @author tastybento
@@ -31,7 +31,7 @@ public class SetIcon extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#setup()
+     * @see world.bentobox.bbox.api.commands.BSBCommand#setup()
      */
     @Override
     public void setup() {
@@ -40,7 +40,7 @@ public class SetIcon extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#execute(us.tastybento.bskyblock.api.commands.User, java.util.List)
+     * @see world.bentobox.bbox.api.commands.BSBCommand#execute(world.bentobox.bbox.api.commands.User, java.util.List)
      */
     @Override
     public boolean execute(User user, String label, List<String> args) {
diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetLevel.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SetLevel.java
index 90dccac..320a27e 100644
--- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetLevel.java
+++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SetLevel.java
@@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin;
 import java.util.List;
 
 import bskyblock.addon.challenges.ChallengesAddon;
-import us.tastybento.bskyblock.api.commands.CompositeCommand;
-import us.tastybento.bskyblock.api.user.User;
+import world.bentobox.bbox.api.commands.CompositeCommand;
+import world.bentobox.bbox.api.user.User;
 
 /**
  * @author tastybento
@@ -45,7 +45,7 @@ public class SetLevel extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#setup()
+     * @see world.bentobox.bbox.api.commands.BSBCommand#setup()
      */
     @Override
     public void setup() {
@@ -54,7 +54,7 @@ public class SetLevel extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#execute(us.tastybento.bskyblock.api.commands.User, java.util.List)
+     * @see world.bentobox.bbox.api.commands.BSBCommand#execute(world.bentobox.bbox.api.commands.User, java.util.List)
      */
     @Override
     public boolean execute(User user, String label, List<String> args) {
diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetMaxTimes.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SetMaxTimes.java
index 26a7357..2cabf36 100644
--- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetMaxTimes.java
+++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SetMaxTimes.java
@@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin;
 import java.util.List;
 
 import bskyblock.addon.challenges.ChallengesAddon;
-import us.tastybento.bskyblock.api.commands.CompositeCommand;
-import us.tastybento.bskyblock.api.user.User;
+import world.bentobox.bbox.api.commands.CompositeCommand;
+import world.bentobox.bbox.api.user.User;
 
 /**
  * @author tastybento
@@ -45,7 +45,7 @@ public class SetMaxTimes extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#setup()
+     * @see world.bentobox.bbox.api.commands.BSBCommand#setup()
      */
     @Override
     public void setup() {
@@ -54,7 +54,7 @@ public class SetMaxTimes extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#execute(us.tastybento.bskyblock.api.commands.User, java.util.List)
+     * @see world.bentobox.bbox.api.commands.BSBCommand#execute(world.bentobox.bbox.api.commands.User, java.util.List)
      */
     @Override
     public boolean execute(User user, String label, List<String> args) {
diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetPerm.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SetPerm.java
index e8dd446..8f2b0c1 100644
--- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetPerm.java
+++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SetPerm.java
@@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin;
 import java.util.List;
 
 import bskyblock.addon.challenges.ChallengesAddon;
-import us.tastybento.bskyblock.api.commands.CompositeCommand;
-import us.tastybento.bskyblock.api.user.User;
+import world.bentobox.bbox.api.commands.CompositeCommand;
+import world.bentobox.bbox.api.user.User;
 
 /**
  * @author tastybento
@@ -45,7 +45,7 @@ public class SetPerm extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#setup()
+     * @see world.bentobox.bbox.api.commands.BSBCommand#setup()
      */
     @Override
     public void setup() {
@@ -54,7 +54,7 @@ public class SetPerm extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#execute(us.tastybento.bskyblock.api.commands.User, java.util.List)
+     * @see world.bentobox.bbox.api.commands.BSBCommand#execute(world.bentobox.bbox.api.commands.User, java.util.List)
      */
     @Override
     public boolean execute(User user, String label, List<String> args) {
diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetRepeatable.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SetRepeatable.java
index 0ec2162..448cd09 100644
--- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetRepeatable.java
+++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SetRepeatable.java
@@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin;
 import java.util.List;
 
 import bskyblock.addon.challenges.ChallengesAddon;
-import us.tastybento.bskyblock.api.commands.CompositeCommand;
-import us.tastybento.bskyblock.api.user.User;
+import world.bentobox.bbox.api.commands.CompositeCommand;
+import world.bentobox.bbox.api.user.User;
 
 /**
  * @author tastybento
@@ -45,7 +45,7 @@ public class SetRepeatable extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#setup()
+     * @see world.bentobox.bbox.api.commands.BSBCommand#setup()
      */
     @Override
     public void setup() {
@@ -54,7 +54,7 @@ public class SetRepeatable extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#execute(us.tastybento.bskyblock.api.commands.User, java.util.List)
+     * @see world.bentobox.bbox.api.commands.BSBCommand#execute(world.bentobox.bbox.api.commands.User, java.util.List)
      */
     @Override
     public boolean execute(User user, String label, List<String> args) {
diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetReward.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SetReward.java
index d66b8c8..c76e01e 100644
--- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetReward.java
+++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SetReward.java
@@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin;
 import java.util.List;
 
 import bskyblock.addon.challenges.ChallengesAddon;
-import us.tastybento.bskyblock.api.commands.CompositeCommand;
-import us.tastybento.bskyblock.api.user.User;
+import world.bentobox.bbox.api.commands.CompositeCommand;
+import world.bentobox.bbox.api.user.User;
 
 /**
  * @author tastybento
@@ -45,7 +45,7 @@ public class SetReward extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#setup()
+     * @see world.bentobox.bbox.api.commands.BSBCommand#setup()
      */
     @Override
     public void setup() {
@@ -54,7 +54,7 @@ public class SetReward extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#execute(us.tastybento.bskyblock.api.commands.User, java.util.List)
+     * @see world.bentobox.bbox.api.commands.BSBCommand#execute(world.bentobox.bbox.api.commands.User, java.util.List)
      */
     @Override
     public boolean execute(User user, String label, List<String> args) {
diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetType.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SetType.java
index a56864d..b9d7795 100644
--- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetType.java
+++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SetType.java
@@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin;
 import java.util.List;
 
 import bskyblock.addon.challenges.ChallengesAddon;
-import us.tastybento.bskyblock.api.commands.CompositeCommand;
-import us.tastybento.bskyblock.api.user.User;
+import world.bentobox.bbox.api.commands.CompositeCommand;
+import world.bentobox.bbox.api.user.User;
 
 /**
  * @author tastybento
@@ -45,7 +45,7 @@ public class SetType extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#setup()
+     * @see world.bentobox.bbox.api.commands.BSBCommand#setup()
      */
     @Override
     public void setup() {
@@ -54,7 +54,7 @@ public class SetType extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#execute(us.tastybento.bskyblock.api.commands.User, java.util.List)
+     * @see world.bentobox.bbox.api.commands.BSBCommand#execute(world.bentobox.bbox.api.commands.User, java.util.List)
      */
     @Override
     public boolean execute(User user, String label, List<String> args) {
diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SurroundChallengeBuilder.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SurroundChallengeBuilder.java
index d00af6d..8df20f2 100644
--- a/src/main/java/bskyblock/addon/challenges/commands/admin/SurroundChallengeBuilder.java
+++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SurroundChallengeBuilder.java
@@ -7,7 +7,7 @@ import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
 
 import bskyblock.addon.challenges.ChallengesAddon;
-import us.tastybento.bskyblock.api.user.User;
+import world.bentobox.bbox.api.user.User;
 
 /**
  * Enables the state of a Surrounding Challenge to be stored as it is built
diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/TakeItems.java b/src/main/java/bskyblock/addon/challenges/commands/admin/TakeItems.java
index dba84a8..2a3f45f 100644
--- a/src/main/java/bskyblock/addon/challenges/commands/admin/TakeItems.java
+++ b/src/main/java/bskyblock/addon/challenges/commands/admin/TakeItems.java
@@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin;
 import java.util.List;
 
 import bskyblock.addon.challenges.ChallengesAddon;
-import us.tastybento.bskyblock.api.commands.CompositeCommand;
-import us.tastybento.bskyblock.api.user.User;
+import world.bentobox.bbox.api.commands.CompositeCommand;
+import world.bentobox.bbox.api.user.User;
 
 /**
  * @author tastybento
@@ -45,7 +45,7 @@ public class TakeItems extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#setup()
+     * @see world.bentobox.bbox.api.commands.BSBCommand#setup()
      */
     @Override
     public void setup() {
@@ -54,7 +54,7 @@ public class TakeItems extends CompositeCommand {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.api.commands.BSBCommand#execute(us.tastybento.bskyblock.api.commands.User, java.util.List)
+     * @see world.bentobox.bbox.api.commands.BSBCommand#execute(world.bentobox.bbox.api.commands.User, java.util.List)
      */
     @Override
     public boolean execute(User user, String label, List<String> args) {
diff --git a/src/main/java/bskyblock/addon/challenges/database/object/ChallengeLevels.java b/src/main/java/bskyblock/addon/challenges/database/object/ChallengeLevels.java
index a465591..2c77d4a 100644
--- a/src/main/java/bskyblock/addon/challenges/database/object/ChallengeLevels.java
+++ b/src/main/java/bskyblock/addon/challenges/database/object/ChallengeLevels.java
@@ -6,8 +6,8 @@ import java.util.List;
 import org.bukkit.inventory.ItemStack;
 
 import bskyblock.addon.challenges.ChallengesManager;
-import us.tastybento.bskyblock.api.configuration.ConfigComment;
-import us.tastybento.bskyblock.database.objects.DataObject;
+import world.bentobox.bbox.api.configuration.ConfigComment;
+import world.bentobox.bbox.database.objects.DataObject;
 
 /**
  * Represent a challenge level
diff --git a/src/main/java/bskyblock/addon/challenges/database/object/Challenges.java b/src/main/java/bskyblock/addon/challenges/database/object/Challenges.java
index b16795e..b27671a 100644
--- a/src/main/java/bskyblock/addon/challenges/database/object/Challenges.java
+++ b/src/main/java/bskyblock/addon/challenges/database/object/Challenges.java
@@ -13,8 +13,8 @@ import org.bukkit.entity.EntityType;
 import org.bukkit.inventory.ItemStack;
 
 import bskyblock.addon.challenges.ChallengesManager;
-import us.tastybento.bskyblock.api.configuration.ConfigComment;
-import us.tastybento.bskyblock.database.objects.DataObject;
+import world.bentobox.bbox.api.configuration.ConfigComment;
+import world.bentobox.bbox.database.objects.DataObject;
 
 /**
  * Data object for challenges
diff --git a/src/main/java/bskyblock/addon/challenges/database/object/PlayerData.java b/src/main/java/bskyblock/addon/challenges/database/object/PlayerData.java
index f9c34b6..7e49971 100644
--- a/src/main/java/bskyblock/addon/challenges/database/object/PlayerData.java
+++ b/src/main/java/bskyblock/addon/challenges/database/object/PlayerData.java
@@ -12,8 +12,8 @@ import org.bukkit.World;
 
 import com.google.gson.annotations.Expose;
 
-import us.tastybento.bskyblock.database.objects.DataObject;
-import us.tastybento.bskyblock.util.Util;
+import world.bentobox.bbox.database.objects.DataObject;
+import world.bentobox.bbox.util.Util;
 
 /**
  * Stores the player's challenge situation
@@ -75,7 +75,7 @@ public class PlayerData implements DataObject {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.database.objects.DataObject#getUniqueId()
+     * @see world.bentobox.bbox.database.objects.DataObject#getUniqueId()
      */
     @Override
     public String getUniqueId() {
@@ -83,7 +83,7 @@ public class PlayerData implements DataObject {
     }
 
     /* (non-Javadoc)
-     * @see us.tastybento.bskyblock.database.objects.DataObject#setUniqueId(java.lang.String)
+     * @see world.bentobox.bbox.database.objects.DataObject#setUniqueId(java.lang.String)
      */
     @Override
     public void setUniqueId(String uniqueId) {
diff --git a/src/main/java/bskyblock/addon/challenges/panel/ChallengesPanels.java b/src/main/java/bskyblock/addon/challenges/panel/ChallengesPanels.java
index 2b8d6d5..c2f93fd 100644
--- a/src/main/java/bskyblock/addon/challenges/panel/ChallengesPanels.java
+++ b/src/main/java/bskyblock/addon/challenges/panel/ChallengesPanels.java
@@ -15,11 +15,11 @@ import bskyblock.addon.challenges.LevelStatus;
 import bskyblock.addon.challenges.commands.ChallengesCommand;
 import bskyblock.addon.challenges.database.object.Challenges;
 import bskyblock.addon.challenges.database.object.Challenges.ChallengeType;
-import us.tastybento.bskyblock.api.panels.Panel;
-import us.tastybento.bskyblock.api.panels.PanelItem;
-import us.tastybento.bskyblock.api.panels.builders.PanelBuilder;
-import us.tastybento.bskyblock.api.panels.builders.PanelItemBuilder;
-import us.tastybento.bskyblock.api.user.User;
+import world.bentobox.bbox.api.panels.Panel;
+import world.bentobox.bbox.api.panels.PanelItem;
+import world.bentobox.bbox.api.panels.builders.PanelBuilder;
+import world.bentobox.bbox.api.panels.builders.PanelItemBuilder;
+import world.bentobox.bbox.api.user.User;
 
 
 public class ChallengesPanels {
diff --git a/src/main/java/bskyblock/addon/challenges/panel/CreateChallengeListener.java b/src/main/java/bskyblock/addon/challenges/panel/CreateChallengeListener.java
index 220fb4a..f2e5439 100644
--- a/src/main/java/bskyblock/addon/challenges/panel/CreateChallengeListener.java
+++ b/src/main/java/bskyblock/addon/challenges/panel/CreateChallengeListener.java
@@ -4,8 +4,8 @@ import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 
 import bskyblock.addon.challenges.ChallengesAddon;
-import us.tastybento.bskyblock.api.panels.PanelListener;
-import us.tastybento.bskyblock.api.user.User;
+import world.bentobox.bbox.api.panels.PanelListener;
+import world.bentobox.bbox.api.user.User;
 
 public class CreateChallengeListener implements PanelListener {
 
diff --git a/src/main/java/bskyblock/addon/challenges/panel/CreateChallengePanel.java b/src/main/java/bskyblock/addon/challenges/panel/CreateChallengePanel.java
index 7e99123..bcb64fd 100644
--- a/src/main/java/bskyblock/addon/challenges/panel/CreateChallengePanel.java
+++ b/src/main/java/bskyblock/addon/challenges/panel/CreateChallengePanel.java
@@ -1,8 +1,8 @@
 package bskyblock.addon.challenges.panel;
 
 import bskyblock.addon.challenges.ChallengesAddon;
-import us.tastybento.bskyblock.api.panels.builders.PanelBuilder;
-import us.tastybento.bskyblock.api.user.User;
+import world.bentobox.bbox.api.panels.builders.PanelBuilder;
+import world.bentobox.bbox.api.user.User;
 
 public class CreateChallengePanel {
 
diff --git a/src/main/java/bskyblock/addon/challenges/panel/TryToComplete.java b/src/main/java/bskyblock/addon/challenges/panel/TryToComplete.java
index 39802e2..e82261b 100644
--- a/src/main/java/bskyblock/addon/challenges/panel/TryToComplete.java
+++ b/src/main/java/bskyblock/addon/challenges/panel/TryToComplete.java
@@ -20,8 +20,8 @@ import bskyblock.addon.challenges.commands.ChallengesCommand;
 import bskyblock.addon.challenges.database.object.Challenges;
 import bskyblock.addon.challenges.database.object.Challenges.ChallengeType;
 import bskyblock.addon.level.Level;
-import us.tastybento.bskyblock.api.user.User;
-import us.tastybento.bskyblock.util.Util;
+import world.bentobox.bbox.api.user.User;
+import world.bentobox.bbox.util.Util;
 
 /**
  * Run when a user tries to complete a challenge