diff --git a/Content/Shaders/GI/GlobalSurfaceAtlas.flax b/Content/Shaders/GI/GlobalSurfaceAtlas.flax
new file mode 100644
index 000000000..2376e451e
--- /dev/null
+++ b/Content/Shaders/GI/GlobalSurfaceAtlas.flax
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ec7fc26caf2d2c9c216cc47684ac2adc6b872a5a61cdd7028a59e9230eae0f4
+size 10668
diff --git a/Content/Shaders/GlobalSurfaceAtlas.flax b/Content/Shaders/GlobalSurfaceAtlas.flax
deleted file mode 100644
index 3191dd042..000000000
--- a/Content/Shaders/GlobalSurfaceAtlas.flax
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fe3a26590d86b5da94b82dbd508e5f05c83b74d333d5be4c7f102897b611ead9
-size 10665
diff --git a/Source/Editor/Cooker/Steps/DeployDataStep.cpp b/Source/Editor/Cooker/Steps/DeployDataStep.cpp
index b9c092059..b41b28e43 100644
--- a/Source/Editor/Cooker/Steps/DeployDataStep.cpp
+++ b/Source/Editor/Cooker/Steps/DeployDataStep.cpp
@@ -69,7 +69,7 @@ bool DeployDataStep::Perform(CookingData& data)
     data.AddRootEngineAsset(TEXT("Shaders/BitonicSort"));
     data.AddRootEngineAsset(TEXT("Shaders/GPUParticlesSorting"));
     data.AddRootEngineAsset(TEXT("Shaders/GlobalSignDistanceField"));
-    data.AddRootEngineAsset(TEXT("Shaders/GlobalSurfaceAtlas"));
+    data.AddRootEngineAsset(TEXT("Shaders/GI/GlobalSurfaceAtlas"));
     data.AddRootEngineAsset(TEXT("Shaders/Quad"));
     data.AddRootEngineAsset(TEXT("Shaders/Reflections"));
     data.AddRootEngineAsset(TEXT("Shaders/Shadows"));
diff --git a/Source/Engine/Level/Actors/StaticModel.cpp b/Source/Engine/Level/Actors/StaticModel.cpp
index ccf355195..cdfd2a2e1 100644
--- a/Source/Engine/Level/Actors/StaticModel.cpp
+++ b/Source/Engine/Level/Actors/StaticModel.cpp
@@ -10,7 +10,7 @@
 #include "Engine/Level/Prefabs/PrefabManager.h"
 #include "Engine/Level/Scene/Scene.h"
 #include "Engine/Renderer/GlobalSignDistanceFieldPass.h"
-#include "Engine/Renderer/GlobalSurfaceAtlasPass.h"
+#include "Engine/Renderer/GI/GlobalSurfaceAtlasPass.h"
 #include "Engine/Utilities/Encryption.h"
 #if USE_EDITOR
 #include "Editor/Editor.h"
diff --git a/Source/Engine/Renderer/GlobalSurfaceAtlasPass.cpp b/Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.cpp
similarity index 99%
rename from Source/Engine/Renderer/GlobalSurfaceAtlasPass.cpp
rename to Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.cpp
index 8268f5994..e26c4efda 100644
--- a/Source/Engine/Renderer/GlobalSurfaceAtlasPass.cpp
+++ b/Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.cpp
@@ -1,9 +1,9 @@
 // Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
 
 #include "GlobalSurfaceAtlasPass.h"
-#include "GlobalSignDistanceFieldPass.h"
-#include "RenderList.h"
-#include "ShadowsPass.h"
+#include "../GlobalSignDistanceFieldPass.h"
+#include "../RenderList.h"
+#include "../ShadowsPass.h"
 #include "Engine/Core/Math/Matrix3x3.h"
 #include "Engine/Core/Math/OrientedBoundingBox.h"
 #include "Engine/Engine/Engine.h"
@@ -192,7 +192,7 @@ bool GlobalSurfaceAtlasPass::setupResources()
     // Load shader
     if (!_shader)
     {
-        _shader = Content::LoadAsyncInternal<Shader>(TEXT("Shaders/GlobalSurfaceAtlas"));
+        _shader = Content::LoadAsyncInternal<Shader>(TEXT("Shaders/GI/GlobalSurfaceAtlas"));
         if (_shader == nullptr)
             return true;
 #if COMPILE_WITH_DEV_ENV
diff --git a/Source/Engine/Renderer/GlobalSurfaceAtlasPass.h b/Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.h
similarity index 99%
rename from Source/Engine/Renderer/GlobalSurfaceAtlasPass.h
rename to Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.h
index f245ac7f0..19fa65c1c 100644
--- a/Source/Engine/Renderer/GlobalSurfaceAtlasPass.h
+++ b/Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "RendererPass.h"
+#include "../RendererPass.h"
 
 /// <summary>
 /// Global Surface Atlas rendering pass. Captures scene geometry into a single atlas texture which contains surface diffuse color, normal vector, emission light, and calculates direct+indirect lighting. Used by Global Illumination and Reflections.
diff --git a/Source/Engine/Renderer/Renderer.cpp b/Source/Engine/Renderer/Renderer.cpp
index ad50ff6e2..056870571 100644
--- a/Source/Engine/Renderer/Renderer.cpp
+++ b/Source/Engine/Renderer/Renderer.cpp
@@ -22,7 +22,7 @@
 #include "HistogramPass.h"
 #include "AtmospherePreCompute.h"
 #include "GlobalSignDistanceFieldPass.h"
-#include "GlobalSurfaceAtlasPass.h"
+#include "GI/GlobalSurfaceAtlasPass.h"
 #include "Utils/MultiScaler.h"
 #include "Utils/BitonicSort.h"
 #include "AntiAliasing/FXAA.h"
diff --git a/Source/Engine/Terrain/Terrain.cpp b/Source/Engine/Terrain/Terrain.cpp
index 021384376..452b4ca56 100644
--- a/Source/Engine/Terrain/Terrain.cpp
+++ b/Source/Engine/Terrain/Terrain.cpp
@@ -14,7 +14,7 @@
 #include "Engine/Graphics/Textures/GPUTexture.h"
 #include "Engine/Profiler/ProfilerCPU.h"
 #include "Engine/Renderer/GlobalSignDistanceFieldPass.h"
-#include "Engine/Renderer/GlobalSurfaceAtlasPass.h"
+#include "Engine/Renderer/GI/GlobalSurfaceAtlasPass.h"
 
 Terrain::Terrain(const SpawnParams& params)
     : PhysicsColliderActor(params)
diff --git a/Source/Shaders/GlobalSurfaceAtlas.hlsl b/Source/Shaders/GI/GlobalSurfaceAtlas.hlsl
similarity index 100%
rename from Source/Shaders/GlobalSurfaceAtlas.hlsl
rename to Source/Shaders/GI/GlobalSurfaceAtlas.hlsl
diff --git a/Source/Shaders/GlobalSurfaceAtlas.shader b/Source/Shaders/GI/GlobalSurfaceAtlas.shader
similarity index 99%
rename from Source/Shaders/GlobalSurfaceAtlas.shader
rename to Source/Shaders/GI/GlobalSurfaceAtlas.shader
index d6e198f05..16d569158 100644
--- a/Source/Shaders/GlobalSurfaceAtlas.shader
+++ b/Source/Shaders/GI/GlobalSurfaceAtlas.shader
@@ -5,9 +5,9 @@
 
 #include "./Flax/Common.hlsl"
 #include "./Flax/Math.hlsl"
-#include "./Flax/GlobalSurfaceAtlas.hlsl"
-#include "./Flax/GlobalSignDistanceField.hlsl"
 #include "./Flax/LightingCommon.hlsl"
+#include "./Flax/GlobalSignDistanceField.hlsl"
+#include "./Flax/GI/GlobalSurfaceAtlas.hlsl"
 
 META_CB_BEGIN(0, Data)
 float3 ViewWorldPos;