diff --git a/Source/MaybeThisTime/Private/BaseCommand.cpp b/Source/MaybeThisTime/Private/Commands/BaseCommand.cpp
similarity index 88%
rename from Source/MaybeThisTime/Private/BaseCommand.cpp
rename to Source/MaybeThisTime/Private/Commands/BaseCommand.cpp
index 9a4c377..40d8d92 100644
--- a/Source/MaybeThisTime/Private/BaseCommand.cpp
+++ b/Source/MaybeThisTime/Private/Commands/BaseCommand.cpp
@@ -1,7 +1,7 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "BaseCommand.h"
+#include "Commands/BaseCommand.h"
 
 void UBaseCommand::Interrupt_Implementation()
 {
diff --git a/Source/MaybeThisTime/Private/BaseCommands.cpp b/Source/MaybeThisTime/Private/Commands/BaseCommands.cpp
similarity index 96%
rename from Source/MaybeThisTime/Private/BaseCommands.cpp
rename to Source/MaybeThisTime/Private/Commands/BaseCommands.cpp
index 1ee4764..d029999 100644
--- a/Source/MaybeThisTime/Private/BaseCommands.cpp
+++ b/Source/MaybeThisTime/Private/Commands/BaseCommands.cpp
@@ -1,9 +1,9 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "BaseCommands.h"
-#include "InteractionInterface.h"
-#include "BaseUnit.h"
+#include "Commands/BaseCommands.h"
+#include "Interaction/InteractionInterface.h"
+#include "Units/BaseUnit.h"
 
 // UMoveToCommand
 void UMoveToCommand::Execute_Implementation()
diff --git a/Source/MaybeThisTime/Private/Commands/CommandComponent.cpp b/Source/MaybeThisTime/Private/Commands/CommandComponent.cpp
index 3adfab5..b4b1d38 100644
--- a/Source/MaybeThisTime/Private/Commands/CommandComponent.cpp
+++ b/Source/MaybeThisTime/Private/Commands/CommandComponent.cpp
@@ -2,8 +2,8 @@
 
 
 #include "Commands/CommandComponent.h"
-#include "BaseCommand.h"
-#include "BaseUnit.h"
+#include "Commands/BaseCommand.h"
+#include "Units/BaseUnit.h"
 
 // Sets default values for this component's properties
 UCommandComponent::UCommandComponent()
diff --git a/Source/MaybeThisTime/Private/MyGameplayTags.cpp b/Source/MaybeThisTime/Private/Core/MyGameplayTags.cpp
similarity index 94%
rename from Source/MaybeThisTime/Private/MyGameplayTags.cpp
rename to Source/MaybeThisTime/Private/Core/MyGameplayTags.cpp
index af71cf0..45acd19 100644
--- a/Source/MaybeThisTime/Private/MyGameplayTags.cpp
+++ b/Source/MaybeThisTime/Private/Core/MyGameplayTags.cpp
@@ -1,7 +1,7 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "MyGameplayTags.h"
+#include "Core/MyGameplayTags.h"
 
 
 //6.März 
diff --git a/Source/MaybeThisTime/Private/ThirdPersonCharacter.cpp b/Source/MaybeThisTime/Private/Core/ThirdPersonCharacter.cpp
similarity index 94%
rename from Source/MaybeThisTime/Private/ThirdPersonCharacter.cpp
rename to Source/MaybeThisTime/Private/Core/ThirdPersonCharacter.cpp
index f0f2aa9..0641625 100644
--- a/Source/MaybeThisTime/Private/ThirdPersonCharacter.cpp
+++ b/Source/MaybeThisTime/Private/Core/ThirdPersonCharacter.cpp
@@ -1,7 +1,7 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "ThirdPersonCharacter.h"
+#include "Core/ThirdPersonCharacter.h"
 
 // Sets default values
 AThirdPersonCharacter::AThirdPersonCharacter()
diff --git a/Source/MaybeThisTime/Private/ThirdPersonController.cpp b/Source/MaybeThisTime/Private/Core/ThirdPersonController.cpp
similarity index 95%
rename from Source/MaybeThisTime/Private/ThirdPersonController.cpp
rename to Source/MaybeThisTime/Private/Core/ThirdPersonController.cpp
index 192c667..bf5a122 100644
--- a/Source/MaybeThisTime/Private/ThirdPersonController.cpp
+++ b/Source/MaybeThisTime/Private/Core/ThirdPersonController.cpp
@@ -1,13 +1,13 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
-#include "ThirdPersonController.h"
-#include "InteractionInterface.h"
+#include "Core/ThirdPersonController.h"
+#include "Interaction/InteractionInterface.h"
 #include "Net/UnrealNetwork.h"
-#include "UnitManagerComponent.h"
-#include "PlayerUnit.h"
-#include "TopDownGameState.h"
-#include "ZoneActor.h"
-#include "ModuleActor.h"
+#include "Units/UnitManagerComponent.h"
+#include "Units/PlayerUnit.h"
+#include "GameFramework/TopDownGameState.h"
+#include "Zones/ZoneActor.h"
+#include "Zones/ModuleActor.h"
 #include "Framework/Application/SlateApplication.h"
 
 AThirdPersonController::AThirdPersonController()
diff --git a/Source/MaybeThisTime/Private/FactionManager.cpp b/Source/MaybeThisTime/Private/Factions/FactionManager.cpp
similarity index 99%
rename from Source/MaybeThisTime/Private/FactionManager.cpp
rename to Source/MaybeThisTime/Private/Factions/FactionManager.cpp
index 26f6c74..41b5e9a 100644
--- a/Source/MaybeThisTime/Private/FactionManager.cpp
+++ b/Source/MaybeThisTime/Private/Factions/FactionManager.cpp
@@ -1,5 +1,5 @@
 // FactionManager.cpp
-#include "FactionManager.h"
+#include "Factions/FactionManager.h"
 #include "Net/UnrealNetwork.h"
 
 UFactionManager::UFactionManager()
diff --git a/Source/MaybeThisTime/Private/TopDownGameMode.cpp b/Source/MaybeThisTime/Private/GameFramework/TopDownGameMode.cpp
similarity index 89%
rename from Source/MaybeThisTime/Private/TopDownGameMode.cpp
rename to Source/MaybeThisTime/Private/GameFramework/TopDownGameMode.cpp
index aa12dd0..ebef8d8 100644
--- a/Source/MaybeThisTime/Private/TopDownGameMode.cpp
+++ b/Source/MaybeThisTime/Private/GameFramework/TopDownGameMode.cpp
@@ -1,13 +1,13 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "TopDownGameMode.h"
-#include "ThirdPersonController.h"
-#include "BaseUnit.h"
-#include "TopDownGameState.h"
-#include "FactionManager.h"
-#include "PlayerUnit.h"
-#include "UnitManagerComponent.h"
+#include "GameFramework/TopDownGameMode.h"
+#include "Core/ThirdPersonController.h"
+#include "Units/BaseUnit.h"
+#include "GameFramework/TopDownGameState.h"
+#include "Factions/FactionManager.h"
+#include "Units/PlayerUnit.h"
+#include "Units/UnitManagerComponent.h"
 
 ABaseUnit* ATopDownGameMode::SpawnUnit(TSubclassOf<ABaseUnit> UnitClass, FTransform SpawnTransform, FName FactionID)
 {
diff --git a/Source/MaybeThisTime/Private/TopDownGameState.cpp b/Source/MaybeThisTime/Private/GameFramework/TopDownGameState.cpp
similarity index 96%
rename from Source/MaybeThisTime/Private/TopDownGameState.cpp
rename to Source/MaybeThisTime/Private/GameFramework/TopDownGameState.cpp
index c1cc4c8..fb7b34c 100644
--- a/Source/MaybeThisTime/Private/TopDownGameState.cpp
+++ b/Source/MaybeThisTime/Private/GameFramework/TopDownGameState.cpp
@@ -1,12 +1,12 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "TopDownGameState.h"
-#include "FactionManager.h"
+#include "GameFramework/TopDownGameState.h"
+#include "Factions/FactionManager.h"
 #include "Net/UnrealNetwork.h"
-#include "BaseUnit.h"
-#include "ZoneActor.h"
-#include "ThirdPersonController.h"
+#include "Units/BaseUnit.h"
+#include "Zones/ZoneActor.h"
+#include "Core/ThirdPersonController.h"
 
 ATopDownGameState::ATopDownGameState()
 {
diff --git a/Source/MaybeThisTime/Private/InteractionInterface.cpp b/Source/MaybeThisTime/Private/Interaction/InteractionInterface.cpp
similarity index 63%
rename from Source/MaybeThisTime/Private/InteractionInterface.cpp
rename to Source/MaybeThisTime/Private/Interaction/InteractionInterface.cpp
index 37264da..22ed7c1 100644
--- a/Source/MaybeThisTime/Private/InteractionInterface.cpp
+++ b/Source/MaybeThisTime/Private/Interaction/InteractionInterface.cpp
@@ -1,4 +1,4 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "InteractionInterface.h"
+#include "Interaction/InteractionInterface.h"
diff --git a/Source/MaybeThisTime/Private/InventoryComponent.cpp b/Source/MaybeThisTime/Private/Items/InventoryComponent.cpp
similarity index 99%
rename from Source/MaybeThisTime/Private/InventoryComponent.cpp
rename to Source/MaybeThisTime/Private/Items/InventoryComponent.cpp
index 6c51551..a6a8a74 100644
--- a/Source/MaybeThisTime/Private/InventoryComponent.cpp
+++ b/Source/MaybeThisTime/Private/Items/InventoryComponent.cpp
@@ -1,10 +1,10 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "InventoryComponent.h"
+#include "Items/InventoryComponent.h"
 #include "Net/UnrealNetwork.h"
-#include "BaseCharacter.h"
-#include "MyGameplayTags.h"
+#include "Units/BaseCharacter.h"
+#include "Core/MyGameplayTags.h"
 
 // Sets default values for this component's properties
 UInventoryComponent::UInventoryComponent()
diff --git a/Source/MaybeThisTime/Private/InventoryInterface.cpp b/Source/MaybeThisTime/Private/Items/InventoryInterface.cpp
similarity index 68%
rename from Source/MaybeThisTime/Private/InventoryInterface.cpp
rename to Source/MaybeThisTime/Private/Items/InventoryInterface.cpp
index ba30cde..cdf30b3 100644
--- a/Source/MaybeThisTime/Private/InventoryInterface.cpp
+++ b/Source/MaybeThisTime/Private/Items/InventoryInterface.cpp
@@ -1,5 +1,5 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "InventoryInterface.h"
+#include "Items/InventoryInterface.h"
 
diff --git a/Source/MaybeThisTime/Private/ItemActor.cpp b/Source/MaybeThisTime/Private/Items/ItemActor.cpp
similarity index 95%
rename from Source/MaybeThisTime/Private/ItemActor.cpp
rename to Source/MaybeThisTime/Private/Items/ItemActor.cpp
index 6650675..c52fb81 100644
--- a/Source/MaybeThisTime/Private/ItemActor.cpp
+++ b/Source/MaybeThisTime/Private/Items/ItemActor.cpp
@@ -1,10 +1,10 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "ItemActor.h"
+#include "Items/ItemActor.h"
 #include "Net/UnrealNetwork.h"
-#include "BaseCharacter.h"
-#include "InventoryInterface.h"
+#include "Units/BaseCharacter.h"
+#include "Items/InventoryInterface.h"
 
 // Sets default values
 AItemActor::AItemActor()
diff --git a/Source/MaybeThisTime/Private/ItemData.cpp b/Source/MaybeThisTime/Private/Items/ItemData.cpp
similarity index 74%
rename from Source/MaybeThisTime/Private/ItemData.cpp
rename to Source/MaybeThisTime/Private/Items/ItemData.cpp
index 8339fb3..c3cad79 100644
--- a/Source/MaybeThisTime/Private/ItemData.cpp
+++ b/Source/MaybeThisTime/Private/Items/ItemData.cpp
@@ -1,4 +1,4 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "ItemData.h"
+#include "Items/ItemData.h"
diff --git a/Source/MaybeThisTime/Private/ItemDefinition.cpp b/Source/MaybeThisTime/Private/Items/ItemDefinition.cpp
similarity index 70%
rename from Source/MaybeThisTime/Private/ItemDefinition.cpp
rename to Source/MaybeThisTime/Private/Items/ItemDefinition.cpp
index 7e0e05d..ebb3061 100644
--- a/Source/MaybeThisTime/Private/ItemDefinition.cpp
+++ b/Source/MaybeThisTime/Private/Items/ItemDefinition.cpp
@@ -1,5 +1,5 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "ItemDefinition.h"
+#include "Items/ItemDefinition.h"
 
diff --git a/Source/MaybeThisTime/Private/ItemObject.cpp b/Source/MaybeThisTime/Private/Items/ItemObject.cpp
similarity index 97%
rename from Source/MaybeThisTime/Private/ItemObject.cpp
rename to Source/MaybeThisTime/Private/Items/ItemObject.cpp
index 1f6eaca..062c444 100644
--- a/Source/MaybeThisTime/Private/ItemObject.cpp
+++ b/Source/MaybeThisTime/Private/Items/ItemObject.cpp
@@ -1,8 +1,8 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "ItemObject.h"
-#include "MyGameplayTags.h"
+#include "Items/ItemObject.h"
+#include "Core/MyGameplayTags.h"
 #include "Net/UnrealNetwork.h"
 
 UItemObject::UItemObject()
diff --git a/Source/MaybeThisTime/Private/ItemRegistry.cpp b/Source/MaybeThisTime/Private/Items/ItemRegistry.cpp
similarity index 97%
rename from Source/MaybeThisTime/Private/ItemRegistry.cpp
rename to Source/MaybeThisTime/Private/Items/ItemRegistry.cpp
index 41b46de..c8e02fe 100644
--- a/Source/MaybeThisTime/Private/ItemRegistry.cpp
+++ b/Source/MaybeThisTime/Private/Items/ItemRegistry.cpp
@@ -1,5 +1,5 @@
 // ItemRegistry.cpp
-#include "ItemRegistry.h"
+#include "Items/ItemRegistry.h"
 
 void UItemRegistry::Initialize(FSubsystemCollectionBase& Collection)
 {
diff --git a/Source/MaybeThisTime/Private/PlaceableItemActor.cpp b/Source/MaybeThisTime/Private/Items/PlaceableItemActor.cpp
similarity index 93%
rename from Source/MaybeThisTime/Private/PlaceableItemActor.cpp
rename to Source/MaybeThisTime/Private/Items/PlaceableItemActor.cpp
index f31bbcc..a8ba08c 100644
--- a/Source/MaybeThisTime/Private/PlaceableItemActor.cpp
+++ b/Source/MaybeThisTime/Private/Items/PlaceableItemActor.cpp
@@ -1,7 +1,7 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "PlaceableItemActor.h"
+#include "Items/PlaceableItemActor.h"
 
 void APlaceableItemActor::BeginPlay()
 {
diff --git a/Source/MaybeThisTime/Private/OutlinerTypes.cpp b/Source/MaybeThisTime/Private/UI/OutlinerTypes.cpp
similarity index 73%
rename from Source/MaybeThisTime/Private/OutlinerTypes.cpp
rename to Source/MaybeThisTime/Private/UI/OutlinerTypes.cpp
index d3ca64c..670c9b8 100644
--- a/Source/MaybeThisTime/Private/OutlinerTypes.cpp
+++ b/Source/MaybeThisTime/Private/UI/OutlinerTypes.cpp
@@ -1,5 +1,5 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "OutlinerTypes.h"
+#include "UI/OutlinerTypes.h"
 
diff --git a/Source/MaybeThisTime/Private/BaseAttributeSet.cpp b/Source/MaybeThisTime/Private/Units/BaseAttributeSet.cpp
similarity index 99%
rename from Source/MaybeThisTime/Private/BaseAttributeSet.cpp
rename to Source/MaybeThisTime/Private/Units/BaseAttributeSet.cpp
index 26d3ac1..309f4aa 100644
--- a/Source/MaybeThisTime/Private/BaseAttributeSet.cpp
+++ b/Source/MaybeThisTime/Private/Units/BaseAttributeSet.cpp
@@ -1,7 +1,7 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "BaseAttributeSet.h"
+#include "Units/BaseAttributeSet.h"
 #include "Net/UnrealNetwork.h"
 #include "GameplayEffectExtension.h"
 
diff --git a/Source/MaybeThisTime/Private/BaseCharacter.cpp b/Source/MaybeThisTime/Private/Units/BaseCharacter.cpp
similarity index 97%
rename from Source/MaybeThisTime/Private/BaseCharacter.cpp
rename to Source/MaybeThisTime/Private/Units/BaseCharacter.cpp
index d11744c..fa0237d 100644
--- a/Source/MaybeThisTime/Private/BaseCharacter.cpp
+++ b/Source/MaybeThisTime/Private/Units/BaseCharacter.cpp
@@ -1,8 +1,8 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
-#include "BaseCharacter.h"
-#include "InteractionInterface.h"
-#include "ItemData.h"
+#include "Units/BaseCharacter.h"
+#include "Interaction/InteractionInterface.h"
+#include "Items/ItemData.h"
 #include "AbilitySystemComponent.h"
 
 
diff --git a/Source/MaybeThisTime/Private/BaseUnit.cpp b/Source/MaybeThisTime/Private/Units/BaseUnit.cpp
similarity index 98%
rename from Source/MaybeThisTime/Private/BaseUnit.cpp
rename to Source/MaybeThisTime/Private/Units/BaseUnit.cpp
index 6ecbf84..366fd8d 100644
--- a/Source/MaybeThisTime/Private/BaseUnit.cpp
+++ b/Source/MaybeThisTime/Private/Units/BaseUnit.cpp
@@ -1,9 +1,9 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "BaseUnit.h"
+#include "Units/BaseUnit.h"
 #include "Components/CapsuleComponent.h" 
-#include "TopDownGameState.h"
+#include "GameFramework/TopDownGameState.h"
 #include "Net/UnrealNetwork.h"
 #include "Commands/CommandComponent.h"
 
diff --git a/Source/MaybeThisTime/Private/BaseUnitAIController.cpp b/Source/MaybeThisTime/Private/Units/BaseUnitAIController.cpp
similarity index 67%
rename from Source/MaybeThisTime/Private/BaseUnitAIController.cpp
rename to Source/MaybeThisTime/Private/Units/BaseUnitAIController.cpp
index 35b3a1a..1a820f0 100644
--- a/Source/MaybeThisTime/Private/BaseUnitAIController.cpp
+++ b/Source/MaybeThisTime/Private/Units/BaseUnitAIController.cpp
@@ -1,5 +1,5 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "BaseUnitAIController.h"
+#include "Units/BaseUnitAIController.h"
 
diff --git a/Source/MaybeThisTime/Private/PlayerUnit.cpp b/Source/MaybeThisTime/Private/Units/PlayerUnit.cpp
similarity index 85%
rename from Source/MaybeThisTime/Private/PlayerUnit.cpp
rename to Source/MaybeThisTime/Private/Units/PlayerUnit.cpp
index 6789452..06f0751 100644
--- a/Source/MaybeThisTime/Private/PlayerUnit.cpp
+++ b/Source/MaybeThisTime/Private/Units/PlayerUnit.cpp
@@ -1,7 +1,7 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "PlayerUnit.h"
+#include "Units/PlayerUnit.h"
 
 EOutlinerStatus APlayerUnit::GetOutlinerStatus() const
 {
diff --git a/Source/MaybeThisTime/Private/UnitManagerComponent.cpp b/Source/MaybeThisTime/Private/Units/UnitManagerComponent.cpp
similarity index 95%
rename from Source/MaybeThisTime/Private/UnitManagerComponent.cpp
rename to Source/MaybeThisTime/Private/Units/UnitManagerComponent.cpp
index 4649335..8ee4e4b 100644
--- a/Source/MaybeThisTime/Private/UnitManagerComponent.cpp
+++ b/Source/MaybeThisTime/Private/Units/UnitManagerComponent.cpp
@@ -1,9 +1,9 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "UnitManagerComponent.h"
-#include "BaseUnit.h"
-#include "BaseCommands.h"
+#include "Units/UnitManagerComponent.h"
+#include "Units/BaseUnit.h"
+#include "Commands/BaseCommands.h"
 #include "Commands/CommandComponent.h"
 
 UUnitManagerComponent::UUnitManagerComponent()
diff --git a/Source/MaybeThisTime/Private/AModuleActor.cpp b/Source/MaybeThisTime/Private/Zones/AModuleActor.cpp
similarity index 93%
rename from Source/MaybeThisTime/Private/AModuleActor.cpp
rename to Source/MaybeThisTime/Private/Zones/AModuleActor.cpp
index d7654d0..0f55eae 100644
--- a/Source/MaybeThisTime/Private/AModuleActor.cpp
+++ b/Source/MaybeThisTime/Private/Zones/AModuleActor.cpp
@@ -1,7 +1,7 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "AModuleActor.h"
+#include "Zones/AModuleActor.h"
 
 // Sets default values
 AAModuleActor::AAModuleActor()
diff --git a/Source/MaybeThisTime/Private/ModuleActor.cpp b/Source/MaybeThisTime/Private/Zones/ModuleActor.cpp
similarity index 97%
rename from Source/MaybeThisTime/Private/ModuleActor.cpp
rename to Source/MaybeThisTime/Private/Zones/ModuleActor.cpp
index d3b108c..653d66c 100644
--- a/Source/MaybeThisTime/Private/ModuleActor.cpp
+++ b/Source/MaybeThisTime/Private/Zones/ModuleActor.cpp
@@ -1,11 +1,11 @@
 
-#include "ModuleActor.h"
-#include "ZoneActor.h"
-#include "InventoryComponent.h"
-#include "BaseUnit.h"
+#include "Zones/ModuleActor.h"
+#include "Zones/ZoneActor.h"
+#include "Items/InventoryComponent.h"
+#include "Units/BaseUnit.h"
 #include "Net/UnrealNetwork.h"
-#include <ItemData.h>
-#include "ItemRegistry.h"
+#include "Items/ItemData.h"
+#include "Items/ItemRegistry.h"
 
 AModuleActor::AModuleActor()
 {
diff --git a/Source/MaybeThisTime/Private/ModuleDefinition.cpp b/Source/MaybeThisTime/Private/Zones/ModuleDefinition.cpp
similarity index 72%
rename from Source/MaybeThisTime/Private/ModuleDefinition.cpp
rename to Source/MaybeThisTime/Private/Zones/ModuleDefinition.cpp
index f02680b..f6dab77 100644
--- a/Source/MaybeThisTime/Private/ModuleDefinition.cpp
+++ b/Source/MaybeThisTime/Private/Zones/ModuleDefinition.cpp
@@ -2,4 +2,4 @@
 
 #pragma once
 
-#include "ModuleDefinition.h"
+#include "Zones/ModuleDefinition.h"
diff --git a/Source/MaybeThisTime/Private/ZoneActor.cpp b/Source/MaybeThisTime/Private/Zones/ZoneActor.cpp
similarity index 97%
rename from Source/MaybeThisTime/Private/ZoneActor.cpp
rename to Source/MaybeThisTime/Private/Zones/ZoneActor.cpp
index 4f6544c..501e877 100644
--- a/Source/MaybeThisTime/Private/ZoneActor.cpp
+++ b/Source/MaybeThisTime/Private/Zones/ZoneActor.cpp
@@ -1,13 +1,13 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
-#include "ZoneActor.h"
+#include "Zones/ZoneActor.h"
 #include "Components/SphereComponent.h"
-#include "InventoryComponent.h"
-#include "ModuleActor.h"
-#include "TopDownGameState.h"
-#include "FactionManager.h"
+#include "Items/InventoryComponent.h"
+#include "Zones/ModuleActor.h"
+#include "GameFramework/TopDownGameState.h"
+#include "Factions/FactionManager.h"
 #include "Net/UnrealNetwork.h"
-#include "BaseUnit.h"
+#include "Units/BaseUnit.h"
 
 AZoneActor::AZoneActor()
 {
diff --git a/Source/MaybeThisTime/Public/BaseCommand.h b/Source/MaybeThisTime/Public/Commands/BaseCommand.h
similarity index 100%
rename from Source/MaybeThisTime/Public/BaseCommand.h
rename to Source/MaybeThisTime/Public/Commands/BaseCommand.h
diff --git a/Source/MaybeThisTime/Public/BaseCommands.h b/Source/MaybeThisTime/Public/Commands/BaseCommands.h
similarity index 100%
rename from Source/MaybeThisTime/Public/BaseCommands.h
rename to Source/MaybeThisTime/Public/Commands/BaseCommands.h
diff --git a/Source/MaybeThisTime/Public/MyGameplayTags.h b/Source/MaybeThisTime/Public/Core/MyGameplayTags.h
similarity index 100%
rename from Source/MaybeThisTime/Public/MyGameplayTags.h
rename to Source/MaybeThisTime/Public/Core/MyGameplayTags.h
diff --git a/Source/MaybeThisTime/Public/ThirdPersonCharacter.h b/Source/MaybeThisTime/Public/Core/ThirdPersonCharacter.h
similarity index 100%
rename from Source/MaybeThisTime/Public/ThirdPersonCharacter.h
rename to Source/MaybeThisTime/Public/Core/ThirdPersonCharacter.h
diff --git a/Source/MaybeThisTime/Public/ThirdPersonController.h b/Source/MaybeThisTime/Public/Core/ThirdPersonController.h
similarity index 100%
rename from Source/MaybeThisTime/Public/ThirdPersonController.h
rename to Source/MaybeThisTime/Public/Core/ThirdPersonController.h
diff --git a/Source/MaybeThisTime/Public/FactionManager.h b/Source/MaybeThisTime/Public/Factions/FactionManager.h
similarity index 100%
rename from Source/MaybeThisTime/Public/FactionManager.h
rename to Source/MaybeThisTime/Public/Factions/FactionManager.h
diff --git a/Source/MaybeThisTime/Public/TopDownGameMode.h b/Source/MaybeThisTime/Public/GameFramework/TopDownGameMode.h
similarity index 100%
rename from Source/MaybeThisTime/Public/TopDownGameMode.h
rename to Source/MaybeThisTime/Public/GameFramework/TopDownGameMode.h
diff --git a/Source/MaybeThisTime/Public/TopDownGameState.h b/Source/MaybeThisTime/Public/GameFramework/TopDownGameState.h
similarity index 100%
rename from Source/MaybeThisTime/Public/TopDownGameState.h
rename to Source/MaybeThisTime/Public/GameFramework/TopDownGameState.h
diff --git a/Source/MaybeThisTime/Public/InteractionInterface.h b/Source/MaybeThisTime/Public/Interaction/InteractionInterface.h
similarity index 100%
rename from Source/MaybeThisTime/Public/InteractionInterface.h
rename to Source/MaybeThisTime/Public/Interaction/InteractionInterface.h
diff --git a/Source/MaybeThisTime/Public/InventoryComponent.h b/Source/MaybeThisTime/Public/Items/InventoryComponent.h
similarity index 100%
rename from Source/MaybeThisTime/Public/InventoryComponent.h
rename to Source/MaybeThisTime/Public/Items/InventoryComponent.h
diff --git a/Source/MaybeThisTime/Public/InventoryInterface.h b/Source/MaybeThisTime/Public/Items/InventoryInterface.h
similarity index 100%
rename from Source/MaybeThisTime/Public/InventoryInterface.h
rename to Source/MaybeThisTime/Public/Items/InventoryInterface.h
diff --git a/Source/MaybeThisTime/Public/ItemActor.h b/Source/MaybeThisTime/Public/Items/ItemActor.h
similarity index 96%
rename from Source/MaybeThisTime/Public/ItemActor.h
rename to Source/MaybeThisTime/Public/Items/ItemActor.h
index 19d8a15..4309933 100644
--- a/Source/MaybeThisTime/Public/ItemActor.h
+++ b/Source/MaybeThisTime/Public/Items/ItemActor.h
@@ -4,7 +4,7 @@
 
 #include "CoreMinimal.h"
 #include "GameFramework/Actor.h"
-#include "InteractionInterface.h"
+#include "Interaction/InteractionInterface.h"
 #include "ItemData.h"
 #include "ItemActor.generated.h"
 
diff --git a/Source/MaybeThisTime/Public/ItemData.h b/Source/MaybeThisTime/Public/Items/ItemData.h
similarity index 98%
rename from Source/MaybeThisTime/Public/ItemData.h
rename to Source/MaybeThisTime/Public/Items/ItemData.h
index 291ff7c..11b55e3 100644
--- a/Source/MaybeThisTime/Public/ItemData.h
+++ b/Source/MaybeThisTime/Public/Items/ItemData.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "CoreMinimal.h"
 
-#include "MyGameplayTags.h"
+#include "Core/MyGameplayTags.h"
 #include "ItemDefinition.h"
 #include "ItemData.generated.h"
 
diff --git a/Source/MaybeThisTime/Public/ItemDefinition.h b/Source/MaybeThisTime/Public/Items/ItemDefinition.h
similarity index 100%
rename from Source/MaybeThisTime/Public/ItemDefinition.h
rename to Source/MaybeThisTime/Public/Items/ItemDefinition.h
diff --git a/Source/MaybeThisTime/Public/ItemObject.h b/Source/MaybeThisTime/Public/Items/ItemObject.h
similarity index 100%
rename from Source/MaybeThisTime/Public/ItemObject.h
rename to Source/MaybeThisTime/Public/Items/ItemObject.h
diff --git a/Source/MaybeThisTime/Public/ItemRegistry.h b/Source/MaybeThisTime/Public/Items/ItemRegistry.h
similarity index 100%
rename from Source/MaybeThisTime/Public/ItemRegistry.h
rename to Source/MaybeThisTime/Public/Items/ItemRegistry.h
diff --git a/Source/MaybeThisTime/Public/PlaceableItemActor.h b/Source/MaybeThisTime/Public/Items/PlaceableItemActor.h
similarity index 100%
rename from Source/MaybeThisTime/Public/PlaceableItemActor.h
rename to Source/MaybeThisTime/Public/Items/PlaceableItemActor.h
diff --git a/Source/MaybeThisTime/Public/OutlinerTypes.h b/Source/MaybeThisTime/Public/UI/OutlinerTypes.h
similarity index 100%
rename from Source/MaybeThisTime/Public/OutlinerTypes.h
rename to Source/MaybeThisTime/Public/UI/OutlinerTypes.h
diff --git a/Source/MaybeThisTime/Public/BaseAttributeSet.h b/Source/MaybeThisTime/Public/Units/BaseAttributeSet.h
similarity index 100%
rename from Source/MaybeThisTime/Public/BaseAttributeSet.h
rename to Source/MaybeThisTime/Public/Units/BaseAttributeSet.h
diff --git a/Source/MaybeThisTime/Public/BaseCharacter.h b/Source/MaybeThisTime/Public/Units/BaseCharacter.h
similarity index 96%
rename from Source/MaybeThisTime/Public/BaseCharacter.h
rename to Source/MaybeThisTime/Public/Units/BaseCharacter.h
index a459018..9d06a22 100644
--- a/Source/MaybeThisTime/Public/BaseCharacter.h
+++ b/Source/MaybeThisTime/Public/Units/BaseCharacter.h
@@ -6,8 +6,8 @@
 #include "GameFramework/Character.h"
 #include "BaseAttributeSet.h"
 #include "AbilitySystemInterface.h"
-#include "ItemActor.h"
-#include "InventoryComponent.h"
+#include "Items/ItemActor.h"
+#include "Items/InventoryComponent.h"
 #include "BaseCharacter.generated.h"
 
 UCLASS(BlueprintType)
diff --git a/Source/MaybeThisTime/Public/BaseUnit.h b/Source/MaybeThisTime/Public/Units/BaseUnit.h
similarity index 90%
rename from Source/MaybeThisTime/Public/BaseUnit.h
rename to Source/MaybeThisTime/Public/Units/BaseUnit.h
index 6b9c044..fa93eb4 100644
--- a/Source/MaybeThisTime/Public/BaseUnit.h
+++ b/Source/MaybeThisTime/Public/Units/BaseUnit.h
@@ -6,11 +6,11 @@
 #include "GameFramework/Character.h"
 #include "BaseAttributeSet.h"
 #include "AbilitySystemInterface.h"
-#include "InventoryComponent.h"
-#include "BaseCommand.h"
-#include "InventoryInterface.h"
-#include "OutlinerTypes.h"
-#include "InteractionInterface.h"
+#include "Items/InventoryComponent.h"
+#include "Commands/BaseCommand.h"
+#include "Items/InventoryInterface.h"
+#include "UI/OutlinerTypes.h"
+#include "Interaction/InteractionInterface.h"
 #include "BaseUnit.generated.h"
 
 class UCommandComponent;
diff --git a/Source/MaybeThisTime/Public/BaseUnitAIController.h b/Source/MaybeThisTime/Public/Units/BaseUnitAIController.h
similarity index 100%
rename from Source/MaybeThisTime/Public/BaseUnitAIController.h
rename to Source/MaybeThisTime/Public/Units/BaseUnitAIController.h
diff --git a/Source/MaybeThisTime/Public/PlayerUnit.h b/Source/MaybeThisTime/Public/Units/PlayerUnit.h
similarity index 100%
rename from Source/MaybeThisTime/Public/PlayerUnit.h
rename to Source/MaybeThisTime/Public/Units/PlayerUnit.h
diff --git a/Source/MaybeThisTime/Public/UnitManagerComponent.h b/Source/MaybeThisTime/Public/Units/UnitManagerComponent.h
similarity index 100%
rename from Source/MaybeThisTime/Public/UnitManagerComponent.h
rename to Source/MaybeThisTime/Public/Units/UnitManagerComponent.h
diff --git a/Source/MaybeThisTime/Public/AModuleActor.h b/Source/MaybeThisTime/Public/Zones/AModuleActor.h
similarity index 100%
rename from Source/MaybeThisTime/Public/AModuleActor.h
rename to Source/MaybeThisTime/Public/Zones/AModuleActor.h
diff --git a/Source/MaybeThisTime/Public/ModuleActor.h b/Source/MaybeThisTime/Public/Zones/ModuleActor.h
similarity index 99%
rename from Source/MaybeThisTime/Public/ModuleActor.h
rename to Source/MaybeThisTime/Public/Zones/ModuleActor.h
index 3bcd077..23c883f 100644
--- a/Source/MaybeThisTime/Public/ModuleActor.h
+++ b/Source/MaybeThisTime/Public/Zones/ModuleActor.h
@@ -5,7 +5,7 @@
 #include "CoreMinimal.h"
 #include "GameFramework/Actor.h"
 #include "ModuleDefinition.h"
-#include "OutlinerTypes.h"
+#include "UI/OutlinerTypes.h"
 #include "ModuleActor.generated.h"
 
 class UInventoryComponent;
diff --git a/Source/MaybeThisTime/Public/ModuleDefinition.h b/Source/MaybeThisTime/Public/Zones/ModuleDefinition.h
similarity index 100%
rename from Source/MaybeThisTime/Public/ModuleDefinition.h
rename to Source/MaybeThisTime/Public/Zones/ModuleDefinition.h
diff --git a/Source/MaybeThisTime/Public/ZoneActor.h b/Source/MaybeThisTime/Public/Zones/ZoneActor.h
similarity index 98%
rename from Source/MaybeThisTime/Public/ZoneActor.h
rename to Source/MaybeThisTime/Public/Zones/ZoneActor.h
index 74724df..326a3c1 100644
--- a/Source/MaybeThisTime/Public/ZoneActor.h
+++ b/Source/MaybeThisTime/Public/Zones/ZoneActor.h
@@ -4,8 +4,8 @@
 
 #include "CoreMinimal.h"
 #include "GameFramework/Actor.h"
-#include "InventoryInterface.h"
-#include "OutlinerTypes.h"
+#include "Items/InventoryInterface.h"
+#include "UI/OutlinerTypes.h"
 #include "ZoneActor.generated.h"
 
 class AModuleActor;