diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java b/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java
index ac5b11564..67324b934 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java
@@ -28,8 +28,8 @@ import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.world.registry.LegacyMapper;
-import com.sk89q.worldedit.world.registry.state.State;
-import com.sk89q.worldedit.world.registry.state.value.StateValue;
+import com.sk89q.worldedit.registry.state.State;
+import com.sk89q.worldedit.registry.state.value.StateValue;
 
 import java.util.Map;
 import java.util.Objects;
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/DefaultBlockParser.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/DefaultBlockParser.java
index 90a328744..6ce02d530 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/DefaultBlockParser.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/DefaultBlockParser.java
@@ -44,8 +44,8 @@ import com.sk89q.worldedit.internal.registry.InputParser;
 import com.sk89q.worldedit.util.HandSide;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.registry.BundledBlockData;
-import com.sk89q.worldedit.world.registry.state.State;
-import com.sk89q.worldedit.world.registry.state.value.StateValue;
+import com.sk89q.worldedit.registry.state.State;
+import com.sk89q.worldedit.registry.state.value.StateValue;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/transform/BlockTransformExtent.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/transform/BlockTransformExtent.java
index 431dcb305..45aa2d97c 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/transform/BlockTransformExtent.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/transform/BlockTransformExtent.java
@@ -32,9 +32,9 @@ import com.sk89q.worldedit.extension.platform.Capability;
 import com.sk89q.worldedit.extent.AbstractDelegateExtent;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.math.transform.Transform;
-import com.sk89q.worldedit.world.registry.state.DirectionalState;
-import com.sk89q.worldedit.world.registry.state.State;
-import com.sk89q.worldedit.world.registry.state.value.DirectionalStateValue;
+import com.sk89q.worldedit.registry.state.DirectionalState;
+import com.sk89q.worldedit.registry.state.State;
+import com.sk89q.worldedit.registry.state.value.DirectionalStateValue;
 
 import java.util.Map;
 
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/state/DirectionalState.java b/worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/DirectionalState.java
similarity index 88%
rename from worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/state/DirectionalState.java
rename to worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/DirectionalState.java
index 0f9967c48..a4c83dd41 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/state/DirectionalState.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/DirectionalState.java
@@ -17,9 +17,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.world.registry.state;
+package com.sk89q.worldedit.registry.state;
 
-import com.sk89q.worldedit.world.registry.state.value.DirectionalStateValue;
+import com.sk89q.worldedit.registry.state.value.DirectionalStateValue;
 
 import java.util.List;
 
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/state/SimpleState.java b/worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/SimpleState.java
similarity index 93%
rename from worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/state/SimpleState.java
rename to worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/SimpleState.java
index fb66705b5..c31716d8f 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/state/SimpleState.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/SimpleState.java
@@ -17,9 +17,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.world.registry.state;
+package com.sk89q.worldedit.registry.state;
 
-import com.sk89q.worldedit.world.registry.state.value.SimpleStateValue;
+import com.sk89q.worldedit.registry.state.value.SimpleStateValue;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/state/State.java b/worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/State.java
similarity index 92%
rename from worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/state/State.java
rename to worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/State.java
index c6c2fc0c1..ad6c819e6 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/state/State.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/State.java
@@ -17,9 +17,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.world.registry.state;
+package com.sk89q.worldedit.registry.state;
 
-import com.sk89q.worldedit.world.registry.state.value.SimpleStateValue;
+import com.sk89q.worldedit.registry.state.value.SimpleStateValue;
 
 import java.util.List;
 
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/state/value/DirectionalStateValue.java b/worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/value/DirectionalStateValue.java
similarity index 94%
rename from worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/state/value/DirectionalStateValue.java
rename to worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/value/DirectionalStateValue.java
index f440dd2ac..8923d7616 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/state/value/DirectionalStateValue.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/value/DirectionalStateValue.java
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.world.registry.state.value;
+package com.sk89q.worldedit.registry.state.value;
 
 import com.sk89q.worldedit.Vector;
 
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/state/value/SimpleStateValue.java b/worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/value/SimpleStateValue.java
similarity index 96%
rename from worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/state/value/SimpleStateValue.java
rename to worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/value/SimpleStateValue.java
index e0e87c7b6..6558a0e71 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/state/value/SimpleStateValue.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/value/SimpleStateValue.java
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.world.registry.state.value;
+package com.sk89q.worldedit.registry.state.value;
 
 import java.util.Objects;
 
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/state/value/StateValue.java b/worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/value/StateValue.java
similarity index 95%
rename from worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/state/value/StateValue.java
rename to worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/value/StateValue.java
index c6dcf902d..3cc989f66 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/state/value/StateValue.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/value/StateValue.java
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.sk89q.worldedit.world.registry.state.value;
+package com.sk89q.worldedit.registry.state.value;
 
 import javax.annotation.Nullable;
 
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java
index 2d46df770..2a0271e93 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java
@@ -23,8 +23,8 @@ import com.google.common.collect.ArrayTable;
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Table;
-import com.sk89q.worldedit.world.registry.state.State;
-import com.sk89q.worldedit.world.registry.state.value.StateValue;
+import com.sk89q.worldedit.registry.state.State;
+import com.sk89q.worldedit.registry.state.value.StateValue;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockStateHolder.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockStateHolder.java
index 21fa25fe2..e1382ec04 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockStateHolder.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockStateHolder.java
@@ -19,8 +19,8 @@
 
 package com.sk89q.worldedit.world.block;
 
-import com.sk89q.worldedit.world.registry.state.State;
-import com.sk89q.worldedit.world.registry.state.value.StateValue;
+import com.sk89q.worldedit.registry.state.State;
+import com.sk89q.worldedit.registry.state.value.StateValue;
 
 import java.util.Map;
 
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BlockRegistry.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BlockRegistry.java
index 80c56c46c..6320c2efc 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BlockRegistry.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BlockRegistry.java
@@ -22,7 +22,7 @@ package com.sk89q.worldedit.world.registry;
 import com.sk89q.worldedit.blocks.BlockMaterial;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
-import com.sk89q.worldedit.world.registry.state.State;
+import com.sk89q.worldedit.registry.state.State;
 
 import java.util.Map;
 
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockData.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockData.java
index 549bfe37a..a839bb179 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockData.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockData.java
@@ -26,8 +26,8 @@ import com.google.gson.reflect.TypeToken;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.blocks.BlockMaterial;
 import com.sk89q.worldedit.util.gson.VectorAdapter;
-import com.sk89q.worldedit.world.registry.state.SimpleState;
-import com.sk89q.worldedit.world.registry.state.State;
+import com.sk89q.worldedit.registry.state.SimpleState;
+import com.sk89q.worldedit.registry.state.State;
 
 import javax.annotation.Nullable;
 import java.io.IOException;
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java
index 707cfc554..588df83c7 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java
@@ -23,7 +23,7 @@ import com.sk89q.worldedit.blocks.BlockMaterial;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.block.BlockTypes;
-import com.sk89q.worldedit.world.registry.state.State;
+import com.sk89q.worldedit.registry.state.State;
 
 import java.util.Map;
 
diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java
index 1cb94556b..52730b518 100644
--- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java
+++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java
@@ -35,8 +35,8 @@ import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.world.AbstractWorld;
 import com.sk89q.worldedit.world.biome.BaseBiome;
-import com.sk89q.worldedit.world.registry.state.State;
-import com.sk89q.worldedit.world.registry.state.value.StateValue;
+import com.sk89q.worldedit.registry.state.State;
+import com.sk89q.worldedit.registry.state.value.StateValue;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.block.BlockSnapshot;
 import org.spongepowered.api.block.BlockState;