diff --git a/HEADS b/HEADS
index ce15d117..c87b3fcb 100644
--- a/HEADS
+++ b/HEADS
@@ -1 +1 @@
-{"engine": "12ee35737fc81a8775347daffd5af3db7ef016ee", "world_generator": "290d973ea9580f748881a54502850ae5fecfb586", "entity_spell_system": "897c0519823f30d305285e9a0ff944861a12192d", "ui_extensions": "271dcf89e9afe5cb6350de2f2433c8ebf8aba785", "voxelman": "ce4020962e19144b3f60f707930dc8f653bc0afa", "texture_packer": "604c330188e220c15d10ea5bd545a6fc5aab0132", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "d60e746b158d3ebf9d2ea306af1dd24bcae49be5"}
\ No newline at end of file
+{"engine": "12ee35737fc81a8775347daffd5af3db7ef016ee", "world_generator": "290d973ea9580f748881a54502850ae5fecfb586", "entity_spell_system": "897c0519823f30d305285e9a0ff944861a12192d", "ui_extensions": "271dcf89e9afe5cb6350de2f2433c8ebf8aba785", "voxelman": "ce4020962e19144b3f60f707930dc8f653bc0afa", "texture_packer": "604c330188e220c15d10ea5bd545a6fc5aab0132", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "d60e746b158d3ebf9d2ea306af1dd24bcae49be5", "mesh_data_resource": "4cf72ef1e6026059e00cc4b5aead59c2c26a5035", "ess_data": "3bd637fdd3304b64a18287a49a6b7387acf2f5de", "prop_tool": "df438053ebc900966f8f842fc65f0264f1271d49"}
\ No newline at end of file
diff --git a/SConstruct b/SConstruct
index 62ea43c0..29fa60e2 100644
--- a/SConstruct
+++ b/SConstruct
@@ -32,7 +32,7 @@ repository_index = 0
 module_clone_path  = '/modules/' 
 clone_command = 'git clone {0} {1}'
 
-engine_repository = [ ['https://github.com/godotengine/godot.git', 'https://github.com/godotengine/godot.git'], 'engine', '' ]
+engine_repository = [ ['https://github.com/godotengine/godot.git', 'git@github.com:godotengine/godot.git'], 'engine', '' ]
 
 module_repositories = [
     [ ['https://github.com/Relintai/world_generator.git', 'git@github.com:Relintai/world_generator.git'], 'world_generator', '' ],
@@ -41,10 +41,12 @@ module_repositories = [
     [ ['https://github.com/Relintai/voxelman.git', 'git@github.com:Relintai/voxelman.git'], 'voxelman', '' ],
     [ ['https://github.com/Relintai/texture_packer.git', 'git@github.com:Relintai/texture_packer.git'], 'texture_packer', '' ],
     [ ['https://github.com/Relintai/godot_fastnoise.git', 'git@github.com:Relintai/godot_fastnoise.git'], 'fastnoise', '' ],
+    [ ['https://github.com/Relintai/mesh_data_resource.git', 'git@github.com:Relintai/mesh_data_resource.git'], 'mesh_data_resource', '' ],
 ]
 
 addon_repositories = [
-    [['https://github.com/Relintai/entity-spell-system-addons.git', 'git@github.com:Relintai/entity-spell-system-addons.git'], 'entity-spell-system-addons', 'addons' ],
+    [ ['https://github.com/Relintai/ess_data.git', 'git@github.com:Relintai/ess_data.git' ], 'ess_data', '' ],
+    [ ['https://github.com/Relintai/prop_tool.git', 'git@github.com:Relintai/prop_tool.git' ], 'prop_tool', '' ],
 ]
 
 third_party_addon_repositories = [
@@ -116,9 +118,6 @@ def setup_repository(data, clone_path):
 def copy_repository(data, target_folder, clone_path):
     copytree(os.path.abspath(clone_path + data[1] + '/' + data[2]), os.path.abspath(target_folder + data[1]))
 
-def copy_addon_repository(data, target_folder, clone_path):
-    copytree(os.path.abspath(clone_path + data[1] + '/' + data[2]), os.path.abspath(target_folder))
-
 def copytree(src, dst):
     for item in os.listdir(src):
         sp = os.path.join(src, item)
@@ -146,12 +145,12 @@ def update_modules():
 def update_addons():
     for rep in addon_repositories:
         update_repository(rep, module_clone_path)
-        copy_addon_repository(rep, './game/addons/', '.' + module_clone_path)
+        copy_repository(rep, './game/addons/', '.' + module_clone_path)
 
 def update_addons_third_party_addons():
     for rep in third_party_addon_repositories:
         update_repository(rep, module_clone_path)
-        copy_addon_repository(rep, './game/addons/', '.' + module_clone_path)
+        copy_repository(rep, './game/addons/', '.' + module_clone_path)
 
 def update_all():
     update_engine()
@@ -173,12 +172,12 @@ def setup_modules():
 def setup_addons():
     for rep in addon_repositories:
         setup_repository(rep, module_clone_path)
-        copy_addon_repository(rep, './game/addons/', '.' + module_clone_path)
+        copy_repository(rep, './game/addons/', '.' + module_clone_path)
 
 def setup_addons_third_party_addons():
     for rep in third_party_addon_repositories:
         setup_repository(rep, module_clone_path)
-        copy_addon_repository(rep, './game/addons/', '.' + module_clone_path)
+        copy_repository(rep, './game/addons/', '.' + module_clone_path)
 
 def setup_all():
     setup_engine()
diff --git a/game/addons/.gitignore b/game/addons/.gitignore
index 150f68c8..44f84133 100644
--- a/game/addons/.gitignore
+++ b/game/addons/.gitignore
@@ -1 +1,3 @@
 */*
+ess_data
+prop_tool
\ No newline at end of file