diff --git a/v1_17_R1/pom.xml b/nms/v1_17_R1/pom.xml
similarity index 95%
rename from v1_17_R1/pom.xml
rename to nms/v1_17_R1/pom.xml
index 36bdbbd3..8450d8d7 100644
--- a/v1_17_R1/pom.xml
+++ b/nms/v1_17_R1/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>LibsDisguises</artifactId>
         <groupId>LibsDisguises</groupId>
         <version>10.0.27-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -72,7 +72,7 @@
                         </goals>
                         <id>remap-spigot</id>
                         <configuration>
-                            <inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>
+                            <inputFile>target/v1_17_R1-10.0.27-SNAPSHOT-remapped-obf.jar</inputFile>
                             <srgIn>org.spigotmc:minecraft-server:1.17.1-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
                             <remappedDependencies>org.spigotmc:spigot:1.17.1-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
                             <remappedArtifactAttached>true</remappedArtifactAttached>
diff --git a/v1_17_R1/src/main/java/me/libraryaddict/disguise/utilities/reflection/v1_17/ReflectionManager.java b/nms/v1_17_R1/src/main/java/me/libraryaddict/disguise/utilities/reflection/v1_17/ReflectionManager.java
similarity index 100%
rename from v1_17_R1/src/main/java/me/libraryaddict/disguise/utilities/reflection/v1_17/ReflectionManager.java
rename to nms/v1_17_R1/src/main/java/me/libraryaddict/disguise/utilities/reflection/v1_17/ReflectionManager.java
diff --git a/v1_18_R1/pom.xml b/nms/v1_18_R1/pom.xml
similarity index 95%
rename from v1_18_R1/pom.xml
rename to nms/v1_18_R1/pom.xml
index 97975be6..4c5f6850 100644
--- a/v1_18_R1/pom.xml
+++ b/nms/v1_18_R1/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>LibsDisguises</artifactId>
         <groupId>LibsDisguises</groupId>
         <version>10.0.27-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -71,7 +71,7 @@
                         </goals>
                         <id>remap-spigot</id>
                         <configuration>
-                            <inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>
+                            <inputFile>target/v1_18_R1-10.0.27-SNAPSHOT-remapped-obf.jar</inputFile>
                             <srgIn>org.spigotmc:minecraft-server:1.18-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
                             <remappedDependencies>org.spigotmc:spigot:1.18-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
                             <remappedArtifactAttached>true</remappedArtifactAttached>
diff --git a/v1_18_R1/src/main/java/me/libraryaddict/disguise/utilities/reflection/v1_18/ReflectionManager.java b/nms/v1_18_R1/src/main/java/me/libraryaddict/disguise/utilities/reflection/v1_18_1/ReflectionManager.java
similarity index 99%
rename from v1_18_R1/src/main/java/me/libraryaddict/disguise/utilities/reflection/v1_18/ReflectionManager.java
rename to nms/v1_18_R1/src/main/java/me/libraryaddict/disguise/utilities/reflection/v1_18_1/ReflectionManager.java
index 391388f9..40ccb8c3 100644
--- a/v1_18_R1/src/main/java/me/libraryaddict/disguise/utilities/reflection/v1_18/ReflectionManager.java
+++ b/nms/v1_18_R1/src/main/java/me/libraryaddict/disguise/utilities/reflection/v1_18_1/ReflectionManager.java
@@ -1,4 +1,4 @@
-package me.libraryaddict.disguise.utilities.reflection.v1_18;
+package me.libraryaddict.disguise.utilities.reflection.v1_18_1;
 
 import com.comphenix.protocol.wrappers.BlockPosition;
 import com.comphenix.protocol.wrappers.EnumWrappers.Direction;
diff --git a/pom.xml b/pom.xml
index 5a2e13c4..1e29a61a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,8 @@
     <version>10.0.27-SNAPSHOT</version>
     <modules>
         <module>shared</module>
-        <module>v1_17_R1</module>
-        <module>v1_18_R1</module>
+        <module>nms/v1_17_R1</module>
+        <module>nms/v1_18_R1</module>
         <module>plugin</module>
     </modules>