diff --git a/src/main/java/com/songoda/epicenchants/EpicEnchants.java b/src/main/java/com/songoda/epicenchants/EpicEnchants.java
index 9c80de7..2f9e512 100644
--- a/src/main/java/com/songoda/epicenchants/EpicEnchants.java
+++ b/src/main/java/com/songoda/epicenchants/EpicEnchants.java
@@ -7,7 +7,7 @@ import com.songoda.core.compatibility.CompatibleMaterial;
 import com.songoda.core.configuration.Config;
 import com.songoda.core.gui.GuiManager;
 import com.songoda.core.hooks.EconomyManager;
-import com.songoda.epicenchants.command.commands.*;
+import com.songoda.epicenchants.commands.*;
 import com.songoda.epicenchants.listeners.ArmorListener;
 import com.songoda.epicenchants.listeners.EntityListener;
 import com.songoda.epicenchants.listeners.HeldItemListener;
diff --git a/src/main/java/com/songoda/epicenchants/commands/CommandAlchemist.java b/src/main/java/com/songoda/epicenchants/commands/CommandAlchemist.java
index b8b1fac..51f8a55 100644
--- a/src/main/java/com/songoda/epicenchants/commands/CommandAlchemist.java
+++ b/src/main/java/com/songoda/epicenchants/commands/CommandAlchemist.java
@@ -1,4 +1,4 @@
-package com.songoda.epicenchants.command.commands;
+package com.songoda.epicenchants.commands;
 
 import com.songoda.core.commands.AbstractCommand;
 import com.songoda.epicenchants.EpicEnchants;
diff --git a/src/main/java/com/songoda/epicenchants/commands/CommandApply.java b/src/main/java/com/songoda/epicenchants/commands/CommandApply.java
index 1865083..afe9209 100644
--- a/src/main/java/com/songoda/epicenchants/commands/CommandApply.java
+++ b/src/main/java/com/songoda/epicenchants/commands/CommandApply.java
@@ -1,4 +1,4 @@
-package com.songoda.epicenchants.command.commands;
+package com.songoda.epicenchants.commands;
 
 import com.songoda.core.commands.AbstractCommand;
 import com.songoda.core.compatibility.CompatibleMaterial;
@@ -22,7 +22,7 @@ import static com.songoda.epicenchants.utils.single.GeneralUtils.getMessageFromR
 public class CommandApply extends AbstractCommand {
 
     private final EpicEnchants plugin;
-    
+
     public CommandApply(EpicEnchants plugin) {
         super(true, "apply");
         this.plugin = plugin;
diff --git a/src/main/java/com/songoda/epicenchants/commands/CommandEnchanter.java b/src/main/java/com/songoda/epicenchants/commands/CommandEnchanter.java
index 75e8268..10a561c 100644
--- a/src/main/java/com/songoda/epicenchants/commands/CommandEnchanter.java
+++ b/src/main/java/com/songoda/epicenchants/commands/CommandEnchanter.java
@@ -1,4 +1,4 @@
-package com.songoda.epicenchants.command.commands;
+package com.songoda.epicenchants.commands;
 
 import com.songoda.core.commands.AbstractCommand;
 import com.songoda.epicenchants.EpicEnchants;
diff --git a/src/main/java/com/songoda/epicenchants/commands/CommandGiveBook.java b/src/main/java/com/songoda/epicenchants/commands/CommandGiveBook.java
index 6bf32d8..d00014e 100644
--- a/src/main/java/com/songoda/epicenchants/commands/CommandGiveBook.java
+++ b/src/main/java/com/songoda/epicenchants/commands/CommandGiveBook.java
@@ -1,4 +1,4 @@
-package com.songoda.epicenchants.command.commands;
+package com.songoda.epicenchants.commands;
 
 import com.songoda.core.commands.AbstractCommand;
 import com.songoda.epicenchants.CommandCommons;
@@ -17,7 +17,7 @@ import java.util.stream.Collectors;
 public class CommandGiveBook extends AbstractCommand {
 
     private final EpicEnchants plugin;
-    
+
     public CommandGiveBook(EpicEnchants plugin) {
         super(false, "givebook");
         this.plugin = plugin;
diff --git a/src/main/java/com/songoda/epicenchants/commands/CommandGiveItemDust.java b/src/main/java/com/songoda/epicenchants/commands/CommandGiveItemDust.java
index 0bde823..11651d5 100644
--- a/src/main/java/com/songoda/epicenchants/commands/CommandGiveItemDust.java
+++ b/src/main/java/com/songoda/epicenchants/commands/CommandGiveItemDust.java
@@ -1,4 +1,4 @@
-package com.songoda.epicenchants.command.commands;
+package com.songoda.epicenchants.commands;
 
 import com.songoda.core.commands.AbstractCommand;
 import com.songoda.epicenchants.CommandCommons;
@@ -15,7 +15,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 public class CommandGiveItemDust extends AbstractCommand {
-    
+
     private final EpicEnchants plugin;
 
     public CommandGiveItemDust(EpicEnchants plugin) {
diff --git a/src/main/java/com/songoda/epicenchants/commands/CommandGiveRandomBook.java b/src/main/java/com/songoda/epicenchants/commands/CommandGiveRandomBook.java
index f35535c..563a8da 100644
--- a/src/main/java/com/songoda/epicenchants/commands/CommandGiveRandomBook.java
+++ b/src/main/java/com/songoda/epicenchants/commands/CommandGiveRandomBook.java
@@ -1,4 +1,4 @@
-package com.songoda.epicenchants.command.commands;
+package com.songoda.epicenchants.commands;
 
 import com.songoda.core.commands.AbstractCommand;
 import com.songoda.epicenchants.EpicEnchants;
@@ -14,7 +14,7 @@ import java.util.stream.Collectors;
 public class CommandGiveRandomBook extends AbstractCommand {
 
     private final EpicEnchants plugin;
-    
+
     public CommandGiveRandomBook(EpicEnchants plugin) {
         super(false, "giverandombook");
         this.plugin = plugin;
diff --git a/src/main/java/com/songoda/epicenchants/commands/CommandGiveScroll.java b/src/main/java/com/songoda/epicenchants/commands/CommandGiveScroll.java
index b84128d..907a004 100644
--- a/src/main/java/com/songoda/epicenchants/commands/CommandGiveScroll.java
+++ b/src/main/java/com/songoda/epicenchants/commands/CommandGiveScroll.java
@@ -1,4 +1,4 @@
-package com.songoda.epicenchants.command.commands;
+package com.songoda.epicenchants.commands;
 
 import com.songoda.core.commands.AbstractCommand;
 import com.songoda.epicenchants.CommandCommons;
@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 public class CommandGiveScroll extends AbstractCommand {
-    
+
     private final EpicEnchants plugin;
 
     public CommandGiveScroll(EpicEnchants plugin) {
diff --git a/src/main/java/com/songoda/epicenchants/commands/CommandList.java b/src/main/java/com/songoda/epicenchants/commands/CommandList.java
index 60b9777..684b973 100644
--- a/src/main/java/com/songoda/epicenchants/commands/CommandList.java
+++ b/src/main/java/com/songoda/epicenchants/commands/CommandList.java
@@ -1,4 +1,4 @@
-package com.songoda.epicenchants.command.commands;
+package com.songoda.epicenchants.commands;
 
 import com.songoda.core.commands.AbstractCommand;
 import com.songoda.epicenchants.EpicEnchants;
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 public class CommandList extends AbstractCommand {
-    
+
     private final EpicEnchants plugin;
 
     public CommandList(EpicEnchants plugin) {
diff --git a/src/main/java/com/songoda/epicenchants/commands/CommandReload.java b/src/main/java/com/songoda/epicenchants/commands/CommandReload.java
index 88e4aeb..9bbd65e 100644
--- a/src/main/java/com/songoda/epicenchants/commands/CommandReload.java
+++ b/src/main/java/com/songoda/epicenchants/commands/CommandReload.java
@@ -1,4 +1,4 @@
-package com.songoda.epicenchants.command.commands;
+package com.songoda.epicenchants.commands;
 
 import com.songoda.core.commands.AbstractCommand;
 import com.songoda.epicenchants.EpicEnchants;
diff --git a/src/main/java/com/songoda/epicenchants/commands/CommandSettings.java b/src/main/java/com/songoda/epicenchants/commands/CommandSettings.java
index 3c3b1c9..ad774b9 100644
--- a/src/main/java/com/songoda/epicenchants/commands/CommandSettings.java
+++ b/src/main/java/com/songoda/epicenchants/commands/CommandSettings.java
@@ -1,4 +1,4 @@
-package com.songoda.epicenchants.command.commands;
+package com.songoda.epicenchants.commands;
 
 import com.songoda.core.commands.AbstractCommand;
 import com.songoda.core.configuration.editor.PluginConfigGui;
@@ -9,7 +9,7 @@ import org.bukkit.entity.Player;
 import java.util.List;
 
 public class CommandSettings extends AbstractCommand {
-    
+
     private final EpicEnchants plugin;
 
     public CommandSettings(EpicEnchants plugin) {
diff --git a/src/main/java/com/songoda/epicenchants/commands/CommandTinkerer.java b/src/main/java/com/songoda/epicenchants/commands/CommandTinkerer.java
index c025e1d..3238917 100644
--- a/src/main/java/com/songoda/epicenchants/commands/CommandTinkerer.java
+++ b/src/main/java/com/songoda/epicenchants/commands/CommandTinkerer.java
@@ -1,4 +1,4 @@
-package com.songoda.epicenchants.command.commands;
+package com.songoda.epicenchants.commands;
 
 import com.songoda.core.commands.AbstractCommand;
 import com.songoda.epicenchants.EpicEnchants;
@@ -9,7 +9,7 @@ import org.bukkit.entity.Player;
 import java.util.List;
 
 public class CommandTinkerer extends AbstractCommand {
-    
+
     private final EpicEnchants plugin;
 
     public CommandTinkerer(EpicEnchants plugin) {