diff --git a/sources/Acedia.uc b/sources/Core/Acedia.uc
similarity index 100%
rename from sources/Acedia.uc
rename to sources/Core/Acedia.uc
diff --git a/sources/AcediaActor.uc b/sources/Core/AcediaActor.uc
similarity index 100%
rename from sources/AcediaActor.uc
rename to sources/Core/AcediaActor.uc
diff --git a/sources/AcediaObject.uc b/sources/Core/AcediaObject.uc
similarity index 100%
rename from sources/AcediaObject.uc
rename to sources/Core/AcediaObject.uc
diff --git a/sources/AcediaReplicationInfo.uc b/sources/Core/AcediaReplicationInfo.uc
similarity index 100%
rename from sources/AcediaReplicationInfo.uc
rename to sources/Core/AcediaReplicationInfo.uc
diff --git a/sources/Data/JArray.uc b/sources/Core/Data/JSON/JArray.uc
similarity index 100%
rename from sources/Data/JArray.uc
rename to sources/Core/Data/JSON/JArray.uc
diff --git a/sources/Data/JObject.uc b/sources/Core/Data/JSON/JObject.uc
similarity index 100%
rename from sources/Data/JObject.uc
rename to sources/Core/Data/JSON/JObject.uc
diff --git a/sources/Data/JSON.uc b/sources/Core/Data/JSON/JSON.uc
similarity index 100%
rename from sources/Data/JSON.uc
rename to sources/Core/Data/JSON/JSON.uc
diff --git a/sources/Data/JSONAPI.uc b/sources/Core/Data/JSON/JSONAPI.uc
similarity index 100%
rename from sources/Data/JSONAPI.uc
rename to sources/Core/Data/JSON/JSONAPI.uc
diff --git a/sources/Data/TEST_JSON.uc b/sources/Core/Data/JSON/Tests/TEST_JSON.uc
similarity index 100%
rename from sources/Data/TEST_JSON.uc
rename to sources/Core/Data/JSON/Tests/TEST_JSON.uc
diff --git a/sources/BroadcastEvents.uc b/sources/Core/Events/Broadcast/BroadcastEvents.uc
similarity index 100%
rename from sources/BroadcastEvents.uc
rename to sources/Core/Events/Broadcast/BroadcastEvents.uc
diff --git a/sources/BroadcastHandler.uc b/sources/Core/Events/Broadcast/BroadcastHandler.uc
similarity index 100%
rename from sources/BroadcastHandler.uc
rename to sources/Core/Events/Broadcast/BroadcastHandler.uc
diff --git a/sources/BroadcastListenerBase.uc b/sources/Core/Events/Broadcast/BroadcastListenerBase.uc
similarity index 100%
rename from sources/BroadcastListenerBase.uc
rename to sources/Core/Events/Broadcast/BroadcastListenerBase.uc
diff --git a/sources/Events.uc b/sources/Core/Events/Events.uc
similarity index 100%
rename from sources/Events.uc
rename to sources/Core/Events/Events.uc
diff --git a/sources/Listener.uc b/sources/Core/Events/Listener.uc
similarity index 100%
rename from sources/Listener.uc
rename to sources/Core/Events/Listener.uc
diff --git a/sources/MutatorEvents.uc b/sources/Core/Events/Mutator/MutatorEvents.uc
similarity index 100%
rename from sources/MutatorEvents.uc
rename to sources/Core/Events/Mutator/MutatorEvents.uc
diff --git a/sources/MutatorListenerBase.uc b/sources/Core/Events/Mutator/MutatorListenerBase.uc
similarity index 100%
rename from sources/MutatorListenerBase.uc
rename to sources/Core/Events/Mutator/MutatorListenerBase.uc
diff --git a/sources/Feature.uc b/sources/Core/Feature.uc
similarity index 100%
rename from sources/Feature.uc
rename to sources/Core/Feature.uc
diff --git a/sources/Service.uc b/sources/Core/Service.uc
similarity index 100%
rename from sources/Service.uc
rename to sources/Core/Service.uc
diff --git a/sources/Singleton.uc b/sources/Core/Singleton.uc
similarity index 100%
rename from sources/Singleton.uc
rename to sources/Core/Singleton.uc
diff --git a/sources/StartUp.uc b/sources/Core/StartUp.uc
similarity index 100%
rename from sources/StartUp.uc
rename to sources/Core/StartUp.uc
diff --git a/sources/TestCase.uc b/sources/Core/Testing/TestCase.uc
similarity index 100%
rename from sources/TestCase.uc
rename to sources/Core/Testing/TestCase.uc