diff --git a/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserBaseDefinition.java b/rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserBaseDefinition.java
similarity index 97%
rename from rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserBaseDefinition.java
rename to rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserBaseDefinition.java
index f00522c..304c011 100644
--- a/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserBaseDefinition.java
+++ b/rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserBaseDefinition.java
@@ -1,4 +1,4 @@
-package org.geysermc.rainbow.mapping.geyser;
+package org.geysermc.rainbow.definition;
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.MapCodec;
@@ -8,7 +8,7 @@ import net.minecraft.core.component.DataComponentType;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.resources.ResourceLocation;
 import org.geysermc.rainbow.Rainbow;
-import org.geysermc.rainbow.mapping.geyser.predicate.GeyserPredicate;
+import org.geysermc.rainbow.definition.predicate.GeyserPredicate;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserGroupDefinition.java b/rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserGroupDefinition.java
similarity index 97%
rename from rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserGroupDefinition.java
rename to rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserGroupDefinition.java
index 3199f47..20e1aa7 100644
--- a/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserGroupDefinition.java
+++ b/rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserGroupDefinition.java
@@ -1,4 +1,4 @@
-package org.geysermc.rainbow.mapping.geyser;
+package org.geysermc.rainbow.definition;
 
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserItemDefinition.java b/rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserItemDefinition.java
similarity index 85%
rename from rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserItemDefinition.java
rename to rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserItemDefinition.java
index ee7ef16..d09894a 100644
--- a/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserItemDefinition.java
+++ b/rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserItemDefinition.java
@@ -1,4 +1,4 @@
-package org.geysermc.rainbow.mapping.geyser;
+package org.geysermc.rainbow.definition;
 
 import net.minecraft.resources.ResourceLocation;
 
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserLegacyDefinition.java b/rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserLegacyDefinition.java
similarity index 96%
rename from rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserLegacyDefinition.java
rename to rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserLegacyDefinition.java
index bff6ba8..0f79aae 100644
--- a/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserLegacyDefinition.java
+++ b/rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserLegacyDefinition.java
@@ -1,4 +1,4 @@
-package org.geysermc.rainbow.mapping.geyser;
+package org.geysermc.rainbow.definition;
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.MapCodec;
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMapping.java b/rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserMapping.java
similarity index 97%
rename from rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMapping.java
rename to rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserMapping.java
index 14c8ffc..d3cc862 100644
--- a/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMapping.java
+++ b/rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserMapping.java
@@ -1,4 +1,4 @@
-package org.geysermc.rainbow.mapping.geyser;
+package org.geysermc.rainbow.definition;
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.DataResult;
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMappings.java b/rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserMappings.java
similarity index 98%
rename from rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMappings.java
rename to rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserMappings.java
index 96fb307..5a887a2 100644
--- a/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMappings.java
+++ b/rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserMappings.java
@@ -1,4 +1,4 @@
-package org.geysermc.rainbow.mapping.geyser;
+package org.geysermc.rainbow.definition;
 
 import com.google.common.collect.Multimap;
 import com.google.common.collect.MultimapBuilder;
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserSingleDefinition.java b/rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserSingleDefinition.java
similarity index 96%
rename from rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserSingleDefinition.java
rename to rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserSingleDefinition.java
index 85f02ce..b3e6066 100644
--- a/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserSingleDefinition.java
+++ b/rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserSingleDefinition.java
@@ -1,4 +1,4 @@
-package org.geysermc.rainbow.mapping.geyser;
+package org.geysermc.rainbow.definition;
 
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserConditionPredicate.java b/rainbow/src/main/java/org/geysermc/rainbow/definition/predicate/GeyserConditionPredicate.java
similarity index 98%
rename from rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserConditionPredicate.java
rename to rainbow/src/main/java/org/geysermc/rainbow/definition/predicate/GeyserConditionPredicate.java
index 7e1d49c..79adca7 100644
--- a/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserConditionPredicate.java
+++ b/rainbow/src/main/java/org/geysermc/rainbow/definition/predicate/GeyserConditionPredicate.java
@@ -1,4 +1,4 @@
-package org.geysermc.rainbow.mapping.geyser.predicate;
+package org.geysermc.rainbow.definition.predicate;
 
 import com.google.common.base.Suppliers;
 import com.mojang.serialization.Codec;
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserMatchPredicate.java b/rainbow/src/main/java/org/geysermc/rainbow/definition/predicate/GeyserMatchPredicate.java
similarity index 98%
rename from rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserMatchPredicate.java
rename to rainbow/src/main/java/org/geysermc/rainbow/definition/predicate/GeyserMatchPredicate.java
index ecd558c..4e793a6 100644
--- a/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserMatchPredicate.java
+++ b/rainbow/src/main/java/org/geysermc/rainbow/definition/predicate/GeyserMatchPredicate.java
@@ -1,4 +1,4 @@
-package org.geysermc.rainbow.mapping.geyser.predicate;
+package org.geysermc.rainbow.definition.predicate;
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.MapCodec;
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserPredicate.java b/rainbow/src/main/java/org/geysermc/rainbow/definition/predicate/GeyserPredicate.java
similarity index 95%
rename from rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserPredicate.java
rename to rainbow/src/main/java/org/geysermc/rainbow/definition/predicate/GeyserPredicate.java
index fb753ba..7c6b0f3 100644
--- a/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserPredicate.java
+++ b/rainbow/src/main/java/org/geysermc/rainbow/definition/predicate/GeyserPredicate.java
@@ -1,4 +1,4 @@
-package org.geysermc.rainbow.mapping.geyser.predicate;
+package org.geysermc.rainbow.definition.predicate;
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.MapCodec;
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserRangeDispatchPredicate.java b/rainbow/src/main/java/org/geysermc/rainbow/definition/predicate/GeyserRangeDispatchPredicate.java
similarity index 98%
rename from rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserRangeDispatchPredicate.java
rename to rainbow/src/main/java/org/geysermc/rainbow/definition/predicate/GeyserRangeDispatchPredicate.java
index 67f3643..537a3f7 100644
--- a/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserRangeDispatchPredicate.java
+++ b/rainbow/src/main/java/org/geysermc/rainbow/definition/predicate/GeyserRangeDispatchPredicate.java
@@ -1,4 +1,4 @@
-package org.geysermc.rainbow.mapping.geyser.predicate;
+package org.geysermc.rainbow.definition.predicate;
 
 import com.google.common.base.Suppliers;
 import com.mojang.serialization.Codec;
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java
index 169bec7..e6a5967 100644
--- a/rainbow/src/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java
+++ b/rainbow/src/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java
@@ -42,14 +42,14 @@ import org.geysermc.rainbow.mapping.animation.BedrockAnimationContext;
 import org.geysermc.rainbow.mapping.attachable.AttachableMapper;
 import org.geysermc.rainbow.mapping.geometry.BedrockGeometryContext;
 import org.geysermc.rainbow.mapping.geometry.GeometryMapper;
-import org.geysermc.rainbow.mapping.geyser.GeyserBaseDefinition;
-import org.geysermc.rainbow.mapping.geyser.GeyserItemDefinition;
-import org.geysermc.rainbow.mapping.geyser.GeyserLegacyDefinition;
-import org.geysermc.rainbow.mapping.geyser.GeyserSingleDefinition;
-import org.geysermc.rainbow.mapping.geyser.predicate.GeyserConditionPredicate;
-import org.geysermc.rainbow.mapping.geyser.predicate.GeyserMatchPredicate;
-import org.geysermc.rainbow.mapping.geyser.predicate.GeyserPredicate;
-import org.geysermc.rainbow.mapping.geyser.predicate.GeyserRangeDispatchPredicate;
+import org.geysermc.rainbow.definition.GeyserBaseDefinition;
+import org.geysermc.rainbow.definition.GeyserItemDefinition;
+import org.geysermc.rainbow.definition.GeyserLegacyDefinition;
+import org.geysermc.rainbow.definition.GeyserSingleDefinition;
+import org.geysermc.rainbow.definition.predicate.GeyserConditionPredicate;
+import org.geysermc.rainbow.definition.predicate.GeyserMatchPredicate;
+import org.geysermc.rainbow.definition.predicate.GeyserPredicate;
+import org.geysermc.rainbow.definition.predicate.GeyserRangeDispatchPredicate;
 import org.geysermc.rainbow.mixin.LateBoundIdMapperAccessor;
 import org.geysermc.rainbow.mixin.RangeSelectItemModelAccessor;
 import org.geysermc.rainbow.mixin.TextureSlotsAccessor;
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/mapping/PackContext.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/PackContext.java
index f6276b6..8bee7e0 100644
--- a/rainbow/src/main/java/org/geysermc/rainbow/mapping/PackContext.java
+++ b/rainbow/src/main/java/org/geysermc/rainbow/mapping/PackContext.java
@@ -2,7 +2,7 @@ package org.geysermc.rainbow.mapping;
 
 import net.minecraft.resources.ResourceLocation;
 import org.geysermc.rainbow.mapping.geometry.GeometryRenderer;
-import org.geysermc.rainbow.mapping.geyser.GeyserMappings;
+import org.geysermc.rainbow.definition.GeyserMappings;
 
 import java.nio.file.Path;
 import java.util.function.Consumer;
diff --git a/rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockPack.java b/rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockPack.java
index 225ee78..5a765ab 100644
--- a/rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockPack.java
+++ b/rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockPack.java
@@ -20,7 +20,7 @@ import org.geysermc.rainbow.mapping.AssetResolver;
 import org.geysermc.rainbow.mapping.BedrockItemMapper;
 import org.geysermc.rainbow.mapping.PackContext;
 import org.geysermc.rainbow.mapping.geometry.NoopGeometryRenderer;
-import org.geysermc.rainbow.mapping.geyser.GeyserMappings;
+import org.geysermc.rainbow.definition.GeyserMappings;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.FileOutputStream;
diff --git a/rainbow/src/main/resources/fabric.mod.json b/rainbow/src/main/resources/fabric.mod.json
index a3e78ce..1677e20 100644
--- a/rainbow/src/main/resources/fabric.mod.json
+++ b/rainbow/src/main/resources/fabric.mod.json
@@ -15,11 +15,6 @@
   "license": "MIT",
   "icon": "assets/rainbow/icon.png",
   "environment": "client",
-  "entrypoints": {
-    "client": [
-      "org.geysermc.rainbow.Rainbow"
-    ]
-  },
   "mixins": [
     "rainbow.mixins.json"
   ],