diff --git a/samples/00_util/CMakeLists.txt b/samples/00_util/CMakeLists.txt
index 0178f88..806117b 100644
--- a/samples/00_util/CMakeLists.txt
+++ b/samples/00_util/CMakeLists.txt
@@ -6,7 +6,9 @@ add_library(util_helper STATIC
         helpers.h
         helpers.cpp
         frame.cpp
-        frame.h)
+        frame.h
+        gpu_resource_manager.cpp
+        gpu_resource_manager.h)
 
 target_link_libraries(util_helper PRIVATE aster_core)
 target_include_directories(util_helper PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/samples/03_model_render/render_resource_manager.cpp b/samples/00_util/gpu_resource_manager.cpp
similarity index 99%
rename from samples/03_model_render/render_resource_manager.cpp
rename to samples/00_util/gpu_resource_manager.cpp
index 96cc30a..a8bbad1 100644
--- a/samples/03_model_render/render_resource_manager.cpp
+++ b/samples/00_util/gpu_resource_manager.cpp
@@ -1,9 +1,9 @@
 // =============================================
-//  Aster: pipeline_utils.h
+//  Aster: gpu_resource_manager.cpp
 //  Copyright (c) 2020-2024 Anish Bhobe
 // =============================================
 
-#include "render_resource_manager.h"
+#include "gpu_resource_manager.h"
 
 #include "buffer.h"
 #include "device.h"
diff --git a/samples/03_model_render/render_resource_manager.h b/samples/00_util/gpu_resource_manager.h
similarity index 96%
rename from samples/03_model_render/render_resource_manager.h
rename to samples/00_util/gpu_resource_manager.h
index 5fb224c..584218a 100644
--- a/samples/03_model_render/render_resource_manager.h
+++ b/samples/00_util/gpu_resource_manager.h
@@ -1,20 +1,18 @@
 // =============================================
-//  Aster: pipeline_utils.h
+//  Aster: gpu_resource_manager.h
 //  Copyright (c) 2020-2024 Anish Bhobe
 // =============================================
 
 #pragma once
 
 #include "global.h"
-#include "buffer.h"
-#include "image.h"
 
 #include <EASTL/deque.h>
 #include <EASTL/vector_map.h>
 
 struct Device;
 struct Texture;
-struct UniformStorageBuffer;
+struct StorageBuffer;
 
 struct GpuResourceHandle
 {
diff --git a/samples/03_model_render/CMakeLists.txt b/samples/03_model_render/CMakeLists.txt
index e8694d8..ed5eca8 100644
--- a/samples/03_model_render/CMakeLists.txt
+++ b/samples/03_model_render/CMakeLists.txt
@@ -8,8 +8,6 @@ find_path(TINYGLTF_INCLUDE_DIRS "tiny_gltf.h")
 add_executable(model_render model_render.cpp
         pipeline_utils.cpp
         pipeline_utils.h
-        render_resource_manager.cpp
-        render_resource_manager.h
         model_loader.cpp
         model_loader.h
         light_manager.cpp 
diff --git a/samples/03_model_render/light_manager.cpp b/samples/03_model_render/light_manager.cpp
index 1088db9..5d54987 100644
--- a/samples/03_model_render/light_manager.cpp
+++ b/samples/03_model_render/light_manager.cpp
@@ -5,6 +5,7 @@
 
 #include "light_manager.h"
 
+#include "buffer.h"
 #include "glm/ext/matrix_transform.hpp"
 
 struct Light
diff --git a/samples/03_model_render/light_manager.h b/samples/03_model_render/light_manager.h
index aac9e54..4dc5479 100644
--- a/samples/03_model_render/light_manager.h
+++ b/samples/03_model_render/light_manager.h
@@ -8,7 +8,7 @@
 #include "global.h"
 
 // TODO: Separate files so you only import handles.
-#include "render_resource_manager.h"
+#include "gpu_resource_manager.h"
 
 struct DirectionalLight
 {
diff --git a/samples/03_model_render/model_loader.cpp b/samples/03_model_render/model_loader.cpp
index b29321f..f6c3223 100644
--- a/samples/03_model_render/model_loader.cpp
+++ b/samples/03_model_render/model_loader.cpp
@@ -16,7 +16,7 @@
 #include "device.h"
 #include "helpers.h"
 #include "image.h"
-#include "render_resource_manager.h"
+#include "gpu_resource_manager.h"
 
 #include <glm/gtc/type_ptr.hpp>
 #include <EASTL/array.h>
diff --git a/samples/03_model_render/model_loader.h b/samples/03_model_render/model_loader.h
index ea477c2..38024bf 100644
--- a/samples/03_model_render/model_loader.h
+++ b/samples/03_model_render/model_loader.h
@@ -8,7 +8,7 @@
 #include "buffer.h"
 #include "global.h"
 
-#include "render_resource_manager.h"
+#include "gpu_resource_manager.h"
 #include "nodes.h"
 
 #include <tiny_gltf.h>
diff --git a/samples/03_model_render/model_render.cpp b/samples/03_model_render/model_render.cpp
index 7d6b167..d77c48e 100644
--- a/samples/03_model_render/model_render.cpp
+++ b/samples/03_model_render/model_render.cpp
@@ -20,7 +20,7 @@
 
 #include "model_loader.h"
 #include "pipeline_utils.h"
-#include "render_resource_manager.h"
+#include "gpu_resource_manager.h"
 
 #include <EASTL/array.h>
 #include <stb_image.h>
diff --git a/samples/03_model_render/pipeline_utils.cpp b/samples/03_model_render/pipeline_utils.cpp
index 0558181..2414424 100644
--- a/samples/03_model_render/pipeline_utils.cpp
+++ b/samples/03_model_render/pipeline_utils.cpp
@@ -7,7 +7,7 @@
 
 #include "device.h"
 #include "helpers.h"
-#include "render_resource_manager.h"
+#include "gpu_resource_manager.h"
 #include "swapchain.h"
 
 #include <EASTL/array.h>