diff --git a/src/main/kotlin/io/delilaheve/AnvilEventListener.kt b/src/main/kotlin/io/delilaheve/AnvilEventListener.kt
index eec1a10..110a651 100644
--- a/src/main/kotlin/io/delilaheve/AnvilEventListener.kt
+++ b/src/main/kotlin/io/delilaheve/AnvilEventListener.kt
@@ -23,8 +23,8 @@ import org.bukkit.inventory.AnvilInventory
 import org.bukkit.inventory.InventoryView.Property.REPAIR_COST
 import org.bukkit.inventory.ItemStack
 import org.bukkit.inventory.meta.Repairable
-import xyz.alexcrea.group.ConflictType
-import xyz.alexcrea.util.UnitRepairUtil.getRepair
+import xyz.alexcrea.cuanvil.group.ConflictType
+import xyz.alexcrea.cuanvil.util.UnitRepairUtil.getRepair
 import kotlin.math.min
 
 
diff --git a/src/main/kotlin/io/delilaheve/CustomAnvil.kt b/src/main/kotlin/io/delilaheve/CustomAnvil.kt
index 73f34f2..1fee6ea 100644
--- a/src/main/kotlin/io/delilaheve/CustomAnvil.kt
+++ b/src/main/kotlin/io/delilaheve/CustomAnvil.kt
@@ -4,12 +4,12 @@ import io.delilaheve.util.ConfigOptions
 import org.bukkit.Bukkit
 import org.bukkit.configuration.file.YamlConfiguration
 import org.bukkit.plugin.java.JavaPlugin
-import xyz.alexcrea.command.ReloadExecutor
-import xyz.alexcrea.command.TestExecutor
+import xyz.alexcrea.cuanvil.command.ReloadExecutor
+import xyz.alexcrea.cuanvil.command.TestExecutor
 import xyz.alexcrea.cuanvil.util.Metrics
-import xyz.alexcrea.group.EnchantConflictManager
-import xyz.alexcrea.group.ItemGroupManager
-import xyz.alexcrea.util.MetricsUtil
+import xyz.alexcrea.cuanvil.group.EnchantConflictManager
+import xyz.alexcrea.cuanvil.group.ItemGroupManager
+import xyz.alexcrea.cuanvil.util.MetricsUtil
 import java.io.File
 import java.io.FileReader
 
@@ -147,7 +147,7 @@ class CustomAnvil : JavaPlugin() {
         return yamlConfig
     }
 
-    fun prepareCommand(): Unit {
+    fun prepareCommand() {
         var command = getCommand(commandReloadName)
         command?.setExecutor(ReloadExecutor())
 
diff --git a/src/main/kotlin/io/delilaheve/util/EnchantmentUtil.kt b/src/main/kotlin/io/delilaheve/util/EnchantmentUtil.kt
index 07874d9..ff61cbb 100644
--- a/src/main/kotlin/io/delilaheve/util/EnchantmentUtil.kt
+++ b/src/main/kotlin/io/delilaheve/util/EnchantmentUtil.kt
@@ -4,7 +4,7 @@ import io.delilaheve.CustomAnvil
 import org.bukkit.Material
 import org.bukkit.enchantments.Enchantment
 import org.bukkit.entity.HumanEntity
-import xyz.alexcrea.group.ConflictType
+import xyz.alexcrea.cuanvil.group.ConflictType
 import kotlin.math.max
 import kotlin.math.min
 
diff --git a/src/main/kotlin/xyz/alexcrea/command/ReloadExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt
similarity index 97%
rename from src/main/kotlin/xyz/alexcrea/command/ReloadExecutor.kt
rename to src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt
index 4893343..b92b569 100644
--- a/src/main/kotlin/xyz/alexcrea/command/ReloadExecutor.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt
@@ -1,4 +1,4 @@
-package xyz.alexcrea.command
+package xyz.alexcrea.cuanvil.command
 
 import io.delilaheve.CustomAnvil
 import org.bukkit.command.Command
diff --git a/src/main/kotlin/xyz/alexcrea/command/TestExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/TestExecutor.kt
similarity index 92%
rename from src/main/kotlin/xyz/alexcrea/command/TestExecutor.kt
rename to src/main/kotlin/xyz/alexcrea/cuanvil/command/TestExecutor.kt
index aa80055..9140edc 100644
--- a/src/main/kotlin/xyz/alexcrea/command/TestExecutor.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/TestExecutor.kt
@@ -1,4 +1,4 @@
-package xyz.alexcrea.command
+package xyz.alexcrea.cuanvil.command
 
 import org.bukkit.command.Command
 import org.bukkit.command.CommandExecutor
diff --git a/src/main/kotlin/xyz/alexcrea/group/AbstractMaterialGroup.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/group/AbstractMaterialGroup.kt
similarity index 96%
rename from src/main/kotlin/xyz/alexcrea/group/AbstractMaterialGroup.kt
rename to src/main/kotlin/xyz/alexcrea/cuanvil/group/AbstractMaterialGroup.kt
index b253da9..fbc007a 100644
--- a/src/main/kotlin/xyz/alexcrea/group/AbstractMaterialGroup.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/group/AbstractMaterialGroup.kt
@@ -1,4 +1,4 @@
-package xyz.alexcrea.group
+package xyz.alexcrea.cuanvil.group
 
 import org.bukkit.Material
 import java.util.EnumSet
diff --git a/src/main/kotlin/xyz/alexcrea/group/EnchantConflictGroup.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictGroup.kt
similarity index 96%
rename from src/main/kotlin/xyz/alexcrea/group/EnchantConflictGroup.kt
rename to src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictGroup.kt
index adef2fe..08b1e02 100644
--- a/src/main/kotlin/xyz/alexcrea/group/EnchantConflictGroup.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictGroup.kt
@@ -1,4 +1,4 @@
-package xyz.alexcrea.group
+package xyz.alexcrea.cuanvil.group
 
 import org.bukkit.Material
 import org.bukkit.enchantments.Enchantment
diff --git a/src/main/kotlin/xyz/alexcrea/group/EnchantConflictManager.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictManager.kt
similarity index 94%
rename from src/main/kotlin/xyz/alexcrea/group/EnchantConflictManager.kt
rename to src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictManager.kt
index 0b2a271..add081f 100644
--- a/src/main/kotlin/xyz/alexcrea/group/EnchantConflictManager.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictManager.kt
@@ -1,4 +1,4 @@
-package xyz.alexcrea.group
+package xyz.alexcrea.cuanvil.group
 
 import io.delilaheve.CustomAnvil
 import org.bukkit.Material
@@ -86,8 +86,8 @@ class EnchantConflictManager {
     }
 
     private fun createConflictObject(section: ConfigurationSection,
-                               itemManager: ItemGroupManager,
-                               conflictName: String): EnchantConflictGroup {
+                                     itemManager: ItemGroupManager,
+                                     conflictName: String): EnchantConflictGroup {
         // Get the maximum number of enchantment before validating the conflict
         var minBeforeBlock = section.getInt(ENCH_MAX_PATH,0)
         if(minBeforeBlock < 0){
@@ -112,7 +112,7 @@ class EnchantConflictManager {
         return EnchantConflictGroup(finalGroup, minBeforeBlock)
     }
 
-    private fun findGroup(groupName: String,itemManager: ItemGroupManager, conflictName: String): AbstractMaterialGroup {
+    private fun findGroup(groupName: String, itemManager: ItemGroupManager, conflictName: String): AbstractMaterialGroup {
         val group = itemManager.get(groupName)
         if(group == null){
             CustomAnvil.instance.logger.warning("Group $groupName do not exist but is ask by conflict $conflictName")
@@ -122,7 +122,7 @@ class EnchantConflictManager {
         return group
     }
 
-    fun isConflicting(base: Set<Enchantment>,mat: Material, newEnchant: Enchantment): ConflictType{
+    fun isConflicting(base: Set<Enchantment>,mat: Material, newEnchant: Enchantment): ConflictType {
         val conflictList = conflictMap[newEnchant] ?: return ConflictType.NO_CONFLICT
 
         var result = ConflictType.NO_CONFLICT
diff --git a/src/main/kotlin/xyz/alexcrea/group/ExcludeGroup.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/group/ExcludeGroup.kt
similarity index 95%
rename from src/main/kotlin/xyz/alexcrea/group/ExcludeGroup.kt
rename to src/main/kotlin/xyz/alexcrea/cuanvil/group/ExcludeGroup.kt
index e929346..fe70cb6 100644
--- a/src/main/kotlin/xyz/alexcrea/group/ExcludeGroup.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/group/ExcludeGroup.kt
@@ -1,4 +1,4 @@
-package xyz.alexcrea.group
+package xyz.alexcrea.cuanvil.group
 
 import org.bukkit.Material
 import java.util.*
diff --git a/src/main/kotlin/xyz/alexcrea/group/IncludeGroup.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/group/IncludeGroup.kt
similarity index 95%
rename from src/main/kotlin/xyz/alexcrea/group/IncludeGroup.kt
rename to src/main/kotlin/xyz/alexcrea/cuanvil/group/IncludeGroup.kt
index d349821..8f97b94 100644
--- a/src/main/kotlin/xyz/alexcrea/group/IncludeGroup.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/group/IncludeGroup.kt
@@ -1,4 +1,4 @@
-package xyz.alexcrea.group
+package xyz.alexcrea.cuanvil.group
 
 import org.bukkit.Material
 import java.util.EnumSet
diff --git a/src/main/kotlin/xyz/alexcrea/group/ItemGroupManager.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/group/ItemGroupManager.kt
similarity index 96%
rename from src/main/kotlin/xyz/alexcrea/group/ItemGroupManager.kt
rename to src/main/kotlin/xyz/alexcrea/cuanvil/group/ItemGroupManager.kt
index dc67389..f157870 100644
--- a/src/main/kotlin/xyz/alexcrea/group/ItemGroupManager.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/group/ItemGroupManager.kt
@@ -1,4 +1,4 @@
-package xyz.alexcrea.group
+package xyz.alexcrea.cuanvil.group
 
 import io.delilaheve.CustomAnvil
 import org.bukkit.Material
@@ -20,7 +20,7 @@ class ItemGroupManager {
         private val FUTURE_MATERIAL = setOf("PIGLIN_HEAD","BRUSH")
     }
 
-    private lateinit var groupMap : HashMap<String,AbstractMaterialGroup>
+    private lateinit var groupMap : HashMap<String, AbstractMaterialGroup>
 
     // Read and create material groups
     fun prepareGroups(config: YamlConfiguration){
@@ -37,7 +37,7 @@ class ItemGroupManager {
     // Create group by key
     private fun createGroup(config: YamlConfiguration,
                             keys: Set<String>,
-                            key: String): AbstractMaterialGroup{
+                            key: String): AbstractMaterialGroup {
         val groupSection = config.getConfigurationSection(key)!!
         val groupType = groupSection.getString(GROUP_TYPE_PATH,null)
 
diff --git a/src/main/kotlin/xyz/alexcrea/util/MetricsUtil.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/util/MetricsUtil.kt
similarity index 97%
rename from src/main/kotlin/xyz/alexcrea/util/MetricsUtil.kt
rename to src/main/kotlin/xyz/alexcrea/cuanvil/util/MetricsUtil.kt
index e6db164..7e56db2 100644
--- a/src/main/kotlin/xyz/alexcrea/util/MetricsUtil.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/util/MetricsUtil.kt
@@ -1,9 +1,8 @@
-package xyz.alexcrea.util
+package xyz.alexcrea.cuanvil.util
 
 import io.delilaheve.CustomAnvil
 import io.delilaheve.util.ConfigOptions
 import org.bukkit.configuration.ConfigurationSection
-import xyz.alexcrea.cuanvil.util.Metrics
 
 object MetricsUtil {
 
@@ -73,7 +72,7 @@ object MetricsUtil {
         // Calculate hash of config
         val baseConfig = testBaseConfig(defaultConfig)
         val limitEnchantConfig = getHashFromKey(defaultConfig, ConfigOptions.ENCHANT_LIMIT_ROOT)
-        val enchantValueConfig =getHashFromKey(defaultConfig, ConfigOptions.ENCHANT_VALUES_ROOT)
+        val enchantValueConfig = getHashFromKey(defaultConfig, ConfigOptions.ENCHANT_VALUES_ROOT)
         val enchantConflictConfig2 = getConfigurationHash(enchantConflictConfig)
         val itemGroupConfig = getConfigurationHash(itemGroupsConfig)
         val unitRepairConfig = getConfigurationHash(unitRepairItemConfig)
diff --git a/src/main/kotlin/xyz/alexcrea/util/UnitRepairUtil.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/util/UnitRepairUtil.kt
similarity index 96%
rename from src/main/kotlin/xyz/alexcrea/util/UnitRepairUtil.kt
rename to src/main/kotlin/xyz/alexcrea/cuanvil/util/UnitRepairUtil.kt
index 19b531d..b01d37f 100644
--- a/src/main/kotlin/xyz/alexcrea/util/UnitRepairUtil.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/util/UnitRepairUtil.kt
@@ -1,4 +1,4 @@
-package xyz.alexcrea.util
+package xyz.alexcrea.cuanvil.util
 
 import io.delilaheve.CustomAnvil
 import org.bukkit.configuration.ConfigurationSection
@@ -30,7 +30,7 @@ object UnitRepairUtil {
             }
         }
         // Get repair amount
-        var userDefault = config.getDouble(UNIT_REPAIR_DEFAULT_PATH,DEFAULT_DEFAULT_UNIT_REPAIR)
+        var userDefault = config.getDouble(UNIT_REPAIR_DEFAULT_PATH, DEFAULT_DEFAULT_UNIT_REPAIR)
         if(userDefault <= 0){
             userDefault = DEFAULT_DEFAULT_UNIT_REPAIR
         }