diff --git a/nicko-core/dependency-reduced-pom.xml b/nicko-core/dependency-reduced-pom.xml
index eb01f8a..a974651 100644
--- a/nicko-core/dependency-reduced-pom.xml
+++ b/nicko-core/dependency-reduced-pom.xml
@@ -38,6 +38,7 @@
                   <include>xyz.upperlevel.spigot.book:spigot-book-api</include>
                   <include>net.wesjd:anvilgui</include>
                   <include>de.studiocode.invui:*</include>
+                  <include>io.vavr:vavr</include>
                 </includes>
               </artifactSet>
               <relocations>
@@ -122,5 +123,6 @@
   <properties>
     <maven.compiler.target>17</maven.compiler.target>
     <maven.compiler.source>17</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/nicko-core/pom.xml b/nicko-core/pom.xml
index 32fc4ab..4b5b3e7 100644
--- a/nicko-core/pom.xml
+++ b/nicko-core/pom.xml
@@ -16,6 +16,7 @@
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <repositories>
@@ -55,6 +56,11 @@
             <artifactId>InvUI</artifactId>
             <version>0.8.2</version>
         </dependency>
+        <dependency>
+            <groupId>io.vavr</groupId>
+            <artifactId>vavr</artifactId>
+            <version>0.10.4</version>
+        </dependency>
         <dependency>
             <groupId>xyz.upperlevel.spigot.book</groupId>
             <artifactId>spigot-book-api</artifactId>
@@ -105,6 +111,7 @@
                                     <include>xyz.upperlevel.spigot.book:spigot-book-api</include>
                                     <include>net.wesjd:anvilgui</include>
                                     <include>de.studiocode.invui:*</include>
+                                    <include>io.vavr:vavr</include>
                                 </includes>
                             </artifactSet>
                             <relocations>
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/AdminPanelAccessItem.java b/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/AdminPanelAccessItem.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/AdminPanelAccessItem.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/AdminPanelAccessItem.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/ChangeNameAndSkinItem.java b/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/ChangeNameAndSkinItem.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/ChangeNameAndSkinItem.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/ChangeNameAndSkinItem.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/ChangeNameItem.java b/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/ChangeNameItem.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/ChangeNameItem.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/ChangeNameItem.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/ChangeSkinItem.java b/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/ChangeSkinItem.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/ChangeSkinItem.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/ChangeSkinItem.java
diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/ExitDoorItem.java b/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/ExitDoorItem.java
similarity index 100%
rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/ExitDoorItem.java
rename to nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/ExitDoorItem.java