diff --git a/mappings/net/minecraft/block/BlockStateBase.mapping b/mappings/net/minecraft/block/state/BlockStateBase.mapping
similarity index 67%
rename from mappings/net/minecraft/block/BlockStateBase.mapping
rename to mappings/net/minecraft/block/state/BlockStateBase.mapping
index 165a27c9fe..05c4c6cda9 100644
--- a/mappings/net/minecraft/block/BlockStateBase.mapping
+++ b/mappings/net/minecraft/block/state/BlockStateBase.mapping
@@ -1,3 +1,3 @@
-CLASS none/asg net/minecraft/block/BlockStateBase
+CLASS none/asg net/minecraft/block/state/BlockStateBase
 	FIELD a COMMA_JOINER Lcom/google/common/base/Joiner;
 	FIELD b ENTRY_TO_NAME_FUNC Lcom/google/common/base/Function;
diff --git a/mappings/net/minecraft/block/BlockStateFactory.mapping b/mappings/net/minecraft/block/state/BlockStateFactory.mapping
similarity index 97%
rename from mappings/net/minecraft/block/BlockStateFactory.mapping
rename to mappings/net/minecraft/block/state/BlockStateFactory.mapping
index 29d866301a..b7349ffa28 100644
--- a/mappings/net/minecraft/block/BlockStateFactory.mapping
+++ b/mappings/net/minecraft/block/state/BlockStateFactory.mapping
@@ -1,4 +1,4 @@
-CLASS none/ask net/minecraft/block/BlockStateFactory
+CLASS none/ask net/minecraft/block/state/BlockStateFactory
 	CLASS none/ask$a BlockState
 		FIELD a block Lnone/akw;
 		FIELD b values Lcom/google/common/collect/ImmutableMap;
diff --git a/mappings/net/minecraft/block/IBlockProperty.mapping b/mappings/net/minecraft/block/state/IBlockProperty.mapping
similarity index 79%
rename from mappings/net/minecraft/block/IBlockProperty.mapping
rename to mappings/net/minecraft/block/state/IBlockProperty.mapping
index c569ca02a3..bb7e67eecd 100644
--- a/mappings/net/minecraft/block/IBlockProperty.mapping
+++ b/mappings/net/minecraft/block/state/IBlockProperty.mapping
@@ -1,4 +1,4 @@
-CLASS none/asz net/minecraft/block/IBlockProperty
+CLASS none/asz net/minecraft/block/state/IBlockProperty
 	METHOD a getName ()Ljava/lang/String;
 	METHOD b getValueClass ()Ljava/lang/Class;
 	METHOD b getValue (Ljava/lang/String;)Lcom/google/common/base/Optional;
diff --git a/mappings/net/minecraft/block/IBlockState.mapping b/mappings/net/minecraft/block/state/IBlockState.mapping
similarity index 84%
rename from mappings/net/minecraft/block/IBlockState.mapping
rename to mappings/net/minecraft/block/state/IBlockState.mapping
index 25a80c854a..6de090b89d 100644
--- a/mappings/net/minecraft/block/IBlockState.mapping
+++ b/mappings/net/minecraft/block/state/IBlockState.mapping
@@ -1,4 +1,4 @@
-CLASS none/asj net/minecraft/block/IBlockState
+CLASS none/asj net/minecraft/block/state/IBlockState
 	METHOD a (Lnone/asz;)Lnone/asj;
 	METHOD a with (Lnone/asz;Ljava/lang/Comparable;)Lnone/asj;
 	METHOD c get (Lnone/asz;)Ljava/lang/Comparable;