diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua
index a91558c7..04cd843e 100644
--- a/homedecor/crafts.lua
+++ b/homedecor/crafts.lua
@@ -2041,3 +2041,13 @@ minetest.register_craft({
 		{ "", "homedecor:plastic_strips", "homedecor:plastic_strips" },
     },
 })
+
+minetest.register_craft( {
+        output = "homedecor:openframe_bookshelf",
+        recipe = {
+		{"group:wood", "", "group:wood"},
+		{"default:book", "default:book", "default:book"},
+		{"group:wood", "", "group:wood"},
+        },
+})
+
diff --git a/homedecor/furniture.lua b/homedecor/furniture.lua
index 51d772a4..e8793476 100644
--- a/homedecor/furniture.lua
+++ b/homedecor/furniture.lua
@@ -189,6 +189,57 @@ for _, color in ipairs(lamp_colors) do
 	reg_lamp("max", "off", nil,          "x", 14,	color )
 end
 
+minetest.register_node(":homedecor:openframe_bookshelf", {
+	description = "Bookshelf (open-frame)",
+	drawtype = "nodebox",
+	is_ground_content = false,
+	groups = {choppy=3,oddly_breakable_by_hand=2,flammable=3},
+	sounds = default.node_sound_wood_defaults(),
+	tiles = {
+		"3dbookshelf_openframe_top.png",
+		"3dbookshelf_openframe_bottom.png",
+		"3dbookshelf_openframe_right.png",
+		"3dbookshelf_openframe_left.png",
+		"3dbookshelf_openframe_back.png",
+		"3dbookshelf_openframe_front.png"
+
+	},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	selection_box = {
+		type = "fixed",
+		fixed = { -0.5, -0.5, 0, 0.5, 0.5, 0.5 }
+	},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.4375, -0.5, 0, -0.375, 0.5, 0.5},
+			{0.375, -0.5, 0, 0.4375, 0.5, 0.5},
+			{-0.5, -0.5, 0, 0.5, -0.4375, 0.5},
+			{-0.5, 0, 0, 0.5, 0.0625, 0.5},
+			{-0.375, 0.0625, 0.176, -0.25, 0.5, 0.5},
+			{-0.25, 0.0625, 0.253, -0.1875, 0.4375, 0.5},
+			{-0.1875, 0.0625, 0.227, -0.125, 0.5, 0.5},
+			{-0.125, 0.0625, 0.176, 0, 0.4375, 0.5},
+			{0, 0.0625, 0.232, 0.0625, 0.375, 0.5},
+			{0.0625, 0.0625, 0.130, 0.1875, 0.5, 0.5},
+			{0.1875, 0.0625, 0.217, 0.25, 0.4375, 0.5},
+			{0.25, 0.0625, 0.166, 0.3125, 0.5, 0.5},
+			{0.3125, 0.0625, 0.242, 0.375, 0.4375, 0.5},
+			{-0.375, -0.4375, 0.191, -0.3125, -0.0625, 0.5},
+			{-0.3125, -0.4375, 0.191, -0.1875, -0.125, 0.5},
+			{-0.1875, -0.4375, 0.227, -0.125, -0.0625, 0.5},
+			{-0.125, -0.4375, 0.0737, 0, -0.0625, 0.5},
+			{0, -0.4375, 0.145, 0.0625, -0.125, 0.5},
+			{0.0625, -0.4375, 0.212, 0.125, -0.1875, 0.5},
+			{0.125, -0.4375, 0.207, 0.1875, -0.125, 0.5},
+			{0.1875, -0.4375, 0.176, 0.25, -0.125, 0.5},
+			{0.25, -0.4375, 0.258, 0.3125, -0.1875, 0.5},
+			{0.3125, -0.4375, 0.130, 0.375, -0.0625, 0.5}
+		}
+	}
+})
+
 -- Aliases for 3dforniture mod.
 minetest.register_alias("3dforniture:table", "homedecor:table")
 minetest.register_alias("3dforniture:chair", "homedecor:chair")
diff --git a/homedecor_3d_extras/textures/3dbookshelf_openframe_back.png b/homedecor/textures/3dbookshelf_openframe_back.png
similarity index 100%
rename from homedecor_3d_extras/textures/3dbookshelf_openframe_back.png
rename to homedecor/textures/3dbookshelf_openframe_back.png
diff --git a/homedecor_3d_extras/textures/3dbookshelf_openframe_bottom.png b/homedecor/textures/3dbookshelf_openframe_bottom.png
similarity index 100%
rename from homedecor_3d_extras/textures/3dbookshelf_openframe_bottom.png
rename to homedecor/textures/3dbookshelf_openframe_bottom.png
diff --git a/homedecor_3d_extras/textures/3dbookshelf_openframe_front.png b/homedecor/textures/3dbookshelf_openframe_front.png
similarity index 100%
rename from homedecor_3d_extras/textures/3dbookshelf_openframe_front.png
rename to homedecor/textures/3dbookshelf_openframe_front.png
diff --git a/homedecor_3d_extras/textures/3dbookshelf_openframe_left.png b/homedecor/textures/3dbookshelf_openframe_left.png
similarity index 100%
rename from homedecor_3d_extras/textures/3dbookshelf_openframe_left.png
rename to homedecor/textures/3dbookshelf_openframe_left.png
diff --git a/homedecor_3d_extras/textures/3dbookshelf_openframe_right.png b/homedecor/textures/3dbookshelf_openframe_right.png
similarity index 100%
rename from homedecor_3d_extras/textures/3dbookshelf_openframe_right.png
rename to homedecor/textures/3dbookshelf_openframe_right.png
diff --git a/homedecor_3d_extras/textures/3dbookshelf_openframe_top.png b/homedecor/textures/3dbookshelf_openframe_top.png
similarity index 100%
rename from homedecor_3d_extras/textures/3dbookshelf_openframe_top.png
rename to homedecor/textures/3dbookshelf_openframe_top.png
diff --git a/homedecor_3d_extras/init.lua b/homedecor_3d_extras/init.lua
index 39fd498b..bd5a241d 100644
--- a/homedecor_3d_extras/init.lua
+++ b/homedecor_3d_extras/init.lua
@@ -64,57 +64,6 @@ minetest.override_item("default:bookshelf", {
 	}
 })
 
-minetest.register_node(":homedecor:openframe_bookshelf", {
-	description = "Bookshelf (open-frame)",
-	drawtype = "nodebox",
-	is_ground_content = false,
-	groups = {choppy=3,oddly_breakable_by_hand=2,flammable=3},
-	sounds = default.node_sound_wood_defaults(),
-	tiles = {
-		"3dbookshelf_openframe_top.png",
-		"3dbookshelf_openframe_bottom.png",
-		"3dbookshelf_openframe_right.png",
-		"3dbookshelf_openframe_left.png",
-		"3dbookshelf_openframe_back.png",
-		"3dbookshelf_openframe_front.png"
-
-	},
-	paramtype = "light",
-	paramtype2 = "facedir",
-	selection_box = {
-		type = "fixed",
-		fixed = { -0.5, -0.5, 0, 0.5, 0.5, 0.5 }
-	},
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.4375, -0.5, 0, -0.375, 0.5, 0.5},
-			{0.375, -0.5, 0, 0.4375, 0.5, 0.5},
-			{-0.5, -0.5, 0, 0.5, -0.4375, 0.5},
-			{-0.5, 0, 0, 0.5, 0.0625, 0.5},
-			{-0.375, 0.0625, 0.176, -0.25, 0.5, 0.5},
-			{-0.25, 0.0625, 0.253, -0.1875, 0.4375, 0.5},
-			{-0.1875, 0.0625, 0.227, -0.125, 0.5, 0.5},
-			{-0.125, 0.0625, 0.176, 0, 0.4375, 0.5},
-			{0, 0.0625, 0.232, 0.0625, 0.375, 0.5},
-			{0.0625, 0.0625, 0.130, 0.1875, 0.5, 0.5},
-			{0.1875, 0.0625, 0.217, 0.25, 0.4375, 0.5},
-			{0.25, 0.0625, 0.166, 0.3125, 0.5, 0.5},
-			{0.3125, 0.0625, 0.242, 0.375, 0.4375, 0.5},
-			{-0.375, -0.4375, 0.191, -0.3125, -0.0625, 0.5},
-			{-0.3125, -0.4375, 0.191, -0.1875, -0.125, 0.5},
-			{-0.1875, -0.4375, 0.227, -0.125, -0.0625, 0.5},
-			{-0.125, -0.4375, 0.0737, 0, -0.0625, 0.5},
-			{0, -0.4375, 0.145, 0.0625, -0.125, 0.5},
-			{0.0625, -0.4375, 0.212, 0.125, -0.1875, 0.5},
-			{0.125, -0.4375, 0.207, 0.1875, -0.125, 0.5},
-			{0.1875, -0.4375, 0.176, 0.25, -0.125, 0.5},
-			{0.25, -0.4375, 0.258, 0.3125, -0.1875, 0.5},
-			{0.3125, -0.4375, 0.130, 0.375, -0.0625, 0.5}
-		}
-	}
-})
-
 if minetest.get_modpath("moreblocks") then
 	minetest.override_item("moreblocks:empty_bookshelf", {
 		drawtype = "nodebox",
@@ -142,14 +91,3 @@ if minetest.get_modpath("moreblocks") then
 	})
 end
 
--- crafting recipes
-
-minetest.register_craft( {
-        output = "homedecor:openframe_bookshelf",
-        recipe = {
-		{"group:wood", "", "group:wood"},
-		{"default:book", "default:book", "default:book"},
-		{"group:wood", "", "group:wood"},
-        },
-})
-