diff --git a/README.md b/README.md
index 2d625aa4..9e959d59 100644
--- a/README.md
+++ b/README.md
@@ -58,13 +58,12 @@ The game includes the mods from the default [minetest_game](https://github.com/m
     * [mobs_redo][] ([MIT](mods/mobs/mobs_redo/license.txt))
 * mobs_aggressive/
     * [creeper][] ([WTFPL][lic.creeper]) -- version [036666e Git][ver.creeper]
-    * ghost ([Creatures MOB-Engine][cme])
+    * ghost ([Creatures MOB-Engine][cme]) -- version: [2.3.1-0-e3502a1 Git][ver.cme]
     * [mobs_goblins][] ([CC-BY-SA / CC-BY / CC0](mods/mobs_aggressive/mobs_goblins/README.md))
     * oerrki ([Creatures MOB-Engine][cme])
     * [spidermob][] ([CC-BY-SA / WTFPL / CC0](mods/mobs_aggressive/spidermob/LICENSE))
     * zombie ([Creatures MOB-Engine][cme])
 * mobs_passive/
-    * chicken ([Creatures MOB-Engine][cme])
     * sheep ([Creatures MOB-Engine][cme])
 * npc/
     * [peaceful_npc][] (WTFPL)
@@ -144,6 +143,9 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 		* mob_shark ([CC BY-SA][lic.amp_shark])
 		* mob_slime ([CC0 / CC BY / CC BY-SA / CC0][lic.amp_slime])
 		* mob_warthog ([CC BY / CC BY-SA][lic.amp_warthog])
+* [creatures_mob_engine][cme]
+	* mp_cme/
+		* chicken
 * [homedecor_modpack][homedecor] ([LGPL / WTFPL / CC BY-SA / CC0][lic.homedecor]) -- version: [02a4d14 Git][ver.homedecor]
 	* mp_homedecor_modpack/
 		* building_blocks
@@ -315,6 +317,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 [ver.areas]: https://github.com/ShadowNinja/areas/tree/67507c75918f8a60ad218cdcb69cc8d39e4a55ed
 [ver.awards]: https://github.com/minetest-mods/awards/tree/92c43d1
 [ver.character_creator]: https://github.com/Rui-Minetest/character_creator/tree/5e8fec2
+[ver.cme]: https://github.com/BlockMen/cme/tree/e3502a1
 [ver.creeper]: https://github.com/Rui-Minetest/creeper/tree/036666e2ccd26632a0c11585af0345c6eaa8c72d
 [ver.homedecor]: https://github.com/minetest-mods/homedecor_modpack/tree/02a4d14
 [ver.ilights]: https://github.com/minetest-mods/ilights/tree/d5f6900b5a6510f5922a7517ad613633861ce4df
diff --git a/mods/mp_cme/API.txt b/mods/mp_cme/API.txt
new file mode 100644
index 00000000..d16d8e3d
--- /dev/null
+++ b/mods/mp_cme/API.txt
@@ -0,0 +1,202 @@
+Creatures MOB-Engine API
+------------------------
+
+creatures.register_mob(#Creature definition)
+ -registers a mob at MOB-Engine; returns true when sucessfull
+
+creatures.rnd(chance_table)
+ -returns a weighted random table element; chance_sum of table must be 1
+    ^ example: creatures.rnd({elem1 = {chance = 0.7}, {elem2 = {chance = 0.3}})
+
+creatures.compare_pos(pos1, pos2)
+ -returns true if pos1 == pos2
+
+creatures.findTarget(search_obj, pos, radius, search_type, mob_name, xray, no_count)
+ -returns table of found objects (as ObjectRef) and boolean player_near
+  ^ search_obj is searching object; can be nil
+  ^ pos is starting position for search radius
+  ^ radius for searching in blocks/node
+  ^ search_type that specifies returned object requirements
+    ^ "all" -- returns every object except dropped Items
+    ^ "hostile" -- returns every object(creature) that has hostile setting or is player
+      ^ ignores "mob_type" if specified
+    ^ "nonhostile" -- returns every object that is not hostile or player
+    ^ "player" -- returns all players
+    ^ "mates" -- returns all objects(creatures) that are of same kind
+      ^ requires "mob_type" specifies
+  ^ mob_type specifies creature that is ignored or searched, depending on search_type
+  ^ xray allows searching through blocks/nodes (default == false)
+  ^ no_count skips collecting loop and returns just the boolean player_near
+    ^ table is empty
+
+creatures.dropItems(pos, drops)
+ -drops items at position pos
+  ^ pos where to drop Items
+  ^ drops table in #ItemDrops format
+
+
+#ItemDrops
+----------
+{
+  {
+    <Itemname>, -- e.g. "default:wood"
+    <amount>,   -- either a <number> or table in format {min = <number>, max = <number>}; optional
+    <rarity>    -- "chance = <value>": <value> between 0.0 and 1.0
+  },
+}
+
+Example:
+Will drop with a chance of 30%  1 to 3 items of type "default:wood"
+and with a chance of 100% 2 items of type "default:stone"
+{
+  {"default:wood", {min = 1, max = 3}, chance = 0.3},
+  {"default:stone", 2}
+}
+
+
+#Creature definition
+--------------------
+{
+  name = "",                 -- e.g. "creatures:sheep"
+  stats = {
+    hp = 1,                  -- 1 HP = "1/2 player heart"
+    hostile = false,         -- is mob hostile (required for mode "attack") <optional>
+    lifetime = 300,          -- after which time mob despawns, in seconds <optional>
+    dies_when_tamed = false, -- stop despawn when tamed <optional>
+    can_jump = 1,            -- height in nodes <optional>
+    can_swim = false,        -- can mob swim or will it drown <optional>
+    can_fly = false,         -- allows to fly (requires mode "fly") and disable step sounds <optional>
+    can_burn = false,        -- takes damage of lava <optional>
+    can_panic = false,       -- runs fast around when hit (requires mode "walk") <optional>
+    has_falldamage = false,  -- deals damage if falling more than 3 blocks <optional>
+    has_kockback = false,    -- get knocked back when hit <optional>
+    sneaky = false,          -- disables step sounds <optional>
+    light = {min, max},      -- which light level will burn creature (requires can_burn = true) <optional>
+  },
+
+  modes = {
+    idle = {chance = <part of 1.0>, duration = <time>, moving_speed = <number>, update_yaw = <yawtime>},
+      ^ chance  -- number between 0.0 and 1.0 (!!NOTE: sum of all modes MUST be 1.0!!)
+       ^ if chance is 0 then mode is not chosen automatically
+      ^ duration  -- time in seconds until the next mode is chosen (depending on chance)
+      ^ moving_speed  -- moving speed(flying/walking) <optional>
+      ^ update_yaw  -- timer in seconds until the looking dir is changed <optional>
+        ^ if moving_speed > 0 then the moving direction is also changed
+
+    -- special modes
+    attack = {<same as above>}
+    follow = {<same as above>, radius = <number>, timer = <time>, items = <table>},
+      ^ same as above  -- all possible values like specified above
+      ^ radius  -- search distance in blocks/nodes for player
+      ^ timer  -- time in seconds between each check for player
+      ^ items  -- table of items to make mob follow in format {<Itemname>, <Itemname>}; e.g. {"farming:wheat"}
+    eat = {<same as above>, nodes = <table>},
+      ^ same as above  -- all possible values like specified above
+      ^ items  -- eatable nodes in format {<Itemname>, <Itemname>}; e.g. {"default:dirt_with_grass"}
+  },
+
+  model = {
+    mesh = "creatures_sheep.x",          -- mesh name; see Minetest Documentation for supported filetypes
+    textures = {"creatures_sheep.png"},  -- table of textures; see Minetest Documentation
+    collisionbox = <NodeBox>,            -- defines mesh collision box; see Minetest Documentation
+    rotation = 0.0,                      -- sets rotation offset when moving
+    backface_culling = false,            -- set true to enable backface culling
+    animations = {                       -- animation used if defined <optional>
+      idle = {#AnimationDef},            -- see #AnimationDef
+        ... -- depends on modes (must correspond to be used);
+              ^ supported "special modes": eat, follow, attack, death, swim, panic
+    },
+  },
+
+  sounds = {
+      on_damage = {#SoundDef},            -- see #SoundDef <optional>
+      on_death = {#SoundDef},             -- see #SoundDef <optional>
+      swim = {#SoundDef},                 -- see #SoundDef <optional>
+      random = {                          -- depends on mode <optional>
+        idle = {#SoundDef},               -- <optional>
+        ... -- depends on modes (must correspond to be used); supports "special modes": eat, follow, attack
+      },
+  },
+
+  drops = {#ItemDrops},     -- see #ItemDrops definition <optional>
+    ^ can also be a function; receives "self" reference
+
+  combat = {              -- specifies behavior of hostile mobs in "attack" mode
+    attack_damage = 1,       -- how much damage deals each hit
+    attack_speed = 0.6,      -- time in seconds between hits
+    attack_radius = 1.1,     -- distance in blocks mob can reach to hit
+
+    search_enemy = true,     -- true to search enemies to attack
+    search_timer = 2,        -- time in seconds to search an enemy (only if none found yet)
+    search_radius = 12,      -- radius in blocks within enemies are searched
+    search_type = "player",  -- what enemy is being searched (see types at creatures.findTarget())
+  }
+
+  spawning = {                  -- defines spawning in world <optional>
+    abm_nodes = {
+      spawn_on = {<table>},     -- on what nodes mob can spawn <optional>
+        ^ table  -- nodes and groups in table format; e.g. {"group:stone", "default:stone"}
+      neighbors = {},           -- what node should be neighbors to spawnnode <optional>
+        ^ can be nil or table as above; "air" is forced always as neighbor
+    },
+    abm_interval = <interval>,  -- time in seconds until Minetest tries to find a node with set specs
+    abm_chance = <chance>,      -- chance is 1/<chance>
+    max_number = <number>,             -- maximum mobs of this kind per mapblock(16x16x16)
+    number = <amount>,          -- how many mobs are spawned if found suitable spawn position
+      ^ amount  -- number or table {min = <value>, max = <value>}
+    time_range = <range>,       -- time range in time of day format (0-24000) <optional>
+      ^ range  -- table {min = <value>, max = <value>}
+    light = <range>,            -- min and max lightvalue at spawn position <optional>
+      ^ range  -- table {min = <value>, max = <value>}
+    height_limit = <range>,     -- min and max height (world Y coordinate) <optional>
+      ^ range  -- table {min = <value>, max = <value>}
+
+    spawn_egg = {           -- is set a spawn_egg is added to creative inventory <optional>
+      description = <desc>, -- Item description as string
+      texture = <name>,     -- texture name as string
+    },
+
+    spawner = {          -- is set a spawner_node is added to creative inventory <optional>
+      range = <number>,  -- defines an area (in blocks/nodes) within mobs are spawned
+      number = <number>, -- maxmimum number of mobs spawned in area defined via range
+      description = <desc>, -- Item description as string <optional>
+      light = <range>,   -- min and max lightvalue at spawn position <optional>
+        ^ range  -- table {min = <value>, max = <value>}
+    }
+  },
+
+  on_rightclick = func(self, clicker) -- called when mob is rightclicked
+    ^ prevents default action when returns boolean true
+
+  on_punch = func(self, puncher) -- called when mob is punched (puncher can be nil)
+    ^ prevents default action when returns boolean true
+
+  on_step = func(self, dtime) -- called each server step
+    ^ prevents default action when returns boolean true
+
+  on_activate = func(self, staticdata) -- called when mob (re-)actived
+    ^ Note: staticdata is deserialized by MOB-Engine (including costum values)
+
+  get_staticdata = func(self) -- called when mob is punched (puncher can be nil)
+    ^ must return a table to save mob data (serialization is done by MOB-Engine)
+    ^ e.g:
+      return {
+        costum_mob_data = self.my_value,
+        }
+}
+
+#AnimationDef {
+  start = 0,    -- animation start frame
+  stop = 80,    -- animation end frame
+  speed = 15,   -- animation speed
+  loop = true,  -- if false, animation if just played once <optional>
+  duration = 1  -- only supported in "death"-Animation, sets time the animation needs until mob is removed <optional>
+}
+
+#SoundDef {
+  name = <name>,        -- sound name as string; see Minetest documentation
+  gain = 1.0,           -- sound gain; see Minetest documentation
+  distance = <number>,  -- hear distance in blocks/nodes <optional>
+  time_min = <time>     -- minimum time in seconds between sounds (random only) <optional>
+  time_max = <time>     -- maximum time in seconds between sounds (random only) <optional>
+}
diff --git a/mods/mp_cme/LICENSE.txt b/mods/mp_cme/LICENSE.txt
new file mode 100644
index 00000000..ed5d50cf
--- /dev/null
+++ b/mods/mp_cme/LICENSE.txt
@@ -0,0 +1,20 @@
+Copyright (c) 2015-2016 BlockMen <blockmen2015@gmail.com>
+
+
+This software is provided 'as-is', without any express or implied warranty. In no
+event will the authors be held liable for any damages arising from the use of
+this software.
+
+Permission is granted to anyone to use this software for any purpose, including
+commercial applications, and to alter it and redistribute it freely, subject to the
+following restrictions:
+
+
+1. The origin of this software must not be misrepresented; you must not
+claim that you wrote the original software. If you use this software in a
+product, an acknowledgment in the product documentation is required.
+
+2. Altered source versions must be plainly marked as such, and must not
+be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
\ No newline at end of file
diff --git a/mods/mp_cme/README.txt b/mods/mp_cme/README.txt
new file mode 100644
index 00000000..767164ec
--- /dev/null
+++ b/mods/mp_cme/README.txt
@@ -0,0 +1,36 @@
+Mod/Modpack Creatures
+=====================
+Copyright (c) 2015-2016 BlockMen <blockmen2015@gmail.com>
+
+Version: 2.3.1
+
+
+A Mod(pack) for Minetest that provides a MOB-Engine and adds several creatures to the game.
+Currently included: Ghosts, Zombies, Sheep, Chicken and Oerrki.
+
+
+License: 
+~~~~~~~~
+Code(if not stated differently):
+(c) Copyright 2015-2016 BlockMen; modified zlib-License
+see "LICENSE.txt" for details.
+
+Media(if not stated differently):
+(c) Copyright (2014-2016) BlockMen; CC-BY-SA 3.0
+
+see each MOB-Module for detailed informations.
+
+
+Github:
+~~~~~~~
+https://github.com/BlockMen/cme
+
+
+Forum:
+~~~~~~
+https://forum.minetest.net/viewtopic.php?id=8638
+
+
+Changelog:
+~~~~~~~~~~
+see Changelog.txt
diff --git a/mods/mp_cme/bower.json b/mods/mp_cme/bower.json
new file mode 100644
index 00000000..f358d8fc
--- /dev/null
+++ b/mods/mp_cme/bower.json
@@ -0,0 +1,25 @@
+{
+    "name": "Creatures MOB-Engine",
+    "description": "A Mod(pack) for Minetest that provides a MOB-Engine and adds several creatures to the game.\n",
+    "keywords": [
+        "creatures",
+        "mobs",
+        "MOB",
+        "MOB-Engine",
+        "Creatures MOB-Engine",
+        "cme",
+        "zombies",
+        "sheep",
+        "ghost",
+        "monsters",
+        "hostile"
+    ],
+    "homepage": "https://github.com/BlockMen/cme",
+    "forum": "http://forum.minetest.net/viewtopic.php?f=11&t=8638",
+    "screenshots": [
+        "https://raw.githubusercontent.com/BlockMen/cme/master/screenshot.png"
+    ],
+    "authors": [
+        "BlockMen"
+    ]
+}
diff --git a/mods/mp_cme/changelog.txt b/mods/mp_cme/changelog.txt
new file mode 100644
index 00000000..43193184
--- /dev/null
+++ b/mods/mp_cme/changelog.txt
@@ -0,0 +1,40 @@
+Version 2.1
+-----------
+- Added death animations
+- Zombie spawners are now generated in dungeons (if they have more than 4 rooms)
+- Fixed bug that hostile mobs did sometimes not attack
+- Reduced sheep model size
+- Tweak codestyle a bit/ added missing documentation of combat values
+
+Version 2.2
+-----------
+- Added chicken
+- Readded sheep spawner (by LNJ)
+- Fix possible crash (reported by bbaez)
+- Added descriptions to spawners
+- Added option to set custom panic and swim animations
+
+Version 2.2.1
+-------------
+- Fixed crash caused by not existing node
+
+Version 2.2.2
+-------------
+- Eggs can be thrown to spawn chicken (rare)
+- Chicken drop chicken meat and feather(s) on death
+- Fixed spawn eggs being endless in singleplayer
+- Fix searching for target if in panic mode
+
+Version 2.3
+-----------
+- Added Oerrki
+- Added fried eggs
+- Fixed moveing facement being reset
+- Fixed chicken model
+- Fixed sneaky variable not working
+- Fixed feathers being eatable
+
+Version 2.3.1
+-------------
+- Added colored sheep
+- Fixed Oerrki spawning times (spawns on night as intended)
diff --git a/mods/mobs_passive/chicken/README.txt b/mods/mp_cme/chicken/README.txt
similarity index 100%
rename from mods/mobs_passive/chicken/README.txt
rename to mods/mp_cme/chicken/README.txt
diff --git a/mods/mobs_passive/chicken/depends.txt b/mods/mp_cme/chicken/depends.txt
similarity index 100%
rename from mods/mobs_passive/chicken/depends.txt
rename to mods/mp_cme/chicken/depends.txt
diff --git a/mods/mobs_passive/chicken/egg.lua b/mods/mp_cme/chicken/egg.lua
similarity index 100%
rename from mods/mobs_passive/chicken/egg.lua
rename to mods/mp_cme/chicken/egg.lua
diff --git a/mods/mobs_passive/chicken/init.lua b/mods/mp_cme/chicken/init.lua
similarity index 100%
rename from mods/mobs_passive/chicken/init.lua
rename to mods/mp_cme/chicken/init.lua
diff --git a/mods/mobs_passive/chicken/models/creatures_chicken.b3d b/mods/mp_cme/chicken/models/creatures_chicken.b3d
similarity index 100%
rename from mods/mobs_passive/chicken/models/creatures_chicken.b3d
rename to mods/mp_cme/chicken/models/creatures_chicken.b3d
diff --git a/mods/mobs_passive/chicken/screenshot.png b/mods/mp_cme/chicken/screenshot.png
similarity index 100%
rename from mods/mobs_passive/chicken/screenshot.png
rename to mods/mp_cme/chicken/screenshot.png
diff --git a/mods/mobs_passive/chicken/sounds/creatures_chicken.1.ogg b/mods/mp_cme/chicken/sounds/creatures_chicken.1.ogg
similarity index 100%
rename from mods/mobs_passive/chicken/sounds/creatures_chicken.1.ogg
rename to mods/mp_cme/chicken/sounds/creatures_chicken.1.ogg
diff --git a/mods/mobs_passive/chicken/sounds/creatures_chicken.2.ogg b/mods/mp_cme/chicken/sounds/creatures_chicken.2.ogg
similarity index 100%
rename from mods/mobs_passive/chicken/sounds/creatures_chicken.2.ogg
rename to mods/mp_cme/chicken/sounds/creatures_chicken.2.ogg
diff --git a/mods/mobs_passive/chicken/sounds/creatures_chicken.3.ogg b/mods/mp_cme/chicken/sounds/creatures_chicken.3.ogg
similarity index 100%
rename from mods/mobs_passive/chicken/sounds/creatures_chicken.3.ogg
rename to mods/mp_cme/chicken/sounds/creatures_chicken.3.ogg
diff --git a/mods/mobs_passive/chicken/sounds/creatures_chicken_hit.1.ogg b/mods/mp_cme/chicken/sounds/creatures_chicken_hit.1.ogg
similarity index 100%
rename from mods/mobs_passive/chicken/sounds/creatures_chicken_hit.1.ogg
rename to mods/mp_cme/chicken/sounds/creatures_chicken_hit.1.ogg
diff --git a/mods/mobs_passive/chicken/sounds/creatures_chicken_hit.2.ogg b/mods/mp_cme/chicken/sounds/creatures_chicken_hit.2.ogg
similarity index 100%
rename from mods/mobs_passive/chicken/sounds/creatures_chicken_hit.2.ogg
rename to mods/mp_cme/chicken/sounds/creatures_chicken_hit.2.ogg
diff --git a/mods/mobs_passive/chicken/textures/creatures_chicken.png b/mods/mp_cme/chicken/textures/creatures_chicken.png
similarity index 100%
rename from mods/mobs_passive/chicken/textures/creatures_chicken.png
rename to mods/mp_cme/chicken/textures/creatures_chicken.png
diff --git a/mods/mobs_passive/chicken/textures/creatures_chicken_flesh.png b/mods/mp_cme/chicken/textures/creatures_chicken_flesh.png
similarity index 100%
rename from mods/mobs_passive/chicken/textures/creatures_chicken_flesh.png
rename to mods/mp_cme/chicken/textures/creatures_chicken_flesh.png
diff --git a/mods/mobs_passive/chicken/textures/creatures_chicken_meat.png b/mods/mp_cme/chicken/textures/creatures_chicken_meat.png
similarity index 100%
rename from mods/mobs_passive/chicken/textures/creatures_chicken_meat.png
rename to mods/mp_cme/chicken/textures/creatures_chicken_meat.png
diff --git a/mods/mobs_passive/chicken/textures/creatures_egg.png b/mods/mp_cme/chicken/textures/creatures_egg.png
similarity index 100%
rename from mods/mobs_passive/chicken/textures/creatures_egg.png
rename to mods/mp_cme/chicken/textures/creatures_egg.png
diff --git a/mods/mobs_passive/chicken/textures/creatures_feather.png b/mods/mp_cme/chicken/textures/creatures_feather.png
similarity index 100%
rename from mods/mobs_passive/chicken/textures/creatures_feather.png
rename to mods/mp_cme/chicken/textures/creatures_feather.png
diff --git a/mods/mobs_passive/chicken/textures/creatures_fried_egg.png b/mods/mp_cme/chicken/textures/creatures_fried_egg.png
similarity index 100%
rename from mods/mobs_passive/chicken/textures/creatures_fried_egg.png
rename to mods/mp_cme/chicken/textures/creatures_fried_egg.png
diff --git a/mods/mp_cme/modpack.txt b/mods/mp_cme/modpack.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/mods/mp_cme/screenshot.png b/mods/mp_cme/screenshot.png
new file mode 100644
index 00000000..1fba4c20
Binary files /dev/null and b/mods/mp_cme/screenshot.png differ