diff --git a/API.md b/calendar/API.md
similarity index 100%
rename from API.md
rename to calendar/API.md
diff --git a/README.md b/calendar/README.md
similarity index 100%
rename from README.md
rename to calendar/README.md
diff --git a/command.lua b/calendar/command.lua
similarity index 100%
rename from command.lua
rename to calendar/command.lua
diff --git a/gameconfig.lua b/calendar/gameconfig.lua
similarity index 100%
rename from gameconfig.lua
rename to calendar/gameconfig.lua
diff --git a/gui.lua b/calendar/gui.lua
similarity index 100%
rename from gui.lua
rename to calendar/gui.lua
diff --git a/init.lua b/calendar/init.lua
similarity index 99%
rename from init.lua
rename to calendar/init.lua
index 42e936e..aafbb79 100644
--- a/init.lua
+++ b/calendar/init.lua
@@ -187,4 +187,3 @@ end
 
 dofile(minetest.get_modpath("calendar").."/gui.lua")
 dofile(minetest.get_modpath("calendar").."/command.lua")
-dofile(minetest.get_modpath("calendar").."/node.lua")
diff --git a/mod.conf b/calendar/mod.conf
similarity index 74%
rename from mod.conf
rename to calendar/mod.conf
index 54e8364..69c2954 100644
--- a/mod.conf
+++ b/calendar/mod.conf
@@ -1,3 +1,2 @@
 name = calendar
 description = A simple calender systema calender to track the passage of days
-optional_depends = default, dye
diff --git a/screenshot.png b/calendar/screenshot.png
similarity index 100%
rename from screenshot.png
rename to calendar/screenshot.png
diff --git a/textures/calendar_legacy_daybox.png b/calendar/textures/calendar_legacy_daybox.png
similarity index 100%
rename from textures/calendar_legacy_daybox.png
rename to calendar/textures/calendar_legacy_daybox.png
diff --git a/node.lua b/calendar_node/init.lua
similarity index 75%
rename from node.lua
rename to calendar_node/init.lua
index 5e4eb88..ada20bc 100644
--- a/node.lua
+++ b/calendar_node/init.lua
@@ -1,11 +1,11 @@
-local S = calendar._get_translator("calendar")
+local S = calendar._get_translator("calendar_node")
 
-minetest.register_node("calendar:calendar", {
+minetest.register_node("calendar_node:calendar", {
 	drawtype = "signlike",
 	description = S("Calendar"),
-	tiles = { "calendar_calendar.png" },
-	inventory_image = "calendar_calendar.png",
-	wield_image = "calendar_calendar.png",
+	tiles = { "calendar_node_calendar.png" },
+	inventory_image = "calendar_node_calendar.png",
+	wield_image = "calendar_node_calendar.png",
 	paramtype = "light",
 	paramtype2 = "wallmounted",
 	is_ground_content = false,
@@ -29,7 +29,7 @@ minetest.register_node("calendar:calendar", {
 
 if minetest.get_modpath("default") and minetest.get_modpath("dye") then
 	minetest.register_craft({
-		output = "calendar:calendar",
+		output = "calendar_node:calendar",
 		recipe = {
 			{ "default:paper","default:paper","default:paper" },
 			{ "default:paper","dye:black","default:paper" },
diff --git a/calendar_node/mod.conf b/calendar_node/mod.conf
new file mode 100644
index 0000000..62533f2
--- /dev/null
+++ b/calendar_node/mod.conf
@@ -0,0 +1,4 @@
+name = calendar_node
+description = Adds a placable calendar
+depends = calendar
+optional_depends = default, dye
diff --git a/calendar_node/screenshot.png b/calendar_node/screenshot.png
new file mode 100644
index 0000000..a15d66f
Binary files /dev/null and b/calendar_node/screenshot.png differ
diff --git a/textures/calendar_calendar.png b/calendar_node/textures/calendar_node_calendar.png
similarity index 100%
rename from textures/calendar_calendar.png
rename to calendar_node/textures/calendar_node_calendar.png
diff --git a/modpack.txt b/modpack.txt
new file mode 100644
index 0000000..e69de29