diff --git a/mods/ENTITIES/mcl_mobs/api.lua b/mods/ENTITIES/mcl_mobs/api/api.lua
similarity index 99%
rename from mods/ENTITIES/mcl_mobs/api.lua
rename to mods/ENTITIES/mcl_mobs/api/api.lua
index 102e07c7ca..7d5bc1fd22 100644
--- a/mods/ENTITIES/mcl_mobs/api.lua
+++ b/mods/ENTITIES/mcl_mobs/api/api.lua
@@ -564,7 +564,6 @@ local mob_activate = function(self, staticdata, def, dtime)
 
 	-- set anything changed above
 	self.object:set_properties(self)
-	set_yaw(self, (math_random(0, 360) - 180) / 180 * math_pi, 6)
 
 	--update_tag(self)
 	--set_animation(self, "stand")
diff --git a/mods/ENTITIES/mcl_mobs/backup_code_api.lua b/mods/ENTITIES/mcl_mobs/api/backup_code_api.lua
similarity index 100%
rename from mods/ENTITIES/mcl_mobs/backup_code_api.lua
rename to mods/ENTITIES/mcl_mobs/api/backup_code_api.lua
diff --git a/mods/ENTITIES/mcl_mobs/mount.lua b/mods/ENTITIES/mcl_mobs/api/mount.lua
similarity index 100%
rename from mods/ENTITIES/mcl_mobs/mount.lua
rename to mods/ENTITIES/mcl_mobs/api/mount.lua
diff --git a/mods/ENTITIES/mcl_mobs/spawning.lua b/mods/ENTITIES/mcl_mobs/api/spawning.lua
similarity index 100%
rename from mods/ENTITIES/mcl_mobs/spawning.lua
rename to mods/ENTITIES/mcl_mobs/api/spawning.lua
diff --git a/mods/ENTITIES/mcl_mobs/init.lua b/mods/ENTITIES/mcl_mobs/init.lua
index 69246b4706..b0daba2c4b 100644
--- a/mods/ENTITIES/mcl_mobs/init.lua
+++ b/mods/ENTITIES/mcl_mobs/init.lua
@@ -1,14 +1,16 @@
 
 local path = minetest.get_modpath(minetest.get_current_modname())
 
+local api_path = path.."/api"
+
 -- Mob API
-dofile(path .. "/api.lua")
+dofile(api_path .. "/api.lua")
 
 -- Spawning Algorithm
-dofile(path .. "/spawning.lua")
+dofile(api_path .. "/spawning.lua")
 
 -- Rideable Mobs
-dofile(path .. "/mount.lua")
+dofile(api_path .. "/mount.lua")
 
 -- Mob Items
 dofile(path .. "/crafts.lua")
\ No newline at end of file
diff --git a/mods/ENTITIES/mcl_mobs/lucky_block.lua b/mods/ENTITIES/mcl_mobs/lucky_block.lua
deleted file mode 100644
index ea90de74ac..0000000000
--- a/mods/ENTITIES/mcl_mobs/lucky_block.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-
-if minetest.get_modpath("lucky_block") then
-
-	lucky_block:add_blocks({
-		{"dro", {"mcl_mobs:nametag"}, 1},
-		{"lig"},
-	})
-end