diff --git a/src/main/java/world/bentobox/challenges/ChallengesAddon.java b/src/main/java/world/bentobox/challenges/ChallengesAddon.java
index da875a8..989d8fc 100644
--- a/src/main/java/world/bentobox/challenges/ChallengesAddon.java
+++ b/src/main/java/world/bentobox/challenges/ChallengesAddon.java
@@ -29,6 +29,8 @@ import world.bentobox.challenges.handlers.LevelDataRequestHandler;
 import world.bentobox.challenges.handlers.LevelListRequestHandler;
 import world.bentobox.challenges.listeners.ResetListener;
 import world.bentobox.challenges.listeners.SaveListener;
+import world.bentobox.challenges.managers.ChallengesImportManager;
+import world.bentobox.challenges.managers.ChallengesManager;
 import world.bentobox.challenges.web.WebManager;
 import world.bentobox.level.Level;
 
diff --git a/src/main/java/world/bentobox/challenges/commands/admin/ReloadChallenges.java b/src/main/java/world/bentobox/challenges/commands/admin/ReloadChallenges.java
index 6022895..f67b313 100644
--- a/src/main/java/world/bentobox/challenges/commands/admin/ReloadChallenges.java
+++ b/src/main/java/world/bentobox/challenges/commands/admin/ReloadChallenges.java
@@ -6,7 +6,7 @@ import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.challenges.ChallengesAddon;
-import world.bentobox.challenges.ChallengesManager;
+import world.bentobox.challenges.managers.ChallengesManager;
 
 
 /**
diff --git a/src/main/java/world/bentobox/challenges/database/object/ChallengeLevel.java b/src/main/java/world/bentobox/challenges/database/object/ChallengeLevel.java
index d5baf35..de772ad 100644
--- a/src/main/java/world/bentobox/challenges/database/object/ChallengeLevel.java
+++ b/src/main/java/world/bentobox/challenges/database/object/ChallengeLevel.java
@@ -13,7 +13,7 @@ import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.configuration.ConfigComment;
 import world.bentobox.bentobox.database.objects.DataObject;
 import world.bentobox.bentobox.database.objects.Table;
-import world.bentobox.challenges.ChallengesManager;
+import world.bentobox.challenges.managers.ChallengesManager;
 
 
 /**
diff --git a/src/main/java/world/bentobox/challenges/handlers/CompletedChallengesRequestHandler.java b/src/main/java/world/bentobox/challenges/handlers/CompletedChallengesRequestHandler.java
index 3ea05bb..21b2fa9 100644
--- a/src/main/java/world/bentobox/challenges/handlers/CompletedChallengesRequestHandler.java
+++ b/src/main/java/world/bentobox/challenges/handlers/CompletedChallengesRequestHandler.java
@@ -11,7 +11,7 @@ import org.bukkit.World;
 
 import world.bentobox.bentobox.api.addons.request.AddonRequestHandler;
 import world.bentobox.challenges.ChallengesAddon;
-import world.bentobox.challenges.ChallengesManager;
+import world.bentobox.challenges.managers.ChallengesManager;
 
 
 /**
diff --git a/src/main/java/world/bentobox/challenges/ChallengesImportManager.java b/src/main/java/world/bentobox/challenges/managers/ChallengesImportManager.java
similarity index 99%
rename from src/main/java/world/bentobox/challenges/ChallengesImportManager.java
rename to src/main/java/world/bentobox/challenges/managers/ChallengesImportManager.java
index 47e0fca..41b4b15 100644
--- a/src/main/java/world/bentobox/challenges/ChallengesImportManager.java
+++ b/src/main/java/world/bentobox/challenges/managers/ChallengesImportManager.java
@@ -1,4 +1,4 @@
-package world.bentobox.challenges;
+package world.bentobox.challenges.managers;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -26,6 +26,7 @@ import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.json.BentoboxTypeAdapterFactory;
 import world.bentobox.bentobox.database.objects.DataObject;
 import world.bentobox.bentobox.util.Util;
+import world.bentobox.challenges.ChallengesAddon;
 import world.bentobox.challenges.database.object.Challenge;
 import world.bentobox.challenges.database.object.ChallengeLevel;
 import world.bentobox.challenges.utils.Utils;
diff --git a/src/main/java/world/bentobox/challenges/ChallengesManager.java b/src/main/java/world/bentobox/challenges/managers/ChallengesManager.java
similarity index 99%
rename from src/main/java/world/bentobox/challenges/ChallengesManager.java
rename to src/main/java/world/bentobox/challenges/managers/ChallengesManager.java
index 20018ed..098fb34 100644
--- a/src/main/java/world/bentobox/challenges/ChallengesManager.java
+++ b/src/main/java/world/bentobox/challenges/managers/ChallengesManager.java
@@ -1,4 +1,4 @@
-package world.bentobox.challenges;
+package world.bentobox.challenges.managers;
 
 
 import java.util.ArrayList;
@@ -30,6 +30,7 @@ import world.bentobox.bentobox.database.Database;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.managers.IslandWorldManager;
 import world.bentobox.bentobox.util.Util;
+import world.bentobox.challenges.ChallengesAddon;
 import world.bentobox.challenges.config.Settings;
 import world.bentobox.challenges.database.object.Challenge;
 import world.bentobox.challenges.database.object.ChallengeLevel;
diff --git a/src/main/java/world/bentobox/challenges/panel/CommonGUI.java b/src/main/java/world/bentobox/challenges/panel/CommonGUI.java
index 2719036..7e1b7d8 100644
--- a/src/main/java/world/bentobox/challenges/panel/CommonGUI.java
+++ b/src/main/java/world/bentobox/challenges/panel/CommonGUI.java
@@ -38,7 +38,7 @@ import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.util.Util;
 import world.bentobox.challenges.ChallengesAddon;
-import world.bentobox.challenges.ChallengesManager;
+import world.bentobox.challenges.managers.ChallengesManager;
 import world.bentobox.challenges.database.object.Challenge;
 import world.bentobox.challenges.database.object.ChallengeLevel;
 import world.bentobox.challenges.database.object.requirements.InventoryRequirements;
diff --git a/src/main/java/world/bentobox/challenges/panel/admin/EditLevelGUI.java b/src/main/java/world/bentobox/challenges/panel/admin/EditLevelGUI.java
index bd6b841..094d8c7 100644
--- a/src/main/java/world/bentobox/challenges/panel/admin/EditLevelGUI.java
+++ b/src/main/java/world/bentobox/challenges/panel/admin/EditLevelGUI.java
@@ -18,7 +18,7 @@ import world.bentobox.bentobox.api.panels.builders.PanelBuilder;
 import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.challenges.ChallengesAddon;
-import world.bentobox.challenges.ChallengesManager;
+import world.bentobox.challenges.managers.ChallengesManager;
 import world.bentobox.challenges.database.object.Challenge;
 import world.bentobox.challenges.database.object.ChallengeLevel;
 import world.bentobox.challenges.panel.CommonGUI;
diff --git a/src/main/java/world/bentobox/challenges/panel/admin/ListUsersGUI.java b/src/main/java/world/bentobox/challenges/panel/admin/ListUsersGUI.java
index e22eead..03d9034 100644
--- a/src/main/java/world/bentobox/challenges/panel/admin/ListUsersGUI.java
+++ b/src/main/java/world/bentobox/challenges/panel/admin/ListUsersGUI.java
@@ -18,7 +18,7 @@ import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Players;
 import world.bentobox.challenges.ChallengesAddon;
-import world.bentobox.challenges.ChallengesManager;
+import world.bentobox.challenges.managers.ChallengesManager;
 import world.bentobox.challenges.database.object.Challenge;
 import world.bentobox.challenges.panel.CommonGUI;
 import world.bentobox.challenges.panel.util.ConfirmationGUI;
diff --git a/src/main/java/world/bentobox/challenges/panel/user/ChallengesGUI.java b/src/main/java/world/bentobox/challenges/panel/user/ChallengesGUI.java
index ec65ce2..5a29cad 100644
--- a/src/main/java/world/bentobox/challenges/panel/user/ChallengesGUI.java
+++ b/src/main/java/world/bentobox/challenges/panel/user/ChallengesGUI.java
@@ -13,7 +13,7 @@ import world.bentobox.bentobox.api.panels.builders.PanelBuilder;
 import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.challenges.ChallengesAddon;
-import world.bentobox.challenges.ChallengesManager;
+import world.bentobox.challenges.managers.ChallengesManager;
 import world.bentobox.challenges.config.SettingsUtils.VisibilityMode;
 import world.bentobox.challenges.database.object.Challenge;
 import world.bentobox.challenges.panel.CommonGUI;
diff --git a/src/main/java/world/bentobox/challenges/tasks/TryToComplete.java b/src/main/java/world/bentobox/challenges/tasks/TryToComplete.java
index 91e17f8..c50a4ca 100644
--- a/src/main/java/world/bentobox/challenges/tasks/TryToComplete.java
+++ b/src/main/java/world/bentobox/challenges/tasks/TryToComplete.java
@@ -33,7 +33,7 @@ import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.util.Util;
 import world.bentobox.challenges.ChallengesAddon;
-import world.bentobox.challenges.ChallengesManager;
+import world.bentobox.challenges.managers.ChallengesManager;
 import world.bentobox.challenges.database.object.Challenge;
 import world.bentobox.challenges.database.object.Challenge.ChallengeType;
 import world.bentobox.challenges.database.object.ChallengeLevel;
diff --git a/src/test/java/world/bentobox/challenges/ChallengesManagerTest.java b/src/test/java/world/bentobox/challenges/ChallengesManagerTest.java
index 499e5f3..0034c68 100644
--- a/src/test/java/world/bentobox/challenges/ChallengesManagerTest.java
+++ b/src/test/java/world/bentobox/challenges/ChallengesManagerTest.java
@@ -65,6 +65,7 @@ import world.bentobox.challenges.events.ChallengeCompletedEvent;
 import world.bentobox.challenges.events.ChallengeResetAllEvent;
 import world.bentobox.challenges.events.ChallengeResetEvent;
 import world.bentobox.challenges.events.LevelCompletedEvent;
+import world.bentobox.challenges.managers.ChallengesManager;
 import world.bentobox.challenges.utils.LevelStatus;
 
 /**
@@ -214,7 +215,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#load()}.
+     * Test method for {@link ChallengesManager#load()}.
      * @throws InterruptedException
      */
     @Test
@@ -230,7 +231,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#reload()}.
+     * Test method for {@link ChallengesManager#reload()}.
      * @throws InterruptedException
      */
     @Test
@@ -246,7 +247,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#loadChallenge(world.bentobox.challenges.database.object.Challenge, boolean, world.bentobox.bentobox.api.user.User, boolean)}.
+     * Test method for {@link ChallengesManager#loadChallenge(world.bentobox.challenges.database.object.Challenge, boolean, world.bentobox.bentobox.api.user.User, boolean)}.
      */
     @Test
     public void testLoadChallengeNoOverwriteSilent() {
@@ -257,7 +258,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#loadChallenge(world.bentobox.challenges.database.object.Challenge, boolean, world.bentobox.bentobox.api.user.User, boolean)}.
+     * Test method for {@link ChallengesManager#loadChallenge(world.bentobox.challenges.database.object.Challenge, boolean, world.bentobox.bentobox.api.user.User, boolean)}.
      */
     @Test
     public void testLoadChallengeNoOverwriteNotSilent() {
@@ -269,7 +270,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#loadChallenge(world.bentobox.challenges.database.object.Challenge, boolean, world.bentobox.bentobox.api.user.User, boolean)}.
+     * Test method for {@link ChallengesManager#loadChallenge(world.bentobox.challenges.database.object.Challenge, boolean, world.bentobox.bentobox.api.user.User, boolean)}.
      */
     @Test
     public void testLoadChallengeOverwriteSilent() {
@@ -281,7 +282,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#loadChallenge(world.bentobox.challenges.database.object.Challenge, boolean, world.bentobox.bentobox.api.user.User, boolean)}.
+     * Test method for {@link ChallengesManager#loadChallenge(world.bentobox.challenges.database.object.Challenge, boolean, world.bentobox.bentobox.api.user.User, boolean)}.
      */
     @Test
     public void testLoadChallengeOverwriteNotSilent() {
@@ -293,7 +294,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#loadLevel(world.bentobox.challenges.database.object.ChallengeLevel, boolean, world.bentobox.bentobox.api.user.User, boolean)}.
+     * Test method for {@link ChallengesManager#loadLevel(world.bentobox.challenges.database.object.ChallengeLevel, boolean, world.bentobox.bentobox.api.user.User, boolean)}.
      */
     @Test
     public void testLoadLevelNoOverwriteSilent() {
@@ -304,7 +305,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#loadLevel(world.bentobox.challenges.database.object.ChallengeLevel, boolean, world.bentobox.bentobox.api.user.User, boolean)}.
+     * Test method for {@link ChallengesManager#loadLevel(world.bentobox.challenges.database.object.ChallengeLevel, boolean, world.bentobox.bentobox.api.user.User, boolean)}.
      */
     @Test
     public void testLoadLevelNoOverwriteNotSilent() {
@@ -316,7 +317,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#loadLevel(world.bentobox.challenges.database.object.ChallengeLevel, boolean, world.bentobox.bentobox.api.user.User, boolean)}.
+     * Test method for {@link ChallengesManager#loadLevel(world.bentobox.challenges.database.object.ChallengeLevel, boolean, world.bentobox.bentobox.api.user.User, boolean)}.
      */
     @Test
     public void testLoadLevelOverwriteSilent() {
@@ -328,7 +329,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#loadLevel(world.bentobox.challenges.database.object.ChallengeLevel, boolean, world.bentobox.bentobox.api.user.User, boolean)}.
+     * Test method for {@link ChallengesManager#loadLevel(world.bentobox.challenges.database.object.ChallengeLevel, boolean, world.bentobox.bentobox.api.user.User, boolean)}.
      */
     @Test
     public void testLoadLevelOverwriteNotSilent() {
@@ -340,7 +341,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#removeFromCache(java.util.UUID)}.
+     * Test method for {@link ChallengesManager#removeFromCache(java.util.UUID)}.
      */
     @Ignore("This method does not do anything so there is no need to test right now.")
     @Test
@@ -351,7 +352,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#wipeDatabase(boolean)}.
+     * Test method for {@link ChallengesManager#wipeDatabase(boolean)}.
      * @throws InterruptedException
      */
     @Test
@@ -387,7 +388,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#wipePlayers()}.
+     * Test method for {@link ChallengesManager#wipePlayers()}.
      * @throws InterruptedException
      */
     @Test
@@ -403,7 +404,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#migrateDatabase(world.bentobox.bentobox.api.user.User, org.bukkit.World)}.
+     * Test method for {@link ChallengesManager#migrateDatabase(world.bentobox.bentobox.api.user.User, org.bukkit.World)}.
      */
     @Test
     public void testMigrateDatabase() {
@@ -411,7 +412,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#save()}.
+     * Test method for {@link ChallengesManager#save()}.
      */
     @Test
     public void testSave() {
@@ -419,7 +420,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#saveChallenge(world.bentobox.challenges.database.object.Challenge)}.
+     * Test method for {@link ChallengesManager#saveChallenge(world.bentobox.challenges.database.object.Challenge)}.
      * @throws InterruptedException
      */
     @Test
@@ -460,7 +461,7 @@ public class ChallengesManagerTest {
         return tempFile.renameTo(inputFile);
     }
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#saveLevel(world.bentobox.challenges.database.object.ChallengeLevel)}.
+     * Test method for {@link ChallengesManager#saveLevel(world.bentobox.challenges.database.object.ChallengeLevel)}.
      * @throws InterruptedException
      */
     @Test
@@ -476,7 +477,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#isChallengeComplete(world.bentobox.bentobox.api.user.User, org.bukkit.World, world.bentobox.challenges.database.object.Challenge)}.
+     * Test method for {@link ChallengesManager#isChallengeComplete(world.bentobox.bentobox.api.user.User, org.bukkit.World, world.bentobox.challenges.database.object.Challenge)}.
      */
     @Test
     public void testIsChallengeCompleteUserWorldChallenge() {
@@ -484,7 +485,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#isChallengeComplete(java.util.UUID, org.bukkit.World, world.bentobox.challenges.database.object.Challenge)}.
+     * Test method for {@link ChallengesManager#isChallengeComplete(java.util.UUID, org.bukkit.World, world.bentobox.challenges.database.object.Challenge)}.
      */
     @Test
     public void testIsChallengeCompleteUUIDWorldChallenge() {
@@ -492,7 +493,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#isChallengeComplete(java.util.UUID, org.bukkit.World, java.lang.String)}.
+     * Test method for {@link ChallengesManager#isChallengeComplete(java.util.UUID, org.bukkit.World, java.lang.String)}.
      */
     @Test
     public void testIsChallengeCompleteUUIDWorldString() {
@@ -500,7 +501,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#setChallengeComplete(world.bentobox.bentobox.api.user.User, org.bukkit.World, world.bentobox.challenges.database.object.Challenge, int)}.
+     * Test method for {@link ChallengesManager#setChallengeComplete(world.bentobox.bentobox.api.user.User, org.bukkit.World, world.bentobox.challenges.database.object.Challenge, int)}.
      */
     @Test
     public void testSetChallengeCompleteUserWorldChallengeInt() {
@@ -510,7 +511,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#setChallengeComplete(java.util.UUID, org.bukkit.World, world.bentobox.challenges.database.object.Challenge, int)}.
+     * Test method for {@link ChallengesManager#setChallengeComplete(java.util.UUID, org.bukkit.World, world.bentobox.challenges.database.object.Challenge, int)}.
      */
     @Test
     public void testSetChallengeCompleteUUIDWorldChallengeInt() {
@@ -520,7 +521,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#setChallengeComplete(java.util.UUID, org.bukkit.World, world.bentobox.challenges.database.object.Challenge, java.util.UUID)}.
+     * Test method for {@link ChallengesManager#setChallengeComplete(java.util.UUID, org.bukkit.World, world.bentobox.challenges.database.object.Challenge, java.util.UUID)}.
      */
     @Test
     public void testSetChallengeCompleteUUIDWorldChallengeUUID() {
@@ -531,7 +532,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#resetChallenge(java.util.UUID, org.bukkit.World, world.bentobox.challenges.database.object.Challenge, java.util.UUID)}.
+     * Test method for {@link ChallengesManager#resetChallenge(java.util.UUID, org.bukkit.World, world.bentobox.challenges.database.object.Challenge, java.util.UUID)}.
      */
     @Test
     public void testResetChallenge() {
@@ -543,7 +544,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#resetAllChallenges(world.bentobox.bentobox.api.user.User, org.bukkit.World)}.
+     * Test method for {@link ChallengesManager#resetAllChallenges(world.bentobox.bentobox.api.user.User, org.bukkit.World)}.
      */
     @Test
     public void testResetAllChallengesUserWorld() {
@@ -555,7 +556,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#resetAllChallenges(java.util.UUID, org.bukkit.World, java.util.UUID)}.
+     * Test method for {@link ChallengesManager#resetAllChallenges(java.util.UUID, org.bukkit.World, java.util.UUID)}.
      */
     @Test
     public void testResetAllChallengesUUIDWorldUUID() {
@@ -567,7 +568,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#getChallengeTimes(world.bentobox.bentobox.api.user.User, org.bukkit.World, world.bentobox.challenges.database.object.Challenge)}.
+     * Test method for {@link ChallengesManager#getChallengeTimes(world.bentobox.bentobox.api.user.User, org.bukkit.World, world.bentobox.challenges.database.object.Challenge)}.
      */
     @Test
     public void testGetChallengeTimesUserWorldChallenge() {
@@ -577,7 +578,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#getChallengeTimes(world.bentobox.bentobox.api.user.User, org.bukkit.World, java.lang.String)}.
+     * Test method for {@link ChallengesManager#getChallengeTimes(world.bentobox.bentobox.api.user.User, org.bukkit.World, java.lang.String)}.
      */
     @Test
     public void testGetChallengeTimesUserWorldString() {
@@ -587,7 +588,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#isLevelCompleted(world.bentobox.bentobox.api.user.User, org.bukkit.World, world.bentobox.challenges.database.object.ChallengeLevel)}.
+     * Test method for {@link ChallengesManager#isLevelCompleted(world.bentobox.bentobox.api.user.User, org.bukkit.World, world.bentobox.challenges.database.object.ChallengeLevel)}.
      */
     @Test
     public void testIsLevelCompleted() {
@@ -595,7 +596,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#isLevelUnlocked(world.bentobox.bentobox.api.user.User, org.bukkit.World, world.bentobox.challenges.database.object.ChallengeLevel)}.
+     * Test method for {@link ChallengesManager#isLevelUnlocked(world.bentobox.bentobox.api.user.User, org.bukkit.World, world.bentobox.challenges.database.object.ChallengeLevel)}.
      */
     @Test
     public void testIsLevelUnlocked() {
@@ -605,7 +606,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#setLevelComplete(world.bentobox.bentobox.api.user.User, org.bukkit.World, world.bentobox.challenges.database.object.ChallengeLevel)}.
+     * Test method for {@link ChallengesManager#setLevelComplete(world.bentobox.bentobox.api.user.User, org.bukkit.World, world.bentobox.challenges.database.object.ChallengeLevel)}.
      */
     @Test
     public void testSetLevelComplete() {
@@ -616,7 +617,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#validateLevelCompletion(world.bentobox.bentobox.api.user.User, org.bukkit.World, world.bentobox.challenges.database.object.ChallengeLevel)}.
+     * Test method for {@link ChallengesManager#validateLevelCompletion(world.bentobox.bentobox.api.user.User, org.bukkit.World, world.bentobox.challenges.database.object.ChallengeLevel)}.
      */
     @Test
     public void testValidateLevelCompletion() {
@@ -624,7 +625,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#getChallengeLevelStatus(java.util.UUID, org.bukkit.World, world.bentobox.challenges.database.object.ChallengeLevel)}.
+     * Test method for {@link ChallengesManager#getChallengeLevelStatus(java.util.UUID, org.bukkit.World, world.bentobox.challenges.database.object.ChallengeLevel)}.
      */
     @Test
     public void testGetChallengeLevelStatus() {
@@ -639,7 +640,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#getAllChallengeLevelStatus(world.bentobox.bentobox.api.user.User, org.bukkit.World)}.
+     * Test method for {@link ChallengesManager#getAllChallengeLevelStatus(world.bentobox.bentobox.api.user.User, org.bukkit.World)}.
      */
     @Test
     public void testGetAllChallengeLevelStatus() {
@@ -655,7 +656,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#getAllChallengesNames(org.bukkit.World)}.
+     * Test method for {@link ChallengesManager#getAllChallengesNames(org.bukkit.World)}.
      */
     @Test
     public void testGetAllChallengesNames() {
@@ -668,7 +669,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#getAllChallenges(org.bukkit.World)}.
+     * Test method for {@link ChallengesManager#getAllChallenges(org.bukkit.World)}.
      */
     @Test
     public void testGetAllChallenges() {
@@ -681,7 +682,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#getFreeChallenges(org.bukkit.World)}.
+     * Test method for {@link ChallengesManager#getFreeChallenges(org.bukkit.World)}.
      */
     @Test
     public void testGetFreeChallenges() {
@@ -701,7 +702,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#getLevelChallenges(world.bentobox.challenges.database.object.ChallengeLevel)}.
+     * Test method for {@link ChallengesManager#getLevelChallenges(world.bentobox.challenges.database.object.ChallengeLevel)}.
      * @throws InterruptedException
      */
     @Test
@@ -718,7 +719,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#getChallenge(java.lang.String)}.
+     * Test method for {@link ChallengesManager#getChallenge(java.lang.String)}.
      * @throws InterruptedException
      */
     @Test
@@ -732,7 +733,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#containsChallenge(java.lang.String)}.
+     * Test method for {@link ChallengesManager#containsChallenge(java.lang.String)}.
      */
     @Test
     public void testContainsChallenge() {
@@ -740,7 +741,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#createChallenge(java.lang.String, world.bentobox.challenges.database.object.Challenge.ChallengeType, world.bentobox.challenges.database.object.requirements.Requirements)}.
+     * Test method for {@link ChallengesManager#createChallenge(java.lang.String, world.bentobox.challenges.database.object.Challenge.ChallengeType, world.bentobox.challenges.database.object.requirements.Requirements)}.
      */
     @Test
     public void testCreateChallenge() {
@@ -751,7 +752,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#deleteChallenge(world.bentobox.challenges.database.object.Challenge)}.
+     * Test method for {@link ChallengesManager#deleteChallenge(world.bentobox.challenges.database.object.Challenge)}.
      * @throws InterruptedException
      */
     @Test
@@ -767,7 +768,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#getLevels(org.bukkit.World)}.
+     * Test method for {@link ChallengesManager#getLevels(org.bukkit.World)}.
      */
     @Test
     public void testGetLevels() {
@@ -778,7 +779,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#getLevel(world.bentobox.challenges.database.object.Challenge)}.
+     * Test method for {@link ChallengesManager#getLevel(world.bentobox.challenges.database.object.Challenge)}.
      */
     @Test
     public void testGetLevelChallenge() {
@@ -787,7 +788,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#getLevel(java.lang.String)}.
+     * Test method for {@link ChallengesManager#getLevel(java.lang.String)}.
      */
     @Test
     public void testGetLevelString() {
@@ -798,7 +799,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#containsLevel(java.lang.String)}.
+     * Test method for {@link ChallengesManager#containsLevel(java.lang.String)}.
      */
     @Test
     public void testContainsLevel() {
@@ -808,7 +809,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#addChallengeToLevel(world.bentobox.challenges.database.object.Challenge, world.bentobox.challenges.database.object.ChallengeLevel)}.
+     * Test method for {@link ChallengesManager#addChallengeToLevel(world.bentobox.challenges.database.object.Challenge, world.bentobox.challenges.database.object.ChallengeLevel)}.
      * @throws InterruptedException
      */
     @Test
@@ -821,7 +822,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#removeChallengeFromLevel(world.bentobox.challenges.database.object.Challenge, world.bentobox.challenges.database.object.ChallengeLevel)}.
+     * Test method for {@link ChallengesManager#removeChallengeFromLevel(world.bentobox.challenges.database.object.Challenge, world.bentobox.challenges.database.object.ChallengeLevel)}.
      * @throws InterruptedException
      */
     @Test
@@ -832,7 +833,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#createLevel(java.lang.String, org.bukkit.World)}.
+     * Test method for {@link ChallengesManager#createLevel(java.lang.String, org.bukkit.World)}.
      */
     @Test
     public void testCreateLevel() {
@@ -843,7 +844,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#deleteChallengeLevel(world.bentobox.challenges.database.object.ChallengeLevel)}.
+     * Test method for {@link ChallengesManager#deleteChallengeLevel(world.bentobox.challenges.database.object.ChallengeLevel)}.
      * @throws InterruptedException
      */
     @Test
@@ -855,7 +856,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#hasAnyChallengeData(org.bukkit.World)}.
+     * Test method for {@link ChallengesManager#hasAnyChallengeData(org.bukkit.World)}.
      * @throws InterruptedException
      */
     @Test
@@ -866,7 +867,7 @@ public class ChallengesManagerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.challenges.ChallengesManager#hasAnyChallengeData(java.lang.String)}.
+     * Test method for {@link ChallengesManager#hasAnyChallengeData(java.lang.String)}.
      * @throws InterruptedException
      */
     @Test
diff --git a/src/test/java/world/bentobox/challenges/commands/ChallengesCommandTest.java b/src/test/java/world/bentobox/challenges/commands/ChallengesCommandTest.java
index 657a495..3fc0e63 100644
--- a/src/test/java/world/bentobox/challenges/commands/ChallengesCommandTest.java
+++ b/src/test/java/world/bentobox/challenges/commands/ChallengesCommandTest.java
@@ -43,7 +43,7 @@ import world.bentobox.bentobox.managers.CommandsManager;
 import world.bentobox.bentobox.managers.IslandWorldManager;
 import world.bentobox.bentobox.managers.IslandsManager;
 import world.bentobox.challenges.ChallengesAddon;
-import world.bentobox.challenges.ChallengesManager;
+import world.bentobox.challenges.managers.ChallengesManager;
 import world.bentobox.challenges.config.Settings;
 import world.bentobox.challenges.config.SettingsUtils.VisibilityMode;
 
diff --git a/src/test/java/world/bentobox/challenges/commands/CompleteChallengeCommandTest.java b/src/test/java/world/bentobox/challenges/commands/CompleteChallengeCommandTest.java
index 3309010..d36ac87 100644
--- a/src/test/java/world/bentobox/challenges/commands/CompleteChallengeCommandTest.java
+++ b/src/test/java/world/bentobox/challenges/commands/CompleteChallengeCommandTest.java
@@ -47,7 +47,7 @@ import world.bentobox.bentobox.managers.IslandWorldManager;
 import world.bentobox.bentobox.managers.IslandsManager;
 import world.bentobox.bentobox.util.Util;
 import world.bentobox.challenges.ChallengesAddon;
-import world.bentobox.challenges.ChallengesManager;
+import world.bentobox.challenges.managers.ChallengesManager;
 import world.bentobox.challenges.config.Settings;
 import world.bentobox.challenges.config.SettingsUtils.VisibilityMode;
 import world.bentobox.challenges.database.object.Challenge;
diff --git a/src/test/java/world/bentobox/challenges/panel/user/ChallengesGUITest.java b/src/test/java/world/bentobox/challenges/panel/user/ChallengesGUITest.java
index 7262791..e030f55 100644
--- a/src/test/java/world/bentobox/challenges/panel/user/ChallengesGUITest.java
+++ b/src/test/java/world/bentobox/challenges/panel/user/ChallengesGUITest.java
@@ -47,7 +47,7 @@ import world.bentobox.bentobox.managers.BlueprintsManager;
 import world.bentobox.bentobox.managers.IslandWorldManager;
 import world.bentobox.bentobox.managers.IslandsManager;
 import world.bentobox.challenges.ChallengesAddon;
-import world.bentobox.challenges.ChallengesManager;
+import world.bentobox.challenges.managers.ChallengesManager;
 import world.bentobox.challenges.config.Settings;
 import world.bentobox.challenges.config.SettingsUtils.VisibilityMode;
 import world.bentobox.challenges.database.object.Challenge;
diff --git a/src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java b/src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java
index 2bbbe26..4d62189 100644
--- a/src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java
+++ b/src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java
@@ -60,7 +60,7 @@ import world.bentobox.bentobox.managers.LocalesManager;
 import world.bentobox.bentobox.managers.PlaceholdersManager;
 import world.bentobox.bentobox.util.Util;
 import world.bentobox.challenges.ChallengesAddon;
-import world.bentobox.challenges.ChallengesManager;
+import world.bentobox.challenges.managers.ChallengesManager;
 import world.bentobox.challenges.config.Settings;
 import world.bentobox.challenges.database.object.Challenge;
 import world.bentobox.challenges.database.object.Challenge.ChallengeType;