diff --git a/src/server/game/Grids/Cell.h b/src/server/game/Grids/Cells/Cell.h
similarity index 100%
rename from src/server/game/Grids/Cell.h
rename to src/server/game/Grids/Cells/Cell.h
diff --git a/src/server/game/Grids/CellImpl.h b/src/server/game/Grids/Cells/CellImpl.h
similarity index 100%
rename from src/server/game/Grids/CellImpl.h
rename to src/server/game/Grids/Cells/CellImpl.h
diff --git a/src/server/framework/GameSystem/Grid.h b/src/server/game/Grids/Grid.h
similarity index 100%
rename from src/server/framework/GameSystem/Grid.h
rename to src/server/game/Grids/Grid.h
diff --git a/src/server/framework/GameSystem/GridLoader.h b/src/server/game/Grids/GridLoader.h
similarity index 100%
rename from src/server/framework/GameSystem/GridLoader.h
rename to src/server/game/Grids/GridLoader.h
diff --git a/src/server/framework/GameSystem/GridRefManager.h b/src/server/game/Grids/GridRefManager.h
similarity index 100%
rename from src/server/framework/GameSystem/GridRefManager.h
rename to src/server/game/Grids/GridRefManager.h
diff --git a/src/server/framework/GameSystem/GridReference.h b/src/server/game/Grids/GridReference.h
similarity index 100%
rename from src/server/framework/GameSystem/GridReference.h
rename to src/server/game/Grids/GridReference.h
diff --git a/src/server/framework/GameSystem/NGrid.h b/src/server/game/Grids/NGrid.h
similarity index 100%
rename from src/server/framework/GameSystem/NGrid.h
rename to src/server/game/Grids/NGrid.h
diff --git a/src/server/game/Grids/GridNotifiers.cpp b/src/server/game/Grids/Notifiers/GridNotifiers.cpp
similarity index 100%
rename from src/server/game/Grids/GridNotifiers.cpp
rename to src/server/game/Grids/Notifiers/GridNotifiers.cpp
diff --git a/src/server/game/Grids/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h
similarity index 100%
rename from src/server/game/Grids/GridNotifiers.h
rename to src/server/game/Grids/Notifiers/GridNotifiers.h
diff --git a/src/server/game/Grids/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
similarity index 100%
rename from src/server/game/Grids/GridNotifiersImpl.h
rename to src/server/game/Grids/Notifiers/GridNotifiersImpl.h
diff --git a/src/server/framework/Platform/CompilerDefs.h b/src/server/shared/CompilerDefs.h
similarity index 100%
rename from src/server/framework/Platform/CompilerDefs.h
rename to src/server/shared/CompilerDefs.h
diff --git a/src/server/framework/Platform/Define.h b/src/server/shared/Define.h
similarity index 100%
rename from src/server/framework/Platform/Define.h
rename to src/server/shared/Define.h
diff --git a/src/server/framework/Utilities/CountedReference/Reference.h b/src/server/shared/Dynamic/CountedReference/Reference.h
similarity index 100%
rename from src/server/framework/Utilities/CountedReference/Reference.h
rename to src/server/shared/Dynamic/CountedReference/Reference.h
diff --git a/src/server/framework/Utilities/CountedReference/ReferenceHolder.h b/src/server/shared/Dynamic/CountedReference/ReferenceHolder.h
similarity index 100%
rename from src/server/framework/Utilities/CountedReference/ReferenceHolder.h
rename to src/server/shared/Dynamic/CountedReference/ReferenceHolder.h
diff --git a/src/server/framework/Utilities/CountedReference/ReferenceImpl.h b/src/server/shared/Dynamic/CountedReference/ReferenceImpl.h
similarity index 100%
rename from src/server/framework/Utilities/CountedReference/ReferenceImpl.h
rename to src/server/shared/Dynamic/CountedReference/ReferenceImpl.h
diff --git a/src/server/framework/Dynamic/FactoryHolder.h b/src/server/shared/Dynamic/FactoryHolder.h
similarity index 100%
rename from src/server/framework/Dynamic/FactoryHolder.h
rename to src/server/shared/Dynamic/FactoryHolder.h
diff --git a/src/server/framework/Utilities/LinkedList.h b/src/server/shared/Dynamic/LinkedList.h
similarity index 100%
rename from src/server/framework/Utilities/LinkedList.h
rename to src/server/shared/Dynamic/LinkedList.h
diff --git a/src/server/framework/Utilities/LinkedReference/RefManager.h b/src/server/shared/Dynamic/LinkedReference/RefManager.h
similarity index 100%
rename from src/server/framework/Utilities/LinkedReference/RefManager.h
rename to src/server/shared/Dynamic/LinkedReference/RefManager.h
diff --git a/src/server/framework/Utilities/LinkedReference/Reference.h b/src/server/shared/Dynamic/LinkedReference/Reference.h
similarity index 100%
rename from src/server/framework/Utilities/LinkedReference/Reference.h
rename to src/server/shared/Dynamic/LinkedReference/Reference.h
diff --git a/src/server/framework/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h
similarity index 100%
rename from src/server/framework/Dynamic/ObjectRegistry.h
rename to src/server/shared/Dynamic/ObjectRegistry.h
diff --git a/src/server/framework/GameSystem/TypeContainer.h b/src/server/shared/Dynamic/TypeContainer.h
similarity index 100%
rename from src/server/framework/GameSystem/TypeContainer.h
rename to src/server/shared/Dynamic/TypeContainer.h
diff --git a/src/server/framework/GameSystem/TypeContainerFunctions.h b/src/server/shared/Dynamic/TypeContainerFunctions.h
similarity index 100%
rename from src/server/framework/GameSystem/TypeContainerFunctions.h
rename to src/server/shared/Dynamic/TypeContainerFunctions.h
diff --git a/src/server/framework/GameSystem/TypeContainerFunctionsPtr.h b/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h
similarity index 100%
rename from src/server/framework/GameSystem/TypeContainerFunctionsPtr.h
rename to src/server/shared/Dynamic/TypeContainerFunctionsPtr.h
diff --git a/src/server/framework/GameSystem/TypeContainerVisitor.h b/src/server/shared/Dynamic/TypeContainerVisitor.h
similarity index 100%
rename from src/server/framework/GameSystem/TypeContainerVisitor.h
rename to src/server/shared/Dynamic/TypeContainerVisitor.h
diff --git a/src/server/framework/Utilities/TypeList.h b/src/server/shared/Dynamic/TypeList.h
similarity index 100%
rename from src/server/framework/Utilities/TypeList.h
rename to src/server/shared/Dynamic/TypeList.h
diff --git a/src/server/framework/Utilities/UnorderedMap.h b/src/server/shared/Dynamic/UnorderedMap.h
similarity index 100%
rename from src/server/framework/Utilities/UnorderedMap.h
rename to src/server/shared/Dynamic/UnorderedMap.h
diff --git a/src/server/framework/Policies/CreationPolicy.h b/src/server/shared/Policies/CreationPolicy.h
similarity index 100%
rename from src/server/framework/Policies/CreationPolicy.h
rename to src/server/shared/Policies/CreationPolicy.h
diff --git a/src/server/framework/Policies/ObjectLifeTime.cpp b/src/server/shared/Policies/ObjectLifeTime.cpp
similarity index 100%
rename from src/server/framework/Policies/ObjectLifeTime.cpp
rename to src/server/shared/Policies/ObjectLifeTime.cpp
diff --git a/src/server/framework/Policies/ObjectLifeTime.h b/src/server/shared/Policies/ObjectLifeTime.h
similarity index 100%
rename from src/server/framework/Policies/ObjectLifeTime.h
rename to src/server/shared/Policies/ObjectLifeTime.h
diff --git a/src/server/framework/Policies/Singleton.h b/src/server/shared/Policies/Singleton.h
similarity index 100%
rename from src/server/framework/Policies/Singleton.h
rename to src/server/shared/Policies/Singleton.h
diff --git a/src/server/framework/Policies/SingletonImp.h b/src/server/shared/Policies/SingletonImp.h
similarity index 100%
rename from src/server/framework/Policies/SingletonImp.h
rename to src/server/shared/Policies/SingletonImp.h
diff --git a/src/server/framework/Policies/ThreadingModel.h b/src/server/shared/Policies/ThreadingModel.h
similarity index 100%
rename from src/server/framework/Policies/ThreadingModel.h
rename to src/server/shared/Policies/ThreadingModel.h
diff --git a/src/server/framework/Utilities/Callback.h b/src/server/shared/Threading/Callback.h
similarity index 100%
rename from src/server/framework/Utilities/Callback.h
rename to src/server/shared/Threading/Callback.h
diff --git a/src/server/framework/Utilities/ByteConverter.h b/src/server/shared/Utilities/ByteConverter.h
similarity index 100%
rename from src/server/framework/Utilities/ByteConverter.h
rename to src/server/shared/Utilities/ByteConverter.h
diff --git a/src/server/framework/Utilities/EventProcessor.cpp b/src/server/shared/Utilities/EventProcessor.cpp
similarity index 100%
rename from src/server/framework/Utilities/EventProcessor.cpp
rename to src/server/shared/Utilities/EventProcessor.cpp
diff --git a/src/server/framework/Utilities/EventProcessor.h b/src/server/shared/Utilities/EventProcessor.h
similarity index 100%
rename from src/server/framework/Utilities/EventProcessor.h
rename to src/server/shared/Utilities/EventProcessor.h
diff --git a/src/server/framework/Network/SocketDefines.h b/src/server/worldserver/RemoteAccess/SocketDefines.h
similarity index 100%
rename from src/server/framework/Network/SocketDefines.h
rename to src/server/worldserver/RemoteAccess/SocketDefines.h