diff --git a/SCsub b/SCsub
index 3820950..1049417 100644
--- a/SCsub
+++ b/SCsub
@@ -15,16 +15,28 @@ sources = [
     "spell_enums.cpp",
     "item_enums.cpp",
 
-    "data/aura.cpp",
-    "data/aura_group.cpp",
-    "data/xp_data.cpp",
-    "data/item_stat_modifier.cpp",
-    "data/item_template_stat_modifier.cpp",
-    "data/item_instance.cpp",
-    "data/item_template.cpp",
-    "data/spell_cooldown_manipulation_data.cpp",
-    "data/equipment_data.cpp",
-    "data/equipment_data_entry.cpp",
+    "data/auras/aura.cpp",
+    "data/auras/aura_group.cpp",
+
+    "data/entities/xp_data.cpp",
+
+    "data/items/item_stat_modifier.cpp",
+    "data/items/item_template_stat_modifier.cpp",
+    "data/items/item_instance.cpp",
+    "data/items/item_template.cpp",
+    "data/items/equipment_data.cpp",
+    "data/items/equipment_data_entry.cpp",
+    "data/items/craft_recipe_helper.cpp",
+    "data/items/craft_recipe.cpp",
+    "data/items/item_visual.cpp",
+    "data/items/item_visual_entry.cpp",
+    "data/species/entity_species_data.cpp",
+    "data/species/species_model_data.cpp",
+
+    "data/spells/spell_cooldown_manipulation_data.cpp",
+    "data/spells/spell.cpp",
+    "data/spells/spell_effect_visual.cpp",
+    "data/spells/spell_effect_visual_simple.cpp",
 
     "entities/data/entity_data.cpp",
     "entities/data/entity_class_data.cpp",
@@ -43,19 +55,11 @@ sources = [
     "entities/data/character_spec.cpp",
     "entities/data/talent_row_data.cpp",
 
-    "data/item_visual.cpp",
-    "data/item_visual_entry.cpp",
-
     "atlases/character_atlas.cpp",
     "atlases/character_atlas_entry.cpp",
 
     "skeleton/character_bones.cpp",
 
-    "data/craft_recipe_helper.cpp",
-    "data/craft_recipe.cpp",
-
-    "data/spell.cpp",
-
     "entities/stats/stat.cpp",
     "entities/stats/stat_modifier.cpp",
     "entities/stats/stat_data.cpp",
@@ -64,9 +68,6 @@ sources = [
     "entities/stats/simple_level_stat_data.cpp",
     "entities/stats/complex_level_stat_data.cpp",
 
-    "data/spell_effect_visual.cpp",
-    "data/spell_effect_visual_simple.cpp",
-
     "world_spells/world_spell_data.cpp",
     "world_spells/world_spell.cpp",
 
@@ -92,8 +93,6 @@ sources = [
     "skeleton/character_skeleton_2d.cpp",
     "skeleton/character_skeleton_3d.cpp",
 
-    "skeleton/entity_species_data.cpp",
-    "skeleton/species_model_data.cpp",
     "skeleton/skeleton_model_entry.cpp",
 
     "utility/entity_create_info.cpp",
@@ -101,9 +100,9 @@ sources = [
     "utility/cooldown.cpp",
     "utility/category_cooldown.cpp",
 
-    "loot/loot_data_base.cpp",
-    "loot/loot_data_container.cpp",
-    "loot/loot_data_item.cpp",
+    "data/loot/loot_data_base.cpp",
+    "data/loot/loot_data_container.cpp",
+    "data/loot/loot_data_item.cpp",
 
     "entities/ai/entity_ai.cpp",
 
diff --git a/data/aura.cpp b/data/auras/aura.cpp
similarity index 99%
rename from data/aura.cpp
rename to data/auras/aura.cpp
index 0999e99..453b350 100644
--- a/data/aura.cpp
+++ b/data/auras/aura.cpp
@@ -22,7 +22,7 @@ SOFTWARE.
 
 #include "aura.h"
 
-#include "../entities/resources/entity_resource_cost_data.h"
+#include "../../entities/resources/entity_resource_cost_data.h"
 
 int Aura::get_id() const {
 	return _id;
diff --git a/data/aura.h b/data/auras/aura.h
similarity index 96%
rename from data/aura.h
rename to data/auras/aura.h
index c9a156e..c84ddb8 100644
--- a/data/aura.h
+++ b/data/auras/aura.h
@@ -29,27 +29,27 @@ SOFTWARE.
 
 #include "aura_group.h"
 
-#include "../entity_enums.h"
-#include "../spell_enums.h"
+#include "../../entity_enums.h"
+#include "../../spell_enums.h"
 
-#include "../entities/entity.h"
-#include "../entities/stats/stat.h"
-#include "../infos/aura_infos.h"
+#include "../../entities/entity.h"
+#include "../../entities/stats/stat.h"
+#include "../../infos/aura_infos.h"
 
 #include "aura_stat_attribute.h"
 #include "aura_trigger_data.h"
 
-#include "../entities/auras/aura_data.h"
-#include "../infos/spell_cast_info.h"
-#include "../pipelines/spell_damage_info.h"
-#include "../pipelines/spell_heal_info.h"
+#include "../../entities/auras/aura_data.h"
+#include "../../infos/spell_cast_info.h"
+#include "../../pipelines/spell_damage_info.h"
+#include "../../pipelines/spell_heal_info.h"
 
-#include "../utility/category_cooldown.h"
-#include "../utility/cooldown.h"
+#include "../../utility/category_cooldown.h"
+#include "../../utility/cooldown.h"
 
-#include "spell_effect_visual.h"
+#include "../spells/spell_effect_visual.h"
 
-#include "../world_spells/world_spell_data.h"
+#include "../../world_spells/world_spell_data.h"
 
 class AuraApplyInfo;
 class AuraScript;
@@ -359,7 +359,7 @@ protected:
 	virtual void _sremove_expired(Ref<AuraData> aura);
 	virtual void _sremove_dispell(Ref<AuraData> aura);
 	virtual void _supdate(Ref<AuraData> aura, float delta);
-	
+
 	virtual void _setup_aura_data(Ref<AuraData> data, Ref<AuraApplyInfo> info);
 
 	virtual void _sapply_passives_damage_receive(Ref<SpellDamageInfo> info);
diff --git a/data/aura_group.cpp b/data/auras/aura_group.cpp
similarity index 100%
rename from data/aura_group.cpp
rename to data/auras/aura_group.cpp
diff --git a/data/aura_group.h b/data/auras/aura_group.h
similarity index 100%
rename from data/aura_group.h
rename to data/auras/aura_group.h
diff --git a/data/aura_stat_attribute.cpp b/data/auras/aura_stat_attribute.cpp
similarity index 100%
rename from data/aura_stat_attribute.cpp
rename to data/auras/aura_stat_attribute.cpp
diff --git a/data/aura_stat_attribute.h b/data/auras/aura_stat_attribute.h
similarity index 98%
rename from data/aura_stat_attribute.h
rename to data/auras/aura_stat_attribute.h
index 42722d7..58fb88a 100644
--- a/data/aura_stat_attribute.h
+++ b/data/auras/aura_stat_attribute.h
@@ -23,7 +23,7 @@ SOFTWARE.
 #ifndef AURA_STAT_ATTRIBUTE_H
 #define AURA_STAT_ATTRIBUTE_H
 
-#include "../entities/stats/stat.h"
+#include "../../entities/stats/stat.h"
 #include "core/reference.h"
 
 class AuraStatAttribute : public Reference {
diff --git a/data/aura_trigger_data.cpp b/data/auras/aura_trigger_data.cpp
similarity index 100%
rename from data/aura_trigger_data.cpp
rename to data/auras/aura_trigger_data.cpp
diff --git a/data/aura_trigger_data.h b/data/auras/aura_trigger_data.h
similarity index 97%
rename from data/aura_trigger_data.h
rename to data/auras/aura_trigger_data.h
index 77721cc..9f3d4e3 100644
--- a/data/aura_trigger_data.h
+++ b/data/auras/aura_trigger_data.h
@@ -25,9 +25,9 @@ SOFTWARE.
 
 #include "core/reference.h"
 
-#include "../spell_enums.h"
+#include "../../spell_enums.h"
+#include "../spells/spell.h"
 #include "aura.h"
-#include "spell.h"
 
 class Spell;
 
diff --git a/data/xp_data.cpp b/data/entities/xp_data.cpp
similarity index 98%
rename from data/xp_data.cpp
rename to data/entities/xp_data.cpp
index c9444a1..e29b57f 100644
--- a/data/xp_data.cpp
+++ b/data/entities/xp_data.cpp
@@ -22,7 +22,7 @@ SOFTWARE.
 
 #include "xp_data.h"
 
-#include "../entity_enums.h"
+#include "../../entity_enums.h"
 
 int XPData::get_max_level() {
 	return EntityEnums::MAX_LEVEL;
diff --git a/data/xp_data.h b/data/entities/xp_data.h
similarity index 100%
rename from data/xp_data.h
rename to data/entities/xp_data.h
diff --git a/data/craft_recipe.cpp b/data/items/craft_recipe.cpp
similarity index 100%
rename from data/craft_recipe.cpp
rename to data/items/craft_recipe.cpp
diff --git a/data/craft_recipe.h b/data/items/craft_recipe.h
similarity index 100%
rename from data/craft_recipe.h
rename to data/items/craft_recipe.h
diff --git a/data/craft_recipe_helper.cpp b/data/items/craft_recipe_helper.cpp
similarity index 100%
rename from data/craft_recipe_helper.cpp
rename to data/items/craft_recipe_helper.cpp
diff --git a/data/craft_recipe_helper.h b/data/items/craft_recipe_helper.h
similarity index 100%
rename from data/craft_recipe_helper.h
rename to data/items/craft_recipe_helper.h
diff --git a/data/equipment_data.cpp b/data/items/equipment_data.cpp
similarity index 100%
rename from data/equipment_data.cpp
rename to data/items/equipment_data.cpp
diff --git a/data/equipment_data.h b/data/items/equipment_data.h
similarity index 98%
rename from data/equipment_data.h
rename to data/items/equipment_data.h
index 305e2c5..dc3f393 100644
--- a/data/equipment_data.h
+++ b/data/items/equipment_data.h
@@ -25,7 +25,7 @@ SOFTWARE.
 
 #include "core/resource.h"
 
-#include "../item_enums.h"
+#include "../../item_enums.h"
 #include "equipment_data_entry.h"
 
 class EquipmentData : public Resource {
diff --git a/data/equipment_data_entry.cpp b/data/items/equipment_data_entry.cpp
similarity index 100%
rename from data/equipment_data_entry.cpp
rename to data/items/equipment_data_entry.cpp
diff --git a/data/equipment_data_entry.h b/data/items/equipment_data_entry.h
similarity index 100%
rename from data/equipment_data_entry.h
rename to data/items/equipment_data_entry.h
diff --git a/data/item_instance.cpp b/data/items/item_instance.cpp
similarity index 99%
rename from data/item_instance.cpp
rename to data/items/item_instance.cpp
index 08ad1cc..3083707 100644
--- a/data/item_instance.cpp
+++ b/data/items/item_instance.cpp
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "item_template.h"
 
-#include "../singletons/entity_data_manager.h"
+#include "../../singletons/entity_data_manager.h"
 
 Ref<ItemTemplate> ItemInstance::get_item_template() const {
 	return _item_template;
diff --git a/data/item_instance.h b/data/items/item_instance.h
similarity index 96%
rename from data/item_instance.h
rename to data/items/item_instance.h
index 88cb0f3..7f9f90c 100644
--- a/data/item_instance.h
+++ b/data/items/item_instance.h
@@ -26,8 +26,8 @@ SOFTWARE.
 #include "core/reference.h"
 #include "core/vector.h"
 
-#include "../entities/stats/stat.h"
-#include "../item_enums.h"
+#include "../../entities/stats/stat.h"
+#include "../../item_enums.h"
 #include "item_stat_modifier.h"
 
 class ItemTemplate;
diff --git a/data/item_stat_modifier.cpp b/data/items/item_stat_modifier.cpp
similarity index 100%
rename from data/item_stat_modifier.cpp
rename to data/items/item_stat_modifier.cpp
diff --git a/data/item_stat_modifier.h b/data/items/item_stat_modifier.h
similarity index 97%
rename from data/item_stat_modifier.h
rename to data/items/item_stat_modifier.h
index ca46f65..43903f7 100644
--- a/data/item_stat_modifier.h
+++ b/data/items/item_stat_modifier.h
@@ -23,7 +23,7 @@ SOFTWARE.
 #ifndef ITEM_STAT_MODIFIER_H
 #define ITEM_STAT_MODIFIER_H
 
-#include "../entities/stats/stat.h"
+#include "../../entities/stats/stat.h"
 #include "core/reference.h"
 
 class ItemStatModifier : public Reference {
diff --git a/data/item_template.cpp b/data/items/item_template.cpp
similarity index 99%
rename from data/item_template.cpp
rename to data/items/item_template.cpp
index e0191f3..4c0a584 100644
--- a/data/item_template.cpp
+++ b/data/items/item_template.cpp
@@ -22,10 +22,10 @@ SOFTWARE.
 
 #include "item_template.h"
 
-#include "../entities/data/entity_class_data.h"
-#include "aura.h"
+#include "../../entities/data/entity_class_data.h"
+#include "../auras/aura.h"
+#include "../spells/spell.h"
 #include "item_instance.h"
-#include "spell.h"
 
 int ItemTemplate::get_id() const {
 	return _id;
diff --git a/data/item_template.h b/data/items/item_template.h
similarity index 98%
rename from data/item_template.h
rename to data/items/item_template.h
index c362ddc..f035f82 100644
--- a/data/item_template.h
+++ b/data/items/item_template.h
@@ -27,8 +27,8 @@ SOFTWARE.
 #include "core/vector.h"
 #include "scene/resources/texture.h"
 
-#include "../entities/stats/stat.h"
-#include "../item_enums.h"
+#include "../../entities/stats/stat.h"
+#include "../../item_enums.h"
 #include "item_template_stat_modifier.h"
 #include "item_visual.h"
 
diff --git a/data/item_template_stat_modifier.cpp b/data/items/item_template_stat_modifier.cpp
similarity index 100%
rename from data/item_template_stat_modifier.cpp
rename to data/items/item_template_stat_modifier.cpp
diff --git a/data/item_template_stat_modifier.h b/data/items/item_template_stat_modifier.h
similarity index 98%
rename from data/item_template_stat_modifier.h
rename to data/items/item_template_stat_modifier.h
index 3238c1b..56a3c1b 100644
--- a/data/item_template_stat_modifier.h
+++ b/data/items/item_template_stat_modifier.h
@@ -23,7 +23,7 @@ SOFTWARE.
 #ifndef ITEM_TEMPLATE_STAT_MODIFIER_H
 #define ITEM_TEMPLATE_STAT_MODIFIER_H
 
-#include "../entities/stats/stat.h"
+#include "../../entities/stats/stat.h"
 #include "core/reference.h"
 
 class ItemTemplateStatModifier : public Reference {
diff --git a/data/item_visual.cpp b/data/items/item_visual.cpp
similarity index 100%
rename from data/item_visual.cpp
rename to data/items/item_visual.cpp
diff --git a/data/item_visual.h b/data/items/item_visual.h
similarity index 98%
rename from data/item_visual.h
rename to data/items/item_visual.h
index 27bbaa1..b36b891 100644
--- a/data/item_visual.h
+++ b/data/items/item_visual.h
@@ -25,7 +25,7 @@ SOFTWARE.
 
 #include "core/resource.h"
 
-#include "../item_enums.h"
+#include "../../item_enums.h"
 #include "item_visual_entry.h"
 
 class ItemVisual : public Resource {
diff --git a/data/item_visual_entry.cpp b/data/items/item_visual_entry.cpp
similarity index 100%
rename from data/item_visual_entry.cpp
rename to data/items/item_visual_entry.cpp
diff --git a/data/item_visual_entry.h b/data/items/item_visual_entry.h
similarity index 95%
rename from data/item_visual_entry.h
rename to data/items/item_visual_entry.h
index c4d40ef..1d0be4f 100644
--- a/data/item_visual_entry.h
+++ b/data/items/item_visual_entry.h
@@ -28,14 +28,14 @@ SOFTWARE.
 #include "core/ustring.h"
 #include "scene/resources/texture.h"
 
-#include "../entity_enums.h"
-#include "../item_enums.h"
+#include "../../entity_enums.h"
+#include "../../item_enums.h"
 
 #include "scene/resources/mesh.h"
 #include "scene/resources/packed_scene.h"
 
 #ifdef MESH_DATA_RESOURCE_PRESENT
-#include "../../mesh_data_resource/mesh_data_resource.h"
+#include "../../../mesh_data_resource/mesh_data_resource.h"
 #endif
 
 class ItemVisualEntry : public Resource {
diff --git a/loot/loot_data_base.cpp b/data/loot/loot_data_base.cpp
similarity index 100%
rename from loot/loot_data_base.cpp
rename to data/loot/loot_data_base.cpp
diff --git a/loot/loot_data_base.h b/data/loot/loot_data_base.h
similarity index 97%
rename from loot/loot_data_base.h
rename to data/loot/loot_data_base.h
index 29e8f24..45fb406 100644
--- a/loot/loot_data_base.h
+++ b/data/loot/loot_data_base.h
@@ -25,7 +25,7 @@ SOFTWARE.
 
 #include "core/array.h"
 
-#include "../data/item_template.h"
+#include "../items/item_template.h"
 
 class LootDataBase : public Resource {
 	GDCLASS(LootDataBase, Resource);
diff --git a/loot/loot_data_container.cpp b/data/loot/loot_data_container.cpp
similarity index 100%
rename from loot/loot_data_container.cpp
rename to data/loot/loot_data_container.cpp
diff --git a/loot/loot_data_container.h b/data/loot/loot_data_container.h
similarity index 100%
rename from loot/loot_data_container.h
rename to data/loot/loot_data_container.h
diff --git a/loot/loot_data_item.cpp b/data/loot/loot_data_item.cpp
similarity index 100%
rename from loot/loot_data_item.cpp
rename to data/loot/loot_data_item.cpp
diff --git a/loot/loot_data_item.h b/data/loot/loot_data_item.h
similarity index 100%
rename from loot/loot_data_item.h
rename to data/loot/loot_data_item.h
diff --git a/skeleton/entity_species_data.cpp b/data/species/entity_species_data.cpp
similarity index 99%
rename from skeleton/entity_species_data.cpp
rename to data/species/entity_species_data.cpp
index e12bbd0..4ff41da 100644
--- a/skeleton/entity_species_data.cpp
+++ b/data/species/entity_species_data.cpp
@@ -22,8 +22,8 @@ SOFTWARE.
 
 #include "entity_species_data.h"
 
-#include "../data/aura.h"
-#include "../data/spell.h"
+#include "../auras/aura.h"
+#include "../spells/spell.h"
 
 int EntitySpeciesData::get_id() {
 	return _id;
diff --git a/skeleton/entity_species_data.h b/data/species/entity_species_data.h
similarity index 98%
rename from skeleton/entity_species_data.h
rename to data/species/entity_species_data.h
index ca36ddc..c1b0587 100644
--- a/skeleton/entity_species_data.h
+++ b/data/species/entity_species_data.h
@@ -27,7 +27,7 @@ SOFTWARE.
 #include "core/ustring.h"
 #include "core/vector.h"
 
-#include "../entity_enums.h"
+#include "../../entity_enums.h"
 
 #include "species_model_data.h"
 
diff --git a/skeleton/species_model_data.cpp b/data/species/species_model_data.cpp
similarity index 100%
rename from skeleton/species_model_data.cpp
rename to data/species/species_model_data.cpp
diff --git a/skeleton/species_model_data.h b/data/species/species_model_data.h
similarity index 98%
rename from skeleton/species_model_data.h
rename to data/species/species_model_data.h
index 34fc896..d305dad 100644
--- a/skeleton/species_model_data.h
+++ b/data/species/species_model_data.h
@@ -30,9 +30,9 @@ SOFTWARE.
 #include "core/vector.h"
 #include "scene/resources/packed_scene.h"
 
-#include "../data/item_visual_entry.h"
+#include "../items/item_visual_entry.h"
 
-#include "../entity_enums.h"
+#include "../../entity_enums.h"
 
 class ItemVisual;
 
diff --git a/data/spell.cpp b/data/spells/spell.cpp
similarity index 99%
rename from data/spell.cpp
rename to data/spells/spell.cpp
index a6f46d9..a492e5c 100644
--- a/data/spell.cpp
+++ b/data/spells/spell.cpp
@@ -22,13 +22,13 @@ SOFTWARE.
 
 #include "spell.h"
 
-#include "../entities/resources/entity_resource_cost_data.h"
-#include "../entities/skills/entity_skill_data.h"
-#include "aura.h"
-#include "craft_recipe.h"
-#include "../world_spells/world_spell.h"
+#include "../../entities/resources/entity_resource_cost_data.h"
+#include "../../entities/skills/entity_skill_data.h"
+#include "../../world_spells/world_spell.h"
+#include "../auras/aura.h"
+#include "../items/craft_recipe.h"
 
-#include "../entities/auras/aura_data.h"
+#include "../../entities/auras/aura_data.h"
 
 int Spell::get_id() const {
 	return _id;
@@ -884,7 +884,7 @@ void Spell::_handle_projectile(Ref<SpellCastInfo> info) {
 
 void Spell::_handle_effect(Ref<SpellCastInfo> info) {
 
-		/*
+	/*
 #		var ok : bool = false
 		
 #		if (target_relation_type & TARGET_SELF):
@@ -931,7 +931,7 @@ void Spell::_handle_effect(Ref<SpellCastInfo> info) {
 
 		_caster_aura_applys.get(i)->sapply(aai);
 	}
-		
+
 	if (has_target) {
 		for (int i = 0; i < _target_aura_applys.size(); ++i) {
 			Ref<Aura> aura = _target_aura_applys.get(i);
@@ -948,7 +948,6 @@ void Spell::_handle_effect(Ref<SpellCastInfo> info) {
 				info->get_target()->sremove_aura_exact(ad);
 			}
 
-
 			Ref<AuraApplyInfo> aai;
 			aai.instance();
 
@@ -962,7 +961,6 @@ void Spell::_handle_effect(Ref<SpellCastInfo> info) {
 	}
 }
 
-
 void Spell::_bind_methods() {
 	//Commands
 	ClassDB::bind_method(D_METHOD("sstart_casting", "info"), &Spell::sstart_casting);
diff --git a/data/spell.h b/data/spells/spell.h
similarity index 97%
rename from data/spell.h
rename to data/spells/spell.h
index 35faa4c..407de49 100644
--- a/data/spell.h
+++ b/data/spells/spell.h
@@ -26,20 +26,20 @@ SOFTWARE.
 #include "core/resource.h"
 #include "scene/resources/texture.h"
 
-#include "../entity_enums.h"
-#include "../spell_enums.h"
+#include "../../entity_enums.h"
+#include "../../spell_enums.h"
 
-#include "../infos/spell_cast_info.h"
+#include "../../infos/spell_cast_info.h"
 
-#include "../entities/entity.h"
-#include "../entities/stats/stat.h"
+#include "../../entities/entity.h"
+#include "../../entities/stats/stat.h"
 
-#include "../infos/aura_infos.h"
-#include "../pipelines/spell_damage_info.h"
+#include "../../infos/aura_infos.h"
+#include "../../pipelines/spell_damage_info.h"
 
 #include "spell_effect_visual.h"
 
-#include "../world_spells/world_spell_data.h"
+#include "../../world_spells/world_spell_data.h"
 
 class Entity;
 class Aura;
diff --git a/data/spell_cooldown_manipulation_data.cpp b/data/spells/spell_cooldown_manipulation_data.cpp
similarity index 100%
rename from data/spell_cooldown_manipulation_data.cpp
rename to data/spells/spell_cooldown_manipulation_data.cpp
diff --git a/data/spell_cooldown_manipulation_data.h b/data/spells/spell_cooldown_manipulation_data.h
similarity index 100%
rename from data/spell_cooldown_manipulation_data.h
rename to data/spells/spell_cooldown_manipulation_data.h
diff --git a/data/spell_effect_visual.cpp b/data/spells/spell_effect_visual.cpp
similarity index 100%
rename from data/spell_effect_visual.cpp
rename to data/spells/spell_effect_visual.cpp
diff --git a/data/spell_effect_visual.h b/data/spells/spell_effect_visual.h
similarity index 100%
rename from data/spell_effect_visual.h
rename to data/spells/spell_effect_visual.h
diff --git a/data/spell_effect_visual_simple.cpp b/data/spells/spell_effect_visual_simple.cpp
similarity index 100%
rename from data/spell_effect_visual_simple.cpp
rename to data/spells/spell_effect_visual_simple.cpp
diff --git a/data/spell_effect_visual_simple.h b/data/spells/spell_effect_visual_simple.h
similarity index 98%
rename from data/spell_effect_visual_simple.h
rename to data/spells/spell_effect_visual_simple.h
index 78e6d93..518b405 100644
--- a/data/spell_effect_visual_simple.h
+++ b/data/spells/spell_effect_visual_simple.h
@@ -27,7 +27,7 @@ SOFTWARE.
 
 #include "scene/resources/packed_scene.h"
 
-#include "../entity_enums.h"
+#include "../../entity_enums.h"
 
 class SpellEffectVisualSimple : public SpellEffectVisual {
 	GDCLASS(SpellEffectVisualSimple, SpellEffectVisual);
diff --git a/entities/auras/aura_data.cpp b/entities/auras/aura_data.cpp
index 4f2c365..a6cddca 100644
--- a/entities/auras/aura_data.cpp
+++ b/entities/auras/aura_data.cpp
@@ -22,7 +22,7 @@ SOFTWARE.
 
 #include "aura_data.h"
 
-#include "../../data/aura.h"
+#include "../../data/auras/aura.h"
 #include "../../singletons/entity_data_manager.h"
 #include "../entity.h"
 
diff --git a/entities/data/character_spec.cpp b/entities/data/character_spec.cpp
index 18a1db3..4e5c942 100644
--- a/entities/data/character_spec.cpp
+++ b/entities/data/character_spec.cpp
@@ -22,7 +22,7 @@ SOFTWARE.
 
 #include "character_spec.h"
 
-#include "../../data/aura.h"
+#include "../../data/auras/aura.h"
 
 int CharacterSpec::get_id() {
 	return _id;
diff --git a/entities/data/entity_class_data.cpp b/entities/data/entity_class_data.cpp
index 5f8220d..361a8da 100644
--- a/entities/data/entity_class_data.cpp
+++ b/entities/data/entity_class_data.cpp
@@ -22,9 +22,9 @@ SOFTWARE.
 
 #include "entity_class_data.h"
 
-#include "../../data/aura.h"
-#include "../../data/item_instance.h"
-#include "../../data/spell.h"
+#include "../../data/auras/aura.h"
+#include "../../data/items/item_instance.h"
+#include "../../data/spells/spell.h"
 #include "../../infos/spell_cast_info.h"
 #include "../ai/entity_ai.h"
 #include "../entity.h"
diff --git a/entities/data/entity_data.cpp b/entities/data/entity_data.cpp
index 481f236..9fb0e42 100644
--- a/entities/data/entity_data.cpp
+++ b/entities/data/entity_data.cpp
@@ -22,9 +22,9 @@ SOFTWARE.
 
 #include "entity_data.h"
 
-#include "../../data/aura.h"
-#include "../../data/craft_recipe.h"
-#include "../../data/spell.h"
+#include "../../data/auras/aura.h"
+#include "../../data/items/craft_recipe.h"
+#include "../../data/spells/spell.h"
 #include "../../infos/spell_cast_info.h"
 #include "../entity.h"
 #include "character_spec.h"
diff --git a/entities/data/entity_data.h b/entities/data/entity_data.h
index 56b828e..59466a1 100644
--- a/entities/data/entity_data.h
+++ b/entities/data/entity_data.h
@@ -38,14 +38,14 @@ SOFTWARE.
 #include "../../utility/category_cooldown.h"
 #include "../../utility/cooldown.h"
 
-#include "../../loot/loot_data_base.h"
+#include "../../data/loot/loot_data_base.h"
 
 #include "entity_class_data.h"
 #include "item_container_data.h"
 
-#include "../../data/equipment_data.h"
+#include "../../data/items/equipment_data.h"
 
-#include "../../skeleton/entity_species_data.h"
+#include "../../data/species/entity_species_data.h"
 
 #include "../../formations/ai_formation.h"
 #include "../ai/entity_ai.h"
diff --git a/entities/data/item_container_data_entry.cpp b/entities/data/item_container_data_entry.cpp
index 014d55a..7db9c6b 100644
--- a/entities/data/item_container_data_entry.cpp
+++ b/entities/data/item_container_data_entry.cpp
@@ -22,7 +22,7 @@ SOFTWARE.
 
 #include "item_container_data_entry.h"
 
-#include "../../data/item_template.h"
+#include "../../data/items/item_template.h"
 
 Ref<ItemTemplate> ItemContainerDataEntry::get_item() {
 	return _item;
diff --git a/entities/data/talent_row_data.h b/entities/data/talent_row_data.h
index c7f143c..fe719d6 100644
--- a/entities/data/talent_row_data.h
+++ b/entities/data/talent_row_data.h
@@ -26,7 +26,7 @@ SOFTWARE.
 #include "core/reference.h"
 #include "core/ustring.h"
 
-#include "../../data/aura.h"
+#include "../../data/auras/aura.h"
 
 class Aura;
 
diff --git a/entities/data/vendor_item_data_entry.cpp b/entities/data/vendor_item_data_entry.cpp
index 3102c57..3b85c24 100644
--- a/entities/data/vendor_item_data_entry.cpp
+++ b/entities/data/vendor_item_data_entry.cpp
@@ -22,7 +22,7 @@ SOFTWARE.
 
 #include "vendor_item_data.h"
 
-#include "../../data/item_template.h"
+#include "../../data/items/item_template.h"
 
 Ref<ItemTemplate> VendorItemDataEntry::get_item() {
 	return _item;
diff --git a/entities/entity.cpp b/entities/entity.cpp
index 22c3ff9..d7dc08f 100644
--- a/entities/entity.cpp
+++ b/entities/entity.cpp
@@ -25,8 +25,8 @@ SOFTWARE.
 #include "../singletons/entity_data_manager.h"
 #include "../singletons/profile_manager.h"
 
-#include "../data/aura.h"
-#include "../data/spell.h"
+#include "../data/auras/aura.h"
+#include "../data/spells/spell.h"
 #include "../entities/auras/aura_data.h"
 #include "../infos/spell_cast_info.h"
 #include "../inventory/bag.h"
diff --git a/entities/entity.h b/entities/entity.h
index ded6af5..6b01ef2 100644
--- a/entities/entity.h
+++ b/entities/entity.h
@@ -27,17 +27,17 @@ SOFTWARE.
 
 #include "scene/main/node.h"
 
-#include "../data/craft_recipe.h"
-#include "../data/item_instance.h"
-#include "../data/spell.h"
-#include "../data/xp_data.h"
+#include "../data/entities/xp_data.h"
+#include "../data/items/craft_recipe.h"
+#include "../data/items/item_instance.h"
+#include "../data/spells/spell.h"
 #include "./data/entity_data.h"
 #include "core/hash_map.h"
 #include "core/object.h"
 #include "core/ustring.h"
 #include "core/vector.h"
 
-#include "../data/spell.h"
+#include "../data/spells/spell.h"
 #include "./resources/entity_resource.h"
 #include "stats/stat.h"
 
@@ -54,7 +54,7 @@ SOFTWARE.
 
 #include "./ai/entity_ai.h"
 
-#include "../data/aura_group.h"
+#include "../data/auras/aura_group.h"
 
 class EntityData;
 class AuraData;
diff --git a/infos/aura_infos.cpp b/infos/aura_infos.cpp
index 8252fb7..5234192 100644
--- a/infos/aura_infos.cpp
+++ b/infos/aura_infos.cpp
@@ -22,7 +22,7 @@ SOFTWARE.
 
 #include "aura_infos.h"
 
-#include "../data/aura.h"
+#include "../data/auras/aura.h"
 
 Entity *AuraApplyInfo::get_caster() const {
 	return _caster;
diff --git a/infos/spell_cast_info.cpp b/infos/spell_cast_info.cpp
index 1176b75..317a3ac 100644
--- a/infos/spell_cast_info.cpp
+++ b/infos/spell_cast_info.cpp
@@ -22,7 +22,7 @@ SOFTWARE.
 
 #include "spell_cast_info.h"
 
-#include "../data/spell.h"
+#include "../data/spells/spell.h"
 
 #include "../singletons/entity_data_manager.h"
 
diff --git a/inventory/bag.cpp b/inventory/bag.cpp
index dcb8dab..52364a5 100644
--- a/inventory/bag.cpp
+++ b/inventory/bag.cpp
@@ -22,8 +22,8 @@ SOFTWARE.
 
 #include "bag.h"
 
-#include "../data/item_instance.h"
-#include "../data/item_template.h"
+#include "../data/items/item_instance.h"
+#include "../data/items/item_template.h"
 
 int Bag::get_allowed_item_types() const {
 	return _allowed_item_types;
diff --git a/inventory/grid_bag.cpp b/inventory/grid_bag.cpp
index b0ecac6..5235508 100644
--- a/inventory/grid_bag.cpp
+++ b/inventory/grid_bag.cpp
@@ -22,8 +22,8 @@ SOFTWARE.
 
 #include "grid_bag.h"
 
-#include "../data/item_instance.h"
-#include "../data/item_template.h"
+#include "../data/items/item_instance.h"
+#include "../data/items/item_template.h"
 
 int GridBag::get_allowed_item_types() const {
 	return _allowed_item_types;
diff --git a/inventory/inventory.cpp b/inventory/inventory.cpp
index 11c2f70..f33c601 100644
--- a/inventory/inventory.cpp
+++ b/inventory/inventory.cpp
@@ -22,8 +22,8 @@ SOFTWARE.
 
 #include "inventory.h"
 
-#include "../data/item_instance.h"
-#include "../data/item_template.h"
+#include "../data/items/item_instance.h"
+#include "../data/items/item_template.h"
 
 #include "../entities/player.h"
 
diff --git a/inventory/normal_bag.cpp b/inventory/normal_bag.cpp
index b213b6b..f82d893 100644
--- a/inventory/normal_bag.cpp
+++ b/inventory/normal_bag.cpp
@@ -22,8 +22,8 @@ SOFTWARE.
 
 #include "bag.h"
 
-#include "../data/item_instance.h"
-#include "../data/item_template.h"
+#include "../data/items/item_instance.h"
+#include "../data/items/item_template.h"
 
 int Bag::get_allowed_item_types() const {
 	return _allowed_item_types;
diff --git a/pipelines/spell_damage_info.cpp b/pipelines/spell_damage_info.cpp
index e98e484..38d0e93 100644
--- a/pipelines/spell_damage_info.cpp
+++ b/pipelines/spell_damage_info.cpp
@@ -22,8 +22,8 @@ SOFTWARE.
 
 #include "spell_damage_info.h"
 
-#include "../data/aura.h"
-#include "../data/spell.h"
+#include "../data/auras/aura.h"
+#include "../data/spells/spell.h"
 #include "../entities/entity.h"
 #include "../singletons/entity_data_manager.h"
 
diff --git a/pipelines/spell_heal_info.cpp b/pipelines/spell_heal_info.cpp
index 3b48542..89854d8 100644
--- a/pipelines/spell_heal_info.cpp
+++ b/pipelines/spell_heal_info.cpp
@@ -22,8 +22,8 @@ SOFTWARE.
 
 #include "spell_heal_info.h"
 
-#include "../data/aura.h"
-#include "../data/spell.h"
+#include "../data/auras/aura.h"
+#include "../data/spells/spell.h"
 #include "../entities/entity.h"
 #include "../singletons/entity_data_manager.h"
 
diff --git a/register_types.cpp b/register_types.cpp
index 968d252..dab58af 100644
--- a/register_types.cpp
+++ b/register_types.cpp
@@ -27,15 +27,16 @@ SOFTWARE.
 
 #include "singletons/entity_data_manager.h"
 
-#include "data/aura.h"
-#include "data/aura_group.h"
-#include "data/aura_stat_attribute.h"
-#include "data/equipment_data.h"
-#include "data/equipment_data_entry.h"
-#include "data/item_stat_modifier.h"
-#include "data/item_template_stat_modifier.h"
-#include "data/spell_cooldown_manipulation_data.h"
-#include "data/xp_data.h"
+#include "data/auras/aura.h"
+#include "data/auras/aura_group.h"
+#include "data/auras/aura_stat_attribute.h"
+
+#include "data/entities/xp_data.h"
+#include "data/items/equipment_data.h"
+#include "data/items/equipment_data_entry.h"
+#include "data/items/item_stat_modifier.h"
+#include "data/items/item_template_stat_modifier.h"
+#include "data/spells/spell_cooldown_manipulation_data.h"
 
 #include "entities/data/entity_class_data.h"
 #include "entities/data/entity_data.h"
@@ -51,18 +52,18 @@ SOFTWARE.
 #include "entities/data/character_spec.h"
 #include "entities/data/talent_row_data.h"
 
-#include "data/item_visual.h"
-#include "data/item_visual_entry.h"
+#include "data/items/item_visual.h"
+#include "data/items/item_visual_entry.h"
 
 #include "atlases/character_atlas.h"
 #include "atlases/character_atlas_entry.h"
 
 #include "skeleton/character_bones.h"
 
-#include "data/item_instance.h"
-#include "data/item_template.h"
+#include "data/items/item_instance.h"
+#include "data/items/item_template.h"
 
-#include "data/spell.h"
+#include "data/spells/spell.h"
 #include "entities/stats/complex_level_stat_data.h"
 #include "entities/stats/level_stat_data.h"
 #include "entities/stats/simple_level_stat_data.h"
@@ -74,8 +75,8 @@ SOFTWARE.
 #include "inventory/bag.h"
 //#include "inventory/inventory.h"
 
-#include "data/craft_recipe.h"
-#include "data/craft_recipe_helper.h"
+#include "data/items/craft_recipe.h"
+#include "data/items/craft_recipe_helper.h"
 
 #include "infos/aura_infos.h"
 #include "infos/spell_cast_info.h"
@@ -90,8 +91,8 @@ SOFTWARE.
 #include "entities/auras/aura_data.h"
 #include "entities/entity.h"
 
-#include "data/aura_stat_attribute.h"
-#include "data/aura_trigger_data.h"
+#include "data/auras/aura_stat_attribute.h"
+#include "data/auras/aura_trigger_data.h"
 
 #include "ui/unit_frame.h"
 
@@ -100,20 +101,20 @@ SOFTWARE.
 #include "skeleton/character_skeleton_2d.h"
 #include "skeleton/character_skeleton_3d.h"
 
-#include "skeleton/entity_species_data.h"
+#include "data/species/entity_species_data.h"
+#include "data/species/species_model_data.h"
 #include "skeleton/skeleton_model_entry.h"
-#include "skeleton/species_model_data.h"
 
 #include "utility/category_cooldown.h"
 #include "utility/cooldown.h"
 #include "utility/entity_create_info.h"
 
-#include "loot/loot_data_base.h"
-#include "loot/loot_data_container.h"
-#include "loot/loot_data_item.h"
+#include "data/loot/loot_data_base.h"
+#include "data/loot/loot_data_container.h"
+#include "data/loot/loot_data_item.h"
 
-#include "data/spell_effect_visual.h"
-#include "data/spell_effect_visual_simple.h"
+#include "data/spells/spell_effect_visual.h"
+#include "data/spells/spell_effect_visual_simple.h"
 
 #include "world_spells/world_spell.h"
 #include "world_spells/world_spell_data.h"
diff --git a/singletons/entity_data_manager.cpp b/singletons/entity_data_manager.cpp
index cbfe7dd..e952ab8 100644
--- a/singletons/entity_data_manager.cpp
+++ b/singletons/entity_data_manager.cpp
@@ -22,9 +22,9 @@ SOFTWARE.
 
 #include "entity_data_manager.h"
 
-#include "../data/aura.h"
-#include "../data/craft_recipe.h"
-#include "../data/spell.h"
+#include "../data/auras/aura.h"
+#include "../data/items/craft_recipe.h"
+#include "../data/spells/spell.h"
 #include "../entities/data/entity_data.h"
 #include "../entities/resources/entity_resource_data.h"
 #include "../entities/skills/entity_skill_data.h"
@@ -35,11 +35,11 @@ EntityDataManager *EntityDataManager::get_instance() {
 	return instance;
 }
 
-bool EntityDataManager::get_automatic_load() { 
-	return _automatic_load; 
+bool EntityDataManager::get_automatic_load() {
+	return _automatic_load;
 }
-void EntityDataManager::set_automatic_load(bool load) { 
-	_automatic_load = load; 
+void EntityDataManager::set_automatic_load(bool load) {
+	_automatic_load = load;
 }
 
 Ref<Aura> EntityDataManager::get_skill_for_armor_type(int index) {
diff --git a/singletons/entity_data_manager.h b/singletons/entity_data_manager.h
index bd62df2..8337a45 100644
--- a/singletons/entity_data_manager.h
+++ b/singletons/entity_data_manager.h
@@ -40,7 +40,7 @@ SOFTWARE.
 
 #include "../item_enums.h"
 
-#include "../data/xp_data.h"
+#include "../data/entities/xp_data.h"
 
 #include "../world_spells/world_spell_data.h"
 
diff --git a/skeleton/character_skeleton_2d.h b/skeleton/character_skeleton_2d.h
index 963c551..bfd54f9 100644
--- a/skeleton/character_skeleton_2d.h
+++ b/skeleton/character_skeleton_2d.h
@@ -31,7 +31,7 @@ SOFTWARE.
 
 #include "../entity_enums.h"
 
-#include "../data/item_visual.h"
+#include "../data/items/item_visual.h"
 
 class CharacterSkeleton2D : public Node2D {
 	GDCLASS(CharacterSkeleton2D, Node2D);
diff --git a/skeleton/character_skeleton_3d.cpp b/skeleton/character_skeleton_3d.cpp
index af37acd..6060b06 100644
--- a/skeleton/character_skeleton_3d.cpp
+++ b/skeleton/character_skeleton_3d.cpp
@@ -22,7 +22,7 @@ SOFTWARE.
 
 #include "character_skeleton_3d.h"
 
-#include "../data/item_visual.h"
+#include "../data/items/item_visual.h"
 
 EntityEnums::EntityGender CharacterSkeleton3D::get_gender() {
 	return _gender;
diff --git a/skeleton/character_skeleton_3d.h b/skeleton/character_skeleton_3d.h
index c6c9fd8..34ff2ca 100644
--- a/skeleton/character_skeleton_3d.h
+++ b/skeleton/character_skeleton_3d.h
@@ -35,7 +35,7 @@ SOFTWARE.
 #include "../entity_enums.h"
 #include "skeleton_model_entry.h"
 
-#include "../data/item_visual_entry.h"
+#include "../data/items/item_visual_entry.h"
 
 class ItemVisual;
 
diff --git a/skeleton/skeleton_model_entry.h b/skeleton/skeleton_model_entry.h
index d7816e8..49837b1 100644
--- a/skeleton/skeleton_model_entry.h
+++ b/skeleton/skeleton_model_entry.h
@@ -23,7 +23,7 @@ SOFTWARE.
 #ifndef SKELETON_MODEL_ENTRY_H
 #define SKELETON_MODEL_ENTRY_H
 
-#include "../data/item_visual_entry.h"
+#include "../data/items/item_visual_entry.h"
 #include "core/reference.h"
 
 class SkeletonModelEntry : public Reference {