52 files changed, 70 insertions, 75 deletions
diff --git a/src/3d/renderer.cc b/src/3d/renderer.cc
index d846895..7f2f800 100644
--- a/src/3d/renderer.cc
+++ b/src/3d/renderer.cc
@@ -3,7 +3,7 @@
 
 #include "3d/renderer.h"
 #include "generated/assets.h"
-#include "gpu/effects/shader_composer.h"
+#include "gpu/shader_composer.h"
 #include "util/asset_manager.h"
 #include <algorithm>
 #include <cassert>
diff --git a/src/3d/renderer_pipelines.cc b/src/3d/renderer_pipelines.cc
index 54499af..fed3983 100644
--- a/src/3d/renderer_pipelines.cc
+++ b/src/3d/renderer_pipelines.cc
@@ -3,7 +3,7 @@
 
 #include "3d/renderer.h"
 #include "generated/assets.h"
-#include "gpu/effects/shader_composer.h"
+#include "gpu/shader_composer.h"
 #include "util/asset_manager.h"
 #include "util/asset_manager_utils.h"
 #include <vector>
diff --git a/src/app/test_demo.cc b/src/app/test_demo.cc
index 7f10c3b..2a91d37 100644
--- a/src/app/test_demo.cc
+++ b/src/app/test_demo.cc
@@ -20,10 +20,10 @@ extern float GetDemoDuration();
 extern void LoadTimeline(MainSequence& main_seq, const GpuContext& ctx);
 
 // Inline peak meter effect for debugging audio-visual sync
-#include "gpu/effects/post_process_helper.h"
-#include "gpu/effects/shader_composer.h"
-#include "gpu/effects/cnn_effect.h"
-#include "gpu/effects/cnn_v2_effect.h"
+#include "gpu/post_process_helper.h"
+#include "gpu/shader_composer.h"
+#include "effects/cnn_effect.h"
+#include "effects/cnn_v2_effect.h"
 
 class PeakMeterEffect : public PostProcessEffect {
  public:
diff --git a/src/gpu/effects/chroma_aberration_effect.cc b/src/effects/chroma_aberration_effect.cc
index 3a51965..a096f5b 100644
--- a/src/gpu/effects/chroma_aberration_effect.cc
+++ b/src/effects/chroma_aberration_effect.cc
@@ -2,7 +2,7 @@
 // It implements the ChromaAberrationEffect with parameterization.
 
 #include "gpu/demo_effects.h"
-#include "gpu/effects/post_process_helper.h"
+#include "gpu/post_process_helper.h"
 #include "gpu/gpu.h"
 
 // --- ChromaAberrationEffect ---
diff --git a/src/gpu/effects/circle_mask_effect.cc b/src/effects/circle_mask_effect.cc
index dfe7d03..63c8f68 100644
--- a/src/gpu/effects/circle_mask_effect.cc
+++ b/src/effects/circle_mask_effect.cc
@@ -2,10 +2,10 @@
 // It implements CircleMaskEffect for auxiliary texture masking demonstration.
 // Generates circular mask and renders green background outside circle.
 
-#include "gpu/effects/circle_mask_effect.h"
+#include "effects/circle_mask_effect.h"
 #include "generated/assets.h"
 #include "gpu/bind_group_builder.h"
-#include "gpu/effects/shader_composer.h"
+#include "gpu/shader_composer.h"
 
 CircleMaskEffect::CircleMaskEffect(const GpuContext& ctx, float radius)
     : Effect(ctx), radius_(radius) {
diff --git a/src/gpu/effects/circle_mask_effect.h b/src/effects/circle_mask_effect.h
index 6ebaca1..53cc1bc 100644
--- a/src/gpu/effects/circle_mask_effect.h
+++ b/src/effects/circle_mask_effect.h
@@ -6,7 +6,7 @@
 #define CIRCLE_MASK_EFFECT_H_
 
 #include "gpu/effect.h"
-#include "gpu/effects/post_process_helper.h"
+#include "gpu/post_process_helper.h"
 #include "gpu/uniform_helper.h"
 
 class CircleMaskEffect : public Effect {
diff --git a/src/gpu/effects/cnn_effect.cc b/src/effects/cnn_effect.cc
index 83a3365..4475180 100644
--- a/src/gpu/effects/cnn_effect.cc
+++ b/src/effects/cnn_effect.cc
@@ -1,10 +1,10 @@
 // CNN post-processing effect implementation
 // Neural network-based stylization with modular WGSL
 
-#include "gpu/effects/cnn_effect.h"
-#include "gpu/effects/post_process_helper.h"
-#include "gpu/effects/shaders.h"
-#include "gpu/effects/shader_composer.h"
+#include "effects/cnn_effect.h"
+#include "gpu/post_process_helper.h"
+#include "gpu/shaders.h"
+#include "gpu/shader_composer.h"
 #include "gpu/effect.h"
 #include "gpu/bind_group_builder.h"
 #include "gpu/sampler_cache.h"
diff --git a/src/gpu/effects/cnn_effect.h b/src/effects/cnn_effect.h
index 3e2b7ca..3e2b7ca 100644
--- a/src/gpu/effects/cnn_effect.h
+++ b/src/effects/cnn_effect.h
diff --git a/src/gpu/effects/cnn_v2_effect.cc b/src/effects/cnn_v2_effect.cc
index be856a4..4c10ed1 100644
--- a/src/gpu/effects/cnn_v2_effect.cc
+++ b/src/effects/cnn_v2_effect.cc
@@ -1,6 +1,6 @@
 // CNN v2 Effect Implementation
 
-#include "gpu/effects/cnn_v2_effect.h"
+#include "effects/cnn_v2_effect.h"
 
 #if defined(USE_TEST_ASSETS)
 #include "test_assets.h"
@@ -153,7 +153,7 @@ void CNNv2Effect::create_textures() {
   // Input texture with mips (for multi-scale features)
   TextureWithView input_mip = gpu_create_texture_2d(
       ctx_.device, width_, height_, WGPUTextureFormat_RGBA8Unorm,
-      WGPUTextureUsage_TextureBinding | WGPUTextureUsage_CopyDst, 3);
+      (WGPUTextureUsage)(WGPUTextureUsage_TextureBinding | WGPUTextureUsage_CopyDst), 3);
   input_mip_tex_ = input_mip.texture;
 
   for (int i = 0; i < 3; ++i) {
diff --git a/src/gpu/effects/cnn_v2_effect.h b/src/effects/cnn_v2_effect.h
index d530d3b..d530d3b 100644
--- a/src/gpu/effects/cnn_v2_effect.h
+++ b/src/effects/cnn_v2_effect.h
diff --git a/src/gpu/effects/distort_effect.cc b/src/effects/distort_effect.cc
index 97622b2..97622b2 100644
--- a/src/gpu/effects/distort_effect.cc
+++ b/src/effects/distort_effect.cc
diff --git a/src/gpu/effects/fade_effect.cc b/src/effects/fade_effect.cc
index 93684d8..fd2af69 100644
--- a/src/gpu/effects/fade_effect.cc
+++ b/src/effects/fade_effect.cc
@@ -1,8 +1,8 @@
 // This file is part of the 64k demo project.
 // It implements the FadeEffect - fades to/from black based on time.
 
-#include "gpu/effects/fade_effect.h"
-#include "gpu/effects/post_process_helper.h"
+#include "effects/fade_effect.h"
+#include "gpu/post_process_helper.h"
 #include <cmath>
 
 struct FadeParams {
diff --git a/src/gpu/effects/fade_effect.h b/src/effects/fade_effect.h
index 3360a5f..8cd7006 100644
--- a/src/gpu/effects/fade_effect.h
+++ b/src/effects/fade_effect.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "gpu/effect.h"
-#include "gpu/effects/post_process_helper.h"
+#include "gpu/post_process_helper.h"
 #include "gpu/gpu.h"
 #include "gpu/uniform_helper.h"
 
diff --git a/src/gpu/effects/flash_cube_effect.cc b/src/effects/flash_cube_effect.cc
index 506f11c..29e9897 100644
--- a/src/gpu/effects/flash_cube_effect.cc
+++ b/src/effects/flash_cube_effect.cc
@@ -2,7 +2,7 @@
 // It implements the FlashCubeEffect - a flashing background cube with Perlin
 // noise.
 
-#include "gpu/effects/flash_cube_effect.h"
+#include "effects/flash_cube_effect.h"
 #include "generated/assets.h"
 #include "util/asset_manager_utils.h"
 #include <cmath>
diff --git a/src/gpu/effects/flash_cube_effect.h b/src/effects/flash_cube_effect.h
index df30b5b..df30b5b 100644
--- a/src/gpu/effects/flash_cube_effect.h
+++ b/src/effects/flash_cube_effect.h
diff --git a/src/gpu/effects/flash_effect.cc b/src/effects/flash_effect.cc
index e53cbce..235412d 100644
--- a/src/gpu/effects/flash_effect.cc
+++ b/src/effects/flash_effect.cc
@@ -2,8 +2,8 @@
 // It implements the FlashEffect - brief flash on u.beat hits.
 // Now supports parameterized color with per-frame animation.
 
-#include "gpu/effects/flash_effect.h"
-#include "gpu/effects/post_process_helper.h"
+#include "effects/flash_effect.h"
+#include "gpu/post_process_helper.h"
 #include <cmath>
 
 // Backward compatibility constructor (delegates to parameterized constructor)
diff --git a/src/gpu/effects/flash_effect.h b/src/effects/flash_effect.h
index 1ac75a4..1ac75a4 100644
--- a/src/gpu/effects/flash_effect.h
+++ b/src/effects/flash_effect.h
diff --git a/src/gpu/effects/gaussian_blur_effect.cc b/src/effects/gaussian_blur_effect.cc
index 4421e33..0b4beae 100644
--- a/src/gpu/effects/gaussian_blur_effect.cc
+++ b/src/effects/gaussian_blur_effect.cc
@@ -2,7 +2,7 @@
 // It implements the GaussianBlurEffect with parameterization.
 
 #include "gpu/demo_effects.h"
-#include "gpu/effects/post_process_helper.h"
+#include "gpu/post_process_helper.h"
 #include "gpu/gpu.h"
 
 // --- GaussianBlurEffect ---
diff --git a/src/gpu/effects/heptagon_effect.cc b/src/effects/heptagon_effect.cc
index 724eabb..724eabb 100644
--- a/src/gpu/effects/heptagon_effect.cc
+++ b/src/effects/heptagon_effect.cc
diff --git a/src/gpu/effects/hybrid_3d_effect.cc b/src/effects/hybrid_3d_effect.cc
index a46ab4c..1cd773d 100644
--- a/src/gpu/effects/hybrid_3d_effect.cc
+++ b/src/effects/hybrid_3d_effect.cc
@@ -1,7 +1,7 @@
 // This file is part of the 64k demo project.
 // It implements the Hybrid3DEffect.
 
-#include "gpu/effects/hybrid_3d_effect.h"
+#include "effects/hybrid_3d_effect.h"
 #include "generated/assets.h"
 #include "util/asset_manager_utils.h"
 #include <cassert>
diff --git a/src/gpu/effects/hybrid_3d_effect.h b/src/effects/hybrid_3d_effect.h
index 818b65c..818b65c 100644
--- a/src/gpu/effects/hybrid_3d_effect.h
+++ b/src/effects/hybrid_3d_effect.h
diff --git a/src/gpu/effects/moving_ellipse_effect.cc b/src/effects/moving_ellipse_effect.cc
index bbd3c08..f595de9 100644
--- a/src/gpu/effects/moving_ellipse_effect.cc
+++ b/src/effects/moving_ellipse_effect.cc
@@ -2,7 +2,7 @@
 // It implements the MovingEllipseEffect.
 
 #include "gpu/demo_effects.h"
-#include "gpu/effects/post_process_helper.h"
+#include "gpu/post_process_helper.h"
 #include "gpu/gpu.h"
 
 // --- MovingEllipseEffect ---
diff --git a/src/gpu/effects/particle_spray_effect.cc b/src/effects/particle_spray_effect.cc
index 9b615d0..e250f5a 100644
--- a/src/gpu/effects/particle_spray_effect.cc
+++ b/src/effects/particle_spray_effect.cc
@@ -2,7 +2,7 @@
 // It implements the ParticleSprayEffect.
 
 #include "gpu/demo_effects.h"
-#include "gpu/effects/post_process_helper.h"
+#include "gpu/post_process_helper.h"
 #include "gpu/gpu.h"
 #include <vector>
 
diff --git a/src/gpu/effects/particles_effect.cc b/src/effects/particles_effect.cc
index f8c18f0..5762637 100644
--- a/src/gpu/effects/particles_effect.cc
+++ b/src/effects/particles_effect.cc
@@ -2,7 +2,7 @@
 // It implements the ParticlesEffect.
 
 #include "gpu/demo_effects.h"
-#include "gpu/effects/post_process_helper.h"
+#include "gpu/post_process_helper.h"
 #include "gpu/gpu.h"
 #include <vector>
 
diff --git a/src/gpu/effects/passthrough_effect.cc b/src/effects/passthrough_effect.cc
index aedb387..aedb387 100644
--- a/src/gpu/effects/passthrough_effect.cc
+++ b/src/effects/passthrough_effect.cc
diff --git a/src/gpu/effects/rotating_cube_effect.cc b/src/effects/rotating_cube_effect.cc
index 96b02f1..a42feaa 100644
--- a/src/gpu/effects/rotating_cube_effect.cc
+++ b/src/effects/rotating_cube_effect.cc
@@ -2,10 +2,10 @@
 // It implements RotatingCubeEffect for bump-mapped rotating cube rendering.
 // Uses auxiliary texture masking to render only inside a circular region.
 
-#include "gpu/effects/rotating_cube_effect.h"
+#include "effects/rotating_cube_effect.h"
 #include "generated/assets.h"
 #include "gpu/bind_group_builder.h"
-#include "gpu/effects/shader_composer.h"
+#include "gpu/shader_composer.h"
 #include "gpu/gpu.h"
 #include "gpu/sampler_cache.h"
 #include "util/asset_manager_utils.h"
@@ -39,7 +39,7 @@ void RotatingCubeEffect::init(MainSequence* demo) {
 
   TextureWithView noise = gpu_create_texture_2d(
       ctx_.device, 1, 1, WGPUTextureFormat_RGBA8Unorm,
-      WGPUTextureUsage_TextureBinding | WGPUTextureUsage_RenderAttachment, 1);
+      (WGPUTextureUsage)(WGPUTextureUsage_TextureBinding | WGPUTextureUsage_RenderAttachment), 1);
   noise_texture_ = noise.texture;
   noise_view_ = noise.view;
 
diff --git a/src/gpu/effects/rotating_cube_effect.h b/src/effects/rotating_cube_effect.h
index fdf67ab..fdf67ab 100644
--- a/src/gpu/effects/rotating_cube_effect.h
+++ b/src/effects/rotating_cube_effect.h
diff --git a/src/gpu/effects/scene1_effect.cc b/src/effects/scene1_effect.cc
index c75e511..c75e511 100644
--- a/src/gpu/effects/scene1_effect.cc
+++ b/src/effects/scene1_effect.cc
diff --git a/src/gpu/effects/scene1_effect.h b/src/effects/scene1_effect.h
index 190ffa9..190ffa9 100644
--- a/src/gpu/effects/scene1_effect.h
+++ b/src/effects/scene1_effect.h
diff --git a/src/gpu/effects/solarize_effect.cc b/src/effects/solarize_effect.cc
index cdb9354..cdb9354 100644
--- a/src/gpu/effects/solarize_effect.cc
+++ b/src/effects/solarize_effect.cc
diff --git a/src/gpu/effects/theme_modulation_effect.cc b/src/effects/theme_modulation_effect.cc
index aff6bce..1c81d79 100644
--- a/src/gpu/effects/theme_modulation_effect.cc
+++ b/src/effects/theme_modulation_effect.cc
@@ -1,9 +1,9 @@
 // This file is part of the 64k demo project.
 // It implements theme modulation (bright/dark alternation).
 
-#include "gpu/effects/theme_modulation_effect.h"
-#include "gpu/effects/post_process_helper.h"
-#include "gpu/effects/shaders.h"
+#include "effects/theme_modulation_effect.h"
+#include "gpu/post_process_helper.h"
+#include "gpu/shaders.h"
 #include <cmath>
 
 struct ThemeModulationParams {
diff --git a/src/gpu/effects/theme_modulation_effect.h b/src/effects/theme_modulation_effect.h
index 31e96e6..e4d4e0a 100644
--- a/src/gpu/effects/theme_modulation_effect.h
+++ b/src/effects/theme_modulation_effect.h
@@ -5,7 +5,7 @@
 
 #pragma once
 #include "gpu/effect.h"
-#include "gpu/effects/post_process_helper.h"
+#include "gpu/post_process_helper.h"
 #include "gpu/uniform_helper.h"
 
 class ThemeModulationEffect : public PostProcessEffect {
diff --git a/src/gpu/effects/vignette_effect.cc b/src/effects/vignette_effect.cc
index 4b0ffe2..0e5f68f 100644
--- a/src/gpu/effects/vignette_effect.cc
+++ b/src/effects/vignette_effect.cc
@@ -2,7 +2,7 @@
 // It implements the VignetteEffect.
 
 #include "gpu/demo_effects.h"
-#include "gpu/effects/post_process_helper.h"
+#include "gpu/post_process_helper.h"
 #include "gpu/gpu.h"
 
 VignetteEffect::VignetteEffect(const GpuContext& ctx)
diff --git a/src/gpu/demo_effects.cc b/src/gpu/demo_effects.cc
index 069d36c..3acf287 100644
--- a/src/gpu/demo_effects.cc
+++ b/src/gpu/demo_effects.cc
@@ -3,8 +3,8 @@
 // Its content has been split into individual effect files and helper files.
 
 #include "gpu/demo_effects.h"
-#include "gpu/effects/circle_mask_effect.h"
-#include "gpu/effects/rotating_cube_effect.h"
+#include "effects/circle_mask_effect.h"
+#include "effects/rotating_cube_effect.h"
 
 // Auto-generated function to populate the timeline
 void LoadTimeline(MainSequence& main_seq, WGPUDevice device, WGPUQueue queue,
diff --git a/src/gpu/demo_effects.h b/src/gpu/demo_effects.h
index d0ae748..beadafb 100644
--- a/src/gpu/demo_effects.h
+++ b/src/gpu/demo_effects.h
@@ -6,16 +6,16 @@
 #include "3d/renderer.h"
 #include "3d/scene.h"
 #include "effect.h"
-#include "gpu/effects/circle_mask_effect.h"
-#include "gpu/effects/fade_effect.h"  // FadeEffect with full definition
-#include "gpu/effects/flash_effect.h" // FlashEffect with params support
-#include "gpu/effects/post_process_helper.h"
-#include "gpu/effects/rotating_cube_effect.h"
-#include "gpu/effects/shaders.h"
-#include "gpu/effects/theme_modulation_effect.h" // ThemeModulationEffect with full definition
-#include "gpu/effects/hybrid_3d_effect.h"
-#include "gpu/effects/flash_cube_effect.h"
-#include "gpu/effects/scene1_effect.h"
+#include "effects/circle_mask_effect.h"
+#include "effects/fade_effect.h"  // FadeEffect with full definition
+#include "effects/flash_effect.h" // FlashEffect with params support
+#include "gpu/post_process_helper.h"
+#include "effects/rotating_cube_effect.h"
+#include "gpu/shaders.h"
+#include "effects/theme_modulation_effect.h" // ThemeModulationEffect with full definition
+#include "effects/hybrid_3d_effect.h"
+#include "effects/flash_cube_effect.h"
+#include "effects/scene1_effect.h"
 #include "gpu/gpu.h"
 #include "gpu/texture_manager.h"
 #include "gpu/uniform_helper.h"
@@ -180,13 +180,9 @@ class DistortEffect : public PostProcessEffect {
   UniformBuffer<DistortParams> params_buffer_;
 };
 
-// ThemeModulationEffect now defined in gpu/effects/theme_modulation_effect.h
-// (included above) FadeEffect now defined in gpu/effects/fade_effect.h
-// (included above) FlashEffect now defined in gpu/effects/flash_effect.h
-// (included above)
 
-#include "gpu/effects/cnn_effect.h"
-#include "gpu/effects/cnn_v2_effect.h"
+#include "effects/cnn_effect.h"
+#include "effects/cnn_v2_effect.h"
 
 // Auto-generated functions
 void LoadTimeline(MainSequence& main_seq, const GpuContext& ctx);
diff --git a/src/gpu/effect.h b/src/gpu/effect.h
index b9709a4..5d835ad 100644
--- a/src/gpu/effect.h
+++ b/src/gpu/effect.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "gpu/gpu.h"
-#include "gpu/effects/post_process_helper.h"
+#include "gpu/post_process_helper.h"
 #include "gpu/uniform_helper.h"
 #include <algorithm>
 #include <map>
diff --git a/src/gpu/gpu.cc b/src/gpu/gpu.cc
index afbba90..929a063 100644
--- a/src/gpu/gpu.cc
+++ b/src/gpu/gpu.cc
@@ -4,8 +4,8 @@
 
 #include "gpu.h"
 #include "effect.h"
-#include "gpu/effects/shaders.h"
-#include "gpu/effects/shader_composer.h"
+#include "gpu/shaders.h"
+#include "gpu/shader_composer.h"
 #include "platform/platform.h"
 
 #include <cassert>
@@ -81,7 +81,7 @@ TextureWithView gpu_create_storage_texture_2d(WGPUDevice device, uint32_t width,
                                               WGPUTextureFormat format) {
   return gpu_create_texture_2d(
       device, width, height, format,
-      WGPUTextureUsage_StorageBinding | WGPUTextureUsage_TextureBinding, 1);
+      (WGPUTextureUsage)(WGPUTextureUsage_StorageBinding | WGPUTextureUsage_TextureBinding), 1);
 }
 
 TextureWithView gpu_create_post_process_texture(WGPUDevice device,
@@ -89,8 +89,7 @@ TextureWithView gpu_create_post_process_texture(WGPUDevice device,
                                                 WGPUTextureFormat format) {
   return gpu_create_texture_2d(
       device, width, height, format,
-      WGPUTextureUsage_RenderAttachment | WGPUTextureUsage_TextureBinding |
-          WGPUTextureUsage_CopySrc,
+      (WGPUTextureUsage)(WGPUTextureUsage_RenderAttachment | WGPUTextureUsage_TextureBinding | WGPUTextureUsage_CopySrc),
       1);
 }
 
diff --git a/src/gpu/pipeline_builder.h b/src/gpu/pipeline_builder.h
index 06b4ceb..68e34ea 100644
--- a/src/gpu/pipeline_builder.h
+++ b/src/gpu/pipeline_builder.h
@@ -14,7 +14,7 @@ struct WGPUShaderModuleImpl;
 typedef struct WGPUShaderModuleImpl* WGPUShaderModule;
 
 #include "platform/platform.h"
-#include "gpu/effects/shader_composer.h"
+#include "gpu/shader_composer.h"
 
 class RenderPipelineBuilder {
   WGPUDevice device_;
diff --git a/src/gpu/effects/post_process_helper.cc b/src/gpu/post_process_helper.cc
index 0c339c7..4ffa9c1 100644
--- a/src/gpu/effects/post_process_helper.cc
+++ b/src/gpu/post_process_helper.cc
@@ -2,9 +2,9 @@
 // It implements helper functions for post-processing effects.
 
 #include "post_process_helper.h"
-#include "../demo_effects.h"
+#include "demo_effects.h"
 #include "gpu/gpu.h"
-#include "gpu/effects/shader_composer.h"
+#include "gpu/shader_composer.h"
 #include "gpu/bind_group_builder.h"
 #include "gpu/sampler_cache.h"
 #include "gpu/pipeline_builder.h"
diff --git a/src/gpu/effects/post_process_helper.h b/src/gpu/post_process_helper.h
index 1c649e7..1c649e7 100644
--- a/src/gpu/effects/post_process_helper.h
+++ b/src/gpu/post_process_helper.h
diff --git a/src/gpu/effects/shader_composer.cc b/src/gpu/shader_composer.cc
index 9234b7a..fce6de4 100644
--- a/src/gpu/effects/shader_composer.cc
+++ b/src/gpu/shader_composer.cc
@@ -1,7 +1,7 @@
 // This file is part of the 64k demo project.
 // It implements the ShaderComposer class.
 
-#include "gpu/effects/shader_composer.h"
+#include "gpu/shader_composer.h"
 #include <set>
 #include <sstream>
 
diff --git a/src/gpu/effects/shader_composer.h b/src/gpu/shader_composer.h
index d0972f2..d0972f2 100644
--- a/src/gpu/effects/shader_composer.h
+++ b/src/gpu/shader_composer.h
diff --git a/src/gpu/effects/shaders.cc b/src/gpu/shaders.cc
index d79f3d3..903b96e 100644
--- a/src/gpu/effects/shaders.cc
+++ b/src/gpu/shaders.cc
@@ -1,7 +1,7 @@
 // This file is part of the 64k demo project.
 // It defines WGSL shader code for various effects.
 
-#include "../demo_effects.h"
+#include "demo_effects.h"
 
 #if defined(USE_TEST_ASSETS)
 
@@ -13,7 +13,7 @@
 
 #endif
 
-#include "gpu/effects/shader_composer.h"
+#include "gpu/shader_composer.h"
 
 #include "util/asset_manager.h"
 
diff --git a/src/gpu/effects/shaders.h b/src/gpu/shaders.h
index 03fa48c..03fa48c 100644
--- a/src/gpu/effects/shaders.h
+++ b/src/gpu/shaders.h
diff --git a/src/gpu/texture_manager.cc b/src/gpu/texture_manager.cc
index d5821ee..7889283 100644
--- a/src/gpu/texture_manager.cc
+++ b/src/gpu/texture_manager.cc
@@ -2,7 +2,7 @@
 // It implements the TextureManager.
 
 #include "gpu/texture_manager.h"
-#include "gpu/effects/shader_composer.h"
+#include "gpu/shader_composer.h"
 #include "platform/platform.h"
 #include <cstdio>
 #include <cstring>
diff --git a/src/tests/3d/test_3d_physics.cc b/src/tests/3d/test_3d_physics.cc
index 9b8bf11..9e4f71b 100644
--- a/src/tests/3d/test_3d_physics.cc
+++ b/src/tests/3d/test_3d_physics.cc
@@ -8,7 +8,7 @@
 #include "3d/renderer.h"
 #include "3d/renderer_helpers.h"
 #include "3d/scene.h"
-#include "gpu/effects/shaders.h"
+#include "gpu/shaders.h"
 #include "gpu/texture_manager.h"
 #include "platform/platform.h"
 #include "procedural/generator.h"
diff --git a/src/tests/3d/test_3d_render.cc b/src/tests/3d/test_3d_render.cc
index 87d7b76..10de907 100644
--- a/src/tests/3d/test_3d_render.cc
+++ b/src/tests/3d/test_3d_render.cc
@@ -7,7 +7,7 @@
 #include "3d/renderer_helpers.h"
 #include "3d/scene.h"
 #include "generated/assets.h"
-#include "gpu/effects/shaders.h"
+#include "gpu/shaders.h"
 #include "gpu/texture_manager.h"
 #include "platform/platform.h"
 #include "procedural/generator.h"
diff --git a/src/tests/3d/test_mesh.cc b/src/tests/3d/test_mesh.cc
index 4a1d97b..d4ce097 100644
--- a/src/tests/3d/test_mesh.cc
+++ b/src/tests/3d/test_mesh.cc
@@ -6,7 +6,7 @@
 #include "3d/renderer.h"
 #include "3d/renderer_helpers.h"
 #include "3d/scene.h"
-#include "gpu/effects/shaders.h"
+#include "gpu/shaders.h"
 #include "gpu/texture_manager.h"
 #include "platform/platform.h"
 #include "procedural/generator.h"
diff --git a/src/tests/gpu/test_demo_effects.cc b/src/tests/gpu/test_demo_effects.cc
index 169db91..7c61691 100644
--- a/src/tests/gpu/test_demo_effects.cc
+++ b/src/tests/gpu/test_demo_effects.cc
@@ -13,7 +13,7 @@
 #include "../common/effect_test_helpers.h"
 #include "gpu/demo_effects.h"
 #include "gpu/effect.h"
-#include "gpu/effects/cnn_effect.h"
+#include "effects/cnn_effect.h"
 #include "../common/webgpu_test_fixture.h"
 #include <cassert>
 #include <cstdio>
diff --git a/src/tests/gpu/test_noise_functions.cc b/src/tests/gpu/test_noise_functions.cc
index f8dfc93..eddd88e 100644
--- a/src/tests/gpu/test_noise_functions.cc
+++ b/src/tests/gpu/test_noise_functions.cc
@@ -2,8 +2,8 @@
 // It validates that the noise.wgsl functions are accessible and usable.
 
 #include "generated/assets.h"
-#include "gpu/effects/shader_composer.h"
-#include "gpu/effects/shaders.h"
+#include "gpu/shader_composer.h"
+#include "gpu/shaders.h"
 #include <cassert>
 #include <cstdio>
 #include <cstring>
diff --git a/src/tests/gpu/test_shader_compilation.cc b/src/tests/gpu/test_shader_compilation.cc
index a322e8a..3a7c2cf 100644
--- a/src/tests/gpu/test_shader_compilation.cc
+++ b/src/tests/gpu/test_shader_compilation.cc
@@ -6,8 +6,8 @@
 // - Type mismatches
 
 #include "generated/assets.h"
-#include "gpu/effects/shader_composer.h"
-#include "gpu/effects/shaders.h"
+#include "gpu/shader_composer.h"
+#include "gpu/shaders.h"
 #include "platform/platform.h"
 #include <cassert>
 #include <cstdio>
diff --git a/src/tests/gpu/test_shader_composer.cc b/src/tests/gpu/test_shader_composer.cc
index a98a259..a23d6fa 100644
--- a/src/tests/gpu/test_shader_composer.cc
+++ b/src/tests/gpu/test_shader_composer.cc
@@ -1,7 +1,7 @@
 // This file is part of the 64k demo project.
 // It tests the ShaderComposer utility.
 
-#include "gpu/effects/shader_composer.h"
+#include "gpu/shader_composer.h"
 #include <cassert>
 #include <iostream>
 #include <string>