diff --git a/Code/Sandbox/Editor/2DViewport.cpp b/Code/Editor/2DViewport.cpp
similarity index 100%
rename from Code/Sandbox/Editor/2DViewport.cpp
rename to Code/Editor/2DViewport.cpp
diff --git a/Code/Sandbox/Editor/2DViewport.h b/Code/Editor/2DViewport.h
similarity index 100%
rename from Code/Sandbox/Editor/2DViewport.h
rename to Code/Editor/2DViewport.h
diff --git a/Code/Sandbox/Editor/AboutDialog.cpp b/Code/Editor/AboutDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/AboutDialog.cpp
rename to Code/Editor/AboutDialog.cpp
diff --git a/Code/Sandbox/Editor/AboutDialog.h b/Code/Editor/AboutDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/AboutDialog.h
rename to Code/Editor/AboutDialog.h
diff --git a/Code/Sandbox/Editor/AboutDialog.ui b/Code/Editor/AboutDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/AboutDialog.ui
rename to Code/Editor/AboutDialog.ui
diff --git a/Code/Sandbox/Editor/ActionManager.cpp b/Code/Editor/ActionManager.cpp
similarity index 100%
rename from Code/Sandbox/Editor/ActionManager.cpp
rename to Code/Editor/ActionManager.cpp
diff --git a/Code/Sandbox/Editor/ActionManager.h b/Code/Editor/ActionManager.h
similarity index 100%
rename from Code/Sandbox/Editor/ActionManager.h
rename to Code/Editor/ActionManager.h
diff --git a/Code/Sandbox/Editor/Animation/AnimationBipedBoneNames.cpp b/Code/Editor/Animation/AnimationBipedBoneNames.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Animation/AnimationBipedBoneNames.cpp
rename to Code/Editor/Animation/AnimationBipedBoneNames.cpp
diff --git a/Code/Sandbox/Editor/Animation/AnimationBipedBoneNames.h b/Code/Editor/Animation/AnimationBipedBoneNames.h
similarity index 100%
rename from Code/Sandbox/Editor/Animation/AnimationBipedBoneNames.h
rename to Code/Editor/Animation/AnimationBipedBoneNames.h
diff --git a/Code/Sandbox/Editor/Animation/SkeletonHierarchy.cpp b/Code/Editor/Animation/SkeletonHierarchy.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Animation/SkeletonHierarchy.cpp
rename to Code/Editor/Animation/SkeletonHierarchy.cpp
diff --git a/Code/Sandbox/Editor/Animation/SkeletonHierarchy.h b/Code/Editor/Animation/SkeletonHierarchy.h
similarity index 100%
rename from Code/Sandbox/Editor/Animation/SkeletonHierarchy.h
rename to Code/Editor/Animation/SkeletonHierarchy.h
diff --git a/Code/Sandbox/Editor/Animation/SkeletonMapper.cpp b/Code/Editor/Animation/SkeletonMapper.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Animation/SkeletonMapper.cpp
rename to Code/Editor/Animation/SkeletonMapper.cpp
diff --git a/Code/Sandbox/Editor/Animation/SkeletonMapper.h b/Code/Editor/Animation/SkeletonMapper.h
similarity index 100%
rename from Code/Sandbox/Editor/Animation/SkeletonMapper.h
rename to Code/Editor/Animation/SkeletonMapper.h
diff --git a/Code/Sandbox/Editor/Animation/SkeletonMapperOperator.cpp b/Code/Editor/Animation/SkeletonMapperOperator.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Animation/SkeletonMapperOperator.cpp
rename to Code/Editor/Animation/SkeletonMapperOperator.cpp
diff --git a/Code/Sandbox/Editor/Animation/SkeletonMapperOperator.h b/Code/Editor/Animation/SkeletonMapperOperator.h
similarity index 100%
rename from Code/Sandbox/Editor/Animation/SkeletonMapperOperator.h
rename to Code/Editor/Animation/SkeletonMapperOperator.h
diff --git a/Code/Sandbox/Editor/AnimationContext.cpp b/Code/Editor/AnimationContext.cpp
similarity index 100%
rename from Code/Sandbox/Editor/AnimationContext.cpp
rename to Code/Editor/AnimationContext.cpp
diff --git a/Code/Sandbox/Editor/AnimationContext.cpp.rej b/Code/Editor/AnimationContext.cpp.rej
similarity index 100%
rename from Code/Sandbox/Editor/AnimationContext.cpp.rej
rename to Code/Editor/AnimationContext.cpp.rej
diff --git a/Code/Sandbox/Editor/AnimationContext.h b/Code/Editor/AnimationContext.h
similarity index 100%
rename from Code/Sandbox/Editor/AnimationContext.h
rename to Code/Editor/AnimationContext.h
diff --git a/Code/Sandbox/Editor/AssetDatabase/AssetDatabaseLocationListener.cpp b/Code/Editor/AssetDatabase/AssetDatabaseLocationListener.cpp
similarity index 100%
rename from Code/Sandbox/Editor/AssetDatabase/AssetDatabaseLocationListener.cpp
rename to Code/Editor/AssetDatabase/AssetDatabaseLocationListener.cpp
diff --git a/Code/Sandbox/Editor/AssetDatabase/AssetDatabaseLocationListener.h b/Code/Editor/AssetDatabase/AssetDatabaseLocationListener.h
similarity index 100%
rename from Code/Sandbox/Editor/AssetDatabase/AssetDatabaseLocationListener.h
rename to Code/Editor/AssetDatabase/AssetDatabaseLocationListener.h
diff --git a/Code/Sandbox/Editor/AssetEditor/AssetEditorRequestsHandler.cpp b/Code/Editor/AssetEditor/AssetEditorRequestsHandler.cpp
similarity index 100%
rename from Code/Sandbox/Editor/AssetEditor/AssetEditorRequestsHandler.cpp
rename to Code/Editor/AssetEditor/AssetEditorRequestsHandler.cpp
diff --git a/Code/Sandbox/Editor/AssetEditor/AssetEditorRequestsHandler.h b/Code/Editor/AssetEditor/AssetEditorRequestsHandler.h
similarity index 100%
rename from Code/Sandbox/Editor/AssetEditor/AssetEditorRequestsHandler.h
rename to Code/Editor/AssetEditor/AssetEditorRequestsHandler.h
diff --git a/Code/Sandbox/Editor/AssetEditor/AssetEditorWindow.cpp b/Code/Editor/AssetEditor/AssetEditorWindow.cpp
similarity index 100%
rename from Code/Sandbox/Editor/AssetEditor/AssetEditorWindow.cpp
rename to Code/Editor/AssetEditor/AssetEditorWindow.cpp
diff --git a/Code/Sandbox/Editor/AssetEditor/AssetEditorWindow.h b/Code/Editor/AssetEditor/AssetEditorWindow.h
similarity index 100%
rename from Code/Sandbox/Editor/AssetEditor/AssetEditorWindow.h
rename to Code/Editor/AssetEditor/AssetEditorWindow.h
diff --git a/Code/Sandbox/Editor/AssetEditor/AssetEditorWindow.ui b/Code/Editor/AssetEditor/AssetEditorWindow.ui
similarity index 100%
rename from Code/Sandbox/Editor/AssetEditor/AssetEditorWindow.ui
rename to Code/Editor/AssetEditor/AssetEditorWindow.ui
diff --git a/Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.cpp b/Code/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.cpp
similarity index 100%
rename from Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.cpp
rename to Code/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.cpp
diff --git a/Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.h b/Code/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.h
similarity index 100%
rename from Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.h
rename to Code/Editor/AssetImporter/AssetImporterManager/AssetImporterDragAndDropHandler.h
diff --git a/Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.cpp b/Code/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.cpp
similarity index 100%
rename from Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.cpp
rename to Code/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.cpp
diff --git a/Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.h b/Code/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.h
similarity index 100%
rename from Code/Sandbox/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.h
rename to Code/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.h
diff --git a/Code/Sandbox/Editor/AssetImporter/UI/FilesAlreadyExistDialog.cpp b/Code/Editor/AssetImporter/UI/FilesAlreadyExistDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/AssetImporter/UI/FilesAlreadyExistDialog.cpp
rename to Code/Editor/AssetImporter/UI/FilesAlreadyExistDialog.cpp
diff --git a/Code/Sandbox/Editor/AssetImporter/UI/FilesAlreadyExistDialog.h b/Code/Editor/AssetImporter/UI/FilesAlreadyExistDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/AssetImporter/UI/FilesAlreadyExistDialog.h
rename to Code/Editor/AssetImporter/UI/FilesAlreadyExistDialog.h
diff --git a/Code/Sandbox/Editor/AssetImporter/UI/FilesAlreadyExistDialog.ui b/Code/Editor/AssetImporter/UI/FilesAlreadyExistDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/AssetImporter/UI/FilesAlreadyExistDialog.ui
rename to Code/Editor/AssetImporter/UI/FilesAlreadyExistDialog.ui
diff --git a/Code/Sandbox/Editor/AssetImporter/UI/ProcessingAssetsDialog.cpp b/Code/Editor/AssetImporter/UI/ProcessingAssetsDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/AssetImporter/UI/ProcessingAssetsDialog.cpp
rename to Code/Editor/AssetImporter/UI/ProcessingAssetsDialog.cpp
diff --git a/Code/Sandbox/Editor/AssetImporter/UI/ProcessingAssetsDialog.h b/Code/Editor/AssetImporter/UI/ProcessingAssetsDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/AssetImporter/UI/ProcessingAssetsDialog.h
rename to Code/Editor/AssetImporter/UI/ProcessingAssetsDialog.h
diff --git a/Code/Sandbox/Editor/AssetImporter/UI/ProcessingAssetsDialog.ui b/Code/Editor/AssetImporter/UI/ProcessingAssetsDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/AssetImporter/UI/ProcessingAssetsDialog.ui
rename to Code/Editor/AssetImporter/UI/ProcessingAssetsDialog.ui
diff --git a/Code/Sandbox/Editor/AssetImporter/UI/SelectDestinationDialog.cpp b/Code/Editor/AssetImporter/UI/SelectDestinationDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/AssetImporter/UI/SelectDestinationDialog.cpp
rename to Code/Editor/AssetImporter/UI/SelectDestinationDialog.cpp
diff --git a/Code/Sandbox/Editor/AssetImporter/UI/SelectDestinationDialog.h b/Code/Editor/AssetImporter/UI/SelectDestinationDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/AssetImporter/UI/SelectDestinationDialog.h
rename to Code/Editor/AssetImporter/UI/SelectDestinationDialog.h
diff --git a/Code/Sandbox/Editor/AssetImporter/UI/SelectDestinationDialog.ui b/Code/Editor/AssetImporter/UI/SelectDestinationDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/AssetImporter/UI/SelectDestinationDialog.ui
rename to Code/Editor/AssetImporter/UI/SelectDestinationDialog.ui
diff --git a/Code/Sandbox/Editor/AzAssetBrowser/AssetBrowserWindow.cpp b/Code/Editor/AzAssetBrowser/AssetBrowserWindow.cpp
similarity index 100%
rename from Code/Sandbox/Editor/AzAssetBrowser/AssetBrowserWindow.cpp
rename to Code/Editor/AzAssetBrowser/AssetBrowserWindow.cpp
diff --git a/Code/Sandbox/Editor/AzAssetBrowser/AssetBrowserWindow.h b/Code/Editor/AzAssetBrowser/AssetBrowserWindow.h
similarity index 100%
rename from Code/Sandbox/Editor/AzAssetBrowser/AssetBrowserWindow.h
rename to Code/Editor/AzAssetBrowser/AssetBrowserWindow.h
diff --git a/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp b/Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp
similarity index 100%
rename from Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp
rename to Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp
diff --git a/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.h b/Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.h
similarity index 100%
rename from Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.h
rename to Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.h
diff --git a/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp b/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp
similarity index 100%
rename from Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp
rename to Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp
diff --git a/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.h b/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.h
similarity index 100%
rename from Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.h
rename to Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.h
diff --git a/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.ui b/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.ui
similarity index 100%
rename from Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserWindow.ui
rename to Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.ui
diff --git a/Code/Sandbox/Editor/BaseLibrary.cpp b/Code/Editor/BaseLibrary.cpp
similarity index 100%
rename from Code/Sandbox/Editor/BaseLibrary.cpp
rename to Code/Editor/BaseLibrary.cpp
diff --git a/Code/Sandbox/Editor/BaseLibrary.h b/Code/Editor/BaseLibrary.h
similarity index 100%
rename from Code/Sandbox/Editor/BaseLibrary.h
rename to Code/Editor/BaseLibrary.h
diff --git a/Code/Sandbox/Editor/BaseLibraryItem.cpp b/Code/Editor/BaseLibraryItem.cpp
similarity index 100%
rename from Code/Sandbox/Editor/BaseLibraryItem.cpp
rename to Code/Editor/BaseLibraryItem.cpp
diff --git a/Code/Sandbox/Editor/BaseLibraryItem.h b/Code/Editor/BaseLibraryItem.h
similarity index 100%
rename from Code/Sandbox/Editor/BaseLibraryItem.h
rename to Code/Editor/BaseLibraryItem.h
diff --git a/Code/Sandbox/Editor/BaseLibraryManager.cpp b/Code/Editor/BaseLibraryManager.cpp
similarity index 100%
rename from Code/Sandbox/Editor/BaseLibraryManager.cpp
rename to Code/Editor/BaseLibraryManager.cpp
diff --git a/Code/Sandbox/Editor/BaseLibraryManager.h b/Code/Editor/BaseLibraryManager.h
similarity index 100%
rename from Code/Sandbox/Editor/BaseLibraryManager.h
rename to Code/Editor/BaseLibraryManager.h
diff --git a/Code/Sandbox/Editor/CMakeLists.txt b/Code/Editor/CMakeLists.txt
similarity index 100%
rename from Code/Sandbox/Editor/CMakeLists.txt
rename to Code/Editor/CMakeLists.txt
diff --git a/Code/Sandbox/Editor/CVarMenu.cpp b/Code/Editor/CVarMenu.cpp
similarity index 100%
rename from Code/Sandbox/Editor/CVarMenu.cpp
rename to Code/Editor/CVarMenu.cpp
diff --git a/Code/Sandbox/Editor/CVarMenu.h b/Code/Editor/CVarMenu.h
similarity index 100%
rename from Code/Sandbox/Editor/CVarMenu.h
rename to Code/Editor/CVarMenu.h
diff --git a/Code/Sandbox/Editor/CheckOutDialog.cpp b/Code/Editor/CheckOutDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/CheckOutDialog.cpp
rename to Code/Editor/CheckOutDialog.cpp
diff --git a/Code/Sandbox/Editor/CheckOutDialog.h b/Code/Editor/CheckOutDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/CheckOutDialog.h
rename to Code/Editor/CheckOutDialog.h
diff --git a/Code/Sandbox/Editor/CheckOutDialog.ui b/Code/Editor/CheckOutDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/CheckOutDialog.ui
rename to Code/Editor/CheckOutDialog.ui
diff --git a/Code/Sandbox/Editor/Clipboard.cpp b/Code/Editor/Clipboard.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Clipboard.cpp
rename to Code/Editor/Clipboard.cpp
diff --git a/Code/Sandbox/Editor/Clipboard.h b/Code/Editor/Clipboard.h
similarity index 100%
rename from Code/Sandbox/Editor/Clipboard.h
rename to Code/Editor/Clipboard.h
diff --git a/Code/Sandbox/Editor/Commands/CommandManager.cpp b/Code/Editor/Commands/CommandManager.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Commands/CommandManager.cpp
rename to Code/Editor/Commands/CommandManager.cpp
diff --git a/Code/Sandbox/Editor/Commands/CommandManager.h b/Code/Editor/Commands/CommandManager.h
similarity index 100%
rename from Code/Sandbox/Editor/Commands/CommandManager.h
rename to Code/Editor/Commands/CommandManager.h
diff --git a/Code/Sandbox/Editor/Commands/CommandManagerBus.h b/Code/Editor/Commands/CommandManagerBus.h
similarity index 100%
rename from Code/Sandbox/Editor/Commands/CommandManagerBus.h
rename to Code/Editor/Commands/CommandManagerBus.h
diff --git a/Code/Sandbox/Editor/Common/spline_edit-00.png b/Code/Editor/Common/spline_edit-00.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-00.png
rename to Code/Editor/Common/spline_edit-00.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-01.png b/Code/Editor/Common/spline_edit-01.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-01.png
rename to Code/Editor/Common/spline_edit-01.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-02.png b/Code/Editor/Common/spline_edit-02.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-02.png
rename to Code/Editor/Common/spline_edit-02.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-03.png b/Code/Editor/Common/spline_edit-03.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-03.png
rename to Code/Editor/Common/spline_edit-03.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-04.png b/Code/Editor/Common/spline_edit-04.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-04.png
rename to Code/Editor/Common/spline_edit-04.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-05.png b/Code/Editor/Common/spline_edit-05.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-05.png
rename to Code/Editor/Common/spline_edit-05.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-06.png b/Code/Editor/Common/spline_edit-06.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-06.png
rename to Code/Editor/Common/spline_edit-06.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-07.png b/Code/Editor/Common/spline_edit-07.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-07.png
rename to Code/Editor/Common/spline_edit-07.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-08.png b/Code/Editor/Common/spline_edit-08.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-08.png
rename to Code/Editor/Common/spline_edit-08.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-09.png b/Code/Editor/Common/spline_edit-09.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-09.png
rename to Code/Editor/Common/spline_edit-09.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-10.png b/Code/Editor/Common/spline_edit-10.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-10.png
rename to Code/Editor/Common/spline_edit-10.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-11.png b/Code/Editor/Common/spline_edit-11.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-11.png
rename to Code/Editor/Common/spline_edit-11.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-12.png b/Code/Editor/Common/spline_edit-12.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-12.png
rename to Code/Editor/Common/spline_edit-12.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-13.png b/Code/Editor/Common/spline_edit-13.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-13.png
rename to Code/Editor/Common/spline_edit-13.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-14.png b/Code/Editor/Common/spline_edit-14.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-14.png
rename to Code/Editor/Common/spline_edit-14.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-15.png b/Code/Editor/Common/spline_edit-15.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-15.png
rename to Code/Editor/Common/spline_edit-15.png
diff --git a/Code/Sandbox/Editor/Common/spline_edit-16.png b/Code/Editor/Common/spline_edit-16.png
similarity index 100%
rename from Code/Sandbox/Editor/Common/spline_edit-16.png
rename to Code/Editor/Common/spline_edit-16.png
diff --git a/Code/Sandbox/Editor/ConfigGroup.cpp b/Code/Editor/ConfigGroup.cpp
similarity index 100%
rename from Code/Sandbox/Editor/ConfigGroup.cpp
rename to Code/Editor/ConfigGroup.cpp
diff --git a/Code/Sandbox/Editor/ConfigGroup.h b/Code/Editor/ConfigGroup.h
similarity index 100%
rename from Code/Sandbox/Editor/ConfigGroup.h
rename to Code/Editor/ConfigGroup.h
diff --git a/Code/Sandbox/Editor/ConsoleDialog.cpp b/Code/Editor/ConsoleDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/ConsoleDialog.cpp
rename to Code/Editor/ConsoleDialog.cpp
diff --git a/Code/Sandbox/Editor/ConsoleDialog.h b/Code/Editor/ConsoleDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/ConsoleDialog.h
rename to Code/Editor/ConsoleDialog.h
diff --git a/Code/Sandbox/Editor/ControlMRU.cpp b/Code/Editor/ControlMRU.cpp
similarity index 100%
rename from Code/Sandbox/Editor/ControlMRU.cpp
rename to Code/Editor/ControlMRU.cpp
diff --git a/Code/Sandbox/Editor/ControlMRU.h b/Code/Editor/ControlMRU.h
similarity index 100%
rename from Code/Sandbox/Editor/ControlMRU.h
rename to Code/Editor/ControlMRU.h
diff --git a/Code/Sandbox/Editor/Controls/BitmapToolTip.cpp b/Code/Editor/Controls/BitmapToolTip.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/BitmapToolTip.cpp
rename to Code/Editor/Controls/BitmapToolTip.cpp
diff --git a/Code/Sandbox/Editor/Controls/BitmapToolTip.h b/Code/Editor/Controls/BitmapToolTip.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/BitmapToolTip.h
rename to Code/Editor/Controls/BitmapToolTip.h
diff --git a/Code/Sandbox/Editor/Controls/ColorGradientCtrl.cpp b/Code/Editor/Controls/ColorGradientCtrl.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ColorGradientCtrl.cpp
rename to Code/Editor/Controls/ColorGradientCtrl.cpp
diff --git a/Code/Sandbox/Editor/Controls/ColorGradientCtrl.h b/Code/Editor/Controls/ColorGradientCtrl.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ColorGradientCtrl.h
rename to Code/Editor/Controls/ColorGradientCtrl.h
diff --git a/Code/Sandbox/Editor/Controls/ConsoleSCB.cpp b/Code/Editor/Controls/ConsoleSCB.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ConsoleSCB.cpp
rename to Code/Editor/Controls/ConsoleSCB.cpp
diff --git a/Code/Sandbox/Editor/Controls/ConsoleSCB.h b/Code/Editor/Controls/ConsoleSCB.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ConsoleSCB.h
rename to Code/Editor/Controls/ConsoleSCB.h
diff --git a/Code/Sandbox/Editor/Controls/ConsoleSCB.qrc b/Code/Editor/Controls/ConsoleSCB.qrc
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ConsoleSCB.qrc
rename to Code/Editor/Controls/ConsoleSCB.qrc
diff --git a/Code/Sandbox/Editor/Controls/ConsoleSCB.ui b/Code/Editor/Controls/ConsoleSCB.ui
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ConsoleSCB.ui
rename to Code/Editor/Controls/ConsoleSCB.ui
diff --git a/Code/Sandbox/Editor/Controls/ConsoleSCBMFC.cpp b/Code/Editor/Controls/ConsoleSCBMFC.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ConsoleSCBMFC.cpp
rename to Code/Editor/Controls/ConsoleSCBMFC.cpp
diff --git a/Code/Sandbox/Editor/Controls/ConsoleSCBMFC.h b/Code/Editor/Controls/ConsoleSCBMFC.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ConsoleSCBMFC.h
rename to Code/Editor/Controls/ConsoleSCBMFC.h
diff --git a/Code/Sandbox/Editor/Controls/ConsoleSCBMFC.ui b/Code/Editor/Controls/ConsoleSCBMFC.ui
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ConsoleSCBMFC.ui
rename to Code/Editor/Controls/ConsoleSCBMFC.ui
diff --git a/Code/Sandbox/Editor/Controls/FolderTreeCtrl.cpp b/Code/Editor/Controls/FolderTreeCtrl.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/FolderTreeCtrl.cpp
rename to Code/Editor/Controls/FolderTreeCtrl.cpp
diff --git a/Code/Sandbox/Editor/Controls/FolderTreeCtrl.h b/Code/Editor/Controls/FolderTreeCtrl.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/FolderTreeCtrl.h
rename to Code/Editor/Controls/FolderTreeCtrl.h
diff --git a/Code/Sandbox/Editor/Controls/HotTrackingTreeCtrl.cpp b/Code/Editor/Controls/HotTrackingTreeCtrl.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/HotTrackingTreeCtrl.cpp
rename to Code/Editor/Controls/HotTrackingTreeCtrl.cpp
diff --git a/Code/Sandbox/Editor/Controls/HotTrackingTreeCtrl.h b/Code/Editor/Controls/HotTrackingTreeCtrl.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/HotTrackingTreeCtrl.h
rename to Code/Editor/Controls/HotTrackingTreeCtrl.h
diff --git a/Code/Sandbox/Editor/Controls/ImageHistogramCtrl.cpp b/Code/Editor/Controls/ImageHistogramCtrl.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ImageHistogramCtrl.cpp
rename to Code/Editor/Controls/ImageHistogramCtrl.cpp
diff --git a/Code/Sandbox/Editor/Controls/ImageHistogramCtrl.h b/Code/Editor/Controls/ImageHistogramCtrl.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ImageHistogramCtrl.h
rename to Code/Editor/Controls/ImageHistogramCtrl.h
diff --git a/Code/Sandbox/Editor/Controls/ImageListCtrl.cpp b/Code/Editor/Controls/ImageListCtrl.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ImageListCtrl.cpp
rename to Code/Editor/Controls/ImageListCtrl.cpp
diff --git a/Code/Sandbox/Editor/Controls/ImageListCtrl.h b/Code/Editor/Controls/ImageListCtrl.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ImageListCtrl.h
rename to Code/Editor/Controls/ImageListCtrl.h
diff --git a/Code/Sandbox/Editor/Controls/MultiMonHelper.cpp b/Code/Editor/Controls/MultiMonHelper.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/MultiMonHelper.cpp
rename to Code/Editor/Controls/MultiMonHelper.cpp
diff --git a/Code/Sandbox/Editor/Controls/MultiMonHelper.h b/Code/Editor/Controls/MultiMonHelper.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/MultiMonHelper.h
rename to Code/Editor/Controls/MultiMonHelper.h
diff --git a/Code/Sandbox/Editor/Controls/NumberCtrl.cpp b/Code/Editor/Controls/NumberCtrl.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/NumberCtrl.cpp
rename to Code/Editor/Controls/NumberCtrl.cpp
diff --git a/Code/Sandbox/Editor/Controls/NumberCtrl.h b/Code/Editor/Controls/NumberCtrl.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/NumberCtrl.h
rename to Code/Editor/Controls/NumberCtrl.h
diff --git a/Code/Sandbox/Editor/Controls/QBitmapPreviewDialog.cpp b/Code/Editor/Controls/QBitmapPreviewDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/QBitmapPreviewDialog.cpp
rename to Code/Editor/Controls/QBitmapPreviewDialog.cpp
diff --git a/Code/Sandbox/Editor/Controls/QBitmapPreviewDialog.h b/Code/Editor/Controls/QBitmapPreviewDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/QBitmapPreviewDialog.h
rename to Code/Editor/Controls/QBitmapPreviewDialog.h
diff --git a/Code/Sandbox/Editor/Controls/QBitmapPreviewDialog.ui b/Code/Editor/Controls/QBitmapPreviewDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/Controls/QBitmapPreviewDialog.ui
rename to Code/Editor/Controls/QBitmapPreviewDialog.ui
diff --git a/Code/Sandbox/Editor/Controls/QBitmapPreviewDialogImp.cpp b/Code/Editor/Controls/QBitmapPreviewDialogImp.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/QBitmapPreviewDialogImp.cpp
rename to Code/Editor/Controls/QBitmapPreviewDialogImp.cpp
diff --git a/Code/Sandbox/Editor/Controls/QBitmapPreviewDialogImp.h b/Code/Editor/Controls/QBitmapPreviewDialogImp.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/QBitmapPreviewDialogImp.h
rename to Code/Editor/Controls/QBitmapPreviewDialogImp.h
diff --git a/Code/Sandbox/Editor/Controls/QToolTipWidget.cpp b/Code/Editor/Controls/QToolTipWidget.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/QToolTipWidget.cpp
rename to Code/Editor/Controls/QToolTipWidget.cpp
diff --git a/Code/Sandbox/Editor/Controls/QToolTipWidget.h b/Code/Editor/Controls/QToolTipWidget.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/QToolTipWidget.h
rename to Code/Editor/Controls/QToolTipWidget.h
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyAnimationCtrl.cpp b/Code/Editor/Controls/ReflectedPropertyControl/PropertyAnimationCtrl.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyAnimationCtrl.cpp
rename to Code/Editor/Controls/ReflectedPropertyControl/PropertyAnimationCtrl.cpp
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyAnimationCtrl.h b/Code/Editor/Controls/ReflectedPropertyControl/PropertyAnimationCtrl.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyAnimationCtrl.h
rename to Code/Editor/Controls/ReflectedPropertyControl/PropertyAnimationCtrl.h
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.cpp b/Code/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.cpp
rename to Code/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.cpp
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.h b/Code/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.h
rename to Code/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.h
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.cpp b/Code/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.cpp
rename to Code/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.cpp
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.h b/Code/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.h
rename to Code/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.h
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.cpp b/Code/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.cpp
rename to Code/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.cpp
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.h b/Code/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.h
rename to Code/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.h
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.cpp b/Code/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.cpp
rename to Code/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.cpp
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.h b/Code/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.h
rename to Code/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.h
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp b/Code/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp
rename to Code/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.h b/Code/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.h
rename to Code/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.h
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.cpp b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.cpp
rename to Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.cpp
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.h b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.h
rename to Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.h
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp
rename to Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.h b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.h
rename to Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.h
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.qrc b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.qrc
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.qrc
rename to Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.qrc
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp
rename to Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.h b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.h
rename to Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.h
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVar.cpp b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVar.cpp
rename to Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.cpp
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVar.h b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVar.h
rename to Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.h
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp
rename to Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.h b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.h
rename to Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.h
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/resources/apply.png b/Code/Editor/Controls/ReflectedPropertyControl/resources/apply.png
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/resources/apply.png
rename to Code/Editor/Controls/ReflectedPropertyControl/resources/apply.png
diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/resources/file_browse.png b/Code/Editor/Controls/ReflectedPropertyControl/resources/file_browse.png
similarity index 100%
rename from Code/Sandbox/Editor/Controls/ReflectedPropertyControl/resources/file_browse.png
rename to Code/Editor/Controls/ReflectedPropertyControl/resources/file_browse.png
diff --git a/Code/Sandbox/Editor/Controls/SplineCtrl.cpp b/Code/Editor/Controls/SplineCtrl.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/SplineCtrl.cpp
rename to Code/Editor/Controls/SplineCtrl.cpp
diff --git a/Code/Sandbox/Editor/Controls/SplineCtrl.h b/Code/Editor/Controls/SplineCtrl.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/SplineCtrl.h
rename to Code/Editor/Controls/SplineCtrl.h
diff --git a/Code/Sandbox/Editor/Controls/SplineCtrlEx.cpp b/Code/Editor/Controls/SplineCtrlEx.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/SplineCtrlEx.cpp
rename to Code/Editor/Controls/SplineCtrlEx.cpp
diff --git a/Code/Sandbox/Editor/Controls/SplineCtrlEx.h b/Code/Editor/Controls/SplineCtrlEx.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/SplineCtrlEx.h
rename to Code/Editor/Controls/SplineCtrlEx.h
diff --git a/Code/Sandbox/Editor/Controls/TextEditorCtrl.cpp b/Code/Editor/Controls/TextEditorCtrl.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/TextEditorCtrl.cpp
rename to Code/Editor/Controls/TextEditorCtrl.cpp
diff --git a/Code/Sandbox/Editor/Controls/TextEditorCtrl.h b/Code/Editor/Controls/TextEditorCtrl.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/TextEditorCtrl.h
rename to Code/Editor/Controls/TextEditorCtrl.h
diff --git a/Code/Sandbox/Editor/Controls/TimelineCtrl.cpp b/Code/Editor/Controls/TimelineCtrl.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Controls/TimelineCtrl.cpp
rename to Code/Editor/Controls/TimelineCtrl.cpp
diff --git a/Code/Sandbox/Editor/Controls/TimelineCtrl.h b/Code/Editor/Controls/TimelineCtrl.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/TimelineCtrl.h
rename to Code/Editor/Controls/TimelineCtrl.h
diff --git a/Code/Sandbox/Editor/Controls/TreeCtrlUtils.h b/Code/Editor/Controls/TreeCtrlUtils.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/TreeCtrlUtils.h
rename to Code/Editor/Controls/TreeCtrlUtils.h
diff --git a/Code/Sandbox/Editor/Controls/WndGridHelper.h b/Code/Editor/Controls/WndGridHelper.h
similarity index 100%
rename from Code/Sandbox/Editor/Controls/WndGridHelper.h
rename to Code/Editor/Controls/WndGridHelper.h
diff --git a/Code/Sandbox/Editor/Core/EditorMetricsPlainTextNameRegistration.cpp b/Code/Editor/Core/EditorMetricsPlainTextNameRegistration.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Core/EditorMetricsPlainTextNameRegistration.cpp
rename to Code/Editor/Core/EditorMetricsPlainTextNameRegistration.cpp
diff --git a/Code/Sandbox/Editor/Core/EditorMetricsPlainTextNameRegistration.h b/Code/Editor/Core/EditorMetricsPlainTextNameRegistration.h
similarity index 100%
rename from Code/Sandbox/Editor/Core/EditorMetricsPlainTextNameRegistration.h
rename to Code/Editor/Core/EditorMetricsPlainTextNameRegistration.h
diff --git a/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp b/Code/Editor/Core/LevelEditorMenuHandler.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp
rename to Code/Editor/Core/LevelEditorMenuHandler.cpp
diff --git a/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.h b/Code/Editor/Core/LevelEditorMenuHandler.h
similarity index 100%
rename from Code/Sandbox/Editor/Core/LevelEditorMenuHandler.h
rename to Code/Editor/Core/LevelEditorMenuHandler.h
diff --git a/Code/Sandbox/Editor/Core/QtEditorApplication.cpp b/Code/Editor/Core/QtEditorApplication.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Core/QtEditorApplication.cpp
rename to Code/Editor/Core/QtEditorApplication.cpp
diff --git a/Code/Sandbox/Editor/Core/QtEditorApplication.h b/Code/Editor/Core/QtEditorApplication.h
similarity index 100%
rename from Code/Sandbox/Editor/Core/QtEditorApplication.h
rename to Code/Editor/Core/QtEditorApplication.h
diff --git a/Code/Sandbox/Editor/Core/QtEditorApplication_linux.cpp b/Code/Editor/Core/QtEditorApplication_linux.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Core/QtEditorApplication_linux.cpp
rename to Code/Editor/Core/QtEditorApplication_linux.cpp
diff --git a/Code/Sandbox/Editor/Core/QtEditorApplication_mac.mm b/Code/Editor/Core/QtEditorApplication_mac.mm
similarity index 100%
rename from Code/Sandbox/Editor/Core/QtEditorApplication_mac.mm
rename to Code/Editor/Core/QtEditorApplication_mac.mm
diff --git a/Code/Sandbox/Editor/Core/Tests/test_Archive.cpp b/Code/Editor/Core/Tests/test_Archive.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Core/Tests/test_Archive.cpp
rename to Code/Editor/Core/Tests/test_Archive.cpp
diff --git a/Code/Sandbox/Editor/Core/Tests/test_Main.cpp b/Code/Editor/Core/Tests/test_Main.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Core/Tests/test_Main.cpp
rename to Code/Editor/Core/Tests/test_Main.cpp
diff --git a/Code/Sandbox/Editor/Core/Tests/test_PathUtil.cpp b/Code/Editor/Core/Tests/test_PathUtil.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Core/Tests/test_PathUtil.cpp
rename to Code/Editor/Core/Tests/test_PathUtil.cpp
diff --git a/Code/Sandbox/Editor/CrtDebug.cpp b/Code/Editor/CrtDebug.cpp
similarity index 100%
rename from Code/Sandbox/Editor/CrtDebug.cpp
rename to Code/Editor/CrtDebug.cpp
diff --git a/Code/Sandbox/Editor/CryEdit.cpp b/Code/Editor/CryEdit.cpp
similarity index 100%
rename from Code/Sandbox/Editor/CryEdit.cpp
rename to Code/Editor/CryEdit.cpp
diff --git a/Code/Sandbox/Editor/CryEdit.h b/Code/Editor/CryEdit.h
similarity index 100%
rename from Code/Sandbox/Editor/CryEdit.h
rename to Code/Editor/CryEdit.h
diff --git a/Code/Sandbox/Editor/CryEdit.rc b/Code/Editor/CryEdit.rc
similarity index 100%
rename from Code/Sandbox/Editor/CryEdit.rc
rename to Code/Editor/CryEdit.rc
diff --git a/Code/Sandbox/Editor/CryEditDoc.cpp b/Code/Editor/CryEditDoc.cpp
similarity index 100%
rename from Code/Sandbox/Editor/CryEditDoc.cpp
rename to Code/Editor/CryEditDoc.cpp
diff --git a/Code/Sandbox/Editor/CryEditDoc.h b/Code/Editor/CryEditDoc.h
similarity index 100%
rename from Code/Sandbox/Editor/CryEditDoc.h
rename to Code/Editor/CryEditDoc.h
diff --git a/Code/Sandbox/Editor/CryEditLiveCreate.rc b/Code/Editor/CryEditLiveCreate.rc
similarity index 100%
rename from Code/Sandbox/Editor/CryEditLiveCreate.rc
rename to Code/Editor/CryEditLiveCreate.rc
diff --git a/Code/Sandbox/Editor/CryEditPy.cpp b/Code/Editor/CryEditPy.cpp
similarity index 100%
rename from Code/Sandbox/Editor/CryEditPy.cpp
rename to Code/Editor/CryEditPy.cpp
diff --git a/Code/Sandbox/Editor/CustomAspectRatioDlg.cpp b/Code/Editor/CustomAspectRatioDlg.cpp
similarity index 100%
rename from Code/Sandbox/Editor/CustomAspectRatioDlg.cpp
rename to Code/Editor/CustomAspectRatioDlg.cpp
diff --git a/Code/Sandbox/Editor/CustomAspectRatioDlg.h b/Code/Editor/CustomAspectRatioDlg.h
similarity index 100%
rename from Code/Sandbox/Editor/CustomAspectRatioDlg.h
rename to Code/Editor/CustomAspectRatioDlg.h
diff --git a/Code/Sandbox/Editor/CustomAspectRatioDlg.ui b/Code/Editor/CustomAspectRatioDlg.ui
similarity index 100%
rename from Code/Sandbox/Editor/CustomAspectRatioDlg.ui
rename to Code/Editor/CustomAspectRatioDlg.ui
diff --git a/Code/Sandbox/Editor/CustomResolutionDlg.cpp b/Code/Editor/CustomResolutionDlg.cpp
similarity index 100%
rename from Code/Sandbox/Editor/CustomResolutionDlg.cpp
rename to Code/Editor/CustomResolutionDlg.cpp
diff --git a/Code/Sandbox/Editor/CustomResolutionDlg.h b/Code/Editor/CustomResolutionDlg.h
similarity index 100%
rename from Code/Sandbox/Editor/CustomResolutionDlg.h
rename to Code/Editor/CustomResolutionDlg.h
diff --git a/Code/Sandbox/Editor/CustomResolutionDlg.ui b/Code/Editor/CustomResolutionDlg.ui
similarity index 100%
rename from Code/Sandbox/Editor/CustomResolutionDlg.ui
rename to Code/Editor/CustomResolutionDlg.ui
diff --git a/Code/Sandbox/Editor/CustomizeKeyboardDialog.cpp b/Code/Editor/CustomizeKeyboardDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/CustomizeKeyboardDialog.cpp
rename to Code/Editor/CustomizeKeyboardDialog.cpp
diff --git a/Code/Sandbox/Editor/CustomizeKeyboardDialog.h b/Code/Editor/CustomizeKeyboardDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/CustomizeKeyboardDialog.h
rename to Code/Editor/CustomizeKeyboardDialog.h
diff --git a/Code/Sandbox/Editor/CustomizeKeyboardDialog.ui b/Code/Editor/CustomizeKeyboardDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/CustomizeKeyboardDialog.ui
rename to Code/Editor/CustomizeKeyboardDialog.ui
diff --git a/Code/Sandbox/Editor/DPIAware.xml b/Code/Editor/DPIAware.xml
similarity index 100%
rename from Code/Sandbox/Editor/DPIAware.xml
rename to Code/Editor/DPIAware.xml
diff --git a/Code/Sandbox/Editor/Dialogs/ErrorsDlg.cpp b/Code/Editor/Dialogs/ErrorsDlg.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Dialogs/ErrorsDlg.cpp
rename to Code/Editor/Dialogs/ErrorsDlg.cpp
diff --git a/Code/Sandbox/Editor/Dialogs/ErrorsDlg.h b/Code/Editor/Dialogs/ErrorsDlg.h
similarity index 100%
rename from Code/Sandbox/Editor/Dialogs/ErrorsDlg.h
rename to Code/Editor/Dialogs/ErrorsDlg.h
diff --git a/Code/Sandbox/Editor/Dialogs/ErrorsDlg.ui b/Code/Editor/Dialogs/ErrorsDlg.ui
similarity index 100%
rename from Code/Sandbox/Editor/Dialogs/ErrorsDlg.ui
rename to Code/Editor/Dialogs/ErrorsDlg.ui
diff --git a/Code/Sandbox/Editor/Dialogs/Generic/UserOptions.cpp b/Code/Editor/Dialogs/Generic/UserOptions.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Dialogs/Generic/UserOptions.cpp
rename to Code/Editor/Dialogs/Generic/UserOptions.cpp
diff --git a/Code/Sandbox/Editor/Dialogs/Generic/UserOptions.h b/Code/Editor/Dialogs/Generic/UserOptions.h
similarity index 100%
rename from Code/Sandbox/Editor/Dialogs/Generic/UserOptions.h
rename to Code/Editor/Dialogs/Generic/UserOptions.h
diff --git a/Code/Sandbox/Editor/Dialogs/PythonScriptsDialog.cpp b/Code/Editor/Dialogs/PythonScriptsDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Dialogs/PythonScriptsDialog.cpp
rename to Code/Editor/Dialogs/PythonScriptsDialog.cpp
diff --git a/Code/Sandbox/Editor/Dialogs/PythonScriptsDialog.h b/Code/Editor/Dialogs/PythonScriptsDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/Dialogs/PythonScriptsDialog.h
rename to Code/Editor/Dialogs/PythonScriptsDialog.h
diff --git a/Code/Sandbox/Editor/Dialogs/PythonScriptsDialog.ui b/Code/Editor/Dialogs/PythonScriptsDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/Dialogs/PythonScriptsDialog.ui
rename to Code/Editor/Dialogs/PythonScriptsDialog.ui
diff --git a/Code/Sandbox/Editor/DimensionsDialog.cpp b/Code/Editor/DimensionsDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/DimensionsDialog.cpp
rename to Code/Editor/DimensionsDialog.cpp
diff --git a/Code/Sandbox/Editor/DimensionsDialog.h b/Code/Editor/DimensionsDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/DimensionsDialog.h
rename to Code/Editor/DimensionsDialog.h
diff --git a/Code/Sandbox/Editor/DimensionsDialog.ui b/Code/Editor/DimensionsDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/DimensionsDialog.ui
rename to Code/Editor/DimensionsDialog.ui
diff --git a/Code/Sandbox/Editor/DisplaySettings.cpp b/Code/Editor/DisplaySettings.cpp
similarity index 100%
rename from Code/Sandbox/Editor/DisplaySettings.cpp
rename to Code/Editor/DisplaySettings.cpp
diff --git a/Code/Sandbox/Editor/DisplaySettings.h b/Code/Editor/DisplaySettings.h
similarity index 100%
rename from Code/Sandbox/Editor/DisplaySettings.h
rename to Code/Editor/DisplaySettings.h
diff --git a/Code/Sandbox/Editor/DisplaySettingsPythonFuncs.cpp b/Code/Editor/DisplaySettingsPythonFuncs.cpp
similarity index 100%
rename from Code/Sandbox/Editor/DisplaySettingsPythonFuncs.cpp
rename to Code/Editor/DisplaySettingsPythonFuncs.cpp
diff --git a/Code/Sandbox/Editor/DisplaySettingsPythonFuncs.h b/Code/Editor/DisplaySettingsPythonFuncs.h
similarity index 100%
rename from Code/Sandbox/Editor/DisplaySettingsPythonFuncs.h
rename to Code/Editor/DisplaySettingsPythonFuncs.h
diff --git a/Code/Sandbox/Editor/DocMultiArchive.h b/Code/Editor/DocMultiArchive.h
similarity index 100%
rename from Code/Sandbox/Editor/DocMultiArchive.h
rename to Code/Editor/DocMultiArchive.h
diff --git a/Code/Sandbox/Editor/EditMode/DeepSelection.cpp b/Code/Editor/EditMode/DeepSelection.cpp
similarity index 100%
rename from Code/Sandbox/Editor/EditMode/DeepSelection.cpp
rename to Code/Editor/EditMode/DeepSelection.cpp
diff --git a/Code/Sandbox/Editor/EditMode/DeepSelection.h b/Code/Editor/EditMode/DeepSelection.h
similarity index 100%
rename from Code/Sandbox/Editor/EditMode/DeepSelection.h
rename to Code/Editor/EditMode/DeepSelection.h
diff --git a/Code/Sandbox/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.cpp b/Code/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.cpp
similarity index 100%
rename from Code/Sandbox/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.cpp
rename to Code/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.cpp
diff --git a/Code/Sandbox/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.h b/Code/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.h
similarity index 100%
rename from Code/Sandbox/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.h
rename to Code/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.h
diff --git a/Code/Sandbox/Editor/EditorCryEdit.rc b/Code/Editor/EditorCryEdit.rc
similarity index 100%
rename from Code/Sandbox/Editor/EditorCryEdit.rc
rename to Code/Editor/EditorCryEdit.rc
diff --git a/Code/Sandbox/Editor/EditorDefs.h b/Code/Editor/EditorDefs.h
similarity index 100%
rename from Code/Sandbox/Editor/EditorDefs.h
rename to Code/Editor/EditorDefs.h
diff --git a/Code/Sandbox/Editor/EditorEnvironment.cpp b/Code/Editor/EditorEnvironment.cpp
similarity index 100%
rename from Code/Sandbox/Editor/EditorEnvironment.cpp
rename to Code/Editor/EditorEnvironment.cpp
diff --git a/Code/Sandbox/Editor/EditorEnvironment.h b/Code/Editor/EditorEnvironment.h
similarity index 100%
rename from Code/Sandbox/Editor/EditorEnvironment.h
rename to Code/Editor/EditorEnvironment.h
diff --git a/Code/Sandbox/Editor/EditorFileMonitor.cpp b/Code/Editor/EditorFileMonitor.cpp
similarity index 100%
rename from Code/Sandbox/Editor/EditorFileMonitor.cpp
rename to Code/Editor/EditorFileMonitor.cpp
diff --git a/Code/Sandbox/Editor/EditorFileMonitor.h b/Code/Editor/EditorFileMonitor.h
similarity index 100%
rename from Code/Sandbox/Editor/EditorFileMonitor.h
rename to Code/Editor/EditorFileMonitor.h
diff --git a/Code/Sandbox/Editor/EditorPanelUtils.cpp b/Code/Editor/EditorPanelUtils.cpp
similarity index 100%
rename from Code/Sandbox/Editor/EditorPanelUtils.cpp
rename to Code/Editor/EditorPanelUtils.cpp
diff --git a/Code/Sandbox/Editor/EditorPanelUtils.h b/Code/Editor/EditorPanelUtils.h
similarity index 100%
rename from Code/Sandbox/Editor/EditorPanelUtils.h
rename to Code/Editor/EditorPanelUtils.h
diff --git a/Code/Sandbox/Editor/EditorPreferencesBus.h b/Code/Editor/EditorPreferencesBus.h
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesBus.h
rename to Code/Editor/EditorPreferencesBus.h
diff --git a/Code/Sandbox/Editor/EditorPreferencesDialog.cpp b/Code/Editor/EditorPreferencesDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesDialog.cpp
rename to Code/Editor/EditorPreferencesDialog.cpp
diff --git a/Code/Sandbox/Editor/EditorPreferencesDialog.h b/Code/Editor/EditorPreferencesDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesDialog.h
rename to Code/Editor/EditorPreferencesDialog.h
diff --git a/Code/Sandbox/Editor/EditorPreferencesDialog.ui b/Code/Editor/EditorPreferencesDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesDialog.ui
rename to Code/Editor/EditorPreferencesDialog.ui
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageAWS.cpp b/Code/Editor/EditorPreferencesPageAWS.cpp
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesPageAWS.cpp
rename to Code/Editor/EditorPreferencesPageAWS.cpp
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageAWS.h b/Code/Editor/EditorPreferencesPageAWS.h
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesPageAWS.h
rename to Code/Editor/EditorPreferencesPageAWS.h
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageExperimentalLighting.cpp b/Code/Editor/EditorPreferencesPageExperimentalLighting.cpp
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesPageExperimentalLighting.cpp
rename to Code/Editor/EditorPreferencesPageExperimentalLighting.cpp
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageExperimentalLighting.h b/Code/Editor/EditorPreferencesPageExperimentalLighting.h
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesPageExperimentalLighting.h
rename to Code/Editor/EditorPreferencesPageExperimentalLighting.h
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageFiles.cpp b/Code/Editor/EditorPreferencesPageFiles.cpp
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesPageFiles.cpp
rename to Code/Editor/EditorPreferencesPageFiles.cpp
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageFiles.h b/Code/Editor/EditorPreferencesPageFiles.h
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesPageFiles.h
rename to Code/Editor/EditorPreferencesPageFiles.h
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageGeneral.cpp b/Code/Editor/EditorPreferencesPageGeneral.cpp
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesPageGeneral.cpp
rename to Code/Editor/EditorPreferencesPageGeneral.cpp
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageGeneral.h b/Code/Editor/EditorPreferencesPageGeneral.h
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesPageGeneral.h
rename to Code/Editor/EditorPreferencesPageGeneral.h
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageViewportDebug.cpp b/Code/Editor/EditorPreferencesPageViewportDebug.cpp
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesPageViewportDebug.cpp
rename to Code/Editor/EditorPreferencesPageViewportDebug.cpp
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageViewportDebug.h b/Code/Editor/EditorPreferencesPageViewportDebug.h
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesPageViewportDebug.h
rename to Code/Editor/EditorPreferencesPageViewportDebug.h
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageViewportGeneral.cpp b/Code/Editor/EditorPreferencesPageViewportGeneral.cpp
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesPageViewportGeneral.cpp
rename to Code/Editor/EditorPreferencesPageViewportGeneral.cpp
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageViewportGeneral.h b/Code/Editor/EditorPreferencesPageViewportGeneral.h
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesPageViewportGeneral.h
rename to Code/Editor/EditorPreferencesPageViewportGeneral.h
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageViewportGizmo.cpp b/Code/Editor/EditorPreferencesPageViewportGizmo.cpp
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesPageViewportGizmo.cpp
rename to Code/Editor/EditorPreferencesPageViewportGizmo.cpp
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageViewportGizmo.h b/Code/Editor/EditorPreferencesPageViewportGizmo.h
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesPageViewportGizmo.h
rename to Code/Editor/EditorPreferencesPageViewportGizmo.h
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageViewportMovement.cpp b/Code/Editor/EditorPreferencesPageViewportMovement.cpp
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesPageViewportMovement.cpp
rename to Code/Editor/EditorPreferencesPageViewportMovement.cpp
diff --git a/Code/Sandbox/Editor/EditorPreferencesPageViewportMovement.h b/Code/Editor/EditorPreferencesPageViewportMovement.h
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesPageViewportMovement.h
rename to Code/Editor/EditorPreferencesPageViewportMovement.h
diff --git a/Code/Sandbox/Editor/EditorPreferencesTreeWidgetItem.cpp b/Code/Editor/EditorPreferencesTreeWidgetItem.cpp
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesTreeWidgetItem.cpp
rename to Code/Editor/EditorPreferencesTreeWidgetItem.cpp
diff --git a/Code/Sandbox/Editor/EditorPreferencesTreeWidgetItem.h b/Code/Editor/EditorPreferencesTreeWidgetItem.h
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesTreeWidgetItem.h
rename to Code/Editor/EditorPreferencesTreeWidgetItem.h
diff --git a/Code/Sandbox/Editor/EditorPreferencesTreeWidgetItemDelegate.cpp b/Code/Editor/EditorPreferencesTreeWidgetItemDelegate.cpp
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesTreeWidgetItemDelegate.cpp
rename to Code/Editor/EditorPreferencesTreeWidgetItemDelegate.cpp
diff --git a/Code/Sandbox/Editor/EditorPreferencesTreeWidgetItemDelegate.h b/Code/Editor/EditorPreferencesTreeWidgetItemDelegate.h
similarity index 100%
rename from Code/Sandbox/Editor/EditorPreferencesTreeWidgetItemDelegate.h
rename to Code/Editor/EditorPreferencesTreeWidgetItemDelegate.h
diff --git a/Code/Sandbox/Editor/EditorToolsApplication.cpp b/Code/Editor/EditorToolsApplication.cpp
similarity index 100%
rename from Code/Sandbox/Editor/EditorToolsApplication.cpp
rename to Code/Editor/EditorToolsApplication.cpp
diff --git a/Code/Sandbox/Editor/EditorToolsApplication.h b/Code/Editor/EditorToolsApplication.h
similarity index 100%
rename from Code/Sandbox/Editor/EditorToolsApplication.h
rename to Code/Editor/EditorToolsApplication.h
diff --git a/Code/Sandbox/Editor/EditorToolsApplicationAPI.h b/Code/Editor/EditorToolsApplicationAPI.h
similarity index 100%
rename from Code/Sandbox/Editor/EditorToolsApplicationAPI.h
rename to Code/Editor/EditorToolsApplicationAPI.h
diff --git a/Code/Sandbox/Editor/EditorVersion.rc b/Code/Editor/EditorVersion.rc
similarity index 100%
rename from Code/Sandbox/Editor/EditorVersion.rc
rename to Code/Editor/EditorVersion.rc
diff --git a/Code/Sandbox/Editor/EditorViewportSettings.cpp b/Code/Editor/EditorViewportSettings.cpp
similarity index 100%
rename from Code/Sandbox/Editor/EditorViewportSettings.cpp
rename to Code/Editor/EditorViewportSettings.cpp
diff --git a/Code/Sandbox/Editor/EditorViewportSettings.h b/Code/Editor/EditorViewportSettings.h
similarity index 100%
rename from Code/Sandbox/Editor/EditorViewportSettings.h
rename to Code/Editor/EditorViewportSettings.h
diff --git a/Code/Sandbox/Editor/EditorViewportWidget.cpp b/Code/Editor/EditorViewportWidget.cpp
similarity index 100%
rename from Code/Sandbox/Editor/EditorViewportWidget.cpp
rename to Code/Editor/EditorViewportWidget.cpp
diff --git a/Code/Sandbox/Editor/EditorViewportWidget.h b/Code/Editor/EditorViewportWidget.h
similarity index 100%
rename from Code/Sandbox/Editor/EditorViewportWidget.h
rename to Code/Editor/EditorViewportWidget.h
diff --git a/Code/Sandbox/Editor/ErrorDialog.cpp b/Code/Editor/ErrorDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/ErrorDialog.cpp
rename to Code/Editor/ErrorDialog.cpp
diff --git a/Code/Sandbox/Editor/ErrorDialog.h b/Code/Editor/ErrorDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/ErrorDialog.h
rename to Code/Editor/ErrorDialog.h
diff --git a/Code/Sandbox/Editor/ErrorDialog.ui b/Code/Editor/ErrorDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/ErrorDialog.ui
rename to Code/Editor/ErrorDialog.ui
diff --git a/Code/Sandbox/Editor/ErrorRecorder.cpp b/Code/Editor/ErrorRecorder.cpp
similarity index 100%
rename from Code/Sandbox/Editor/ErrorRecorder.cpp
rename to Code/Editor/ErrorRecorder.cpp
diff --git a/Code/Sandbox/Editor/ErrorRecorder.h b/Code/Editor/ErrorRecorder.h
similarity index 100%
rename from Code/Sandbox/Editor/ErrorRecorder.h
rename to Code/Editor/ErrorRecorder.h
diff --git a/Code/Sandbox/Editor/ErrorReport.cpp b/Code/Editor/ErrorReport.cpp
similarity index 100%
rename from Code/Sandbox/Editor/ErrorReport.cpp
rename to Code/Editor/ErrorReport.cpp
diff --git a/Code/Sandbox/Editor/ErrorReport.h b/Code/Editor/ErrorReport.h
similarity index 100%
rename from Code/Sandbox/Editor/ErrorReport.h
rename to Code/Editor/ErrorReport.h
diff --git a/Code/Sandbox/Editor/ErrorReportDialog.cpp b/Code/Editor/ErrorReportDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/ErrorReportDialog.cpp
rename to Code/Editor/ErrorReportDialog.cpp
diff --git a/Code/Sandbox/Editor/ErrorReportDialog.h b/Code/Editor/ErrorReportDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/ErrorReportDialog.h
rename to Code/Editor/ErrorReportDialog.h
diff --git a/Code/Sandbox/Editor/ErrorReportDialog.ui b/Code/Editor/ErrorReportDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/ErrorReportDialog.ui
rename to Code/Editor/ErrorReportDialog.ui
diff --git a/Code/Sandbox/Editor/ErrorReportTableModel.cpp b/Code/Editor/ErrorReportTableModel.cpp
similarity index 100%
rename from Code/Sandbox/Editor/ErrorReportTableModel.cpp
rename to Code/Editor/ErrorReportTableModel.cpp
diff --git a/Code/Sandbox/Editor/ErrorReportTableModel.h b/Code/Editor/ErrorReportTableModel.h
similarity index 100%
rename from Code/Sandbox/Editor/ErrorReportTableModel.h
rename to Code/Editor/ErrorReportTableModel.h
diff --git a/Code/Sandbox/Editor/Export/ExportManager.cpp b/Code/Editor/Export/ExportManager.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Export/ExportManager.cpp
rename to Code/Editor/Export/ExportManager.cpp
diff --git a/Code/Sandbox/Editor/Export/ExportManager.h b/Code/Editor/Export/ExportManager.h
similarity index 100%
rename from Code/Sandbox/Editor/Export/ExportManager.h
rename to Code/Editor/Export/ExportManager.h
diff --git a/Code/Sandbox/Editor/Export/OBJExporter.cpp b/Code/Editor/Export/OBJExporter.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Export/OBJExporter.cpp
rename to Code/Editor/Export/OBJExporter.cpp
diff --git a/Code/Sandbox/Editor/Export/OBJExporter.h b/Code/Editor/Export/OBJExporter.h
similarity index 100%
rename from Code/Sandbox/Editor/Export/OBJExporter.h
rename to Code/Editor/Export/OBJExporter.h
diff --git a/Code/Sandbox/Editor/Export/OCMExporter.cpp b/Code/Editor/Export/OCMExporter.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Export/OCMExporter.cpp
rename to Code/Editor/Export/OCMExporter.cpp
diff --git a/Code/Sandbox/Editor/Export/OCMExporter.h b/Code/Editor/Export/OCMExporter.h
similarity index 100%
rename from Code/Sandbox/Editor/Export/OCMExporter.h
rename to Code/Editor/Export/OCMExporter.h
diff --git a/Code/Sandbox/Editor/FBXExporterDialog.cpp b/Code/Editor/FBXExporterDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/FBXExporterDialog.cpp
rename to Code/Editor/FBXExporterDialog.cpp
diff --git a/Code/Sandbox/Editor/FBXExporterDialog.h b/Code/Editor/FBXExporterDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/FBXExporterDialog.h
rename to Code/Editor/FBXExporterDialog.h
diff --git a/Code/Sandbox/Editor/FBXExporterDialog.ui b/Code/Editor/FBXExporterDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/FBXExporterDialog.ui
rename to Code/Editor/FBXExporterDialog.ui
diff --git a/Code/Sandbox/Editor/FileTypeUtils.cpp b/Code/Editor/FileTypeUtils.cpp
similarity index 100%
rename from Code/Sandbox/Editor/FileTypeUtils.cpp
rename to Code/Editor/FileTypeUtils.cpp
diff --git a/Code/Sandbox/Editor/FileTypeUtils.h b/Code/Editor/FileTypeUtils.h
similarity index 100%
rename from Code/Sandbox/Editor/FileTypeUtils.h
rename to Code/Editor/FileTypeUtils.h
diff --git a/Code/Sandbox/Editor/GameEngine.cpp b/Code/Editor/GameEngine.cpp
similarity index 100%
rename from Code/Sandbox/Editor/GameEngine.cpp
rename to Code/Editor/GameEngine.cpp
diff --git a/Code/Sandbox/Editor/GameEngine.h b/Code/Editor/GameEngine.h
similarity index 100%
rename from Code/Sandbox/Editor/GameEngine.h
rename to Code/Editor/GameEngine.h
diff --git a/Code/Sandbox/Editor/GameExporter.cpp b/Code/Editor/GameExporter.cpp
similarity index 100%
rename from Code/Sandbox/Editor/GameExporter.cpp
rename to Code/Editor/GameExporter.cpp
diff --git a/Code/Sandbox/Editor/GameExporter.h b/Code/Editor/GameExporter.h
similarity index 100%
rename from Code/Sandbox/Editor/GameExporter.h
rename to Code/Editor/GameExporter.h
diff --git a/Code/Sandbox/Editor/GameResourcesExporter.cpp b/Code/Editor/GameResourcesExporter.cpp
similarity index 100%
rename from Code/Sandbox/Editor/GameResourcesExporter.cpp
rename to Code/Editor/GameResourcesExporter.cpp
diff --git a/Code/Sandbox/Editor/GameResourcesExporter.h b/Code/Editor/GameResourcesExporter.h
similarity index 100%
rename from Code/Sandbox/Editor/GameResourcesExporter.h
rename to Code/Editor/GameResourcesExporter.h
diff --git a/Code/Sandbox/Editor/GenericSelectItemDialog.cpp b/Code/Editor/GenericSelectItemDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/GenericSelectItemDialog.cpp
rename to Code/Editor/GenericSelectItemDialog.cpp
diff --git a/Code/Sandbox/Editor/GenericSelectItemDialog.h b/Code/Editor/GenericSelectItemDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/GenericSelectItemDialog.h
rename to Code/Editor/GenericSelectItemDialog.h
diff --git a/Code/Sandbox/Editor/GenericSelectItemDialog.ui b/Code/Editor/GenericSelectItemDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/GenericSelectItemDialog.ui
rename to Code/Editor/GenericSelectItemDialog.ui
diff --git a/Code/Sandbox/Editor/Geometry/TriMesh.cpp b/Code/Editor/Geometry/TriMesh.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Geometry/TriMesh.cpp
rename to Code/Editor/Geometry/TriMesh.cpp
diff --git a/Code/Sandbox/Editor/Geometry/TriMesh.h b/Code/Editor/Geometry/TriMesh.h
similarity index 100%
rename from Code/Sandbox/Editor/Geometry/TriMesh.h
rename to Code/Editor/Geometry/TriMesh.h
diff --git a/Code/Sandbox/Editor/GotoPositionDlg.cpp b/Code/Editor/GotoPositionDlg.cpp
similarity index 100%
rename from Code/Sandbox/Editor/GotoPositionDlg.cpp
rename to Code/Editor/GotoPositionDlg.cpp
diff --git a/Code/Sandbox/Editor/GotoPositionDlg.h b/Code/Editor/GotoPositionDlg.h
similarity index 100%
rename from Code/Sandbox/Editor/GotoPositionDlg.h
rename to Code/Editor/GotoPositionDlg.h
diff --git a/Code/Sandbox/Editor/GotoPositionDlg.ui b/Code/Editor/GotoPositionDlg.ui
similarity index 100%
rename from Code/Sandbox/Editor/GotoPositionDlg.ui
rename to Code/Editor/GotoPositionDlg.ui
diff --git a/Code/Sandbox/Editor/GraphicsSettingsDialog.cpp b/Code/Editor/GraphicsSettingsDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/GraphicsSettingsDialog.cpp
rename to Code/Editor/GraphicsSettingsDialog.cpp
diff --git a/Code/Sandbox/Editor/GraphicsSettingsDialog.h b/Code/Editor/GraphicsSettingsDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/GraphicsSettingsDialog.h
rename to Code/Editor/GraphicsSettingsDialog.h
diff --git a/Code/Sandbox/Editor/GridUtils.h b/Code/Editor/GridUtils.h
similarity index 100%
rename from Code/Sandbox/Editor/GridUtils.h
rename to Code/Editor/GridUtils.h
diff --git a/Code/Sandbox/Editor/IEditor.h b/Code/Editor/IEditor.h
similarity index 100%
rename from Code/Sandbox/Editor/IEditor.h
rename to Code/Editor/IEditor.h
diff --git a/Code/Sandbox/Editor/IEditorImpl.cpp b/Code/Editor/IEditorImpl.cpp
similarity index 100%
rename from Code/Sandbox/Editor/IEditorImpl.cpp
rename to Code/Editor/IEditorImpl.cpp
diff --git a/Code/Sandbox/Editor/IEditorImpl.h b/Code/Editor/IEditorImpl.h
similarity index 100%
rename from Code/Sandbox/Editor/IEditorImpl.h
rename to Code/Editor/IEditorImpl.h
diff --git a/Code/Sandbox/Editor/IEditorPanelUtils.h b/Code/Editor/IEditorPanelUtils.h
similarity index 100%
rename from Code/Sandbox/Editor/IEditorPanelUtils.h
rename to Code/Editor/IEditorPanelUtils.h
diff --git a/Code/Sandbox/Editor/IObservable.h b/Code/Editor/IObservable.h
similarity index 100%
rename from Code/Sandbox/Editor/IObservable.h
rename to Code/Editor/IObservable.h
diff --git a/Code/Sandbox/Editor/IPostRenderer.h b/Code/Editor/IPostRenderer.h
similarity index 100%
rename from Code/Sandbox/Editor/IPostRenderer.h
rename to Code/Editor/IPostRenderer.h
diff --git a/Code/Sandbox/Editor/IconListDialog.ui b/Code/Editor/IconListDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/IconListDialog.ui
rename to Code/Editor/IconListDialog.ui
diff --git a/Code/Sandbox/Editor/IconManager.cpp b/Code/Editor/IconManager.cpp
similarity index 100%
rename from Code/Sandbox/Editor/IconManager.cpp
rename to Code/Editor/IconManager.cpp
diff --git a/Code/Sandbox/Editor/IconManager.h b/Code/Editor/IconManager.h
similarity index 100%
rename from Code/Sandbox/Editor/IconManager.h
rename to Code/Editor/IconManager.h
diff --git a/Code/Sandbox/Editor/Include/Command.h b/Code/Editor/Include/Command.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/Command.h
rename to Code/Editor/Include/Command.h
diff --git a/Code/Sandbox/Editor/Include/EditorCoreAPI.cpp b/Code/Editor/Include/EditorCoreAPI.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Include/EditorCoreAPI.cpp
rename to Code/Editor/Include/EditorCoreAPI.cpp
diff --git a/Code/Sandbox/Editor/Include/EditorCoreAPI.h b/Code/Editor/Include/EditorCoreAPI.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/EditorCoreAPI.h
rename to Code/Editor/Include/EditorCoreAPI.h
diff --git a/Code/Sandbox/Editor/Include/HitContext.h b/Code/Editor/Include/HitContext.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/HitContext.h
rename to Code/Editor/Include/HitContext.h
diff --git a/Code/Sandbox/Editor/Include/IAnimationCompressionManager.h b/Code/Editor/Include/IAnimationCompressionManager.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IAnimationCompressionManager.h
rename to Code/Editor/Include/IAnimationCompressionManager.h
diff --git a/Code/Sandbox/Editor/Include/IAssetItem.h b/Code/Editor/Include/IAssetItem.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IAssetItem.h
rename to Code/Editor/Include/IAssetItem.h
diff --git a/Code/Sandbox/Editor/Include/IAssetItemDatabase.h b/Code/Editor/Include/IAssetItemDatabase.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IAssetItemDatabase.h
rename to Code/Editor/Include/IAssetItemDatabase.h
diff --git a/Code/Sandbox/Editor/Include/IAssetViewer.h b/Code/Editor/Include/IAssetViewer.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IAssetViewer.h
rename to Code/Editor/Include/IAssetViewer.h
diff --git a/Code/Sandbox/Editor/Include/IBaseLibraryManager.h b/Code/Editor/Include/IBaseLibraryManager.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IBaseLibraryManager.h
rename to Code/Editor/Include/IBaseLibraryManager.h
diff --git a/Code/Sandbox/Editor/Include/ICommandManager.h b/Code/Editor/Include/ICommandManager.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/ICommandManager.h
rename to Code/Editor/Include/ICommandManager.h
diff --git a/Code/Sandbox/Editor/Include/IConsoleConnectivity.h b/Code/Editor/Include/IConsoleConnectivity.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IConsoleConnectivity.h
rename to Code/Editor/Include/IConsoleConnectivity.h
diff --git a/Code/Sandbox/Editor/Include/IDataBaseItem.h b/Code/Editor/Include/IDataBaseItem.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IDataBaseItem.h
rename to Code/Editor/Include/IDataBaseItem.h
diff --git a/Code/Sandbox/Editor/Include/IDataBaseLibrary.h b/Code/Editor/Include/IDataBaseLibrary.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IDataBaseLibrary.h
rename to Code/Editor/Include/IDataBaseLibrary.h
diff --git a/Code/Sandbox/Editor/Include/IDataBaseManager.h b/Code/Editor/Include/IDataBaseManager.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IDataBaseManager.h
rename to Code/Editor/Include/IDataBaseManager.h
diff --git a/Code/Sandbox/Editor/Include/IDisplayViewport.h b/Code/Editor/Include/IDisplayViewport.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IDisplayViewport.h
rename to Code/Editor/Include/IDisplayViewport.h
diff --git a/Code/Sandbox/Editor/Include/IEditorClassFactory.h b/Code/Editor/Include/IEditorClassFactory.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IEditorClassFactory.h
rename to Code/Editor/Include/IEditorClassFactory.h
diff --git a/Code/Sandbox/Editor/Include/IEditorFileMonitor.h b/Code/Editor/Include/IEditorFileMonitor.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IEditorFileMonitor.h
rename to Code/Editor/Include/IEditorFileMonitor.h
diff --git a/Code/Sandbox/Editor/Include/IEditorMaterial.h b/Code/Editor/Include/IEditorMaterial.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IEditorMaterial.h
rename to Code/Editor/Include/IEditorMaterial.h
diff --git a/Code/Sandbox/Editor/Include/IEditorMaterialManager.h b/Code/Editor/Include/IEditorMaterialManager.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IEditorMaterialManager.h
rename to Code/Editor/Include/IEditorMaterialManager.h
diff --git a/Code/Sandbox/Editor/Include/IErrorReport.h b/Code/Editor/Include/IErrorReport.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IErrorReport.h
rename to Code/Editor/Include/IErrorReport.h
diff --git a/Code/Sandbox/Editor/Include/IEventLoopHook.h b/Code/Editor/Include/IEventLoopHook.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IEventLoopHook.h
rename to Code/Editor/Include/IEventLoopHook.h
diff --git a/Code/Sandbox/Editor/Include/IExportManager.h b/Code/Editor/Include/IExportManager.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IExportManager.h
rename to Code/Editor/Include/IExportManager.h
diff --git a/Code/Sandbox/Editor/Include/IFacialEditor.h b/Code/Editor/Include/IFacialEditor.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IFacialEditor.h
rename to Code/Editor/Include/IFacialEditor.h
diff --git a/Code/Sandbox/Editor/Include/IFileUtil.h b/Code/Editor/Include/IFileUtil.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IFileUtil.h
rename to Code/Editor/Include/IFileUtil.h
diff --git a/Code/Sandbox/Editor/Include/IGizmoManager.h b/Code/Editor/Include/IGizmoManager.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IGizmoManager.h
rename to Code/Editor/Include/IGizmoManager.h
diff --git a/Code/Sandbox/Editor/Include/IIconManager.h b/Code/Editor/Include/IIconManager.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IIconManager.h
rename to Code/Editor/Include/IIconManager.h
diff --git a/Code/Sandbox/Editor/Include/IImageUtil.h b/Code/Editor/Include/IImageUtil.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IImageUtil.h
rename to Code/Editor/Include/IImageUtil.h
diff --git a/Code/Sandbox/Editor/Include/IKeyTimeSet.h b/Code/Editor/Include/IKeyTimeSet.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IKeyTimeSet.h
rename to Code/Editor/Include/IKeyTimeSet.h
diff --git a/Code/Sandbox/Editor/Include/ILogFile.h b/Code/Editor/Include/ILogFile.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/ILogFile.h
rename to Code/Editor/Include/ILogFile.h
diff --git a/Code/Sandbox/Editor/Include/IObjectManager.h b/Code/Editor/Include/IObjectManager.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IObjectManager.h
rename to Code/Editor/Include/IObjectManager.h
diff --git a/Code/Sandbox/Editor/Include/IPlugin.h b/Code/Editor/Include/IPlugin.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IPlugin.h
rename to Code/Editor/Include/IPlugin.h
diff --git a/Code/Sandbox/Editor/Include/IPreferencesPage.h b/Code/Editor/Include/IPreferencesPage.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IPreferencesPage.h
rename to Code/Editor/Include/IPreferencesPage.h
diff --git a/Code/Sandbox/Editor/Include/IRenderListener.h b/Code/Editor/Include/IRenderListener.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IRenderListener.h
rename to Code/Editor/Include/IRenderListener.h
diff --git a/Code/Sandbox/Editor/Include/IResourceSelectorHost.h b/Code/Editor/Include/IResourceSelectorHost.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IResourceSelectorHost.h
rename to Code/Editor/Include/IResourceSelectorHost.h
diff --git a/Code/Sandbox/Editor/Include/ISourceControl.h b/Code/Editor/Include/ISourceControl.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/ISourceControl.h
rename to Code/Editor/Include/ISourceControl.h
diff --git a/Code/Sandbox/Editor/Include/ISubObjectSelectionReferenceFrameCalculator.h b/Code/Editor/Include/ISubObjectSelectionReferenceFrameCalculator.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/ISubObjectSelectionReferenceFrameCalculator.h
rename to Code/Editor/Include/ISubObjectSelectionReferenceFrameCalculator.h
diff --git a/Code/Sandbox/Editor/Include/ITextureDatabaseUpdater.h b/Code/Editor/Include/ITextureDatabaseUpdater.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/ITextureDatabaseUpdater.h
rename to Code/Editor/Include/ITextureDatabaseUpdater.h
diff --git a/Code/Sandbox/Editor/Include/ITransformManipulator.h b/Code/Editor/Include/ITransformManipulator.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/ITransformManipulator.h
rename to Code/Editor/Include/ITransformManipulator.h
diff --git a/Code/Sandbox/Editor/Include/IViewPane.h b/Code/Editor/Include/IViewPane.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/IViewPane.h
rename to Code/Editor/Include/IViewPane.h
diff --git a/Code/Sandbox/Editor/Include/ObjectEvent.h b/Code/Editor/Include/ObjectEvent.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/ObjectEvent.h
rename to Code/Editor/Include/ObjectEvent.h
diff --git a/Code/Sandbox/Editor/Include/SandboxAPI.h b/Code/Editor/Include/SandboxAPI.h
similarity index 100%
rename from Code/Sandbox/Editor/Include/SandboxAPI.h
rename to Code/Editor/Include/SandboxAPI.h
diff --git a/Code/Sandbox/Editor/InfoBar.qrc b/Code/Editor/InfoBar.qrc
similarity index 100%
rename from Code/Sandbox/Editor/InfoBar.qrc
rename to Code/Editor/InfoBar.qrc
diff --git a/Code/Sandbox/Editor/KeyboardCustomizationSettings.cpp b/Code/Editor/KeyboardCustomizationSettings.cpp
similarity index 100%
rename from Code/Sandbox/Editor/KeyboardCustomizationSettings.cpp
rename to Code/Editor/KeyboardCustomizationSettings.cpp
diff --git a/Code/Sandbox/Editor/KeyboardCustomizationSettings.h b/Code/Editor/KeyboardCustomizationSettings.h
similarity index 100%
rename from Code/Sandbox/Editor/KeyboardCustomizationSettings.h
rename to Code/Editor/KeyboardCustomizationSettings.h
diff --git a/Code/Sandbox/Editor/Launcher/editor_launcher.rc b/Code/Editor/Launcher/editor_launcher.rc
similarity index 100%
rename from Code/Sandbox/Editor/Launcher/editor_launcher.rc
rename to Code/Editor/Launcher/editor_launcher.rc
diff --git a/Code/Sandbox/Editor/Launcher/resource.h b/Code/Editor/Launcher/resource.h
similarity index 100%
rename from Code/Sandbox/Editor/Launcher/resource.h
rename to Code/Editor/Launcher/resource.h
diff --git a/Code/Sandbox/Editor/LayoutConfigDialog.cpp b/Code/Editor/LayoutConfigDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/LayoutConfigDialog.cpp
rename to Code/Editor/LayoutConfigDialog.cpp
diff --git a/Code/Sandbox/Editor/LayoutConfigDialog.h b/Code/Editor/LayoutConfigDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/LayoutConfigDialog.h
rename to Code/Editor/LayoutConfigDialog.h
diff --git a/Code/Sandbox/Editor/LayoutConfigDialog.qrc b/Code/Editor/LayoutConfigDialog.qrc
similarity index 100%
rename from Code/Sandbox/Editor/LayoutConfigDialog.qrc
rename to Code/Editor/LayoutConfigDialog.qrc
diff --git a/Code/Sandbox/Editor/LayoutConfigDialog.ui b/Code/Editor/LayoutConfigDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/LayoutConfigDialog.ui
rename to Code/Editor/LayoutConfigDialog.ui
diff --git a/Code/Sandbox/Editor/LayoutWnd.cpp b/Code/Editor/LayoutWnd.cpp
similarity index 100%
rename from Code/Sandbox/Editor/LayoutWnd.cpp
rename to Code/Editor/LayoutWnd.cpp
diff --git a/Code/Sandbox/Editor/LayoutWnd.h b/Code/Editor/LayoutWnd.h
similarity index 100%
rename from Code/Sandbox/Editor/LayoutWnd.h
rename to Code/Editor/LayoutWnd.h
diff --git a/Code/Sandbox/Editor/LegacyViewportCameraController.cpp b/Code/Editor/LegacyViewportCameraController.cpp
similarity index 100%
rename from Code/Sandbox/Editor/LegacyViewportCameraController.cpp
rename to Code/Editor/LegacyViewportCameraController.cpp
diff --git a/Code/Sandbox/Editor/LegacyViewportCameraController.h b/Code/Editor/LegacyViewportCameraController.h
similarity index 100%
rename from Code/Sandbox/Editor/LegacyViewportCameraController.h
rename to Code/Editor/LegacyViewportCameraController.h
diff --git a/Code/Sandbox/Editor/LevelFileDialog.cpp b/Code/Editor/LevelFileDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/LevelFileDialog.cpp
rename to Code/Editor/LevelFileDialog.cpp
diff --git a/Code/Sandbox/Editor/LevelFileDialog.h b/Code/Editor/LevelFileDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/LevelFileDialog.h
rename to Code/Editor/LevelFileDialog.h
diff --git a/Code/Sandbox/Editor/LevelFileDialog.qrc b/Code/Editor/LevelFileDialog.qrc
similarity index 100%
rename from Code/Sandbox/Editor/LevelFileDialog.qrc
rename to Code/Editor/LevelFileDialog.qrc
diff --git a/Code/Sandbox/Editor/LevelFileDialog.ui b/Code/Editor/LevelFileDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/LevelFileDialog.ui
rename to Code/Editor/LevelFileDialog.ui
diff --git a/Code/Sandbox/Editor/LevelIndependentFileMan.cpp b/Code/Editor/LevelIndependentFileMan.cpp
similarity index 100%
rename from Code/Sandbox/Editor/LevelIndependentFileMan.cpp
rename to Code/Editor/LevelIndependentFileMan.cpp
diff --git a/Code/Sandbox/Editor/LevelIndependentFileMan.h b/Code/Editor/LevelIndependentFileMan.h
similarity index 100%
rename from Code/Sandbox/Editor/LevelIndependentFileMan.h
rename to Code/Editor/LevelIndependentFileMan.h
diff --git a/Code/Sandbox/Editor/LevelInfo.cpp b/Code/Editor/LevelInfo.cpp
similarity index 100%
rename from Code/Sandbox/Editor/LevelInfo.cpp
rename to Code/Editor/LevelInfo.cpp
diff --git a/Code/Sandbox/Editor/LevelInfo.h b/Code/Editor/LevelInfo.h
similarity index 100%
rename from Code/Sandbox/Editor/LevelInfo.h
rename to Code/Editor/LevelInfo.h
diff --git a/Code/Sandbox/Editor/LevelTreeModel.cpp b/Code/Editor/LevelTreeModel.cpp
similarity index 100%
rename from Code/Sandbox/Editor/LevelTreeModel.cpp
rename to Code/Editor/LevelTreeModel.cpp
diff --git a/Code/Sandbox/Editor/LevelTreeModel.h b/Code/Editor/LevelTreeModel.h
similarity index 100%
rename from Code/Sandbox/Editor/LevelTreeModel.h
rename to Code/Editor/LevelTreeModel.h
diff --git a/Code/Sandbox/Editor/Lib/Tests/IEditorMock.h b/Code/Editor/Lib/Tests/IEditorMock.h
similarity index 100%
rename from Code/Sandbox/Editor/Lib/Tests/IEditorMock.h
rename to Code/Editor/Lib/Tests/IEditorMock.h
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_ClickableLabel.cpp b/Code/Editor/Lib/Tests/test_ClickableLabel.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Lib/Tests/test_ClickableLabel.cpp
rename to Code/Editor/Lib/Tests/test_ClickableLabel.cpp
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_CryEditDocPythonBindings.cpp b/Code/Editor/Lib/Tests/test_CryEditDocPythonBindings.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Lib/Tests/test_CryEditDocPythonBindings.cpp
rename to Code/Editor/Lib/Tests/test_CryEditDocPythonBindings.cpp
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_CryEditPythonBindings.cpp b/Code/Editor/Lib/Tests/test_CryEditPythonBindings.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Lib/Tests/test_CryEditPythonBindings.cpp
rename to Code/Editor/Lib/Tests/test_CryEditPythonBindings.cpp
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_DisplaySettingsPythonBindings.cpp b/Code/Editor/Lib/Tests/test_DisplaySettingsPythonBindings.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Lib/Tests/test_DisplaySettingsPythonBindings.cpp
rename to Code/Editor/Lib/Tests/test_DisplaySettingsPythonBindings.cpp
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_EditorPythonBindings.cpp b/Code/Editor/Lib/Tests/test_EditorPythonBindings.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Lib/Tests/test_EditorPythonBindings.cpp
rename to Code/Editor/Lib/Tests/test_EditorPythonBindings.cpp
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_EditorUtils.cpp b/Code/Editor/Lib/Tests/test_EditorUtils.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Lib/Tests/test_EditorUtils.cpp
rename to Code/Editor/Lib/Tests/test_EditorUtils.cpp
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_Main.cpp b/Code/Editor/Lib/Tests/test_Main.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Lib/Tests/test_Main.cpp
rename to Code/Editor/Lib/Tests/test_Main.cpp
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_MainWindowPythonBindings.cpp b/Code/Editor/Lib/Tests/test_MainWindowPythonBindings.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Lib/Tests/test_MainWindowPythonBindings.cpp
rename to Code/Editor/Lib/Tests/test_MainWindowPythonBindings.cpp
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp b/Code/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp
rename to Code/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_TerrainHoleToolPythonBindings.cpp b/Code/Editor/Lib/Tests/test_TerrainHoleToolPythonBindings.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Lib/Tests/test_TerrainHoleToolPythonBindings.cpp
rename to Code/Editor/Lib/Tests/test_TerrainHoleToolPythonBindings.cpp
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_TerrainLayerPythonBindings.cpp b/Code/Editor/Lib/Tests/test_TerrainLayerPythonBindings.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Lib/Tests/test_TerrainLayerPythonBindings.cpp
rename to Code/Editor/Lib/Tests/test_TerrainLayerPythonBindings.cpp
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_TerrainModifyPythonBindings.cpp b/Code/Editor/Lib/Tests/test_TerrainModifyPythonBindings.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Lib/Tests/test_TerrainModifyPythonBindings.cpp
rename to Code/Editor/Lib/Tests/test_TerrainModifyPythonBindings.cpp
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_TerrainPainterPythonBindings.cpp b/Code/Editor/Lib/Tests/test_TerrainPainterPythonBindings.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Lib/Tests/test_TerrainPainterPythonBindings.cpp
rename to Code/Editor/Lib/Tests/test_TerrainPainterPythonBindings.cpp
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_TerrainPythonBindings.cpp b/Code/Editor/Lib/Tests/test_TerrainPythonBindings.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Lib/Tests/test_TerrainPythonBindings.cpp
rename to Code/Editor/Lib/Tests/test_TerrainPythonBindings.cpp
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_TerrainTexturePythonBindings.cpp b/Code/Editor/Lib/Tests/test_TerrainTexturePythonBindings.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Lib/Tests/test_TerrainTexturePythonBindings.cpp
rename to Code/Editor/Lib/Tests/test_TerrainTexturePythonBindings.cpp
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_TrackViewPythonBindings.cpp b/Code/Editor/Lib/Tests/test_TrackViewPythonBindings.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Lib/Tests/test_TrackViewPythonBindings.cpp
rename to Code/Editor/Lib/Tests/test_TrackViewPythonBindings.cpp
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_ViewPanePythonBindings.cpp b/Code/Editor/Lib/Tests/test_ViewPanePythonBindings.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Lib/Tests/test_ViewPanePythonBindings.cpp
rename to Code/Editor/Lib/Tests/test_ViewPanePythonBindings.cpp
diff --git a/Code/Sandbox/Editor/Lib/Tests/test_ViewportTitleDlgPythonBindings.cpp b/Code/Editor/Lib/Tests/test_ViewportTitleDlgPythonBindings.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Lib/Tests/test_ViewportTitleDlgPythonBindings.cpp
rename to Code/Editor/Lib/Tests/test_ViewportTitleDlgPythonBindings.cpp
diff --git a/Code/Sandbox/Editor/LightmapCompiler/SimpleTriangleRasterizer.cpp b/Code/Editor/LightmapCompiler/SimpleTriangleRasterizer.cpp
similarity index 100%
rename from Code/Sandbox/Editor/LightmapCompiler/SimpleTriangleRasterizer.cpp
rename to Code/Editor/LightmapCompiler/SimpleTriangleRasterizer.cpp
diff --git a/Code/Sandbox/Editor/LightmapCompiler/SimpleTriangleRasterizer.h b/Code/Editor/LightmapCompiler/SimpleTriangleRasterizer.h
similarity index 100%
rename from Code/Sandbox/Editor/LightmapCompiler/SimpleTriangleRasterizer.h
rename to Code/Editor/LightmapCompiler/SimpleTriangleRasterizer.h
diff --git a/Code/Sandbox/Editor/LogFile.cpp b/Code/Editor/LogFile.cpp
similarity index 100%
rename from Code/Sandbox/Editor/LogFile.cpp
rename to Code/Editor/LogFile.cpp
diff --git a/Code/Sandbox/Editor/LogFile.h b/Code/Editor/LogFile.h
similarity index 100%
rename from Code/Sandbox/Editor/LogFile.h
rename to Code/Editor/LogFile.h
diff --git a/Code/Sandbox/Editor/LogFileImpl.cpp b/Code/Editor/LogFileImpl.cpp
similarity index 100%
rename from Code/Sandbox/Editor/LogFileImpl.cpp
rename to Code/Editor/LogFileImpl.cpp
diff --git a/Code/Sandbox/Editor/LogFileImpl.h b/Code/Editor/LogFileImpl.h
similarity index 100%
rename from Code/Sandbox/Editor/LogFileImpl.h
rename to Code/Editor/LogFileImpl.h
diff --git a/Code/Sandbox/Editor/LogFile_mac.mm b/Code/Editor/LogFile_mac.mm
similarity index 100%
rename from Code/Sandbox/Editor/LogFile_mac.mm
rename to Code/Editor/LogFile_mac.mm
diff --git a/Code/Sandbox/Editor/LyViewPaneNames.h b/Code/Editor/LyViewPaneNames.h
similarity index 100%
rename from Code/Sandbox/Editor/LyViewPaneNames.h
rename to Code/Editor/LyViewPaneNames.h
diff --git a/Code/Sandbox/Editor/MainStatusBar.cpp b/Code/Editor/MainStatusBar.cpp
similarity index 100%
rename from Code/Sandbox/Editor/MainStatusBar.cpp
rename to Code/Editor/MainStatusBar.cpp
diff --git a/Code/Sandbox/Editor/MainStatusBar.h b/Code/Editor/MainStatusBar.h
similarity index 100%
rename from Code/Sandbox/Editor/MainStatusBar.h
rename to Code/Editor/MainStatusBar.h
diff --git a/Code/Sandbox/Editor/MainStatusBarItems.h b/Code/Editor/MainStatusBarItems.h
similarity index 100%
rename from Code/Sandbox/Editor/MainStatusBarItems.h
rename to Code/Editor/MainStatusBarItems.h
diff --git a/Code/Sandbox/Editor/MainWindow.cpp b/Code/Editor/MainWindow.cpp
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow.cpp
rename to Code/Editor/MainWindow.cpp
diff --git a/Code/Sandbox/Editor/MainWindow.h b/Code/Editor/MainWindow.h
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow.h
rename to Code/Editor/MainWindow.h
diff --git a/Code/Sandbox/Editor/MainWindow.qrc b/Code/Editor/MainWindow.qrc
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow.qrc
rename to Code/Editor/MainWindow.qrc
diff --git a/Code/Sandbox/Editor/MainWindow/ObjSelection.png b/Code/Editor/MainWindow/ObjSelection.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/ObjSelection.png
rename to Code/Editor/MainWindow/ObjSelection.png
diff --git a/Code/Sandbox/Editor/MainWindow/display_info.png b/Code/Editor/MainWindow/display_info.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/display_info.png
rename to Code/Editor/MainWindow/display_info.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-00.png b/Code/Editor/MainWindow/edit_mode_toolbar-00.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-00.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-00.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-01.png b/Code/Editor/MainWindow/edit_mode_toolbar-01.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-01.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-01.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-02.png b/Code/Editor/MainWindow/edit_mode_toolbar-02.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-02.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-02.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-03.png b/Code/Editor/MainWindow/edit_mode_toolbar-03.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-03.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-03.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-05.png b/Code/Editor/MainWindow/edit_mode_toolbar-05.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-05.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-05.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-06.png b/Code/Editor/MainWindow/edit_mode_toolbar-06.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-06.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-06.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-07.png b/Code/Editor/MainWindow/edit_mode_toolbar-07.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-07.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-07.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-08.png b/Code/Editor/MainWindow/edit_mode_toolbar-08.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-08.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-08.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-09.png b/Code/Editor/MainWindow/edit_mode_toolbar-09.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-09.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-09.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-10.png b/Code/Editor/MainWindow/edit_mode_toolbar-10.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-10.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-10.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-11.png b/Code/Editor/MainWindow/edit_mode_toolbar-11.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-11.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-11.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-12.png b/Code/Editor/MainWindow/edit_mode_toolbar-12.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-12.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-12.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-13.png b/Code/Editor/MainWindow/edit_mode_toolbar-13.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-13.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-13.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-14.png b/Code/Editor/MainWindow/edit_mode_toolbar-14.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-14.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-14.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-15.png b/Code/Editor/MainWindow/edit_mode_toolbar-15.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-15.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-15.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-16.png b/Code/Editor/MainWindow/edit_mode_toolbar-16.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-16.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-16.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-17.png b/Code/Editor/MainWindow/edit_mode_toolbar-17.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-17.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-17.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-18.png b/Code/Editor/MainWindow/edit_mode_toolbar-18.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-18.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-18.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-19.png b/Code/Editor/MainWindow/edit_mode_toolbar-19.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-19.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-19.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-20.png b/Code/Editor/MainWindow/edit_mode_toolbar-20.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-20.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-20.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-22.png b/Code/Editor/MainWindow/edit_mode_toolbar-22.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-22.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-22.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-23.png b/Code/Editor/MainWindow/edit_mode_toolbar-23.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-23.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-23.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-24.png b/Code/Editor/MainWindow/edit_mode_toolbar-24.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-24.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-24.png
diff --git a/Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-25.png b/Code/Editor/MainWindow/edit_mode_toolbar-25.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/edit_mode_toolbar-25.png
rename to Code/Editor/MainWindow/edit_mode_toolbar-25.png
diff --git a/Code/Sandbox/Editor/MainWindow/editwithbutton_dark.png b/Code/Editor/MainWindow/editwithbutton_dark.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/editwithbutton_dark.png
rename to Code/Editor/MainWindow/editwithbutton_dark.png
diff --git a/Code/Sandbox/Editor/MainWindow/editwithbutton_light.png b/Code/Editor/MainWindow/editwithbutton_light.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/editwithbutton_light.png
rename to Code/Editor/MainWindow/editwithbutton_light.png
diff --git a/Code/Sandbox/Editor/MainWindow/hide_helpers.png b/Code/Editor/MainWindow/hide_helpers.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/hide_helpers.png
rename to Code/Editor/MainWindow/hide_helpers.png
diff --git a/Code/Sandbox/Editor/MainWindow/maximize.png b/Code/Editor/MainWindow/maximize.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/maximize.png
rename to Code/Editor/MainWindow/maximize.png
diff --git a/Code/Sandbox/Editor/MainWindow/misc_toolbar-00.png b/Code/Editor/MainWindow/misc_toolbar-00.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/misc_toolbar-00.png
rename to Code/Editor/MainWindow/misc_toolbar-00.png
diff --git a/Code/Sandbox/Editor/MainWindow/object_toolbar-00.png b/Code/Editor/MainWindow/object_toolbar-00.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/object_toolbar-00.png
rename to Code/Editor/MainWindow/object_toolbar-00.png
diff --git a/Code/Sandbox/Editor/MainWindow/object_toolbar-01.png b/Code/Editor/MainWindow/object_toolbar-01.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/object_toolbar-01.png
rename to Code/Editor/MainWindow/object_toolbar-01.png
diff --git a/Code/Sandbox/Editor/MainWindow/object_toolbar-02.png b/Code/Editor/MainWindow/object_toolbar-02.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/object_toolbar-02.png
rename to Code/Editor/MainWindow/object_toolbar-02.png
diff --git a/Code/Sandbox/Editor/MainWindow/object_toolbar-03.svg b/Code/Editor/MainWindow/object_toolbar-03.svg
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/object_toolbar-03.svg
rename to Code/Editor/MainWindow/object_toolbar-03.svg
diff --git a/Code/Sandbox/Editor/MainWindow/object_toolbar-04.png b/Code/Editor/MainWindow/object_toolbar-04.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/object_toolbar-04.png
rename to Code/Editor/MainWindow/object_toolbar-04.png
diff --git a/Code/Sandbox/Editor/MainWindow/object_toolbar-05.png b/Code/Editor/MainWindow/object_toolbar-05.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/object_toolbar-05.png
rename to Code/Editor/MainWindow/object_toolbar-05.png
diff --git a/Code/Sandbox/Editor/MainWindow/object_toolbar-06.png b/Code/Editor/MainWindow/object_toolbar-06.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/object_toolbar-06.png
rename to Code/Editor/MainWindow/object_toolbar-06.png
diff --git a/Code/Sandbox/Editor/MainWindow/object_toolbar-07.png b/Code/Editor/MainWindow/object_toolbar-07.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/object_toolbar-07.png
rename to Code/Editor/MainWindow/object_toolbar-07.png
diff --git a/Code/Sandbox/Editor/MainWindow/object_toolbar-08.png b/Code/Editor/MainWindow/object_toolbar-08.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/object_toolbar-08.png
rename to Code/Editor/MainWindow/object_toolbar-08.png
diff --git a/Code/Sandbox/Editor/MainWindow/object_toolbar-09.png b/Code/Editor/MainWindow/object_toolbar-09.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/object_toolbar-09.png
rename to Code/Editor/MainWindow/object_toolbar-09.png
diff --git a/Code/Sandbox/Editor/MainWindow/object_toolbar-10.png b/Code/Editor/MainWindow/object_toolbar-10.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/object_toolbar-10.png
rename to Code/Editor/MainWindow/object_toolbar-10.png
diff --git a/Code/Sandbox/Editor/MainWindow/proceduralmaterial_toolbar.png b/Code/Editor/MainWindow/proceduralmaterial_toolbar.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/proceduralmaterial_toolbar.png
rename to Code/Editor/MainWindow/proceduralmaterial_toolbar.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-00.png b/Code/Editor/MainWindow/standard_views_toolbar-00.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-00.png
rename to Code/Editor/MainWindow/standard_views_toolbar-00.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-01.png b/Code/Editor/MainWindow/standard_views_toolbar-01.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-01.png
rename to Code/Editor/MainWindow/standard_views_toolbar-01.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-02.png b/Code/Editor/MainWindow/standard_views_toolbar-02.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-02.png
rename to Code/Editor/MainWindow/standard_views_toolbar-02.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-03.png b/Code/Editor/MainWindow/standard_views_toolbar-03.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-03.png
rename to Code/Editor/MainWindow/standard_views_toolbar-03.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-04.png b/Code/Editor/MainWindow/standard_views_toolbar-04.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-04.png
rename to Code/Editor/MainWindow/standard_views_toolbar-04.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-05.png b/Code/Editor/MainWindow/standard_views_toolbar-05.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-05.png
rename to Code/Editor/MainWindow/standard_views_toolbar-05.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-06.png b/Code/Editor/MainWindow/standard_views_toolbar-06.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-06.png
rename to Code/Editor/MainWindow/standard_views_toolbar-06.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-07.png b/Code/Editor/MainWindow/standard_views_toolbar-07.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-07.png
rename to Code/Editor/MainWindow/standard_views_toolbar-07.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-08.png b/Code/Editor/MainWindow/standard_views_toolbar-08.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-08.png
rename to Code/Editor/MainWindow/standard_views_toolbar-08.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-09.png b/Code/Editor/MainWindow/standard_views_toolbar-09.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-09.png
rename to Code/Editor/MainWindow/standard_views_toolbar-09.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-10.png b/Code/Editor/MainWindow/standard_views_toolbar-10.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-10.png
rename to Code/Editor/MainWindow/standard_views_toolbar-10.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-11.png b/Code/Editor/MainWindow/standard_views_toolbar-11.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-11.png
rename to Code/Editor/MainWindow/standard_views_toolbar-11.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-12.png b/Code/Editor/MainWindow/standard_views_toolbar-12.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-12.png
rename to Code/Editor/MainWindow/standard_views_toolbar-12.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-13.png b/Code/Editor/MainWindow/standard_views_toolbar-13.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-13.png
rename to Code/Editor/MainWindow/standard_views_toolbar-13.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-14.png b/Code/Editor/MainWindow/standard_views_toolbar-14.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-14.png
rename to Code/Editor/MainWindow/standard_views_toolbar-14.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-15.png b/Code/Editor/MainWindow/standard_views_toolbar-15.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-15.png
rename to Code/Editor/MainWindow/standard_views_toolbar-15.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-16.png b/Code/Editor/MainWindow/standard_views_toolbar-16.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-16.png
rename to Code/Editor/MainWindow/standard_views_toolbar-16.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-17.png b/Code/Editor/MainWindow/standard_views_toolbar-17.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-17.png
rename to Code/Editor/MainWindow/standard_views_toolbar-17.png
diff --git a/Code/Sandbox/Editor/MainWindow/standard_views_toolbar-18.png b/Code/Editor/MainWindow/standard_views_toolbar-18.png
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow/standard_views_toolbar-18.png
rename to Code/Editor/MainWindow/standard_views_toolbar-18.png
diff --git a/Code/Sandbox/Editor/MainWindow_mac.mm b/Code/Editor/MainWindow_mac.mm
similarity index 100%
rename from Code/Sandbox/Editor/MainWindow_mac.mm
rename to Code/Editor/MainWindow_mac.mm
diff --git a/Code/Sandbox/Editor/NewLevelDialog.cpp b/Code/Editor/NewLevelDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/NewLevelDialog.cpp
rename to Code/Editor/NewLevelDialog.cpp
diff --git a/Code/Sandbox/Editor/NewLevelDialog.h b/Code/Editor/NewLevelDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/NewLevelDialog.h
rename to Code/Editor/NewLevelDialog.h
diff --git a/Code/Sandbox/Editor/NewLevelDialog.ui b/Code/Editor/NewLevelDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/NewLevelDialog.ui
rename to Code/Editor/NewLevelDialog.ui
diff --git a/Code/Sandbox/Editor/NewTerrainDialog.cpp b/Code/Editor/NewTerrainDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/NewTerrainDialog.cpp
rename to Code/Editor/NewTerrainDialog.cpp
diff --git a/Code/Sandbox/Editor/NewTerrainDialog.h b/Code/Editor/NewTerrainDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/NewTerrainDialog.h
rename to Code/Editor/NewTerrainDialog.h
diff --git a/Code/Sandbox/Editor/NewTerrainDialog.ui b/Code/Editor/NewTerrainDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/NewTerrainDialog.ui
rename to Code/Editor/NewTerrainDialog.ui
diff --git a/Code/Sandbox/Editor/Objects/AxisGizmo.cpp b/Code/Editor/Objects/AxisGizmo.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Objects/AxisGizmo.cpp
rename to Code/Editor/Objects/AxisGizmo.cpp
diff --git a/Code/Sandbox/Editor/Objects/AxisGizmo.h b/Code/Editor/Objects/AxisGizmo.h
similarity index 100%
rename from Code/Sandbox/Editor/Objects/AxisGizmo.h
rename to Code/Editor/Objects/AxisGizmo.h
diff --git a/Code/Sandbox/Editor/Objects/BaseObject.cpp b/Code/Editor/Objects/BaseObject.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Objects/BaseObject.cpp
rename to Code/Editor/Objects/BaseObject.cpp
diff --git a/Code/Sandbox/Editor/Objects/BaseObject.h b/Code/Editor/Objects/BaseObject.h
similarity index 100%
rename from Code/Sandbox/Editor/Objects/BaseObject.h
rename to Code/Editor/Objects/BaseObject.h
diff --git a/Code/Sandbox/Editor/Objects/ClassDesc.cpp b/Code/Editor/Objects/ClassDesc.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Objects/ClassDesc.cpp
rename to Code/Editor/Objects/ClassDesc.cpp
diff --git a/Code/Sandbox/Editor/Objects/ClassDesc.h b/Code/Editor/Objects/ClassDesc.h
similarity index 100%
rename from Code/Sandbox/Editor/Objects/ClassDesc.h
rename to Code/Editor/Objects/ClassDesc.h
diff --git a/Code/Sandbox/Editor/Objects/DisplayContext.cpp b/Code/Editor/Objects/DisplayContext.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Objects/DisplayContext.cpp
rename to Code/Editor/Objects/DisplayContext.cpp
diff --git a/Code/Sandbox/Editor/Objects/DisplayContext.h b/Code/Editor/Objects/DisplayContext.h
similarity index 100%
rename from Code/Sandbox/Editor/Objects/DisplayContext.h
rename to Code/Editor/Objects/DisplayContext.h
diff --git a/Code/Sandbox/Editor/Objects/DisplayContextShared.inl b/Code/Editor/Objects/DisplayContextShared.inl
similarity index 100%
rename from Code/Sandbox/Editor/Objects/DisplayContextShared.inl
rename to Code/Editor/Objects/DisplayContextShared.inl
diff --git a/Code/Sandbox/Editor/Objects/EntityObject.cpp b/Code/Editor/Objects/EntityObject.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Objects/EntityObject.cpp
rename to Code/Editor/Objects/EntityObject.cpp
diff --git a/Code/Sandbox/Editor/Objects/EntityObject.h b/Code/Editor/Objects/EntityObject.h
similarity index 100%
rename from Code/Sandbox/Editor/Objects/EntityObject.h
rename to Code/Editor/Objects/EntityObject.h
diff --git a/Code/Sandbox/Editor/Objects/Gizmo.cpp b/Code/Editor/Objects/Gizmo.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Objects/Gizmo.cpp
rename to Code/Editor/Objects/Gizmo.cpp
diff --git a/Code/Sandbox/Editor/Objects/Gizmo.h b/Code/Editor/Objects/Gizmo.h
similarity index 100%
rename from Code/Sandbox/Editor/Objects/Gizmo.h
rename to Code/Editor/Objects/Gizmo.h
diff --git a/Code/Sandbox/Editor/Objects/GizmoManager.cpp b/Code/Editor/Objects/GizmoManager.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Objects/GizmoManager.cpp
rename to Code/Editor/Objects/GizmoManager.cpp
diff --git a/Code/Sandbox/Editor/Objects/GizmoManager.h b/Code/Editor/Objects/GizmoManager.h
similarity index 100%
rename from Code/Sandbox/Editor/Objects/GizmoManager.h
rename to Code/Editor/Objects/GizmoManager.h
diff --git a/Code/Sandbox/Editor/Objects/IEntityObjectListener.h b/Code/Editor/Objects/IEntityObjectListener.h
similarity index 100%
rename from Code/Sandbox/Editor/Objects/IEntityObjectListener.h
rename to Code/Editor/Objects/IEntityObjectListener.h
diff --git a/Code/Sandbox/Editor/Objects/LineGizmo.cpp b/Code/Editor/Objects/LineGizmo.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Objects/LineGizmo.cpp
rename to Code/Editor/Objects/LineGizmo.cpp
diff --git a/Code/Sandbox/Editor/Objects/LineGizmo.h b/Code/Editor/Objects/LineGizmo.h
similarity index 100%
rename from Code/Sandbox/Editor/Objects/LineGizmo.h
rename to Code/Editor/Objects/LineGizmo.h
diff --git a/Code/Sandbox/Editor/Objects/ObjectLoader.cpp b/Code/Editor/Objects/ObjectLoader.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Objects/ObjectLoader.cpp
rename to Code/Editor/Objects/ObjectLoader.cpp
diff --git a/Code/Sandbox/Editor/Objects/ObjectLoader.h b/Code/Editor/Objects/ObjectLoader.h
similarity index 100%
rename from Code/Sandbox/Editor/Objects/ObjectLoader.h
rename to Code/Editor/Objects/ObjectLoader.h
diff --git a/Code/Sandbox/Editor/Objects/ObjectManager.cpp b/Code/Editor/Objects/ObjectManager.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Objects/ObjectManager.cpp
rename to Code/Editor/Objects/ObjectManager.cpp
diff --git a/Code/Sandbox/Editor/Objects/ObjectManager.h b/Code/Editor/Objects/ObjectManager.h
similarity index 100%
rename from Code/Sandbox/Editor/Objects/ObjectManager.h
rename to Code/Editor/Objects/ObjectManager.h
diff --git a/Code/Sandbox/Editor/Objects/ObjectManagerEventBus.h b/Code/Editor/Objects/ObjectManagerEventBus.h
similarity index 100%
rename from Code/Sandbox/Editor/Objects/ObjectManagerEventBus.h
rename to Code/Editor/Objects/ObjectManagerEventBus.h
diff --git a/Code/Sandbox/Editor/Objects/ObjectManagerLegacyUndo.cpp b/Code/Editor/Objects/ObjectManagerLegacyUndo.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Objects/ObjectManagerLegacyUndo.cpp
rename to Code/Editor/Objects/ObjectManagerLegacyUndo.cpp
diff --git a/Code/Sandbox/Editor/Objects/ObjectManagerLegacyUndo.h b/Code/Editor/Objects/ObjectManagerLegacyUndo.h
similarity index 100%
rename from Code/Sandbox/Editor/Objects/ObjectManagerLegacyUndo.h
rename to Code/Editor/Objects/ObjectManagerLegacyUndo.h
diff --git a/Code/Sandbox/Editor/Objects/SelectionGroup.cpp b/Code/Editor/Objects/SelectionGroup.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Objects/SelectionGroup.cpp
rename to Code/Editor/Objects/SelectionGroup.cpp
diff --git a/Code/Sandbox/Editor/Objects/SelectionGroup.h b/Code/Editor/Objects/SelectionGroup.h
similarity index 100%
rename from Code/Sandbox/Editor/Objects/SelectionGroup.h
rename to Code/Editor/Objects/SelectionGroup.h
diff --git a/Code/Sandbox/Editor/Objects/SubObjSelection.cpp b/Code/Editor/Objects/SubObjSelection.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Objects/SubObjSelection.cpp
rename to Code/Editor/Objects/SubObjSelection.cpp
diff --git a/Code/Sandbox/Editor/Objects/SubObjSelection.h b/Code/Editor/Objects/SubObjSelection.h
similarity index 100%
rename from Code/Sandbox/Editor/Objects/SubObjSelection.h
rename to Code/Editor/Objects/SubObjSelection.h
diff --git a/Code/Sandbox/Editor/Objects/TrackGizmo.cpp b/Code/Editor/Objects/TrackGizmo.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Objects/TrackGizmo.cpp
rename to Code/Editor/Objects/TrackGizmo.cpp
diff --git a/Code/Sandbox/Editor/Objects/TrackGizmo.h b/Code/Editor/Objects/TrackGizmo.h
similarity index 100%
rename from Code/Sandbox/Editor/Objects/TrackGizmo.h
rename to Code/Editor/Objects/TrackGizmo.h
diff --git a/Code/Sandbox/Editor/PakManagerDlg.qrc b/Code/Editor/PakManagerDlg.qrc
similarity index 100%
rename from Code/Sandbox/Editor/PakManagerDlg.qrc
rename to Code/Editor/PakManagerDlg.qrc
diff --git a/Code/Sandbox/Editor/PakManagerDlg.ui b/Code/Editor/PakManagerDlg.ui
similarity index 100%
rename from Code/Sandbox/Editor/PakManagerDlg.ui
rename to Code/Editor/PakManagerDlg.ui
diff --git a/Code/Sandbox/Editor/Platform/Android/editor_android.cmake b/Code/Editor/Platform/Android/editor_android.cmake
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Android/editor_android.cmake
rename to Code/Editor/Platform/Android/editor_android.cmake
diff --git a/Code/Sandbox/Editor/Platform/Android/editor_lib_android.cmake b/Code/Editor/Platform/Android/editor_lib_android.cmake
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Android/editor_lib_android.cmake
rename to Code/Editor/Platform/Android/editor_lib_android.cmake
diff --git a/Code/Sandbox/Editor/Platform/Common/Clang/editor_lib_clang.cmake b/Code/Editor/Platform/Common/Clang/editor_lib_clang.cmake
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Common/Clang/editor_lib_clang.cmake
rename to Code/Editor/Platform/Common/Clang/editor_lib_clang.cmake
diff --git a/Code/Sandbox/Editor/Platform/Common/MSVC/editor_lib_msvc.cmake b/Code/Editor/Platform/Common/MSVC/editor_lib_msvc.cmake
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Common/MSVC/editor_lib_msvc.cmake
rename to Code/Editor/Platform/Common/MSVC/editor_lib_msvc.cmake
diff --git a/Code/Sandbox/Editor/Platform/Common/Unimplemented/Util/Mailer_Unimplemented.cpp b/Code/Editor/Platform/Common/Unimplemented/Util/Mailer_Unimplemented.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Common/Unimplemented/Util/Mailer_Unimplemented.cpp
rename to Code/Editor/Platform/Common/Unimplemented/Util/Mailer_Unimplemented.cpp
diff --git a/Code/Sandbox/Editor/Platform/Linux/editor_core_files_linux.cmake b/Code/Editor/Platform/Linux/editor_core_files_linux.cmake
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Linux/editor_core_files_linux.cmake
rename to Code/Editor/Platform/Linux/editor_core_files_linux.cmake
diff --git a/Code/Sandbox/Editor/Platform/Linux/editor_lib_linux.cmake b/Code/Editor/Platform/Linux/editor_lib_linux.cmake
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Linux/editor_lib_linux.cmake
rename to Code/Editor/Platform/Linux/editor_lib_linux.cmake
diff --git a/Code/Sandbox/Editor/Platform/Linux/editor_linux.cmake b/Code/Editor/Platform/Linux/editor_linux.cmake
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Linux/editor_linux.cmake
rename to Code/Editor/Platform/Linux/editor_linux.cmake
diff --git a/Code/Sandbox/Editor/Platform/Linux/platform_linux_files.cmake b/Code/Editor/Platform/Linux/platform_linux_files.cmake
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Linux/platform_linux_files.cmake
rename to Code/Editor/Platform/Linux/platform_linux_files.cmake
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/Contents.json b/Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/Contents.json
rename to Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/Contents.json
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_128 _2x.png b/Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_128 _2x.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_128 _2x.png
rename to Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_128 _2x.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_128.png b/Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_128.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_128.png
rename to Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_128.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_16.png b/Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_16.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_16.png
rename to Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_16.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_16_2x.png b/Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_16_2x.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_16_2x.png
rename to Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_16_2x.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_256 _2x.png b/Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_256 _2x.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_256 _2x.png
rename to Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_256 _2x.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_256.png b/Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_256.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_256.png
rename to Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_256.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_32.png b/Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_32.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_32.png
rename to Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_32.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_32_2x.png b/Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_32_2x.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_32_2x.png
rename to Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_32_2x.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_512.png b/Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_512.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_512.png
rename to Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_512.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_512_2x.png b/Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_512_2x.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_512_2x.png
rename to Code/Editor/Platform/Mac/Images.xcassets/AppIcon.appiconset/icon_512_2x.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/Contents.json b/Code/Editor/Platform/Mac/Images.xcassets/Contents.json
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/Contents.json
rename to Code/Editor/Platform/Mac/Images.xcassets/Contents.json
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/Contents.json b/Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/Contents.json
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/Contents.json
rename to Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/Contents.json
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_128 _2x.png b/Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_128 _2x.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_128 _2x.png
rename to Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_128 _2x.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_128.png b/Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_128.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_128.png
rename to Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_128.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_16.png b/Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_16.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_16.png
rename to Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_16.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_16_2x.png b/Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_16_2x.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_16_2x.png
rename to Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_16_2x.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_256 _2x.png b/Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_256 _2x.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_256 _2x.png
rename to Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_256 _2x.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_256.png b/Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_256.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_256.png
rename to Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_256.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_32.png b/Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_32.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_32.png
rename to Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_32.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_32_2x.png b/Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_32_2x.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_32_2x.png
rename to Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_32_2x.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_512.png b/Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_512.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_512.png
rename to Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_512.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_512_2x.png b/Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_512_2x.png
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_512_2x.png
rename to Code/Editor/Platform/Mac/Images.xcassets/EditorAppIcon.appiconset/icon_512_2x.png
diff --git a/Code/Sandbox/Editor/Platform/Mac/editor_core_files_mac.cmake b/Code/Editor/Platform/Mac/editor_core_files_mac.cmake
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/editor_core_files_mac.cmake
rename to Code/Editor/Platform/Mac/editor_core_files_mac.cmake
diff --git a/Code/Sandbox/Editor/Platform/Mac/editor_lib_mac.cmake b/Code/Editor/Platform/Mac/editor_lib_mac.cmake
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/editor_lib_mac.cmake
rename to Code/Editor/Platform/Mac/editor_lib_mac.cmake
diff --git a/Code/Sandbox/Editor/Platform/Mac/editor_mac.cmake b/Code/Editor/Platform/Mac/editor_mac.cmake
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/editor_mac.cmake
rename to Code/Editor/Platform/Mac/editor_mac.cmake
diff --git a/Code/Sandbox/Editor/Platform/Mac/gui_info.plist b/Code/Editor/Platform/Mac/gui_info.plist
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/gui_info.plist
rename to Code/Editor/Platform/Mac/gui_info.plist
diff --git a/Code/Sandbox/Editor/Platform/Mac/platform_mac_files.cmake b/Code/Editor/Platform/Mac/platform_mac_files.cmake
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Mac/platform_mac_files.cmake
rename to Code/Editor/Platform/Mac/platform_mac_files.cmake
diff --git a/Code/Sandbox/Editor/Platform/Windows/Util/Mailer_Windows.cpp b/Code/Editor/Platform/Windows/Util/Mailer_Windows.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Windows/Util/Mailer_Windows.cpp
rename to Code/Editor/Platform/Windows/Util/Mailer_Windows.cpp
diff --git a/Code/Sandbox/Editor/Platform/Windows/editor_core_files_windows.cmake b/Code/Editor/Platform/Windows/editor_core_files_windows.cmake
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Windows/editor_core_files_windows.cmake
rename to Code/Editor/Platform/Windows/editor_core_files_windows.cmake
diff --git a/Code/Sandbox/Editor/Platform/Windows/editor_lib_windows.cmake b/Code/Editor/Platform/Windows/editor_lib_windows.cmake
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Windows/editor_lib_windows.cmake
rename to Code/Editor/Platform/Windows/editor_lib_windows.cmake
diff --git a/Code/Sandbox/Editor/Platform/Windows/editor_windows.cmake b/Code/Editor/Platform/Windows/editor_windows.cmake
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Windows/editor_windows.cmake
rename to Code/Editor/Platform/Windows/editor_windows.cmake
diff --git a/Code/Sandbox/Editor/Platform/Windows/platform_windows_files.cmake b/Code/Editor/Platform/Windows/platform_windows_files.cmake
similarity index 100%
rename from Code/Sandbox/Editor/Platform/Windows/platform_windows_files.cmake
rename to Code/Editor/Platform/Windows/platform_windows_files.cmake
diff --git a/Code/Sandbox/Editor/Platform/iOS/editor_ios.cmake b/Code/Editor/Platform/iOS/editor_ios.cmake
similarity index 100%
rename from Code/Sandbox/Editor/Platform/iOS/editor_ios.cmake
rename to Code/Editor/Platform/iOS/editor_ios.cmake
diff --git a/Code/Sandbox/Editor/Platform/iOS/editor_lib_ios.cmake b/Code/Editor/Platform/iOS/editor_lib_ios.cmake
similarity index 100%
rename from Code/Sandbox/Editor/Platform/iOS/editor_lib_ios.cmake
rename to Code/Editor/Platform/iOS/editor_lib_ios.cmake
diff --git a/Code/Sandbox/Editor/Plugin.cpp b/Code/Editor/Plugin.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Plugin.cpp
rename to Code/Editor/Plugin.cpp
diff --git a/Code/Sandbox/Editor/Plugin.h b/Code/Editor/Plugin.h
similarity index 100%
rename from Code/Sandbox/Editor/Plugin.h
rename to Code/Editor/Plugin.h
diff --git a/Code/Sandbox/Editor/PluginManager.cpp b/Code/Editor/PluginManager.cpp
similarity index 100%
rename from Code/Sandbox/Editor/PluginManager.cpp
rename to Code/Editor/PluginManager.cpp
diff --git a/Code/Sandbox/Editor/PluginManager.h b/Code/Editor/PluginManager.h
similarity index 100%
rename from Code/Sandbox/Editor/PluginManager.h
rename to Code/Editor/PluginManager.h
diff --git a/Code/Sandbox/Editor/PreferencesStdPages.cpp b/Code/Editor/PreferencesStdPages.cpp
similarity index 100%
rename from Code/Sandbox/Editor/PreferencesStdPages.cpp
rename to Code/Editor/PreferencesStdPages.cpp
diff --git a/Code/Sandbox/Editor/PreferencesStdPages.h b/Code/Editor/PreferencesStdPages.h
similarity index 100%
rename from Code/Sandbox/Editor/PreferencesStdPages.h
rename to Code/Editor/PreferencesStdPages.h
diff --git a/Code/Sandbox/Editor/ProcessInfo.cpp b/Code/Editor/ProcessInfo.cpp
similarity index 100%
rename from Code/Sandbox/Editor/ProcessInfo.cpp
rename to Code/Editor/ProcessInfo.cpp
diff --git a/Code/Sandbox/Editor/ProcessInfo.h b/Code/Editor/ProcessInfo.h
similarity index 100%
rename from Code/Sandbox/Editor/ProcessInfo.h
rename to Code/Editor/ProcessInfo.h
diff --git a/Code/Sandbox/Editor/PythonEditorEventsBus.h b/Code/Editor/PythonEditorEventsBus.h
similarity index 100%
rename from Code/Sandbox/Editor/PythonEditorEventsBus.h
rename to Code/Editor/PythonEditorEventsBus.h
diff --git a/Code/Sandbox/Editor/PythonEditorFuncs.cpp b/Code/Editor/PythonEditorFuncs.cpp
similarity index 100%
rename from Code/Sandbox/Editor/PythonEditorFuncs.cpp
rename to Code/Editor/PythonEditorFuncs.cpp
diff --git a/Code/Sandbox/Editor/PythonEditorFuncs.h b/Code/Editor/PythonEditorFuncs.h
similarity index 100%
rename from Code/Sandbox/Editor/PythonEditorFuncs.h
rename to Code/Editor/PythonEditorFuncs.h
diff --git a/Code/Sandbox/Editor/QtUI/ClickableLabel.cpp b/Code/Editor/QtUI/ClickableLabel.cpp
similarity index 100%
rename from Code/Sandbox/Editor/QtUI/ClickableLabel.cpp
rename to Code/Editor/QtUI/ClickableLabel.cpp
diff --git a/Code/Sandbox/Editor/QtUI/ClickableLabel.h b/Code/Editor/QtUI/ClickableLabel.h
similarity index 100%
rename from Code/Sandbox/Editor/QtUI/ClickableLabel.h
rename to Code/Editor/QtUI/ClickableLabel.h
diff --git a/Code/Sandbox/Editor/QtUI/ColorButton.cpp b/Code/Editor/QtUI/ColorButton.cpp
similarity index 100%
rename from Code/Sandbox/Editor/QtUI/ColorButton.cpp
rename to Code/Editor/QtUI/ColorButton.cpp
diff --git a/Code/Sandbox/Editor/QtUI/ColorButton.h b/Code/Editor/QtUI/ColorButton.h
similarity index 100%
rename from Code/Sandbox/Editor/QtUI/ColorButton.h
rename to Code/Editor/QtUI/ColorButton.h
diff --git a/Code/Sandbox/Editor/QtUI/ColorButton_mac.mm b/Code/Editor/QtUI/ColorButton_mac.mm
similarity index 100%
rename from Code/Sandbox/Editor/QtUI/ColorButton_mac.mm
rename to Code/Editor/QtUI/ColorButton_mac.mm
diff --git a/Code/Sandbox/Editor/QtUI/PixmapLabelPreview.cpp b/Code/Editor/QtUI/PixmapLabelPreview.cpp
similarity index 100%
rename from Code/Sandbox/Editor/QtUI/PixmapLabelPreview.cpp
rename to Code/Editor/QtUI/PixmapLabelPreview.cpp
diff --git a/Code/Sandbox/Editor/QtUI/PixmapLabelPreview.h b/Code/Editor/QtUI/PixmapLabelPreview.h
similarity index 100%
rename from Code/Sandbox/Editor/QtUI/PixmapLabelPreview.h
rename to Code/Editor/QtUI/PixmapLabelPreview.h
diff --git a/Code/Sandbox/Editor/QtUI/QCollapsibleGroupBox.cpp b/Code/Editor/QtUI/QCollapsibleGroupBox.cpp
similarity index 100%
rename from Code/Sandbox/Editor/QtUI/QCollapsibleGroupBox.cpp
rename to Code/Editor/QtUI/QCollapsibleGroupBox.cpp
diff --git a/Code/Sandbox/Editor/QtUI/QCollapsibleGroupBox.h b/Code/Editor/QtUI/QCollapsibleGroupBox.h
similarity index 100%
rename from Code/Sandbox/Editor/QtUI/QCollapsibleGroupBox.h
rename to Code/Editor/QtUI/QCollapsibleGroupBox.h
diff --git a/Code/Sandbox/Editor/QtUI/WaitCursor.cpp b/Code/Editor/QtUI/WaitCursor.cpp
similarity index 100%
rename from Code/Sandbox/Editor/QtUI/WaitCursor.cpp
rename to Code/Editor/QtUI/WaitCursor.cpp
diff --git a/Code/Sandbox/Editor/QtUI/WaitCursor.h b/Code/Editor/QtUI/WaitCursor.h
similarity index 100%
rename from Code/Sandbox/Editor/QtUI/WaitCursor.h
rename to Code/Editor/QtUI/WaitCursor.h
diff --git a/Code/Sandbox/Editor/QtUtil.h b/Code/Editor/QtUtil.h
similarity index 100%
rename from Code/Sandbox/Editor/QtUtil.h
rename to Code/Editor/QtUtil.h
diff --git a/Code/Sandbox/Editor/QtUtilWin.h b/Code/Editor/QtUtilWin.h
similarity index 100%
rename from Code/Sandbox/Editor/QtUtilWin.h
rename to Code/Editor/QtUtilWin.h
diff --git a/Code/Sandbox/Editor/QtViewPane.h b/Code/Editor/QtViewPane.h
similarity index 100%
rename from Code/Sandbox/Editor/QtViewPane.h
rename to Code/Editor/QtViewPane.h
diff --git a/Code/Sandbox/Editor/QtViewPaneManager.cpp b/Code/Editor/QtViewPaneManager.cpp
similarity index 100%
rename from Code/Sandbox/Editor/QtViewPaneManager.cpp
rename to Code/Editor/QtViewPaneManager.cpp
diff --git a/Code/Sandbox/Editor/QtViewPaneManager.h b/Code/Editor/QtViewPaneManager.h
similarity index 100%
rename from Code/Sandbox/Editor/QtViewPaneManager.h
rename to Code/Editor/QtViewPaneManager.h
diff --git a/Code/Sandbox/Editor/QuickAccessBar.cpp b/Code/Editor/QuickAccessBar.cpp
similarity index 100%
rename from Code/Sandbox/Editor/QuickAccessBar.cpp
rename to Code/Editor/QuickAccessBar.cpp
diff --git a/Code/Sandbox/Editor/QuickAccessBar.h b/Code/Editor/QuickAccessBar.h
similarity index 100%
rename from Code/Sandbox/Editor/QuickAccessBar.h
rename to Code/Editor/QuickAccessBar.h
diff --git a/Code/Sandbox/Editor/QuickAccessBar.ui b/Code/Editor/QuickAccessBar.ui
similarity index 100%
rename from Code/Sandbox/Editor/QuickAccessBar.ui
rename to Code/Editor/QuickAccessBar.ui
diff --git a/Code/Sandbox/Editor/RenderHelpers/AxisHelper.cpp b/Code/Editor/RenderHelpers/AxisHelper.cpp
similarity index 100%
rename from Code/Sandbox/Editor/RenderHelpers/AxisHelper.cpp
rename to Code/Editor/RenderHelpers/AxisHelper.cpp
diff --git a/Code/Sandbox/Editor/RenderHelpers/AxisHelper.h b/Code/Editor/RenderHelpers/AxisHelper.h
similarity index 100%
rename from Code/Sandbox/Editor/RenderHelpers/AxisHelper.h
rename to Code/Editor/RenderHelpers/AxisHelper.h
diff --git a/Code/Sandbox/Editor/RenderHelpers/AxisHelperShared.inl b/Code/Editor/RenderHelpers/AxisHelperShared.inl
similarity index 100%
rename from Code/Sandbox/Editor/RenderHelpers/AxisHelperShared.inl
rename to Code/Editor/RenderHelpers/AxisHelperShared.inl
diff --git a/Code/Sandbox/Editor/RenderViewport.cpp b/Code/Editor/RenderViewport.cpp
similarity index 100%
rename from Code/Sandbox/Editor/RenderViewport.cpp
rename to Code/Editor/RenderViewport.cpp
diff --git a/Code/Sandbox/Editor/RenderViewport.h b/Code/Editor/RenderViewport.h
similarity index 100%
rename from Code/Sandbox/Editor/RenderViewport.h
rename to Code/Editor/RenderViewport.h
diff --git a/Code/Sandbox/Editor/RenderViewport_mac.mm b/Code/Editor/RenderViewport_mac.mm
similarity index 100%
rename from Code/Sandbox/Editor/RenderViewport_mac.mm
rename to Code/Editor/RenderViewport_mac.mm
diff --git a/Code/Sandbox/Editor/Report.h b/Code/Editor/Report.h
similarity index 100%
rename from Code/Sandbox/Editor/Report.h
rename to Code/Editor/Report.h
diff --git a/Code/Sandbox/Editor/ResizeResolutionDialog.cpp b/Code/Editor/ResizeResolutionDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/ResizeResolutionDialog.cpp
rename to Code/Editor/ResizeResolutionDialog.cpp
diff --git a/Code/Sandbox/Editor/ResizeResolutionDialog.h b/Code/Editor/ResizeResolutionDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/ResizeResolutionDialog.h
rename to Code/Editor/ResizeResolutionDialog.h
diff --git a/Code/Sandbox/Editor/ResizeResolutionDialog.ui b/Code/Editor/ResizeResolutionDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/ResizeResolutionDialog.ui
rename to Code/Editor/ResizeResolutionDialog.ui
diff --git a/Code/Sandbox/Editor/Resource.h b/Code/Editor/Resource.h
similarity index 100%
rename from Code/Sandbox/Editor/Resource.h
rename to Code/Editor/Resource.h
diff --git a/Code/Sandbox/Editor/ResourceSelectorHost.cpp b/Code/Editor/ResourceSelectorHost.cpp
similarity index 100%
rename from Code/Sandbox/Editor/ResourceSelectorHost.cpp
rename to Code/Editor/ResourceSelectorHost.cpp
diff --git a/Code/Sandbox/Editor/ResourceSelectorHost.h b/Code/Editor/ResourceSelectorHost.h
similarity index 100%
rename from Code/Sandbox/Editor/ResourceSelectorHost.h
rename to Code/Editor/ResourceSelectorHost.h
diff --git a/Code/Sandbox/Editor/SelectEAXPresetDlg.cpp b/Code/Editor/SelectEAXPresetDlg.cpp
similarity index 100%
rename from Code/Sandbox/Editor/SelectEAXPresetDlg.cpp
rename to Code/Editor/SelectEAXPresetDlg.cpp
diff --git a/Code/Sandbox/Editor/SelectEAXPresetDlg.h b/Code/Editor/SelectEAXPresetDlg.h
similarity index 100%
rename from Code/Sandbox/Editor/SelectEAXPresetDlg.h
rename to Code/Editor/SelectEAXPresetDlg.h
diff --git a/Code/Sandbox/Editor/SelectEAXPresetDlg.ui b/Code/Editor/SelectEAXPresetDlg.ui
similarity index 100%
rename from Code/Sandbox/Editor/SelectEAXPresetDlg.ui
rename to Code/Editor/SelectEAXPresetDlg.ui
diff --git a/Code/Sandbox/Editor/SelectLightAnimationDialog.cpp b/Code/Editor/SelectLightAnimationDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/SelectLightAnimationDialog.cpp
rename to Code/Editor/SelectLightAnimationDialog.cpp
diff --git a/Code/Sandbox/Editor/SelectLightAnimationDialog.h b/Code/Editor/SelectLightAnimationDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/SelectLightAnimationDialog.h
rename to Code/Editor/SelectLightAnimationDialog.h
diff --git a/Code/Sandbox/Editor/SelectSequenceDialog.cpp b/Code/Editor/SelectSequenceDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/SelectSequenceDialog.cpp
rename to Code/Editor/SelectSequenceDialog.cpp
diff --git a/Code/Sandbox/Editor/SelectSequenceDialog.h b/Code/Editor/SelectSequenceDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/SelectSequenceDialog.h
rename to Code/Editor/SelectSequenceDialog.h
diff --git a/Code/Sandbox/Editor/Settings.cpp b/Code/Editor/Settings.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Settings.cpp
rename to Code/Editor/Settings.cpp
diff --git a/Code/Sandbox/Editor/Settings.h b/Code/Editor/Settings.h
similarity index 100%
rename from Code/Sandbox/Editor/Settings.h
rename to Code/Editor/Settings.h
diff --git a/Code/Sandbox/Editor/SettingsManager.cpp b/Code/Editor/SettingsManager.cpp
similarity index 100%
rename from Code/Sandbox/Editor/SettingsManager.cpp
rename to Code/Editor/SettingsManager.cpp
diff --git a/Code/Sandbox/Editor/SettingsManager.h b/Code/Editor/SettingsManager.h
similarity index 100%
rename from Code/Sandbox/Editor/SettingsManager.h
rename to Code/Editor/SettingsManager.h
diff --git a/Code/Sandbox/Editor/SettingsManagerDialog.cpp b/Code/Editor/SettingsManagerDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/SettingsManagerDialog.cpp
rename to Code/Editor/SettingsManagerDialog.cpp
diff --git a/Code/Sandbox/Editor/SettingsManagerDialog.h b/Code/Editor/SettingsManagerDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/SettingsManagerDialog.h
rename to Code/Editor/SettingsManagerDialog.h
diff --git a/Code/Sandbox/Editor/SettingsManagerDialog.ui b/Code/Editor/SettingsManagerDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/SettingsManagerDialog.ui
rename to Code/Editor/SettingsManagerDialog.ui
diff --git a/Code/Sandbox/Editor/ShortcutDispatcher.cpp b/Code/Editor/ShortcutDispatcher.cpp
similarity index 100%
rename from Code/Sandbox/Editor/ShortcutDispatcher.cpp
rename to Code/Editor/ShortcutDispatcher.cpp
diff --git a/Code/Sandbox/Editor/ShortcutDispatcher.h b/Code/Editor/ShortcutDispatcher.h
similarity index 100%
rename from Code/Sandbox/Editor/ShortcutDispatcher.h
rename to Code/Editor/ShortcutDispatcher.h
diff --git a/Code/Sandbox/Editor/StartupLogoDialog.cpp b/Code/Editor/StartupLogoDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/StartupLogoDialog.cpp
rename to Code/Editor/StartupLogoDialog.cpp
diff --git a/Code/Sandbox/Editor/StartupLogoDialog.h b/Code/Editor/StartupLogoDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/StartupLogoDialog.h
rename to Code/Editor/StartupLogoDialog.h
diff --git a/Code/Sandbox/Editor/StartupLogoDialog.qrc b/Code/Editor/StartupLogoDialog.qrc
similarity index 100%
rename from Code/Sandbox/Editor/StartupLogoDialog.qrc
rename to Code/Editor/StartupLogoDialog.qrc
diff --git a/Code/Sandbox/Editor/StartupLogoDialog.ui b/Code/Editor/StartupLogoDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/StartupLogoDialog.ui
rename to Code/Editor/StartupLogoDialog.ui
diff --git a/Code/Sandbox/Editor/StartupTraceHandler.cpp b/Code/Editor/StartupTraceHandler.cpp
similarity index 100%
rename from Code/Sandbox/Editor/StartupTraceHandler.cpp
rename to Code/Editor/StartupTraceHandler.cpp
diff --git a/Code/Sandbox/Editor/StartupTraceHandler.h b/Code/Editor/StartupTraceHandler.h
similarity index 100%
rename from Code/Sandbox/Editor/StartupTraceHandler.h
rename to Code/Editor/StartupTraceHandler.h
diff --git a/Code/Sandbox/Editor/StringDlg.cpp b/Code/Editor/StringDlg.cpp
similarity index 100%
rename from Code/Sandbox/Editor/StringDlg.cpp
rename to Code/Editor/StringDlg.cpp
diff --git a/Code/Sandbox/Editor/StringDlg.h b/Code/Editor/StringDlg.h
similarity index 100%
rename from Code/Sandbox/Editor/StringDlg.h
rename to Code/Editor/StringDlg.h
diff --git a/Code/Sandbox/Editor/Style/Editor.qss b/Code/Editor/Style/Editor.qss
similarity index 100%
rename from Code/Sandbox/Editor/Style/Editor.qss
rename to Code/Editor/Style/Editor.qss
diff --git a/Code/Sandbox/Editor/Style/EditorPreferencesDialog.qss b/Code/Editor/Style/EditorPreferencesDialog.qss
similarity index 100%
rename from Code/Sandbox/Editor/Style/EditorPreferencesDialog.qss
rename to Code/Editor/Style/EditorPreferencesDialog.qss
diff --git a/Code/Sandbox/Editor/Style/EditorStylesheetVariables_Dark.json b/Code/Editor/Style/EditorStylesheetVariables_Dark.json
similarity index 100%
rename from Code/Sandbox/Editor/Style/EditorStylesheetVariables_Dark.json
rename to Code/Editor/Style/EditorStylesheetVariables_Dark.json
diff --git a/Code/Sandbox/Editor/Style/GraphicsSettingsDialog.qss b/Code/Editor/Style/GraphicsSettingsDialog.qss
similarity index 100%
rename from Code/Sandbox/Editor/Style/GraphicsSettingsDialog.qss
rename to Code/Editor/Style/GraphicsSettingsDialog.qss
diff --git a/Code/Sandbox/Editor/Style/LayoutConfigDialog.qss b/Code/Editor/Style/LayoutConfigDialog.qss
similarity index 100%
rename from Code/Sandbox/Editor/Style/LayoutConfigDialog.qss
rename to Code/Editor/Style/LayoutConfigDialog.qss
diff --git a/Code/Sandbox/Editor/Style/NewEditorStylesheet.qss b/Code/Editor/Style/NewEditorStylesheet.qss
similarity index 100%
rename from Code/Sandbox/Editor/Style/NewEditorStylesheet.qss
rename to Code/Editor/Style/NewEditorStylesheet.qss
diff --git a/Code/Sandbox/Editor/Style/resources.qrc b/Code/Editor/Style/resources.qrc
similarity index 100%
rename from Code/Sandbox/Editor/Style/resources.qrc
rename to Code/Editor/Style/resources.qrc
diff --git a/Code/Sandbox/Editor/SurfaceTypeValidator.cpp b/Code/Editor/SurfaceTypeValidator.cpp
similarity index 100%
rename from Code/Sandbox/Editor/SurfaceTypeValidator.cpp
rename to Code/Editor/SurfaceTypeValidator.cpp
diff --git a/Code/Sandbox/Editor/SurfaceTypeValidator.h b/Code/Editor/SurfaceTypeValidator.h
similarity index 100%
rename from Code/Sandbox/Editor/SurfaceTypeValidator.h
rename to Code/Editor/SurfaceTypeValidator.h
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-00.png b/Code/Editor/TimeOfDay/main-00.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-00.png
rename to Code/Editor/TimeOfDay/main-00.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-01.png b/Code/Editor/TimeOfDay/main-01.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-01.png
rename to Code/Editor/TimeOfDay/main-01.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-02.png b/Code/Editor/TimeOfDay/main-02.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-02.png
rename to Code/Editor/TimeOfDay/main-02.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-03.png b/Code/Editor/TimeOfDay/main-03.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-03.png
rename to Code/Editor/TimeOfDay/main-03.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-04.png b/Code/Editor/TimeOfDay/main-04.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-04.png
rename to Code/Editor/TimeOfDay/main-04.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-05.png b/Code/Editor/TimeOfDay/main-05.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-05.png
rename to Code/Editor/TimeOfDay/main-05.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-06.png b/Code/Editor/TimeOfDay/main-06.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-06.png
rename to Code/Editor/TimeOfDay/main-06.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-07.png b/Code/Editor/TimeOfDay/main-07.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-07.png
rename to Code/Editor/TimeOfDay/main-07.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-08.png b/Code/Editor/TimeOfDay/main-08.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-08.png
rename to Code/Editor/TimeOfDay/main-08.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-09.png b/Code/Editor/TimeOfDay/main-09.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-09.png
rename to Code/Editor/TimeOfDay/main-09.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-10.png b/Code/Editor/TimeOfDay/main-10.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-10.png
rename to Code/Editor/TimeOfDay/main-10.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-11.png b/Code/Editor/TimeOfDay/main-11.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-11.png
rename to Code/Editor/TimeOfDay/main-11.png
diff --git a/Code/Sandbox/Editor/TimeOfDay/main-12.png b/Code/Editor/TimeOfDay/main-12.png
similarity index 100%
rename from Code/Sandbox/Editor/TimeOfDay/main-12.png
rename to Code/Editor/TimeOfDay/main-12.png
diff --git a/Code/Sandbox/Editor/ToolBox.cpp b/Code/Editor/ToolBox.cpp
similarity index 100%
rename from Code/Sandbox/Editor/ToolBox.cpp
rename to Code/Editor/ToolBox.cpp
diff --git a/Code/Sandbox/Editor/ToolBox.h b/Code/Editor/ToolBox.h
similarity index 100%
rename from Code/Sandbox/Editor/ToolBox.h
rename to Code/Editor/ToolBox.h
diff --git a/Code/Sandbox/Editor/ToolbarCustomizationDialog.cpp b/Code/Editor/ToolbarCustomizationDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/ToolbarCustomizationDialog.cpp
rename to Code/Editor/ToolbarCustomizationDialog.cpp
diff --git a/Code/Sandbox/Editor/ToolbarCustomizationDialog.h b/Code/Editor/ToolbarCustomizationDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/ToolbarCustomizationDialog.h
rename to Code/Editor/ToolbarCustomizationDialog.h
diff --git a/Code/Sandbox/Editor/ToolbarCustomizationDialog.ui b/Code/Editor/ToolbarCustomizationDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/ToolbarCustomizationDialog.ui
rename to Code/Editor/ToolbarCustomizationDialog.ui
diff --git a/Code/Sandbox/Editor/ToolbarManager.cpp b/Code/Editor/ToolbarManager.cpp
similarity index 100%
rename from Code/Sandbox/Editor/ToolbarManager.cpp
rename to Code/Editor/ToolbarManager.cpp
diff --git a/Code/Sandbox/Editor/ToolbarManager.h b/Code/Editor/ToolbarManager.h
similarity index 100%
rename from Code/Sandbox/Editor/ToolbarManager.h
rename to Code/Editor/ToolbarManager.h
diff --git a/Code/Sandbox/Editor/ToolsConfigPage.cpp b/Code/Editor/ToolsConfigPage.cpp
similarity index 100%
rename from Code/Sandbox/Editor/ToolsConfigPage.cpp
rename to Code/Editor/ToolsConfigPage.cpp
diff --git a/Code/Sandbox/Editor/ToolsConfigPage.h b/Code/Editor/ToolsConfigPage.h
similarity index 100%
rename from Code/Sandbox/Editor/ToolsConfigPage.h
rename to Code/Editor/ToolsConfigPage.h
diff --git a/Code/Sandbox/Editor/ToolsConfigPage.ui b/Code/Editor/ToolsConfigPage.ui
similarity index 100%
rename from Code/Sandbox/Editor/ToolsConfigPage.ui
rename to Code/Editor/ToolsConfigPage.ui
diff --git a/Code/Sandbox/Editor/TopRendererWnd.cpp b/Code/Editor/TopRendererWnd.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TopRendererWnd.cpp
rename to Code/Editor/TopRendererWnd.cpp
diff --git a/Code/Sandbox/Editor/TopRendererWnd.h b/Code/Editor/TopRendererWnd.h
similarity index 100%
rename from Code/Sandbox/Editor/TopRendererWnd.h
rename to Code/Editor/TopRendererWnd.h
diff --git a/Code/Sandbox/Editor/TrackView/2DBezierKeyUIControls.cpp b/Code/Editor/TrackView/2DBezierKeyUIControls.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/2DBezierKeyUIControls.cpp
rename to Code/Editor/TrackView/2DBezierKeyUIControls.cpp
diff --git a/Code/Sandbox/Editor/TrackView/AssetBlendKeyUIControls.cpp b/Code/Editor/TrackView/AssetBlendKeyUIControls.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/AssetBlendKeyUIControls.cpp
rename to Code/Editor/TrackView/AssetBlendKeyUIControls.cpp
diff --git a/Code/Sandbox/Editor/TrackView/AtomOutputFrameCapture.cpp b/Code/Editor/TrackView/AtomOutputFrameCapture.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/AtomOutputFrameCapture.cpp
rename to Code/Editor/TrackView/AtomOutputFrameCapture.cpp
diff --git a/Code/Sandbox/Editor/TrackView/AtomOutputFrameCapture.h b/Code/Editor/TrackView/AtomOutputFrameCapture.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/AtomOutputFrameCapture.h
rename to Code/Editor/TrackView/AtomOutputFrameCapture.h
diff --git a/Code/Sandbox/Editor/TrackView/CaptureKeyUIControls.cpp b/Code/Editor/TrackView/CaptureKeyUIControls.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/CaptureKeyUIControls.cpp
rename to Code/Editor/TrackView/CaptureKeyUIControls.cpp
diff --git a/Code/Sandbox/Editor/TrackView/CharacterKeyUIControls.cpp b/Code/Editor/TrackView/CharacterKeyUIControls.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/CharacterKeyUIControls.cpp
rename to Code/Editor/TrackView/CharacterKeyUIControls.cpp
diff --git a/Code/Sandbox/Editor/TrackView/CommentKeyUIControls.cpp b/Code/Editor/TrackView/CommentKeyUIControls.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/CommentKeyUIControls.cpp
rename to Code/Editor/TrackView/CommentKeyUIControls.cpp
diff --git a/Code/Sandbox/Editor/TrackView/CommentNodeAnimator.cpp b/Code/Editor/TrackView/CommentNodeAnimator.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/CommentNodeAnimator.cpp
rename to Code/Editor/TrackView/CommentNodeAnimator.cpp
diff --git a/Code/Sandbox/Editor/TrackView/CommentNodeAnimator.h b/Code/Editor/TrackView/CommentNodeAnimator.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/CommentNodeAnimator.h
rename to Code/Editor/TrackView/CommentNodeAnimator.h
diff --git a/Code/Sandbox/Editor/TrackView/ConsoleKeyUIControls.cpp b/Code/Editor/TrackView/ConsoleKeyUIControls.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/ConsoleKeyUIControls.cpp
rename to Code/Editor/TrackView/ConsoleKeyUIControls.cpp
diff --git a/Code/Sandbox/Editor/TrackView/DirectorNodeAnimator.cpp b/Code/Editor/TrackView/DirectorNodeAnimator.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/DirectorNodeAnimator.cpp
rename to Code/Editor/TrackView/DirectorNodeAnimator.cpp
diff --git a/Code/Sandbox/Editor/TrackView/DirectorNodeAnimator.h b/Code/Editor/TrackView/DirectorNodeAnimator.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/DirectorNodeAnimator.h
rename to Code/Editor/TrackView/DirectorNodeAnimator.h
diff --git a/Code/Sandbox/Editor/TrackView/EditorTrackViewEventsBus.h b/Code/Editor/TrackView/EditorTrackViewEventsBus.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/EditorTrackViewEventsBus.h
rename to Code/Editor/TrackView/EditorTrackViewEventsBus.h
diff --git a/Code/Sandbox/Editor/TrackView/EventKeyUIControls.cpp b/Code/Editor/TrackView/EventKeyUIControls.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/EventKeyUIControls.cpp
rename to Code/Editor/TrackView/EventKeyUIControls.cpp
diff --git a/Code/Sandbox/Editor/TrackView/GotoKeyUIControls.cpp b/Code/Editor/TrackView/GotoKeyUIControls.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/GotoKeyUIControls.cpp
rename to Code/Editor/TrackView/GotoKeyUIControls.cpp
diff --git a/Code/Sandbox/Editor/TrackView/ScreenFaderKeyUIControls.cpp b/Code/Editor/TrackView/ScreenFaderKeyUIControls.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/ScreenFaderKeyUIControls.cpp
rename to Code/Editor/TrackView/ScreenFaderKeyUIControls.cpp
diff --git a/Code/Sandbox/Editor/TrackView/SelectKeyUIControls.cpp b/Code/Editor/TrackView/SelectKeyUIControls.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/SelectKeyUIControls.cpp
rename to Code/Editor/TrackView/SelectKeyUIControls.cpp
diff --git a/Code/Sandbox/Editor/TrackView/SequenceBatchRenderDialog.cpp b/Code/Editor/TrackView/SequenceBatchRenderDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/SequenceBatchRenderDialog.cpp
rename to Code/Editor/TrackView/SequenceBatchRenderDialog.cpp
diff --git a/Code/Sandbox/Editor/TrackView/SequenceBatchRenderDialog.h b/Code/Editor/TrackView/SequenceBatchRenderDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/SequenceBatchRenderDialog.h
rename to Code/Editor/TrackView/SequenceBatchRenderDialog.h
diff --git a/Code/Sandbox/Editor/TrackView/SequenceBatchRenderDialog.ui b/Code/Editor/TrackView/SequenceBatchRenderDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/SequenceBatchRenderDialog.ui
rename to Code/Editor/TrackView/SequenceBatchRenderDialog.ui
diff --git a/Code/Sandbox/Editor/TrackView/SequenceKeyUIControls.cpp b/Code/Editor/TrackView/SequenceKeyUIControls.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/SequenceKeyUIControls.cpp
rename to Code/Editor/TrackView/SequenceKeyUIControls.cpp
diff --git a/Code/Sandbox/Editor/TrackView/SoundKeyUIControls.cpp b/Code/Editor/TrackView/SoundKeyUIControls.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/SoundKeyUIControls.cpp
rename to Code/Editor/TrackView/SoundKeyUIControls.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TVCustomizeTrackColorsDialog.ui b/Code/Editor/TrackView/TVCustomizeTrackColorsDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TVCustomizeTrackColorsDialog.ui
rename to Code/Editor/TrackView/TVCustomizeTrackColorsDialog.ui
diff --git a/Code/Sandbox/Editor/TrackView/TVCustomizeTrackColorsDlg.cpp b/Code/Editor/TrackView/TVCustomizeTrackColorsDlg.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TVCustomizeTrackColorsDlg.cpp
rename to Code/Editor/TrackView/TVCustomizeTrackColorsDlg.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TVCustomizeTrackColorsDlg.h b/Code/Editor/TrackView/TVCustomizeTrackColorsDlg.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TVCustomizeTrackColorsDlg.h
rename to Code/Editor/TrackView/TVCustomizeTrackColorsDlg.h
diff --git a/Code/Sandbox/Editor/TrackView/TVEventsDialog.cpp b/Code/Editor/TrackView/TVEventsDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TVEventsDialog.cpp
rename to Code/Editor/TrackView/TVEventsDialog.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TVEventsDialog.h b/Code/Editor/TrackView/TVEventsDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TVEventsDialog.h
rename to Code/Editor/TrackView/TVEventsDialog.h
diff --git a/Code/Sandbox/Editor/TrackView/TVEventsDialog.ui b/Code/Editor/TrackView/TVEventsDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TVEventsDialog.ui
rename to Code/Editor/TrackView/TVEventsDialog.ui
diff --git a/Code/Sandbox/Editor/TrackView/TVSequenceProps.cpp b/Code/Editor/TrackView/TVSequenceProps.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TVSequenceProps.cpp
rename to Code/Editor/TrackView/TVSequenceProps.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TVSequenceProps.h b/Code/Editor/TrackView/TVSequenceProps.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TVSequenceProps.h
rename to Code/Editor/TrackView/TVSequenceProps.h
diff --git a/Code/Sandbox/Editor/TrackView/TVSequenceProps.ui b/Code/Editor/TrackView/TVSequenceProps.ui
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TVSequenceProps.ui
rename to Code/Editor/TrackView/TVSequenceProps.ui
diff --git a/Code/Sandbox/Editor/TrackView/TimeRangeKeyUIControls.cpp b/Code/Editor/TrackView/TimeRangeKeyUIControls.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TimeRangeKeyUIControls.cpp
rename to Code/Editor/TrackView/TimeRangeKeyUIControls.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TrackEventKeyUIControls.cpp b/Code/Editor/TrackView/TrackEventKeyUIControls.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackEventKeyUIControls.cpp
rename to Code/Editor/TrackView/TrackEventKeyUIControls.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewAnimNode.cpp b/Code/Editor/TrackView/TrackViewAnimNode.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewAnimNode.cpp
rename to Code/Editor/TrackView/TrackViewAnimNode.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewAnimNode.h b/Code/Editor/TrackView/TrackViewAnimNode.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewAnimNode.h
rename to Code/Editor/TrackView/TrackViewAnimNode.h
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewCurveEditor.cpp b/Code/Editor/TrackView/TrackViewCurveEditor.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewCurveEditor.cpp
rename to Code/Editor/TrackView/TrackViewCurveEditor.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewCurveEditor.h b/Code/Editor/TrackView/TrackViewCurveEditor.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewCurveEditor.h
rename to Code/Editor/TrackView/TrackViewCurveEditor.h
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewCurveEditor.ui b/Code/Editor/TrackView/TrackViewCurveEditor.ui
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewCurveEditor.ui
rename to Code/Editor/TrackView/TrackViewCurveEditor.ui
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewDialog.cpp b/Code/Editor/TrackView/TrackViewDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewDialog.cpp
rename to Code/Editor/TrackView/TrackViewDialog.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewDialog.h b/Code/Editor/TrackView/TrackViewDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewDialog.h
rename to Code/Editor/TrackView/TrackViewDialog.h
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewDialog.qrc b/Code/Editor/TrackView/TrackViewDialog.qrc
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewDialog.qrc
rename to Code/Editor/TrackView/TrackViewDialog.qrc
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewDopeSheetBase.cpp b/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewDopeSheetBase.cpp
rename to Code/Editor/TrackView/TrackViewDopeSheetBase.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewDopeSheetBase.h b/Code/Editor/TrackView/TrackViewDopeSheetBase.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewDopeSheetBase.h
rename to Code/Editor/TrackView/TrackViewDopeSheetBase.h
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewDoubleSpinBox.cpp b/Code/Editor/TrackView/TrackViewDoubleSpinBox.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewDoubleSpinBox.cpp
rename to Code/Editor/TrackView/TrackViewDoubleSpinBox.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewDoubleSpinBox.h b/Code/Editor/TrackView/TrackViewDoubleSpinBox.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewDoubleSpinBox.h
rename to Code/Editor/TrackView/TrackViewDoubleSpinBox.h
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewEventNode.cpp b/Code/Editor/TrackView/TrackViewEventNode.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewEventNode.cpp
rename to Code/Editor/TrackView/TrackViewEventNode.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewEventNode.h b/Code/Editor/TrackView/TrackViewEventNode.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewEventNode.h
rename to Code/Editor/TrackView/TrackViewEventNode.h
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewFindDlg.cpp b/Code/Editor/TrackView/TrackViewFindDlg.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewFindDlg.cpp
rename to Code/Editor/TrackView/TrackViewFindDlg.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewFindDlg.h b/Code/Editor/TrackView/TrackViewFindDlg.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewFindDlg.h
rename to Code/Editor/TrackView/TrackViewFindDlg.h
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewFindDlg.ui b/Code/Editor/TrackView/TrackViewFindDlg.ui
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewFindDlg.ui
rename to Code/Editor/TrackView/TrackViewFindDlg.ui
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp b/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp
rename to Code/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewKeyPropertiesDlg.h b/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewKeyPropertiesDlg.h
rename to Code/Editor/TrackView/TrackViewKeyPropertiesDlg.h
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewNode.cpp b/Code/Editor/TrackView/TrackViewNode.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewNode.cpp
rename to Code/Editor/TrackView/TrackViewNode.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewNode.h b/Code/Editor/TrackView/TrackViewNode.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewNode.h
rename to Code/Editor/TrackView/TrackViewNode.h
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewNodeFactories.cpp b/Code/Editor/TrackView/TrackViewNodeFactories.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewNodeFactories.cpp
rename to Code/Editor/TrackView/TrackViewNodeFactories.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewNodeFactories.h b/Code/Editor/TrackView/TrackViewNodeFactories.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewNodeFactories.h
rename to Code/Editor/TrackView/TrackViewNodeFactories.h
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewNodes.cpp b/Code/Editor/TrackView/TrackViewNodes.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewNodes.cpp
rename to Code/Editor/TrackView/TrackViewNodes.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewNodes.h b/Code/Editor/TrackView/TrackViewNodes.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewNodes.h
rename to Code/Editor/TrackView/TrackViewNodes.h
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewNodes.ui b/Code/Editor/TrackView/TrackViewNodes.ui
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewNodes.ui
rename to Code/Editor/TrackView/TrackViewNodes.ui
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewPythonFuncs.cpp b/Code/Editor/TrackView/TrackViewPythonFuncs.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewPythonFuncs.cpp
rename to Code/Editor/TrackView/TrackViewPythonFuncs.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewPythonFuncs.h b/Code/Editor/TrackView/TrackViewPythonFuncs.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewPythonFuncs.h
rename to Code/Editor/TrackView/TrackViewPythonFuncs.h
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewSequence.cpp b/Code/Editor/TrackView/TrackViewSequence.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewSequence.cpp
rename to Code/Editor/TrackView/TrackViewSequence.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewSequence.h b/Code/Editor/TrackView/TrackViewSequence.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewSequence.h
rename to Code/Editor/TrackView/TrackViewSequence.h
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewSequenceManager.cpp b/Code/Editor/TrackView/TrackViewSequenceManager.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewSequenceManager.cpp
rename to Code/Editor/TrackView/TrackViewSequenceManager.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewSequenceManager.h b/Code/Editor/TrackView/TrackViewSequenceManager.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewSequenceManager.h
rename to Code/Editor/TrackView/TrackViewSequenceManager.h
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewSplineCtrl.cpp b/Code/Editor/TrackView/TrackViewSplineCtrl.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewSplineCtrl.cpp
rename to Code/Editor/TrackView/TrackViewSplineCtrl.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewSplineCtrl.h b/Code/Editor/TrackView/TrackViewSplineCtrl.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewSplineCtrl.h
rename to Code/Editor/TrackView/TrackViewSplineCtrl.h
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewTimeline.cpp b/Code/Editor/TrackView/TrackViewTimeline.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewTimeline.cpp
rename to Code/Editor/TrackView/TrackViewTimeline.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewTimeline.h b/Code/Editor/TrackView/TrackViewTimeline.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewTimeline.h
rename to Code/Editor/TrackView/TrackViewTimeline.h
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewTrack.cpp b/Code/Editor/TrackView/TrackViewTrack.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewTrack.cpp
rename to Code/Editor/TrackView/TrackViewTrack.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewTrack.h b/Code/Editor/TrackView/TrackViewTrack.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewTrack.h
rename to Code/Editor/TrackView/TrackViewTrack.h
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewTrackPropsDlg.ui b/Code/Editor/TrackView/TrackViewTrackPropsDlg.ui
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewTrackPropsDlg.ui
rename to Code/Editor/TrackView/TrackViewTrackPropsDlg.ui
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewUndo.cpp b/Code/Editor/TrackView/TrackViewUndo.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewUndo.cpp
rename to Code/Editor/TrackView/TrackViewUndo.cpp
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewUndo.h b/Code/Editor/TrackView/TrackViewUndo.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/TrackViewUndo.h
rename to Code/Editor/TrackView/TrackViewUndo.h
diff --git a/Code/Sandbox/Editor/TrackView/bmp00016_00.png b/Code/Editor/TrackView/bmp00016_00.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/bmp00016_00.png
rename to Code/Editor/TrackView/bmp00016_00.png
diff --git a/Code/Sandbox/Editor/TrackView/bmp00016_01.png b/Code/Editor/TrackView/bmp00016_01.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/bmp00016_01.png
rename to Code/Editor/TrackView/bmp00016_01.png
diff --git a/Code/Sandbox/Editor/TrackView/clapperboard_cancel.png b/Code/Editor/TrackView/clapperboard_cancel.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/clapperboard_cancel.png
rename to Code/Editor/TrackView/clapperboard_cancel.png
diff --git a/Code/Sandbox/Editor/TrackView/clapperboard_ready.png b/Code/Editor/TrackView/clapperboard_ready.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/clapperboard_ready.png
rename to Code/Editor/TrackView/clapperboard_ready.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_00.png b/Code/Editor/TrackView/spline_edit_bar_00.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_00.png
rename to Code/Editor/TrackView/spline_edit_bar_00.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_01.png b/Code/Editor/TrackView/spline_edit_bar_01.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_01.png
rename to Code/Editor/TrackView/spline_edit_bar_01.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_02.png b/Code/Editor/TrackView/spline_edit_bar_02.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_02.png
rename to Code/Editor/TrackView/spline_edit_bar_02.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_03.png b/Code/Editor/TrackView/spline_edit_bar_03.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_03.png
rename to Code/Editor/TrackView/spline_edit_bar_03.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_04.png b/Code/Editor/TrackView/spline_edit_bar_04.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_04.png
rename to Code/Editor/TrackView/spline_edit_bar_04.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_05.png b/Code/Editor/TrackView/spline_edit_bar_05.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_05.png
rename to Code/Editor/TrackView/spline_edit_bar_05.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_06.png b/Code/Editor/TrackView/spline_edit_bar_06.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_06.png
rename to Code/Editor/TrackView/spline_edit_bar_06.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_07.png b/Code/Editor/TrackView/spline_edit_bar_07.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_07.png
rename to Code/Editor/TrackView/spline_edit_bar_07.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_08.png b/Code/Editor/TrackView/spline_edit_bar_08.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_08.png
rename to Code/Editor/TrackView/spline_edit_bar_08.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_09.png b/Code/Editor/TrackView/spline_edit_bar_09.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_09.png
rename to Code/Editor/TrackView/spline_edit_bar_09.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_10.png b/Code/Editor/TrackView/spline_edit_bar_10.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_10.png
rename to Code/Editor/TrackView/spline_edit_bar_10.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_11.png b/Code/Editor/TrackView/spline_edit_bar_11.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_11.png
rename to Code/Editor/TrackView/spline_edit_bar_11.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_12.png b/Code/Editor/TrackView/spline_edit_bar_12.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_12.png
rename to Code/Editor/TrackView/spline_edit_bar_12.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_13.png b/Code/Editor/TrackView/spline_edit_bar_13.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_13.png
rename to Code/Editor/TrackView/spline_edit_bar_13.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_14.png b/Code/Editor/TrackView/spline_edit_bar_14.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_14.png
rename to Code/Editor/TrackView/spline_edit_bar_14.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_15.png b/Code/Editor/TrackView/spline_edit_bar_15.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_15.png
rename to Code/Editor/TrackView/spline_edit_bar_15.png
diff --git a/Code/Sandbox/Editor/TrackView/spline_edit_bar_16.png b/Code/Editor/TrackView/spline_edit_bar_16.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/spline_edit_bar_16.png
rename to Code/Editor/TrackView/spline_edit_bar_16.png
diff --git a/Code/Sandbox/Editor/TrackView/trackview_keys_00.png b/Code/Editor/TrackView/trackview_keys_00.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/trackview_keys_00.png
rename to Code/Editor/TrackView/trackview_keys_00.png
diff --git a/Code/Sandbox/Editor/TrackView/trackview_keys_01.png b/Code/Editor/TrackView/trackview_keys_01.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/trackview_keys_01.png
rename to Code/Editor/TrackView/trackview_keys_01.png
diff --git a/Code/Sandbox/Editor/TrackView/trackview_keys_02.png b/Code/Editor/TrackView/trackview_keys_02.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/trackview_keys_02.png
rename to Code/Editor/TrackView/trackview_keys_02.png
diff --git a/Code/Sandbox/Editor/TrackView/trackview_keys_03.png b/Code/Editor/TrackView/trackview_keys_03.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/trackview_keys_03.png
rename to Code/Editor/TrackView/trackview_keys_03.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-00.png b/Code/Editor/TrackView/tvkeys-00.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-00.png
rename to Code/Editor/TrackView/tvkeys-00.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-01.png b/Code/Editor/TrackView/tvkeys-01.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-01.png
rename to Code/Editor/TrackView/tvkeys-01.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-02.png b/Code/Editor/TrackView/tvkeys-02.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-02.png
rename to Code/Editor/TrackView/tvkeys-02.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-03.png b/Code/Editor/TrackView/tvkeys-03.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-03.png
rename to Code/Editor/TrackView/tvkeys-03.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-04.png b/Code/Editor/TrackView/tvkeys-04.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-04.png
rename to Code/Editor/TrackView/tvkeys-04.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-05.png b/Code/Editor/TrackView/tvkeys-05.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-05.png
rename to Code/Editor/TrackView/tvkeys-05.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-06.png b/Code/Editor/TrackView/tvkeys-06.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-06.png
rename to Code/Editor/TrackView/tvkeys-06.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-07.png b/Code/Editor/TrackView/tvkeys-07.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-07.png
rename to Code/Editor/TrackView/tvkeys-07.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-08.png b/Code/Editor/TrackView/tvkeys-08.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-08.png
rename to Code/Editor/TrackView/tvkeys-08.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-09.png b/Code/Editor/TrackView/tvkeys-09.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-09.png
rename to Code/Editor/TrackView/tvkeys-09.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-10.png b/Code/Editor/TrackView/tvkeys-10.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-10.png
rename to Code/Editor/TrackView/tvkeys-10.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-11.png b/Code/Editor/TrackView/tvkeys-11.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-11.png
rename to Code/Editor/TrackView/tvkeys-11.png
diff --git a/Code/Sandbox/Editor/TrackView/tvkeys-12.png b/Code/Editor/TrackView/tvkeys-12.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvkeys-12.png
rename to Code/Editor/TrackView/tvkeys-12.png
diff --git a/Code/Sandbox/Editor/TrackView/tvmain-00.png b/Code/Editor/TrackView/tvmain-00.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvmain-00.png
rename to Code/Editor/TrackView/tvmain-00.png
diff --git a/Code/Sandbox/Editor/TrackView/tvmain-01.png b/Code/Editor/TrackView/tvmain-01.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvmain-01.png
rename to Code/Editor/TrackView/tvmain-01.png
diff --git a/Code/Sandbox/Editor/TrackView/tvmain-02.png b/Code/Editor/TrackView/tvmain-02.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvmain-02.png
rename to Code/Editor/TrackView/tvmain-02.png
diff --git a/Code/Sandbox/Editor/TrackView/tvmain-03.png b/Code/Editor/TrackView/tvmain-03.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvmain-03.png
rename to Code/Editor/TrackView/tvmain-03.png
diff --git a/Code/Sandbox/Editor/TrackView/tvmain-04.png b/Code/Editor/TrackView/tvmain-04.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvmain-04.png
rename to Code/Editor/TrackView/tvmain-04.png
diff --git a/Code/Sandbox/Editor/TrackView/tvmain-05.png b/Code/Editor/TrackView/tvmain-05.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvmain-05.png
rename to Code/Editor/TrackView/tvmain-05.png
diff --git a/Code/Sandbox/Editor/TrackView/tvmain-06.png b/Code/Editor/TrackView/tvmain-06.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvmain-06.png
rename to Code/Editor/TrackView/tvmain-06.png
diff --git a/Code/Sandbox/Editor/TrackView/tvmain-07.png b/Code/Editor/TrackView/tvmain-07.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvmain-07.png
rename to Code/Editor/TrackView/tvmain-07.png
diff --git a/Code/Sandbox/Editor/TrackView/tvmain-08.png b/Code/Editor/TrackView/tvmain-08.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvmain-08.png
rename to Code/Editor/TrackView/tvmain-08.png
diff --git a/Code/Sandbox/Editor/TrackView/tvmain-09.png b/Code/Editor/TrackView/tvmain-09.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvmain-09.png
rename to Code/Editor/TrackView/tvmain-09.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-00.png b/Code/Editor/TrackView/tvnodes-00.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-00.png
rename to Code/Editor/TrackView/tvnodes-00.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-01.png b/Code/Editor/TrackView/tvnodes-01.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-01.png
rename to Code/Editor/TrackView/tvnodes-01.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-02.png b/Code/Editor/TrackView/tvnodes-02.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-02.png
rename to Code/Editor/TrackView/tvnodes-02.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-03.png b/Code/Editor/TrackView/tvnodes-03.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-03.png
rename to Code/Editor/TrackView/tvnodes-03.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-04.png b/Code/Editor/TrackView/tvnodes-04.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-04.png
rename to Code/Editor/TrackView/tvnodes-04.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-05.png b/Code/Editor/TrackView/tvnodes-05.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-05.png
rename to Code/Editor/TrackView/tvnodes-05.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-06.png b/Code/Editor/TrackView/tvnodes-06.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-06.png
rename to Code/Editor/TrackView/tvnodes-06.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-07.png b/Code/Editor/TrackView/tvnodes-07.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-07.png
rename to Code/Editor/TrackView/tvnodes-07.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-08.png b/Code/Editor/TrackView/tvnodes-08.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-08.png
rename to Code/Editor/TrackView/tvnodes-08.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-09.png b/Code/Editor/TrackView/tvnodes-09.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-09.png
rename to Code/Editor/TrackView/tvnodes-09.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-10.png b/Code/Editor/TrackView/tvnodes-10.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-10.png
rename to Code/Editor/TrackView/tvnodes-10.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-11.png b/Code/Editor/TrackView/tvnodes-11.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-11.png
rename to Code/Editor/TrackView/tvnodes-11.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-12.png b/Code/Editor/TrackView/tvnodes-12.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-12.png
rename to Code/Editor/TrackView/tvnodes-12.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-13.png b/Code/Editor/TrackView/tvnodes-13.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-13.png
rename to Code/Editor/TrackView/tvnodes-13.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-14.png b/Code/Editor/TrackView/tvnodes-14.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-14.png
rename to Code/Editor/TrackView/tvnodes-14.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-15.png b/Code/Editor/TrackView/tvnodes-15.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-15.png
rename to Code/Editor/TrackView/tvnodes-15.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-16.png b/Code/Editor/TrackView/tvnodes-16.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-16.png
rename to Code/Editor/TrackView/tvnodes-16.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-17.png b/Code/Editor/TrackView/tvnodes-17.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-17.png
rename to Code/Editor/TrackView/tvnodes-17.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-18.png b/Code/Editor/TrackView/tvnodes-18.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-18.png
rename to Code/Editor/TrackView/tvnodes-18.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-19.png b/Code/Editor/TrackView/tvnodes-19.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-19.png
rename to Code/Editor/TrackView/tvnodes-19.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-20.png b/Code/Editor/TrackView/tvnodes-20.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-20.png
rename to Code/Editor/TrackView/tvnodes-20.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-21.png b/Code/Editor/TrackView/tvnodes-21.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-21.png
rename to Code/Editor/TrackView/tvnodes-21.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-22.png b/Code/Editor/TrackView/tvnodes-22.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-22.png
rename to Code/Editor/TrackView/tvnodes-22.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-23.png b/Code/Editor/TrackView/tvnodes-23.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-23.png
rename to Code/Editor/TrackView/tvnodes-23.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-24.png b/Code/Editor/TrackView/tvnodes-24.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-24.png
rename to Code/Editor/TrackView/tvnodes-24.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-25.png b/Code/Editor/TrackView/tvnodes-25.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-25.png
rename to Code/Editor/TrackView/tvnodes-25.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-26.png b/Code/Editor/TrackView/tvnodes-26.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-26.png
rename to Code/Editor/TrackView/tvnodes-26.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-27.png b/Code/Editor/TrackView/tvnodes-27.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-27.png
rename to Code/Editor/TrackView/tvnodes-27.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-28.png b/Code/Editor/TrackView/tvnodes-28.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-28.png
rename to Code/Editor/TrackView/tvnodes-28.png
diff --git a/Code/Sandbox/Editor/TrackView/tvnodes-29.png b/Code/Editor/TrackView/tvnodes-29.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvnodes-29.png
rename to Code/Editor/TrackView/tvnodes-29.png
diff --git a/Code/Sandbox/Editor/TrackView/tvplay-00.png b/Code/Editor/TrackView/tvplay-00.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvplay-00.png
rename to Code/Editor/TrackView/tvplay-00.png
diff --git a/Code/Sandbox/Editor/TrackView/tvplay-01.png b/Code/Editor/TrackView/tvplay-01.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvplay-01.png
rename to Code/Editor/TrackView/tvplay-01.png
diff --git a/Code/Sandbox/Editor/TrackView/tvplay-02.png b/Code/Editor/TrackView/tvplay-02.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvplay-02.png
rename to Code/Editor/TrackView/tvplay-02.png
diff --git a/Code/Sandbox/Editor/TrackView/tvplay-03.png b/Code/Editor/TrackView/tvplay-03.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvplay-03.png
rename to Code/Editor/TrackView/tvplay-03.png
diff --git a/Code/Sandbox/Editor/TrackView/tvplay-04.png b/Code/Editor/TrackView/tvplay-04.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvplay-04.png
rename to Code/Editor/TrackView/tvplay-04.png
diff --git a/Code/Sandbox/Editor/TrackView/tvplay-05.png b/Code/Editor/TrackView/tvplay-05.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvplay-05.png
rename to Code/Editor/TrackView/tvplay-05.png
diff --git a/Code/Sandbox/Editor/TrackView/tvplay-06.png b/Code/Editor/TrackView/tvplay-06.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvplay-06.png
rename to Code/Editor/TrackView/tvplay-06.png
diff --git a/Code/Sandbox/Editor/TrackView/tvplay-07.png b/Code/Editor/TrackView/tvplay-07.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvplay-07.png
rename to Code/Editor/TrackView/tvplay-07.png
diff --git a/Code/Sandbox/Editor/TrackView/tvplay-08.png b/Code/Editor/TrackView/tvplay-08.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvplay-08.png
rename to Code/Editor/TrackView/tvplay-08.png
diff --git a/Code/Sandbox/Editor/TrackView/tvplay-09.png b/Code/Editor/TrackView/tvplay-09.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvplay-09.png
rename to Code/Editor/TrackView/tvplay-09.png
diff --git a/Code/Sandbox/Editor/TrackView/tvplay-10.png b/Code/Editor/TrackView/tvplay-10.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvplay-10.png
rename to Code/Editor/TrackView/tvplay-10.png
diff --git a/Code/Sandbox/Editor/TrackView/tvview-00.png b/Code/Editor/TrackView/tvview-00.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvview-00.png
rename to Code/Editor/TrackView/tvview-00.png
diff --git a/Code/Sandbox/Editor/TrackView/tvview-01.png b/Code/Editor/TrackView/tvview-01.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvview-01.png
rename to Code/Editor/TrackView/tvview-01.png
diff --git a/Code/Sandbox/Editor/TrackView/tvview-02.png b/Code/Editor/TrackView/tvview-02.png
similarity index 100%
rename from Code/Sandbox/Editor/TrackView/tvview-02.png
rename to Code/Editor/TrackView/tvview-02.png
diff --git a/Code/Sandbox/Editor/TrackViewExportKeyTimeDlg.cpp b/Code/Editor/TrackViewExportKeyTimeDlg.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackViewExportKeyTimeDlg.cpp
rename to Code/Editor/TrackViewExportKeyTimeDlg.cpp
diff --git a/Code/Sandbox/Editor/TrackViewExportKeyTimeDlg.h b/Code/Editor/TrackViewExportKeyTimeDlg.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackViewExportKeyTimeDlg.h
rename to Code/Editor/TrackViewExportKeyTimeDlg.h
diff --git a/Code/Sandbox/Editor/TrackViewExportKeyTimeDlg.ui b/Code/Editor/TrackViewExportKeyTimeDlg.ui
similarity index 100%
rename from Code/Sandbox/Editor/TrackViewExportKeyTimeDlg.ui
rename to Code/Editor/TrackViewExportKeyTimeDlg.ui
diff --git a/Code/Sandbox/Editor/TrackViewFBXImportPreviewDialog.cpp b/Code/Editor/TrackViewFBXImportPreviewDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackViewFBXImportPreviewDialog.cpp
rename to Code/Editor/TrackViewFBXImportPreviewDialog.cpp
diff --git a/Code/Sandbox/Editor/TrackViewFBXImportPreviewDialog.h b/Code/Editor/TrackViewFBXImportPreviewDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackViewFBXImportPreviewDialog.h
rename to Code/Editor/TrackViewFBXImportPreviewDialog.h
diff --git a/Code/Sandbox/Editor/TrackViewFBXImportPreviewDialog.ui b/Code/Editor/TrackViewFBXImportPreviewDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/TrackViewFBXImportPreviewDialog.ui
rename to Code/Editor/TrackViewFBXImportPreviewDialog.ui
diff --git a/Code/Sandbox/Editor/TrackViewNewSequenceDialog.cpp b/Code/Editor/TrackViewNewSequenceDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/TrackViewNewSequenceDialog.cpp
rename to Code/Editor/TrackViewNewSequenceDialog.cpp
diff --git a/Code/Sandbox/Editor/TrackViewNewSequenceDialog.h b/Code/Editor/TrackViewNewSequenceDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/TrackViewNewSequenceDialog.h
rename to Code/Editor/TrackViewNewSequenceDialog.h
diff --git a/Code/Sandbox/Editor/TrackViewNewSequenceDialog.ui b/Code/Editor/TrackViewNewSequenceDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/TrackViewNewSequenceDialog.ui
rename to Code/Editor/TrackViewNewSequenceDialog.ui
diff --git a/Code/Sandbox/Editor/Translations/assetbrowser_en-us.ts b/Code/Editor/Translations/assetbrowser_en-us.ts
similarity index 100%
rename from Code/Sandbox/Editor/Translations/assetbrowser_en-us.ts
rename to Code/Editor/Translations/assetbrowser_en-us.ts
diff --git a/Code/Sandbox/Editor/Translations/editor_en-us.ts b/Code/Editor/Translations/editor_en-us.ts
similarity index 100%
rename from Code/Sandbox/Editor/Translations/editor_en-us.ts
rename to Code/Editor/Translations/editor_en-us.ts
diff --git a/Code/Sandbox/Editor/TrustInfo.manifest b/Code/Editor/TrustInfo.manifest
similarity index 100%
rename from Code/Sandbox/Editor/TrustInfo.manifest
rename to Code/Editor/TrustInfo.manifest
diff --git a/Code/Sandbox/Editor/UIEnumsDatabase.cpp b/Code/Editor/UIEnumsDatabase.cpp
similarity index 100%
rename from Code/Sandbox/Editor/UIEnumsDatabase.cpp
rename to Code/Editor/UIEnumsDatabase.cpp
diff --git a/Code/Sandbox/Editor/UIEnumsDatabase.h b/Code/Editor/UIEnumsDatabase.h
similarity index 100%
rename from Code/Sandbox/Editor/UIEnumsDatabase.h
rename to Code/Editor/UIEnumsDatabase.h
diff --git a/Code/Sandbox/Editor/Undo/IUndoManagerListener.h b/Code/Editor/Undo/IUndoManagerListener.h
similarity index 100%
rename from Code/Sandbox/Editor/Undo/IUndoManagerListener.h
rename to Code/Editor/Undo/IUndoManagerListener.h
diff --git a/Code/Sandbox/Editor/Undo/IUndoObject.h b/Code/Editor/Undo/IUndoObject.h
similarity index 100%
rename from Code/Sandbox/Editor/Undo/IUndoObject.h
rename to Code/Editor/Undo/IUndoObject.h
diff --git a/Code/Sandbox/Editor/Undo/Undo.cpp b/Code/Editor/Undo/Undo.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Undo/Undo.cpp
rename to Code/Editor/Undo/Undo.cpp
diff --git a/Code/Sandbox/Editor/Undo/Undo.h b/Code/Editor/Undo/Undo.h
similarity index 100%
rename from Code/Sandbox/Editor/Undo/Undo.h
rename to Code/Editor/Undo/Undo.h
diff --git a/Code/Sandbox/Editor/Undo/UndoVariableChange.h b/Code/Editor/Undo/UndoVariableChange.h
similarity index 100%
rename from Code/Sandbox/Editor/Undo/UndoVariableChange.h
rename to Code/Editor/Undo/UndoVariableChange.h
diff --git a/Code/Sandbox/Editor/UndoConfigSpec.cpp b/Code/Editor/UndoConfigSpec.cpp
similarity index 100%
rename from Code/Sandbox/Editor/UndoConfigSpec.cpp
rename to Code/Editor/UndoConfigSpec.cpp
diff --git a/Code/Sandbox/Editor/UndoConfigSpec.h b/Code/Editor/UndoConfigSpec.h
similarity index 100%
rename from Code/Sandbox/Editor/UndoConfigSpec.h
rename to Code/Editor/UndoConfigSpec.h
diff --git a/Code/Sandbox/Editor/UndoDropDown.cpp b/Code/Editor/UndoDropDown.cpp
similarity index 100%
rename from Code/Sandbox/Editor/UndoDropDown.cpp
rename to Code/Editor/UndoDropDown.cpp
diff --git a/Code/Sandbox/Editor/UndoDropDown.h b/Code/Editor/UndoDropDown.h
similarity index 100%
rename from Code/Sandbox/Editor/UndoDropDown.h
rename to Code/Editor/UndoDropDown.h
diff --git a/Code/Sandbox/Editor/UndoViewPosition.cpp b/Code/Editor/UndoViewPosition.cpp
similarity index 100%
rename from Code/Sandbox/Editor/UndoViewPosition.cpp
rename to Code/Editor/UndoViewPosition.cpp
diff --git a/Code/Sandbox/Editor/UndoViewPosition.h b/Code/Editor/UndoViewPosition.h
similarity index 100%
rename from Code/Sandbox/Editor/UndoViewPosition.h
rename to Code/Editor/UndoViewPosition.h
diff --git a/Code/Sandbox/Editor/UndoViewRotation.cpp b/Code/Editor/UndoViewRotation.cpp
similarity index 100%
rename from Code/Sandbox/Editor/UndoViewRotation.cpp
rename to Code/Editor/UndoViewRotation.cpp
diff --git a/Code/Sandbox/Editor/UndoViewRotation.h b/Code/Editor/UndoViewRotation.h
similarity index 100%
rename from Code/Sandbox/Editor/UndoViewRotation.h
rename to Code/Editor/UndoViewRotation.h
diff --git a/Code/Sandbox/Editor/UsedResources.cpp b/Code/Editor/UsedResources.cpp
similarity index 100%
rename from Code/Sandbox/Editor/UsedResources.cpp
rename to Code/Editor/UsedResources.cpp
diff --git a/Code/Sandbox/Editor/UsedResources.h b/Code/Editor/UsedResources.h
similarity index 100%
rename from Code/Sandbox/Editor/UsedResources.h
rename to Code/Editor/UsedResources.h
diff --git a/Code/Sandbox/Editor/UserMessageDefines.h b/Code/Editor/UserMessageDefines.h
similarity index 100%
rename from Code/Sandbox/Editor/UserMessageDefines.h
rename to Code/Editor/UserMessageDefines.h
diff --git a/Code/Sandbox/Editor/Util/3DConnexionDriver.cpp b/Code/Editor/Util/3DConnexionDriver.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/3DConnexionDriver.cpp
rename to Code/Editor/Util/3DConnexionDriver.cpp
diff --git a/Code/Sandbox/Editor/Util/3DConnexionDriver.h b/Code/Editor/Util/3DConnexionDriver.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/3DConnexionDriver.h
rename to Code/Editor/Util/3DConnexionDriver.h
diff --git a/Code/Sandbox/Editor/Util/AbstractGroupProxyModel.cpp b/Code/Editor/Util/AbstractGroupProxyModel.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/AbstractGroupProxyModel.cpp
rename to Code/Editor/Util/AbstractGroupProxyModel.cpp
diff --git a/Code/Sandbox/Editor/Util/AbstractGroupProxyModel.h b/Code/Editor/Util/AbstractGroupProxyModel.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/AbstractGroupProxyModel.h
rename to Code/Editor/Util/AbstractGroupProxyModel.h
diff --git a/Code/Sandbox/Editor/Util/AbstractSortModel.cpp b/Code/Editor/Util/AbstractSortModel.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/AbstractSortModel.cpp
rename to Code/Editor/Util/AbstractSortModel.cpp
diff --git a/Code/Sandbox/Editor/Util/AbstractSortModel.h b/Code/Editor/Util/AbstractSortModel.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/AbstractSortModel.h
rename to Code/Editor/Util/AbstractSortModel.h
diff --git a/Code/Sandbox/Editor/Util/AffineParts.cpp b/Code/Editor/Util/AffineParts.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/AffineParts.cpp
rename to Code/Editor/Util/AffineParts.cpp
diff --git a/Code/Sandbox/Editor/Util/AffineParts.h b/Code/Editor/Util/AffineParts.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/AffineParts.h
rename to Code/Editor/Util/AffineParts.h
diff --git a/Code/Sandbox/Editor/Util/AutoDirectoryRestoreFileDialog.cpp b/Code/Editor/Util/AutoDirectoryRestoreFileDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/AutoDirectoryRestoreFileDialog.cpp
rename to Code/Editor/Util/AutoDirectoryRestoreFileDialog.cpp
diff --git a/Code/Sandbox/Editor/Util/AutoDirectoryRestoreFileDialog.h b/Code/Editor/Util/AutoDirectoryRestoreFileDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/AutoDirectoryRestoreFileDialog.h
rename to Code/Editor/Util/AutoDirectoryRestoreFileDialog.h
diff --git a/Code/Sandbox/Editor/Util/AutoLogTime.cpp b/Code/Editor/Util/AutoLogTime.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/AutoLogTime.cpp
rename to Code/Editor/Util/AutoLogTime.cpp
diff --git a/Code/Sandbox/Editor/Util/AutoLogTime.h b/Code/Editor/Util/AutoLogTime.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/AutoLogTime.h
rename to Code/Editor/Util/AutoLogTime.h
diff --git a/Code/Sandbox/Editor/Util/ColorUtils.cpp b/Code/Editor/Util/ColorUtils.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/ColorUtils.cpp
rename to Code/Editor/Util/ColorUtils.cpp
diff --git a/Code/Sandbox/Editor/Util/ColorUtils.h b/Code/Editor/Util/ColorUtils.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/ColorUtils.h
rename to Code/Editor/Util/ColorUtils.h
diff --git a/Code/Sandbox/Editor/Util/ColumnGroupHeaderView.cpp b/Code/Editor/Util/ColumnGroupHeaderView.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/ColumnGroupHeaderView.cpp
rename to Code/Editor/Util/ColumnGroupHeaderView.cpp
diff --git a/Code/Sandbox/Editor/Util/ColumnGroupHeaderView.h b/Code/Editor/Util/ColumnGroupHeaderView.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/ColumnGroupHeaderView.h
rename to Code/Editor/Util/ColumnGroupHeaderView.h
diff --git a/Code/Sandbox/Editor/Util/ColumnGroupItemDelegate.cpp b/Code/Editor/Util/ColumnGroupItemDelegate.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/ColumnGroupItemDelegate.cpp
rename to Code/Editor/Util/ColumnGroupItemDelegate.cpp
diff --git a/Code/Sandbox/Editor/Util/ColumnGroupItemDelegate.h b/Code/Editor/Util/ColumnGroupItemDelegate.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/ColumnGroupItemDelegate.h
rename to Code/Editor/Util/ColumnGroupItemDelegate.h
diff --git a/Code/Sandbox/Editor/Util/ColumnGroupProxyModel.cpp b/Code/Editor/Util/ColumnGroupProxyModel.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/ColumnGroupProxyModel.cpp
rename to Code/Editor/Util/ColumnGroupProxyModel.cpp
diff --git a/Code/Sandbox/Editor/Util/ColumnGroupProxyModel.h b/Code/Editor/Util/ColumnGroupProxyModel.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/ColumnGroupProxyModel.h
rename to Code/Editor/Util/ColumnGroupProxyModel.h
diff --git a/Code/Sandbox/Editor/Util/ColumnGroupTreeView.cpp b/Code/Editor/Util/ColumnGroupTreeView.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/ColumnGroupTreeView.cpp
rename to Code/Editor/Util/ColumnGroupTreeView.cpp
diff --git a/Code/Sandbox/Editor/Util/ColumnGroupTreeView.h b/Code/Editor/Util/ColumnGroupTreeView.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/ColumnGroupTreeView.h
rename to Code/Editor/Util/ColumnGroupTreeView.h
diff --git a/Code/Sandbox/Editor/Util/ColumnSortProxyModel.cpp b/Code/Editor/Util/ColumnSortProxyModel.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/ColumnSortProxyModel.cpp
rename to Code/Editor/Util/ColumnSortProxyModel.cpp
diff --git a/Code/Sandbox/Editor/Util/ColumnSortProxyModel.h b/Code/Editor/Util/ColumnSortProxyModel.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/ColumnSortProxyModel.h
rename to Code/Editor/Util/ColumnSortProxyModel.h
diff --git a/Code/Sandbox/Editor/Util/Contrib/NvFloatMath.inl b/Code/Editor/Util/Contrib/NvFloatMath.inl
similarity index 100%
rename from Code/Sandbox/Editor/Util/Contrib/NvFloatMath.inl
rename to Code/Editor/Util/Contrib/NvFloatMath.inl
diff --git a/Code/Sandbox/Editor/Util/CryMemFile.h b/Code/Editor/Util/CryMemFile.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/CryMemFile.h
rename to Code/Editor/Util/CryMemFile.h
diff --git a/Code/Sandbox/Editor/Util/DynamicArray2D.cpp b/Code/Editor/Util/DynamicArray2D.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/DynamicArray2D.cpp
rename to Code/Editor/Util/DynamicArray2D.cpp
diff --git a/Code/Sandbox/Editor/Util/DynamicArray2D.h b/Code/Editor/Util/DynamicArray2D.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/DynamicArray2D.h
rename to Code/Editor/Util/DynamicArray2D.h
diff --git a/Code/Sandbox/Editor/Util/EditorAutoLevelLoadTest.cpp b/Code/Editor/Util/EditorAutoLevelLoadTest.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/EditorAutoLevelLoadTest.cpp
rename to Code/Editor/Util/EditorAutoLevelLoadTest.cpp
diff --git a/Code/Sandbox/Editor/Util/EditorAutoLevelLoadTest.h b/Code/Editor/Util/EditorAutoLevelLoadTest.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/EditorAutoLevelLoadTest.h
rename to Code/Editor/Util/EditorAutoLevelLoadTest.h
diff --git a/Code/Sandbox/Editor/Util/EditorUtils.cpp b/Code/Editor/Util/EditorUtils.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/EditorUtils.cpp
rename to Code/Editor/Util/EditorUtils.cpp
diff --git a/Code/Sandbox/Editor/Util/EditorUtils.h b/Code/Editor/Util/EditorUtils.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/EditorUtils.h
rename to Code/Editor/Util/EditorUtils.h
diff --git a/Code/Sandbox/Editor/Util/FileChangeMonitor.cpp b/Code/Editor/Util/FileChangeMonitor.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/FileChangeMonitor.cpp
rename to Code/Editor/Util/FileChangeMonitor.cpp
diff --git a/Code/Sandbox/Editor/Util/FileChangeMonitor.h b/Code/Editor/Util/FileChangeMonitor.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/FileChangeMonitor.h
rename to Code/Editor/Util/FileChangeMonitor.h
diff --git a/Code/Sandbox/Editor/Util/FileEnum.cpp b/Code/Editor/Util/FileEnum.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/FileEnum.cpp
rename to Code/Editor/Util/FileEnum.cpp
diff --git a/Code/Sandbox/Editor/Util/FileEnum.h b/Code/Editor/Util/FileEnum.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/FileEnum.h
rename to Code/Editor/Util/FileEnum.h
diff --git a/Code/Sandbox/Editor/Util/FileUtil.cpp b/Code/Editor/Util/FileUtil.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/FileUtil.cpp
rename to Code/Editor/Util/FileUtil.cpp
diff --git a/Code/Sandbox/Editor/Util/FileUtil.h b/Code/Editor/Util/FileUtil.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/FileUtil.h
rename to Code/Editor/Util/FileUtil.h
diff --git a/Code/Sandbox/Editor/Util/FileUtil_impl.cpp b/Code/Editor/Util/FileUtil_impl.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/FileUtil_impl.cpp
rename to Code/Editor/Util/FileUtil_impl.cpp
diff --git a/Code/Sandbox/Editor/Util/FileUtil_impl.h b/Code/Editor/Util/FileUtil_impl.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/FileUtil_impl.h
rename to Code/Editor/Util/FileUtil_impl.h
diff --git a/Code/Sandbox/Editor/Util/GdiUtil.cpp b/Code/Editor/Util/GdiUtil.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/GdiUtil.cpp
rename to Code/Editor/Util/GdiUtil.cpp
diff --git a/Code/Sandbox/Editor/Util/GdiUtil.h b/Code/Editor/Util/GdiUtil.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/GdiUtil.h
rename to Code/Editor/Util/GdiUtil.h
diff --git a/Code/Sandbox/Editor/Util/GeometryUtil.cpp b/Code/Editor/Util/GeometryUtil.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/GeometryUtil.cpp
rename to Code/Editor/Util/GeometryUtil.cpp
diff --git a/Code/Sandbox/Editor/Util/GeometryUtil.h b/Code/Editor/Util/GeometryUtil.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/GeometryUtil.h
rename to Code/Editor/Util/GeometryUtil.h
diff --git a/Code/Sandbox/Editor/Util/GuidUtil.cpp b/Code/Editor/Util/GuidUtil.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/GuidUtil.cpp
rename to Code/Editor/Util/GuidUtil.cpp
diff --git a/Code/Sandbox/Editor/Util/GuidUtil.h b/Code/Editor/Util/GuidUtil.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/GuidUtil.h
rename to Code/Editor/Util/GuidUtil.h
diff --git a/Code/Sandbox/Editor/Util/IObservable.h b/Code/Editor/Util/IObservable.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/IObservable.h
rename to Code/Editor/Util/IObservable.h
diff --git a/Code/Sandbox/Editor/Util/IXmlHistoryManager.h b/Code/Editor/Util/IXmlHistoryManager.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/IXmlHistoryManager.h
rename to Code/Editor/Util/IXmlHistoryManager.h
diff --git a/Code/Sandbox/Editor/Util/Image.cpp b/Code/Editor/Util/Image.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/Image.cpp
rename to Code/Editor/Util/Image.cpp
diff --git a/Code/Sandbox/Editor/Util/Image.h b/Code/Editor/Util/Image.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/Image.h
rename to Code/Editor/Util/Image.h
diff --git a/Code/Sandbox/Editor/Util/ImageASC.cpp b/Code/Editor/Util/ImageASC.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/ImageASC.cpp
rename to Code/Editor/Util/ImageASC.cpp
diff --git a/Code/Sandbox/Editor/Util/ImageASC.h b/Code/Editor/Util/ImageASC.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/ImageASC.h
rename to Code/Editor/Util/ImageASC.h
diff --git a/Code/Sandbox/Editor/Util/ImageBT.cpp b/Code/Editor/Util/ImageBT.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/ImageBT.cpp
rename to Code/Editor/Util/ImageBT.cpp
diff --git a/Code/Sandbox/Editor/Util/ImageBT.h b/Code/Editor/Util/ImageBT.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/ImageBT.h
rename to Code/Editor/Util/ImageBT.h
diff --git a/Code/Sandbox/Editor/Util/ImageGif.cpp b/Code/Editor/Util/ImageGif.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/ImageGif.cpp
rename to Code/Editor/Util/ImageGif.cpp
diff --git a/Code/Sandbox/Editor/Util/ImageGif.h b/Code/Editor/Util/ImageGif.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/ImageGif.h
rename to Code/Editor/Util/ImageGif.h
diff --git a/Code/Sandbox/Editor/Util/ImageHistogram.cpp b/Code/Editor/Util/ImageHistogram.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/ImageHistogram.cpp
rename to Code/Editor/Util/ImageHistogram.cpp
diff --git a/Code/Sandbox/Editor/Util/ImageHistogram.h b/Code/Editor/Util/ImageHistogram.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/ImageHistogram.h
rename to Code/Editor/Util/ImageHistogram.h
diff --git a/Code/Sandbox/Editor/Util/ImagePainter.cpp b/Code/Editor/Util/ImagePainter.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/ImagePainter.cpp
rename to Code/Editor/Util/ImagePainter.cpp
diff --git a/Code/Sandbox/Editor/Util/ImagePainter.h b/Code/Editor/Util/ImagePainter.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/ImagePainter.h
rename to Code/Editor/Util/ImagePainter.h
diff --git a/Code/Sandbox/Editor/Util/ImageTIF.cpp b/Code/Editor/Util/ImageTIF.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/ImageTIF.cpp
rename to Code/Editor/Util/ImageTIF.cpp
diff --git a/Code/Sandbox/Editor/Util/ImageTIF.h b/Code/Editor/Util/ImageTIF.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/ImageTIF.h
rename to Code/Editor/Util/ImageTIF.h
diff --git a/Code/Sandbox/Editor/Util/ImageUtil.cpp b/Code/Editor/Util/ImageUtil.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/ImageUtil.cpp
rename to Code/Editor/Util/ImageUtil.cpp
diff --git a/Code/Sandbox/Editor/Util/ImageUtil.h b/Code/Editor/Util/ImageUtil.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/ImageUtil.h
rename to Code/Editor/Util/ImageUtil.h
diff --git a/Code/Sandbox/Editor/Util/ImageUtil_impl.cpp b/Code/Editor/Util/ImageUtil_impl.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/ImageUtil_impl.cpp
rename to Code/Editor/Util/ImageUtil_impl.cpp
diff --git a/Code/Sandbox/Editor/Util/ImageUtil_impl.h b/Code/Editor/Util/ImageUtil_impl.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/ImageUtil_impl.h
rename to Code/Editor/Util/ImageUtil_impl.h
diff --git a/Code/Sandbox/Editor/Util/IndexedFiles.cpp b/Code/Editor/Util/IndexedFiles.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/IndexedFiles.cpp
rename to Code/Editor/Util/IndexedFiles.cpp
diff --git a/Code/Sandbox/Editor/Util/IndexedFiles.h b/Code/Editor/Util/IndexedFiles.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/IndexedFiles.h
rename to Code/Editor/Util/IndexedFiles.h
diff --git a/Code/Sandbox/Editor/Util/KDTree.cpp b/Code/Editor/Util/KDTree.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/KDTree.cpp
rename to Code/Editor/Util/KDTree.cpp
diff --git a/Code/Sandbox/Editor/Util/KDTree.h b/Code/Editor/Util/KDTree.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/KDTree.h
rename to Code/Editor/Util/KDTree.h
diff --git a/Code/Sandbox/Editor/Util/Mailer.h b/Code/Editor/Util/Mailer.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/Mailer.h
rename to Code/Editor/Util/Mailer.h
diff --git a/Code/Sandbox/Editor/Util/Math.h b/Code/Editor/Util/Math.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/Math.h
rename to Code/Editor/Util/Math.h
diff --git a/Code/Sandbox/Editor/Util/MemoryBlock.cpp b/Code/Editor/Util/MemoryBlock.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/MemoryBlock.cpp
rename to Code/Editor/Util/MemoryBlock.cpp
diff --git a/Code/Sandbox/Editor/Util/MemoryBlock.h b/Code/Editor/Util/MemoryBlock.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/MemoryBlock.h
rename to Code/Editor/Util/MemoryBlock.h
diff --git a/Code/Sandbox/Editor/Util/ModalWindowDismisser.cpp b/Code/Editor/Util/ModalWindowDismisser.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/ModalWindowDismisser.cpp
rename to Code/Editor/Util/ModalWindowDismisser.cpp
diff --git a/Code/Sandbox/Editor/Util/ModalWindowDismisser.h b/Code/Editor/Util/ModalWindowDismisser.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/ModalWindowDismisser.h
rename to Code/Editor/Util/ModalWindowDismisser.h
diff --git a/Code/Sandbox/Editor/Util/NamedData.cpp b/Code/Editor/Util/NamedData.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/NamedData.cpp
rename to Code/Editor/Util/NamedData.cpp
diff --git a/Code/Sandbox/Editor/Util/NamedData.h b/Code/Editor/Util/NamedData.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/NamedData.h
rename to Code/Editor/Util/NamedData.h
diff --git a/Code/Sandbox/Editor/Util/Observable.h b/Code/Editor/Util/Observable.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/Observable.h
rename to Code/Editor/Util/Observable.h
diff --git a/Code/Sandbox/Editor/Util/PakFile.cpp b/Code/Editor/Util/PakFile.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/PakFile.cpp
rename to Code/Editor/Util/PakFile.cpp
diff --git a/Code/Sandbox/Editor/Util/PakFile.h b/Code/Editor/Util/PakFile.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/PakFile.h
rename to Code/Editor/Util/PakFile.h
diff --git a/Code/Sandbox/Editor/Util/PathUtil.cpp b/Code/Editor/Util/PathUtil.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/PathUtil.cpp
rename to Code/Editor/Util/PathUtil.cpp
diff --git a/Code/Sandbox/Editor/Util/PathUtil.h b/Code/Editor/Util/PathUtil.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/PathUtil.h
rename to Code/Editor/Util/PathUtil.h
diff --git a/Code/Sandbox/Editor/Util/PredefinedAspectRatios.cpp b/Code/Editor/Util/PredefinedAspectRatios.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/PredefinedAspectRatios.cpp
rename to Code/Editor/Util/PredefinedAspectRatios.cpp
diff --git a/Code/Sandbox/Editor/Util/PredefinedAspectRatios.h b/Code/Editor/Util/PredefinedAspectRatios.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/PredefinedAspectRatios.h
rename to Code/Editor/Util/PredefinedAspectRatios.h
diff --git a/Code/Sandbox/Editor/Util/RefCountBase.h b/Code/Editor/Util/RefCountBase.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/RefCountBase.h
rename to Code/Editor/Util/RefCountBase.h
diff --git a/Code/Sandbox/Editor/Util/StringHelpers.cpp b/Code/Editor/Util/StringHelpers.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/StringHelpers.cpp
rename to Code/Editor/Util/StringHelpers.cpp
diff --git a/Code/Sandbox/Editor/Util/StringHelpers.h b/Code/Editor/Util/StringHelpers.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/StringHelpers.h
rename to Code/Editor/Util/StringHelpers.h
diff --git a/Code/Sandbox/Editor/Util/StringNoCasePredicate.h b/Code/Editor/Util/StringNoCasePredicate.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/StringNoCasePredicate.h
rename to Code/Editor/Util/StringNoCasePredicate.h
diff --git a/Code/Sandbox/Editor/Util/TRefCountBase.h b/Code/Editor/Util/TRefCountBase.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/TRefCountBase.h
rename to Code/Editor/Util/TRefCountBase.h
diff --git a/Code/Sandbox/Editor/Util/Triangulate.cpp b/Code/Editor/Util/Triangulate.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/Triangulate.cpp
rename to Code/Editor/Util/Triangulate.cpp
diff --git a/Code/Sandbox/Editor/Util/Triangulate.h b/Code/Editor/Util/Triangulate.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/Triangulate.h
rename to Code/Editor/Util/Triangulate.h
diff --git a/Code/Sandbox/Editor/Util/UIEnumerations.cpp b/Code/Editor/Util/UIEnumerations.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/UIEnumerations.cpp
rename to Code/Editor/Util/UIEnumerations.cpp
diff --git a/Code/Sandbox/Editor/Util/UIEnumerations.h b/Code/Editor/Util/UIEnumerations.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/UIEnumerations.h
rename to Code/Editor/Util/UIEnumerations.h
diff --git a/Code/Sandbox/Editor/Util/UndoUtil.cpp b/Code/Editor/Util/UndoUtil.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/UndoUtil.cpp
rename to Code/Editor/Util/UndoUtil.cpp
diff --git a/Code/Sandbox/Editor/Util/UndoUtil.h b/Code/Editor/Util/UndoUtil.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/UndoUtil.h
rename to Code/Editor/Util/UndoUtil.h
diff --git a/Code/Sandbox/Editor/Util/Util.h b/Code/Editor/Util/Util.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/Util.h
rename to Code/Editor/Util/Util.h
diff --git a/Code/Sandbox/Editor/Util/Variable.cpp b/Code/Editor/Util/Variable.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/Variable.cpp
rename to Code/Editor/Util/Variable.cpp
diff --git a/Code/Sandbox/Editor/Util/Variable.h b/Code/Editor/Util/Variable.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/Variable.h
rename to Code/Editor/Util/Variable.h
diff --git a/Code/Sandbox/Editor/Util/VariablePropertyType.cpp b/Code/Editor/Util/VariablePropertyType.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/VariablePropertyType.cpp
rename to Code/Editor/Util/VariablePropertyType.cpp
diff --git a/Code/Sandbox/Editor/Util/VariablePropertyType.h b/Code/Editor/Util/VariablePropertyType.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/VariablePropertyType.h
rename to Code/Editor/Util/VariablePropertyType.h
diff --git a/Code/Sandbox/Editor/Util/XmlArchive.cpp b/Code/Editor/Util/XmlArchive.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/XmlArchive.cpp
rename to Code/Editor/Util/XmlArchive.cpp
diff --git a/Code/Sandbox/Editor/Util/XmlArchive.h b/Code/Editor/Util/XmlArchive.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/XmlArchive.h
rename to Code/Editor/Util/XmlArchive.h
diff --git a/Code/Sandbox/Editor/Util/XmlHistoryManager.cpp b/Code/Editor/Util/XmlHistoryManager.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/XmlHistoryManager.cpp
rename to Code/Editor/Util/XmlHistoryManager.cpp
diff --git a/Code/Sandbox/Editor/Util/XmlHistoryManager.h b/Code/Editor/Util/XmlHistoryManager.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/XmlHistoryManager.h
rename to Code/Editor/Util/XmlHistoryManager.h
diff --git a/Code/Sandbox/Editor/Util/XmlTemplate.cpp b/Code/Editor/Util/XmlTemplate.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Util/XmlTemplate.cpp
rename to Code/Editor/Util/XmlTemplate.cpp
diff --git a/Code/Sandbox/Editor/Util/XmlTemplate.h b/Code/Editor/Util/XmlTemplate.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/XmlTemplate.h
rename to Code/Editor/Util/XmlTemplate.h
diff --git a/Code/Sandbox/Editor/Util/bitarray.h b/Code/Editor/Util/bitarray.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/bitarray.h
rename to Code/Editor/Util/bitarray.h
diff --git a/Code/Sandbox/Editor/Util/fastlib.h b/Code/Editor/Util/fastlib.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/fastlib.h
rename to Code/Editor/Util/fastlib.h
diff --git a/Code/Sandbox/Editor/Util/smartptr.h b/Code/Editor/Util/smartptr.h
similarity index 100%
rename from Code/Sandbox/Editor/Util/smartptr.h
rename to Code/Editor/Util/smartptr.h
diff --git a/Code/Sandbox/Editor/ViewManager.cpp b/Code/Editor/ViewManager.cpp
similarity index 100%
rename from Code/Sandbox/Editor/ViewManager.cpp
rename to Code/Editor/ViewManager.cpp
diff --git a/Code/Sandbox/Editor/ViewManager.h b/Code/Editor/ViewManager.h
similarity index 100%
rename from Code/Sandbox/Editor/ViewManager.h
rename to Code/Editor/ViewManager.h
diff --git a/Code/Sandbox/Editor/ViewPane.cpp b/Code/Editor/ViewPane.cpp
similarity index 100%
rename from Code/Sandbox/Editor/ViewPane.cpp
rename to Code/Editor/ViewPane.cpp
diff --git a/Code/Sandbox/Editor/ViewPane.h b/Code/Editor/ViewPane.h
similarity index 100%
rename from Code/Sandbox/Editor/ViewPane.h
rename to Code/Editor/ViewPane.h
diff --git a/Code/Sandbox/Editor/Viewport.cpp b/Code/Editor/Viewport.cpp
similarity index 100%
rename from Code/Sandbox/Editor/Viewport.cpp
rename to Code/Editor/Viewport.cpp
diff --git a/Code/Sandbox/Editor/Viewport.h b/Code/Editor/Viewport.h
similarity index 100%
rename from Code/Sandbox/Editor/Viewport.h
rename to Code/Editor/Viewport.h
diff --git a/Code/Sandbox/Editor/ViewportManipulatorController.cpp b/Code/Editor/ViewportManipulatorController.cpp
similarity index 100%
rename from Code/Sandbox/Editor/ViewportManipulatorController.cpp
rename to Code/Editor/ViewportManipulatorController.cpp
diff --git a/Code/Sandbox/Editor/ViewportManipulatorController.h b/Code/Editor/ViewportManipulatorController.h
similarity index 100%
rename from Code/Sandbox/Editor/ViewportManipulatorController.h
rename to Code/Editor/ViewportManipulatorController.h
diff --git a/Code/Sandbox/Editor/ViewportTitleDlg.cpp b/Code/Editor/ViewportTitleDlg.cpp
similarity index 100%
rename from Code/Sandbox/Editor/ViewportTitleDlg.cpp
rename to Code/Editor/ViewportTitleDlg.cpp
diff --git a/Code/Sandbox/Editor/ViewportTitleDlg.h b/Code/Editor/ViewportTitleDlg.h
similarity index 100%
rename from Code/Sandbox/Editor/ViewportTitleDlg.h
rename to Code/Editor/ViewportTitleDlg.h
diff --git a/Code/Sandbox/Editor/ViewportTitleDlg.ui b/Code/Editor/ViewportTitleDlg.ui
similarity index 100%
rename from Code/Sandbox/Editor/ViewportTitleDlg.ui
rename to Code/Editor/ViewportTitleDlg.ui
diff --git a/Code/Sandbox/Editor/WaitProgress.cpp b/Code/Editor/WaitProgress.cpp
similarity index 100%
rename from Code/Sandbox/Editor/WaitProgress.cpp
rename to Code/Editor/WaitProgress.cpp
diff --git a/Code/Sandbox/Editor/WaitProgress.h b/Code/Editor/WaitProgress.h
similarity index 100%
rename from Code/Sandbox/Editor/WaitProgress.h
rename to Code/Editor/WaitProgress.h
diff --git a/Code/Sandbox/Editor/WelcomeScreen/DefaultActiveProject.png b/Code/Editor/WelcomeScreen/DefaultActiveProject.png
similarity index 100%
rename from Code/Sandbox/Editor/WelcomeScreen/DefaultActiveProject.png
rename to Code/Editor/WelcomeScreen/DefaultActiveProject.png
diff --git a/Code/Sandbox/Editor/WelcomeScreen/WelcomeScreenDialog.cpp b/Code/Editor/WelcomeScreen/WelcomeScreenDialog.cpp
similarity index 100%
rename from Code/Sandbox/Editor/WelcomeScreen/WelcomeScreenDialog.cpp
rename to Code/Editor/WelcomeScreen/WelcomeScreenDialog.cpp
diff --git a/Code/Sandbox/Editor/WelcomeScreen/WelcomeScreenDialog.h b/Code/Editor/WelcomeScreen/WelcomeScreenDialog.h
similarity index 100%
rename from Code/Sandbox/Editor/WelcomeScreen/WelcomeScreenDialog.h
rename to Code/Editor/WelcomeScreen/WelcomeScreenDialog.h
diff --git a/Code/Sandbox/Editor/WelcomeScreen/WelcomeScreenDialog.qrc b/Code/Editor/WelcomeScreen/WelcomeScreenDialog.qrc
similarity index 100%
rename from Code/Sandbox/Editor/WelcomeScreen/WelcomeScreenDialog.qrc
rename to Code/Editor/WelcomeScreen/WelcomeScreenDialog.qrc
diff --git a/Code/Sandbox/Editor/WelcomeScreen/WelcomeScreenDialog.ui b/Code/Editor/WelcomeScreen/WelcomeScreenDialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/WelcomeScreen/WelcomeScreenDialog.ui
rename to Code/Editor/WelcomeScreen/WelcomeScreenDialog.ui
diff --git a/Code/Sandbox/Editor/WinWidgetId.h b/Code/Editor/WinWidgetId.h
similarity index 100%
rename from Code/Sandbox/Editor/WinWidgetId.h
rename to Code/Editor/WinWidgetId.h
diff --git a/Code/Sandbox/Editor/WindowObserver_mac.h b/Code/Editor/WindowObserver_mac.h
similarity index 100%
rename from Code/Sandbox/Editor/WindowObserver_mac.h
rename to Code/Editor/WindowObserver_mac.h
diff --git a/Code/Sandbox/Editor/WindowObserver_mac.mm b/Code/Editor/WindowObserver_mac.mm
similarity index 100%
rename from Code/Sandbox/Editor/WindowObserver_mac.mm
rename to Code/Editor/WindowObserver_mac.mm
diff --git a/Code/Sandbox/Editor/WipFeatureManager.cpp b/Code/Editor/WipFeatureManager.cpp
similarity index 100%
rename from Code/Sandbox/Editor/WipFeatureManager.cpp
rename to Code/Editor/WipFeatureManager.cpp
diff --git a/Code/Sandbox/Editor/WipFeatureManager.h b/Code/Editor/WipFeatureManager.h
similarity index 100%
rename from Code/Sandbox/Editor/WipFeatureManager.h
rename to Code/Editor/WipFeatureManager.h
diff --git a/Code/Sandbox/Editor/WipFeaturesDlg.cpp b/Code/Editor/WipFeaturesDlg.cpp
similarity index 100%
rename from Code/Sandbox/Editor/WipFeaturesDlg.cpp
rename to Code/Editor/WipFeaturesDlg.cpp
diff --git a/Code/Sandbox/Editor/WipFeaturesDlg.h b/Code/Editor/WipFeaturesDlg.h
similarity index 100%
rename from Code/Sandbox/Editor/WipFeaturesDlg.h
rename to Code/Editor/WipFeaturesDlg.h
diff --git a/Code/Sandbox/Editor/WipFeaturesDlg.qrc b/Code/Editor/WipFeaturesDlg.qrc
similarity index 100%
rename from Code/Sandbox/Editor/WipFeaturesDlg.qrc
rename to Code/Editor/WipFeaturesDlg.qrc
diff --git a/Code/Sandbox/Editor/WipFeaturesDlg.ui b/Code/Editor/WipFeaturesDlg.ui
similarity index 100%
rename from Code/Sandbox/Editor/WipFeaturesDlg.ui
rename to Code/Editor/WipFeaturesDlg.ui
diff --git a/Code/Sandbox/Editor/arhitype_tree_00.png b/Code/Editor/arhitype_tree_00.png
similarity index 100%
rename from Code/Sandbox/Editor/arhitype_tree_00.png
rename to Code/Editor/arhitype_tree_00.png
diff --git a/Code/Sandbox/Editor/arhitype_tree_01.png b/Code/Editor/arhitype_tree_01.png
similarity index 100%
rename from Code/Sandbox/Editor/arhitype_tree_01.png
rename to Code/Editor/arhitype_tree_01.png
diff --git a/Code/Sandbox/Editor/arhitype_tree_02.png b/Code/Editor/arhitype_tree_02.png
similarity index 100%
rename from Code/Sandbox/Editor/arhitype_tree_02.png
rename to Code/Editor/arhitype_tree_02.png
diff --git a/Code/Sandbox/Editor/arhitype_tree_03.png b/Code/Editor/arhitype_tree_03.png
similarity index 100%
rename from Code/Sandbox/Editor/arhitype_tree_03.png
rename to Code/Editor/arhitype_tree_03.png
diff --git a/Code/Sandbox/Editor/bmp00005_00.png b/Code/Editor/bmp00005_00.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00005_00.png
rename to Code/Editor/bmp00005_00.png
diff --git a/Code/Sandbox/Editor/bmp00005_01.png b/Code/Editor/bmp00005_01.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00005_01.png
rename to Code/Editor/bmp00005_01.png
diff --git a/Code/Sandbox/Editor/bmp00005_02.png b/Code/Editor/bmp00005_02.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00005_02.png
rename to Code/Editor/bmp00005_02.png
diff --git a/Code/Sandbox/Editor/bmp00005_03.png b/Code/Editor/bmp00005_03.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00005_03.png
rename to Code/Editor/bmp00005_03.png
diff --git a/Code/Sandbox/Editor/bmp00005_04.png b/Code/Editor/bmp00005_04.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00005_04.png
rename to Code/Editor/bmp00005_04.png
diff --git a/Code/Sandbox/Editor/bmp00005_05.png b/Code/Editor/bmp00005_05.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00005_05.png
rename to Code/Editor/bmp00005_05.png
diff --git a/Code/Sandbox/Editor/bmp00005_06.png b/Code/Editor/bmp00005_06.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00005_06.png
rename to Code/Editor/bmp00005_06.png
diff --git a/Code/Sandbox/Editor/bmp00005_07.png b/Code/Editor/bmp00005_07.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00005_07.png
rename to Code/Editor/bmp00005_07.png
diff --git a/Code/Sandbox/Editor/bmp00005_08.png b/Code/Editor/bmp00005_08.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00005_08.png
rename to Code/Editor/bmp00005_08.png
diff --git a/Code/Sandbox/Editor/bmp00005_09.png b/Code/Editor/bmp00005_09.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00005_09.png
rename to Code/Editor/bmp00005_09.png
diff --git a/Code/Sandbox/Editor/bmp00006_00.png b/Code/Editor/bmp00006_00.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00006_00.png
rename to Code/Editor/bmp00006_00.png
diff --git a/Code/Sandbox/Editor/bmp00006_01.png b/Code/Editor/bmp00006_01.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00006_01.png
rename to Code/Editor/bmp00006_01.png
diff --git a/Code/Sandbox/Editor/bmp00006_02.png b/Code/Editor/bmp00006_02.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00006_02.png
rename to Code/Editor/bmp00006_02.png
diff --git a/Code/Sandbox/Editor/bmp00006_03.png b/Code/Editor/bmp00006_03.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00006_03.png
rename to Code/Editor/bmp00006_03.png
diff --git a/Code/Sandbox/Editor/bmp00006_04.png b/Code/Editor/bmp00006_04.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00006_04.png
rename to Code/Editor/bmp00006_04.png
diff --git a/Code/Sandbox/Editor/bmp00006_05.png b/Code/Editor/bmp00006_05.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00006_05.png
rename to Code/Editor/bmp00006_05.png
diff --git a/Code/Sandbox/Editor/bmp00006_06.png b/Code/Editor/bmp00006_06.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00006_06.png
rename to Code/Editor/bmp00006_06.png
diff --git a/Code/Sandbox/Editor/bmp00006_07.png b/Code/Editor/bmp00006_07.png
similarity index 100%
rename from Code/Sandbox/Editor/bmp00006_07.png
rename to Code/Editor/bmp00006_07.png
diff --git a/Code/Sandbox/Editor/editor_core_files.cmake b/Code/Editor/editor_core_files.cmake
similarity index 100%
rename from Code/Sandbox/Editor/editor_core_files.cmake
rename to Code/Editor/editor_core_files.cmake
diff --git a/Code/Sandbox/Editor/editor_core_test_files.cmake b/Code/Editor/editor_core_test_files.cmake
similarity index 100%
rename from Code/Sandbox/Editor/editor_core_test_files.cmake
rename to Code/Editor/editor_core_test_files.cmake
diff --git a/Code/Sandbox/Editor/editor_darwin_files.cmake b/Code/Editor/editor_darwin_files.cmake
similarity index 100%
rename from Code/Sandbox/Editor/editor_darwin_files.cmake
rename to Code/Editor/editor_darwin_files.cmake
diff --git a/Code/Sandbox/Editor/editor_files.cmake b/Code/Editor/editor_files.cmake
similarity index 100%
rename from Code/Sandbox/Editor/editor_files.cmake
rename to Code/Editor/editor_files.cmake
diff --git a/Code/Sandbox/Editor/editor_headers_files.cmake b/Code/Editor/editor_headers_files.cmake
similarity index 100%
rename from Code/Sandbox/Editor/editor_headers_files.cmake
rename to Code/Editor/editor_headers_files.cmake
diff --git a/Code/Sandbox/Editor/editor_lib_files.cmake b/Code/Editor/editor_lib_files.cmake
similarity index 100%
rename from Code/Sandbox/Editor/editor_lib_files.cmake
rename to Code/Editor/editor_lib_files.cmake
diff --git a/Code/Sandbox/Editor/editor_lib_terrain_files.cmake b/Code/Editor/editor_lib_terrain_files.cmake
similarity index 100%
rename from Code/Sandbox/Editor/editor_lib_terrain_files.cmake
rename to Code/Editor/editor_lib_terrain_files.cmake
diff --git a/Code/Sandbox/Editor/editor_lib_test_files.cmake b/Code/Editor/editor_lib_test_files.cmake
similarity index 100%
rename from Code/Sandbox/Editor/editor_lib_test_files.cmake
rename to Code/Editor/editor_lib_test_files.cmake
diff --git a/Code/Sandbox/Editor/editor_lib_test_terrain_files.cmake b/Code/Editor/editor_lib_test_terrain_files.cmake
similarity index 100%
rename from Code/Sandbox/Editor/editor_lib_test_terrain_files.cmake
rename to Code/Editor/editor_lib_test_terrain_files.cmake
diff --git a/Code/Sandbox/Editor/editor_win_files.cmake b/Code/Editor/editor_win_files.cmake
similarity index 100%
rename from Code/Sandbox/Editor/editor_win_files.cmake
rename to Code/Editor/editor_win_files.cmake
diff --git a/Code/Sandbox/Editor/graphicssettingsdialog.ui b/Code/Editor/graphicssettingsdialog.ui
similarity index 100%
rename from Code/Sandbox/Editor/graphicssettingsdialog.ui
rename to Code/Editor/graphicssettingsdialog.ui
diff --git a/Code/Sandbox/Editor/main.cpp b/Code/Editor/main.cpp
similarity index 100%
rename from Code/Sandbox/Editor/main.cpp
rename to Code/Editor/main.cpp
diff --git a/Code/Sandbox/Editor/o3de_logo.svg b/Code/Editor/o3de_logo.svg
similarity index 100%
rename from Code/Sandbox/Editor/o3de_logo.svg
rename to Code/Editor/o3de_logo.svg
diff --git a/Code/Sandbox/Editor/particles_tree_00.png b/Code/Editor/particles_tree_00.png
similarity index 100%
rename from Code/Sandbox/Editor/particles_tree_00.png
rename to Code/Editor/particles_tree_00.png
diff --git a/Code/Sandbox/Editor/particles_tree_01.png b/Code/Editor/particles_tree_01.png
similarity index 100%
rename from Code/Sandbox/Editor/particles_tree_01.png
rename to Code/Editor/particles_tree_01.png
diff --git a/Code/Sandbox/Editor/particles_tree_02.png b/Code/Editor/particles_tree_02.png
similarity index 100%
rename from Code/Sandbox/Editor/particles_tree_02.png
rename to Code/Editor/particles_tree_02.png
diff --git a/Code/Sandbox/Editor/particles_tree_03.png b/Code/Editor/particles_tree_03.png
similarity index 100%
rename from Code/Sandbox/Editor/particles_tree_03.png
rename to Code/Editor/particles_tree_03.png
diff --git a/Code/Sandbox/Editor/particles_tree_04.png b/Code/Editor/particles_tree_04.png
similarity index 100%
rename from Code/Sandbox/Editor/particles_tree_04.png
rename to Code/Editor/particles_tree_04.png
diff --git a/Code/Sandbox/Editor/particles_tree_05.png b/Code/Editor/particles_tree_05.png
similarity index 100%
rename from Code/Sandbox/Editor/particles_tree_05.png
rename to Code/Editor/particles_tree_05.png
diff --git a/Code/Sandbox/Editor/particles_tree_06.png b/Code/Editor/particles_tree_06.png
similarity index 100%
rename from Code/Sandbox/Editor/particles_tree_06.png
rename to Code/Editor/particles_tree_06.png
diff --git a/Code/Sandbox/Editor/particles_tree_07.png b/Code/Editor/particles_tree_07.png
similarity index 100%
rename from Code/Sandbox/Editor/particles_tree_07.png
rename to Code/Editor/particles_tree_07.png
diff --git a/Code/Sandbox/Editor/res/4WAY01.CUR b/Code/Editor/res/4WAY01.CUR
similarity index 100%
rename from Code/Sandbox/Editor/res/4WAY01.CUR
rename to Code/Editor/res/4WAY01.CUR
diff --git a/Code/Sandbox/Editor/res/AVI_Recorder.bmp b/Code/Editor/res/AVI_Recorder.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/AVI_Recorder.bmp
rename to Code/Editor/res/AVI_Recorder.bmp
diff --git a/Code/Sandbox/Editor/res/AWS_preferences_icon.svg b/Code/Editor/res/AWS_preferences_icon.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/AWS_preferences_icon.svg
rename to Code/Editor/res/AWS_preferences_icon.svg
diff --git a/Code/Sandbox/Editor/res/Camera.svg b/Code/Editor/res/Camera.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Camera.svg
rename to Code/Editor/res/Camera.svg
diff --git a/Code/Sandbox/Editor/res/ConsoleToolbar.bmp b/Code/Editor/res/ConsoleToolbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/ConsoleToolbar.bmp
rename to Code/Editor/res/ConsoleToolbar.bmp
diff --git a/Code/Sandbox/Editor/res/CryEdit.ico b/Code/Editor/res/CryEdit.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/CryEdit.ico
rename to Code/Editor/res/CryEdit.ico
diff --git a/Code/Sandbox/Editor/res/CryEdit.rc2 b/Code/Editor/res/CryEdit.rc2
similarity index 100%
rename from Code/Sandbox/Editor/res/CryEdit.rc2
rename to Code/Editor/res/CryEdit.rc2
diff --git a/Code/Sandbox/Editor/res/CryEditDoc.ico b/Code/Editor/res/CryEditDoc.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/CryEditDoc.ico
rename to Code/Editor/res/CryEditDoc.ico
diff --git a/Code/Sandbox/Editor/res/Cursor_2.cur b/Code/Editor/res/Cursor_2.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/Cursor_2.cur
rename to Code/Editor/res/Cursor_2.cur
diff --git a/Code/Sandbox/Editor/res/Debug.svg b/Code/Editor/res/Debug.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Debug.svg
rename to Code/Editor/res/Debug.svg
diff --git a/Code/Sandbox/Editor/res/Default_closed.svg b/Code/Editor/res/Default_closed.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Default_closed.svg
rename to Code/Editor/res/Default_closed.svg
diff --git a/Code/Sandbox/Editor/res/Default_open.svg b/Code/Editor/res/Default_open.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Default_open.svg
rename to Code/Editor/res/Default_open.svg
diff --git a/Code/Sandbox/Editor/res/Entity.svg b/Code/Editor/res/Entity.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Entity.svg
rename to Code/Editor/res/Entity.svg
diff --git a/Code/Sandbox/Editor/res/Entity_Editor_Only.svg b/Code/Editor/res/Entity_Editor_Only.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Entity_Editor_Only.svg
rename to Code/Editor/res/Entity_Editor_Only.svg
diff --git a/Code/Sandbox/Editor/res/Entity_Not_Active.svg b/Code/Editor/res/Entity_Not_Active.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Entity_Not_Active.svg
rename to Code/Editor/res/Entity_Not_Active.svg
diff --git a/Code/Sandbox/Editor/res/Experimental.svg b/Code/Editor/res/Experimental.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Experimental.svg
rename to Code/Editor/res/Experimental.svg
diff --git a/Code/Sandbox/Editor/res/Eye.svg b/Code/Editor/res/Eye.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Eye.svg
rename to Code/Editor/res/Eye.svg
diff --git a/Code/Sandbox/Editor/res/Eye_Open.tif b/Code/Editor/res/Eye_Open.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Eye_Open.tif
rename to Code/Editor/res/Eye_Open.tif
diff --git a/Code/Sandbox/Editor/res/Eye_Open_Hidden.tif b/Code/Editor/res/Eye_Open_Hidden.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Eye_Open_Hidden.tif
rename to Code/Editor/res/Eye_Open_Hidden.tif
diff --git a/Code/Sandbox/Editor/res/Eye_Open_Hover.tif b/Code/Editor/res/Eye_Open_Hover.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Eye_Open_Hover.tif
rename to Code/Editor/res/Eye_Open_Hover.tif
diff --git a/Code/Sandbox/Editor/res/Eye_Partial_Open.tif b/Code/Editor/res/Eye_Partial_Open.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Eye_Partial_Open.tif
rename to Code/Editor/res/Eye_Partial_Open.tif
diff --git a/Code/Sandbox/Editor/res/Eye_Partial_Slash.tif b/Code/Editor/res/Eye_Partial_Slash.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Eye_Partial_Slash.tif
rename to Code/Editor/res/Eye_Partial_Slash.tif
diff --git a/Code/Sandbox/Editor/res/Eye_Slash.tif b/Code/Editor/res/Eye_Slash.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Eye_Slash.tif
rename to Code/Editor/res/Eye_Slash.tif
diff --git a/Code/Sandbox/Editor/res/Eye_Slash_Hidden.tif b/Code/Editor/res/Eye_Slash_Hidden.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Eye_Slash_Hidden.tif
rename to Code/Editor/res/Eye_Slash_Hidden.tif
diff --git a/Code/Sandbox/Editor/res/Eye_Slash_Hover.tif b/Code/Editor/res/Eye_Slash_Hover.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Eye_Slash_Hover.tif
rename to Code/Editor/res/Eye_Slash_Hover.tif
diff --git a/Code/Sandbox/Editor/res/Files.svg b/Code/Editor/res/Files.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Files.svg
rename to Code/Editor/res/Files.svg
diff --git a/Code/Sandbox/Editor/res/Gizmos.svg b/Code/Editor/res/Gizmos.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Gizmos.svg
rename to Code/Editor/res/Gizmos.svg
diff --git a/Code/Sandbox/Editor/res/Global.svg b/Code/Editor/res/Global.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Global.svg
rename to Code/Editor/res/Global.svg
diff --git a/Code/Sandbox/Editor/res/LegacyLogo.bmp b/Code/Editor/res/LegacyLogo.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/LegacyLogo.bmp
rename to Code/Editor/res/LegacyLogo.bmp
diff --git a/Code/Sandbox/Editor/res/MannFileManagerImageList.bmp b/Code/Editor/res/MannFileManagerImageList.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/MannFileManagerImageList.bmp
rename to Code/Editor/res/MannFileManagerImageList.bmp
diff --git a/Code/Sandbox/Editor/res/Motion.svg b/Code/Editor/res/Motion.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Motion.svg
rename to Code/Editor/res/Motion.svg
diff --git a/Code/Sandbox/Editor/res/Mouse.cur b/Code/Editor/res/Mouse.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/Mouse.cur
rename to Code/Editor/res/Mouse.cur
diff --git a/Code/Sandbox/Editor/res/Padlock.svg b/Code/Editor/res/Padlock.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Padlock.svg
rename to Code/Editor/res/Padlock.svg
diff --git a/Code/Sandbox/Editor/res/Padlock_Disabled.tif b/Code/Editor/res/Padlock_Disabled.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Padlock_Disabled.tif
rename to Code/Editor/res/Padlock_Disabled.tif
diff --git a/Code/Sandbox/Editor/res/Padlock_Disabled_Hover.tif b/Code/Editor/res/Padlock_Disabled_Hover.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Padlock_Disabled_Hover.tif
rename to Code/Editor/res/Padlock_Disabled_Hover.tif
diff --git a/Code/Sandbox/Editor/res/Padlock_Enabled.tif b/Code/Editor/res/Padlock_Enabled.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Padlock_Enabled.tif
rename to Code/Editor/res/Padlock_Enabled.tif
diff --git a/Code/Sandbox/Editor/res/Padlock_Enabled_Hover.tif b/Code/Editor/res/Padlock_Enabled_Hover.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Padlock_Enabled_Hover.tif
rename to Code/Editor/res/Padlock_Enabled_Hover.tif
diff --git a/Code/Sandbox/Editor/res/Padlock_Partial_Disabled.tif b/Code/Editor/res/Padlock_Partial_Disabled.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Padlock_Partial_Disabled.tif
rename to Code/Editor/res/Padlock_Partial_Disabled.tif
diff --git a/Code/Sandbox/Editor/res/Padlock_Partial_Enabled.tif b/Code/Editor/res/Padlock_Partial_Enabled.tif
similarity index 100%
rename from Code/Sandbox/Editor/res/Padlock_Partial_Enabled.tif
rename to Code/Editor/res/Padlock_Partial_Enabled.tif
diff --git a/Code/Sandbox/Editor/res/Preferences.bmp b/Code/Editor/res/Preferences.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/Preferences.bmp
rename to Code/Editor/res/Preferences.bmp
diff --git a/Code/Sandbox/Editor/res/Preferences_00.png b/Code/Editor/res/Preferences_00.png
similarity index 100%
rename from Code/Sandbox/Editor/res/Preferences_00.png
rename to Code/Editor/res/Preferences_00.png
diff --git a/Code/Sandbox/Editor/res/Preferences_01.png b/Code/Editor/res/Preferences_01.png
similarity index 100%
rename from Code/Sandbox/Editor/res/Preferences_01.png
rename to Code/Editor/res/Preferences_01.png
diff --git a/Code/Sandbox/Editor/res/Preferences_02.png b/Code/Editor/res/Preferences_02.png
similarity index 100%
rename from Code/Sandbox/Editor/res/Preferences_02.png
rename to Code/Editor/res/Preferences_02.png
diff --git a/Code/Sandbox/Editor/res/Preferences_03.png b/Code/Editor/res/Preferences_03.png
similarity index 100%
rename from Code/Sandbox/Editor/res/Preferences_03.png
rename to Code/Editor/res/Preferences_03.png
diff --git a/Code/Sandbox/Editor/res/Slice_Entity.svg b/Code/Editor/res/Slice_Entity.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Entity.svg
rename to Code/Editor/res/Slice_Entity.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Entity_Editor_Only.svg b/Code/Editor/res/Slice_Entity_Editor_Only.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Entity_Editor_Only.svg
rename to Code/Editor/res/Slice_Entity_Editor_Only.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Entity_Modified.svg b/Code/Editor/res/Slice_Entity_Modified.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Entity_Modified.svg
rename to Code/Editor/res/Slice_Entity_Modified.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Entity_Modified_Editor_Only.svg b/Code/Editor/res/Slice_Entity_Modified_Editor_Only.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Entity_Modified_Editor_Only.svg
rename to Code/Editor/res/Slice_Entity_Modified_Editor_Only.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Entity_Modified_Editor_Only_Unsavable.svg b/Code/Editor/res/Slice_Entity_Modified_Editor_Only_Unsavable.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Entity_Modified_Editor_Only_Unsavable.svg
rename to Code/Editor/res/Slice_Entity_Modified_Editor_Only_Unsavable.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Entity_Modified_Not_Active.svg b/Code/Editor/res/Slice_Entity_Modified_Not_Active.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Entity_Modified_Not_Active.svg
rename to Code/Editor/res/Slice_Entity_Modified_Not_Active.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Entity_Modified_Not_Active_Unsavable.svg b/Code/Editor/res/Slice_Entity_Modified_Not_Active_Unsavable.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Entity_Modified_Not_Active_Unsavable.svg
rename to Code/Editor/res/Slice_Entity_Modified_Not_Active_Unsavable.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Entity_Modified_Unsavable.svg b/Code/Editor/res/Slice_Entity_Modified_Unsavable.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Entity_Modified_Unsavable.svg
rename to Code/Editor/res/Slice_Entity_Modified_Unsavable.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Entity_Not_Active.svg b/Code/Editor/res/Slice_Entity_Not_Active.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Entity_Not_Active.svg
rename to Code/Editor/res/Slice_Entity_Not_Active.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Handle.svg b/Code/Editor/res/Slice_Handle.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Handle.svg
rename to Code/Editor/res/Slice_Handle.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Handle_Editor_Only.svg b/Code/Editor/res/Slice_Handle_Editor_Only.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Handle_Editor_Only.svg
rename to Code/Editor/res/Slice_Handle_Editor_Only.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Handle_Modified.svg b/Code/Editor/res/Slice_Handle_Modified.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Handle_Modified.svg
rename to Code/Editor/res/Slice_Handle_Modified.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Handle_Modified_Editor_Only.svg b/Code/Editor/res/Slice_Handle_Modified_Editor_Only.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Handle_Modified_Editor_Only.svg
rename to Code/Editor/res/Slice_Handle_Modified_Editor_Only.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Handle_Modified_Not_Active.svg b/Code/Editor/res/Slice_Handle_Modified_Not_Active.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Handle_Modified_Not_Active.svg
rename to Code/Editor/res/Slice_Handle_Modified_Not_Active.svg
diff --git a/Code/Sandbox/Editor/res/Slice_Handle_Not_Active.svg b/Code/Editor/res/Slice_Handle_Not_Active.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Slice_Handle_Not_Active.svg
rename to Code/Editor/res/Slice_Handle_Not_Active.svg
diff --git a/Code/Sandbox/Editor/res/Toolbar.bmp b/Code/Editor/res/Toolbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/Toolbar.bmp
rename to Code/Editor/res/Toolbar.bmp
diff --git a/Code/Sandbox/Editor/res/TreeView.bmp b/Code/Editor/res/TreeView.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/TreeView.bmp
rename to Code/Editor/res/TreeView.bmp
diff --git a/Code/Sandbox/Editor/res/Viewport.svg b/Code/Editor/res/Viewport.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/Viewport.svg
rename to Code/Editor/res/Viewport.svg
diff --git a/Code/Sandbox/Editor/res/VisualLog_PlayerButtons.bmp b/Code/Editor/res/VisualLog_PlayerButtons.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/VisualLog_PlayerButtons.bmp
rename to Code/Editor/res/VisualLog_PlayerButtons.bmp
diff --git a/Code/Sandbox/Editor/res/ab_toolbar.bmp b/Code/Editor/res/ab_toolbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/ab_toolbar.bmp
rename to Code/Editor/res/ab_toolbar.bmp
diff --git a/Code/Sandbox/Editor/res/about_dark.bmp b/Code/Editor/res/about_dark.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/about_dark.bmp
rename to Code/Editor/res/about_dark.bmp
diff --git a/Code/Sandbox/Editor/res/add.png b/Code/Editor/res/add.png
similarity index 100%
rename from Code/Sandbox/Editor/res/add.png
rename to Code/Editor/res/add.png
diff --git a/Code/Sandbox/Editor/res/anim.bmp b/Code/Editor/res/anim.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/anim.bmp
rename to Code/Editor/res/anim.bmp
diff --git a/Code/Sandbox/Editor/res/animatio.bmp b/Code/Editor/res/animatio.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/animatio.bmp
rename to Code/Editor/res/animatio.bmp
diff --git a/Code/Sandbox/Editor/res/animations_tree_soundevent.bmp b/Code/Editor/res/animations_tree_soundevent.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/animations_tree_soundevent.bmp
rename to Code/Editor/res/animations_tree_soundevent.bmp
diff --git a/Code/Sandbox/Editor/res/animflag_inside_pak.bmp b/Code/Editor/res/animflag_inside_pak.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/animflag_inside_pak.bmp
rename to Code/Editor/res/animflag_inside_pak.bmp
diff --git a/Code/Sandbox/Editor/res/animflag_on_disk.bmp b/Code/Editor/res/animflag_on_disk.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/animflag_on_disk.bmp
rename to Code/Editor/res/animflag_on_disk.bmp
diff --git a/Code/Sandbox/Editor/res/animtree.bmp b/Code/Editor/res/animtree.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/animtree.bmp
rename to Code/Editor/res/animtree.bmp
diff --git a/Code/Sandbox/Editor/res/arhitype_tree.bmp b/Code/Editor/res/arhitype_tree.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/arhitype_tree.bmp
rename to Code/Editor/res/arhitype_tree.bmp
diff --git a/Code/Sandbox/Editor/res/arr_addkey.cur b/Code/Editor/res/arr_addkey.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/arr_addkey.cur
rename to Code/Editor/res/arr_addkey.cur
diff --git a/Code/Sandbox/Editor/res/arrow.cur b/Code/Editor/res/arrow.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/arrow.cur
rename to Code/Editor/res/arrow.cur
diff --git a/Code/Sandbox/Editor/res/arrow_down.cur b/Code/Editor/res/arrow_down.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/arrow_down.cur
rename to Code/Editor/res/arrow_down.cur
diff --git a/Code/Sandbox/Editor/res/arrow_down_black.ico b/Code/Editor/res/arrow_down_black.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/arrow_down_black.ico
rename to Code/Editor/res/arrow_down_black.ico
diff --git a/Code/Sandbox/Editor/res/arrow_downright.cur b/Code/Editor/res/arrow_downright.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/arrow_downright.cur
rename to Code/Editor/res/arrow_downright.cur
diff --git a/Code/Sandbox/Editor/res/arrow_up.cur b/Code/Editor/res/arrow_up.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/arrow_up.cur
rename to Code/Editor/res/arrow_up.cur
diff --git a/Code/Sandbox/Editor/res/arrow_up_black.ico b/Code/Editor/res/arrow_up_black.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/arrow_up_black.ico
rename to Code/Editor/res/arrow_up_black.ico
diff --git a/Code/Sandbox/Editor/res/arrow_upright.cur b/Code/Editor/res/arrow_upright.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/arrow_upright.cur
rename to Code/Editor/res/arrow_upright.cur
diff --git a/Code/Sandbox/Editor/res/arrowcop.cur b/Code/Editor/res/arrowcop.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/arrowcop.cur
rename to Code/Editor/res/arrowcop.cur
diff --git a/Code/Sandbox/Editor/res/assetIsDraggable.ico b/Code/Editor/res/assetIsDraggable.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/assetIsDraggable.ico
rename to Code/Editor/res/assetIsDraggable.ico
diff --git a/Code/Sandbox/Editor/res/avi_reco.bmp b/Code/Editor/res/avi_reco.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/avi_reco.bmp
rename to Code/Editor/res/avi_reco.bmp
diff --git a/Code/Sandbox/Editor/res/ball_disabled.ico b/Code/Editor/res/ball_disabled.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/ball_disabled.ico
rename to Code/Editor/res/ball_disabled.ico
diff --git a/Code/Sandbox/Editor/res/ball_offline.ico b/Code/Editor/res/ball_offline.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/ball_offline.ico
rename to Code/Editor/res/ball_offline.ico
diff --git a/Code/Sandbox/Editor/res/ball_online.ico b/Code/Editor/res/ball_online.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/ball_online.ico
rename to Code/Editor/res/ball_online.ico
diff --git a/Code/Sandbox/Editor/res/ball_pending.ico b/Code/Editor/res/ball_pending.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/ball_pending.ico
rename to Code/Editor/res/ball_pending.ico
diff --git a/Code/Sandbox/Editor/res/bitmap5.bmp b/Code/Editor/res/bitmap5.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bitmap5.bmp
rename to Code/Editor/res/bitmap5.bmp
diff --git a/Code/Sandbox/Editor/res/bitmap6.bmp b/Code/Editor/res/bitmap6.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bitmap6.bmp
rename to Code/Editor/res/bitmap6.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00001.bmp b/Code/Editor/res/bmp00001.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00001.bmp
rename to Code/Editor/res/bmp00001.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00002.bmp b/Code/Editor/res/bmp00002.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00002.bmp
rename to Code/Editor/res/bmp00002.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00003.bmp b/Code/Editor/res/bmp00003.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00003.bmp
rename to Code/Editor/res/bmp00003.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00005.bmp b/Code/Editor/res/bmp00005.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00005.bmp
rename to Code/Editor/res/bmp00005.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00006.bmp b/Code/Editor/res/bmp00006.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00006.bmp
rename to Code/Editor/res/bmp00006.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00007.bmp b/Code/Editor/res/bmp00007.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00007.bmp
rename to Code/Editor/res/bmp00007.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00007_0.png b/Code/Editor/res/bmp00007_0.png
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00007_0.png
rename to Code/Editor/res/bmp00007_0.png
diff --git a/Code/Sandbox/Editor/res/bmp00007_1.png b/Code/Editor/res/bmp00007_1.png
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00007_1.png
rename to Code/Editor/res/bmp00007_1.png
diff --git a/Code/Sandbox/Editor/res/bmp00007_2.png b/Code/Editor/res/bmp00007_2.png
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00007_2.png
rename to Code/Editor/res/bmp00007_2.png
diff --git a/Code/Sandbox/Editor/res/bmp00007_3.png b/Code/Editor/res/bmp00007_3.png
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00007_3.png
rename to Code/Editor/res/bmp00007_3.png
diff --git a/Code/Sandbox/Editor/res/bmp00007_4.png b/Code/Editor/res/bmp00007_4.png
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00007_4.png
rename to Code/Editor/res/bmp00007_4.png
diff --git a/Code/Sandbox/Editor/res/bmp00007_5.png b/Code/Editor/res/bmp00007_5.png
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00007_5.png
rename to Code/Editor/res/bmp00007_5.png
diff --git a/Code/Sandbox/Editor/res/bmp00007_6.png b/Code/Editor/res/bmp00007_6.png
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00007_6.png
rename to Code/Editor/res/bmp00007_6.png
diff --git a/Code/Sandbox/Editor/res/bmp00008.bmp b/Code/Editor/res/bmp00008.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00008.bmp
rename to Code/Editor/res/bmp00008.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00009.bmp b/Code/Editor/res/bmp00009.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00009.bmp
rename to Code/Editor/res/bmp00009.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00010.bmp b/Code/Editor/res/bmp00010.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00010.bmp
rename to Code/Editor/res/bmp00010.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00011.bmp b/Code/Editor/res/bmp00011.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00011.bmp
rename to Code/Editor/res/bmp00011.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00012.bmp b/Code/Editor/res/bmp00012.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00012.bmp
rename to Code/Editor/res/bmp00012.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00013.bmp b/Code/Editor/res/bmp00013.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00013.bmp
rename to Code/Editor/res/bmp00013.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00014.bmp b/Code/Editor/res/bmp00014.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00014.bmp
rename to Code/Editor/res/bmp00014.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00015.bmp b/Code/Editor/res/bmp00015.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00015.bmp
rename to Code/Editor/res/bmp00015.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00016.bmp b/Code/Editor/res/bmp00016.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00016.bmp
rename to Code/Editor/res/bmp00016.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00017.bmp b/Code/Editor/res/bmp00017.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00017.bmp
rename to Code/Editor/res/bmp00017.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00019.bmp b/Code/Editor/res/bmp00019.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00019.bmp
rename to Code/Editor/res/bmp00019.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00020.bmp b/Code/Editor/res/bmp00020.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00020.bmp
rename to Code/Editor/res/bmp00020.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00024.bmp b/Code/Editor/res/bmp00024.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00024.bmp
rename to Code/Editor/res/bmp00024.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00025.bmp b/Code/Editor/res/bmp00025.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00025.bmp
rename to Code/Editor/res/bmp00025.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00026.bmp b/Code/Editor/res/bmp00026.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00026.bmp
rename to Code/Editor/res/bmp00026.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00027.bmp b/Code/Editor/res/bmp00027.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00027.bmp
rename to Code/Editor/res/bmp00027.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00028.bmp b/Code/Editor/res/bmp00028.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00028.bmp
rename to Code/Editor/res/bmp00028.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00029.bmp b/Code/Editor/res/bmp00029.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00029.bmp
rename to Code/Editor/res/bmp00029.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00030.bmp b/Code/Editor/res/bmp00030.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00030.bmp
rename to Code/Editor/res/bmp00030.bmp
diff --git a/Code/Sandbox/Editor/res/bmp00031.bmp b/Code/Editor/res/bmp00031.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/bmp00031.bmp
rename to Code/Editor/res/bmp00031.bmp
diff --git a/Code/Sandbox/Editor/res/brush24bpp.bmp b/Code/Editor/res/brush24bpp.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/brush24bpp.bmp
rename to Code/Editor/res/brush24bpp.bmp
diff --git a/Code/Sandbox/Editor/res/ce_animations_toolbar.bmp b/Code/Editor/res/ce_animations_toolbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/ce_animations_toolbar.bmp
rename to Code/Editor/res/ce_animations_toolbar.bmp
diff --git a/Code/Sandbox/Editor/res/character_parts_bar.bmp b/Code/Editor/res/character_parts_bar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/character_parts_bar.bmp
rename to Code/Editor/res/character_parts_bar.bmp
diff --git a/Code/Sandbox/Editor/res/charedit.bmp b/Code/Editor/res/charedit.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/charedit.bmp
rename to Code/Editor/res/charedit.bmp
diff --git a/Code/Sandbox/Editor/res/chrparamsicons.bmp b/Code/Editor/res/chrparamsicons.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/chrparamsicons.bmp
rename to Code/Editor/res/chrparamsicons.bmp
diff --git a/Code/Sandbox/Editor/res/clapperboard_cancel.bmp b/Code/Editor/res/clapperboard_cancel.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/clapperboard_cancel.bmp
rename to Code/Editor/res/clapperboard_cancel.bmp
diff --git a/Code/Sandbox/Editor/res/clapperboard_ready.bmp b/Code/Editor/res/clapperboard_ready.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/clapperboard_ready.bmp
rename to Code/Editor/res/clapperboard_ready.bmp
diff --git a/Code/Sandbox/Editor/res/clone.ico b/Code/Editor/res/clone.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/clone.ico
rename to Code/Editor/res/clone.ico
diff --git a/Code/Sandbox/Editor/res/cur00001.cur b/Code/Editor/res/cur00001.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/cur00001.cur
rename to Code/Editor/res/cur00001.cur
diff --git a/Code/Sandbox/Editor/res/cur00002.cur b/Code/Editor/res/cur00002.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/cur00002.cur
rename to Code/Editor/res/cur00002.cur
diff --git a/Code/Sandbox/Editor/res/cur00003.cur b/Code/Editor/res/cur00003.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/cur00003.cur
rename to Code/Editor/res/cur00003.cur
diff --git a/Code/Sandbox/Editor/res/cur00004.cur b/Code/Editor/res/cur00004.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/cur00004.cur
rename to Code/Editor/res/cur00004.cur
diff --git a/Code/Sandbox/Editor/res/cur00005.cur b/Code/Editor/res/cur00005.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/cur00005.cur
rename to Code/Editor/res/cur00005.cur
diff --git a/Code/Sandbox/Editor/res/cursor1.cur b/Code/Editor/res/cursor1.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/cursor1.cur
rename to Code/Editor/res/cursor1.cur
diff --git a/Code/Sandbox/Editor/res/cursor2.cur b/Code/Editor/res/cursor2.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/cursor2.cur
rename to Code/Editor/res/cursor2.cur
diff --git a/Code/Sandbox/Editor/res/cvar_dark.bmp b/Code/Editor/res/cvar_dark.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/cvar_dark.bmp
rename to Code/Editor/res/cvar_dark.bmp
diff --git a/Code/Sandbox/Editor/res/db_gametoken.bmp b/Code/Editor/res/db_gametoken.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/db_gametoken.bmp
rename to Code/Editor/res/db_gametoken.bmp
diff --git a/Code/Sandbox/Editor/res/db_library_add.svg b/Code/Editor/res/db_library_add.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_add.svg
rename to Code/Editor/res/db_library_add.svg
diff --git a/Code/Sandbox/Editor/res/db_library_additem.svg b/Code/Editor/res/db_library_additem.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_additem.svg
rename to Code/Editor/res/db_library_additem.svg
diff --git a/Code/Sandbox/Editor/res/db_library_assignitem.svg b/Code/Editor/res/db_library_assignitem.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_assignitem.svg
rename to Code/Editor/res/db_library_assignitem.svg
diff --git a/Code/Sandbox/Editor/res/db_library_bar.bmp b/Code/Editor/res/db_library_bar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_bar.bmp
rename to Code/Editor/res/db_library_bar.bmp
diff --git a/Code/Sandbox/Editor/res/db_library_bar_00.png b/Code/Editor/res/db_library_bar_00.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_bar_00.png
rename to Code/Editor/res/db_library_bar_00.png
diff --git a/Code/Sandbox/Editor/res/db_library_bar_01.png b/Code/Editor/res/db_library_bar_01.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_bar_01.png
rename to Code/Editor/res/db_library_bar_01.png
diff --git a/Code/Sandbox/Editor/res/db_library_bar_02.png b/Code/Editor/res/db_library_bar_02.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_bar_02.png
rename to Code/Editor/res/db_library_bar_02.png
diff --git a/Code/Sandbox/Editor/res/db_library_bar_03.png b/Code/Editor/res/db_library_bar_03.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_bar_03.png
rename to Code/Editor/res/db_library_bar_03.png
diff --git a/Code/Sandbox/Editor/res/db_library_bar_04.png b/Code/Editor/res/db_library_bar_04.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_bar_04.png
rename to Code/Editor/res/db_library_bar_04.png
diff --git a/Code/Sandbox/Editor/res/db_library_bar_05.png b/Code/Editor/res/db_library_bar_05.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_bar_05.png
rename to Code/Editor/res/db_library_bar_05.png
diff --git a/Code/Sandbox/Editor/res/db_library_cloneitem.svg b/Code/Editor/res/db_library_cloneitem.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_cloneitem.svg
rename to Code/Editor/res/db_library_cloneitem.svg
diff --git a/Code/Sandbox/Editor/res/db_library_copy.svg b/Code/Editor/res/db_library_copy.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_copy.svg
rename to Code/Editor/res/db_library_copy.svg
diff --git a/Code/Sandbox/Editor/res/db_library_delete.svg b/Code/Editor/res/db_library_delete.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_delete.svg
rename to Code/Editor/res/db_library_delete.svg
diff --git a/Code/Sandbox/Editor/res/db_library_getproperties.svg b/Code/Editor/res/db_library_getproperties.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_getproperties.svg
rename to Code/Editor/res/db_library_getproperties.svg
diff --git a/Code/Sandbox/Editor/res/db_library_item_bar.bmp b/Code/Editor/res/db_library_item_bar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_item_bar.bmp
rename to Code/Editor/res/db_library_item_bar.bmp
diff --git a/Code/Sandbox/Editor/res/db_library_item_bar_00.png b/Code/Editor/res/db_library_item_bar_00.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_item_bar_00.png
rename to Code/Editor/res/db_library_item_bar_00.png
diff --git a/Code/Sandbox/Editor/res/db_library_item_bar_01.png b/Code/Editor/res/db_library_item_bar_01.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_item_bar_01.png
rename to Code/Editor/res/db_library_item_bar_01.png
diff --git a/Code/Sandbox/Editor/res/db_library_item_bar_02.png b/Code/Editor/res/db_library_item_bar_02.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_item_bar_02.png
rename to Code/Editor/res/db_library_item_bar_02.png
diff --git a/Code/Sandbox/Editor/res/db_library_item_bar_03.png b/Code/Editor/res/db_library_item_bar_03.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_item_bar_03.png
rename to Code/Editor/res/db_library_item_bar_03.png
diff --git a/Code/Sandbox/Editor/res/db_library_item_bar_04.png b/Code/Editor/res/db_library_item_bar_04.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_item_bar_04.png
rename to Code/Editor/res/db_library_item_bar_04.png
diff --git a/Code/Sandbox/Editor/res/db_library_item_bar_05.png b/Code/Editor/res/db_library_item_bar_05.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_item_bar_05.png
rename to Code/Editor/res/db_library_item_bar_05.png
diff --git a/Code/Sandbox/Editor/res/db_library_open.svg b/Code/Editor/res/db_library_open.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_open.svg
rename to Code/Editor/res/db_library_open.svg
diff --git a/Code/Sandbox/Editor/res/db_library_paste.svg b/Code/Editor/res/db_library_paste.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_paste.svg
rename to Code/Editor/res/db_library_paste.svg
diff --git a/Code/Sandbox/Editor/res/db_library_redo.svg b/Code/Editor/res/db_library_redo.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_redo.svg
rename to Code/Editor/res/db_library_redo.svg
diff --git a/Code/Sandbox/Editor/res/db_library_refresh.svg b/Code/Editor/res/db_library_refresh.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_refresh.svg
rename to Code/Editor/res/db_library_refresh.svg
diff --git a/Code/Sandbox/Editor/res/db_library_reload.svg b/Code/Editor/res/db_library_reload.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_reload.svg
rename to Code/Editor/res/db_library_reload.svg
diff --git a/Code/Sandbox/Editor/res/db_library_removeitem.svg b/Code/Editor/res/db_library_removeitem.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_removeitem.svg
rename to Code/Editor/res/db_library_removeitem.svg
diff --git a/Code/Sandbox/Editor/res/db_library_save.svg b/Code/Editor/res/db_library_save.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_save.svg
rename to Code/Editor/res/db_library_save.svg
diff --git a/Code/Sandbox/Editor/res/db_library_undo.svg b/Code/Editor/res/db_library_undo.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/db_library_undo.svg
rename to Code/Editor/res/db_library_undo.svg
diff --git a/Code/Sandbox/Editor/res/db_music.bmp b/Code/Editor/res/db_music.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/db_music.bmp
rename to Code/Editor/res/db_music.bmp
diff --git a/Code/Sandbox/Editor/res/db_music_logic.bmp b/Code/Editor/res/db_music_logic.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/db_music_logic.bmp
rename to Code/Editor/res/db_music_logic.bmp
diff --git a/Code/Sandbox/Editor/res/db_standart.bmp b/Code/Editor/res/db_standart.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/db_standart.bmp
rename to Code/Editor/res/db_standart.bmp
diff --git a/Code/Sandbox/Editor/res/db_standart_00.png b/Code/Editor/res/db_standart_00.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_standart_00.png
rename to Code/Editor/res/db_standart_00.png
diff --git a/Code/Sandbox/Editor/res/db_standart_01.png b/Code/Editor/res/db_standart_01.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_standart_01.png
rename to Code/Editor/res/db_standart_01.png
diff --git a/Code/Sandbox/Editor/res/db_standart_02.png b/Code/Editor/res/db_standart_02.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_standart_02.png
rename to Code/Editor/res/db_standart_02.png
diff --git a/Code/Sandbox/Editor/res/db_standart_03.png b/Code/Editor/res/db_standart_03.png
similarity index 100%
rename from Code/Sandbox/Editor/res/db_standart_03.png
rename to Code/Editor/res/db_standart_03.png
diff --git a/Code/Sandbox/Editor/res/desc_editor_toolbar.bmp b/Code/Editor/res/desc_editor_toolbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/desc_editor_toolbar.bmp
rename to Code/Editor/res/desc_editor_toolbar.bmp
diff --git a/Code/Sandbox/Editor/res/down_arr.ico b/Code/Editor/res/down_arr.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/down_arr.ico
rename to Code/Editor/res/down_arr.ico
diff --git a/Code/Sandbox/Editor/res/down_arrow.ico b/Code/Editor/res/down_arrow.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/down_arrow.ico
rename to Code/Editor/res/down_arrow.ico
diff --git a/Code/Sandbox/Editor/res/dynamichelp.bmp b/Code/Editor/res/dynamichelp.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/dynamichelp.bmp
rename to Code/Editor/res/dynamichelp.bmp
diff --git a/Code/Sandbox/Editor/res/edit_mod.bmp b/Code/Editor/res/edit_mod.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/edit_mod.bmp
rename to Code/Editor/res/edit_mod.bmp
diff --git a/Code/Sandbox/Editor/res/editwithbutton.bmp b/Code/Editor/res/editwithbutton.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/editwithbutton.bmp
rename to Code/Editor/res/editwithbutton.bmp
diff --git a/Code/Sandbox/Editor/res/editwithbutton_dark.bmp b/Code/Editor/res/editwithbutton_dark.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/editwithbutton_dark.bmp
rename to Code/Editor/res/editwithbutton_dark.bmp
diff --git a/Code/Sandbox/Editor/res/emptycontainer.png b/Code/Editor/res/emptycontainer.png
similarity index 100%
rename from Code/Sandbox/Editor/res/emptycontainer.png
rename to Code/Editor/res/emptycontainer.png
diff --git a/Code/Sandbox/Editor/res/entitybar.bmp b/Code/Editor/res/entitybar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/entitybar.bmp
rename to Code/Editor/res/entitybar.bmp
diff --git a/Code/Sandbox/Editor/res/error_report.bmp b/Code/Editor/res/error_report.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/error_report.bmp
rename to Code/Editor/res/error_report.bmp
diff --git a/Code/Sandbox/Editor/res/error_report_checkmark.svg b/Code/Editor/res/error_report_checkmark.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/error_report_checkmark.svg
rename to Code/Editor/res/error_report_checkmark.svg
diff --git a/Code/Sandbox/Editor/res/error_report_comment.svg b/Code/Editor/res/error_report_comment.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/error_report_comment.svg
rename to Code/Editor/res/error_report_comment.svg
diff --git a/Code/Sandbox/Editor/res/error_report_error.svg b/Code/Editor/res/error_report_error.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/error_report_error.svg
rename to Code/Editor/res/error_report_error.svg
diff --git a/Code/Sandbox/Editor/res/error_report_warning.svg b/Code/Editor/res/error_report_warning.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/error_report_warning.svg
rename to Code/Editor/res/error_report_warning.svg
diff --git a/Code/Sandbox/Editor/res/expand1.ico b/Code/Editor/res/expand1.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/expand1.ico
rename to Code/Editor/res/expand1.ico
diff --git a/Code/Sandbox/Editor/res/expand2.ico b/Code/Editor/res/expand2.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/expand2.ico
rename to Code/Editor/res/expand2.ico
diff --git a/Code/Sandbox/Editor/res/faceit_playbar.bmp b/Code/Editor/res/faceit_playbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/faceit_playbar.bmp
rename to Code/Editor/res/faceit_playbar.bmp
diff --git a/Code/Sandbox/Editor/res/faceit_slidersbar.bmp b/Code/Editor/res/faceit_slidersbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/faceit_slidersbar.bmp
rename to Code/Editor/res/faceit_slidersbar.bmp
diff --git a/Code/Sandbox/Editor/res/faceit_spline_bar.bmp b/Code/Editor/res/faceit_spline_bar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/faceit_spline_bar.bmp
rename to Code/Editor/res/faceit_spline_bar.bmp
diff --git a/Code/Sandbox/Editor/res/facejoystickbar.bmp b/Code/Editor/res/facejoystickbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/facejoystickbar.bmp
rename to Code/Editor/res/facejoystickbar.bmp
diff --git a/Code/Sandbox/Editor/res/facesequence_bar.bmp b/Code/Editor/res/facesequence_bar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/facesequence_bar.bmp
rename to Code/Editor/res/facesequence_bar.bmp
diff --git a/Code/Sandbox/Editor/res/facialsequence_bar.bmp b/Code/Editor/res/facialsequence_bar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/facialsequence_bar.bmp
rename to Code/Editor/res/facialsequence_bar.bmp
diff --git a/Code/Sandbox/Editor/res/feedback.ico b/Code/Editor/res/feedback.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/feedback.ico
rename to Code/Editor/res/feedback.ico
diff --git a/Code/Sandbox/Editor/res/file_browse.ico b/Code/Editor/res/file_browse.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/file_browse.ico
rename to Code/Editor/res/file_browse.ico
diff --git a/Code/Sandbox/Editor/res/filesimage.bmp b/Code/Editor/res/filesimage.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/filesimage.bmp
rename to Code/Editor/res/filesimage.bmp
diff --git a/Code/Sandbox/Editor/res/filesimage_00.png b/Code/Editor/res/filesimage_00.png
similarity index 100%
rename from Code/Sandbox/Editor/res/filesimage_00.png
rename to Code/Editor/res/filesimage_00.png
diff --git a/Code/Sandbox/Editor/res/filesimage_01.png b/Code/Editor/res/filesimage_01.png
similarity index 100%
rename from Code/Sandbox/Editor/res/filesimage_01.png
rename to Code/Editor/res/filesimage_01.png
diff --git a/Code/Sandbox/Editor/res/filesimage_02.png b/Code/Editor/res/filesimage_02.png
similarity index 100%
rename from Code/Sandbox/Editor/res/filesimage_02.png
rename to Code/Editor/res/filesimage_02.png
diff --git a/Code/Sandbox/Editor/res/filesimage_03.png b/Code/Editor/res/filesimage_03.png
similarity index 100%
rename from Code/Sandbox/Editor/res/filesimage_03.png
rename to Code/Editor/res/filesimage_03.png
diff --git a/Code/Sandbox/Editor/res/filesimage_04.png b/Code/Editor/res/filesimage_04.png
similarity index 100%
rename from Code/Sandbox/Editor/res/filesimage_04.png
rename to Code/Editor/res/filesimage_04.png
diff --git a/Code/Sandbox/Editor/res/filesimage_05.png b/Code/Editor/res/filesimage_05.png
similarity index 100%
rename from Code/Sandbox/Editor/res/filesimage_05.png
rename to Code/Editor/res/filesimage_05.png
diff --git a/Code/Sandbox/Editor/res/filesimage_06.png b/Code/Editor/res/filesimage_06.png
similarity index 100%
rename from Code/Sandbox/Editor/res/filesimage_06.png
rename to Code/Editor/res/filesimage_06.png
diff --git a/Code/Sandbox/Editor/res/filesimage_07.png b/Code/Editor/res/filesimage_07.png
similarity index 100%
rename from Code/Sandbox/Editor/res/filesimage_07.png
rename to Code/Editor/res/filesimage_07.png
diff --git a/Code/Sandbox/Editor/res/filesimage_08.png b/Code/Editor/res/filesimage_08.png
similarity index 100%
rename from Code/Sandbox/Editor/res/filesimage_08.png
rename to Code/Editor/res/filesimage_08.png
diff --git a/Code/Sandbox/Editor/res/filesimage_09.png b/Code/Editor/res/filesimage_09.png
similarity index 100%
rename from Code/Sandbox/Editor/res/filesimage_09.png
rename to Code/Editor/res/filesimage_09.png
diff --git a/Code/Sandbox/Editor/res/filestatus.bmp b/Code/Editor/res/filestatus.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/filestatus.bmp
rename to Code/Editor/res/filestatus.bmp
diff --git a/Code/Sandbox/Editor/res/folder.ico b/Code/Editor/res/folder.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/folder.ico
rename to Code/Editor/res/folder.ico
diff --git a/Code/Sandbox/Editor/res/folder.png b/Code/Editor/res/folder.png
similarity index 100%
rename from Code/Sandbox/Editor/res/folder.png
rename to Code/Editor/res/folder.png
diff --git a/Code/Sandbox/Editor/res/fopen_back.ico b/Code/Editor/res/fopen_back.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/fopen_back.ico
rename to Code/Editor/res/fopen_back.ico
diff --git a/Code/Sandbox/Editor/res/fopen_back.png b/Code/Editor/res/fopen_back.png
similarity index 100%
rename from Code/Sandbox/Editor/res/fopen_back.png
rename to Code/Editor/res/fopen_back.png
diff --git a/Code/Sandbox/Editor/res/fopen_up.ico b/Code/Editor/res/fopen_up.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/fopen_up.ico
rename to Code/Editor/res/fopen_up.ico
diff --git a/Code/Sandbox/Editor/res/fopen_up.png b/Code/Editor/res/fopen_up.png
similarity index 100%
rename from Code/Sandbox/Editor/res/fopen_up.png
rename to Code/Editor/res/fopen_up.png
diff --git a/Code/Sandbox/Editor/res/grid.ico b/Code/Editor/res/grid.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/grid.ico
rename to Code/Editor/res/grid.ico
diff --git a/Code/Sandbox/Editor/res/group_closed.png b/Code/Editor/res/group_closed.png
similarity index 100%
rename from Code/Sandbox/Editor/res/group_closed.png
rename to Code/Editor/res/group_closed.png
diff --git a/Code/Sandbox/Editor/res/group_open.png b/Code/Editor/res/group_open.png
similarity index 100%
rename from Code/Sandbox/Editor/res/group_open.png
rename to Code/Editor/res/group_open.png
diff --git a/Code/Sandbox/Editor/res/handDrag.cur b/Code/Editor/res/handDrag.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/handDrag.cur
rename to Code/Editor/res/handDrag.cur
diff --git a/Code/Sandbox/Editor/res/hit.cur b/Code/Editor/res/hit.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/hit.cur
rename to Code/Editor/res/hit.cur
diff --git a/Code/Sandbox/Editor/res/hypergraph_components.bmp b/Code/Editor/res/hypergraph_components.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/hypergraph_components.bmp
rename to Code/Editor/res/hypergraph_components.bmp
diff --git a/Code/Sandbox/Editor/res/hypergraphtree.bmp b/Code/Editor/res/hypergraphtree.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/hypergraphtree.bmp
rename to Code/Editor/res/hypergraphtree.bmp
diff --git a/Code/Sandbox/Editor/res/ico00001.ico b/Code/Editor/res/ico00001.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/ico00001.ico
rename to Code/Editor/res/ico00001.ico
diff --git a/Code/Sandbox/Editor/res/ico00002.ico b/Code/Editor/res/ico00002.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/ico00002.ico
rename to Code/Editor/res/ico00002.ico
diff --git a/Code/Sandbox/Editor/res/icon1.ico b/Code/Editor/res/icon1.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/icon1.ico
rename to Code/Editor/res/icon1.ico
diff --git a/Code/Sandbox/Editor/res/icon_delete.ico b/Code/Editor/res/icon_delete.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/icon_delete.ico
rename to Code/Editor/res/icon_delete.ico
diff --git a/Code/Sandbox/Editor/res/icon_export.ico b/Code/Editor/res/icon_export.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/icon_export.ico
rename to Code/Editor/res/icon_export.ico
diff --git a/Code/Sandbox/Editor/res/icon_import.ico b/Code/Editor/res/icon_import.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/icon_import.ico
rename to Code/Editor/res/icon_import.ico
diff --git a/Code/Sandbox/Editor/res/icon_new.ico b/Code/Editor/res/icon_new.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/icon_new.ico
rename to Code/Editor/res/icon_new.ico
diff --git a/Code/Sandbox/Editor/res/icon_pause.ico b/Code/Editor/res/icon_pause.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/icon_pause.ico
rename to Code/Editor/res/icon_pause.ico
diff --git a/Code/Sandbox/Editor/res/icon_play.ico b/Code/Editor/res/icon_play.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/icon_play.ico
rename to Code/Editor/res/icon_play.ico
diff --git a/Code/Sandbox/Editor/res/icon_question.bmp b/Code/Editor/res/icon_question.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/icon_question.bmp
rename to Code/Editor/res/icon_question.bmp
diff --git a/Code/Sandbox/Editor/res/icon_question.ico b/Code/Editor/res/icon_question.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/icon_question.ico
rename to Code/Editor/res/icon_question.ico
diff --git a/Code/Sandbox/Editor/res/idb_.bmp b/Code/Editor/res/idb_.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/idb_.bmp
rename to Code/Editor/res/idb_.bmp
diff --git a/Code/Sandbox/Editor/res/infobar/CameraCollision-default.svg b/Code/Editor/res/infobar/CameraCollision-default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/CameraCollision-default.svg
rename to Code/Editor/res/infobar/CameraCollision-default.svg
diff --git a/Code/Sandbox/Editor/res/infobar/GotoLocation-default.svg b/Code/Editor/res/infobar/GotoLocation-default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/GotoLocation-default.svg
rename to Code/Editor/res/infobar/GotoLocation-default.svg
diff --git a/Code/Sandbox/Editor/res/infobar/LockScale-default.svg b/Code/Editor/res/infobar/LockScale-default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/LockScale-default.svg
rename to Code/Editor/res/infobar/LockScale-default.svg
diff --git a/Code/Sandbox/Editor/res/infobar/LockSelection-default.svg b/Code/Editor/res/infobar/LockSelection-default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/LockSelection-default.svg
rename to Code/Editor/res/infobar/LockSelection-default.svg
diff --git a/Code/Sandbox/Editor/res/infobar/Mute-default.svg b/Code/Editor/res/infobar/Mute-default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/Mute-default.svg
rename to Code/Editor/res/infobar/Mute-default.svg
diff --git a/Code/Sandbox/Editor/res/infobar/NoPlayerSync-default.svg b/Code/Editor/res/infobar/NoPlayerSync-default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/NoPlayerSync-default.svg
rename to Code/Editor/res/infobar/NoPlayerSync-default.svg
diff --git a/Code/Sandbox/Editor/res/infobar/NoPlayerSync-selected.svg b/Code/Editor/res/infobar/NoPlayerSync-selected.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/NoPlayerSync-selected.svg
rename to Code/Editor/res/infobar/NoPlayerSync-selected.svg
diff --git a/Code/Sandbox/Editor/res/infobar/Pause-default.svg b/Code/Editor/res/infobar/Pause-default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/Pause-default.svg
rename to Code/Editor/res/infobar/Pause-default.svg
diff --git a/Code/Sandbox/Editor/res/infobar/PausePlay-default.svg b/Code/Editor/res/infobar/PausePlay-default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/PausePlay-default.svg
rename to Code/Editor/res/infobar/PausePlay-default.svg
diff --git a/Code/Sandbox/Editor/res/infobar/PhysicsCol-default.svg b/Code/Editor/res/infobar/PhysicsCol-default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/PhysicsCol-default.svg
rename to Code/Editor/res/infobar/PhysicsCol-default.svg
diff --git a/Code/Sandbox/Editor/res/infobar/VR-default.svg b/Code/Editor/res/infobar/VR-default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/VR-default.svg
rename to Code/Editor/res/infobar/VR-default.svg
diff --git a/Code/Sandbox/Editor/res/infobar/XYZ-default.svg b/Code/Editor/res/infobar/XYZ-default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/infobar/XYZ-default.svg
rename to Code/Editor/res/infobar/XYZ-default.svg
diff --git a/Code/Sandbox/Editor/res/k_PlayerButtons.bmp b/Code/Editor/res/k_PlayerButtons.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/k_PlayerButtons.bmp
rename to Code/Editor/res/k_PlayerButtons.bmp
diff --git a/Code/Sandbox/Editor/res/layer_editor_layer_buttons-0.png b/Code/Editor/res/layer_editor_layer_buttons-0.png
similarity index 100%
rename from Code/Sandbox/Editor/res/layer_editor_layer_buttons-0.png
rename to Code/Editor/res/layer_editor_layer_buttons-0.png
diff --git a/Code/Sandbox/Editor/res/layer_editor_layer_buttons-1.png b/Code/Editor/res/layer_editor_layer_buttons-1.png
similarity index 100%
rename from Code/Sandbox/Editor/res/layer_editor_layer_buttons-1.png
rename to Code/Editor/res/layer_editor_layer_buttons-1.png
diff --git a/Code/Sandbox/Editor/res/layer_icon.svg b/Code/Editor/res/layer_icon.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/layer_icon.svg
rename to Code/Editor/res/layer_icon.svg
diff --git a/Code/Sandbox/Editor/res/layouts.bmp b/Code/Editor/res/layouts.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/layouts.bmp
rename to Code/Editor/res/layouts.bmp
diff --git a/Code/Sandbox/Editor/res/layouts/layouts-0.svg b/Code/Editor/res/layouts/layouts-0.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/layouts/layouts-0.svg
rename to Code/Editor/res/layouts/layouts-0.svg
diff --git a/Code/Sandbox/Editor/res/layouts/layouts-1.svg b/Code/Editor/res/layouts/layouts-1.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/layouts/layouts-1.svg
rename to Code/Editor/res/layouts/layouts-1.svg
diff --git a/Code/Sandbox/Editor/res/layouts/layouts-2.svg b/Code/Editor/res/layouts/layouts-2.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/layouts/layouts-2.svg
rename to Code/Editor/res/layouts/layouts-2.svg
diff --git a/Code/Sandbox/Editor/res/layouts/layouts-3.svg b/Code/Editor/res/layouts/layouts-3.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/layouts/layouts-3.svg
rename to Code/Editor/res/layouts/layouts-3.svg
diff --git a/Code/Sandbox/Editor/res/layouts/layouts-4.svg b/Code/Editor/res/layouts/layouts-4.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/layouts/layouts-4.svg
rename to Code/Editor/res/layouts/layouts-4.svg
diff --git a/Code/Sandbox/Editor/res/layouts/layouts-5.svg b/Code/Editor/res/layouts/layouts-5.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/layouts/layouts-5.svg
rename to Code/Editor/res/layouts/layouts-5.svg
diff --git a/Code/Sandbox/Editor/res/layouts/layouts-6.svg b/Code/Editor/res/layouts/layouts-6.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/layouts/layouts-6.svg
rename to Code/Editor/res/layouts/layouts-6.svg
diff --git a/Code/Sandbox/Editor/res/layouts/layouts-7.svg b/Code/Editor/res/layouts/layouts-7.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/layouts/layouts-7.svg
rename to Code/Editor/res/layouts/layouts-7.svg
diff --git a/Code/Sandbox/Editor/res/layouts/layouts-8.svg b/Code/Editor/res/layouts/layouts-8.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/layouts/layouts-8.svg
rename to Code/Editor/res/layouts/layouts-8.svg
diff --git a/Code/Sandbox/Editor/res/lc_connecting.ico b/Code/Editor/res/lc_connecting.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/lc_connecting.ico
rename to Code/Editor/res/lc_connecting.ico
diff --git a/Code/Sandbox/Editor/res/lc_running.ico b/Code/Editor/res/lc_running.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/lc_running.ico
rename to Code/Editor/res/lc_running.ico
diff --git a/Code/Sandbox/Editor/res/leftright.cur b/Code/Editor/res/leftright.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/leftright.cur
rename to Code/Editor/res/leftright.cur
diff --git a/Code/Sandbox/Editor/res/litebulb.bmp b/Code/Editor/res/litebulb.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/litebulb.bmp
rename to Code/Editor/res/litebulb.bmp
diff --git a/Code/Sandbox/Editor/res/lock_circle_default.svg b/Code/Editor/res/lock_circle_default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/lock_circle_default.svg
rename to Code/Editor/res/lock_circle_default.svg
diff --git a/Code/Sandbox/Editor/res/lock_circle_transparent.svg b/Code/Editor/res/lock_circle_transparent.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/lock_circle_transparent.svg
rename to Code/Editor/res/lock_circle_transparent.svg
diff --git a/Code/Sandbox/Editor/res/lock_on_NotTransparent.svg b/Code/Editor/res/lock_on_NotTransparent.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/lock_on_NotTransparent.svg
rename to Code/Editor/res/lock_on_NotTransparent.svg
diff --git a/Code/Sandbox/Editor/res/lock_on_transparent.svg b/Code/Editor/res/lock_on_transparent.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/lock_on_transparent.svg
rename to Code/Editor/res/lock_on_transparent.svg
diff --git a/Code/Sandbox/Editor/res/lock_sel.bmp b/Code/Editor/res/lock_sel.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/lock_sel.bmp
rename to Code/Editor/res/lock_sel.bmp
diff --git a/Code/Sandbox/Editor/res/locked.svg b/Code/Editor/res/locked.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/locked.svg
rename to Code/Editor/res/locked.svg
diff --git a/Code/Sandbox/Editor/res/locksele.bmp b/Code/Editor/res/locksele.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/locksele.bmp
rename to Code/Editor/res/locksele.bmp
diff --git a/Code/Sandbox/Editor/res/logo.bmp b/Code/Editor/res/logo.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/logo.bmp
rename to Code/Editor/res/logo.bmp
diff --git a/Code/Sandbox/Editor/res/logo.gif b/Code/Editor/res/logo.gif
similarity index 100%
rename from Code/Sandbox/Editor/res/logo.gif
rename to Code/Editor/res/logo.gif
diff --git a/Code/Sandbox/Editor/res/lyeditor_small.ico b/Code/Editor/res/lyeditor_small.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/lyeditor_small.ico
rename to Code/Editor/res/lyeditor_small.ico
diff --git a/Code/Sandbox/Editor/res/mainfram.bmp b/Code/Editor/res/mainfram.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/mainfram.bmp
rename to Code/Editor/res/mainfram.bmp
diff --git a/Code/Sandbox/Editor/res/mann_tagdef_toolbar.bmp b/Code/Editor/res/mann_tagdef_toolbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/mann_tagdef_toolbar.bmp
rename to Code/Editor/res/mann_tagdef_toolbar.bmp
diff --git a/Code/Sandbox/Editor/res/mann_tagdef_tree.bmp b/Code/Editor/res/mann_tagdef_tree.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/mann_tagdef_tree.bmp
rename to Code/Editor/res/mann_tagdef_tree.bmp
diff --git a/Code/Sandbox/Editor/res/material.bmp b/Code/Editor/res/material.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/material.bmp
rename to Code/Editor/res/material.bmp
diff --git a/Code/Sandbox/Editor/res/material_browser.bmp b/Code/Editor/res/material_browser.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/material_browser.bmp
rename to Code/Editor/res/material_browser.bmp
diff --git a/Code/Sandbox/Editor/res/materialbar.bmp b/Code/Editor/res/materialbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/materialbar.bmp
rename to Code/Editor/res/materialbar.bmp
diff --git a/Code/Sandbox/Editor/res/maximize.ico b/Code/Editor/res/maximize.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/maximize.ico
rename to Code/Editor/res/maximize.ico
diff --git a/Code/Sandbox/Editor/res/minus.ico b/Code/Editor/res/minus.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/minus.ico
rename to Code/Editor/res/minus.ico
diff --git a/Code/Sandbox/Editor/res/misc_bar.bmp b/Code/Editor/res/misc_bar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/misc_bar.bmp
rename to Code/Editor/res/misc_bar.bmp
diff --git a/Code/Sandbox/Editor/res/model_viewport_dock.bmp b/Code/Editor/res/model_viewport_dock.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/model_viewport_dock.bmp
rename to Code/Editor/res/model_viewport_dock.bmp
diff --git a/Code/Sandbox/Editor/res/model_viewport_fullscreen.bmp b/Code/Editor/res/model_viewport_fullscreen.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/model_viewport_fullscreen.bmp
rename to Code/Editor/res/model_viewport_fullscreen.bmp
diff --git a/Code/Sandbox/Editor/res/motion_b.bmp b/Code/Editor/res/motion_b.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/motion_b.bmp
rename to Code/Editor/res/motion_b.bmp
diff --git a/Code/Sandbox/Editor/res/musictree.bmp b/Code/Editor/res/musictree.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/musictree.bmp
rename to Code/Editor/res/musictree.bmp
diff --git a/Code/Sandbox/Editor/res/nodrop.cur b/Code/Editor/res/nodrop.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/nodrop.cur
rename to Code/Editor/res/nodrop.cur
diff --git a/Code/Sandbox/Editor/res/o3de_editor.ico b/Code/Editor/res/o3de_editor.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/o3de_editor.ico
rename to Code/Editor/res/o3de_editor.ico
diff --git a/Code/Sandbox/Editor/res/object_move.cur b/Code/Editor/res/object_move.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/object_move.cur
rename to Code/Editor/res/object_move.cur
diff --git a/Code/Sandbox/Editor/res/object_rotate.cur b/Code/Editor/res/object_rotate.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/object_rotate.cur
rename to Code/Editor/res/object_rotate.cur
diff --git a/Code/Sandbox/Editor/res/object_scale.cur b/Code/Editor/res/object_scale.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/object_scale.cur
rename to Code/Editor/res/object_scale.cur
diff --git a/Code/Sandbox/Editor/res/objectsbrowser.bmp b/Code/Editor/res/objectsbrowser.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/objectsbrowser.bmp
rename to Code/Editor/res/objectsbrowser.bmp
diff --git a/Code/Sandbox/Editor/res/pakmanager_file.png b/Code/Editor/res/pakmanager_file.png
similarity index 100%
rename from Code/Sandbox/Editor/res/pakmanager_file.png
rename to Code/Editor/res/pakmanager_file.png
diff --git a/Code/Sandbox/Editor/res/pakmanager_folder.png b/Code/Editor/res/pakmanager_folder.png
similarity index 100%
rename from Code/Sandbox/Editor/res/pakmanager_folder.png
rename to Code/Editor/res/pakmanager_folder.png
diff --git a/Code/Sandbox/Editor/res/panel_ve.bmp b/Code/Editor/res/panel_ve.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_ve.bmp
rename to Code/Editor/res/panel_ve.bmp
diff --git a/Code/Sandbox/Editor/res/panel_veg.bmp b/Code/Editor/res/panel_veg.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_veg.bmp
rename to Code/Editor/res/panel_veg.bmp
diff --git a/Code/Sandbox/Editor/res/panel_veg2.bmp b/Code/Editor/res/panel_veg2.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_veg2.bmp
rename to Code/Editor/res/panel_veg2.bmp
diff --git a/Code/Sandbox/Editor/res/panel_vegetation-00.png b/Code/Editor/res/panel_vegetation-00.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation-00.png
rename to Code/Editor/res/panel_vegetation-00.png
diff --git a/Code/Sandbox/Editor/res/panel_vegetation-01.png b/Code/Editor/res/panel_vegetation-01.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation-01.png
rename to Code/Editor/res/panel_vegetation-01.png
diff --git a/Code/Sandbox/Editor/res/panel_vegetation-02.png b/Code/Editor/res/panel_vegetation-02.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation-02.png
rename to Code/Editor/res/panel_vegetation-02.png
diff --git a/Code/Sandbox/Editor/res/panel_vegetation-03.png b/Code/Editor/res/panel_vegetation-03.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation-03.png
rename to Code/Editor/res/panel_vegetation-03.png
diff --git a/Code/Sandbox/Editor/res/panel_vegetation-04.png b/Code/Editor/res/panel_vegetation-04.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation-04.png
rename to Code/Editor/res/panel_vegetation-04.png
diff --git a/Code/Sandbox/Editor/res/panel_vegetation-05.png b/Code/Editor/res/panel_vegetation-05.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation-05.png
rename to Code/Editor/res/panel_vegetation-05.png
diff --git a/Code/Sandbox/Editor/res/panel_vegetation_2-00.png b/Code/Editor/res/panel_vegetation_2-00.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation_2-00.png
rename to Code/Editor/res/panel_vegetation_2-00.png
diff --git a/Code/Sandbox/Editor/res/panel_vegetation_2-01.png b/Code/Editor/res/panel_vegetation_2-01.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation_2-01.png
rename to Code/Editor/res/panel_vegetation_2-01.png
diff --git a/Code/Sandbox/Editor/res/panel_vegetation_2-02.png b/Code/Editor/res/panel_vegetation_2-02.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation_2-02.png
rename to Code/Editor/res/panel_vegetation_2-02.png
diff --git a/Code/Sandbox/Editor/res/panel_vegetation_2-03.png b/Code/Editor/res/panel_vegetation_2-03.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation_2-03.png
rename to Code/Editor/res/panel_vegetation_2-03.png
diff --git a/Code/Sandbox/Editor/res/panel_vegetation_2-04.png b/Code/Editor/res/panel_vegetation_2-04.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation_2-04.png
rename to Code/Editor/res/panel_vegetation_2-04.png
diff --git a/Code/Sandbox/Editor/res/panel_vegetation_2-05.png b/Code/Editor/res/panel_vegetation_2-05.png
similarity index 100%
rename from Code/Sandbox/Editor/res/panel_vegetation_2-05.png
rename to Code/Editor/res/panel_vegetation_2-05.png
diff --git a/Code/Sandbox/Editor/res/particles_tree.bmp b/Code/Editor/res/particles_tree.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/particles_tree.bmp
rename to Code/Editor/res/particles_tree.bmp
diff --git a/Code/Sandbox/Editor/res/particlesbar.bmp b/Code/Editor/res/particlesbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/particlesbar.bmp
rename to Code/Editor/res/particlesbar.bmp
diff --git a/Code/Sandbox/Editor/res/pick.bmp b/Code/Editor/res/pick.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/pick.bmp
rename to Code/Editor/res/pick.bmp
diff --git a/Code/Sandbox/Editor/res/pick_cursor.cur b/Code/Editor/res/pick_cursor.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pick_cursor.cur
rename to Code/Editor/res/pick_cursor.cur
diff --git a/Code/Sandbox/Editor/res/plus.ico b/Code/Editor/res/plus.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/plus.ico
rename to Code/Editor/res/plus.ico
diff --git a/Code/Sandbox/Editor/res/pointerDragItem.cur b/Code/Editor/res/pointerDragItem.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointerDragItem.cur
rename to Code/Editor/res/pointerDragItem.cur
diff --git a/Code/Sandbox/Editor/res/pointerHit.cur b/Code/Editor/res/pointerHit.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointerHit.cur
rename to Code/Editor/res/pointerHit.cur
diff --git a/Code/Sandbox/Editor/res/pointer_.cur b/Code/Editor/res/pointer_.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointer_.cur
rename to Code/Editor/res/pointer_.cur
diff --git a/Code/Sandbox/Editor/res/pointer_flatten.cur b/Code/Editor/res/pointer_flatten.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointer_flatten.cur
rename to Code/Editor/res/pointer_flatten.cur
diff --git a/Code/Sandbox/Editor/res/pointer_getheight.cur b/Code/Editor/res/pointer_getheight.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointer_getheight.cur
rename to Code/Editor/res/pointer_getheight.cur
diff --git a/Code/Sandbox/Editor/res/pointer_link.cur b/Code/Editor/res/pointer_link.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointer_link.cur
rename to Code/Editor/res/pointer_link.cur
diff --git a/Code/Sandbox/Editor/res/pointer_linknow.cur b/Code/Editor/res/pointer_linknow.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointer_linknow.cur
rename to Code/Editor/res/pointer_linknow.cur
diff --git a/Code/Sandbox/Editor/res/pointer_minus.cur b/Code/Editor/res/pointer_minus.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointer_minus.cur
rename to Code/Editor/res/pointer_minus.cur
diff --git a/Code/Sandbox/Editor/res/pointer_plus.cur b/Code/Editor/res/pointer_plus.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointer_plus.cur
rename to Code/Editor/res/pointer_plus.cur
diff --git a/Code/Sandbox/Editor/res/pointer_smooth.cur b/Code/Editor/res/pointer_smooth.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointer_smooth.cur
rename to Code/Editor/res/pointer_smooth.cur
diff --git a/Code/Sandbox/Editor/res/pointer_so_sel_plus.cur b/Code/Editor/res/pointer_so_sel_plus.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointer_so_sel_plus.cur
rename to Code/Editor/res/pointer_so_sel_plus.cur
diff --git a/Code/Sandbox/Editor/res/pointer_so_select.cur b/Code/Editor/res/pointer_so_select.cur
similarity index 100%
rename from Code/Sandbox/Editor/res/pointer_so_select.cur
rename to Code/Editor/res/pointer_so_select.cur
diff --git a/Code/Sandbox/Editor/res/proceduralmaterial_toolbar.bmp b/Code/Editor/res/proceduralmaterial_toolbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/proceduralmaterial_toolbar.bmp
rename to Code/Editor/res/proceduralmaterial_toolbar.bmp
diff --git a/Code/Sandbox/Editor/res/progslider_end.bmp b/Code/Editor/res/progslider_end.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/progslider_end.bmp
rename to Code/Editor/res/progslider_end.bmp
diff --git a/Code/Sandbox/Editor/res/progslider_marker.bmp b/Code/Editor/res/progslider_marker.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/progslider_marker.bmp
rename to Code/Editor/res/progslider_marker.bmp
diff --git a/Code/Sandbox/Editor/res/progslider_start.bmp b/Code/Editor/res/progslider_start.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/progslider_start.bmp
rename to Code/Editor/res/progslider_start.bmp
diff --git a/Code/Sandbox/Editor/res/progslider_thumb.bmp b/Code/Editor/res/progslider_thumb.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/progslider_thumb.bmp
rename to Code/Editor/res/progslider_thumb.bmp
diff --git a/Code/Sandbox/Editor/res/progslider_track.bmp b/Code/Editor/res/progslider_track.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/progslider_track.bmp
rename to Code/Editor/res/progslider_track.bmp
diff --git a/Code/Sandbox/Editor/res/properties.bmp b/Code/Editor/res/properties.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/properties.bmp
rename to Code/Editor/res/properties.bmp
diff --git a/Code/Sandbox/Editor/res/psd.ico b/Code/Editor/res/psd.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/psd.ico
rename to Code/Editor/res/psd.ico
diff --git a/Code/Sandbox/Editor/res/remove.png b/Code/Editor/res/remove.png
similarity index 100%
rename from Code/Sandbox/Editor/res/remove.png
rename to Code/Editor/res/remove.png
diff --git a/Code/Sandbox/Editor/res/rename.ico b/Code/Editor/res/rename.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/rename.ico
rename to Code/Editor/res/rename.ico
diff --git a/Code/Sandbox/Editor/res/replace.ico b/Code/Editor/res/replace.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/replace.ico
rename to Code/Editor/res/replace.ico
diff --git a/Code/Sandbox/Editor/res/ribbon_system_button.png b/Code/Editor/res/ribbon_system_button.png
similarity index 100%
rename from Code/Sandbox/Editor/res/ribbon_system_button.png
rename to Code/Editor/res/ribbon_system_button.png
diff --git a/Code/Sandbox/Editor/res/sandbox_dark.bmp b/Code/Editor/res/sandbox_dark.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/sandbox_dark.bmp
rename to Code/Editor/res/sandbox_dark.bmp
diff --git a/Code/Sandbox/Editor/res/sb_welcome_dark.bmp b/Code/Editor/res/sb_welcome_dark.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/sb_welcome_dark.bmp
rename to Code/Editor/res/sb_welcome_dark.bmp
diff --git a/Code/Sandbox/Editor/res/selectobj.bmp b/Code/Editor/res/selectobj.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/selectobj.bmp
rename to Code/Editor/res/selectobj.bmp
diff --git a/Code/Sandbox/Editor/res/seq_1_colour_keys.bmp b/Code/Editor/res/seq_1_colour_keys.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/seq_1_colour_keys.bmp
rename to Code/Editor/res/seq_1_colour_keys.bmp
diff --git a/Code/Sandbox/Editor/res/seq_2_colour_keys.bmp b/Code/Editor/res/seq_2_colour_keys.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/seq_2_colour_keys.bmp
rename to Code/Editor/res/seq_2_colour_keys.bmp
diff --git a/Code/Sandbox/Editor/res/seq_3_colour_keys.bmp b/Code/Editor/res/seq_3_colour_keys.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/seq_3_colour_keys.bmp
rename to Code/Editor/res/seq_3_colour_keys.bmp
diff --git a/Code/Sandbox/Editor/res/seq_4_colour_keys.bmp b/Code/Editor/res/seq_4_colour_keys.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/seq_4_colour_keys.bmp
rename to Code/Editor/res/seq_4_colour_keys.bmp
diff --git a/Code/Sandbox/Editor/res/seq_5_colour_keys.bmp b/Code/Editor/res/seq_5_colour_keys.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/seq_5_colour_keys.bmp
rename to Code/Editor/res/seq_5_colour_keys.bmp
diff --git a/Code/Sandbox/Editor/res/seq_6_colour_keys.bmp b/Code/Editor/res/seq_6_colour_keys.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/seq_6_colour_keys.bmp
rename to Code/Editor/res/seq_6_colour_keys.bmp
diff --git a/Code/Sandbox/Editor/res/seq_7_colour_keys.bmp b/Code/Editor/res/seq_7_colour_keys.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/seq_7_colour_keys.bmp
rename to Code/Editor/res/seq_7_colour_keys.bmp
diff --git a/Code/Sandbox/Editor/res/sequencer_keys.bmp b/Code/Editor/res/sequencer_keys.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/sequencer_keys.bmp
rename to Code/Editor/res/sequencer_keys.bmp
diff --git a/Code/Sandbox/Editor/res/sequencer_nodes.bmp b/Code/Editor/res/sequencer_nodes.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/sequencer_nodes.bmp
rename to Code/Editor/res/sequencer_nodes.bmp
diff --git a/Code/Sandbox/Editor/res/soundfiles.bmp b/Code/Editor/res/soundfiles.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/soundfiles.bmp
rename to Code/Editor/res/soundfiles.bmp
diff --git a/Code/Sandbox/Editor/res/soundmood.bmp b/Code/Editor/res/soundmood.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/soundmood.bmp
rename to Code/Editor/res/soundmood.bmp
diff --git a/Code/Sandbox/Editor/res/soundpre.bmp b/Code/Editor/res/soundpre.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/soundpre.bmp
rename to Code/Editor/res/soundpre.bmp
diff --git a/Code/Sandbox/Editor/res/source_control-not_setup.svg b/Code/Editor/res/source_control-not_setup.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/source_control-not_setup.svg
rename to Code/Editor/res/source_control-not_setup.svg
diff --git a/Code/Sandbox/Editor/res/source_control-warning_v2.svg b/Code/Editor/res/source_control-warning_v2.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/source_control-warning_v2.svg
rename to Code/Editor/res/source_control-warning_v2.svg
diff --git a/Code/Sandbox/Editor/res/source_control_buttons.bmp b/Code/Editor/res/source_control_buttons.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/source_control_buttons.bmp
rename to Code/Editor/res/source_control_buttons.bmp
diff --git a/Code/Sandbox/Editor/res/source_control_connected.svg b/Code/Editor/res/source_control_connected.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/source_control_connected.svg
rename to Code/Editor/res/source_control_connected.svg
diff --git a/Code/Sandbox/Editor/res/source_control_error_v2.svg b/Code/Editor/res/source_control_error_v2.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/source_control_error_v2.svg
rename to Code/Editor/res/source_control_error_v2.svg
diff --git a/Code/Sandbox/Editor/res/spline_edit_bar.bmp b/Code/Editor/res/spline_edit_bar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/spline_edit_bar.bmp
rename to Code/Editor/res/spline_edit_bar.bmp
diff --git a/Code/Sandbox/Editor/res/splineextrabar.bmp b/Code/Editor/res/splineextrabar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/splineextrabar.bmp
rename to Code/Editor/res/splineextrabar.bmp
diff --git a/Code/Sandbox/Editor/res/status_mem_low1.ico b/Code/Editor/res/status_mem_low1.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/status_mem_low1.ico
rename to Code/Editor/res/status_mem_low1.ico
diff --git a/Code/Sandbox/Editor/res/status_mem_low2.ico b/Code/Editor/res/status_mem_low2.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/status_mem_low2.ico
rename to Code/Editor/res/status_mem_low2.ico
diff --git a/Code/Sandbox/Editor/res/status_mem_ok.ico b/Code/Editor/res/status_mem_ok.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/status_mem_ok.ico
rename to Code/Editor/res/status_mem_ok.ico
diff --git a/Code/Sandbox/Editor/res/stdviews.bmp b/Code/Editor/res/stdviews.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/stdviews.bmp
rename to Code/Editor/res/stdviews.bmp
diff --git a/Code/Sandbox/Editor/res/subobjseltype.bmp b/Code/Editor/res/subobjseltype.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/subobjseltype.bmp
rename to Code/Editor/res/subobjseltype.bmp
diff --git a/Code/Sandbox/Editor/res/sw_mapbar.bmp b/Code/Editor/res/sw_mapbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/sw_mapbar.bmp
rename to Code/Editor/res/sw_mapbar.bmp
diff --git a/Code/Sandbox/Editor/res/sw_toolbar.bmp b/Code/Editor/res/sw_toolbar.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/sw_toolbar.bmp
rename to Code/Editor/res/sw_toolbar.bmp
diff --git a/Code/Sandbox/Editor/res/tabPanel.bmp b/Code/Editor/res/tabPanel.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/tabPanel.bmp
rename to Code/Editor/res/tabPanel.bmp
diff --git a/Code/Sandbox/Editor/res/tiff.ico b/Code/Editor/res/tiff.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/tiff.ico
rename to Code/Editor/res/tiff.ico
diff --git a/Code/Sandbox/Editor/res/toolbar1.bmp b/Code/Editor/res/toolbar1.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/toolbar1.bmp
rename to Code/Editor/res/toolbar1.bmp
diff --git a/Code/Sandbox/Editor/res/toolbar2.bmp b/Code/Editor/res/toolbar2.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/toolbar2.bmp
rename to Code/Editor/res/toolbar2.bmp
diff --git a/Code/Sandbox/Editor/res/toolbox.bmp b/Code/Editor/res/toolbox.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/toolbox.bmp
rename to Code/Editor/res/toolbox.bmp
diff --git a/Code/Sandbox/Editor/res/trackvie.bmp b/Code/Editor/res/trackvie.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/trackvie.bmp
rename to Code/Editor/res/trackvie.bmp
diff --git a/Code/Sandbox/Editor/res/trackview.bmp b/Code/Editor/res/trackview.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/trackview.bmp
rename to Code/Editor/res/trackview.bmp
diff --git a/Code/Sandbox/Editor/res/trackview1.bmp b/Code/Editor/res/trackview1.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/trackview1.bmp
rename to Code/Editor/res/trackview1.bmp
diff --git a/Code/Sandbox/Editor/res/trackview_key.bmp b/Code/Editor/res/trackview_key.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/trackview_key.bmp
rename to Code/Editor/res/trackview_key.bmp
diff --git a/Code/Sandbox/Editor/res/trackview_keys.bmp b/Code/Editor/res/trackview_keys.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/trackview_keys.bmp
rename to Code/Editor/res/trackview_keys.bmp
diff --git a/Code/Sandbox/Editor/res/trackview_nodes.bmp b/Code/Editor/res/trackview_nodes.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/trackview_nodes.bmp
rename to Code/Editor/res/trackview_nodes.bmp
diff --git a/Code/Sandbox/Editor/res/trackview_play.bmp b/Code/Editor/res/trackview_play.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/trackview_play.bmp
rename to Code/Editor/res/trackview_play.bmp
diff --git a/Code/Sandbox/Editor/res/trackview_view.bmp b/Code/Editor/res/trackview_view.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/trackview_view.bmp
rename to Code/Editor/res/trackview_view.bmp
diff --git a/Code/Sandbox/Editor/res/tree_vie.bmp b/Code/Editor/res/tree_vie.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/tree_vie.bmp
rename to Code/Editor/res/tree_vie.bmp
diff --git a/Code/Sandbox/Editor/res/tree_view_folder.png b/Code/Editor/res/tree_view_folder.png
similarity index 100%
rename from Code/Sandbox/Editor/res/tree_view_folder.png
rename to Code/Editor/res/tree_view_folder.png
diff --git a/Code/Sandbox/Editor/res/tree_view_level.png b/Code/Editor/res/tree_view_level.png
similarity index 100%
rename from Code/Sandbox/Editor/res/tree_view_level.png
rename to Code/Editor/res/tree_view_level.png
diff --git a/Code/Sandbox/Editor/res/uieditor_main.bmp b/Code/Editor/res/uieditor_main.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/uieditor_main.bmp
rename to Code/Editor/res/uieditor_main.bmp
diff --git a/Code/Sandbox/Editor/res/unlocked.svg b/Code/Editor/res/unlocked.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/unlocked.svg
rename to Code/Editor/res/unlocked.svg
diff --git a/Code/Sandbox/Editor/res/up_arrow.ico b/Code/Editor/res/up_arrow.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/up_arrow.ico
rename to Code/Editor/res/up_arrow.ico
diff --git a/Code/Sandbox/Editor/res/value_types.bmp b/Code/Editor/res/value_types.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/value_types.bmp
rename to Code/Editor/res/value_types.bmp
diff --git a/Code/Sandbox/Editor/res/veed_tree.bmp b/Code/Editor/res/veed_tree.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/veed_tree.bmp
rename to Code/Editor/res/veed_tree.bmp
diff --git a/Code/Sandbox/Editor/res/vegetati.bmp b/Code/Editor/res/vegetati.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/vegetati.bmp
rename to Code/Editor/res/vegetati.bmp
diff --git a/Code/Sandbox/Editor/res/vegtree.bmp b/Code/Editor/res/vegtree.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/vegtree.bmp
rename to Code/Editor/res/vegtree.bmp
diff --git a/Code/Sandbox/Editor/res/video_record.ico b/Code/Editor/res/video_record.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/video_record.ico
rename to Code/Editor/res/video_record.ico
diff --git a/Code/Sandbox/Editor/res/vis_circle_default.svg b/Code/Editor/res/vis_circle_default.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/vis_circle_default.svg
rename to Code/Editor/res/vis_circle_default.svg
diff --git a/Code/Sandbox/Editor/res/vis_circle_transparent.svg b/Code/Editor/res/vis_circle_transparent.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/vis_circle_transparent.svg
rename to Code/Editor/res/vis_circle_transparent.svg
diff --git a/Code/Sandbox/Editor/res/vis_on_NotTransparent.svg b/Code/Editor/res/vis_on_NotTransparent.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/vis_on_NotTransparent.svg
rename to Code/Editor/res/vis_on_NotTransparent.svg
diff --git a/Code/Sandbox/Editor/res/vis_on_transparent.svg b/Code/Editor/res/vis_on_transparent.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/vis_on_transparent.svg
rename to Code/Editor/res/vis_on_transparent.svg
diff --git a/Code/Sandbox/Editor/res/visb.svg b/Code/Editor/res/visb.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/visb.svg
rename to Code/Editor/res/visb.svg
diff --git a/Code/Sandbox/Editor/res/visb_hidden.svg b/Code/Editor/res/visb_hidden.svg
similarity index 100%
rename from Code/Sandbox/Editor/res/visb_hidden.svg
rename to Code/Editor/res/visb_hidden.svg
diff --git a/Code/Sandbox/Editor/res/warning16x16.ico b/Code/Editor/res/warning16x16.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/warning16x16.ico
rename to Code/Editor/res/warning16x16.ico
diff --git a/Code/Sandbox/Editor/res/water.bmp b/Code/Editor/res/water.bmp
similarity index 100%
rename from Code/Sandbox/Editor/res/water.bmp
rename to Code/Editor/res/water.bmp
diff --git a/Code/Sandbox/Editor/res/work_in_progress_icon.ico b/Code/Editor/res/work_in_progress_icon.ico
similarity index 100%
rename from Code/Sandbox/Editor/res/work_in_progress_icon.ico
rename to Code/Editor/res/work_in_progress_icon.ico
diff --git a/Code/Sandbox/Editor/res/work_in_progress_icon.png b/Code/Editor/res/work_in_progress_icon.png
similarity index 100%
rename from Code/Sandbox/Editor/res/work_in_progress_icon.png
rename to Code/Editor/res/work_in_progress_icon.png
diff --git a/Code/Sandbox/Editor/splashscreen_background_gradient.jpg b/Code/Editor/splashscreen_background_gradient.jpg
similarity index 100%
rename from Code/Sandbox/Editor/splashscreen_background_gradient.jpg
rename to Code/Editor/splashscreen_background_gradient.jpg
diff --git a/Code/Sandbox/Editor/water.png b/Code/Editor/water.png
similarity index 100%
rename from Code/Sandbox/Editor/water.png
rename to Code/Editor/water.png