diff --git a/SConstruct b/SConstruct
index eb22a5c..9215189 100644
--- a/SConstruct
+++ b/SConstruct
@@ -27,7 +27,7 @@ module_repositories = [
 ]
 
 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', '' ],
 ]
 
 third_party_addon_repositories = [
@@ -99,9 +99,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)
@@ -129,12 +126,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()
@@ -156,12 +153,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 150f68c..72e8ffc 100644
--- a/game/addons/.gitignore
+++ b/game/addons/.gitignore
@@ -1 +1 @@
-*/*
+*