From 9971ff54f85be7c8ec9a7ec5f2ec766aea5ccbe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Krupi=C5=84ski?= <danielkrupinski@outlook.com>
Date: Wed, 29 Jan 2025 19:51:47 +0100
Subject: [PATCH] Move Panorama-related classes to Source/Panorama directory

---
 Source/Features/Common/InWorldPanels.h        |   2 +-
 .../Common/InWorldPanelsUnloadHandler.h       |   2 +-
 .../Features/Hud/BombTimer/BombTimerContext.h |   8 +-
 .../Hud/BombTimer/BombTimerPanelParams.h      |   6 +-
 .../DefusingAlert/DefusingAlertPanelParams.h  |   6 +-
 .../PostRoundTimer/PostRoundTimerContext.h    |   2 +-
 .../PostRoundTimerPanelParams.h               |   2 +-
 .../Sound/Details/SoundVisualizationFeature.h |   2 +-
 .../Details/SoundVisualizationPanelFactory.h  |   2 +-
 .../ActiveWeaponAmmoPanelParams.h             |   8 +-
 .../PlayerActiveWeaponAmmoPanel.h             |   2 +-
 .../PlayerHealth/PlayerHealthPanelParams.h    |   6 +-
 .../PlayerInfoInWorld/PlayerInfoInWorld.h     |   6 +-
 .../PlayerInfoInWorldPanelFactory.h           |   4 +-
 .../PlayerInfoInWorld/PlayerInfoPanel.h       |   4 +-
 .../PlayerPositionArrowPanelParams.h          |   4 +-
 .../PlayerStateIconsPanelContext.h            |   2 +-
 .../PlayerStateIconsPanelParams.h             |   6 +-
 .../ActiveWeaponIconPanelParams.h             |   6 +-
 .../PlayerActiveWeaponIconPanel.h             |   2 +-
 .../PlayerActiveWeaponIconPanelContext.h      |   2 +-
 .../BombIcon/PlayerBombIconPanelContext.h     |   2 +-
 .../BombIcon/PlayerBombIconPanelParams.h      |   6 +-
 .../PlayerWeaponIconPanelParams.h             |   4 +-
 Source/GameClasses/Hud/DeathNoticeContext.h   |   2 +-
 Source/GameClasses/Hud/HudContext.h           |   2 +-
 Source/GameDependencies/GameDependencies.h    |   4 +-
 Source/HookDependencies/HookDependencies.h    |   4 +-
 .../Hud/BombStatus/BombStatusPanelContext.h   |   2 +-
 Source/Osiris.vcxproj                         |  51 +++---
 Source/Osiris.vcxproj.filters                 | 156 +++++++++---------
 .../{GameClasses => Panorama}/ClientPanel.h   |   0
 .../MapPlayerPreviewPanel.h                   |   0
 .../PanelAlignmentParams.h                    |   0
 .../{GameClasses => Panorama}/PanelFactory.h  |   2 +-
 .../PanelFontParams.h                         |   0
 .../{GameClasses => Panorama}/PanelHandle.h   |   0
 .../PanelMarginParams.h                       |   0
 .../PanelShadowParams.h                       |   0
 .../PanelStylePropertyFactory.h               |   6 +-
 .../PanoramaDropDown.h                        |   0
 .../PanoramaImagePanel.h                      |   0
 .../PanoramaImagePanelContext.h               |   2 +-
 .../{GameClasses => Panorama}/PanoramaLabel.h |   0
 .../PanoramaSymbols.h                         |   2 +-
 .../PanoramaTransformFactory.h                |   0
 .../PanoramaTransformations.h                 |   0
 .../PanoramaUiEngine.h                        |   0
 .../PanoramaUiPanel.h                         |   4 +-
 .../PanoramaUiPanelChildPanels.h              |   0
 .../PanoramaUiPanelClasses.h                  |   0
 .../PanoramaUiPanelContext.h                  |   1 +
 .../PanoramaUiPanelIterator.h                 |   0
 .../PanoramaUiPanelMethodInvoker.h            |   0
 .../StylePropertiesSymbolsAndVMTs.h           |   0
 .../StylePropertySymbolMap.h                  |   0
 .../TopLevelWindow.h                          |   0
 Source/UI/Panorama/HudTab.h                   |   2 +-
 Source/UI/Panorama/PanoramaGUI.h              |   4 +-
 Source/UI/Panorama/PanoramaGuiUnloadHandler.h |   2 +-
 Source/UI/Panorama/SoundTab.h                 |   2 +-
 Source/UI/Panorama/VisualsTab.h               |   2 +-
 62 files changed, 177 insertions(+), 169 deletions(-)
 rename Source/{GameClasses => Panorama}/ClientPanel.h (100%)
 rename Source/{GameClasses => Panorama}/MapPlayerPreviewPanel.h (100%)
 rename Source/{GameClasses => Panorama}/PanelAlignmentParams.h (100%)
 rename Source/{GameClasses => Panorama}/PanelFactory.h (98%)
 rename Source/{GameClasses => Panorama}/PanelFontParams.h (100%)
 rename Source/{GameClasses => Panorama}/PanelHandle.h (100%)
 rename Source/{GameClasses => Panorama}/PanelMarginParams.h (100%)
 rename Source/{FeatureHelpers => Panorama}/PanelShadowParams.h (100%)
 rename Source/{FeatureHelpers => Panorama}/PanelStylePropertyFactory.h (97%)
 rename Source/{GameClasses => Panorama}/PanoramaDropDown.h (100%)
 rename Source/{GameClasses => Panorama}/PanoramaImagePanel.h (100%)
 rename Source/{GameClasses => Panorama}/PanoramaImagePanelContext.h (95%)
 rename Source/{GameClasses => Panorama}/PanoramaLabel.h (100%)
 rename Source/{GameDependencies => Panorama}/PanoramaSymbols.h (92%)
 rename Source/{Helpers => Panorama}/PanoramaTransformFactory.h (100%)
 rename Source/{FeatureHelpers => Panorama}/PanoramaTransformations.h (100%)
 rename Source/{GameClasses => Panorama}/PanoramaUiEngine.h (100%)
 rename Source/{GameClasses => Panorama}/PanoramaUiPanel.h (98%)
 rename Source/{GameClasses => Panorama}/PanoramaUiPanelChildPanels.h (100%)
 rename Source/{GameClasses => Panorama}/PanoramaUiPanelClasses.h (100%)
 rename Source/{GameClasses => Panorama}/PanoramaUiPanelContext.h (99%)
 rename Source/{GameClasses => Panorama}/PanoramaUiPanelIterator.h (100%)
 rename Source/{GameClasses => Panorama}/PanoramaUiPanelMethodInvoker.h (100%)
 rename Source/{FeatureHelpers => Panorama}/StylePropertiesSymbolsAndVMTs.h (100%)
 rename Source/{FeatureHelpers => Panorama}/StylePropertySymbolMap.h (100%)
 rename Source/{GameClasses => Panorama}/TopLevelWindow.h (100%)

diff --git a/Source/Features/Common/InWorldPanels.h b/Source/Features/Common/InWorldPanels.h
index 7c96d7a6c69..738253c8c2a 100644
--- a/Source/Features/Common/InWorldPanels.h
+++ b/Source/Features/Common/InWorldPanels.h
@@ -5,7 +5,7 @@
 #include <Features/Visuals/PlayerInfoInWorld/PlayerInfoInWorldPanelFactory.h>
 #include <Features/Visuals/PlayerInfoInWorld/PlayerInfoPanel.h>
 #include <Features/Visuals/PlayerInfoInWorld/PlayerInfoPanelCache.h>
-#include <GameClasses/PanelHandle.h>
+#include <Panorama/PanelHandle.h>
 #include "InWorldPanelIndex.h"
 #include "InWorldPanelListEntry.h"
 
diff --git a/Source/Features/Common/InWorldPanelsUnloadHandler.h b/Source/Features/Common/InWorldPanelsUnloadHandler.h
index f31939729b2..9b8fe616b4d 100644
--- a/Source/Features/Common/InWorldPanelsUnloadHandler.h
+++ b/Source/Features/Common/InWorldPanelsUnloadHandler.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <GameClasses/PanoramaUiEngine.h>
+#include <Panorama/PanoramaUiEngine.h>
 
 template <typename HookContext>
 struct InWorldPanelsUnloadHandler {
diff --git a/Source/Features/Hud/BombTimer/BombTimerContext.h b/Source/Features/Hud/BombTimer/BombTimerContext.h
index 94fa41ed38b..3fe9d3ad173 100644
--- a/Source/Features/Hud/BombTimer/BombTimerContext.h
+++ b/Source/Features/Hud/BombTimer/BombTimerContext.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <CS2/Constants/ColorConstants.h>
-#include <GameClasses/PanoramaImagePanel.h>
-#include <GameClasses/PanoramaLabel.h>
-#include <GameClasses/PanoramaUiEngine.h>
-#include <GameClasses/PanoramaUiPanel.h>
+#include <Panorama/PanoramaImagePanel.h>
+#include <Panorama/PanoramaLabel.h>
+#include <Panorama/PanoramaUiEngine.h>
+#include <Panorama/PanoramaUiPanel.h>
 #include <Utils/Lvalue.h>
 
 #include "BombSiteIconPanel.h"
diff --git a/Source/Features/Hud/BombTimer/BombTimerPanelParams.h b/Source/Features/Hud/BombTimer/BombTimerPanelParams.h
index c8690cadd94..b68e6db6e69 100644
--- a/Source/Features/Hud/BombTimer/BombTimerPanelParams.h
+++ b/Source/Features/Hud/BombTimer/BombTimerPanelParams.h
@@ -3,9 +3,9 @@
 #include <CS2/Panorama/CUILength.h>
 #include <CS2/Panorama/StyleEnums.h>
 
-#include <GameClasses/PanelAlignmentParams.h>
-#include <GameClasses/PanelFontParams.h>
-#include <GameClasses/PanelMarginParams.h>
+#include <Panorama/PanelAlignmentParams.h>
+#include <Panorama/PanelFontParams.h>
+#include <Panorama/PanelMarginParams.h>
 
 namespace bomb_timer_panel_params::container_panel_params
 {
diff --git a/Source/Features/Hud/DefusingAlert/DefusingAlertPanelParams.h b/Source/Features/Hud/DefusingAlert/DefusingAlertPanelParams.h
index a72794930f6..aebe52eaa4f 100644
--- a/Source/Features/Hud/DefusingAlert/DefusingAlertPanelParams.h
+++ b/Source/Features/Hud/DefusingAlert/DefusingAlertPanelParams.h
@@ -3,9 +3,9 @@
 #include <CS2/Panorama/CUILength.h>
 #include <CS2/Constants/ColorConstants.h>
 #include <CS2/Panorama/StyleEnums.h>
-#include <GameClasses/PanelAlignmentParams.h>
-#include <GameClasses/PanelFontParams.h>
-#include <GameClasses/PanelMarginParams.h>
+#include <Panorama/PanelAlignmentParams.h>
+#include <Panorama/PanelFontParams.h>
+#include <Panorama/PanelMarginParams.h>
 
 namespace defusing_alert_panel_params::timer_text_panel_params
 {
diff --git a/Source/Features/Hud/PostRoundTimer/PostRoundTimerContext.h b/Source/Features/Hud/PostRoundTimer/PostRoundTimerContext.h
index 26e4844e947..db0fc184933 100644
--- a/Source/Features/Hud/PostRoundTimer/PostRoundTimerContext.h
+++ b/Source/Features/Hud/PostRoundTimer/PostRoundTimerContext.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <GameClasses/PanelHandle.h>
+#include <Panorama/PanelHandle.h>
 
 #include "PostRoundTimerCondition.h"
 #include "PostRoundTimerPanel.h"
diff --git a/Source/Features/Hud/PostRoundTimer/PostRoundTimerPanelParams.h b/Source/Features/Hud/PostRoundTimer/PostRoundTimerPanelParams.h
index 6c1eaefb3a9..631c9532a64 100644
--- a/Source/Features/Hud/PostRoundTimer/PostRoundTimerPanelParams.h
+++ b/Source/Features/Hud/PostRoundTimer/PostRoundTimerPanelParams.h
@@ -2,7 +2,7 @@
 
 #include <CS2/Panorama/CUILength.h>
 #include <CS2/Panorama/StyleEnums.h>
-#include <GameClasses/PanelFontParams.h>
+#include <Panorama/PanelFontParams.h>
 
 namespace post_round_timer_panel_params::container_panel_params
 {
diff --git a/Source/Features/Sound/Details/SoundVisualizationFeature.h b/Source/Features/Sound/Details/SoundVisualizationFeature.h
index 5c689d271e7..e7c5f2f0dcc 100644
--- a/Source/Features/Sound/Details/SoundVisualizationFeature.h
+++ b/Source/Features/Sound/Details/SoundVisualizationFeature.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <FeatureHelpers/PanoramaTransformations.h>
+#include <Panorama/PanoramaTransformations.h>
 #include <FeatureHelpers/Sound/SoundWatcher.h>
 #include <FeatureHelpers/FeatureToggle.h>
 #include <Hooks/ViewRenderHook.h>
diff --git a/Source/Features/Sound/Details/SoundVisualizationPanelFactory.h b/Source/Features/Sound/Details/SoundVisualizationPanelFactory.h
index 5047ff962e8..51b371c51f8 100644
--- a/Source/Features/Sound/Details/SoundVisualizationPanelFactory.h
+++ b/Source/Features/Sound/Details/SoundVisualizationPanelFactory.h
@@ -5,7 +5,7 @@
 #include <CS2/Constants/ColorConstants.h>
 #include <CS2/Panorama/CUILength.h>
 #include <CS2/Panorama/CUIPanel.h>
-#include <GameClasses/PanoramaUiPanel.h>
+#include <Panorama/PanoramaUiPanel.h>
 #include <Utils/Lvalue.h>
 
 #include "SoundVisualizationPanelProperties.h"
diff --git a/Source/Features/Visuals/PlayerInfoInWorld/ActiveWeaponAmmo/ActiveWeaponAmmoPanelParams.h b/Source/Features/Visuals/PlayerInfoInWorld/ActiveWeaponAmmo/ActiveWeaponAmmoPanelParams.h
index c278e5b30bb..630e8726d58 100644
--- a/Source/Features/Visuals/PlayerInfoInWorld/ActiveWeaponAmmo/ActiveWeaponAmmoPanelParams.h
+++ b/Source/Features/Visuals/PlayerInfoInWorld/ActiveWeaponAmmo/ActiveWeaponAmmoPanelParams.h
@@ -3,10 +3,10 @@
 #include <CS2/Constants/ColorConstants.h>
 #include <CS2/Panorama/CUILength.h>
 #include <CS2/Panorama/StyleEnums.h>
-#include <FeatureHelpers/PanelShadowParams.h>
-#include <GameClasses/PanelAlignmentParams.h>
-#include <GameClasses/PanelFontParams.h>
-#include <GameClasses/PanelMarginParams.h>
+#include <Panorama/PanelShadowParams.h>
+#include <Panorama/PanelAlignmentParams.h>
+#include <Panorama/PanelFontParams.h>
+#include <Panorama/PanelMarginParams.h>
 
 namespace active_weapon_ammo_panel_params::container_panel_params
 {
diff --git a/Source/Features/Visuals/PlayerInfoInWorld/ActiveWeaponAmmo/PlayerActiveWeaponAmmoPanel.h b/Source/Features/Visuals/PlayerInfoInWorld/ActiveWeaponAmmo/PlayerActiveWeaponAmmoPanel.h
index e7ee2993e5f..4badc2edee7 100644
--- a/Source/Features/Visuals/PlayerInfoInWorld/ActiveWeaponAmmo/PlayerActiveWeaponAmmoPanel.h
+++ b/Source/Features/Visuals/PlayerInfoInWorld/ActiveWeaponAmmo/PlayerActiveWeaponAmmoPanel.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "PlayerActiveWeaponAmmoPanelContext.h"
-#include <GameClasses/PanoramaLabel.h>
+#include <Panorama/PanoramaLabel.h>
 
 template <typename HookContext, typename Context = PlayerActiveWeaponAmmoPanelContext<HookContext>>
 class PlayerActiveWeaponAmmoPanel {
diff --git a/Source/Features/Visuals/PlayerInfoInWorld/PlayerHealth/PlayerHealthPanelParams.h b/Source/Features/Visuals/PlayerInfoInWorld/PlayerHealth/PlayerHealthPanelParams.h
index 13725edad44..83fe94ef71d 100644
--- a/Source/Features/Visuals/PlayerInfoInWorld/PlayerHealth/PlayerHealthPanelParams.h
+++ b/Source/Features/Visuals/PlayerInfoInWorld/PlayerHealth/PlayerHealthPanelParams.h
@@ -3,9 +3,9 @@
 #include <CS2/Constants/ColorConstants.h>
 #include <CS2/Panorama/CUILength.h>
 #include <CS2/Panorama/StyleEnums.h>
-#include <FeatureHelpers/PanelShadowParams.h>
-#include <GameClasses/PanelAlignmentParams.h>
-#include <GameClasses/PanelMarginParams.h>
+#include <Panorama/PanelShadowParams.h>
+#include <Panorama/PanelAlignmentParams.h>
+#include <Panorama/PanelMarginParams.h>
 
 namespace player_health_panel_params::container_panel_params
 {
diff --git a/Source/Features/Visuals/PlayerInfoInWorld/PlayerInfoInWorld.h b/Source/Features/Visuals/PlayerInfoInWorld/PlayerInfoInWorld.h
index fc1ce0fa6d0..4ed8addb1c8 100644
--- a/Source/Features/Visuals/PlayerInfoInWorld/PlayerInfoInWorld.h
+++ b/Source/Features/Visuals/PlayerInfoInWorld/PlayerInfoInWorld.h
@@ -8,11 +8,11 @@
 #include <Entities/PlayerPawn.h>
 #include <Features/Common/InWorldPanels.h>
 #include <FeatureHelpers/LifeState.h>
-#include <FeatureHelpers/PanoramaTransformations.h>
+#include <Panorama/PanoramaTransformations.h>
 #include <FeatureHelpers/FeatureToggle.h>
 #include <FeatureHelpers/TeamNumber.h>
-#include <GameClasses/PanoramaLabel.h>
-#include <GameClasses/PanoramaImagePanel.h>
+#include <Panorama/PanoramaLabel.h>
+#include <Panorama/PanoramaImagePanel.h>
 #include <Hooks/ViewRenderHook.h>
 #include <Utils/ColorUtils.h>
 #include <Utils/CString.h>
diff --git a/Source/Features/Visuals/PlayerInfoInWorld/PlayerInfoInWorldPanelFactory.h b/Source/Features/Visuals/PlayerInfoInWorld/PlayerInfoInWorldPanelFactory.h
index ef631ec7fd0..1dee676e243 100644
--- a/Source/Features/Visuals/PlayerInfoInWorld/PlayerInfoInWorldPanelFactory.h
+++ b/Source/Features/Visuals/PlayerInfoInWorld/PlayerInfoInWorldPanelFactory.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <CS2/Constants/ColorConstants.h>
-#include <FeatureHelpers/PanoramaTransformations.h>
-#include <GameClasses/PanelFactory.h>
+#include <Panorama/PanoramaTransformations.h>
+#include <Panorama/PanelFactory.h>
 
 #include "ActiveWeaponAmmo/ActiveWeaponAmmoPanelParams.h"
 #include "ActiveWeaponAmmo/PlayerActiveWeaponAmmoPanel.h"
diff --git a/Source/Features/Visuals/PlayerInfoInWorld/PlayerInfoPanel.h b/Source/Features/Visuals/PlayerInfoInWorld/PlayerInfoPanel.h
index 776ce13315a..b84c491226e 100644
--- a/Source/Features/Visuals/PlayerInfoInWorld/PlayerInfoPanel.h
+++ b/Source/Features/Visuals/PlayerInfoInWorld/PlayerInfoPanel.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <CS2/Panorama/CUIPanel.h>
-#include <FeatureHelpers/PanoramaTransformations.h>
+#include <Panorama/PanoramaTransformations.h>
 #include <FeatureHelpers/ViewToProjectionMatrix.h>
 #include <FeatureHelpers/WorldToClipSpaceConverter.h>
-#include <GameClasses/PanoramaUiPanel.h>
+#include <Panorama/PanoramaUiPanel.h>
 #include "PlayerInfoInWorldState.h"
 #include "PlayerInfoPanelCacheEntry.h"
 #include "PlayerInfoPanelTypes.h"
diff --git a/Source/Features/Visuals/PlayerInfoInWorld/PlayerPositionArrow/PlayerPositionArrowPanelParams.h b/Source/Features/Visuals/PlayerInfoInWorld/PlayerPositionArrow/PlayerPositionArrowPanelParams.h
index 114616edef1..429ccafb565 100644
--- a/Source/Features/Visuals/PlayerInfoInWorld/PlayerPositionArrow/PlayerPositionArrowPanelParams.h
+++ b/Source/Features/Visuals/PlayerInfoInWorld/PlayerPositionArrow/PlayerPositionArrowPanelParams.h
@@ -2,8 +2,8 @@
 
 #include <CS2/Constants/ColorConstants.h>
 #include <CS2/Panorama/CUILength.h>
-#include <FeatureHelpers/PanelShadowParams.h>
-#include <GameClasses/PanelAlignmentParams.h>
+#include <Panorama/PanelShadowParams.h>
+#include <Panorama/PanelAlignmentParams.h>
 
 namespace player_position_arrow_panel_params
 {
diff --git a/Source/Features/Visuals/PlayerInfoInWorld/PlayerStateIcons/PlayerStateIconsPanelContext.h b/Source/Features/Visuals/PlayerInfoInWorld/PlayerStateIcons/PlayerStateIconsPanelContext.h
index 81de370db4e..09de14f4fc2 100644
--- a/Source/Features/Visuals/PlayerInfoInWorld/PlayerStateIcons/PlayerStateIconsPanelContext.h
+++ b/Source/Features/Visuals/PlayerInfoInWorld/PlayerStateIcons/PlayerStateIconsPanelContext.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Features/Visuals/PlayerInfoInWorld/PlayerInfoPanelCacheEntry.h>
-#include <GameClasses/PanoramaUiPanel.h>
+#include <Panorama/PanoramaUiPanel.h>
 
 template <typename HookContext>
 class PlayerStateIconsPanelContext {
diff --git a/Source/Features/Visuals/PlayerInfoInWorld/PlayerStateIcons/PlayerStateIconsPanelParams.h b/Source/Features/Visuals/PlayerInfoInWorld/PlayerStateIcons/PlayerStateIconsPanelParams.h
index f79140664d1..fb85c6bfe8a 100644
--- a/Source/Features/Visuals/PlayerInfoInWorld/PlayerStateIcons/PlayerStateIconsPanelParams.h
+++ b/Source/Features/Visuals/PlayerInfoInWorld/PlayerStateIcons/PlayerStateIconsPanelParams.h
@@ -2,9 +2,9 @@
 
 #include <CS2/Constants/ColorConstants.h>
 #include <CS2/Panorama/CUILength.h>
-#include <FeatureHelpers/PanelShadowParams.h>
-#include <GameClasses/PanelAlignmentParams.h>
-#include <GameClasses/PanelMarginParams.h>
+#include <Panorama/PanelShadowParams.h>
+#include <Panorama/PanelAlignmentParams.h>
+#include <Panorama/PanelMarginParams.h>
 
 namespace player_state_icons_panel_params::container_panel_params
 {
diff --git a/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/ActiveWeaponIcon/ActiveWeaponIconPanelParams.h b/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/ActiveWeaponIcon/ActiveWeaponIconPanelParams.h
index bc0dd24e21a..f4081ee3a62 100644
--- a/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/ActiveWeaponIcon/ActiveWeaponIconPanelParams.h
+++ b/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/ActiveWeaponIcon/ActiveWeaponIconPanelParams.h
@@ -2,9 +2,9 @@
 
 #include <CS2/Constants/ColorConstants.h>
 #include <CS2/Panorama/CUILength.h>
-#include <FeatureHelpers/PanelShadowParams.h>
-#include <GameClasses/PanelAlignmentParams.h>
-#include <GameClasses/PanelMarginParams.h>
+#include <Panorama/PanelShadowParams.h>
+#include <Panorama/PanelAlignmentParams.h>
+#include <Panorama/PanelMarginParams.h>
 
 namespace active_weapon_icon_panel_params
 {
diff --git a/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/ActiveWeaponIcon/PlayerActiveWeaponIconPanel.h b/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/ActiveWeaponIcon/PlayerActiveWeaponIconPanel.h
index 88a1dde3bee..c36eada95d8 100644
--- a/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/ActiveWeaponIcon/PlayerActiveWeaponIconPanel.h
+++ b/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/ActiveWeaponIcon/PlayerActiveWeaponIconPanel.h
@@ -2,7 +2,7 @@
 
 #include <Common/Visibility.h>
 #include <Entities/C4.h>
-#include <GameClasses/PanoramaImagePanel.h>
+#include <Panorama/PanoramaImagePanel.h>
 #include <Utils/CString.h>
 #include "PlayerActiveWeaponIconPanelContext.h"
 
diff --git a/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/ActiveWeaponIcon/PlayerActiveWeaponIconPanelContext.h b/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/ActiveWeaponIcon/PlayerActiveWeaponIconPanelContext.h
index 248e7cf6b5b..993639a11f8 100644
--- a/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/ActiveWeaponIcon/PlayerActiveWeaponIconPanelContext.h
+++ b/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/ActiveWeaponIcon/PlayerActiveWeaponIconPanelContext.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <CS2/Panorama/CUIPanel.h>
-#include <GameClasses/PanoramaUiPanel.h>
+#include <Panorama/PanoramaUiPanel.h>
 
 template <typename HookContext>
 class PlayerActiveWeaponIconPanelContext {
diff --git a/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/BombIcon/PlayerBombIconPanelContext.h b/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/BombIcon/PlayerBombIconPanelContext.h
index 9d8f9756866..b775199cd6e 100644
--- a/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/BombIcon/PlayerBombIconPanelContext.h
+++ b/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/BombIcon/PlayerBombIconPanelContext.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <CS2/Panorama/CUIPanel.h>
-#include <GameClasses/PanoramaUiPanel.h>
+#include <Panorama/PanoramaUiPanel.h>
 
 template <typename HookContext>
 class PlayerBombIconPanelContext {
diff --git a/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/BombIcon/PlayerBombIconPanelParams.h b/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/BombIcon/PlayerBombIconPanelParams.h
index 3bfbd0f76ca..8b893cceec9 100644
--- a/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/BombIcon/PlayerBombIconPanelParams.h
+++ b/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/BombIcon/PlayerBombIconPanelParams.h
@@ -4,9 +4,9 @@
 #include <CS2/Constants/ColorConstants.h>
 #include <CS2/Panorama/CUILength.h>
 #include <CS2/Panorama/StyleEnums.h>
-#include <FeatureHelpers/PanelShadowParams.h>
-#include <GameClasses/PanelAlignmentParams.h>
-#include <GameClasses/PanelMarginParams.h>
+#include <Panorama/PanelShadowParams.h>
+#include <Panorama/PanelAlignmentParams.h>
+#include <Panorama/PanelMarginParams.h>
 
 namespace player_bomb_icon_panel_params::bomb_icon_panel_params
 {
diff --git a/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/PlayerWeaponIconPanelParams.h b/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/PlayerWeaponIconPanelParams.h
index 5a7f1315295..c1c64d16d31 100644
--- a/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/PlayerWeaponIconPanelParams.h
+++ b/Source/Features/Visuals/PlayerInfoInWorld/PlayerWeaponIcon/PlayerWeaponIconPanelParams.h
@@ -2,8 +2,8 @@
 
 #include <CS2/Panorama/CUILength.h>
 #include <CS2/Panorama/StyleEnums.h>
-#include <GameClasses/PanelAlignmentParams.h>
-#include <GameClasses/PanelMarginParams.h>
+#include <Panorama/PanelAlignmentParams.h>
+#include <Panorama/PanelMarginParams.h>
 
 namespace player_weapon_icon_panel_params
 {
diff --git a/Source/GameClasses/Hud/DeathNoticeContext.h b/Source/GameClasses/Hud/DeathNoticeContext.h
index 8f5bdac4e1d..42e387b49d8 100644
--- a/Source/GameClasses/Hud/DeathNoticeContext.h
+++ b/Source/GameClasses/Hud/DeathNoticeContext.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <CS2/Panorama/CUIPanel.h>
-#include <GameClasses/PanoramaUiPanel.h>
+#include <Panorama/PanoramaUiPanel.h>
 
 template <typename HookContext>
 struct DeathNoticeContext {
diff --git a/Source/GameClasses/Hud/HudContext.h b/Source/GameClasses/Hud/HudContext.h
index 40fd39c5643..fe0e496844e 100644
--- a/Source/GameClasses/Hud/HudContext.h
+++ b/Source/GameClasses/Hud/HudContext.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <GameClasses/PanelHandle.h>
+#include <Panorama/PanelHandle.h>
 
 template <typename HookContext>
 struct HudContext {
diff --git a/Source/GameDependencies/GameDependencies.h b/Source/GameDependencies/GameDependencies.h
index 692d21a0a1a..9c961d45986 100644
--- a/Source/GameDependencies/GameDependencies.h
+++ b/Source/GameDependencies/GameDependencies.h
@@ -5,9 +5,9 @@
 #include "GlowSceneObjectDeps.h"
 #include "HudDeps.h"
 #include "MemAllocDeps.h"
-#include "PanoramaSymbols.h"
 
-#include <FeatureHelpers/StylePropertiesSymbolsAndVMTs.h>
+#include <Panorama/PanoramaSymbols.h>
+#include <Panorama/StylePropertiesSymbolsAndVMTs.h>
 
 #include <MemoryPatterns/MemoryPatterns.h>
 #include <Platform/VmtFinder.h>
diff --git a/Source/HookDependencies/HookDependencies.h b/Source/HookDependencies/HookDependencies.h
index 2299509df44..ad6e3720bfc 100644
--- a/Source/HookDependencies/HookDependencies.h
+++ b/Source/HookDependencies/HookDependencies.h
@@ -10,9 +10,9 @@
 #include <GameClasses/FileSystem.h>
 #include <GameClasses/Hud/Hud.h>
 #include <GameClasses/Hud/HudContext.h>
-#include <GameClasses/PanelFactory.h>
+#include <Panorama/PanelFactory.h>
 #include <GameClasses/GlobalVars.h>
-#include <Helpers/PanoramaTransformFactory.h>
+#include <Panorama/PanoramaTransformFactory.h>
 
 struct BombStatusPanelState;
 struct FeaturesStates;
diff --git a/Source/Hud/BombStatus/BombStatusPanelContext.h b/Source/Hud/BombStatus/BombStatusPanelContext.h
index 9b0c07bfc0c..05d0246b4a9 100644
--- a/Source/Hud/BombStatus/BombStatusPanelContext.h
+++ b/Source/Hud/BombStatus/BombStatusPanelContext.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <GameClasses/PanelHandle.h>
+#include <Panorama/PanelHandle.h>
 
 template <typename HookContext>
 struct BombStatusPanelContext {
diff --git a/Source/Osiris.vcxproj b/Source/Osiris.vcxproj
index 9bb44cfaa76..2f20fd7a4f9 100644
--- a/Source/Osiris.vcxproj
+++ b/Source/Osiris.vcxproj
@@ -114,10 +114,7 @@
     <ClInclude Include="FeatureHelpers\EntityClassifier.h" />
     <ClInclude Include="FeatureHelpers\FeatureToggle.h" />
     <ClInclude Include="FeatureHelpers\LifeState.h" />
-    <ClInclude Include="FeatureHelpers\PanelShadowParams.h" />
     <ClInclude Include="FeatureHelpers\NormalizedDeviceCoordinates.h" />
-    <ClInclude Include="FeatureHelpers\PanelStylePropertyFactory.h" />
-    <ClInclude Include="FeatureHelpers\PanoramaTransformations.h" />
     <ClInclude Include="FeatureHelpers\RenderingHookEntityLoop.h" />
     <ClInclude Include="FeatureHelpers\Sound\PlayedSound.h" />
     <ClInclude Include="FeatureHelpers\Sound\SoundExpiryChecker.h" />
@@ -126,8 +123,6 @@
     <ClInclude Include="FeatureHelpers\Sound\SoundWatcherImplState.h" />
     <ClInclude Include="FeatureHelpers\Sound\SoundWatcherState.h" />
     <ClInclude Include="FeatureHelpers\Sound\WatchedSounds.h" />
-    <ClInclude Include="FeatureHelpers\StylePropertiesSymbolsAndVMTs.h" />
-    <ClInclude Include="FeatureHelpers\StylePropertySymbolMap.h" />
     <ClInclude Include="FeatureHelpers\TeamNumber.h" />
     <ClInclude Include="FeatureHelpers\ViewToProjectionMatrix.h" />
     <ClInclude Include="FeatureHelpers\WorldToClipSpaceConverter.h" />
@@ -282,7 +277,6 @@
     <ClInclude Include="Features\Visuals\VisualFeatures.h" />
     <ClInclude Include="Features\Visuals\VisualFeaturesStates.h" />
     <ClInclude Include="FileUtils\FileSlice.h" />
-    <ClInclude Include="GameClasses\ClientPanel.h" />
     <ClInclude Include="GameClasses\EntityIdentity.h" />
     <ClInclude Include="GameClasses\EntitySystem.h" />
     <ClInclude Include="GameClasses\GameSceneNode.h" />
@@ -294,29 +288,11 @@
     <ClInclude Include="GameClasses\Hud\DeathNoticeContext.h" />
     <ClInclude Include="GameClasses\Hud\DeathNotices.h" />
     <ClInclude Include="GameClasses\Hud\Hud.h" />
-    <ClInclude Include="GameClasses\MapPlayerPreviewPanel.h" />
     <ClInclude Include="GameClasses\MemAlloc.h" />
-    <ClInclude Include="GameClasses\PanelAlignmentParams.h" />
-    <ClInclude Include="GameClasses\PanelFactory.h" />
-    <ClInclude Include="GameClasses\PanelFontParams.h" />
-    <ClInclude Include="GameClasses\PanelHandle.h" />
-    <ClInclude Include="GameClasses\PanelMarginParams.h" />
-    <ClInclude Include="GameClasses\PanoramaDropDown.h" />
-    <ClInclude Include="GameClasses\PanoramaImagePanel.h" />
-    <ClInclude Include="GameClasses\PanoramaImagePanelContext.h" />
-    <ClInclude Include="GameClasses\PanoramaLabel.h" />
-    <ClInclude Include="GameClasses\PanoramaUiEngine.h" />
-    <ClInclude Include="GameClasses\PanoramaUiPanel.h" />
-    <ClInclude Include="GameClasses\PanoramaUiPanelChildPanels.h" />
-    <ClInclude Include="GameClasses\PanoramaUiPanelClasses.h" />
-    <ClInclude Include="GameClasses\PanoramaUiPanelContext.h" />
-    <ClInclude Include="GameClasses\PanoramaUiPanelIterator.h" />
-    <ClInclude Include="GameClasses\PanoramaUiPanelMethodInvoker.h" />
     <ClInclude Include="GameClasses\SceneObject.h" />
     <ClInclude Include="GameClasses\SceneObjectUpdater.h" />
     <ClInclude Include="GameClasses\SceneObjectUpdaters.h" />
     <ClInclude Include="GameClasses\SceneSystem.h" />
-    <ClInclude Include="GameClasses\TopLevelWindow.h" />
     <ClInclude Include="GameDependencies\ConVars.h" />
     <ClInclude Include="GameDependencies\ConVarsBase.h" />
     <ClInclude Include="GameDependencies\FileNameSymbolTableDeps.h" />
@@ -324,7 +300,6 @@
     <ClInclude Include="GameDependencies\GlowSceneObjectDeps.h" />
     <ClInclude Include="GameDependencies\HudDeps.h" />
     <ClInclude Include="GameDependencies\MemAllocDeps.h" />
-    <ClInclude Include="GameDependencies\PanoramaSymbols.h" />
     <ClInclude Include="GameDLLs\Tier0Dll.h" />
     <ClInclude Include="GlobalContext\DeferredCompleteObject.h" />
     <ClInclude Include="GlobalContext\FullGlobalContext.h" />
@@ -449,6 +424,32 @@
     <ClInclude Include="OutlineGlow\GlowSceneObjectPointer.h" />
     <ClInclude Include="OutlineGlow\GlowSceneObjects.h" />
     <ClInclude Include="OutlineGlow\GlowSceneObjectsState.h" />
+    <ClInclude Include="Panorama\ClientPanel.h" />
+    <ClInclude Include="Panorama\MapPlayerPreviewPanel.h" />
+    <ClInclude Include="Panorama\PanelAlignmentParams.h" />
+    <ClInclude Include="Panorama\PanelFactory.h" />
+    <ClInclude Include="Panorama\PanelFontParams.h" />
+    <ClInclude Include="Panorama\PanelHandle.h" />
+    <ClInclude Include="Panorama\PanelMarginParams.h" />
+    <ClInclude Include="Panorama\PanelShadowParams.h" />
+    <ClInclude Include="Panorama\PanelStylePropertyFactory.h" />
+    <ClInclude Include="Panorama\PanoramaDropDown.h" />
+    <ClInclude Include="Panorama\PanoramaImagePanel.h" />
+    <ClInclude Include="Panorama\PanoramaImagePanelContext.h" />
+    <ClInclude Include="Panorama\PanoramaLabel.h" />
+    <ClInclude Include="Panorama\PanoramaSymbols.h" />
+    <ClInclude Include="Panorama\PanoramaTransformations.h" />
+    <ClInclude Include="Panorama\PanoramaTransformFactory.h" />
+    <ClInclude Include="Panorama\PanoramaUiEngine.h" />
+    <ClInclude Include="Panorama\PanoramaUiPanel.h" />
+    <ClInclude Include="Panorama\PanoramaUiPanelChildPanels.h" />
+    <ClInclude Include="Panorama\PanoramaUiPanelClasses.h" />
+    <ClInclude Include="Panorama\PanoramaUiPanelContext.h" />
+    <ClInclude Include="Panorama\PanoramaUiPanelIterator.h" />
+    <ClInclude Include="Panorama\PanoramaUiPanelMethodInvoker.h" />
+    <ClInclude Include="Panorama\StylePropertiesSymbolsAndVMTs.h" />
+    <ClInclude Include="Panorama\StylePropertySymbolMap.h" />
+    <ClInclude Include="Panorama\TopLevelWindow.h" />
     <ClInclude Include="Platform\DynamicLibrary.h" />
     <ClInclude Include="Platform\Macros\CallingConventions.h" />
     <ClInclude Include="Platform\Macros\CallStack.h" />
diff --git a/Source/Osiris.vcxproj.filters b/Source/Osiris.vcxproj.filters
index ccae517d363..841c68ed052 100644
--- a/Source/Osiris.vcxproj.filters
+++ b/Source/Osiris.vcxproj.filters
@@ -223,6 +223,9 @@
     <Filter Include="Features\Visuals\ModelGlow\Preview">
       <UniqueIdentifier>{34c6b5fe-cc1f-4d35-97f4-fa7228496d57}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Panorama">
+      <UniqueIdentifier>{29f9a026-37c7-43b3-adbb-11b20e71aa23}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CS2\Classes\C_CSGameRules.h">
@@ -267,18 +270,6 @@
     <ClInclude Include="Features\Visuals\VisualFeatures.h">
       <Filter>Features\Visuals</Filter>
     </ClInclude>
-    <ClInclude Include="GameClasses\PanoramaImagePanel.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
-    <ClInclude Include="GameClasses\PanoramaLabel.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
-    <ClInclude Include="GameClasses\PanoramaUiEngine.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
-    <ClInclude Include="GameClasses\PanoramaUiPanel.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
     <ClInclude Include="Helpers\Bits.h">
       <Filter>Helpers</Filter>
     </ClInclude>
@@ -599,9 +590,6 @@
     <ClInclude Include="Features\Sound\BombDefuseVisualizer.h">
       <Filter>Features\Sound</Filter>
     </ClInclude>
-    <ClInclude Include="FeatureHelpers\PanoramaTransformations.h">
-      <Filter>FeatureHelpers</Filter>
-    </ClInclude>
     <ClInclude Include="Features\Sound\WeaponScopeVisualizer.h">
       <Filter>Features\Sound</Filter>
     </ClInclude>
@@ -638,12 +626,6 @@
     <ClInclude Include="CS2\Classes\CUtlMap.h">
       <Filter>CS2\Classes</Filter>
     </ClInclude>
-    <ClInclude Include="FeatureHelpers\PanelStylePropertyFactory.h">
-      <Filter>FeatureHelpers</Filter>
-    </ClInclude>
-    <ClInclude Include="FeatureHelpers\StylePropertySymbolMap.h">
-      <Filter>FeatureHelpers</Filter>
-    </ClInclude>
     <ClInclude Include="Platform\Windows\WindowsVmtFinder.h">
       <Filter>Platform\Windows</Filter>
     </ClInclude>
@@ -719,9 +701,6 @@
     <ClInclude Include="Platform\Windows\WindowsPlatformApiImpl.h">
       <Filter>Platform\Windows</Filter>
     </ClInclude>
-    <ClInclude Include="FeatureHelpers\PanelShadowParams.h">
-      <Filter>FeatureHelpers</Filter>
-    </ClInclude>
     <ClInclude Include="Platform\Windows\Syscalls\WindowsSyscallIndex.h">
       <Filter>Platform\Windows\Syscalls</Filter>
     </ClInclude>
@@ -758,9 +737,6 @@
     <ClInclude Include="Utils\GenericPointer.h">
       <Filter>Utils</Filter>
     </ClInclude>
-    <ClInclude Include="GameClasses\TopLevelWindow.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
     <ClInclude Include="MemoryPatterns\Windows\TopLevelWindowPatternsWindows.h">
       <Filter>MemoryPatterns\Windows</Filter>
     </ClInclude>
@@ -818,9 +794,6 @@
     <ClInclude Include="MemoryPatterns\Windows\PlayerPawnPatternsWindows.h">
       <Filter>MemoryPatterns\Windows</Filter>
     </ClInclude>
-    <ClInclude Include="FeatureHelpers\StylePropertiesSymbolsAndVMTs.h">
-      <Filter>FeatureHelpers</Filter>
-    </ClInclude>
     <ClInclude Include="GlobalContext\DeferredCompleteObject.h">
       <Filter>GlobalContext</Filter>
     </ClInclude>
@@ -1007,24 +980,6 @@
     <ClInclude Include="MemoryAllocation\MemoryAllocatorBaseImpl.h">
       <Filter>MemoryAllocation</Filter>
     </ClInclude>
-    <ClInclude Include="GameClasses\ClientPanel.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
-    <ClInclude Include="GameClasses\PanelHandle.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
-    <ClInclude Include="GameClasses\PanoramaUiPanelChildPanels.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
-    <ClInclude Include="GameClasses\PanoramaUiPanelClasses.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
-    <ClInclude Include="GameClasses\PanoramaUiPanelContext.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
-    <ClInclude Include="GameClasses\PanoramaUiPanelIterator.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
     <ClInclude Include="Features\FeaturesUnloadHandler.h">
       <Filter>Features</Filter>
     </ClInclude>
@@ -1040,27 +995,9 @@
     <ClInclude Include="GameClasses\Hud\DeathNoticeContext.h">
       <Filter>GameClasses\Hud</Filter>
     </ClInclude>
-    <ClInclude Include="GameClasses\PanoramaImagePanelContext.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
-    <ClInclude Include="GameClasses\PanoramaUiPanelMethodInvoker.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
     <ClInclude Include="Utils\Lvalue.h">
       <Filter>Utils</Filter>
     </ClInclude>
-    <ClInclude Include="GameClasses\PanelFactory.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
-    <ClInclude Include="GameClasses\PanelAlignmentParams.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
-    <ClInclude Include="GameClasses\PanelFontParams.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
-    <ClInclude Include="GameClasses\PanelMarginParams.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
     <ClInclude Include="GameClasses\Hud\HudContext.h">
       <Filter>GameClasses\Hud</Filter>
     </ClInclude>
@@ -1475,9 +1412,6 @@
     <ClInclude Include="MemorySearch\PatternPoolBuilder.h">
       <Filter>MemorySearch</Filter>
     </ClInclude>
-    <ClInclude Include="GameDependencies\PanoramaSymbols.h">
-      <Filter>GameDependencies</Filter>
-    </ClInclude>
     <ClInclude Include="MemoryPatterns\PatternTypes\ConVarPatternTypes.h">
       <Filter>MemoryPatterns\PatternTypes</Filter>
     </ClInclude>
@@ -1733,9 +1667,6 @@
     <ClInclude Include="UI\Panorama\VisualsTab.h">
       <Filter>UI\Panorama</Filter>
     </ClInclude>
-    <ClInclude Include="GameClasses\PanoramaDropDown.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
     <ClInclude Include="UI\Panorama\HudTab.h">
       <Filter>UI\Panorama</Filter>
     </ClInclude>
@@ -1778,15 +1709,90 @@
     <ClInclude Include="GameClasses\EntityIdentity.h">
       <Filter>GameClasses</Filter>
     </ClInclude>
-    <ClInclude Include="GameClasses\MapPlayerPreviewPanel.h">
-      <Filter>GameClasses</Filter>
-    </ClInclude>
     <ClInclude Include="MemoryPatterns\PatternTypes\MapPlayerPreviewPanelPatternTypes.h">
       <Filter>MemoryPatterns\PatternTypes</Filter>
     </ClInclude>
     <ClInclude Include="MemoryPatterns\Windows\MapPlayerPreviewPanelPatternsWindows.h">
       <Filter>MemoryPatterns\Windows</Filter>
     </ClInclude>
+    <ClInclude Include="Panorama\ClientPanel.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\MapPlayerPreviewPanel.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\PanelAlignmentParams.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\PanelFactory.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\PanelFontParams.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\PanelHandle.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\PanelMarginParams.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\PanoramaDropDown.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\PanoramaImagePanel.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\PanoramaImagePanelContext.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\PanoramaLabel.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\PanoramaUiEngine.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\PanoramaUiPanel.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\PanoramaUiPanelChildPanels.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\PanoramaUiPanelClasses.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\PanoramaUiPanelContext.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\PanoramaUiPanelIterator.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\PanoramaUiPanelMethodInvoker.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\TopLevelWindow.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\PanelShadowParams.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\PanelStylePropertyFactory.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\PanoramaSymbols.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\PanoramaTransformations.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\PanoramaTransformFactory.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\StylePropertiesSymbolsAndVMTs.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
+    <ClInclude Include="Panorama\StylePropertySymbolMap.h">
+      <Filter>Panorama</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="UI\Panorama\CreateGUI.js">
diff --git a/Source/GameClasses/ClientPanel.h b/Source/Panorama/ClientPanel.h
similarity index 100%
rename from Source/GameClasses/ClientPanel.h
rename to Source/Panorama/ClientPanel.h
diff --git a/Source/GameClasses/MapPlayerPreviewPanel.h b/Source/Panorama/MapPlayerPreviewPanel.h
similarity index 100%
rename from Source/GameClasses/MapPlayerPreviewPanel.h
rename to Source/Panorama/MapPlayerPreviewPanel.h
diff --git a/Source/GameClasses/PanelAlignmentParams.h b/Source/Panorama/PanelAlignmentParams.h
similarity index 100%
rename from Source/GameClasses/PanelAlignmentParams.h
rename to Source/Panorama/PanelAlignmentParams.h
diff --git a/Source/GameClasses/PanelFactory.h b/Source/Panorama/PanelFactory.h
similarity index 98%
rename from Source/GameClasses/PanelFactory.h
rename to Source/Panorama/PanelFactory.h
index b369ef9d3b9..339fc26f952 100644
--- a/Source/GameClasses/PanelFactory.h
+++ b/Source/Panorama/PanelFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <GameClasses/PanoramaImagePanel.h>
+#include <Panorama/PanoramaImagePanel.h>
 
 template <typename HookContext>
 struct PanelFactory {
diff --git a/Source/GameClasses/PanelFontParams.h b/Source/Panorama/PanelFontParams.h
similarity index 100%
rename from Source/GameClasses/PanelFontParams.h
rename to Source/Panorama/PanelFontParams.h
diff --git a/Source/GameClasses/PanelHandle.h b/Source/Panorama/PanelHandle.h
similarity index 100%
rename from Source/GameClasses/PanelHandle.h
rename to Source/Panorama/PanelHandle.h
diff --git a/Source/GameClasses/PanelMarginParams.h b/Source/Panorama/PanelMarginParams.h
similarity index 100%
rename from Source/GameClasses/PanelMarginParams.h
rename to Source/Panorama/PanelMarginParams.h
diff --git a/Source/FeatureHelpers/PanelShadowParams.h b/Source/Panorama/PanelShadowParams.h
similarity index 100%
rename from Source/FeatureHelpers/PanelShadowParams.h
rename to Source/Panorama/PanelShadowParams.h
diff --git a/Source/FeatureHelpers/PanelStylePropertyFactory.h b/Source/Panorama/PanelStylePropertyFactory.h
similarity index 97%
rename from Source/FeatureHelpers/PanelStylePropertyFactory.h
rename to Source/Panorama/PanelStylePropertyFactory.h
index 2a61cc13b00..b841bed86a6 100644
--- a/Source/FeatureHelpers/PanelStylePropertyFactory.h
+++ b/Source/Panorama/PanelStylePropertyFactory.h
@@ -2,9 +2,9 @@
 
 #include <CS2/Panorama/StyleProperties.h>
 #include <GameClasses/MemAlloc.h>
-#include <GameClasses/PanelAlignmentParams.h>
-#include <GameClasses/PanelFontParams.h>
-#include <GameClasses/PanelMarginParams.h>
+#include <Panorama/PanelAlignmentParams.h>
+#include <Panorama/PanelFontParams.h>
+#include <Panorama/PanelMarginParams.h>
 
 #include "PanelShadowParams.h"
 #include "StylePropertiesSymbolsAndVMTs.h"
diff --git a/Source/GameClasses/PanoramaDropDown.h b/Source/Panorama/PanoramaDropDown.h
similarity index 100%
rename from Source/GameClasses/PanoramaDropDown.h
rename to Source/Panorama/PanoramaDropDown.h
diff --git a/Source/GameClasses/PanoramaImagePanel.h b/Source/Panorama/PanoramaImagePanel.h
similarity index 100%
rename from Source/GameClasses/PanoramaImagePanel.h
rename to Source/Panorama/PanoramaImagePanel.h
diff --git a/Source/GameClasses/PanoramaImagePanelContext.h b/Source/Panorama/PanoramaImagePanelContext.h
similarity index 95%
rename from Source/GameClasses/PanoramaImagePanelContext.h
rename to Source/Panorama/PanoramaImagePanelContext.h
index 79f29baa818..9a851054bf1 100644
--- a/Source/GameClasses/PanoramaImagePanelContext.h
+++ b/Source/Panorama/PanoramaImagePanelContext.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <CS2/Panorama/CImagePanel.h>
-#include <GameClasses/PanoramaUiPanel.h>
 #include <MemoryPatterns/PatternTypes/PanoramaImagePanelPatternTypes.h>
+#include <Panorama/PanoramaUiPanel.h>
 
 template <typename HookContext>
 struct PanoramaImagePanelContext {
diff --git a/Source/GameClasses/PanoramaLabel.h b/Source/Panorama/PanoramaLabel.h
similarity index 100%
rename from Source/GameClasses/PanoramaLabel.h
rename to Source/Panorama/PanoramaLabel.h
diff --git a/Source/GameDependencies/PanoramaSymbols.h b/Source/Panorama/PanoramaSymbols.h
similarity index 92%
rename from Source/GameDependencies/PanoramaSymbols.h
rename to Source/Panorama/PanoramaSymbols.h
index 31c624adaee..02e04b1b86f 100644
--- a/Source/GameDependencies/PanoramaSymbols.h
+++ b/Source/Panorama/PanoramaSymbols.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <CS2/Panorama/CPanoramaSymbol.h>
-#include <GameClasses/PanoramaUiEngine.h>
+#include <Panorama/PanoramaUiEngine.h>
 
 struct PanoramaSymbols {
     template <typename HookContext>
diff --git a/Source/Helpers/PanoramaTransformFactory.h b/Source/Panorama/PanoramaTransformFactory.h
similarity index 100%
rename from Source/Helpers/PanoramaTransformFactory.h
rename to Source/Panorama/PanoramaTransformFactory.h
diff --git a/Source/FeatureHelpers/PanoramaTransformations.h b/Source/Panorama/PanoramaTransformations.h
similarity index 100%
rename from Source/FeatureHelpers/PanoramaTransformations.h
rename to Source/Panorama/PanoramaTransformations.h
diff --git a/Source/GameClasses/PanoramaUiEngine.h b/Source/Panorama/PanoramaUiEngine.h
similarity index 100%
rename from Source/GameClasses/PanoramaUiEngine.h
rename to Source/Panorama/PanoramaUiEngine.h
diff --git a/Source/GameClasses/PanoramaUiPanel.h b/Source/Panorama/PanoramaUiPanel.h
similarity index 98%
rename from Source/GameClasses/PanoramaUiPanel.h
rename to Source/Panorama/PanoramaUiPanel.h
index 4c78d7eb788..5ea4fe25850 100644
--- a/Source/GameClasses/PanoramaUiPanel.h
+++ b/Source/Panorama/PanoramaUiPanel.h
@@ -2,11 +2,11 @@
 
 #include <cstring>
 
-#include <GameClasses/TopLevelWindow.h>
-#include <FeatureHelpers/PanelStylePropertyFactory.h>
 #include <Utils/Lvalue.h>
 
+#include "PanelStylePropertyFactory.h"
 #include "PanoramaUiPanelContext.h"
+#include "TopLevelWindow.h"
 
 struct PanelAlignmentParams;
 struct PanelMarginParams;
diff --git a/Source/GameClasses/PanoramaUiPanelChildPanels.h b/Source/Panorama/PanoramaUiPanelChildPanels.h
similarity index 100%
rename from Source/GameClasses/PanoramaUiPanelChildPanels.h
rename to Source/Panorama/PanoramaUiPanelChildPanels.h
diff --git a/Source/GameClasses/PanoramaUiPanelClasses.h b/Source/Panorama/PanoramaUiPanelClasses.h
similarity index 100%
rename from Source/GameClasses/PanoramaUiPanelClasses.h
rename to Source/Panorama/PanoramaUiPanelClasses.h
diff --git a/Source/GameClasses/PanoramaUiPanelContext.h b/Source/Panorama/PanoramaUiPanelContext.h
similarity index 99%
rename from Source/GameClasses/PanoramaUiPanelContext.h
rename to Source/Panorama/PanoramaUiPanelContext.h
index 3f3fcc1fc3d..ce63432d911 100644
--- a/Source/GameClasses/PanoramaUiPanelContext.h
+++ b/Source/Panorama/PanoramaUiPanelContext.h
@@ -7,6 +7,7 @@
 #include "PanoramaUiPanelChildPanels.h"
 #include "PanoramaUiPanelClasses.h"
 #include "PanoramaUiPanelMethodInvoker.h"
+#include "TopLevelWindow.h"
 #include <MemoryPatterns/PatternTypes/PanelStylePatternTypes.h>
 #include <MemoryPatterns/PatternTypes/UiPanelPatternTypes.h>
 
diff --git a/Source/GameClasses/PanoramaUiPanelIterator.h b/Source/Panorama/PanoramaUiPanelIterator.h
similarity index 100%
rename from Source/GameClasses/PanoramaUiPanelIterator.h
rename to Source/Panorama/PanoramaUiPanelIterator.h
diff --git a/Source/GameClasses/PanoramaUiPanelMethodInvoker.h b/Source/Panorama/PanoramaUiPanelMethodInvoker.h
similarity index 100%
rename from Source/GameClasses/PanoramaUiPanelMethodInvoker.h
rename to Source/Panorama/PanoramaUiPanelMethodInvoker.h
diff --git a/Source/FeatureHelpers/StylePropertiesSymbolsAndVMTs.h b/Source/Panorama/StylePropertiesSymbolsAndVMTs.h
similarity index 100%
rename from Source/FeatureHelpers/StylePropertiesSymbolsAndVMTs.h
rename to Source/Panorama/StylePropertiesSymbolsAndVMTs.h
diff --git a/Source/FeatureHelpers/StylePropertySymbolMap.h b/Source/Panorama/StylePropertySymbolMap.h
similarity index 100%
rename from Source/FeatureHelpers/StylePropertySymbolMap.h
rename to Source/Panorama/StylePropertySymbolMap.h
diff --git a/Source/GameClasses/TopLevelWindow.h b/Source/Panorama/TopLevelWindow.h
similarity index 100%
rename from Source/GameClasses/TopLevelWindow.h
rename to Source/Panorama/TopLevelWindow.h
diff --git a/Source/UI/Panorama/HudTab.h b/Source/UI/Panorama/HudTab.h
index 61908f0a581..c625759e78c 100644
--- a/Source/UI/Panorama/HudTab.h
+++ b/Source/UI/Panorama/HudTab.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <GameClasses/PanoramaDropDown.h>
+#include <Panorama/PanoramaDropDown.h>
 #include <Platform/Macros/FunctionAttributes.h>
 
 template <typename HookContext>
diff --git a/Source/UI/Panorama/PanoramaGUI.h b/Source/UI/Panorama/PanoramaGUI.h
index a74b0492a50..32b83a53ed0 100644
--- a/Source/UI/Panorama/PanoramaGUI.h
+++ b/Source/UI/Panorama/PanoramaGUI.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <Entities/PreviewPlayer.h>
-#include <GameClasses/MapPlayerPreviewPanel.h>
-#include <GameClasses/PanoramaUiEngine.h>
+#include <Panorama/MapPlayerPreviewPanel.h>
+#include <Panorama/PanoramaUiEngine.h>
 #include <Utils/StringParser.h>
 #include <Helpers/UnloadFlag.h>
 #include <FeatureHelpers/FeatureToggle.h>
diff --git a/Source/UI/Panorama/PanoramaGuiUnloadHandler.h b/Source/UI/Panorama/PanoramaGuiUnloadHandler.h
index 1ca28d2a41c..1e0a8d4f4a3 100644
--- a/Source/UI/Panorama/PanoramaGuiUnloadHandler.h
+++ b/Source/UI/Panorama/PanoramaGuiUnloadHandler.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <GameClasses/PanoramaUiEngine.h>
+#include <Panorama/PanoramaUiEngine.h>
 
 template <typename HookContext>
 struct PanoramaGuiUnloadHandler {
diff --git a/Source/UI/Panorama/SoundTab.h b/Source/UI/Panorama/SoundTab.h
index dd1c1e474c7..06c83b61ed5 100644
--- a/Source/UI/Panorama/SoundTab.h
+++ b/Source/UI/Panorama/SoundTab.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <GameClasses/PanoramaDropDown.h>
+#include <Panorama/PanoramaDropDown.h>
 #include <Platform/Macros/FunctionAttributes.h>
 
 template <typename HookContext>
diff --git a/Source/UI/Panorama/VisualsTab.h b/Source/UI/Panorama/VisualsTab.h
index 39e4df86056..761d193e4f0 100644
--- a/Source/UI/Panorama/VisualsTab.h
+++ b/Source/UI/Panorama/VisualsTab.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <GameClasses/PanoramaDropDown.h>
+#include <Panorama/PanoramaDropDown.h>
 #include <Platform/Macros/FunctionAttributes.h>
 
 template <typename HookContext>