From f9d4523f0902034cbf0f12dc4115701f8239e5e6 Mon Sep 17 00:00:00 2001
From: CatChow0 <thetrueshibadoggo@gmail.com>
Date: Wed, 21 May 2025 16:40:27 +0200
Subject: [PATCH] Minor - Refactor name - V10.5.0

---
 .../.idea/encodings.xml                       |    2 +-
 .../.idea/workspace.xml                       |  132 +-
 enginecustom/DemoScene_V10.1.2.ker            |    1 +
 enginecustom/assets/Texture/imgui.ini         |   82 +-
 enginecustom/enginecustom.vcxproj             |  142 +-
 enginecustom/imgui.ini                        |   62 +-
 enginecustom/include/imgui.h                  |   50 +-
 .../src/inc/shader/CelShadingShader.h         |   64 -
 .../src/inc/shader/Multitextureshaderclass.h  |   59 -
 .../src/inc/shader/alpha_map_shader_class.h   |   55 +
 .../src/inc/shader/alphamapshaderclass.h      |   55 -
 enginecustom/src/inc/shader/celshade_class.h  |   85 ++
 ...olorshaderclass.h => color_shader_class.h} |   36 +-
 .../src/inc/shader/font_shader_class.h        |   62 +
 enginecustom/src/inc/shader/fontshaderclass.h |   62 -
 .../src/inc/shader/light_map_shader_class.h   |   57 +
 .../src/inc/shader/light_shader_class.h       |   92 ++
 .../src/inc/shader/lightmapshaderclass.h      |   57 -
 .../src/inc/shader/lightshaderclass.h         |   92 --
 .../src/inc/shader/lightshaderwaterclass.h    |    1 -
 .../inc/shader/multi_texture_shader_class.h   |   59 +
 .../src/inc/shader/normal_map_shader_class.h  |   64 +
 .../src/inc/shader/normalmapshaderclass.h     |   64 -
 .../src/inc/shader/reflection_shader_class.h  |   65 +
 .../src/inc/shader/reflectionshaderclass.h    |   65 -
 .../src/inc/shader/refraction_shader_class.h  |   72 +
 .../src/inc/shader/refractionshaderclass.h    |   72 -
 .../src/inc/shader/shader_manager_class.h     |   67 +
 .../src/inc/shader/shadermanagerclass.h       |   67 -
 ...boxShaderClass.h => skybox_shader_class.h} |    8 +-
 .../src/inc/shader/spec_map_shader_class.h    |   72 +
 .../src/inc/shader/specmapshaderclass.h       |   72 -
 .../src/inc/shader/sunlight_shader_class.h    |   68 +
 .../src/inc/shader/sunlightshaderclass.h      |   68 -
 .../src/inc/shader/texture_shader_class.h     |   56 +
 .../src/inc/shader/textureshaderclass.h       |   56 -
 .../src/inc/shader/translate_shader_class.h   |   63 +
 .../src/inc/shader/translateshaderclass.h     |   63 -
 .../src/inc/shader/transparent_shader_class.h |   63 +
 .../src/inc/shader/transparentshaderclass.h   |   63 -
 .../src/inc/shader/water_shader_class.h       |   70 +
 .../src/inc/shader/watershaderclass.h         |   70 -
 enginecustom/src/inc/system/Cameraclass.h     |   46 -
 enginecustom/src/inc/system/Logger.h          |    8 +-
 enginecustom/src/inc/system/Skybox.h          |   10 +-
 .../src/inc/system/application_class.h        |  325 +++++
 .../src/inc/system/applicationclass.h         |  327 -----
 enginecustom/src/inc/system/bitmap_class.h    |   59 +
 enginecustom/src/inc/system/bitmapclass.h     |   59 -
 enginecustom/src/inc/system/camera_class.h    |   46 +
 enginecustom/src/inc/system/d3dclass.h        |   90 --
 enginecustom/src/inc/system/d_3d_class.h      |   90 ++
 ...playplaneclass.h => display_plane_class.h} |   12 +-
 .../inc/system/{fontclass.h => font_class.h}  |   14 +-
 .../inc/system/{fpsclass.h => fps_class.h}    |   10 +-
 enginecustom/src/inc/system/fps_limiter.h     |   22 +
 enginecustom/src/inc/system/frustum.h         |    2 +-
 enginecustom/src/inc/system/imguiManager.h    |   46 +-
 .../system/{inputclass.h => input_class.h}    |   10 +-
 .../system/{lightclass.h => light_class.h}    |   10 +-
 .../system/{modelclass.h => model_class.h}    |   26 +-
 enginecustom/src/inc/system/object.h          |   16 +-
 enginecustom/src/inc/system/physics.h         |   20 +-
 .../{Positionclass.h => position_class.h}     |   10 +-
 ...rtextureclass.h => render_texture_class.h} |   10 +-
 .../system/{Spriteclass.h => sprite_class.h}  |   14 +-
 enginecustom/src/inc/system/system_class.h    |   72 +
 enginecustom/src/inc/system/systemclass.h     |   73 -
 .../inc/system/{textclass.h => text_class.h}  |   18 +-
 .../{textureclass.h => texture_class.h}       |   10 +-
 .../system/{Timerclass.h => timer_class.h}    |   10 +-
 ...erclass.cpp => alpha_map_shader_class.cpp} |  116 +-
 ...elShadingShader.cpp => celshade_class.cpp} |  202 +--
 ...shaderclass.cpp => color_shader_class.cpp} |  106 +-
 ...tshaderclass.cpp => font_shader_class.cpp} |  140 +-
 ...erclass.cpp => light_map_shader_class.cpp} |  122 +-
 ...shaderclass.cpp => light_shader_class.cpp} |  192 +--
 ...ass.cpp => multi_texture_shader_class.cpp} |  118 +-
 ...rclass.cpp => normal_map_shader_class.cpp} |  140 +-
 ...rclass.cpp => reflection_shader_class.cpp} |  138 +-
 ...rclass.cpp => refraction_shader_class.cpp} |  168 +--
 .../src/src/shader/shader_manager_class.cpp   |  479 ++++++
 .../src/src/shader/shadermanagerclass.cpp     |  479 ------
 ...haderClass.cpp => skybox_shader_class.cpp} |   26 +-
 ...derclass.cpp => spec_map_shader_class.cpp} |  168 +--
 ...derclass.cpp => sunlight_shader_class.cpp} |  168 +--
 ...aderclass.cpp => texture_shader_class.cpp} |  114 +-
 ...erclass.cpp => translate_shader_class.cpp} |  140 +-
 ...class.cpp => transparent_shader_class.cpp} |  142 +-
 ...shaderclass.cpp => water_shader_class.cpp} |  162 +--
 enginecustom/src/src/system/Main.cpp          |   18 +-
 enginecustom/src/src/system/Skybox.cpp        |   10 +-
 ...icationclass.cpp => application_class.cpp} | 1296 ++++++++---------
 .../{bitmapclass.cpp => bitmap_class.cpp}     |  160 +-
 .../{Cameraclass.cpp => camera_class.cpp}     |   86 +-
 .../system/{d3dclass.cpp => d_3d_class.cpp}   |  276 ++--
 ...planeclass.cpp => display_plane_class.cpp} |   26 +-
 .../system/{fontclass.cpp => font_class.cpp}  |   30 +-
 .../system/{fpsclass.cpp => fps_class.cpp}    |   22 +-
 enginecustom/src/src/system/frustum.cpp       |    4 +-
 enginecustom/src/src/system/imguiManager.cpp  |  220 ++-
 .../{inputclass.cpp => input_class.cpp}       |   58 +-
 .../{lightclass.cpp => light_class.cpp}       |   32 +-
 .../{modelclass.cpp => model_class.cpp}       |   46 +-
 enginecustom/src/src/system/object.cpp        |  102 +-
 enginecustom/src/src/system/physics.cpp       |   24 +-
 .../{Positionclass.cpp => position_class.cpp} |   22 +-
 ...tureclass.cpp => render_texture_class.cpp} |   34 +-
 .../{Spriteclass.cpp => sprite_class.cpp}     |   36 +-
 .../{Systemclass.cpp => system_class.cpp}     |  235 +--
 .../system/{textclass.cpp => text_class.cpp}  |   26 +-
 .../{textureclass.cpp => texture_class.cpp}   |   20 +-
 .../{Timerclass.cpp => timer_class.cpp}       |   14 +-
 113 files changed, 5200 insertions(+), 5017 deletions(-)
 delete mode 100644 enginecustom/src/inc/shader/CelShadingShader.h
 delete mode 100644 enginecustom/src/inc/shader/Multitextureshaderclass.h
 create mode 100644 enginecustom/src/inc/shader/alpha_map_shader_class.h
 delete mode 100644 enginecustom/src/inc/shader/alphamapshaderclass.h
 create mode 100644 enginecustom/src/inc/shader/celshade_class.h
 rename enginecustom/src/inc/shader/{Colorshaderclass.h => color_shader_class.h} (50%)
 create mode 100644 enginecustom/src/inc/shader/font_shader_class.h
 delete mode 100644 enginecustom/src/inc/shader/fontshaderclass.h
 create mode 100644 enginecustom/src/inc/shader/light_map_shader_class.h
 create mode 100644 enginecustom/src/inc/shader/light_shader_class.h
 delete mode 100644 enginecustom/src/inc/shader/lightmapshaderclass.h
 delete mode 100644 enginecustom/src/inc/shader/lightshaderclass.h
 delete mode 100644 enginecustom/src/inc/shader/lightshaderwaterclass.h
 create mode 100644 enginecustom/src/inc/shader/multi_texture_shader_class.h
 create mode 100644 enginecustom/src/inc/shader/normal_map_shader_class.h
 delete mode 100644 enginecustom/src/inc/shader/normalmapshaderclass.h
 create mode 100644 enginecustom/src/inc/shader/reflection_shader_class.h
 delete mode 100644 enginecustom/src/inc/shader/reflectionshaderclass.h
 create mode 100644 enginecustom/src/inc/shader/refraction_shader_class.h
 delete mode 100644 enginecustom/src/inc/shader/refractionshaderclass.h
 create mode 100644 enginecustom/src/inc/shader/shader_manager_class.h
 delete mode 100644 enginecustom/src/inc/shader/shadermanagerclass.h
 rename enginecustom/src/inc/shader/{SkyboxShaderClass.h => skybox_shader_class.h} (92%)
 create mode 100644 enginecustom/src/inc/shader/spec_map_shader_class.h
 delete mode 100644 enginecustom/src/inc/shader/specmapshaderclass.h
 create mode 100644 enginecustom/src/inc/shader/sunlight_shader_class.h
 delete mode 100644 enginecustom/src/inc/shader/sunlightshaderclass.h
 create mode 100644 enginecustom/src/inc/shader/texture_shader_class.h
 delete mode 100644 enginecustom/src/inc/shader/textureshaderclass.h
 create mode 100644 enginecustom/src/inc/shader/translate_shader_class.h
 delete mode 100644 enginecustom/src/inc/shader/translateshaderclass.h
 create mode 100644 enginecustom/src/inc/shader/transparent_shader_class.h
 delete mode 100644 enginecustom/src/inc/shader/transparentshaderclass.h
 create mode 100644 enginecustom/src/inc/shader/water_shader_class.h
 delete mode 100644 enginecustom/src/inc/shader/watershaderclass.h
 delete mode 100644 enginecustom/src/inc/system/Cameraclass.h
 create mode 100644 enginecustom/src/inc/system/application_class.h
 delete mode 100644 enginecustom/src/inc/system/applicationclass.h
 create mode 100644 enginecustom/src/inc/system/bitmap_class.h
 delete mode 100644 enginecustom/src/inc/system/bitmapclass.h
 create mode 100644 enginecustom/src/inc/system/camera_class.h
 delete mode 100644 enginecustom/src/inc/system/d3dclass.h
 create mode 100644 enginecustom/src/inc/system/d_3d_class.h
 rename enginecustom/src/inc/system/{displayplaneclass.h => display_plane_class.h} (80%)
 rename enginecustom/src/inc/system/{fontclass.h => font_class.h} (86%)
 rename enginecustom/src/inc/system/{fpsclass.h => fps_class.h} (86%)
 create mode 100644 enginecustom/src/inc/system/fps_limiter.h
 rename enginecustom/src/inc/system/{inputclass.h => input_class.h} (93%)
 rename enginecustom/src/inc/system/{lightclass.h => light_class.h} (91%)
 rename enginecustom/src/inc/system/{modelclass.h => model_class.h} (92%)
 rename enginecustom/src/inc/system/{Positionclass.h => position_class.h} (85%)
 rename enginecustom/src/inc/system/{rendertextureclass.h => render_texture_class.h} (88%)
 rename enginecustom/src/inc/system/{Spriteclass.h => sprite_class.h} (87%)
 create mode 100644 enginecustom/src/inc/system/system_class.h
 delete mode 100644 enginecustom/src/inc/system/systemclass.h
 rename enginecustom/src/inc/system/{textclass.h => text_class.h} (72%)
 rename enginecustom/src/inc/system/{textureclass.h => texture_class.h} (87%)
 rename enginecustom/src/inc/system/{Timerclass.h => timer_class.h} (79%)
 rename enginecustom/src/src/shader/{alphamapshaderclass.cpp => alpha_map_shader_class.cpp} (77%)
 rename enginecustom/src/src/shader/{CelShadingShader.cpp => celshade_class.cpp} (68%)
 rename enginecustom/src/src/shader/{Colorshaderclass.cpp => color_shader_class.cpp} (75%)
 rename enginecustom/src/src/shader/{fontshaderclass.cpp => font_shader_class.cpp} (74%)
 rename enginecustom/src/src/shader/{lightmapshaderclass.cpp => light_map_shader_class.cpp} (73%)
 rename enginecustom/src/src/shader/{lightshaderclass.cpp => light_shader_class.cpp} (73%)
 rename enginecustom/src/src/shader/{Multitextureshaderclass.cpp => multi_texture_shader_class.cpp} (75%)
 rename enginecustom/src/src/shader/{normalmapshaderclass.cpp => normal_map_shader_class.cpp} (77%)
 rename enginecustom/src/src/shader/{reflectionshaderclass.cpp => reflection_shader_class.cpp} (75%)
 rename enginecustom/src/src/shader/{refractionshaderclass.cpp => refraction_shader_class.cpp} (70%)
 create mode 100644 enginecustom/src/src/shader/shader_manager_class.cpp
 delete mode 100644 enginecustom/src/src/shader/shadermanagerclass.cpp
 rename enginecustom/src/src/shader/{SkyboxShaderClass.cpp => skybox_shader_class.cpp} (92%)
 rename enginecustom/src/src/shader/{specmapshaderclass.cpp => spec_map_shader_class.cpp} (72%)
 rename enginecustom/src/src/shader/{sunlightshaderclass.cpp => sunlight_shader_class.cpp} (71%)
 rename enginecustom/src/src/shader/{textureshaderclass.cpp => texture_shader_class.cpp} (75%)
 rename enginecustom/src/src/shader/{translateshaderclass.cpp => translate_shader_class.cpp} (74%)
 rename enginecustom/src/src/shader/{transparentshaderclass.cpp => transparent_shader_class.cpp} (74%)
 rename enginecustom/src/src/shader/{watershaderclass.cpp => water_shader_class.cpp} (72%)
 rename enginecustom/src/src/system/{applicationclass.cpp => application_class.cpp} (61%)
 rename enginecustom/src/src/system/{bitmapclass.cpp => bitmap_class.cpp} (68%)
 rename enginecustom/src/src/system/{Cameraclass.cpp => camera_class.cpp} (64%)
 rename enginecustom/src/src/system/{d3dclass.cpp => d_3d_class.cpp} (73%)
 rename enginecustom/src/src/system/{displayplaneclass.cpp => display_plane_class.cpp} (85%)
 rename enginecustom/src/src/system/{fontclass.cpp => font_class.cpp} (88%)
 rename enginecustom/src/src/system/{fpsclass.cpp => fps_class.cpp} (71%)
 rename enginecustom/src/src/system/{inputclass.cpp => input_class.cpp} (86%)
 rename enginecustom/src/src/system/{lightclass.cpp => light_class.cpp} (51%)
 rename enginecustom/src/src/system/{modelclass.cpp => model_class.cpp} (92%)
 rename enginecustom/src/src/system/{Positionclass.cpp => position_class.cpp} (88%)
 rename enginecustom/src/src/system/{rendertextureclass.cpp => render_texture_class.cpp} (83%)
 rename enginecustom/src/src/system/{Spriteclass.cpp => sprite_class.cpp} (90%)
 rename enginecustom/src/src/system/{Systemclass.cpp => system_class.cpp} (69%)
 rename enginecustom/src/src/system/{textclass.cpp => text_class.cpp} (86%)
 rename enginecustom/src/src/system/{textureclass.cpp => texture_class.cpp} (93%)
 rename enginecustom/src/src/system/{Timerclass.cpp => timer_class.cpp} (84%)

diff --git a/.idea/.idea.KhaoticEngineReborn/.idea/encodings.xml b/.idea/.idea.KhaoticEngineReborn/.idea/encodings.xml
index 24f3ba2..d178b1a 100644
--- a/.idea/.idea.KhaoticEngineReborn/.idea/encodings.xml
+++ b/.idea/.idea.KhaoticEngineReborn/.idea/encodings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/enginecustom/src/src/system/applicationclass.cpp" charset="windows-1252" />
+    <file url="file://$PROJECT_DIR$/enginecustom/src/src/system/application_class.cpp" charset="windows-1252" />
     <file url="file://$PROJECT_DIR$/enginecustom/src/src/system/imguiManager.cpp" charset="windows-1252" />
     <file url="PROJECT" charset="windows-1252" />
   </component>
diff --git a/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml b/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
index a15e645..690b46b 100644
--- a/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
+++ b/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
@@ -5,12 +5,97 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e81d6e08-efc7-40a0-909d-ec4943d948e9" name="Changes" comment="">
+      <change afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/fps_limiter.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/encodings.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/DemoScene_V10.1.2.ker" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/DemoScene_V10.1.2.ker" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/assets/Texture/imgui.ini" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/assets/Texture/imgui.ini" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/enginecustom.vcxproj" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/enginecustom.vcxproj" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/enginecustom/imgui.ini" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/imgui.ini" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/include/imgui.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/include/imgui.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/CelShadingShader.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/shader/celshade_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/Colorshaderclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/shader/color_shader_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/Multitextureshaderclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/shader/multi_texture_shader_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/SkyboxShaderClass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/shader/skybox_shader_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/alphamapshaderclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/shader/alpha_map_shader_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/fontshaderclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/shader/font_shader_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/lightmapshaderclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/shader/light_map_shader_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/lightshaderclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/shader/light_shader_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/lightshaderwaterclass.h" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/normalmapshaderclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/shader/normal_map_shader_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/reflectionshaderclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/shader/reflection_shader_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/refractionshaderclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/shader/refraction_shader_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/shadermanagerclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/shader/shader_manager_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/specmapshaderclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/shader/spec_map_shader_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/sunlightshaderclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/shader/sunlight_shader_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/textureshaderclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/shader/texture_shader_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/translateshaderclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/shader/translate_shader_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/transparentshaderclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/shader/transparent_shader_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/watershaderclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/shader/water_shader_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/Cameraclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/camera_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/Logger.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/Logger.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/Positionclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/position_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/Skybox.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/Skybox.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/Spriteclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/sprite_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/Timerclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/timer_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/applicationclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/application_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/bitmapclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/bitmap_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/d3dclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/d_3d_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/displayplaneclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/display_plane_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/fontclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/font_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/fpsclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/fps_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/frustum.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/frustum.h" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/imguiManager.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/imguiManager.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/modelclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/modelclass.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/inputclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/input_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/lightclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/light_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/modelclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/model_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/object.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/object.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/physics.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/physics.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/rendertextureclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/render_texture_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/systemclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/system_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/textclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/text_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/textureclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/texture_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/shader/CelShadingShader.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/shader/celshade_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/shader/Colorshaderclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/shader/color_shader_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/shader/Multitextureshaderclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/shader/multi_texture_shader_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/shader/SkyboxShaderClass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/shader/skybox_shader_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/shader/alphamapshaderclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/shader/alpha_map_shader_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/shader/fontshaderclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/shader/font_shader_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/shader/lightmapshaderclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/shader/light_map_shader_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/shader/lightshaderclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/shader/light_shader_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/shader/normalmapshaderclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/shader/normal_map_shader_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/shader/reflectionshaderclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/shader/reflection_shader_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/shader/refractionshaderclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/shader/refraction_shader_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/shader/shadermanagerclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/shader/shader_manager_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/shader/specmapshaderclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/shader/spec_map_shader_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/shader/sunlightshaderclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/shader/sunlight_shader_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/shader/textureshaderclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/shader/texture_shader_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/shader/translateshaderclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/shader/translate_shader_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/shader/transparentshaderclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/shader/transparent_shader_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/shader/watershaderclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/shader/water_shader_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/Cameraclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/camera_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/Main.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/Main.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/Positionclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/position_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/Skybox.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/Skybox.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/Spriteclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/sprite_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/Systemclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/system_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/Timerclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/timer_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/applicationclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/application_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/bitmapclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/bitmap_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/d3dclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/d_3d_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/displayplaneclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/display_plane_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/fontclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/font_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/fpsclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/fps_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/frustum.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/frustum.cpp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/imguiManager.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/imguiManager.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/modelclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/modelclass.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/inputclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/input_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/lightclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/light_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/modelclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/model_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/object.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/object.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/physics.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/physics.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/rendertextureclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/render_texture_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/textclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/text_class.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/textureclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/texture_class.cpp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -156,6 +241,10 @@
     <setting file="file://$PROJECT_DIR$/enginecustom/src/src/shader/CelShadingShader.cpp" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/../../IDE_VS/VC/Tools/MSVC/14.38.33130/include/type_traits" root0="SKIP_HIGHLIGHTING" />
   </component>
+  <component name="KubernetesApiPersistence">{}</component>
+  <component name="KubernetesApiProvider">{
+  &quot;isMigrated&quot;: true
+}</component>
   <component name="MetaFilesCheckinStateConfiguration" checkMetaFiles="true" />
   <component name="ProblemsViewState">
     <option name="selectedTabId" value="CurrentFile" />
@@ -168,25 +257,25 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ASKED_SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    &quot;C++ Project.enginecustom.executor&quot;: &quot;Run&quot;,
-    &quot;C/C++ Project.enginecustom.executor&quot;: &quot;Run&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
-    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.build.unityPlugin&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    "C++ Project.enginecustom.executor": "Run",
+    "C/C++ Project.enginecustom.executor": "Run",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    "git-widget-placeholder": "main",
+    "ignore.virus.scanning.warn.message": "true",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "preferences.keymap",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RunManager" selected="C/C++ Project.enginecustom">
     <configuration name="KhaoticDemo" type="CppProject" factoryName="C++ Project">
       <configuration_1 setup="1">
@@ -314,6 +403,9 @@
       <workItem from="1746795828588" duration="592000" />
       <workItem from="1747049871967" duration="9350000" />
       <workItem from="1747136509645" duration="3939000" />
+      <workItem from="1747258663152" duration="835000" />
+      <workItem from="1747826758888" duration="3587000" />
+      <workItem from="1747830379222" duration="7954000" />
     </task>
     <task id="LOCAL-00001" summary="Minor update - viewport window tweak">
       <option name="closed" value="true" />
diff --git a/enginecustom/DemoScene_V10.1.2.ker b/enginecustom/DemoScene_V10.1.2.ker
index e69de29..0278198 100644
--- a/enginecustom/DemoScene_V10.1.2.ker
+++ b/enginecustom/DemoScene_V10.1.2.ker
@@ -0,0 +1 @@
+1 isosphere 0 10 0 0 -0 0 1 1 1 Content/Assets/Kobject/isosphere.obj ALPHA_MAPPING 1 Unknown 1 0 2 assets/Texture/Bricks2K.png F:\Github_Repo\khaotic-engine-Reborn\enginecustom\assets\Texture\moss01.png 1 assets/Texture/BricksNRM2K.png 1 assets/Texture/BricksGLOSS2K.png 1 F:\Github_Repo\khaotic-engine-Reborn\enginecustom\assets\Texture\alpha01.png
diff --git a/enginecustom/assets/Texture/imgui.ini b/enginecustom/assets/Texture/imgui.ini
index 18240cd..f2660b0 100644
--- a/enginecustom/assets/Texture/imgui.ini
+++ b/enginecustom/assets/Texture/imgui.ini
@@ -4,28 +4,28 @@ Size=400,400
 Collapsed=0
 
 [Window][Khaotic Engine]
-Pos=1697,27
-Size=343,1094
+Pos=1745,19
+Size=303,667
 Collapsed=0
-DockId=0x00000005,0
+DockId=0x0000000F,0
 
 [Window][Objects]
-Pos=8,27
-Size=289,547
+Pos=0,19
+Size=281,441
+Collapsed=0
+DockId=0x00000011,0
+
+[Window][Terrain]
+Pos=283,19
+Size=280,883
 Collapsed=0
 DockId=0x00000007,0
 
-[Window][Terrain]
-Pos=8,576
-Size=289,545
-Collapsed=0
-DockId=0x00000008,0
-
 [Window][Light]
-Pos=8,27
-Size=290,866
+Pos=0,462
+Size=281,440
 Collapsed=0
-DockId=0x0000000B,1
+DockId=0x00000012,0
 
 [Window][Shader Manager]
 Pos=8,27
@@ -34,10 +34,10 @@ Collapsed=0
 DockId=0x00000001,2
 
 [Window][Engine Settings]
-Pos=8,27
-Size=289,547
+Pos=1745,688
+Size=303,441
 Collapsed=0
-DockId=0x00000007,1
+DockId=0x00000010,0
 
 [Window][DockSpace Demo]
 Size=1584,861
@@ -47,7 +47,7 @@ Collapsed=0
 Pos=8,27
 Size=1559,974
 Collapsed=0
-DockId=0x00000007,0
+DockId=0x00000011,0
 
 [Window][DockSpace]
 Pos=0,0
@@ -66,24 +66,36 @@ Collapsed=0
 DockId=0x0000000C,0
 
 [Window][Log Window]
-Pos=8,37
-Size=16,19
+Pos=873,904
+Size=870,225
 Collapsed=0
 DockId=0x00000006,0
 
-[Docking][Data]
-DockSpace         ID=0xC0DFADC4 Pos=8,27 Size=1568,826 Split=X
-  DockNode        ID=0x00000001 Parent=0xC0DFADC4 SizeRef=330,1094 Selected=0x393905AB
-  DockNode        ID=0x00000003 Parent=0xC0DFADC4 SizeRef=1700,1094 CentralNode=1
-DockSpace         ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=8,27 Size=2032,1094 Split=Y
-  DockNode        ID=0x00000004 Parent=0xCCBD8CF7 SizeRef=1568,598 Split=X
-    DockNode      ID=0x00000009 Parent=0x00000004 SizeRef=289,974 Split=Y Selected=0x031DC75C
-      DockNode    ID=0x00000007 Parent=0x00000009 SizeRef=289,547 Selected=0x0B098C4B
-      DockNode    ID=0x00000008 Parent=0x00000009 SizeRef=289,545 Selected=0x393905AB
-    DockNode      ID=0x0000000D Parent=0x00000004 SizeRef=1613,974 Split=X
-      DockNode    ID=0x00000002 Parent=0x0000000D SizeRef=1268,826 Split=Y
-        DockNode  ID=0x0000000B Parent=0x00000002 SizeRef=1568,637 CentralNode=1
-        DockNode  ID=0x0000000C Parent=0x00000002 SizeRef=1568,335 Selected=0x139FDA3F
-      DockNode    ID=0x00000005 Parent=0x0000000D SizeRef=343,826 Selected=0x9F035453
-  DockNode        ID=0x00000006 Parent=0xCCBD8CF7 SizeRef=1568,226 Selected=0xAB74BEE9
+[Window][Render Stats]
+Pos=0,904
+Size=871,225
+Collapsed=0
+DockId=0x00000004,0
+
+[Docking][Data]
+DockSpace           ID=0xC0DFADC4 Pos=8,27 Size=1568,826 Split=X
+  DockNode          ID=0x00000001 Parent=0xC0DFADC4 SizeRef=330,1094 Selected=0x393905AB
+  DockNode          ID=0x00000003 Parent=0xC0DFADC4 SizeRef=1700,1094 CentralNode=1
+DockSpace           ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=0,19 Size=2048,1110 Split=X
+  DockNode          ID=0x00000002 Parent=0xCCBD8CF7 SizeRef=1743,826 Split=Y
+    DockNode        ID=0x0000000A Parent=0x00000002 SizeRef=1568,599 Split=X
+      DockNode      ID=0x00000009 Parent=0x0000000A SizeRef=281,974 Split=Y Selected=0x031DC75C
+        DockNode    ID=0x00000011 Parent=0x00000009 SizeRef=281,441 Selected=0x031DC75C
+        DockNode    ID=0x00000012 Parent=0x00000009 SizeRef=281,440 Selected=0x321620B2
+      DockNode      ID=0x0000000D Parent=0x0000000A SizeRef=1460,974 Split=Y
+        DockNode    ID=0x0000000B Parent=0x0000000D SizeRef=1568,637 Split=X Selected=0x321620B2
+          DockNode  ID=0x00000007 Parent=0x0000000B SizeRef=280,883 Selected=0x393905AB
+          DockNode  ID=0x00000008 Parent=0x0000000B SizeRef=1178,883 CentralNode=1
+        DockNode    ID=0x0000000C Parent=0x0000000D SizeRef=1568,335 Selected=0x139FDA3F
+    DockNode        ID=0x0000000E Parent=0x00000002 SizeRef=1568,225 Split=X Selected=0xD99DEA49
+      DockNode      ID=0x00000004 Parent=0x0000000E SizeRef=871,225 Selected=0xD99DEA49
+      DockNode      ID=0x00000006 Parent=0x0000000E SizeRef=870,225 Selected=0xAB74BEE9
+  DockNode          ID=0x00000005 Parent=0xCCBD8CF7 SizeRef=303,826 Split=Y Selected=0x9F035453
+    DockNode        ID=0x0000000F Parent=0x00000005 SizeRef=303,667 Selected=0x9F035453
+    DockNode        ID=0x00000010 Parent=0x00000005 SizeRef=303,441 Selected=0x0B098C4B
 
diff --git a/enginecustom/enginecustom.vcxproj b/enginecustom/enginecustom.vcxproj
index 2c395d2..3fa969b 100644
--- a/enginecustom/enginecustom.vcxproj
+++ b/enginecustom/enginecustom.vcxproj
@@ -30,49 +30,49 @@
     <ClCompile Include="include\Src\pch.cpp" />
     <ClCompile Include="include\Src\SimpleMath.cpp" />
     <ClCompile Include="include\Src\WICTextureLoader.cpp" />
-    <ClCompile Include="src\src\shader\alphamapshaderclass.cpp" />
-    <ClCompile Include="src\src\shader\CelShadingShader.cpp" />
-    <ClCompile Include="src\src\shader\Colorshaderclass.cpp" />
-    <ClCompile Include="src\src\shader\fontshaderclass.cpp" />
-    <ClCompile Include="src\src\shader\lightmapshaderclass.cpp" />
-    <ClCompile Include="src\src\shader\lightshaderclass.cpp" />
-    <ClCompile Include="src\src\shader\Multitextureshaderclass.cpp" />
-    <ClCompile Include="src\src\shader\normalmapshaderclass.cpp" />
-    <ClCompile Include="src\src\shader\reflectionshaderclass.cpp" />
-    <ClCompile Include="src\src\shader\refractionshaderclass.cpp" />
-    <ClCompile Include="src\src\shader\shadermanagerclass.cpp" />
-    <ClCompile Include="src\src\shader\SkyboxShaderClass.cpp" />
-    <ClCompile Include="src\src\shader\specmapshaderclass.cpp" />
-    <ClCompile Include="src\src\shader\sunlightshaderclass.cpp" />
-    <ClCompile Include="src\src\shader\textureshaderclass.cpp" />
-    <ClCompile Include="src\src\shader\translateshaderclass.cpp" />
-    <ClCompile Include="src\src\shader\transparentshaderclass.cpp" />
-    <ClCompile Include="src\src\shader\watershaderclass.cpp" />
-    <ClCompile Include="src\src\system\applicationclass.cpp" />
-    <ClCompile Include="src\src\system\bitmapclass.cpp" />
-    <ClCompile Include="src\src\system\Cameraclass.cpp" />
-    <ClCompile Include="src\src\system\d3dclass.cpp" />
-    <ClCompile Include="src\src\system\displayplaneclass.cpp" />
-    <ClCompile Include="src\src\system\fontclass.cpp" />
-    <ClCompile Include="src\src\system\fpsclass.cpp" />
+    <ClCompile Include="src\src\shader\alpha_map_shader_class.cpp" />
+    <ClCompile Include="src\src\shader\celshade_class.cpp" />
+    <ClCompile Include="src\src\shader\color_shader_class.cpp" />
+    <ClCompile Include="src\src\shader\font_shader_class.cpp" />
+    <ClCompile Include="src\src\shader\light_map_shader_class.cpp" />
+    <ClCompile Include="src\src\shader\light_shader_class.cpp" />
+    <ClCompile Include="src\src\shader\multi_texture_shader_class.cpp" />
+    <ClCompile Include="src\src\shader\normal_map_shader_class.cpp" />
+    <ClCompile Include="src\src\shader\reflection_shader_class.cpp" />
+    <ClCompile Include="src\src\shader\refraction_shader_class.cpp" />
+    <ClCompile Include="src\src\shader\shader_manager_class.cpp" />
+    <ClCompile Include="src\src\shader\skybox_shader_class.cpp" />
+    <ClCompile Include="src\src\shader\spec_map_shader_class.cpp" />
+    <ClCompile Include="src\src\shader\sunlight_shader_class.cpp" />
+    <ClCompile Include="src\src\shader\texture_shader_class.cpp" />
+    <ClCompile Include="src\src\shader\translate_shader_class.cpp" />
+    <ClCompile Include="src\src\shader\transparent_shader_class.cpp" />
+    <ClCompile Include="src\src\shader\water_shader_class.cpp" />
+    <ClCompile Include="src\src\system\application_class.cpp" />
+    <ClCompile Include="src\src\system\bitmap_class.cpp" />
+    <ClCompile Include="src\src\system\camera_class.cpp" />
+    <ClCompile Include="src\src\system\d_3d_class.cpp" />
+    <ClCompile Include="src\src\system\display_plane_class.cpp" />
+    <ClCompile Include="src\src\system\font_class.cpp" />
+    <ClCompile Include="src\src\system\fps_class.cpp" />
     <ClCompile Include="src\src\system\frustum.cpp" />
     <ClCompile Include="src\src\system\frustumclass.cpp" />
     <ClCompile Include="src\src\system\imguiManager.cpp" />
-    <ClCompile Include="src\src\system\inputclass.cpp" />
-    <ClCompile Include="src\src\system\lightclass.cpp" />
+    <ClCompile Include="src\src\system\input_class.cpp" />
+    <ClCompile Include="src\src\system\light_class.cpp" />
     <ClCompile Include="src\src\system\Main.cpp" />
-    <ClCompile Include="src\src\system\modelclass.cpp" />
+    <ClCompile Include="src\src\system\model_class.cpp" />
     <ClCompile Include="src\src\system\Modellistclass.cpp" />
     <ClCompile Include="src\src\system\object.cpp" />
     <ClCompile Include="src\src\system\physics.cpp" />
-    <ClCompile Include="src\src\system\Positionclass.cpp" />
-    <ClCompile Include="src\src\system\rendertextureclass.cpp" />
+    <ClCompile Include="src\src\system\position_class.cpp" />
+    <ClCompile Include="src\src\system\render_texture_class.cpp" />
     <ClCompile Include="src\src\system\Skybox.cpp" />
-    <ClCompile Include="src\src\system\Spriteclass.cpp" />
-    <ClCompile Include="src\src\system\Systemclass.cpp" />
-    <ClCompile Include="src\src\system\textclass.cpp" />
-    <ClCompile Include="src\src\system\textureclass.cpp" />
-    <ClCompile Include="src\src\system\Timerclass.cpp" />
+    <ClCompile Include="src\src\system\sprite_class.cpp" />
+    <ClCompile Include="src\src\system\system_class.cpp" />
+    <ClCompile Include="src\src\system\text_class.cpp" />
+    <ClCompile Include="src\src\system\texture_class.cpp" />
+    <ClCompile Include="src\src\system\timer_class.cpp" />
     <ClCompile Include="src\src\system\vulkan.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -89,51 +89,51 @@
     <ClInclude Include="include\Src\LoaderHelpers.h" />
     <ClInclude Include="include\Src\pch.h" />
     <ClInclude Include="include\Src\PlatformHelpers.h" />
-    <ClInclude Include="src\inc\shader\alphamapshaderclass.h" />
-    <ClInclude Include="src\inc\shader\CelShadingShader.h" />
-    <ClInclude Include="src\inc\shader\Colorshaderclass.h" />
-    <ClInclude Include="src\inc\shader\fontshaderclass.h" />
-    <ClInclude Include="src\inc\shader\lightmapshaderclass.h" />
-    <ClInclude Include="src\inc\shader\lightshaderclass.h" />
-    <ClInclude Include="src\inc\shader\lightshaderwaterclass.h" />
-    <ClInclude Include="src\inc\shader\Multitextureshaderclass.h" />
-    <ClInclude Include="src\inc\shader\normalmapshaderclass.h" />
-    <ClInclude Include="src\inc\shader\reflectionshaderclass.h" />
-    <ClInclude Include="src\inc\shader\refractionshaderclass.h" />
-    <ClInclude Include="src\inc\shader\shadermanagerclass.h" />
-    <ClInclude Include="src\inc\shader\SkyboxShaderClass.h" />
-    <ClInclude Include="src\inc\shader\specmapshaderclass.h" />
-    <ClInclude Include="src\inc\shader\sunlightshaderclass.h" />
-    <ClInclude Include="src\inc\shader\textureshaderclass.h" />
-    <ClInclude Include="src\inc\shader\translateshaderclass.h" />
-    <ClInclude Include="src\inc\shader\transparentshaderclass.h" />
-    <ClInclude Include="src\inc\shader\watershaderclass.h" />
-    <ClInclude Include="src\inc\system\applicationclass.h" />
-    <ClInclude Include="src\inc\system\bitmapclass.h" />
-    <ClInclude Include="src\inc\system\Cameraclass.h" />
-    <ClInclude Include="src\inc\system\d3dclass.h" />
-    <ClInclude Include="src\inc\system\displayplaneclass.h" />
-    <ClInclude Include="src\inc\system\fontclass.h" />
-    <ClInclude Include="src\inc\system\fpsclass.h" />
+    <ClInclude Include="src\inc\shader\alpha_map_shader_class.h" />
+    <ClInclude Include="src\inc\shader\celshade_class.h" />
+    <ClInclude Include="src\inc\shader\color_shader_class.h" />
+    <ClInclude Include="src\inc\shader\font_shader_class.h" />
+    <ClInclude Include="src\inc\shader\light_map_shader_class.h" />
+    <ClInclude Include="src\inc\shader\light_shader_class.h" />
+    <ClInclude Include="src\inc\shader\multi_texture_shader_class.h" />
+    <ClInclude Include="src\inc\shader\normal_map_shader_class.h" />
+    <ClInclude Include="src\inc\shader\reflection_shader_class.h" />
+    <ClInclude Include="src\inc\shader\refraction_shader_class.h" />
+    <ClInclude Include="src\inc\shader\shader_manager_class.h" />
+    <ClInclude Include="src\inc\shader\skybox_shader_class.h" />
+    <ClInclude Include="src\inc\shader\spec_map_shader_class.h" />
+    <ClInclude Include="src\inc\shader\sunlight_shader_class.h" />
+    <ClInclude Include="src\inc\shader\texture_shader_class.h" />
+    <ClInclude Include="src\inc\shader\translate_shader_class.h" />
+    <ClInclude Include="src\inc\shader\transparent_shader_class.h" />
+    <ClInclude Include="src\inc\shader\water_shader_class.h" />
+    <ClInclude Include="src\inc\system\application_class.h" />
+    <ClInclude Include="src\inc\system\bitmap_class.h" />
+    <ClInclude Include="src\inc\system\camera_class.h" />
+    <ClInclude Include="src\inc\system\d_3d_class.h" />
+    <ClInclude Include="src\inc\system\display_plane_class.h" />
+    <ClInclude Include="src\inc\system\font_class.h" />
+    <ClInclude Include="src\inc\system\fps_class.h" />
+    <ClInclude Include="src\inc\system\fps_limiter.h" />
     <ClInclude Include="src\inc\system\frustum.h" />
     <ClInclude Include="src\inc\system\frustumclass.h" />
     <ClInclude Include="src\inc\system\imguiManager.h" />
-    <ClInclude Include="src\inc\system\inputclass.h" />
-    <ClInclude Include="src\inc\system\lightclass.h" />
+    <ClInclude Include="src\inc\system\input_class.h" />
+    <ClInclude Include="src\inc\system\light_class.h" />
     <ClInclude Include="src\inc\system\Logger.h" />
-    <ClInclude Include="src\inc\system\modelclass.h" />
+    <ClInclude Include="src\inc\system\model_class.h" />
     <ClInclude Include="src\inc\system\Modellistclass.h" />
     <ClInclude Include="src\inc\system\object.h" />
     <ClInclude Include="src\inc\system\physics.h" />
-    <ClInclude Include="src\inc\system\Positionclass.h" />
-    <ClInclude Include="src\inc\system\rendertextureclass.h" />
+    <ClInclude Include="src\inc\system\position_class.h" />
+    <ClInclude Include="src\inc\system\render_texture_class.h" />
     <ClInclude Include="src\inc\system\sceneManager.h" />
     <ClInclude Include="src\inc\system\Skybox.h" />
-    <ClInclude Include="src\inc\system\Spriteclass.h" />
-    <ClInclude Include="src\inc\system\systemclass.h" />
-    <ClInclude Include="src\inc\system\textclass.h" />
-    <ClInclude Include="src\inc\system\textureclass.h" />
-    <ClInclude Include="src\inc\system\Timerclass.h" />
+    <ClInclude Include="src\inc\system\sprite_class.h" />
+    <ClInclude Include="src\inc\system\system_class.h" />
+    <ClInclude Include="src\inc\system\text_class.h" />
+    <ClInclude Include="src\inc\system\texture_class.h" />
+    <ClInclude Include="src\inc\system\timer_class.h" />
     <ClInclude Include="src\inc\system\vulkan.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/enginecustom/imgui.ini b/enginecustom/imgui.ini
index 5a9460a..1dbfb45 100644
--- a/enginecustom/imgui.ini
+++ b/enginecustom/imgui.ini
@@ -7,25 +7,25 @@ Collapsed=0
 Pos=1281,19
 Size=303,842
 Collapsed=0
-DockId=0x00000005,0
+DockId=0x0000000F,0
 
 [Window][Objects]
 Pos=0,19
-Size=281,615
+Size=281,307
 Collapsed=0
-DockId=0x00000007,0
+DockId=0x00000011,0
 
 [Window][Terrain]
-Pos=0,19
-Size=281,615
+Pos=283,19
+Size=280,615
 Collapsed=0
-DockId=0x00000008,0
+DockId=0x00000007,0
 
 [Window][Light]
 Pos=0,328
 Size=281,306
 Collapsed=0
-DockId=0x00000008,1
+DockId=0x00000012,0
 
 [Window][Shader Manager]
 Pos=8,27
@@ -34,10 +34,10 @@ Collapsed=0
 DockId=0x00000001,2
 
 [Window][Engine Settings]
-Pos=0,19
-Size=281,615
+Pos=1281,527
+Size=303,334
 Collapsed=0
-DockId=0x00000007,1
+DockId=0x00000010,0
 
 [Window][DockSpace Demo]
 Size=1584,861
@@ -47,7 +47,7 @@ Collapsed=0
 Pos=8,27
 Size=1559,974
 Collapsed=0
-DockId=0x00000007,0
+DockId=0x00000011,0
 
 [Window][DockSpace]
 Pos=0,0
@@ -66,8 +66,8 @@ Collapsed=0
 DockId=0x0000000C,0
 
 [Window][Log Window]
-Pos=641,636
-Size=638,225
+Pos=0,636
+Size=1279,225
 Collapsed=0
 DockId=0x00000006,0
 
@@ -78,20 +78,24 @@ Collapsed=0
 DockId=0x00000004,0
 
 [Docking][Data]
-DockSpace         ID=0xC0DFADC4 Pos=8,27 Size=1568,826 Split=X
-  DockNode        ID=0x00000001 Parent=0xC0DFADC4 SizeRef=330,1094 Selected=0x393905AB
-  DockNode        ID=0x00000003 Parent=0xC0DFADC4 SizeRef=1700,1094 CentralNode=1
-DockSpace         ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=0,19 Size=1584,842 Split=X
-  DockNode        ID=0x00000002 Parent=0xCCBD8CF7 SizeRef=1743,826 Split=Y
-    DockNode      ID=0x0000000A Parent=0x00000002 SizeRef=1568,599 Split=X
-      DockNode    ID=0x00000009 Parent=0x0000000A SizeRef=281,974 Split=Y Selected=0x031DC75C
-        DockNode  ID=0x00000007 Parent=0x00000009 SizeRef=289,547 Selected=0x0B098C4B
-        DockNode  ID=0x00000008 Parent=0x00000009 SizeRef=289,545 Selected=0x393905AB
-      DockNode    ID=0x0000000D Parent=0x0000000A SizeRef=1460,974 Split=Y
-        DockNode  ID=0x0000000B Parent=0x0000000D SizeRef=1568,637 CentralNode=1 Selected=0x321620B2
-        DockNode  ID=0x0000000C Parent=0x0000000D SizeRef=1568,335 Selected=0x139FDA3F
-    DockNode      ID=0x0000000E Parent=0x00000002 SizeRef=1568,225 Split=X Selected=0xD99DEA49
-      DockNode    ID=0x00000004 Parent=0x0000000E SizeRef=882,225 Selected=0xD99DEA49
-      DockNode    ID=0x00000006 Parent=0x0000000E SizeRef=881,225 Selected=0xAB74BEE9
-  DockNode        ID=0x00000005 Parent=0xCCBD8CF7 SizeRef=303,826 Selected=0x9F035453
+DockSpace           ID=0xC0DFADC4 Pos=8,27 Size=1568,826 Split=X
+  DockNode          ID=0x00000001 Parent=0xC0DFADC4 SizeRef=330,1094 Selected=0x393905AB
+  DockNode          ID=0x00000003 Parent=0xC0DFADC4 SizeRef=1700,1094 CentralNode=1
+DockSpace           ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=0,19 Size=1584,842 Split=X
+  DockNode          ID=0x00000002 Parent=0xCCBD8CF7 SizeRef=1743,826 Split=Y
+    DockNode        ID=0x0000000A Parent=0x00000002 SizeRef=1568,599 Split=X
+      DockNode      ID=0x00000009 Parent=0x0000000A SizeRef=281,974 Split=Y Selected=0x031DC75C
+        DockNode    ID=0x00000011 Parent=0x00000009 SizeRef=281,441 Selected=0x031DC75C
+        DockNode    ID=0x00000012 Parent=0x00000009 SizeRef=281,440 Selected=0x321620B2
+      DockNode      ID=0x0000000D Parent=0x0000000A SizeRef=1460,974 Split=Y
+        DockNode    ID=0x0000000B Parent=0x0000000D SizeRef=1568,637 Split=X Selected=0x321620B2
+          DockNode  ID=0x00000007 Parent=0x0000000B SizeRef=280,883 Selected=0x393905AB
+          DockNode  ID=0x00000008 Parent=0x0000000B SizeRef=1178,883 CentralNode=1
+        DockNode    ID=0x0000000C Parent=0x0000000D SizeRef=1568,335 Selected=0x139FDA3F
+    DockNode        ID=0x0000000E Parent=0x00000002 SizeRef=1568,225 Split=X Selected=0xD99DEA49
+      DockNode      ID=0x00000004 Parent=0x0000000E SizeRef=871,225 Selected=0xD99DEA49
+      DockNode      ID=0x00000006 Parent=0x0000000E SizeRef=870,225 Selected=0xAB74BEE9
+  DockNode          ID=0x00000005 Parent=0xCCBD8CF7 SizeRef=303,826 Split=Y Selected=0x9F035453
+    DockNode        ID=0x0000000F Parent=0x00000005 SizeRef=303,667 Selected=0x9F035453
+    DockNode        ID=0x00000010 Parent=0x00000005 SizeRef=303,441 Selected=0x0B098C4B
 
diff --git a/enginecustom/include/imgui.h b/enginecustom/include/imgui.h
index afc089e..b53a573 100644
--- a/enginecustom/include/imgui.h
+++ b/enginecustom/include/imgui.h
@@ -340,10 +340,10 @@ namespace ImGui
     IMGUI_API ImGuiIO&      GetIO();                                    // access the ImGuiIO structure (mouse/keyboard/gamepad inputs, time, various configuration options/flags)
     IMGUI_API ImGuiPlatformIO& GetPlatformIO();                         // access the ImGuiPlatformIO structure (mostly hooks/functions to connect to platform/renderer and OS Clipboard, IME etc.)
     IMGUI_API ImGuiStyle&   GetStyle();                                 // access the Style structure (colors, sizes). Always use PushStyleColor(), PushStyleVar() to modify style mid-frame!
-    IMGUI_API void          NewFrame();                                 // start a new Dear ImGui frame, you can submit any command from this point until Render()/EndFrame().
-    IMGUI_API void          EndFrame();                                 // ends the Dear ImGui frame. automatically called by Render(). If you don't need to render data (skipping rendering) you may call EndFrame() without Render()... but you'll have wasted CPU already! If you don't need to render, better to not create any windows and not call NewFrame() at all!
+    IMGUI_API void          NewFrame();                                 // start a new Dear ImGui frame, you can submit any command from this point until render()/EndFrame().
+    IMGUI_API void          EndFrame();                                 // ends the Dear ImGui frame. automatically called by render(). If you don't need to render data (skipping rendering) you may call EndFrame() without render()... but you'll have wasted CPU already! If you don't need to render, better to not create any windows and not call NewFrame() at all!
     IMGUI_API void          Render();                                   // ends the Dear ImGui frame, finalize the draw data. You can then get call GetDrawData().
-    IMGUI_API ImDrawData*   GetDrawData();                              // valid after Render() and until the next call to NewFrame(). this is what you have to render.
+    IMGUI_API ImDrawData*   GetDrawData();                              // valid after render() and until the next call to NewFrame(). this is what you have to render.
 
     // Demo, Debug, Information
     IMGUI_API void          ShowDemoWindow(bool* p_open = NULL);        // create Demo window. demonstrate most ImGui features. call this to learn about the library! try to make it always available in your application!
@@ -409,8 +409,8 @@ namespace ImGui
     IMGUI_API float         GetWindowDpiScale();                        // get DPI scale currently associated to the current window's viewport.
     IMGUI_API ImVec2        GetWindowPos();                             // get current window position in screen space (IT IS UNLIKELY YOU EVER NEED TO USE THIS. Consider always using GetCursorScreenPos() and GetContentRegionAvail() instead)
     IMGUI_API ImVec2        GetWindowSize();                            // get current window size (IT IS UNLIKELY YOU EVER NEED TO USE THIS. Consider always using GetCursorScreenPos() and GetContentRegionAvail() instead)
-    IMGUI_API float         GetWindowWidth();                           // get current window width (IT IS UNLIKELY YOU EVER NEED TO USE THIS). Shortcut for GetWindowSize().x.
-    IMGUI_API float         GetWindowHeight();                          // get current window height (IT IS UNLIKELY YOU EVER NEED TO USE THIS). Shortcut for GetWindowSize().y.
+    IMGUI_API float         GetWindowWidth();                           // get current window width (IT IS UNLIKELY YOU EVER NEED TO USE THIS). Shortcut for get_window_size().x.
+    IMGUI_API float         GetWindowHeight();                          // get current window height (IT IS UNLIKELY YOU EVER NEED TO USE THIS). Shortcut for get_window_size().y.
     IMGUI_API ImGuiViewport*GetWindowViewport();                        // get viewport currently associated to the current window.
 
     // Window manipulation
@@ -1048,7 +1048,7 @@ namespace ImGui
     IMGUI_API bool          IsMouseDragging(ImGuiMouseButton button, float lock_threshold = -1.0f);         // is mouse dragging? (uses io.MouseDraggingThreshold if lock_threshold < 0.0f)
     IMGUI_API ImVec2        GetMouseDragDelta(ImGuiMouseButton button = 0, float lock_threshold = -1.0f);   // return the delta from the initial clicking position while the mouse button is pressed or was just released. This is locked and return 0.0f until the mouse moves past a distance threshold at least once (uses io.MouseDraggingThreshold if lock_threshold < 0.0f)
     IMGUI_API void          ResetMouseDragDelta(ImGuiMouseButton button = 0);                   //
-    IMGUI_API ImGuiMouseCursor GetMouseCursor();                                                // get desired mouse cursor shape. Important: reset in ImGui::NewFrame(), this is updated during the frame. valid before Render(). If you use software rendering by setting io.MouseDrawCursor ImGui will render those for you
+    IMGUI_API ImGuiMouseCursor GetMouseCursor();                                                // get desired mouse cursor shape. Important: reset in ImGui::NewFrame(), this is updated during the frame. valid before render(). If you use software rendering by setting io.MouseDrawCursor ImGui will render those for you
     IMGUI_API void          SetMouseCursor(ImGuiMouseCursor cursor_type);                       // set desired mouse cursor shape
     IMGUI_API void          SetNextFrameWantCaptureMouse(bool want_capture_mouse);              // Override io.WantCaptureMouse flag next frame (said flag is left for your application to handle, typical when true it instucts your app to ignore inputs). This is equivalent to setting "io.WantCaptureMouse = want_capture_mouse;" after the next NewFrame() call.
 
@@ -1091,7 +1091,7 @@ namespace ImGui
     // Note: You may use GetWindowViewport() to get the current viewport of the current window.
     IMGUI_API void              UpdatePlatformWindows();                                        // call in main loop. will call CreateWindow/ResizeWindow/etc. platform functions for each secondary viewport, and DestroyWindow for each inactive viewport.
     IMGUI_API void              RenderPlatformWindowsDefault(void* platform_render_arg = NULL, void* renderer_render_arg = NULL); // call in main loop. will call RenderWindow/SwapBuffers platform functions for each secondary viewport which doesn't have the ImGuiViewportFlags_Minimized flag set. May be reimplemented by user for custom rendering needs.
-    IMGUI_API void              DestroyPlatformWindows();                                       // call DestroyWindow platform functions for all viewports. call from backend Shutdown() if you need to close platform windows before imgui shutdown. otherwise will be called by DestroyContext().
+    IMGUI_API void              DestroyPlatformWindows();                                       // call DestroyWindow platform functions for all viewports. call from backend shutdown() if you need to close platform windows before imgui shutdown. otherwise will be called by DestroyContext().
     IMGUI_API ImGuiViewport*    FindViewportByID(ImGuiID id);                                   // this is a helper for backends.
     IMGUI_API ImGuiViewport*    FindViewportByPlatformHandle(void* platform_handle);            // this is a helper for backends. the type platform_handle is decided by the backend (e.g. HWND, MyWindow*, GLFWwindow* etc.)
 
@@ -1247,7 +1247,7 @@ enum ImGuiTreeNodeFlags_
     ImGuiTreeNodeFlags_SpanAvailWidth       = 1 << 11,  // Extend hit box to the right-most edge, even if not framed. This is not the default in order to allow adding other items on the same line without using AllowOverlap mode.
     ImGuiTreeNodeFlags_SpanFullWidth        = 1 << 12,  // Extend hit box to the left-most and right-most edges (cover the indent area).
     ImGuiTreeNodeFlags_SpanLabelWidth       = 1 << 13,  // Narrow hit box + narrow hovering highlight, will only cover the label text.
-    ImGuiTreeNodeFlags_SpanAllColumns       = 1 << 14,  // Frame will span all columns of its container table (label will still fit in current column)
+    ImGuiTreeNodeFlags_SpanAllColumns       = 1 << 14,  // frame will span all columns of its container table (label will still fit in current column)
     ImGuiTreeNodeFlags_LabelSpanAllColumns  = 1 << 15,  // Label will span all columns of its container table
     //ImGuiTreeNodeFlags_NoScrollOnOpen     = 1 << 16,  // FIXME: TODO: Disable automatic scroll on TreePop() if node got just open and contents is not visible
     ImGuiTreeNodeFlags_NavLeftJumpsBackHere = 1 << 17,  // (WIP) Nav: left direction may move to this TreeNode() from any of its child (items submitted between TreeNode and TreePop)
@@ -1289,7 +1289,7 @@ enum ImGuiSelectableFlags_
 {
     ImGuiSelectableFlags_None               = 0,
     ImGuiSelectableFlags_NoAutoClosePopups  = 1 << 0,   // Clicking this doesn't close parent popup window (overrides ImGuiItemFlags_AutoClosePopups)
-    ImGuiSelectableFlags_SpanAllColumns     = 1 << 1,   // Frame will span all columns of its container table (text will still fit in current column)
+    ImGuiSelectableFlags_SpanAllColumns     = 1 << 1,   // frame will span all columns of its container table (text will still fit in current column)
     ImGuiSelectableFlags_AllowDoubleClick   = 1 << 2,   // Generate press events on double clicks too
     ImGuiSelectableFlags_Disabled           = 1 << 3,   // Cannot be selected, display grayed out text
     ImGuiSelectableFlags_AllowOverlap       = 1 << 4,   // (WIP) Hit testing to allow subsequent widgets to overlap this one
@@ -2251,7 +2251,7 @@ struct ImGuiStyle
     float       DockingSeparatorSize;       // Thickness of resizing border between docked windows
     float       MouseCursorScale;           // Scale software rendered mouse cursor (when io.MouseDrawCursor is enabled). We apply per-monitor DPI scaling over this scale. May be removed later.
     bool        AntiAliasedLines;           // Enable anti-aliased lines/borders. Disable if you are really tight on CPU/GPU. Latched at the beginning of the frame (copied to ImDrawList).
-    bool        AntiAliasedLinesUseTex;     // Enable anti-aliased lines/borders using textures where possible. Require backend to render with bilinear filtering (NOT point/nearest filtering). Latched at the beginning of the frame (copied to ImDrawList).
+    bool        AntiAliasedLinesUseTex;     // Enable anti-aliased lines/borders using textures_ where possible. Require backend to render with bilinear filtering (NOT point/nearest filtering). Latched at the beginning of the frame (copied to ImDrawList).
     bool        AntiAliasedFill;            // Enable anti-aliased edges around filled shapes (rounded rectangles, circles, etc.). Disable if you are really tight on CPU/GPU. Latched at the beginning of the frame (copied to ImDrawList).
     float       CurveTessellationTol;       // Tessellation tolerance when using PathBezierCurveTo() without a specific number of segments. Decrease for highly tessellated curves (higher quality, more polygons), increase to reduce quality.
     float       CircleTessellationMaxError; // Maximum error (in pixels) allowed when using AddCircle()/AddCircleFilled() or drawing rounded corner rectangles with no explicit segment count specified. Decrease for higher quality but more geometry.
@@ -2446,7 +2446,7 @@ struct ImGuiIO
 #endif
 
     //------------------------------------------------------------------
-    // Output - Updated by NewFrame() or EndFrame()/Render()
+    // Output - Updated by NewFrame() or EndFrame()/render()
     // (when reading from the io.WantCaptureMouse, io.WantCaptureKeyboard flags to dispatch your inputs, it is
     //  generally easier and more correct to use their state BEFORE calling NewFrame(). See FAQ for details!)
     //------------------------------------------------------------------
@@ -2459,8 +2459,8 @@ struct ImGuiIO
     bool        NavActive;                          // Keyboard/Gamepad navigation is currently allowed (will handle ImGuiKey_NavXXX events) = a window is focused and it doesn't use the ImGuiWindowFlags_NoNavInputs flag.
     bool        NavVisible;                         // Keyboard/Gamepad navigation highlight is visible and allowed (will handle ImGuiKey_NavXXX events).
     float       Framerate;                          // Estimate of application framerate (rolling average over 60 frames, based on io.DeltaTime), in frame per second. Solely for convenience. Slow applications may not want to use a moving average or may want to reset underlying buffers occasionally.
-    int         MetricsRenderVertices;              // Vertices output during last call to Render()
-    int         MetricsRenderIndices;               // Indices output during last call to Render() = number of triangles * 3
+    int         MetricsRenderVertices;              // Vertices output during last call to render()
+    int         MetricsRenderIndices;               // Indices output during last call to render() = number of triangles * 3
     int         MetricsRenderWindows;               // Number of visible windows
     int         MetricsActiveWindows;               // Number of active windows
     ImVec2      MouseDelta;                         // Mouse delta. Note that this is zero if either current or previous position are invalid (-FLT_MAX,-FLT_MAX), so a disappearing/reappearing mouse won't have a huge delta.
@@ -3038,7 +3038,7 @@ struct ImGuiSelectionExternalStorage
 // Hold a series of drawing commands. The user provides a renderer for ImDrawData which essentially contains an array of ImDrawList.
 //-----------------------------------------------------------------------------
 
-// The maximum line width to bake anti-aliased textures for. Build atlas with ImFontAtlasFlags_NoBakedLines to disable baking.
+// The maximum line width to bake anti-aliased textures_ for. Build atlas with ImFontAtlasFlags_NoBakedLines to disable baking.
 #ifndef IM_DRAWLIST_TEX_LINES_WIDTH_MAX
 #define IM_DRAWLIST_TEX_LINES_WIDTH_MAX     (32)
 #endif
@@ -3057,7 +3057,7 @@ typedef void (*ImDrawCallback)(const ImDrawList* parent_list, const ImDrawCmd* c
 // Special Draw callback value to request renderer backend to reset the graphics/render state.
 // The renderer backend needs to handle this special value, otherwise it will crash trying to call a function at this address.
 // This is useful, for example, if you submitted callbacks which you know have altered the render state and you want it to be restored.
-// Render state is not reset by default because they are many perfectly useful way of altering render state (e.g. changing shader/blending settings before an Image call).
+// render state is not reset by default because they are many perfectly useful way of altering render state (e.g. changing shader/blending settings before an Image call).
 #define ImDrawCallback_ResetRenderState     (ImDrawCallback)(-8)
 
 // Typically, 1 command = 1 GPU draw call (unless command is a callback)
@@ -3156,8 +3156,8 @@ enum ImDrawFlags_
 enum ImDrawListFlags_
 {
     ImDrawListFlags_None                    = 0,
-    ImDrawListFlags_AntiAliasedLines        = 1 << 0,  // Enable anti-aliased lines/borders (*2 the number of triangles for 1.0f wide line or lines thin enough to be drawn using textures, otherwise *3 the number of triangles)
-    ImDrawListFlags_AntiAliasedLinesUseTex  = 1 << 1,  // Enable anti-aliased lines/borders using textures when possible. Require backend to render with bilinear filtering (NOT point/nearest filtering).
+    ImDrawListFlags_AntiAliasedLines        = 1 << 0,  // Enable anti-aliased lines/borders (*2 the number of triangles for 1.0f wide line or lines thin enough to be drawn using textures_, otherwise *3 the number of triangles)
+    ImDrawListFlags_AntiAliasedLinesUseTex  = 1 << 1,  // Enable anti-aliased lines/borders using textures_ when possible. Require backend to render with bilinear filtering (NOT point/nearest filtering).
     ImDrawListFlags_AntiAliasedFill         = 1 << 2,  // Enable anti-aliased edge around filled shapes (rounded rectangles, circles).
     ImDrawListFlags_AllowVtxOffset          = 1 << 3,  // Can emit 'VtxOffset > 0' to allow large meshes. Set when 'ImGuiBackendFlags_RendererHasVtxOffset' is enabled.
 };
@@ -3198,7 +3198,7 @@ struct ImDrawList
     IMGUI_API ImDrawList(ImDrawListSharedData* shared_data);
     IMGUI_API ~ImDrawList();
 
-    IMGUI_API void  PushClipRect(const ImVec2& clip_rect_min, const ImVec2& clip_rect_max, bool intersect_with_current_clip_rect = false);  // Render-level scissoring. This is passed down to your render function but not used for CPU-side coarse clipping. Prefer using higher-level ImGui::PushClipRect() to affect logic (hit-testing and widget culling)
+    IMGUI_API void  PushClipRect(const ImVec2& clip_rect_min, const ImVec2& clip_rect_max, bool intersect_with_current_clip_rect = false);  // render-level scissoring. This is passed down to your render function but not used for CPU-side coarse clipping. Prefer using higher-level ImGui::PushClipRect() to affect logic (hit-testing and widget culling)
     IMGUI_API void  PushClipRectFullScreen();
     IMGUI_API void  PopClipRect();
     IMGUI_API void  PushTextureID(ImTextureID texture_id);
@@ -3211,7 +3211,7 @@ struct ImDrawList
     // - For rectangular primitives, "p_min" and "p_max" represent the upper-left and lower-right corners.
     // - For circle primitives, use "num_segments == 0" to automatically calculate tessellation (preferred).
     //   In older versions (until Dear ImGui 1.77) the AddCircle functions defaulted to num_segments == 12.
-    //   In future versions we will use textures to provide cheaper and higher-quality circles.
+    //   In future versions we will use textures_ to provide cheaper and higher-quality circles.
     //   Use AddNgon() and AddNgonFilled() functions if you need to guarantee a specific number of sides.
     IMGUI_API void  AddLine(const ImVec2& p1, const ImVec2& p2, ImU32 col, float thickness = 1.0f);
     IMGUI_API void  AddRect(const ImVec2& p_min, const ImVec2& p_max, ImU32 col, float rounding = 0.0f, ImDrawFlags flags = 0, float thickness = 1.0f);   // a: upper-left, b: lower-right (== upper-left + size)
@@ -3326,7 +3326,7 @@ struct ImDrawList
 // as this is one of the oldest structure exposed by the library! Basically, ImDrawList == CmdList)
 struct ImDrawData
 {
-    bool                Valid;              // Only valid after Render() is called and before the next NewFrame() is called.
+    bool                Valid;              // Only valid after render() is called and before the next NewFrame() is called.
     int                 CmdListsCount;      // Number of ImDrawList* to render
     int                 TotalIdxCount;      // For convenience, sum of all ImDrawList's IdxBuffer.Size
     int                 TotalVtxCount;      // For convenience, sum of all ImDrawList's VtxBuffer.Size
@@ -3426,7 +3426,7 @@ enum ImFontAtlasFlags_
     ImFontAtlasFlags_None               = 0,
     ImFontAtlasFlags_NoPowerOfTwoHeight = 1 << 0,   // Don't round the height to next power of two
     ImFontAtlasFlags_NoMouseCursors     = 1 << 1,   // Don't build software mouse cursors into the atlas (save a little texture memory)
-    ImFontAtlasFlags_NoBakedLines       = 1 << 2,   // Don't build thick line textures into the atlas (save a little texture memory, allow support for point/nearest filtering). The AntiAliasedLinesUseTex features uses them, otherwise they will be rendered using polygons (more expensive for CPU/GPU).
+    ImFontAtlasFlags_NoBakedLines       = 1 << 2,   // Don't build thick line textures_ into the atlas (save a little texture memory, allow support for point/nearest filtering). The AntiAliasedLinesUseTex features uses them, otherwise they will be rendered using polygons (more expensive for CPU/GPU).
 };
 
 // Load and rasterize multiple TTF/OTF fonts into a same texture. The font atlas will build a single texture holding:
@@ -3647,7 +3647,7 @@ struct ImGuiViewport
     ImVec2              WorkSize;               // Work Area: Size of the viewport minus task bars, menu bars, status bars (<= Size)
     float               DpiScale;               // 1.0f = 96 DPI = No extra scale.
     ImGuiID             ParentViewportId;       // (Advanced) 0: no parent. Instruct the platform backend to setup a parent/child relationship between platform windows.
-    ImDrawData*         DrawData;               // The ImDrawData corresponding to this viewport. Valid after Render() and until the next call to NewFrame().
+    ImDrawData*         DrawData;               // The ImDrawData corresponding to this viewport. Valid after render() and until the next call to NewFrame().
 
     // Platform/Backend Dependent Data
     // Our design separate the Renderer and Platform backends to facilitate combining default backends with each others.
@@ -3693,7 +3693,7 @@ struct ImGuiViewport
 // Steps to use multi-viewports in your application, when using a default backend from the examples/ folder:
 // - Application:  Enable feature with 'io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable'.
 // - Backend:      The backend initialization will setup all necessary ImGuiPlatformIO's functions and update monitors info every frame.
-// - Application:  In your main loop, call ImGui::UpdatePlatformWindows(), ImGui::RenderPlatformWindowsDefault() after EndFrame() or Render().
+// - Application:  In your main loop, call ImGui::UpdatePlatformWindows(), ImGui::RenderPlatformWindowsDefault() after EndFrame() or render().
 // - Application:  Fix absolute coordinates used in ImGui::SetWindowPos() or ImGui::SetNextWindowPos() calls.
 //
 // Steps to use multi-viewports in your application, when using a custom backend:
@@ -3705,7 +3705,7 @@ struct ImGuiViewport
 //                 Set 'io.BackendFlags |= ImGuiBackendFlags_PlatformHasViewports' and 'io.BackendFlags |= ImGuiBackendFlags_PlatformHasViewports'.
 //                 Update ImGuiPlatformIO's Monitors list every frame.
 //                 Update MousePos every frame, in absolute coordinates.
-// - Application:  In your main loop, call ImGui::UpdatePlatformWindows(), ImGui::RenderPlatformWindowsDefault() after EndFrame() or Render().
+// - Application:  In your main loop, call ImGui::UpdatePlatformWindows(), ImGui::RenderPlatformWindowsDefault() after EndFrame() or render().
 //                 You may skip calling RenderPlatformWindowsDefault() if its API is not convenient for your needs. Read comments below.
 // - Application:  Fix absolute coordinates used in ImGui::SetWindowPos() or ImGui::SetNextWindowPos() calls.
 //
@@ -3811,7 +3811,7 @@ struct ImGuiPlatformIO
     // Output - List of viewports to render into platform windows
     //------------------------------------------------------------------
 
-    // Viewports list (the list is updated by calling ImGui::EndFrame or ImGui::Render)
+    // Viewports list (the list is updated by calling ImGui::EndFrame or ImGui::render)
     // (in the future we will attempt to organize this feature to remove the need for a "main viewport")
     ImVector<ImGuiViewport*>        Viewports;                              // Main viewports, followed by all secondary viewports.
 };
diff --git a/enginecustom/src/inc/shader/CelShadingShader.h b/enginecustom/src/inc/shader/CelShadingShader.h
deleted file mode 100644
index 7522ea1..0000000
--- a/enginecustom/src/inc/shader/CelShadingShader.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#pragma once
-
-#include "Logger.h"
-#include <d3d11.h>
-#include <d3dcompiler.h>
-#include <directxmath.h>
-#include <fstream>
-using namespace DirectX;
-using namespace std;
-
-class CelshadeClass
-{
-
-    private :
-        struct MatrixBufferType
-    {
-        XMMATRIX world;
-        XMMATRIX view;
-        XMMATRIX projection;
-    };
-
-    struct CameraBufferType
-    {
-        XMFLOAT3 cameraPosition;
-        float padding;
-    };
-
-    struct SunLightBufferType
-    {
-        XMFLOAT4 diffuseColor;
-        XMFLOAT4 ambientColor;
-        XMFLOAT3 sunDirection;
-        float intensity;
-    };
-    
-
-public :
-    CelshadeClass();
-    CelshadeClass(const CelshadeClass&);
-    ~CelshadeClass();
-
-    bool Initialize(ID3D11Device*, HWND);
-    void Shutdown();
-    bool Render(ID3D11DeviceContext* deviceContex, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix, ID3D11ShaderResourceView* texture, XMFLOAT4 diffuseColor, XMFLOAT4 ambientColor, XMFLOAT3 sunDirection,float intensity);
-
-private:
-    bool InitializeShader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
-    void ShutdownShader();
-    void OutputShaderErrorMessage(ID3D10Blob*, HWND, WCHAR*);
-
-    bool SetShaderParameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix, ID3D11ShaderResourceView* texture, XMFLOAT4 ambientColor, XMFLOAT4 diffuseColor, XMFLOAT3 lightDirection, float sunIntensity);
-    void RenderShader(ID3D11DeviceContext*, int);
-
-private:
-    ID3D11VertexShader* m_vertexShader;
-    ID3D11PixelShader* m_pixelShader;
-    ID3D11InputLayout* m_layout;
-    ID3D11SamplerState* m_sampleState;
-    ID3D11Buffer* m_matrixBuffer;
-    ID3D11Buffer* m_cameraBuffer;
-    ID3D11Buffer* m_sunlightBuffer;
-    ID3D11Buffer* m_sunlightColorBuffer;
-    ID3D11Buffer* m_sunlightPositionBuffer;
-};
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/Multitextureshaderclass.h b/enginecustom/src/inc/shader/Multitextureshaderclass.h
deleted file mode 100644
index 2ea3eca..0000000
--- a/enginecustom/src/inc/shader/Multitextureshaderclass.h
+++ /dev/null
@@ -1,59 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// Filename: multitextureshaderclass.h
-////////////////////////////////////////////////////////////////////////////////
-#ifndef _MULTITEXTURESHADERCLASS_H_
-#define _MULTITEXTURESHADERCLASS_H_
-
-
-//////////////
-// INCLUDES //
-//////////////
-#include "Logger.h"
-#include <d3d11.h>
-#include <d3dcompiler.h>
-#include <directxmath.h>
-#include <fstream>
-using namespace DirectX;
-using namespace std;
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Class name: MultiTextureShaderClass
-////////////////////////////////////////////////////////////////////////////////
-class MultiTextureShaderClass
-{
-private:
-    struct MatrixBufferType
-    {
-        XMMATRIX world;
-        XMMATRIX view;
-        XMMATRIX projection;
-    };
-
-public:
-    MultiTextureShaderClass();
-    MultiTextureShaderClass(const MultiTextureShaderClass&);
-    ~MultiTextureShaderClass();
-
-    bool Initialize(ID3D11Device*, HWND);
-    void Shutdown();
-    bool Render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*);
-
-private:
-    bool InitializeShader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
-    void ShutdownShader();
-    void OutputShaderErrorMessage(ID3D10Blob*, HWND, WCHAR*);
-
-    bool SetShaderParameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*);
-    void RenderShader(ID3D11DeviceContext*, int);
-
-private:
-    ID3D11VertexShader* m_vertexShader;
-    ID3D11PixelShader* m_pixelShader;
-    ID3D11InputLayout* m_layout;
-    ID3D11Buffer* m_matrixBuffer;
-    ID3D11SamplerState* m_sampleState;
-
-};
-
-#endif
diff --git a/enginecustom/src/inc/shader/alpha_map_shader_class.h b/enginecustom/src/inc/shader/alpha_map_shader_class.h
new file mode 100644
index 0000000..521217b
--- /dev/null
+++ b/enginecustom/src/inc/shader/alpha_map_shader_class.h
@@ -0,0 +1,55 @@
+#ifndef _ALPHAMAPSHADERCLASS_H_
+#define _ALPHAMAPSHADERCLASS_H_
+
+
+//////////////
+// INCLUDES //
+//////////////
+#include "Logger.h"
+#include <d3d11.h>
+#include <d3dcompiler.h>
+#include <directxmath.h>
+#include <fstream>
+using namespace DirectX;
+using namespace std;
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Class name: alpha_map_shader_class
+////////////////////////////////////////////////////////////////////////////////
+class alpha_map_shader_class
+{
+private:
+    struct matrix_buffer_type
+    {
+        XMMATRIX world;
+        XMMATRIX view;
+        XMMATRIX projection;
+    };
+
+public:
+    alpha_map_shader_class();
+    alpha_map_shader_class(const alpha_map_shader_class&);
+    ~alpha_map_shader_class();
+
+    bool initialize(ID3D11Device*, HWND);
+    void shutdown();
+    bool render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*);
+
+private:
+    bool initialize_shader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
+    void shutdown_shader();
+    void output_shader_error_message(ID3D10Blob*, HWND, WCHAR*);
+
+    bool set_shader_parameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*);
+    void render_shader(ID3D11DeviceContext*, int);
+
+private:
+    ID3D11VertexShader* vertex_shader_;
+    ID3D11PixelShader* pixel_shader_;
+    ID3D11InputLayout* layout_;
+    ID3D11Buffer* matrix_buffer_;
+    ID3D11SamplerState* sample_state_;
+};
+
+#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/alphamapshaderclass.h b/enginecustom/src/inc/shader/alphamapshaderclass.h
deleted file mode 100644
index 38760a1..0000000
--- a/enginecustom/src/inc/shader/alphamapshaderclass.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef _ALPHAMAPSHADERCLASS_H_
-#define _ALPHAMAPSHADERCLASS_H_
-
-
-//////////////
-// INCLUDES //
-//////////////
-#include "Logger.h"
-#include <d3d11.h>
-#include <d3dcompiler.h>
-#include <directxmath.h>
-#include <fstream>
-using namespace DirectX;
-using namespace std;
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Class name: AlphaMapShaderClass
-////////////////////////////////////////////////////////////////////////////////
-class AlphaMapShaderClass
-{
-private:
-    struct MatrixBufferType
-    {
-        XMMATRIX world;
-        XMMATRIX view;
-        XMMATRIX projection;
-    };
-
-public:
-    AlphaMapShaderClass();
-    AlphaMapShaderClass(const AlphaMapShaderClass&);
-    ~AlphaMapShaderClass();
-
-    bool Initialize(ID3D11Device*, HWND);
-    void Shutdown();
-    bool Render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*);
-
-private:
-    bool InitializeShader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
-    void ShutdownShader();
-    void OutputShaderErrorMessage(ID3D10Blob*, HWND, WCHAR*);
-
-    bool SetShaderParameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*);
-    void RenderShader(ID3D11DeviceContext*, int);
-
-private:
-    ID3D11VertexShader* m_vertexShader;
-    ID3D11PixelShader* m_pixelShader;
-    ID3D11InputLayout* m_layout;
-    ID3D11Buffer* m_matrixBuffer;
-    ID3D11SamplerState* m_sampleState;
-};
-
-#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/celshade_class.h b/enginecustom/src/inc/shader/celshade_class.h
new file mode 100644
index 0000000..9e280d7
--- /dev/null
+++ b/enginecustom/src/inc/shader/celshade_class.h
@@ -0,0 +1,85 @@
+#pragma once
+
+#include "Logger.h"
+#include <d3d11.h>
+#include <d3dcompiler.h>
+#include <directxmath.h>
+#include <fstream>
+using namespace DirectX;
+using namespace std;
+
+class celshade_class
+{
+
+    private :
+        struct matrix_buffer_type
+    {
+        XMMATRIX world;
+        XMMATRIX view;
+        XMMATRIX projection;
+    };
+
+    struct camera_buffer_type
+    {
+        XMFLOAT3 cameraPosition;
+        float padding;
+    };
+
+    struct sun_light_buffer_type
+    {
+        XMFLOAT4 diffuse_color;
+        XMFLOAT4 ambient_color;
+        XMFLOAT3 sun_direction;
+        float intensity;
+    };
+    
+
+public :
+    celshade_class();
+    celshade_class(const celshade_class&);
+    ~celshade_class();
+
+    bool initialize(ID3D11Device*, HWND);
+    void shutdown();
+    bool render(
+        ID3D11DeviceContext* device_context,
+        int index_count,
+        XMMATRIX world_matrix,
+        XMMATRIX view_matrix, XMMATRIX
+        projection_matrix,
+        ID3D11ShaderResourceView* texture,
+        XMFLOAT4 diffuse_color,
+        XMFLOAT4 ambient_color,
+        XMFLOAT3 sun_direction,
+        float intensity
+        );
+
+private:
+    bool initialize_shader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
+    void shutdown_shader();
+    void output_shader_error_message(ID3D10Blob*, HWND, WCHAR*);
+
+    bool set_shader_parameters(
+        ID3D11DeviceContext* device_context,
+        XMMATRIX world_matrix,
+        XMMATRIX view_matrix,
+        XMMATRIX projection_matrix,
+        ID3D11ShaderResourceView* texture,
+        XMFLOAT4 ambient_color,
+        XMFLOAT4 diffuse_color,
+        XMFLOAT3 light_direction,
+        float sun_intensity
+        );
+    void render_shader(ID3D11DeviceContext*, int);
+
+private:
+    ID3D11VertexShader* vertex_shader_;
+    ID3D11PixelShader* pixel_shader_;
+    ID3D11InputLayout* layout_;
+    ID3D11SamplerState* sample_state_;
+    ID3D11Buffer* matrix_buffer_;
+    ID3D11Buffer* camera_buffer_;
+    ID3D11Buffer* sunlight_buffer_;
+    ID3D11Buffer* sunlight_color_buffer_;
+    ID3D11Buffer* sunlight_position_buffer_;
+};
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/Colorshaderclass.h b/enginecustom/src/inc/shader/color_shader_class.h
similarity index 50%
rename from enginecustom/src/inc/shader/Colorshaderclass.h
rename to enginecustom/src/inc/shader/color_shader_class.h
index b443b12..cb661c1 100644
--- a/enginecustom/src/inc/shader/Colorshaderclass.h
+++ b/enginecustom/src/inc/shader/color_shader_class.h
@@ -18,12 +18,12 @@ using namespace std;
 
 
 ////////////////////////////////////////////////////////////////////////////////
-// Class name: ColorShaderClass
+// Class name: color_shader_class
 ////////////////////////////////////////////////////////////////////////////////
-class ColorShaderClass
+class color_shader_class
 {
 private:
-	struct MatrixBufferType
+	struct matrix_buffer_type
 	{
 		XMMATRIX world;
 		XMMATRIX view;
@@ -31,27 +31,27 @@ private:
 	};
 
 public:
-	ColorShaderClass();
-	ColorShaderClass(const ColorShaderClass&);
-	~ColorShaderClass();
+	color_shader_class();
+	color_shader_class(const color_shader_class&);
+	~color_shader_class();
 
-	bool Initialize(ID3D11Device*, HWND);
-	void Shutdown();
-	bool Render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX);
+	bool initialize(ID3D11Device*, HWND);
+	void shutdown();
+	bool render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX);
 
 private:
-	bool InitializeShader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
-	void ShutdownShader();
-	void OutputShaderErrorMessage(ID3D10Blob*, HWND, WCHAR*);
+	bool initialize_shader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
+	void shutdown_shader();
+	void output_shader_error_message(ID3D10Blob*, HWND, WCHAR*);
 
-	bool SetShaderParameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX);
-	void RenderShader(ID3D11DeviceContext*, int);
+	bool set_shader_parameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX);
+	void render_shader(ID3D11DeviceContext*, int);
 
 private:
-	ID3D11VertexShader* m_vertexShader;
-	ID3D11PixelShader* m_pixelShader;
-	ID3D11InputLayout* m_layout;
-	ID3D11Buffer* m_matrixBuffer;
+	ID3D11VertexShader* vertex_shader_;
+	ID3D11PixelShader* pixel_shader_;
+	ID3D11InputLayout* layout_;
+	ID3D11Buffer* matrix_buffer_;
 };
 
 #endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/font_shader_class.h b/enginecustom/src/inc/shader/font_shader_class.h
new file mode 100644
index 0000000..7bec2bd
--- /dev/null
+++ b/enginecustom/src/inc/shader/font_shader_class.h
@@ -0,0 +1,62 @@
+#ifndef _FONTSHADERCLASS_H_
+#define _FONTSHADERCLASS_H_
+
+
+//////////////
+// INCLUDES //
+//////////////
+#include "Logger.h"
+#include <d3d11.h>
+#include <d3dcompiler.h>
+#include <directxmath.h>
+#include <fstream>
+using namespace DirectX;
+using namespace std;
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Class name: font_shader_class
+////////////////////////////////////////////////////////////////////////////////
+class font_shader_class
+{
+private:
+    struct matrix_buffer_type
+    {
+        XMMATRIX world;
+        XMMATRIX view;
+        XMMATRIX projection;
+    };
+
+    struct pixel_buffer_type
+    {
+        XMFLOAT4 pixelColor;
+    };
+
+public:
+    font_shader_class();
+    font_shader_class(const font_shader_class&);
+    ~font_shader_class();
+
+    bool initialize(ID3D11Device*, HWND);
+    void shutdown();
+    bool render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4);
+
+private:
+    bool initialize_shader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
+    void shutdown_shader();
+    void output_shader_error_message(ID3D10Blob*, HWND, WCHAR*);
+
+    bool set_shader_parameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4);
+    void render_shader(ID3D11DeviceContext*, int);
+
+private:
+    ID3D11VertexShader* vertex_shader_;
+    ID3D11PixelShader* pixel_shader_;
+    ID3D11InputLayout* layout_;
+    ID3D11Buffer* matrix_buffer_;
+    ID3D11SamplerState* sample_state_;
+    ID3D11Buffer* pixel_buffer_;
+
+};
+
+#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/fontshaderclass.h b/enginecustom/src/inc/shader/fontshaderclass.h
deleted file mode 100644
index 6fb454b..0000000
--- a/enginecustom/src/inc/shader/fontshaderclass.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef _FONTSHADERCLASS_H_
-#define _FONTSHADERCLASS_H_
-
-
-//////////////
-// INCLUDES //
-//////////////
-#include "Logger.h"
-#include <d3d11.h>
-#include <d3dcompiler.h>
-#include <directxmath.h>
-#include <fstream>
-using namespace DirectX;
-using namespace std;
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Class name: FontShaderClass
-////////////////////////////////////////////////////////////////////////////////
-class FontShaderClass
-{
-private:
-    struct MatrixBufferType
-    {
-        XMMATRIX world;
-        XMMATRIX view;
-        XMMATRIX projection;
-    };
-
-    struct PixelBufferType
-    {
-        XMFLOAT4 pixelColor;
-    };
-
-public:
-    FontShaderClass();
-    FontShaderClass(const FontShaderClass&);
-    ~FontShaderClass();
-
-    bool Initialize(ID3D11Device*, HWND);
-    void Shutdown();
-    bool Render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4);
-
-private:
-    bool InitializeShader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
-    void ShutdownShader();
-    void OutputShaderErrorMessage(ID3D10Blob*, HWND, WCHAR*);
-
-    bool SetShaderParameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4);
-    void RenderShader(ID3D11DeviceContext*, int);
-
-private:
-    ID3D11VertexShader* m_vertexShader;
-    ID3D11PixelShader* m_pixelShader;
-    ID3D11InputLayout* m_layout;
-    ID3D11Buffer* m_matrixBuffer;
-    ID3D11SamplerState* m_sampleState;
-    ID3D11Buffer* m_pixelBuffer;
-
-};
-
-#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/light_map_shader_class.h b/enginecustom/src/inc/shader/light_map_shader_class.h
new file mode 100644
index 0000000..fc006b7
--- /dev/null
+++ b/enginecustom/src/inc/shader/light_map_shader_class.h
@@ -0,0 +1,57 @@
+////////////////////////////////////////////////////////////////////////////////
+#ifndef _LIGHTMAPSHADERCLASS_H_
+#define _LIGHTMAPSHADERCLASS_H_
+
+
+//////////////
+// INCLUDES //
+//////////////
+#include "Logger.h"
+#include <d3d11.h>
+#include <d3dcompiler.h>
+#include <directxmath.h>
+#include <fstream>
+using namespace DirectX;
+using namespace std;
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Class name: light_map_shader_class
+////////////////////////////////////////////////////////////////////////////////
+class light_map_shader_class
+{
+private:
+    struct matrix_buffer_type
+    {
+        XMMATRIX world;
+        XMMATRIX view;
+        XMMATRIX projection;
+    };
+
+public:
+    light_map_shader_class();
+    light_map_shader_class(const light_map_shader_class&);
+    ~light_map_shader_class();
+
+    bool initialize(ID3D11Device*, HWND);
+    void shutdown();
+    bool render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*);
+
+private:
+    bool initialize_shader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
+    void shutdown_shader();
+    void output_shader_error_message(ID3D10Blob*, HWND, WCHAR*);
+
+    bool set_shader_parameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*);
+    void render_shader(ID3D11DeviceContext*, int);
+
+private:
+    ID3D11VertexShader* vertex_shader_;
+    ID3D11PixelShader* pixel_shader_;
+    ID3D11InputLayout* layout_;
+    ID3D11Buffer* matrix_buffer_;
+    ID3D11SamplerState* sample_state_;
+
+};
+
+#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/light_shader_class.h b/enginecustom/src/inc/shader/light_shader_class.h
new file mode 100644
index 0000000..dc9ea7e
--- /dev/null
+++ b/enginecustom/src/inc/shader/light_shader_class.h
@@ -0,0 +1,92 @@
+////////////////////////////////////////////////////////////////////////////////
+// Filename: lightshaderclass.h
+////////////////////////////////////////////////////////////////////////////////
+#ifndef _LIGHTSHADERCLASS_H_
+#define _LIGHTSHADERCLASS_H_
+#pragma once
+
+/////////////
+// GLOBALS //
+/////////////
+constexpr int num_lights = 4;
+//////////////
+// INCLUDES //
+//////////////
+#include "Logger.h"
+#include <d3d11.h>
+#include <d3dcompiler.h>
+#include <directxmath.h>
+#include <fstream>
+using namespace DirectX;
+using namespace std;
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Class name: light_shader_class
+////////////////////////////////////////////////////////////////////////////////
+class light_shader_class
+{
+private:
+    struct matrix_buffer_type
+    {
+        XMMATRIX world;
+        XMMATRIX view;
+        XMMATRIX projection;
+    };
+
+    struct camera_buffer_type
+    {
+        XMFLOAT3 cameraPosition;
+        float padding;
+    };
+
+	struct light_buffer_type
+	{
+		XMFLOAT4 ambientColor;
+		XMFLOAT4 diffuseColor;
+		XMFLOAT3 lightDirection;
+		float padding;  // Added extra padding so structure is a multiple of 16 for CreateBuffer function requirements.
+        float specularPower;
+        XMFLOAT4 specularColor;
+	};
+
+    struct light_color_buffer_type
+    {
+        XMFLOAT4 diffuseColor[num_lights];
+    };
+
+    struct light_position_buffer_type
+    {
+        XMFLOAT4 lightPosition[num_lights];
+    };
+
+public:
+    light_shader_class();
+    light_shader_class(const light_shader_class&);
+    ~light_shader_class();
+
+	bool initialize(ID3D11Device*, HWND);
+	void shutdown();
+    bool render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4[], XMFLOAT4[], XMFLOAT4[]);
+
+private:
+    bool initialize_shader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
+    void shutdown_shader();
+    void output_shader_error_message(ID3D10Blob*, HWND, WCHAR*);
+
+    bool set_shader_parameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4[], XMFLOAT4[], XMFLOAT4[]);
+	void render_shader(ID3D11DeviceContext*, int);
+
+private:
+    ID3D11VertexShader* vertex_shader_;
+    ID3D11PixelShader* pixel_shader_;
+    ID3D11InputLayout* layout_;
+    ID3D11SamplerState* sample_state_;
+    ID3D11Buffer* matrix_buffer_;
+    ID3D11Buffer* camera_buffer_;
+    ID3D11Buffer* light_buffer_;
+    ID3D11Buffer* light_color_buffer_;
+    ID3D11Buffer* light_position_buffer_;
+};
+
+#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/lightmapshaderclass.h b/enginecustom/src/inc/shader/lightmapshaderclass.h
deleted file mode 100644
index 3766f03..0000000
--- a/enginecustom/src/inc/shader/lightmapshaderclass.h
+++ /dev/null
@@ -1,57 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-#ifndef _LIGHTMAPSHADERCLASS_H_
-#define _LIGHTMAPSHADERCLASS_H_
-
-
-//////////////
-// INCLUDES //
-//////////////
-#include "Logger.h"
-#include <d3d11.h>
-#include <d3dcompiler.h>
-#include <directxmath.h>
-#include <fstream>
-using namespace DirectX;
-using namespace std;
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Class name: LightMapShaderClass
-////////////////////////////////////////////////////////////////////////////////
-class LightMapShaderClass
-{
-private:
-    struct MatrixBufferType
-    {
-        XMMATRIX world;
-        XMMATRIX view;
-        XMMATRIX projection;
-    };
-
-public:
-    LightMapShaderClass();
-    LightMapShaderClass(const LightMapShaderClass&);
-    ~LightMapShaderClass();
-
-    bool Initialize(ID3D11Device*, HWND);
-    void Shutdown();
-    bool Render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*);
-
-private:
-    bool InitializeShader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
-    void ShutdownShader();
-    void OutputShaderErrorMessage(ID3D10Blob*, HWND, WCHAR*);
-
-    bool SetShaderParameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*);
-    void RenderShader(ID3D11DeviceContext*, int);
-
-private:
-    ID3D11VertexShader* m_vertexShader;
-    ID3D11PixelShader* m_pixelShader;
-    ID3D11InputLayout* m_layout;
-    ID3D11Buffer* m_matrixBuffer;
-    ID3D11SamplerState* m_sampleState;
-
-};
-
-#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/lightshaderclass.h b/enginecustom/src/inc/shader/lightshaderclass.h
deleted file mode 100644
index bd072db..0000000
--- a/enginecustom/src/inc/shader/lightshaderclass.h
+++ /dev/null
@@ -1,92 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// Filename: lightshaderclass.h
-////////////////////////////////////////////////////////////////////////////////
-#ifndef _LIGHTSHADERCLASS_H_
-#define _LIGHTSHADERCLASS_H_
-#pragma once
-
-/////////////
-// GLOBALS //
-/////////////
-const int NUM_LIGHTS = 4;
-//////////////
-// INCLUDES //
-//////////////
-#include "Logger.h"
-#include <d3d11.h>
-#include <d3dcompiler.h>
-#include <directxmath.h>
-#include <fstream>
-using namespace DirectX;
-using namespace std;
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Class name: LightShaderClass
-////////////////////////////////////////////////////////////////////////////////
-class LightShaderClass
-{
-private:
-    struct MatrixBufferType
-    {
-        XMMATRIX world;
-        XMMATRIX view;
-        XMMATRIX projection;
-    };
-
-    struct CameraBufferType
-    {
-        XMFLOAT3 cameraPosition;
-        float padding;
-    };
-
-	struct LightBufferType
-	{
-		XMFLOAT4 ambientColor;
-		XMFLOAT4 diffuseColor;
-		XMFLOAT3 lightDirection;
-		float padding;  // Added extra padding so structure is a multiple of 16 for CreateBuffer function requirements.
-        float specularPower;
-        XMFLOAT4 specularColor;
-	};
-
-    struct LightColorBufferType
-    {
-        XMFLOAT4 diffuseColor[NUM_LIGHTS];
-    };
-
-    struct LightPositionBufferType
-    {
-        XMFLOAT4 lightPosition[NUM_LIGHTS];
-    };
-
-public:
-    LightShaderClass();
-    LightShaderClass(const LightShaderClass&);
-    ~LightShaderClass();
-
-	bool Initialize(ID3D11Device*, HWND);
-	void Shutdown();
-    bool Render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4[], XMFLOAT4[], XMFLOAT4[]);
-
-private:
-    bool InitializeShader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
-    void ShutdownShader();
-    void OutputShaderErrorMessage(ID3D10Blob*, HWND, WCHAR*);
-
-    bool SetShaderParameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4[], XMFLOAT4[], XMFLOAT4[]);
-	void RenderShader(ID3D11DeviceContext*, int);
-
-private:
-    ID3D11VertexShader* m_vertexShader;
-    ID3D11PixelShader* m_pixelShader;
-    ID3D11InputLayout* m_layout;
-    ID3D11SamplerState* m_sampleState;
-    ID3D11Buffer* m_matrixBuffer;
-    ID3D11Buffer* m_cameraBuffer;
-    ID3D11Buffer* m_lightBuffer;
-    ID3D11Buffer* m_lightColorBuffer;
-    ID3D11Buffer* m_lightPositionBuffer;
-};
-
-#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/lightshaderwaterclass.h b/enginecustom/src/inc/shader/lightshaderwaterclass.h
deleted file mode 100644
index 6f70f09..0000000
--- a/enginecustom/src/inc/shader/lightshaderwaterclass.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/enginecustom/src/inc/shader/multi_texture_shader_class.h b/enginecustom/src/inc/shader/multi_texture_shader_class.h
new file mode 100644
index 0000000..a879ad8
--- /dev/null
+++ b/enginecustom/src/inc/shader/multi_texture_shader_class.h
@@ -0,0 +1,59 @@
+////////////////////////////////////////////////////////////////////////////////
+// Filename: multitextureshaderclass.h
+////////////////////////////////////////////////////////////////////////////////
+#ifndef _MULTITEXTURESHADERCLASS_H_
+#define _MULTITEXTURESHADERCLASS_H_
+
+
+//////////////
+// INCLUDES //
+//////////////
+#include "Logger.h"
+#include <d3d11.h>
+#include <d3dcompiler.h>
+#include <directxmath.h>
+#include <fstream>
+using namespace DirectX;
+using namespace std;
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Class name: multi_texture_shader_class
+////////////////////////////////////////////////////////////////////////////////
+class multi_texture_shader_class
+{
+private:
+    struct matrix_buffer_type
+    {
+        XMMATRIX world;
+        XMMATRIX view;
+        XMMATRIX projection;
+    };
+
+public:
+    multi_texture_shader_class();
+    multi_texture_shader_class(const multi_texture_shader_class&);
+    ~multi_texture_shader_class();
+
+    bool initialize(ID3D11Device*, HWND);
+    void shutdown();
+    bool render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*);
+
+private:
+    bool initialize_shader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
+    void shutdown_shader();
+    void output_shader_error_message(ID3D10Blob*, HWND, WCHAR*);
+
+    bool set_shader_parameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*);
+    void render_shader(ID3D11DeviceContext*, int);
+
+private:
+    ID3D11VertexShader* vertex_shader_;
+    ID3D11PixelShader* pixel_shader_;
+    ID3D11InputLayout* layout_;
+    ID3D11Buffer* matrix_buffer_;
+    ID3D11SamplerState* sample_state_;
+
+};
+
+#endif
diff --git a/enginecustom/src/inc/shader/normal_map_shader_class.h b/enginecustom/src/inc/shader/normal_map_shader_class.h
new file mode 100644
index 0000000..e994006
--- /dev/null
+++ b/enginecustom/src/inc/shader/normal_map_shader_class.h
@@ -0,0 +1,64 @@
+#ifndef _NORMALMAPSHADERCLASS_H_
+#define _NORMALMAPSHADERCLASS_H_
+
+
+//////////////
+// INCLUDES //
+//////////////
+#include "Logger.h"
+#include <d3d11.h>
+#include <d3dcompiler.h>
+#include <directxmath.h>
+#include <fstream>
+using namespace DirectX;
+using namespace std;
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Class name: normal_map_shader_class
+////////////////////////////////////////////////////////////////////////////////
+class normal_map_shader_class
+{
+private:
+    struct matrix_buffer_type
+    {
+        XMMATRIX world;
+        XMMATRIX view;
+        XMMATRIX projection;
+    };
+
+    struct light_buffer_type
+    {
+        XMFLOAT4 diffuse_color;
+        XMFLOAT3 light_direction;
+        float padding;
+    };
+
+public:
+    normal_map_shader_class();
+    normal_map_shader_class(const normal_map_shader_class&);
+    ~normal_map_shader_class();
+
+    bool initialize(ID3D11Device*, HWND);
+    void shutdown();
+    bool render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, XMFLOAT3, XMFLOAT4);
+
+private:
+    bool initialize_shader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
+    void shutdown_shader();
+    void output_shader_error_message(ID3D10Blob*, HWND, WCHAR*);
+
+    bool set_shader_parameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, XMFLOAT3, XMFLOAT4);
+    void render_shader(ID3D11DeviceContext*, int);
+
+private:
+    ID3D11VertexShader* vertex_shader_;
+    ID3D11PixelShader* pixel_shader_;
+    ID3D11InputLayout* layout_;
+    ID3D11Buffer* matrix_buffer_;
+    ID3D11SamplerState* sample_state_;
+    ID3D11Buffer* light_buffer_;
+
+};
+
+#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/normalmapshaderclass.h b/enginecustom/src/inc/shader/normalmapshaderclass.h
deleted file mode 100644
index 95940cc..0000000
--- a/enginecustom/src/inc/shader/normalmapshaderclass.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef _NORMALMAPSHADERCLASS_H_
-#define _NORMALMAPSHADERCLASS_H_
-
-
-//////////////
-// INCLUDES //
-//////////////
-#include "Logger.h"
-#include <d3d11.h>
-#include <d3dcompiler.h>
-#include <directxmath.h>
-#include <fstream>
-using namespace DirectX;
-using namespace std;
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Class name: NormalMapShaderClass
-////////////////////////////////////////////////////////////////////////////////
-class NormalMapShaderClass
-{
-private:
-    struct MatrixBufferType
-    {
-        XMMATRIX world;
-        XMMATRIX view;
-        XMMATRIX projection;
-    };
-
-    struct LightBufferType
-    {
-        XMFLOAT4 diffuseColor;
-        XMFLOAT3 lightDirection;
-        float padding;
-    };
-
-public:
-    NormalMapShaderClass();
-    NormalMapShaderClass(const NormalMapShaderClass&);
-    ~NormalMapShaderClass();
-
-    bool Initialize(ID3D11Device*, HWND);
-    void Shutdown();
-    bool Render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, XMFLOAT3, XMFLOAT4);
-
-private:
-    bool InitializeShader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
-    void ShutdownShader();
-    void OutputShaderErrorMessage(ID3D10Blob*, HWND, WCHAR*);
-
-    bool SetShaderParameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, XMFLOAT3, XMFLOAT4);
-    void RenderShader(ID3D11DeviceContext*, int);
-
-private:
-    ID3D11VertexShader* m_vertexShader;
-    ID3D11PixelShader* m_pixelShader;
-    ID3D11InputLayout* m_layout;
-    ID3D11Buffer* m_matrixBuffer;
-    ID3D11SamplerState* m_sampleState;
-    ID3D11Buffer* m_lightBuffer;
-
-};
-
-#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/reflection_shader_class.h b/enginecustom/src/inc/shader/reflection_shader_class.h
new file mode 100644
index 0000000..fcf75dc
--- /dev/null
+++ b/enginecustom/src/inc/shader/reflection_shader_class.h
@@ -0,0 +1,65 @@
+////////////////////////////////////////////////////////////////////////////////
+// Filename: reflectionshaderclass.h
+////////////////////////////////////////////////////////////////////////////////
+#ifndef _REFLECTIONSHADERCLASS_H_
+#define _REFLECTIONSHADERCLASS_H_
+
+
+//////////////
+// INCLUDES //
+//////////////
+#include "Logger.h"
+#include <d3d11.h>
+#include <d3dcompiler.h>
+#include <directxmath.h>
+#include <fstream>
+using namespace DirectX;
+using namespace std;
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Class name: reflection_shader_class
+////////////////////////////////////////////////////////////////////////////////
+class reflection_shader_class
+{
+private:
+    struct matrix_buffer_type
+    {
+        XMMATRIX world;
+        XMMATRIX view;
+        XMMATRIX projection;
+    };
+
+    struct reflection_buffer_type
+    {
+        XMMATRIX reflection_matrix;
+    };
+
+public:
+    reflection_shader_class();
+    reflection_shader_class(const reflection_shader_class&);
+    ~reflection_shader_class();
+
+    bool initialize(ID3D11Device*, HWND);
+    void shutdown();
+    bool render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, XMMATRIX);
+
+private:
+    bool initialize_shader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
+    void shutdown_shader();
+    void output_shader_error_message(ID3D10Blob*, HWND, WCHAR*);
+
+    bool set_shader_parameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, XMMATRIX);
+    void render_shader(ID3D11DeviceContext*, int);
+
+private:
+    ID3D11VertexShader* vertex_shader_;
+    ID3D11PixelShader* pixel_shader_;
+    ID3D11InputLayout* layout_;
+    ID3D11Buffer* matrix_buffer_;
+    ID3D11SamplerState* sample_state_;
+    ID3D11Buffer* reflection_buffer_;
+
+};
+
+#endif
diff --git a/enginecustom/src/inc/shader/reflectionshaderclass.h b/enginecustom/src/inc/shader/reflectionshaderclass.h
deleted file mode 100644
index 0ad19b3..0000000
--- a/enginecustom/src/inc/shader/reflectionshaderclass.h
+++ /dev/null
@@ -1,65 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// Filename: reflectionshaderclass.h
-////////////////////////////////////////////////////////////////////////////////
-#ifndef _REFLECTIONSHADERCLASS_H_
-#define _REFLECTIONSHADERCLASS_H_
-
-
-//////////////
-// INCLUDES //
-//////////////
-#include "Logger.h"
-#include <d3d11.h>
-#include <d3dcompiler.h>
-#include <directxmath.h>
-#include <fstream>
-using namespace DirectX;
-using namespace std;
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Class name: ReflectionShaderClass
-////////////////////////////////////////////////////////////////////////////////
-class ReflectionShaderClass
-{
-private:
-    struct MatrixBufferType
-    {
-        XMMATRIX world;
-        XMMATRIX view;
-        XMMATRIX projection;
-    };
-
-    struct ReflectionBufferType
-    {
-        XMMATRIX reflectionMatrix;
-    };
-
-public:
-    ReflectionShaderClass();
-    ReflectionShaderClass(const ReflectionShaderClass&);
-    ~ReflectionShaderClass();
-
-    bool Initialize(ID3D11Device*, HWND);
-    void Shutdown();
-    bool Render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, XMMATRIX);
-
-private:
-    bool InitializeShader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
-    void ShutdownShader();
-    void OutputShaderErrorMessage(ID3D10Blob*, HWND, WCHAR*);
-
-    bool SetShaderParameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, XMMATRIX);
-    void RenderShader(ID3D11DeviceContext*, int);
-
-private:
-    ID3D11VertexShader* m_vertexShader;
-    ID3D11PixelShader* m_pixelShader;
-    ID3D11InputLayout* m_layout;
-    ID3D11Buffer* m_matrixBuffer;
-    ID3D11SamplerState* m_sampleState;
-    ID3D11Buffer* m_reflectionBuffer;
-
-};
-
-#endif
diff --git a/enginecustom/src/inc/shader/refraction_shader_class.h b/enginecustom/src/inc/shader/refraction_shader_class.h
new file mode 100644
index 0000000..9f0197d
--- /dev/null
+++ b/enginecustom/src/inc/shader/refraction_shader_class.h
@@ -0,0 +1,72 @@
+#ifndef _REFRACTIONSHADERCLASS_H_
+#define _REFRACTIONSHADERCLASS_H_
+
+
+//////////////
+// INCLUDES //
+//////////////
+#include <d3d11.h>
+#include <d3dcompiler.h>
+#include <directxmath.h>
+#include <fstream>
+using namespace DirectX;
+using namespace std;
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Class name: refraction_shader_class
+////////////////////////////////////////////////////////////////////////////////
+class refraction_shader_class
+{
+private:
+    struct matrix_buffer_type
+    {
+        XMMATRIX world;
+        XMMATRIX view;
+        XMMATRIX projection;
+    };
+
+    struct light_buffer_type
+    {
+        XMFLOAT4 ambient_color;
+        XMFLOAT4 diffuse_color;
+        XMFLOAT4 light_position;
+        XMFLOAT3 light_direction;
+        float padding;
+    };
+
+    struct clip_plane_buffer_type
+    {
+        XMFLOAT4 clip_plane;
+    };
+
+public:
+    refraction_shader_class();
+    refraction_shader_class(const refraction_shader_class&);
+    ~refraction_shader_class();
+
+    bool initialize(ID3D11Device*, HWND);
+    void shutdown();
+    bool render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*,
+        XMFLOAT3, XMFLOAT4[], XMFLOAT4[], XMFLOAT4[], XMFLOAT4);
+
+private:
+    bool initialize_shader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
+    void shutdown_shader();
+    void output_shader_error_message(ID3D10Blob*, HWND, WCHAR*);
+
+    bool set_shader_parameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*,
+        XMFLOAT3, XMFLOAT4[], XMFLOAT4[], XMFLOAT4[], XMFLOAT4);
+    void render_shader(ID3D11DeviceContext*, int);
+
+private:
+    ID3D11VertexShader* vertex_shader_;
+    ID3D11PixelShader* pixel_shader_;
+    ID3D11InputLayout* layout_;
+    ID3D11SamplerState* sample_state_;
+    ID3D11Buffer* matrix_buffer_;
+    ID3D11Buffer* light_buffer_;
+    ID3D11Buffer* clip_plane_buffer_;
+};
+
+#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/refractionshaderclass.h b/enginecustom/src/inc/shader/refractionshaderclass.h
deleted file mode 100644
index 19e1ded..0000000
--- a/enginecustom/src/inc/shader/refractionshaderclass.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef _REFRACTIONSHADERCLASS_H_
-#define _REFRACTIONSHADERCLASS_H_
-
-
-//////////////
-// INCLUDES //
-//////////////
-#include <d3d11.h>
-#include <d3dcompiler.h>
-#include <directxmath.h>
-#include <fstream>
-using namespace DirectX;
-using namespace std;
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Class name: RefractionShaderClass
-////////////////////////////////////////////////////////////////////////////////
-class RefractionShaderClass
-{
-private:
-    struct MatrixBufferType
-    {
-        XMMATRIX world;
-        XMMATRIX view;
-        XMMATRIX projection;
-    };
-
-    struct LightBufferType
-    {
-        XMFLOAT4 ambientColor;
-        XMFLOAT4 diffuseColor;
-        XMFLOAT4 lightPosition;
-        XMFLOAT3 lightDirection;
-        float padding;
-    };
-
-    struct ClipPlaneBufferType
-    {
-        XMFLOAT4 clipPlane;
-    };
-
-public:
-    RefractionShaderClass();
-    RefractionShaderClass(const RefractionShaderClass&);
-    ~RefractionShaderClass();
-
-    bool Initialize(ID3D11Device*, HWND);
-    void Shutdown();
-    bool Render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*,
-        XMFLOAT3, XMFLOAT4[], XMFLOAT4[], XMFLOAT4[], XMFLOAT4);
-
-private:
-    bool InitializeShader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
-    void ShutdownShader();
-    void OutputShaderErrorMessage(ID3D10Blob*, HWND, WCHAR*);
-
-    bool SetShaderParameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*,
-        XMFLOAT3, XMFLOAT4[], XMFLOAT4[], XMFLOAT4[], XMFLOAT4);
-    void RenderShader(ID3D11DeviceContext*, int);
-
-private:
-    ID3D11VertexShader* m_vertexShader;
-    ID3D11PixelShader* m_pixelShader;
-    ID3D11InputLayout* m_layout;
-    ID3D11SamplerState* m_sampleState;
-    ID3D11Buffer* m_matrixBuffer;
-    ID3D11Buffer* m_lightBuffer;
-    ID3D11Buffer* m_clipPlaneBuffer;
-};
-
-#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/shader_manager_class.h b/enginecustom/src/inc/shader/shader_manager_class.h
new file mode 100644
index 0000000..11ea684
--- /dev/null
+++ b/enginecustom/src/inc/shader/shader_manager_class.h
@@ -0,0 +1,67 @@
+#ifndef _SHADERMANAGERCLASS_H_
+#define _SHADERMANAGERCLASS_H_
+
+// Inclure les en-têtes nécessaires
+#include <d3d11.h>
+#include <DirectXMath.h>
+#include <vector>
+#include "texture_shader_class.h"
+#include "normal_map_shader_class.h"
+#include "multi_texture_shader_class.h"
+#include "translate_shader_class.h"
+#include "alpha_map_shader_class.h"
+#include "spec_map_shader_class.h"
+#include "transparent_shader_class.h"
+#include "light_shader_class.h"
+#include "light_map_shader_class.h"
+#include "refraction_shader_class.h"
+#include "water_shader_class.h"
+#include "celshade_class.h"
+#include "skybox_shader_class.h"
+#include "sunlight_shader_class.h"
+
+using namespace DirectX;
+
+class shader_manager_class
+{
+public:
+    shader_manager_class();
+    shader_manager_class(const shader_manager_class&);
+    ~shader_manager_class();
+
+    bool initialize(ID3D11Device*, HWND);
+    void shutdown();
+
+    bool render_texture_shader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*);
+    bool render_normal_map_shader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, XMFLOAT3, XMFLOAT4);
+    bool render_multitexture_shader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*);
+    bool render_translate_shader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, float);
+    bool render_alpha_map_shader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*);
+    bool render_spec_map_shader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, XMFLOAT3, XMFLOAT4, XMFLOAT3, XMFLOAT4, float);
+    bool render_transparent_shader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, float);
+    bool renderlight_shader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4[], XMFLOAT4[], XMFLOAT4[]);
+    bool renderlight_map_shader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*);
+    bool render_refraction_shader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT3, XMFLOAT4[], XMFLOAT4[], XMFLOAT4[], XMFLOAT4);
+    bool render_water_shader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, float, float);
+    bool render_cel_shading_shader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4, XMFLOAT4, XMFLOAT3, float);
+	bool render_sunlight_shader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4, XMFLOAT4, XMFLOAT3, float);
+	bool render_skybox_shader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4, XMFLOAT4, XMFLOAT3, float);
+	
+private:
+    texture_shader_class* texture_shader_;
+    normal_map_shader_class* normal_map_shader_;
+    multi_texture_shader_class* multitexture_shader_;
+    translate_shader_class* translate_shader_;
+    alpha_map_shader_class* alpha_map_shader_;
+    spec_map_shader_class* spec_map_shader_;
+    transparent_shader_class* transparent_shader_;
+    light_shader_class* light_shader_;
+    light_map_shader_class* light_map_shader_;
+    refraction_shader_class* refraction_shader_;
+    water_shader_class* water_shader_;
+    celshade_class* cel_shading_shader_;
+	sunlight_shader_class* sunlight_shader_;
+	skybox_shader_class* skybox_shader_;
+};
+
+#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/shadermanagerclass.h b/enginecustom/src/inc/shader/shadermanagerclass.h
deleted file mode 100644
index 06c6864..0000000
--- a/enginecustom/src/inc/shader/shadermanagerclass.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef _SHADERMANAGERCLASS_H_
-#define _SHADERMANAGERCLASS_H_
-
-// Inclure les en-têtes nécessaires
-#include <d3d11.h>
-#include <DirectXMath.h>
-#include <vector>
-#include "textureshaderclass.h"
-#include "normalmapshaderclass.h"
-#include "multitextureshaderclass.h"
-#include "translateshaderclass.h"
-#include "alphamapshaderclass.h"
-#include "specmapshaderclass.h"
-#include "transparentshaderclass.h"
-#include "lightshaderclass.h"
-#include "lightmapshaderclass.h"
-#include "refractionshaderclass.h"
-#include "watershaderclass.h"
-#include "celshadingshader.h"
-#include "SkyboxShaderClass.h"
-#include "sunlightshaderclass.h"
-
-using namespace DirectX;
-
-class ShaderManagerClass
-{
-public:
-    ShaderManagerClass();
-    ShaderManagerClass(const ShaderManagerClass&);
-    ~ShaderManagerClass();
-
-    bool Initialize(ID3D11Device*, HWND);
-    void Shutdown();
-
-    bool RenderTextureShader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*);
-    bool RenderNormalMapShader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, XMFLOAT3, XMFLOAT4);
-    bool RenderMultitextureShader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*);
-    bool RenderTranslateShader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, float);
-    bool RenderAlphaMapShader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*);
-    bool RenderSpecMapShader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, XMFLOAT3, XMFLOAT4, XMFLOAT3, XMFLOAT4, float);
-    bool RenderTransparentShader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, float);
-    bool RenderlightShader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4[], XMFLOAT4[], XMFLOAT4[]);
-    bool RenderlightMapShader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*);
-    bool RenderRefractionShader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT3, XMFLOAT4[], XMFLOAT4[], XMFLOAT4[], XMFLOAT4);
-    bool RenderWaterShader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, float, float);
-    bool RenderCelShadingShader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4, XMFLOAT4, XMFLOAT3, float);
-	bool RenderSunlightShader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4, XMFLOAT4, XMFLOAT3, float);
-	bool RenderSkyboxShader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4, XMFLOAT4, XMFLOAT3, float);
-	
-private:
-    TextureShaderClass* m_TextureShader;
-    NormalMapShaderClass* m_NormalMapShader;
-    MultiTextureShaderClass* m_MultitextureShader;
-    TranslateShaderClass* m_TranslateShader;
-    AlphaMapShaderClass* m_AlphaMapShader;
-    SpecMapShaderClass* m_SpecMapShader;
-    TransparentShaderClass* m_TransparentShader;
-    LightShaderClass* m_LightShader;
-    LightMapShaderClass* m_LightMapShader;
-    RefractionShaderClass* m_RefractionShader;
-    WaterShaderClass* m_WaterShader;
-    CelshadeClass* m_CelShadingShader;
-	SunlightShaderClass* m_SunlightShader;
-	SkyboxShaderClass* m_SkyboxShader;
-};
-
-#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/SkyboxShaderClass.h b/enginecustom/src/inc/shader/skybox_shader_class.h
similarity index 92%
rename from enginecustom/src/inc/shader/SkyboxShaderClass.h
rename to enginecustom/src/inc/shader/skybox_shader_class.h
index a5293ac..610bbe3 100644
--- a/enginecustom/src/inc/shader/SkyboxShaderClass.h
+++ b/enginecustom/src/inc/shader/skybox_shader_class.h
@@ -8,7 +8,7 @@
 using namespace DirectX;
 using namespace std;
 
-class SkyboxShaderClass
+class skybox_shader_class
 {
 
     private :
@@ -39,9 +39,9 @@ class SkyboxShaderClass
     };
 
 public :
-    SkyboxShaderClass();
-    SkyboxShaderClass(const SkyboxShaderClass&);
-    ~SkyboxShaderClass();
+    skybox_shader_class();
+    skybox_shader_class(const skybox_shader_class&);
+    ~skybox_shader_class();
 
     bool Initialize(ID3D11Device*, HWND);
     void Shutdown();
diff --git a/enginecustom/src/inc/shader/spec_map_shader_class.h b/enginecustom/src/inc/shader/spec_map_shader_class.h
new file mode 100644
index 0000000..352c159
--- /dev/null
+++ b/enginecustom/src/inc/shader/spec_map_shader_class.h
@@ -0,0 +1,72 @@
+#ifndef _SPECMAPSHADERCLASS_H_
+#define _SPECMAPSHADERCLASS_H_
+
+
+//////////////
+// INCLUDES //
+//////////////
+#include <d3d11.h>
+#include <d3dcompiler.h>
+#include <directxmath.h>
+#include <fstream>
+using namespace DirectX;
+using namespace std;
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Class name: spec_map_shader_class
+////////////////////////////////////////////////////////////////////////////////
+class spec_map_shader_class
+{
+private:
+    struct matrix_buffer_type
+    {
+        XMMATRIX world;
+        XMMATRIX view;
+        XMMATRIX projection;
+    };
+
+    struct light_buffer_type
+    {
+        XMFLOAT4 diffuse_color;
+        XMFLOAT4 specular_color;
+        float specular_power;
+        XMFLOAT3 light_direction;
+    };
+
+    struct camera_buffer_type
+    {
+        XMFLOAT3 camera_position;
+        float padding;
+    };
+
+public:
+    spec_map_shader_class();
+    spec_map_shader_class(const spec_map_shader_class&);
+    ~spec_map_shader_class();
+
+    bool initialize(ID3D11Device*, HWND);
+    void shutdown();
+    bool render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*,
+        XMFLOAT3, XMFLOAT4, XMFLOAT3, XMFLOAT4, float);
+
+private:
+    bool initialize_shader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
+    void shutdown_shader();
+    void output_shader_error_message(ID3D10Blob*, HWND, WCHAR*);
+
+    bool set_shader_parameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*,
+        XMFLOAT3, XMFLOAT4, XMFLOAT3, XMFLOAT4, float);
+    void render_shader(ID3D11DeviceContext*, int);
+
+private:
+    ID3D11VertexShader* vertex_shader_;
+    ID3D11PixelShader* pixel_shader_;
+    ID3D11InputLayout* layout_;
+    ID3D11Buffer* matrix_buffer_;
+    ID3D11SamplerState* sample_state_;
+    ID3D11Buffer* light_buffer_;
+    ID3D11Buffer* camera_buffer_;
+};
+
+#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/specmapshaderclass.h b/enginecustom/src/inc/shader/specmapshaderclass.h
deleted file mode 100644
index e076c88..0000000
--- a/enginecustom/src/inc/shader/specmapshaderclass.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef _SPECMAPSHADERCLASS_H_
-#define _SPECMAPSHADERCLASS_H_
-
-
-//////////////
-// INCLUDES //
-//////////////
-#include <d3d11.h>
-#include <d3dcompiler.h>
-#include <directxmath.h>
-#include <fstream>
-using namespace DirectX;
-using namespace std;
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Class name: SpecMapShaderClass
-////////////////////////////////////////////////////////////////////////////////
-class SpecMapShaderClass
-{
-private:
-    struct MatrixBufferType
-    {
-        XMMATRIX world;
-        XMMATRIX view;
-        XMMATRIX projection;
-    };
-
-    struct LightBufferType
-    {
-        XMFLOAT4 diffuseColor;
-        XMFLOAT4 specularColor;
-        float specularPower;
-        XMFLOAT3 lightDirection;
-    };
-
-    struct CameraBufferType
-    {
-        XMFLOAT3 cameraPosition;
-        float padding;
-    };
-
-public:
-    SpecMapShaderClass();
-    SpecMapShaderClass(const SpecMapShaderClass&);
-    ~SpecMapShaderClass();
-
-    bool Initialize(ID3D11Device*, HWND);
-    void Shutdown();
-    bool Render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*,
-        XMFLOAT3, XMFLOAT4, XMFLOAT3, XMFLOAT4, float);
-
-private:
-    bool InitializeShader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
-    void ShutdownShader();
-    void OutputShaderErrorMessage(ID3D10Blob*, HWND, WCHAR*);
-
-    bool SetShaderParameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*,
-        XMFLOAT3, XMFLOAT4, XMFLOAT3, XMFLOAT4, float);
-    void RenderShader(ID3D11DeviceContext*, int);
-
-private:
-    ID3D11VertexShader* m_vertexShader;
-    ID3D11PixelShader* m_pixelShader;
-    ID3D11InputLayout* m_layout;
-    ID3D11Buffer* m_matrixBuffer;
-    ID3D11SamplerState* m_sampleState;
-    ID3D11Buffer* m_lightBuffer;
-    ID3D11Buffer* m_cameraBuffer;
-};
-
-#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/sunlight_shader_class.h b/enginecustom/src/inc/shader/sunlight_shader_class.h
new file mode 100644
index 0000000..2d15d4d
--- /dev/null
+++ b/enginecustom/src/inc/shader/sunlight_shader_class.h
@@ -0,0 +1,68 @@
+#pragma once
+
+#include "Logger.h"
+#include <d3d11.h>
+#include <d3dcompiler.h>
+#include <directxmath.h>
+#include <fstream>
+using namespace DirectX;
+using namespace std;
+
+class sunlight_shader_class
+{
+
+private :
+	struct matrix_buffer_type
+	{
+		XMMATRIX world;
+		XMMATRIX view;
+		XMMATRIX projection;
+	};
+
+	struct camera_buffer_type
+	{
+		XMFLOAT3 camera_position;
+		float padding;
+	};
+
+	struct sun_light_buffer_type
+	{
+		XMFLOAT4 diffuse_color;
+		XMFLOAT4 ambient_color;
+		XMFLOAT3 sun_direction;
+		float intensity;
+	};
+
+	struct sun_light_color_buffer_type
+	{
+		XMFLOAT4 sun_color;
+	};
+
+public :
+	sunlight_shader_class();
+	sunlight_shader_class(const sunlight_shader_class&);
+	~sunlight_shader_class();
+
+	bool initialize(ID3D11Device*, HWND);
+	void shutdown();
+	bool render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4, XMFLOAT4, XMFLOAT3,float);
+
+private:
+	bool initialize_shader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
+	void shutdown_shader();
+	void output_shader_error_message(ID3D10Blob*, HWND, WCHAR*);
+
+	bool set_shader_parameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4, XMFLOAT4, XMFLOAT3, float);
+	void render_shader(ID3D11DeviceContext*, int);
+
+private:
+	ID3D11VertexShader* vertex_shader_;
+	ID3D11PixelShader* pixel_shader_;
+	ID3D11InputLayout* layout_;
+	ID3D11SamplerState* sample_state_;
+	ID3D11Buffer* matrix_buffer_;
+	ID3D11Buffer* camera_buffer_;
+	ID3D11Buffer* sunlight_buffer_;
+	ID3D11Buffer* sunlight_color_buffer_;
+	ID3D11Buffer* sunlight_position_buffer_;
+};
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/sunlightshaderclass.h b/enginecustom/src/inc/shader/sunlightshaderclass.h
deleted file mode 100644
index 84fa982..0000000
--- a/enginecustom/src/inc/shader/sunlightshaderclass.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#pragma once
-
-#include "Logger.h"
-#include <d3d11.h>
-#include <d3dcompiler.h>
-#include <directxmath.h>
-#include <fstream>
-using namespace DirectX;
-using namespace std;
-
-class SunlightShaderClass
-{
-
-private :
-	struct MatrixBufferType
-	{
-		XMMATRIX world;
-		XMMATRIX view;
-		XMMATRIX projection;
-	};
-
-	struct CameraBufferType
-	{
-		XMFLOAT3 cameraPosition;
-		float padding;
-	};
-
-	struct SunLightBufferType
-	{
-		XMFLOAT4 diffuseColor;
-		XMFLOAT4 ambientColor;
-		XMFLOAT3 sunDirection;
-		float intensity;
-	};
-
-	struct SunLightColorBufferType
-	{
-		XMFLOAT4 sunColor;
-	};
-
-public :
-	SunlightShaderClass();
-	SunlightShaderClass(const SunlightShaderClass&);
-	~SunlightShaderClass();
-
-	bool Initialize(ID3D11Device*, HWND);
-	void Shutdown();
-	bool Render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4, XMFLOAT4, XMFLOAT3,float);
-
-private:
-	bool InitializeShader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
-	void ShutdownShader();
-	void OutputShaderErrorMessage(ID3D10Blob*, HWND, WCHAR*);
-
-	bool SetShaderParameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4, XMFLOAT4, XMFLOAT3, float);
-	void RenderShader(ID3D11DeviceContext*, int);
-
-private:
-	ID3D11VertexShader* m_vertexShader;
-	ID3D11PixelShader* m_pixelShader;
-	ID3D11InputLayout* m_layout;
-	ID3D11SamplerState* m_sampleState;
-	ID3D11Buffer* m_matrixBuffer;
-	ID3D11Buffer* m_cameraBuffer;
-	ID3D11Buffer* m_sunlightBuffer;
-	ID3D11Buffer* m_sunlightColorBuffer;
-	ID3D11Buffer* m_sunlightPositionBuffer;
-};
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/texture_shader_class.h b/enginecustom/src/inc/shader/texture_shader_class.h
new file mode 100644
index 0000000..25f9e1c
--- /dev/null
+++ b/enginecustom/src/inc/shader/texture_shader_class.h
@@ -0,0 +1,56 @@
+#ifndef _TEXTURESHADERCLASS_H_
+#define _TEXTURESHADERCLASS_H_
+
+
+//////////////
+// INCLUDES //
+//////////////
+#include "Logger.h"
+#include <d3d11.h>
+#include <d3dcompiler.h>
+#include <directxmath.h>
+#include <fstream>
+using namespace DirectX;
+using namespace std;
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Class name: texture_shader_class
+////////////////////////////////////////////////////////////////////////////////
+class texture_shader_class
+{
+private:
+	struct matrix_buffer_type
+	{
+		XMMATRIX world;
+		XMMATRIX view;
+		XMMATRIX projection;
+	};
+
+public:
+	texture_shader_class();
+	texture_shader_class(const texture_shader_class&);
+	~texture_shader_class();
+
+	bool initialize(ID3D11Device*, HWND);
+	void shutdown();
+	bool render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*);
+
+private:
+	bool initialize_shader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
+	void shutdown_shader();
+	void output_shader_error_message(ID3D10Blob*, HWND, WCHAR*);
+
+	bool set_shader_parameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*);
+	void render_shader(ID3D11DeviceContext*, int);
+
+private:
+	ID3D11VertexShader* vertex_shader_;
+	ID3D11PixelShader* pixel_shader_;
+	ID3D11InputLayout* layout_;
+	ID3D11Buffer* matrix_buffer_;
+	ID3D11SamplerState* sample_state_;
+
+};
+
+#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/textureshaderclass.h b/enginecustom/src/inc/shader/textureshaderclass.h
deleted file mode 100644
index 7cb1278..0000000
--- a/enginecustom/src/inc/shader/textureshaderclass.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef _TEXTURESHADERCLASS_H_
-#define _TEXTURESHADERCLASS_H_
-
-
-//////////////
-// INCLUDES //
-//////////////
-#include "Logger.h"
-#include <d3d11.h>
-#include <d3dcompiler.h>
-#include <directxmath.h>
-#include <fstream>
-using namespace DirectX;
-using namespace std;
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Class name: TextureShaderClass
-////////////////////////////////////////////////////////////////////////////////
-class TextureShaderClass
-{
-private:
-	struct MatrixBufferType
-	{
-		XMMATRIX world;
-		XMMATRIX view;
-		XMMATRIX projection;
-	};
-
-public:
-	TextureShaderClass();
-	TextureShaderClass(const TextureShaderClass&);
-	~TextureShaderClass();
-
-	bool Initialize(ID3D11Device*, HWND);
-	void Shutdown();
-	bool Render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*);
-
-private:
-	bool InitializeShader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
-	void ShutdownShader();
-	void OutputShaderErrorMessage(ID3D10Blob*, HWND, WCHAR*);
-
-	bool SetShaderParameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*);
-	void RenderShader(ID3D11DeviceContext*, int);
-
-private:
-	ID3D11VertexShader* m_vertexShader;
-	ID3D11PixelShader* m_pixelShader;
-	ID3D11InputLayout* m_layout;
-	ID3D11Buffer* m_matrixBuffer;
-	ID3D11SamplerState* m_sampleState;
-
-};
-
-#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/translate_shader_class.h b/enginecustom/src/inc/shader/translate_shader_class.h
new file mode 100644
index 0000000..809c368
--- /dev/null
+++ b/enginecustom/src/inc/shader/translate_shader_class.h
@@ -0,0 +1,63 @@
+#ifndef _TRANSLATESHADERCLASS_H_
+#define _TRANSLATESHADERCLASS_H_
+
+
+//////////////
+// INCLUDES //
+//////////////
+#include "Logger.h"
+#include <d3d11.h>
+#include <d3dcompiler.h>
+#include <directxmath.h>
+#include <fstream>
+using namespace DirectX;
+using namespace std;
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Class name: translate_shader_class
+////////////////////////////////////////////////////////////////////////////////
+class translate_shader_class
+{
+private:
+    struct matrix_buffer_type
+    {
+        XMMATRIX world;
+        XMMATRIX view;
+        XMMATRIX projection;
+    };
+
+        struct translate_buffer_type
+    {
+        float translation;
+        XMFLOAT3 padding;
+    };
+
+public:
+    translate_shader_class();
+    translate_shader_class(const translate_shader_class&);
+    ~translate_shader_class();
+
+    bool initialize(ID3D11Device*, HWND);
+    void shutdown();
+    bool render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, float);
+
+private:
+    bool initialize_shader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
+    void shutdown_shader();
+    void output_shader_error_message(ID3D10Blob*, HWND, WCHAR*);
+
+    bool set_shader_parameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, float);
+    void render_shader(ID3D11DeviceContext*, int);
+
+private:
+    ID3D11VertexShader* vertex_shader_;
+    ID3D11PixelShader* pixel_shader_;
+    ID3D11InputLayout* layout_;
+    ID3D11Buffer* matrix_buffer_;
+    ID3D11SamplerState* sample_state_;
+    ID3D11Buffer* translate_buffer_;
+
+};
+
+#endif
diff --git a/enginecustom/src/inc/shader/translateshaderclass.h b/enginecustom/src/inc/shader/translateshaderclass.h
deleted file mode 100644
index 9566393..0000000
--- a/enginecustom/src/inc/shader/translateshaderclass.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef _TRANSLATESHADERCLASS_H_
-#define _TRANSLATESHADERCLASS_H_
-
-
-//////////////
-// INCLUDES //
-//////////////
-#include "Logger.h"
-#include <d3d11.h>
-#include <d3dcompiler.h>
-#include <directxmath.h>
-#include <fstream>
-using namespace DirectX;
-using namespace std;
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Class name: TranslateShaderClass
-////////////////////////////////////////////////////////////////////////////////
-class TranslateShaderClass
-{
-private:
-    struct MatrixBufferType
-    {
-        XMMATRIX world;
-        XMMATRIX view;
-        XMMATRIX projection;
-    };
-
-        struct TranslateBufferType
-    {
-        float translation;
-        XMFLOAT3 padding;
-    };
-
-public:
-    TranslateShaderClass();
-    TranslateShaderClass(const TranslateShaderClass&);
-    ~TranslateShaderClass();
-
-    bool Initialize(ID3D11Device*, HWND);
-    void Shutdown();
-    bool Render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, float);
-
-private:
-    bool InitializeShader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
-    void ShutdownShader();
-    void OutputShaderErrorMessage(ID3D10Blob*, HWND, WCHAR*);
-
-    bool SetShaderParameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, float);
-    void RenderShader(ID3D11DeviceContext*, int);
-
-private:
-    ID3D11VertexShader* m_vertexShader;
-    ID3D11PixelShader* m_pixelShader;
-    ID3D11InputLayout* m_layout;
-    ID3D11Buffer* m_matrixBuffer;
-    ID3D11SamplerState* m_sampleState;
-    ID3D11Buffer* m_translateBuffer;
-
-};
-
-#endif
diff --git a/enginecustom/src/inc/shader/transparent_shader_class.h b/enginecustom/src/inc/shader/transparent_shader_class.h
new file mode 100644
index 0000000..487846a
--- /dev/null
+++ b/enginecustom/src/inc/shader/transparent_shader_class.h
@@ -0,0 +1,63 @@
+#ifndef _TRANSPARENTSHADERCLASS_H_
+#define _TRANSPARENTSHADERCLASS_H_
+
+
+//////////////
+// INCLUDES //
+//////////////
+#include "Logger.h"
+#include <d3d11.h>
+#include <d3dcompiler.h>
+#include <directxmath.h>
+#include <fstream>
+using namespace DirectX;
+using namespace std;
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Class name: transparent_shader_class
+////////////////////////////////////////////////////////////////////////////////
+class transparent_shader_class
+{
+private:
+    struct matrix_buffer_type
+    {
+        XMMATRIX world;
+        XMMATRIX view;
+        XMMATRIX projection;
+    };
+
+    struct transparent_buffer_type
+    {
+        float blend_amount;
+        XMFLOAT3 padding;
+    };
+
+public:
+    transparent_shader_class();
+    transparent_shader_class(const transparent_shader_class&);
+    ~transparent_shader_class();
+
+    bool initialize(ID3D11Device*, HWND);
+    void shutdown();
+    bool render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, float);
+
+private:
+    bool initialize_shader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
+    void shutdown_shader();
+    void output_shader_error_message(ID3D10Blob*, HWND, WCHAR*);
+
+    bool set_shader_parameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, float);
+    void render_shader(ID3D11DeviceContext*, int);
+
+private:
+    ID3D11VertexShader* vertex_shader_;
+    ID3D11PixelShader* pixel_shader_;
+    ID3D11InputLayout* layout_;
+    ID3D11Buffer* matrix_buffer_;
+    ID3D11SamplerState* sample_state_;
+    ID3D11Buffer* transparent_buffer_;
+
+};
+
+#endif
diff --git a/enginecustom/src/inc/shader/transparentshaderclass.h b/enginecustom/src/inc/shader/transparentshaderclass.h
deleted file mode 100644
index 8840a0b..0000000
--- a/enginecustom/src/inc/shader/transparentshaderclass.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef _TRANSPARENTSHADERCLASS_H_
-#define _TRANSPARENTSHADERCLASS_H_
-
-
-//////////////
-// INCLUDES //
-//////////////
-#include "Logger.h"
-#include <d3d11.h>
-#include <d3dcompiler.h>
-#include <directxmath.h>
-#include <fstream>
-using namespace DirectX;
-using namespace std;
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Class name: TransparentShaderClass
-////////////////////////////////////////////////////////////////////////////////
-class TransparentShaderClass
-{
-private:
-    struct MatrixBufferType
-    {
-        XMMATRIX world;
-        XMMATRIX view;
-        XMMATRIX projection;
-    };
-
-    struct TransparentBufferType
-    {
-        float blendAmount;
-        XMFLOAT3 padding;
-    };
-
-public:
-    TransparentShaderClass();
-    TransparentShaderClass(const TransparentShaderClass&);
-    ~TransparentShaderClass();
-
-    bool Initialize(ID3D11Device*, HWND);
-    void Shutdown();
-    bool Render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, float);
-
-private:
-    bool InitializeShader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
-    void ShutdownShader();
-    void OutputShaderErrorMessage(ID3D10Blob*, HWND, WCHAR*);
-
-    bool SetShaderParameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, float);
-    void RenderShader(ID3D11DeviceContext*, int);
-
-private:
-    ID3D11VertexShader* m_vertexShader;
-    ID3D11PixelShader* m_pixelShader;
-    ID3D11InputLayout* m_layout;
-    ID3D11Buffer* m_matrixBuffer;
-    ID3D11SamplerState* m_sampleState;
-    ID3D11Buffer* m_transparentBuffer;
-
-};
-
-#endif
diff --git a/enginecustom/src/inc/shader/water_shader_class.h b/enginecustom/src/inc/shader/water_shader_class.h
new file mode 100644
index 0000000..4041503
--- /dev/null
+++ b/enginecustom/src/inc/shader/water_shader_class.h
@@ -0,0 +1,70 @@
+#ifndef _WATERSHADERCLASS_H_
+#define _WATERSHADERCLASS_H_
+
+
+//////////////
+// INCLUDES //
+//////////////
+#include <d3d11.h>
+#include <d3dcompiler.h>
+#include <directxmath.h>
+#include <fstream>
+using namespace DirectX;
+using namespace std;
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Class name: water_shader_class
+////////////////////////////////////////////////////////////////////////////////
+class water_shader_class
+{
+private:
+    struct matrix_buffer_type
+    {
+        XMMATRIX world;
+        XMMATRIX view;
+        XMMATRIX projection;
+    };
+
+    struct reflection_buffer_type
+    {
+        XMMATRIX reflection;
+    };
+
+    struct water_buffer_type
+    {
+        float water_translation;
+        float reflect_refract_scale;
+        XMFLOAT2 padding;
+    };
+
+public:
+    water_shader_class();
+    water_shader_class(const water_shader_class&);
+    ~water_shader_class();
+
+    bool initialize(ID3D11Device*, HWND);
+    void shutdown();
+    bool render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*,
+        ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, float, float);
+
+private:
+    bool initialize_shader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
+    void shutdown_shader();
+    void output_shader_error_message(ID3D10Blob*, HWND, WCHAR*);
+
+    bool set_shader_parameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*,
+        ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, float, float);
+    void render_shader(ID3D11DeviceContext*, int);
+
+private:
+    ID3D11VertexShader* vertex_shader_;
+    ID3D11PixelShader* pixel_shader_;
+    ID3D11InputLayout* layout_;
+    ID3D11Buffer* matrix_buffer_;
+    ID3D11SamplerState* sample_state_;
+    ID3D11Buffer* reflection_buffer_;
+    ID3D11Buffer* water_buffer_;
+};
+
+#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/shader/watershaderclass.h b/enginecustom/src/inc/shader/watershaderclass.h
deleted file mode 100644
index 78173dd..0000000
--- a/enginecustom/src/inc/shader/watershaderclass.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef _WATERSHADERCLASS_H_
-#define _WATERSHADERCLASS_H_
-
-
-//////////////
-// INCLUDES //
-//////////////
-#include <d3d11.h>
-#include <d3dcompiler.h>
-#include <directxmath.h>
-#include <fstream>
-using namespace DirectX;
-using namespace std;
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Class name: WaterShaderClass
-////////////////////////////////////////////////////////////////////////////////
-class WaterShaderClass
-{
-private:
-    struct MatrixBufferType
-    {
-        XMMATRIX world;
-        XMMATRIX view;
-        XMMATRIX projection;
-    };
-
-    struct ReflectionBufferType
-    {
-        XMMATRIX reflection;
-    };
-
-    struct WaterBufferType
-    {
-        float waterTranslation;
-        float reflectRefractScale;
-        XMFLOAT2 padding;
-    };
-
-public:
-    WaterShaderClass();
-    WaterShaderClass(const WaterShaderClass&);
-    ~WaterShaderClass();
-
-    bool Initialize(ID3D11Device*, HWND);
-    void Shutdown();
-    bool Render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*,
-        ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, float, float);
-
-private:
-    bool InitializeShader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
-    void ShutdownShader();
-    void OutputShaderErrorMessage(ID3D10Blob*, HWND, WCHAR*);
-
-    bool SetShaderParameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*,
-        ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, float, float);
-    void RenderShader(ID3D11DeviceContext*, int);
-
-private:
-    ID3D11VertexShader* m_vertexShader;
-    ID3D11PixelShader* m_pixelShader;
-    ID3D11InputLayout* m_layout;
-    ID3D11Buffer* m_matrixBuffer;
-    ID3D11SamplerState* m_sampleState;
-    ID3D11Buffer* m_reflectionBuffer;
-    ID3D11Buffer* m_waterBuffer;
-};
-
-#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/system/Cameraclass.h b/enginecustom/src/inc/system/Cameraclass.h
deleted file mode 100644
index 0f344e9..0000000
--- a/enginecustom/src/inc/system/Cameraclass.h
+++ /dev/null
@@ -1,46 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// Filename: cameraclass.h
-////////////////////////////////////////////////////////////////////////////////
-#ifndef _CAMERACLASS_H_
-#define _CAMERACLASS_H_
-
-
-//////////////
-// INCLUDES //
-//////////////
-#include <directxmath.h>
-using namespace DirectX;
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Class name: CameraClass
-////////////////////////////////////////////////////////////////////////////////
-class CameraClass
-{
-public:
-	CameraClass();
-	CameraClass(const CameraClass&);
-	~CameraClass();
-
-	void SetPosition(float, float, float);
-	void SetRotation(float, float, float);
-
-	XMFLOAT3 GetPosition();
-	XMFLOAT3 GetRotation();
-
-
-	void Render();
-	XMMATRIX GetViewMatrix(XMMATRIX& viewMatrix) const;
-
-	void RenderReflection(float);
-	void GetReflectionViewMatrix(XMMATRIX&) const;
-
-private:
-	float m_positionX, m_positionY, m_positionZ;
-	float m_rotationX, m_rotationY, m_rotationZ;
-	XMMATRIX m_viewMatrix;
-	XMMATRIX m_reflectionViewMatrix;
-
-};
-
-#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/system/Logger.h b/enginecustom/src/inc/system/Logger.h
index d15eafe..bca053d 100644
--- a/enginecustom/src/inc/system/Logger.h
+++ b/enginecustom/src/inc/system/Logger.h
@@ -67,12 +67,12 @@ public:
 		case LogLevel::Info: return LogLevelInfo{ "Info", 0, ImVec4(0.0f, 1.0f, 0.0f, 1.0f) };
 		case LogLevel::Warning: return LogLevelInfo{ "Warning", 1, ImVec4(1.0f, 1.0f, 0.0f, 1.0f) };
 		case LogLevel::Error: return LogLevelInfo{ "Error", 2, ImVec4(1.0f, 0.0f, 0.0f, 1.0f) };
-		case LogLevel::Shutdown: return LogLevelInfo{ "Shutdown", 3, ImVec4(0.5f, 0.0f, 0.0f, 1.0f) };
-		case LogLevel::Initialize: return LogLevelInfo{ "Initialize", 4, ImVec4(0.0f, 1.0f, 1.0f, 1.0f) };
+		case LogLevel::Shutdown: return LogLevelInfo{ "shutdown", 3, ImVec4(0.5f, 0.0f, 0.0f, 1.0f) };
+		case LogLevel::Initialize: return LogLevelInfo{ "initialize", 4, ImVec4(0.0f, 1.0f, 1.0f, 1.0f) };
 		case LogLevel::Update: return LogLevelInfo{ "Update", 5, ImVec4(1.0f, 0.0f, 1.0f, 1.0f) };
-		case LogLevel::Render: return LogLevelInfo{ "Render", 6, ImVec4(1.0f, 1.0f, 1.0f, 1.0f) };
+		case LogLevel::Render: return LogLevelInfo{ "render", 6, ImVec4(1.0f, 1.0f, 1.0f, 1.0f) };
 		case LogLevel::Input: return LogLevelInfo{ "Input", 7, ImVec4(0.5f, 0.5f, 0.5f, 1.0f) };
-		case LogLevel::Physics: return LogLevelInfo{ "Physics", 8, ImVec4(0.5f, 0.5f, 0.5f, 1.0f) };
+		case LogLevel::Physics: return LogLevelInfo{ "physics", 8, ImVec4(0.5f, 0.5f, 0.5f, 1.0f) };
 		case LogLevel::Audio: return LogLevelInfo{ "Audio", 9, ImVec4(0.5f, 0.5f, 0.5f, 1.0f) };
 		case LogLevel::Network: return LogLevelInfo{ "Network", 10, ImVec4(0.5f, 0.5f, 0.5f, 1.0f) };
 		case LogLevel::Scripting: return LogLevelInfo{ "Scripting", 11, ImVec4(0.5f, 0.5f, 0.5f, 1.0f) };
diff --git a/enginecustom/src/inc/system/Skybox.h b/enginecustom/src/inc/system/Skybox.h
index 1d332fb..30c70ac 100644
--- a/enginecustom/src/inc/system/Skybox.h
+++ b/enginecustom/src/inc/system/Skybox.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <vector>
 
-#include "d3dclass.h"
+#include "d_3d_class.h"
 #include "object.h"
 
 class Skybox
@@ -11,9 +11,9 @@ public:
     Skybox();
     ~Skybox();
 
-    void Initialize(D3DClass* d3dClassRef); // Get all the required references
+    void Initialize(d_3d_class* d3dClassRef); // Get all the required references
     
-    Object* ConstructSkybox();
+    object* ConstructSkybox();
 
 
     // Variables
@@ -23,8 +23,8 @@ public:
 
 private:
 
-    D3DClass* m_d3dClassRef; // Reference to the D3DClass instance
-    Object* m_Skybox;
+    d_3d_class* m_d3dClassRef; // Reference to the d_3d_class instance
+    object* m_Skybox;
     
     
 };
diff --git a/enginecustom/src/inc/system/application_class.h b/enginecustom/src/inc/system/application_class.h
new file mode 100644
index 0000000..08af6f5
--- /dev/null
+++ b/enginecustom/src/inc/system/application_class.h
@@ -0,0 +1,325 @@
+#ifndef _APPLICATIONCLASS_H_
+#define _APPLICATIONCLASS_H_
+
+
+///////////////////////
+// MY CLASS INCLUDES //
+///////////////////////
+#include "d_3d_class.h"
+#include "camera_class.h"
+#include "object.h"
+#include "light_class.h"
+#include <vector>
+#include <filesystem>
+
+#include "bitmap_class.h"
+#include "sprite_class.h"
+#include "timer_class.h"
+#include "font_shader_class.h"
+#include "font_class.h"
+#include "text_class.h"
+#include "fps_class.h"
+#include "input_class.h"
+#include "shader_manager_class.h"
+#include "modellistclass.h"
+#include "position_class.h"
+#include "frustumclass.h"
+#include "render_texture_class.h"
+#include "display_plane_class.h"
+#include "translate_shader_class.h"
+#include "reflection_shader_class.h"
+#include "physics.h"
+#include "frustum.h"
+#include "skybox.h"
+
+
+#include <fstream>
+#include <WICTextureLoader.h>
+#include <comdef.h> // Pour _com_error
+#include <chrono>
+#include <thread>
+#include <map>
+#include <algorithm>
+#include <DirectXMath.h>
+#include <mutex>
+
+
+/////////////
+// GLOBALS //
+/////////////
+constexpr bool full_screen = false;
+constexpr float screen_depth = 1000.0f;
+constexpr float screen_near = 0.3f;
+
+struct input
+{
+	bool key_left = false;
+	bool key_right = false;
+	bool key_up = false;
+	bool key_down = false;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Class name: application_class
+////////////////////////////////////////////////////////////////////////////////
+class application_class
+{
+public:
+	application_class();
+	~application_class();
+	d_3d_class* get_direct_3d();
+	
+	render_texture_class* get_scene_texture() const { return scene_texture_; };
+	render_texture_class* get_render_texture() const { return render_texture_; };
+	render_texture_class* get_refraction_texture() const { return refraction_texture_; };
+	render_texture_class* get_reflection_texture() const { return reflection_texture_; };
+
+	int get_total_vertex_count() const;
+	int get_total_triangle_count() const;
+	int get_visible_triangle_count() const;
+
+	void create_big_cube(int side_count);
+	void process_terrain_generation();
+	bool initialize(int, int, HWND, bool is_vulkan);
+	void shutdown();
+	bool frame(input_class*);
+	void physics_thread_function();
+	int get_physics_tick_rate() const { return physics_tick_rate_; };
+	void set_physics_tick_rate(int physics_tick_rate) { physics_tick_rate_ = physics_tick_rate; };
+
+	int get_screen_width() const;
+	void set_screen_width(int screen_width);
+	int get_screen_height() const;
+	void set_screen_height(int screen_height);
+
+	float get_speed() const { return speed_; };
+	void set_speed(const float speed) { this->speed_ = speed; };
+
+	void add_cube();
+	void delete_kobject(int index);
+	size_t get_cube_count() const { return cubes_.size(); };
+	size_t get_terrain_cube_count() const { return terrain_chunk_.size(); };
+	std::vector<object*> get_cubes() const { return cubes_; };
+	std::vector<object*> get_terrain_cubes() const { return terrain_chunk_; };
+	std::vector<object*> get_kobjects() const { return object_; };
+	void add_kobject(std::wstring& filepath);
+	void set_path(WCHAR* path) { path_ = path; };
+	void set_w_folder(const std::filesystem::path& w_folder) { w_folder_ = w_folder; };
+
+	void generate_terrain();
+	void delete_terrain();
+
+	XMVECTOR get_light_position(int index);
+	XMVECTOR get_light_color(int index);
+	void set_light_position(int index, XMVECTOR position);
+	void set_light_color(int index, XMVECTOR color);
+	std::vector<light_class*> get_lights() const { return lights_; };
+	light_class* get_sun_light() const { return sun_light_; };
+
+	bool get_should_quit() const { return should_quit_; };
+	void set_should_quit(const bool should_quit) { should_quit_ = should_quit; };
+
+	void set_cel_shading(const bool enable) { enable_cel_shading_ = enable; };
+
+	void set_vsync(bool vsync);
+	bool get_vsync() const { return vsync_enabled_; };
+
+	HWND get_hwnd() const;
+	void set_hwnd(HWND hwnd);
+
+	bool is_windowed() const;
+	void set_windowed(bool windowed);
+
+	void set_window_size(const ImVec2 size) { window_size_ = size; };
+	ImVec2 get_window_size() const { return window_size_; };
+	float get_aspect_ratio() const { return static_cast<float>(screen_width_) / static_cast<float>(screen_height_); };
+
+	physics* get_physics() const { return physics_; };
+
+	// ------------------------------------- //
+	// --------------- Stats --------------- //
+	// ------------------------------------- //
+
+	int get_current_fps() const;
+	int get_min_fps() const;
+	int get_max_fps() const;
+	float get_frame_time() const;
+	int get_draw_calls() const;
+	void reset_fps_stats();
+	void increment_draw_call_count();
+	void reset_draw_call_count();
+
+	// ----------------------------------- //
+	// ------------- Culling ------------- //
+	// ----------------------------------- //
+
+	frustum get_frustum() const { return frustum_culling_; };
+	void set_frustum(const frustum& frustum) { frustum_culling_ = frustum; };
+
+	void construct_frustum();
+	int get_render_count() const { return render_count_; };
+	void set_render_count(const int render_count) { render_count_ = render_count; };
+	float get_frustum_tolerance() const { return frustum_culling_tolerance_; };
+	void set_frustum_tolerance(const float frustum_tolerance) { frustum_culling_tolerance_ = frustum_tolerance; };
+
+	bool get_can_fixed_update() const { return can_fixed_update_; };
+	void set_can_fixed_update(bool can_fixed_update) { can_fixed_update_ = can_fixed_update; };
+
+	ID3D11ShaderResourceView* get_back_buffer_srv() const {return back_buffer_srv_;};
+
+	// Save and load scene
+	void save_scene();
+	bool load_scene();
+
+	void set_scene_path(const std::string& path) { scene_path_ = path; };
+	std::wstring get_scene_path();
+
+	std::string convert_w_string_to_string(const std::wstring& w_str);
+	
+private:
+	bool render(float, float, float, float, float);
+	bool render_physics(bool key_left, bool key_right, bool key_up, bool key_down, float delta_time);
+	bool update_mouse_strings(int, int, bool);
+	bool update_fps();
+	bool update_render_count_string(int);
+	bool render_scene_to_texture(float);
+	bool render_refraction_to_texture();
+	bool render_reflection_to_texture();
+	bool render_pass(const std::vector<std::reference_wrapper<std::vector<object*>>>& RenderQueues, XMFLOAT4* diffuse, XMFLOAT4* position, XMFLOAT4* ambient, XMMATRIX view, XMMATRIX projection);
+
+	void update_skybox_position();
+	
+public :
+	std::vector<ID3D11ShaderResourceView*> textures;
+
+private :
+
+	// Thread de culling
+	std::thread culling_thread_;
+	std::atomic<bool> culling_active_;
+	std::mutex objects_mutex_;
+	void culling_thread_function();
+
+
+	std::mutex terrain_mutex_;
+	std::vector<std::tuple<float, float, float, std::string, int>> terrain_generation_data_;
+	bool terrain_generation_ready_;
+	int next_terrain_object_id_;
+	
+	// ------------------------------------- //
+	// ------------- DIRECT3D -------------- //
+	// ------------------------------------- //
+
+	d_3d_class* direct_3d_;
+	IDXGISwapChain* swap_chain_;
+	model_class* model_,* ground_model_, * wall_model_, * bath_model_, * water_model_;
+	ModelListClass* model_list_;
+	bool vsync_enabled_ = true;
+
+	HWND hwnd_;
+	bool windowed_;
+
+	std::string scene_path_;
+
+	// ------------------------------------- //
+	// ------------- RENDERING ------------- //
+	// ------------------------------------- //
+
+	XMMATRIX base_view_matrix_;
+	render_texture_class* render_texture_, * refraction_texture_, * reflection_texture_;
+	render_texture_class* scene_texture_;
+	display_plane_class* display_plane_;
+	int screen_width_, screen_height_;
+	camera_class* camera_;
+	position_class* position_;
+	int drawcalls_;
+
+	// ------------------------------------ //
+	// ------------- OBJECTS -------------- //
+	// ------------------------------------ //
+
+	object* selected_object_;
+	std::vector<object*> cubes_;
+	std::vector<object*> terrain_chunk_;
+	float speed_ = 0.1f; // speed for the demo spinning object
+	std::vector<object*> object_;
+	std::vector<object*> imported_object_;
+	int object_id_ = 0;
+	std::vector<std::reference_wrapper<std::vector<object*>>> render_queues_;
+	std::vector<object*> skybox_;
+
+	// ----------------------------------- //
+	// ------------- LIGHTS -------------- //
+	// ----------------------------------- //
+
+	light_class* m_light_;
+	std::vector<light_class*> lights_;
+	int num_lights_;
+	light_class* sun_light_;
+
+	XMFLOAT3 true_light_position_;
+	model_class* light_model_;
+
+	// ----------------------------------- //
+	// ------------- SHADERS ------------- //
+	// ----------------------------------- //
+
+	shader_manager_class* shader_manager_;
+	font_shader_class* font_shader_;
+	bitmap_class* bitmap_;
+	sprite_class* sprite_;
+	
+	bool enable_cel_shading_;
+
+	// ----------------------------------- //
+	// ------------ VARIABLES ------------ //
+	// ----------------------------------- //
+
+	float water_height_, water_translation_;
+	wchar_t* path_;
+	std::filesystem::path w_folder_;
+
+	// ------------------------------------------------- //
+	// ------------- FPS AND INFO ON SCREEN ------------ //
+	// ------------------------------------------------- //
+
+	timer_class* timer_;
+	text_class* mouse_strings_;
+	text_class* render_count_string_;
+	font_class* font_;
+	fps_class* fps_;
+	text_class* fps_string_;
+	int previous_fps_;
+
+	// ------------------------------------------------- //
+	// ------------------- OTHER ----------------------- //
+	// ------------------------------------------------- //
+
+	bool should_quit_;
+	physics* physics_;
+	float gravity_;
+	XMVECTOR previous_position_;
+	ImVec2 window_size_;
+	int physics_tick_rate_ = 50;
+	bool can_fixed_update_ = false;
+	std::thread physics_thread_;
+
+	ID3D11Texture2D* back_buffer_texture_;
+	ID3D11ShaderResourceView* back_buffer_srv_;
+
+	// ------------------------------------------------- //
+	// ------------------- Culling --------------------- //
+	// ------------------------------------------------- //
+
+	frustum frustum_culling_;
+	int render_count_;
+	float frustum_culling_tolerance_ = 5.f;
+
+	// ------------------------------------------------- //
+	// -------------------- Input ---------------------- //
+	// ------------------------------------------------- //
+
+	input inputs_;
+};
+
+#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/system/applicationclass.h b/enginecustom/src/inc/system/applicationclass.h
deleted file mode 100644
index e3fef64..0000000
--- a/enginecustom/src/inc/system/applicationclass.h
+++ /dev/null
@@ -1,327 +0,0 @@
-#ifndef _APPLICATIONCLASS_H_
-#define _APPLICATIONCLASS_H_
-
-
-///////////////////////
-// MY CLASS INCLUDES //
-///////////////////////
-#include "d3dclass.h"
-#include "cameraclass.h"
-#include "object.h"
-#include "lightclass.h"
-#include <vector>
-#include <filesystem>
-
-#include "bitmapclass.h"
-#include "spriteclass.h"
-#include "timerclass.h"
-#include "fontshaderclass.h"
-#include "fontclass.h"
-#include "textclass.h"
-#include "fpsclass.h"
-#include "inputclass.h"
-#include "shadermanagerclass.h"
-#include "modellistclass.h"
-#include "positionclass.h"
-#include "frustumclass.h"
-#include "rendertextureclass.h"
-#include "displayplaneclass.h"
-#include "translateshaderclass.h"
-#include "reflectionshaderclass.h"
-#include "physics.h"
-#include "frustum.h"
-#include "skybox.h"
-
-
-#include <fstream>
-#include <WICTextureLoader.h>
-#include <comdef.h> // Pour _com_error
-#include <chrono>
-#include <thread>
-#include <map>
-#include <algorithm>
-#include <DirectXMath.h>
-#include <mutex>
-
-
-/////////////
-// GLOBALS //
-/////////////
-const bool FULL_SCREEN = false;
-const float SCREEN_DEPTH = 1000.0f;
-const float SCREEN_NEAR = 0.3f;
-
-struct Input
-{
-	bool m_KeyLeft = false;
-	bool m_KeyRight = false;
-	bool m_KeyUp = false;
-	bool m_KeyDown = false;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// Class name: ApplicationClass
-////////////////////////////////////////////////////////////////////////////////
-class ApplicationClass
-{
-public:
-	ApplicationClass();
-	~ApplicationClass();
-	D3DClass* GetDirect3D();
-	
-	RenderTextureClass* GetSceneTexture() const { return m_SceneTexture; };
-	RenderTextureClass* GetRenderTexture() const { return m_RenderTexture; };
-	RenderTextureClass* GetRefractionTexture() const { return m_RefractionTexture; };
-	RenderTextureClass* GetReflectionTexture() const { return m_ReflectionTexture; };
-
-	int GetTotalVertexCount() const;
-	int GetTotalTriangleCount() const;
-	int GetVisibleTriangleCount() const;
-
-	void CreateBigCube(int sideCount);
-	void ProcessTerrainGeneration();
-	bool Initialize(int, int, HWND, bool IsVulkan);
-	void Shutdown();
-	bool Frame(InputClass*);
-	void PhysicsThreadFunction();
-	int GetPhysicsTickRate() const { return m_PhysicsTickRate; };
-	void SetPhysicsTickRate(int physicsTickRate) { m_PhysicsTickRate = physicsTickRate; };
-
-	int GetScreenWidth() const;
-	void SetScreenWidth(int screenWidth);
-	int GetScreenHeight() const;
-	void SetScreenHeight(int screenHeight);
-
-	float GetSpeed() const { return m_speed; };
-	void SetSpeed(float speed) { this->m_speed = speed; };
-
-	void AddCube();
-	void DeleteKobject(int index);
-	size_t GetCubeCount() const { return m_cubes.size(); };
-	size_t GetTerrainCubeCount() const { return m_terrainChunk.size(); };
-	std::vector<Object*> GetCubes() const { return m_cubes; };
-	std::vector<Object*> GetTerrainCubes() const { return m_terrainChunk; };
-	std::vector<Object*> GetKobjects() const { return m_object; };
-	void AddKobject(std::wstring& filepath);
-	void SetPath(WCHAR* path) { m_path = path; };
-	void SetWFolder(std::filesystem::path WFolder) { m_WFolder = WFolder; };
-
-	void GenerateTerrain();
-	void DeleteTerrain();
-
-	XMVECTOR GetLightPosition(int index);
-	XMVECTOR GetLightColor(int index);
-	void SetLightPosition(int index, XMVECTOR color);
-	void SetLightColor(int index, XMVECTOR color);
-	void DeleteLight(int index);
-	void AddLight();
-	std::vector<LightClass*> GetLights() const { return m_Lights; };
-	LightClass* GetSunLight() const { return m_SunLight; };
-
-	bool GetShouldQuit() const { return m_ShouldQuit; };
-	void SetShouldQuit(bool shouldQuit) { m_ShouldQuit = shouldQuit; };
-
-	void SetCelShading(bool enable) { m_enableCelShading = enable; };
-
-	void SetVsync(bool vsync);
-	bool GetVsync() const { return VSYNC_ENABLED; };
-
-	HWND GetHwnd() const;
-	void SetHwnd(HWND hwnd);
-
-	bool IsWindowed() const;
-	void SetWindowed(bool windowed);
-
-	void SetWindowSize(ImVec2 size) { windowSize = size; };
-	ImVec2 GetWindowSize() const { return windowSize; };
-	float GetAspectRatio() const { return (float)m_screenWidth / (float)m_screenHeight; };
-
-	Physics* GetPhysics() const { return m_Physics; };
-
-	// ------------------------------------- //
-	// --------------- Stats --------------- //
-	// ------------------------------------- //
-
-	int GetCurrentFps() const;
-	int GetMinFps() const;
-	int GetMaxFps() const;
-	float GetFrameTime() const;
-	int GetDrawCalls() const;
-	void ResetFpsStats();
-	void IncrementDrawCallCount();
-	void ResetDrawCallCount();
-
-	// ----------------------------------- //
-	// ------------- Culling ------------- //
-	// ----------------------------------- //
-
-	Frustum GetFrustum() const { return m_FrustumCulling; };
-	void SetFrustum(Frustum frustum) { m_FrustumCulling = frustum; };
-
-	void ConstructFrustum();
-	int GetRenderCount() const { return m_renderCount; };
-	void SetRenderCount(int renderCount) { m_renderCount = renderCount; };
-	float GetFrustumTolerance() const { return m_FrustumCullingTolerance; };
-	void SetFrustumTolerance(float frustumTolerance) { m_FrustumCullingTolerance = frustumTolerance; };
-
-	bool GetCanFixedUpdate() const { return CanFixedUpdate; };
-	void SetCanFixedUpdate(bool canFixedUpdate) { CanFixedUpdate = canFixedUpdate; };
-
-	ID3D11ShaderResourceView* GetBackBufferSRV() const {return m_BackBufferSRV;};
-
-	// Save and load scene
-	void SaveScene();
-	bool LoadScene();
-
-	void SetScenePath(std::string path) { m_scenePath = path; };
-	std::wstring GetScenePath();
-
-	std::string ConvertWStringToString(const std::wstring& wstr);
-	
-private:
-	bool Render(float, float, float, float, float);
-	bool RenderPhysics(bool keyLeft, bool keyRight, bool keyUp, bool keyDown, float deltaTime);
-	bool UpdateMouseStrings(int, int, bool);
-	bool UpdateFps();
-	bool UpdateRenderCountString(int);
-	bool RenderSceneToTexture(float);
-	bool RenderRefractionToTexture();
-	bool RenderReflectionToTexture();
-	bool RenderPass(const std::vector<std::reference_wrapper<std::vector<Object*>>>& RenderQueues, XMFLOAT4* diffuse, XMFLOAT4* position, XMFLOAT4* ambient, XMMATRIX view, XMMATRIX projection);
-
-	void UpdateSkyboxPosition();
-	
-public :
-	std::vector<ID3D11ShaderResourceView*> textures;
-
-private :
-
-	// Thread de culling
-	std::thread m_CullingThread;
-	std::atomic<bool> m_CullingActive;
-	std::mutex m_ObjectsMutex;
-	void CullingThreadFunction();
-
-
-	std::mutex m_TerrainMutex;
-	std::vector<std::tuple<float, float, float, std::string, int>> m_TerrainGenerationData;
-	bool m_TerrainGenerationReady;
-	int m_NextTerrainObjectId;
-	
-	// ------------------------------------- //
-	// ------------- DIRECT3D -------------- //
-	// ------------------------------------- //
-
-	D3DClass* m_Direct3D;
-	IDXGISwapChain* m_swapChain;
-	ModelClass* m_Model,* m_GroundModel, * m_WallModel, * m_BathModel, * m_WaterModel;
-	ModelListClass* m_ModelList;
-	bool VSYNC_ENABLED = true;
-
-	HWND m_hwnd;
-	bool m_windowed;
-
-	std::string m_scenePath;
-
-	// ------------------------------------- //
-	// ------------- RENDERING ------------- //
-	// ------------------------------------- //
-
-	XMMATRIX m_baseViewMatrix;
-	RenderTextureClass* m_RenderTexture, * m_RefractionTexture, * m_ReflectionTexture;
-	RenderTextureClass* m_SceneTexture;
-	DisplayPlaneClass* m_DisplayPlane;
-	int m_screenWidth, m_screenHeight;
-	CameraClass* m_Camera;
-	PositionClass* m_Position;
-	int m_drawcalls;
-
-	// ------------------------------------ //
-	// ------------- OBJECTS -------------- //
-	// ------------------------------------ //
-
-	Object* m_SelectedObject;
-	std::vector<Object*> m_cubes;
-	std::vector<Object*> m_terrainChunk;
-	float m_speed = 0.1f; // speed for the demo spinning object
-	std::vector<Object*> m_object;
-	std::vector<Object*> m_ImportedObject;
-	int m_ObjectId = 0;
-	std::vector<std::reference_wrapper<std::vector<Object*>>> m_RenderQueues;
-	std::vector<Object*> m_Skybox;
-
-	// ----------------------------------- //
-	// ------------- LIGHTS -------------- //
-	// ----------------------------------- //
-
-	LightClass* m_Light;
-	std::vector<LightClass*> m_Lights;
-	int m_numLights;
-	LightClass* m_SunLight;
-
-	XMFLOAT3 TrueLightPosition;
-	ModelClass* m_LightModel;
-
-	// ----------------------------------- //
-	// ------------- SHADERS ------------- //
-	// ----------------------------------- //
-
-	ShaderManagerClass* m_ShaderManager;
-	FontShaderClass* m_FontShader;
-	BitmapClass* m_Bitmap;
-	SpriteClass* m_Sprite;
-	
-	bool m_enableCelShading;
-
-	// ----------------------------------- //
-	// ------------ VARIABLES ------------ //
-	// ----------------------------------- //
-
-	float m_waterHeight, m_waterTranslation;
-	wchar_t* m_path;
-	std::filesystem::path m_WFolder;
-
-	// ------------------------------------------------- //
-	// ------------- FPS AND INFO ON SCREEN ------------ //
-	// ------------------------------------------------- //
-
-	TimerClass* m_Timer;
-	TextClass* m_MouseStrings;
-	TextClass* m_RenderCountString;
-	FontClass* m_Font;
-	FpsClass* m_Fps;
-	TextClass* m_FpsString;
-	int m_previousFps;
-
-	// ------------------------------------------------- //
-	// ------------------- OTHER ----------------------- //
-	// ------------------------------------------------- //
-
-	bool m_ShouldQuit;
-	Physics* m_Physics;
-	float m_gravity;
-	XMVECTOR m_previousPosition;
-	ImVec2 windowSize;
-	int m_PhysicsTickRate = 50;
-	bool CanFixedUpdate = false;
-	std::thread m_PhysicsThread;
-
-	ID3D11Texture2D* m_BackBufferTexture;
-	ID3D11ShaderResourceView* m_BackBufferSRV;
-
-	// ------------------------------------------------- //
-	// ------------------- Culling --------------------- //
-	// ------------------------------------------------- //
-
-	Frustum m_FrustumCulling;
-	int m_renderCount;
-	float m_FrustumCullingTolerance = 5.f;
-
-	// ------------------------------------------------- //
-	// -------------------- Input ---------------------- //
-	// ------------------------------------------------- //
-
-	Input m_Inputs;
-};
-
-#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/system/bitmap_class.h b/enginecustom/src/inc/system/bitmap_class.h
new file mode 100644
index 0000000..ec75282
--- /dev/null
+++ b/enginecustom/src/inc/system/bitmap_class.h
@@ -0,0 +1,59 @@
+#ifndef _BITMAPCLASS_H_
+#define _BITMAPCLASS_H_
+
+
+//////////////
+// INCLUDES //
+//////////////
+#include <directxmath.h>
+using namespace DirectX;
+
+
+///////////////////////
+// MY CLASS INCLUDES //
+///////////////////////
+#include "texture_class.h"
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Class name: bitmap_class
+////////////////////////////////////////////////////////////////////////////////
+class bitmap_class
+{
+private:
+    struct vertex_type
+    {
+        XMFLOAT3 position;
+        XMFLOAT2 texture;
+    };
+
+public:
+    bitmap_class();
+    bitmap_class(const bitmap_class&);
+    ~bitmap_class();
+
+    bool initialize(ID3D11Device*, ID3D11DeviceContext*, int, int, char*, int, int);
+    void shutdown();
+    bool render(ID3D11DeviceContext*);
+
+    int get_index_count();
+    ID3D11ShaderResourceView* get_texture();
+
+    void set_render_location(int, int);
+
+private:
+    bool initialize_buffers(ID3D11Device*);
+    void shutdown_buffers();
+    bool update_buffers(ID3D11DeviceContext*);
+    void render_buffers(ID3D11DeviceContext*);
+
+    bool load_texture(ID3D11Device*, ID3D11DeviceContext*, char*);
+    void release_texture();
+private:
+    ID3D11Buffer* vertex_buffer_, * index_buffer_;
+    int vertex_count_, index_count_, screen_width_, screen_height_, bitmap_width_, bitmap_height_, render_x_, render_y_, prev_pos_x_, prev_pos_y_;
+    texture_class* texture_;
+
+};
+
+#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/system/bitmapclass.h b/enginecustom/src/inc/system/bitmapclass.h
deleted file mode 100644
index 1ee0001..0000000
--- a/enginecustom/src/inc/system/bitmapclass.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef _BITMAPCLASS_H_
-#define _BITMAPCLASS_H_
-
-
-//////////////
-// INCLUDES //
-//////////////
-#include <directxmath.h>
-using namespace DirectX;
-
-
-///////////////////////
-// MY CLASS INCLUDES //
-///////////////////////
-#include "textureclass.h"
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Class name: BitmapClass
-////////////////////////////////////////////////////////////////////////////////
-class BitmapClass
-{
-private:
-    struct VertexType
-    {
-        XMFLOAT3 position;
-        XMFLOAT2 texture;
-    };
-
-public:
-    BitmapClass();
-    BitmapClass(const BitmapClass&);
-    ~BitmapClass();
-
-    bool Initialize(ID3D11Device*, ID3D11DeviceContext*, int, int, char*, int, int);
-    void Shutdown();
-    bool Render(ID3D11DeviceContext*);
-
-    int GetIndexCount();
-    ID3D11ShaderResourceView* GetTexture();
-
-    void SetRenderLocation(int, int);
-
-private:
-    bool InitializeBuffers(ID3D11Device*);
-    void ShutdownBuffers();
-    bool UpdateBuffers(ID3D11DeviceContext*);
-    void RenderBuffers(ID3D11DeviceContext*);
-
-    bool LoadTexture(ID3D11Device*, ID3D11DeviceContext*, char*);
-    void ReleaseTexture();
-private:
-    ID3D11Buffer* m_vertexBuffer, * m_indexBuffer;
-    int m_vertexCount, m_indexCount, m_screenWidth, m_screenHeight, m_bitmapWidth, m_bitmapHeight, m_renderX, m_renderY, m_prevPosX, m_prevPosY;
-    TextureClass* m_Texture;
-
-};
-
-#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/system/camera_class.h b/enginecustom/src/inc/system/camera_class.h
new file mode 100644
index 0000000..b6066aa
--- /dev/null
+++ b/enginecustom/src/inc/system/camera_class.h
@@ -0,0 +1,46 @@
+////////////////////////////////////////////////////////////////////////////////
+// Filename: cameraclass.h
+////////////////////////////////////////////////////////////////////////////////
+#ifndef _CAMERACLASS_H_
+#define _CAMERACLASS_H_
+
+
+//////////////
+// INCLUDES //
+//////////////
+#include <directxmath.h>
+using namespace DirectX;
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Class name: camera_class
+////////////////////////////////////////////////////////////////////////////////
+class camera_class
+{
+public:
+	camera_class();
+	camera_class(const camera_class&);
+	~camera_class();
+
+	void set_position(float, float, float);
+	void set_rotation(float, float, float);
+
+	XMFLOAT3 get_position();
+	XMFLOAT3 get_rotation();
+
+
+	void render();
+	XMMATRIX get_view_matrix(XMMATRIX& view_matrix) const;
+
+	void render_reflection(float);
+	void get_reflection_view_matrix(XMMATRIX&) const;
+
+private:
+	float position_x_, position_y_, position_z_;
+	float rotation_x_, rotation_y_, rotation_z_;
+	XMMATRIX view_matrix_;
+	XMMATRIX reflection_view_matrix_;
+
+};
+
+#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/system/d3dclass.h b/enginecustom/src/inc/system/d3dclass.h
deleted file mode 100644
index 095e6f7..0000000
--- a/enginecustom/src/inc/system/d3dclass.h
+++ /dev/null
@@ -1,90 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// Filename: d3dclass.h
-////////////////////////////////////////////////////////////////////////////////
-#ifndef _D3DCLASS_H_
-#define _D3DCLASS_H_
-
-
-/////////////
-// LINKING //
-/////////////
-#pragma comment(lib, "d3d11.lib")
-#pragma comment(lib, "dxgi.lib")
-#pragma comment(lib, "d3dcompiler.lib")
-
-
-//////////////
-// INCLUDES //
-//////////////
-#include "imguiManager.h"
-#include "d3d11.h"
-#include "fontshaderclass.h"
-#include "fontclass.h"
-#include "textclass.h"
-
-using namespace DirectX;
-
-////////////////////////////////////////////////////////////////////////////////
-// Class name: D3DClass
-////////////////////////////////////////////////////////////////////////////////
-class D3DClass
-{
-public:
-	D3DClass();
-	D3DClass(const D3DClass&);
-	~D3DClass();
-
-	bool Initialize(int, int, bool, HWND, bool, float, float);
-	void Shutdown();
-
-	void BeginScene(float, float, float, float);
-	void EndScene();
-
-	ID3D11Device* GetDevice();
-	ID3D11DeviceContext* GetDeviceContext();
-	//XMMATRIX GetProjectionMatrix(XMMATRIX& projectionMatrix);
-	IDXGISwapChain* m_swapChain;
-	IDXGISwapChain* GetSwapChain();
-	void ResizeSwapChain(int, int);
-	void SetVsync(bool vsync);
-
-
-	XMMATRIX GetProjectionMatrix() const { return m_projectionMatrix; };
-	XMMATRIX GetWorldMatrix() const { return m_worldMatrix;};
-	XMMATRIX GetOrthoMatrix() const { return m_orthoMatrix; };
-
-	void GetVideoCardInfo(char*, int&);
-
-	void SetBackBufferRenderTarget();
-	void ResetViewport();
-
-	void ReleaseResources();
-	void ResetResources(int newWidth, int newHeight);
-	
-	void TurnZBufferOn();
-	void TurnZBufferOff();
-
-	void EnableAlphaBlending();
-	void DisableAlphaBlending();
-
-private:
-	bool m_vsync_enabled;
-	int m_videoCardMemory;
-	char m_videoCardDescription[128];
-	ID3D11Device* m_device;
-	ID3D11DeviceContext* m_deviceContext;
-	ID3D11RenderTargetView* m_renderTargetView;
-	ID3D11Texture2D* m_depthStencilBuffer;
-	ID3D11DepthStencilState* m_depthStencilState;
-	ID3D11DepthStencilView* m_depthStencilView;
-	ID3D11RasterizerState* m_rasterState;
-	XMMATRIX m_projectionMatrix;
-	XMMATRIX m_worldMatrix;
-	XMMATRIX m_orthoMatrix;
-	D3D11_VIEWPORT m_viewport;
-	ID3D11DepthStencilState* m_depthDisabledStencilState;
-	ID3D11BlendState* m_alphaEnableBlendingState;
-	ID3D11BlendState* m_alphaDisableBlendingState;
-};
-
-#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/system/d_3d_class.h b/enginecustom/src/inc/system/d_3d_class.h
new file mode 100644
index 0000000..e1f783a
--- /dev/null
+++ b/enginecustom/src/inc/system/d_3d_class.h
@@ -0,0 +1,90 @@
+////////////////////////////////////////////////////////////////////////////////
+// Filename: d3dclass.h
+////////////////////////////////////////////////////////////////////////////////
+#ifndef _D3DCLASS_H_
+#define _D3DCLASS_H_
+
+
+/////////////
+// LINKING //
+/////////////
+#pragma comment(lib, "d3d11.lib")
+#pragma comment(lib, "dxgi.lib")
+#pragma comment(lib, "d3dcompiler.lib")
+
+
+//////////////
+// INCLUDES //
+//////////////
+#include "imguiManager.h"
+#include "d3d11.h"
+#include "font_shader_class.h"
+#include "font_class.h"
+#include "text_class.h"
+
+using namespace DirectX;
+
+////////////////////////////////////////////////////////////////////////////////
+// Class name: d_3d_class
+////////////////////////////////////////////////////////////////////////////////
+class d_3d_class
+{
+public:
+	d_3d_class();
+	d_3d_class(const d_3d_class&);
+	~d_3d_class();
+
+	bool initialize(int, int, bool, HWND, bool, float, float);
+	void shutdown();
+
+	void begin_scene(float, float, float, float);
+	void end_scene();
+
+	ID3D11Device* get_device();
+	ID3D11DeviceContext* get_device_context();
+	//XMMATRIX get_projection_matrix(XMMATRIX& projectionMatrix);
+	IDXGISwapChain* swap_chain;
+	IDXGISwapChain* get_swap_chain();
+	void resize_swap_chain(int, int);
+	void set_vsync(bool vsync);
+
+
+	XMMATRIX get_projection_matrix() const { return projection_matrix_; };
+	XMMATRIX get_world_matrix() const { return world_matrix_;};
+	XMMATRIX get_ortho_matrix() const { return ortho_matrix_; };
+
+	void get_video_card_info(char*, int&);
+
+	void set_back_buffer_render_target();
+	void reset_viewport();
+
+	void release_resources();
+	void reset_resources(int newWidth, int newHeight);
+	
+	void turn_z_buffer_on();
+	void turn_z_buffer_off();
+
+	void enable_alpha_blending();
+	void disable_alpha_blending();
+
+private:
+	bool vsync_enabled_;
+	int video_card_memory_;
+	char video_card_description_[128];
+	ID3D11Device* device_;
+	ID3D11DeviceContext* device_context_;
+	ID3D11RenderTargetView* render_target_view_;
+	ID3D11Texture2D* depth_stencil_buffer_;
+	ID3D11DepthStencilState* depth_stencil_state_;
+	ID3D11DepthStencilView* depth_stencil_view_;
+	ID3D11RasterizerState* raster_state_;
+	XMMATRIX projection_matrix_;
+	XMMATRIX world_matrix_;
+	XMMATRIX ortho_matrix_;
+	D3D11_VIEWPORT viewport_;
+	ID3D11DepthStencilState* depth_disabled_stencil_state_;
+	ID3D11BlendState* alpha_enable_blending_state_;
+	ID3D11BlendState* alpha_disable_blending_state_;
+};
+
+#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/system/displayplaneclass.h b/enginecustom/src/inc/system/display_plane_class.h
similarity index 80%
rename from enginecustom/src/inc/system/displayplaneclass.h
rename to enginecustom/src/inc/system/display_plane_class.h
index c5e1db3..ce96052 100644
--- a/enginecustom/src/inc/system/displayplaneclass.h
+++ b/enginecustom/src/inc/system/display_plane_class.h
@@ -5,13 +5,13 @@
 ///////////////////////
 // MY CLASS INCLUDES //
 ///////////////////////
-#include "d3dclass.h"
+#include "d_3d_class.h"
 
 
 ////////////////////////////////////////////////////////////////////////////////
-// Class name: DisplayPlaneClass
+// Class name: display_plane_class
 ////////////////////////////////////////////////////////////////////////////////
-class DisplayPlaneClass
+class display_plane_class
 {
 private:
     struct VertexType
@@ -21,9 +21,9 @@ private:
     };
 
 public:
-    DisplayPlaneClass();
-    DisplayPlaneClass(const DisplayPlaneClass&);
-    ~DisplayPlaneClass();
+    display_plane_class();
+    display_plane_class(const display_plane_class&);
+    ~display_plane_class();
 
     bool Initialize(ID3D11Device*, float, float);
     void Shutdown();
diff --git a/enginecustom/src/inc/system/fontclass.h b/enginecustom/src/inc/system/font_class.h
similarity index 86%
rename from enginecustom/src/inc/system/fontclass.h
rename to enginecustom/src/inc/system/font_class.h
index cd5a11e..515b3e9 100644
--- a/enginecustom/src/inc/system/fontclass.h
+++ b/enginecustom/src/inc/system/font_class.h
@@ -13,13 +13,13 @@ using namespace DirectX;
 ///////////////////////
 // MY CLASS INCLUDES //
 ///////////////////////
-#include "textureclass.h"
+#include "texture_class.h"
 
 
 ////////////////////////////////////////////////////////////////////////////////
-// Class name: FontClass
+// Class name: font_class
 ////////////////////////////////////////////////////////////////////////////////
-class FontClass
+class font_class
 {
 private:
     struct FontType
@@ -35,9 +35,9 @@ private:
     };
 
 public:
-    FontClass();
-    FontClass(const FontClass&);
-    ~FontClass();
+    font_class();
+    font_class(const font_class&);
+    ~font_class();
 
     bool Initialize(ID3D11Device*, ID3D11DeviceContext*, int);
     void Shutdown();
@@ -56,7 +56,7 @@ private:
 
 private:
     FontType* m_Font;
-    TextureClass* m_Texture;
+    texture_class* m_Texture;
     float m_fontHeight;
     int m_spaceSize;
 };
diff --git a/enginecustom/src/inc/system/fpsclass.h b/enginecustom/src/inc/system/fps_class.h
similarity index 86%
rename from enginecustom/src/inc/system/fpsclass.h
rename to enginecustom/src/inc/system/fps_class.h
index 8445acd..9f3ccad 100644
--- a/enginecustom/src/inc/system/fpsclass.h
+++ b/enginecustom/src/inc/system/fps_class.h
@@ -15,14 +15,14 @@
 #include <mmsystem.h>
 
 ////////////////////////////////////////////////////////////////////////////////
-// Class name: FpsClass
+// Class name: fps_class
 ////////////////////////////////////////////////////////////////////////////////
-class FpsClass
+class fps_class
 {
 public:
-    FpsClass();
-    FpsClass(const FpsClass&);
-    ~FpsClass();
+    fps_class();
+    fps_class(const fps_class&);
+    ~fps_class();
 
     void Initialize();
     void Frame();
diff --git a/enginecustom/src/inc/system/fps_limiter.h b/enginecustom/src/inc/system/fps_limiter.h
new file mode 100644
index 0000000..dc108ed
--- /dev/null
+++ b/enginecustom/src/inc/system/fps_limiter.h
@@ -0,0 +1,22 @@
+#pragma once
+#include <chrono>
+
+class fps_limiter {
+public:
+    explicit fps_limiter(const float target_fps = 60.0f)
+        : min_delta_(1.0f / target_fps), last_time_(std::chrono::high_resolution_clock::now()) {}
+
+    // Retourne true si la fonction peut etre executee
+    bool should_run() {
+        const auto now = std::chrono::high_resolution_clock::now();
+        if (const float elapsed = std::chrono::duration<float>(now - last_time_).count(); elapsed >= min_delta_) {
+            last_time_ = now;
+            return true;
+        }
+        return false;
+    }
+
+private:
+    float min_delta_;
+    std::chrono::high_resolution_clock::time_point last_time_;
+};
\ No newline at end of file
diff --git a/enginecustom/src/inc/system/frustum.h b/enginecustom/src/inc/system/frustum.h
index eac209a..36cca75 100644
--- a/enginecustom/src/inc/system/frustum.h
+++ b/enginecustom/src/inc/system/frustum.h
@@ -1,7 +1,7 @@
 #include <DirectXMath.h>
 using namespace DirectX;
 
-class Frustum
+class frustum
 {
 public:
     void ConstructFrustum(float screenDepth, XMMATRIX projectionMatrix, XMMATRIX viewMatrix);
diff --git a/enginecustom/src/inc/system/imguiManager.h b/enginecustom/src/inc/system/imguiManager.h
index 73af990..f5097bd 100644
--- a/enginecustom/src/inc/system/imguiManager.h
+++ b/enginecustom/src/inc/system/imguiManager.h
@@ -4,15 +4,24 @@
 
 #include "Logger.h"
 #include "sceneManager.h"
+#include "fps_limiter.h"
 
 #include <imgui.h>
 #include <imgui_impl_dx11.h>
 #include <imgui_impl_win32.h>
 #include <windows.h>
 #include <deque>
-#include "rendertextureclass.h"
+#include <functional>
 
-class ApplicationClass;
+#include "render_texture_class.h"
+
+class application_class;
+
+struct widget_entry
+{
+	bool* show;
+	std::function<void()> func;
+};
 
 class imguiManager
 {
@@ -22,29 +31,32 @@ public:
 
 	bool Initialize(HWND hwnd, ID3D11Device* device, ID3D11DeviceContext* deviceContext);
 	void Shutdown();
-	void Render(ApplicationClass* app);
+	void Render();
 	void NewFrame();
-	void SetupDockspace(ApplicationClass* app);
+	void SetupDockspace();
 
 	// Widgets
 	void WidgetSpeedSlider(float* speed);
 	void WidgetButton();
 	void WidgetFPS();
-	void WidgetAddObject(ApplicationClass* app);
+	void WidgetAddObject();
 
-	void WidgetObjectWindow(ApplicationClass* app);
-	void WidgetTerrainWindow(ApplicationClass* app);
-	void WidgetLightWindow(ApplicationClass* app);
-	void WidgetEngineSettingsWindow(ApplicationClass* app);
-	void WidgetRenderWindow(ApplicationClass* app, ImVec2 availableSize);
-	void WidgetLogWindow(ApplicationClass* app);
-	void WidgetRenderStats(ApplicationClass* app);
+	void WidgetObjectWindow();
+	void WidgetTerrainWindow();
+	void WidgetLightWindow();
+	void WidgetEngineSettingsWindow();
+	void WidgetRenderWindow(ImVec2 availableSize);
+	void WidgetLogWindow();
+	void WidgetRenderStats();
 
-	bool ImGuiWidgetRenderer(ApplicationClass* app);
+	bool ImGuiWidgetRenderer();
 
 	void SetWindowSize(ImVec2 size) { windowSize = size; }
 	ImVec2 GetWindowSize() const { return windowSize; }
 
+	// Getters
+	void SetApp(application_class* app) { app_ = app; }
+
 	// Shader toggles
 
 	bool m_EnableCelShading;
@@ -59,6 +71,9 @@ private:
 	// ----------------- Variables ----------------- //
 	// --------------------------------------------- //
 
+	std::vector<widget_entry> widgets_;
+
+	application_class* app_;
 	
 	bool showObjectWindow;
 	bool showTerrainWindow;
@@ -83,9 +98,12 @@ private:
 	ID3D11DeviceContext* m_deviceContext;
 	ImVec2 windowSize;
 
-	RenderTextureClass* m_renderTexture;
+	render_texture_class* m_renderTexture;
 
 	const std::deque<Logger::LogEntry>& logBuffer = Logger::Get().GetLogBuffer();
+
+	int current_fps_, min_fps_, max_fps_, draw_calls_, total_vertex_count_, total_triangle_count_, visible_triangle_count_;
+	float current_frame_time_, min_frame_time_, max_frame_time_ ;
 };
 
 #endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/system/inputclass.h b/enginecustom/src/inc/system/input_class.h
similarity index 93%
rename from enginecustom/src/inc/system/inputclass.h
rename to enginecustom/src/inc/system/input_class.h
index 9eff710..76a3fd2 100644
--- a/enginecustom/src/inc/system/inputclass.h
+++ b/enginecustom/src/inc/system/input_class.h
@@ -19,14 +19,14 @@
 #include <dinput.h>
 
 ////////////////////////////////////////////////////////////////////////////////
-// Class name: InputClass
+// Class name: input_class
 ////////////////////////////////////////////////////////////////////////////////
-class InputClass
+class input_class
 {
 public:
-	InputClass();
-	InputClass(const InputClass&);
-	~InputClass();
+	input_class();
+	input_class(const input_class&);
+	~input_class();
 
 	bool Initialize(HINSTANCE, HWND, int, int);
 	void Shutdown();
diff --git a/enginecustom/src/inc/system/lightclass.h b/enginecustom/src/inc/system/light_class.h
similarity index 91%
rename from enginecustom/src/inc/system/lightclass.h
rename to enginecustom/src/inc/system/light_class.h
index e96c8f7..012e8af 100644
--- a/enginecustom/src/inc/system/lightclass.h
+++ b/enginecustom/src/inc/system/light_class.h
@@ -14,14 +14,14 @@ using namespace DirectX;
 
 
 ////////////////////////////////////////////////////////////////////////////////
-// Class name: LightClass
+// Class name: light_class
 ////////////////////////////////////////////////////////////////////////////////
-class LightClass
+class light_class
 {
 public:
-    LightClass();
-    LightClass(const LightClass&);
-    ~LightClass();
+    light_class();
+    light_class(const light_class&);
+    ~light_class();
 
 	void SetAmbientColor(float, float, float, float);
 	void SetDiffuseColor(float, float, float, float);
diff --git a/enginecustom/src/inc/system/modelclass.h b/enginecustom/src/inc/system/model_class.h
similarity index 92%
rename from enginecustom/src/inc/system/modelclass.h
rename to enginecustom/src/inc/system/model_class.h
index 4b0468c..0743d03 100644
--- a/enginecustom/src/inc/system/modelclass.h
+++ b/enginecustom/src/inc/system/model_class.h
@@ -20,7 +20,7 @@ using namespace std;
 ///////////////////////
 // MY CLASS INCLUDES //
 ///////////////////////
-#include "textureclass.h"
+#include "texture_class.h"
 
 enum class TextureType
 {
@@ -46,7 +46,7 @@ struct TextureContainer
 	std::vector<std::wstring> alphaPaths;
 
 
-	// Get the vector of textures based on the type
+	// Get the vector of textures_ based on the type
 	std::vector<ID3D11ShaderResourceView*>& Get(TextureType type) const {
 		switch (type) {
 		case TextureType::Diffuse:  return const_cast<std::vector<ID3D11ShaderResourceView*>&>(diffuse);
@@ -57,7 +57,7 @@ struct TextureContainer
 		}
 	}
 
-	// Get the vector of textures paths based on the type
+	// Get the vector of textures_ paths based on the type
 	std::vector<std::wstring> GetPaths(TextureType type) const {
 		switch (type)
 		{
@@ -87,7 +87,7 @@ struct TextureContainer
 		return L"";
 	}
 
-	// Release all textures and textures paths
+	// Release all textures_ and textures_ paths
 
 	void ReleaseAll() {
 		ReleaseVector(diffuse);
@@ -145,9 +145,9 @@ private:
 	}
 };
 ////////////////////////////////////////////////////////////////////////////////
-// Class name: ModelClass
+// Class name: model_class
 ////////////////////////////////////////////////////////////////////////////////
-class ModelClass
+class model_class
 {
 protected:
 
@@ -200,15 +200,15 @@ protected:
 	};
 
 public:
-	ModelClass();
-	ModelClass(const ModelClass&) = delete;
-	ModelClass& operator=(const ModelClass&) = delete;
-	~ModelClass();
+	model_class();
+	model_class(const model_class&) = delete;
+	model_class& operator=(const model_class&) = delete;
+	~model_class();
 
-	//bool Initialize(ID3D11Device*, ID3D11DeviceContext*, char*, std::vector<ID3D11ShaderResourceView*>);
+	//bool initialize(ID3D11Device*, ID3D11DeviceContext*, char*, std::vector<ID3D11ShaderResourceView*>);
     // Nouvelle surcharge avec TextureContainer
 	bool Initialize(ID3D11Device*, ID3D11DeviceContext*, char*, const TextureContainer&);
-	// Nouvelle méthode - initialisation sans textures
+	// Nouvelle méthode - initialisation sans textures_
 	bool Initialize(ID3D11Device*, ID3D11DeviceContext*, char*);
 	void Shutdown();
 	void Render(ID3D11DeviceContext*);
@@ -218,7 +218,7 @@ public:
 
 	// TEXTURE //
 	
-	//ID3D11ShaderResourceView* GetTexture(int index) const;
+	//ID3D11ShaderResourceView* get_texture(int index) const;
 	ID3D11ShaderResourceView* GetTexture(TextureType type, int index) const;
 	
 	//bool ChangeTexture(ID3D11Device* device, ID3D11DeviceContext* deviceContext, std::wstring filename, int index);
diff --git a/enginecustom/src/inc/system/object.h b/enginecustom/src/inc/system/object.h
index 13a5b68..a0c0b30 100644
--- a/enginecustom/src/inc/system/object.h
+++ b/enginecustom/src/inc/system/object.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "modelclass.h"
+#include "model_class.h"
 #include <WICTextureLoader.h>
 #include <SimpleMath.h>
 
-#include "d3dclass.h"
+#include "d_3d_class.h"
 
 enum class ObjectType
 {
@@ -26,14 +26,14 @@ enum class ShaderType
 	ALPHA_MAPPING
 };
 
-class Object : public ModelClass
+class object : public model_class
 {
 public:
-	Object();
-	~Object();
+	object();
+	~object();
 
-	Object(const Object&) = delete;
-	Object& operator=(const Object&) = delete;
+	object(const object&) = delete;
+	object& operator=(const object&) = delete;
 
 	void SetScaleMatrix(XMMATRIX scaleMatrix);
 	void SetRotateMatrix(XMMATRIX rotateMatrix);
@@ -103,7 +103,7 @@ public:
 
 	void LaunchObject();
 	bool LoadTexturesFromPath(std::vector<std::wstring>& texturePaths, TextureContainer& texturesContainer,
-	                          D3DClass* m_Direct3D);
+	                          d_3d_class* m_Direct3D);
 	bool SetupInstancing(ID3D11Device* device, const std::vector<XMMATRIX>& instanceTransforms);
 	void EnableInstancing(bool enabled);
 	void SetInstanceCount(int count);
diff --git a/enginecustom/src/inc/system/physics.h b/enginecustom/src/inc/system/physics.h
index bc73660..7c0f748 100644
--- a/enginecustom/src/inc/system/physics.h
+++ b/enginecustom/src/inc/system/physics.h
@@ -4,21 +4,21 @@
 #include "object.h"
 #include "math.h"
 
-class Physics : public Object
+class physics : public object
 {
 public:
-    Physics();
-    explicit Physics(const Physics&); // Use explicit to avoid implicit conversion
-    ~Physics();
+    physics();
+    explicit physics(const physics&); // Use explicit to avoid implicit conversion
+    ~physics();
 
     XMVECTOR GetGravity() const; // Get the gravity value
     void SetGravity(XMVECTOR gravity); // Define the gravity value
-    void ApplyGravity(Object*, float); // Apply gravity to an object
-    void AddForce(Object*, XMVECTOR);
-    bool IsColliding(Object*, Object*);
-    bool CubesOverlap(Object*, Object*);
-    bool SpheresOverlap(Object*, Object*);
-    bool SphereCubeOverlap(Object*, Object*);
+    void ApplyGravity(object*, float); // Apply gravity to an object
+    void AddForce(object*, XMVECTOR);
+    bool IsColliding(object*, object*);
+    bool CubesOverlap(object*, object*);
+    bool SpheresOverlap(object*, object*);
+    bool SphereCubeOverlap(object*, object*);
 
 private:
     XMVECTOR m_gravity;
diff --git a/enginecustom/src/inc/system/Positionclass.h b/enginecustom/src/inc/system/position_class.h
similarity index 85%
rename from enginecustom/src/inc/system/Positionclass.h
rename to enginecustom/src/inc/system/position_class.h
index 8e1fbc8..df1b50c 100644
--- a/enginecustom/src/inc/system/Positionclass.h
+++ b/enginecustom/src/inc/system/position_class.h
@@ -9,14 +9,14 @@
 
 
 ////////////////////////////////////////////////////////////////////////////////
-// Class name: PositionClass
+// Class name: position_class
 ////////////////////////////////////////////////////////////////////////////////
-class PositionClass
+class position_class
 {
 public:
-    PositionClass();
-    PositionClass(const PositionClass&);
-    ~PositionClass();
+    position_class();
+    position_class(const position_class&);
+    ~position_class();
 
     void SetFrameTime(float);
     void GetRotation(float&, float&) const;
diff --git a/enginecustom/src/inc/system/rendertextureclass.h b/enginecustom/src/inc/system/render_texture_class.h
similarity index 88%
rename from enginecustom/src/inc/system/rendertextureclass.h
rename to enginecustom/src/inc/system/render_texture_class.h
index e35f662..44d9d86 100644
--- a/enginecustom/src/inc/system/rendertextureclass.h
+++ b/enginecustom/src/inc/system/render_texture_class.h
@@ -15,14 +15,14 @@ using namespace DirectX;
 
 
 ////////////////////////////////////////////////////////////////////////////////
-// Class name: RenderTextureClass
+// Class name: render_texture_class
 ////////////////////////////////////////////////////////////////////////////////
-class RenderTextureClass
+class render_texture_class
 {
 public:
-    RenderTextureClass();
-    RenderTextureClass(const RenderTextureClass&);
-    ~RenderTextureClass();
+    render_texture_class();
+    render_texture_class(const render_texture_class&);
+    ~render_texture_class();
 
     bool Initialize(ID3D11Device*, int, int, float, float, int);
     void Shutdown();
diff --git a/enginecustom/src/inc/system/Spriteclass.h b/enginecustom/src/inc/system/sprite_class.h
similarity index 87%
rename from enginecustom/src/inc/system/Spriteclass.h
rename to enginecustom/src/inc/system/sprite_class.h
index 5cf28cf..137c55f 100644
--- a/enginecustom/src/inc/system/Spriteclass.h
+++ b/enginecustom/src/inc/system/sprite_class.h
@@ -13,13 +13,13 @@ using namespace DirectX;
 ///////////////////////
 // MY CLASS INCLUDES //
 ///////////////////////
-#include "textureclass.h"
+#include "texture_class.h"
 
 
 ////////////////////////////////////////////////////////////////////////////////
-// Class name: SpriteClass
+// Class name: sprite_class
 ////////////////////////////////////////////////////////////////////////////////
-class SpriteClass
+class sprite_class
 {
 private:
     struct VertexType
@@ -29,9 +29,9 @@ private:
     };
 
 public:
-    SpriteClass();
-    SpriteClass(const SpriteClass&);
-    ~SpriteClass();
+    sprite_class();
+    sprite_class(const sprite_class&);
+    ~sprite_class();
 
     bool Initialize(ID3D11Device*, ID3D11DeviceContext*, int, int, char*, int, int);
     void Shutdown();
@@ -55,7 +55,7 @@ private:
 private:
     ID3D11Buffer* m_vertexBuffer, * m_indexBuffer;
     int m_vertexCount, m_indexCount, m_screenWidth, m_screenHeight, m_bitmapWidth, m_bitmapHeight, m_renderX, m_renderY, m_prevPosX, m_prevPosY;
-    TextureClass* m_Textures;
+    texture_class* m_Textures;
     float m_frameTime, m_cycleTime;
     int m_currentTexture, m_textureCount;
 };
diff --git a/enginecustom/src/inc/system/system_class.h b/enginecustom/src/inc/system/system_class.h
new file mode 100644
index 0000000..079df80
--- /dev/null
+++ b/enginecustom/src/inc/system/system_class.h
@@ -0,0 +1,72 @@
+#ifndef _SYSTEMCLASS_H_
+#define _SYSTEMCLASS_H_
+
+#define WIN32_LEAN_AND_MEAN
+
+static bool DEBUG_MODE = true;
+
+#include "Logger.h"
+
+#include "input_class.h"
+#include "application_class.h"
+#include "imguiManager.h"
+#include <mutex>
+#include <filesystem>
+#include <commdlg.h>
+
+#include "../resources.h"
+#include <chrono>
+
+class system_class
+{
+public:
+	system_class();
+	system_class(const system_class&);
+	~system_class();
+
+	bool initialize();
+	void shutdown();
+	void run();
+
+	LRESULT CALLBACK message_handler(HWND, UINT, WPARAM, LPARAM);
+
+	void send_path(wchar_t* path, std::filesystem::path w_folder);
+
+protected:
+	bool frame();
+	void initialize_windows(int&, int&);
+	void shutdown_windows();
+
+private:
+	LPCWSTR application_name_;
+	HINSTANCE hinstance_;
+	HWND hwnd_;
+
+	input_class* input_;
+	application_class* application_;
+	imguiManager* imgui_manager_;
+
+	int initial_window_width_;
+	int initial_window_height_;
+	bool is_direct_3d_initialized_;
+	bool is_resizing_ = false;
+	bool is_debug_key_pressed_ = false;
+
+	std::mutex render_mutex_;
+	
+};
+
+
+/////////////////////////
+// FUNCTION PROTOTYPES //
+/////////////////////////
+static LRESULT CALLBACK wnd_proc(HWND, UINT, WPARAM, LPARAM);
+
+
+/////////////
+// GLOBALS //
+/////////////
+static system_class* application_handle = 0;
+
+
+#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/system/systemclass.h b/enginecustom/src/inc/system/systemclass.h
deleted file mode 100644
index 34ec4e5..0000000
--- a/enginecustom/src/inc/system/systemclass.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef _SYSTEMCLASS_H_
-#define _SYSTEMCLASS_H_
-
-#define WIN32_LEAN_AND_MEAN
-
-static bool DEBUG_MODE = true;
-
-#include "Logger.h"
-
-#include "inputclass.h"
-#include "applicationclass.h"
-#include "imguiManager.h"
-#include <mutex>
-#include <filesystem>
-#include <commdlg.h>
-
-#include "../resources.h"
-#include <chrono>
-
-class SystemClass
-{
-public:
-	SystemClass();
-	SystemClass(const SystemClass&);
-	~SystemClass();
-
-	bool Initialize();
-	void Shutdown();
-	void Run();
-
-	LRESULT CALLBACK MessageHandler(HWND, UINT, WPARAM, LPARAM);
-
-	void SendPath(wchar_t* path, std::filesystem::path WFolder);
-
-	void GetScenePath();
-
-protected:
-	bool Frame();
-	void InitializeWindows(int&, int&);
-	void ShutdownWindows();
-
-private:
-	LPCWSTR m_applicationName;
-	HINSTANCE m_hinstance;
-	HWND m_hwnd;
-
-	InputClass* m_Input;
-	ApplicationClass* m_Application;
-	imguiManager* m_imguiManager;
-
-	int m_initialWindowWidth;
-	int m_initialWindowHeight;
-	bool m_isDirect3DInitialized;
-	bool m_isResizing = false;
-	bool m_IsDebugKeyPressed = false;
-
-	std::mutex renderMutex;
-};
-
-
-/////////////////////////
-// FUNCTION PROTOTYPES //
-/////////////////////////
-static LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
-
-
-/////////////
-// GLOBALS //
-/////////////
-static SystemClass* ApplicationHandle = 0;
-
-
-#endif
\ No newline at end of file
diff --git a/enginecustom/src/inc/system/textclass.h b/enginecustom/src/inc/system/text_class.h
similarity index 72%
rename from enginecustom/src/inc/system/textclass.h
rename to enginecustom/src/inc/system/text_class.h
index 005c7ff..5ef7cc1 100644
--- a/enginecustom/src/inc/system/textclass.h
+++ b/enginecustom/src/inc/system/text_class.h
@@ -5,11 +5,11 @@
 ///////////////////////
 // MY CLASS INCLUDES //
 ///////////////////////
-#include "fontclass.h"
+#include "font_class.h"
 ////////////////////////////////////////////////////////////////////////////////
-// Class name: TextClass
+// Class name: text_class
 ////////////////////////////////////////////////////////////////////////////////
-class TextClass
+class text_class
 {
 private:
     struct VertexType
@@ -19,21 +19,21 @@ private:
     };
 
 public:
-    TextClass();
-    TextClass(const TextClass&);
-    ~TextClass();
+    text_class();
+    text_class(const text_class&);
+    ~text_class();
 
-    bool Initialize(ID3D11Device*, ID3D11DeviceContext*, int, int, int, FontClass*, char*, int, int, float, float, float);
+    bool Initialize(ID3D11Device*, ID3D11DeviceContext*, int, int, int, font_class*, char*, int, int, float, float, float);
     void Shutdown();
     void Render(ID3D11DeviceContext*);
 
     int GetIndexCount();
 
-    bool UpdateText(ID3D11DeviceContext*, FontClass*, char*, int, int, float, float, float);
+    bool UpdateText(ID3D11DeviceContext*, font_class*, char*, int, int, float, float, float);
     XMFLOAT4 GetPixelColor();
 
 private:
-    bool InitializeBuffers(ID3D11Device*, ID3D11DeviceContext*, FontClass*, char*, int, int, float, float, float);
+    bool InitializeBuffers(ID3D11Device*, ID3D11DeviceContext*, font_class*, char*, int, int, float, float, float);
     void ShutdownBuffers();
     void RenderBuffers(ID3D11DeviceContext*);
 
diff --git a/enginecustom/src/inc/system/textureclass.h b/enginecustom/src/inc/system/texture_class.h
similarity index 87%
rename from enginecustom/src/inc/system/textureclass.h
rename to enginecustom/src/inc/system/texture_class.h
index 3d30004..147c0be 100644
--- a/enginecustom/src/inc/system/textureclass.h
+++ b/enginecustom/src/inc/system/texture_class.h
@@ -11,9 +11,9 @@
 
 
 ////////////////////////////////////////////////////////////////////////////////
-// Class name: TextureClass
+// Class name: texture_class
 ////////////////////////////////////////////////////////////////////////////////
-class TextureClass
+class texture_class
 {
 private:
     struct TargaHeader
@@ -26,9 +26,9 @@ private:
     };
 
 public:
-    TextureClass();
-    TextureClass(const TextureClass&);
-    ~TextureClass();
+    texture_class();
+    texture_class(const texture_class&);
+    ~texture_class();
 
     bool Initialize(ID3D11Device*, ID3D11DeviceContext*, std::string);
     void Shutdown();
diff --git a/enginecustom/src/inc/system/Timerclass.h b/enginecustom/src/inc/system/timer_class.h
similarity index 79%
rename from enginecustom/src/inc/system/Timerclass.h
rename to enginecustom/src/inc/system/timer_class.h
index 89a1c08..d0af25e 100644
--- a/enginecustom/src/inc/system/Timerclass.h
+++ b/enginecustom/src/inc/system/timer_class.h
@@ -10,14 +10,14 @@
 
 
 ////////////////////////////////////////////////////////////////////////////////
-// Class name: TimerClass
+// Class name: timer_class
 ////////////////////////////////////////////////////////////////////////////////
-class TimerClass
+class timer_class
 {
 public:
-    TimerClass();
-    TimerClass(const TimerClass&);
-    ~TimerClass();
+    timer_class();
+    timer_class(const timer_class&);
+    ~timer_class();
 
     bool Initialize();
     void Frame();
diff --git a/enginecustom/src/src/shader/alphamapshaderclass.cpp b/enginecustom/src/src/shader/alpha_map_shader_class.cpp
similarity index 77%
rename from enginecustom/src/src/shader/alphamapshaderclass.cpp
rename to enginecustom/src/src/shader/alpha_map_shader_class.cpp
index 6267a09..f24b027 100644
--- a/enginecustom/src/src/shader/alphamapshaderclass.cpp
+++ b/enginecustom/src/src/shader/alpha_map_shader_class.cpp
@@ -1,29 +1,29 @@
-#include "alphamapshaderclass.h"
+#include "alpha_map_shader_class.h"
 
 
-AlphaMapShaderClass::AlphaMapShaderClass()
+alpha_map_shader_class::alpha_map_shader_class()
 {
-    m_vertexShader = 0;
-    m_pixelShader = 0;
-    m_layout = 0;
-    m_matrixBuffer = 0;
-    m_sampleState = 0;
+    vertex_shader_ = 0;
+    pixel_shader_ = 0;
+    layout_ = 0;
+    matrix_buffer_ = 0;
+    sample_state_ = 0;
 }
 
 
-AlphaMapShaderClass::AlphaMapShaderClass(const AlphaMapShaderClass& other)
+alpha_map_shader_class::alpha_map_shader_class(const alpha_map_shader_class& other)
 {
 }
 
 
-AlphaMapShaderClass::~AlphaMapShaderClass()
+alpha_map_shader_class::~alpha_map_shader_class()
 {
 }
 
 
-bool AlphaMapShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
+bool alpha_map_shader_class::initialize(ID3D11Device* device, HWND hwnd)
 {
-    Logger::Get().Log("Initializing AlphaMapShaderClass", __FILE__, __LINE__, Logger::LogLevel::Initialize);
+    Logger::Get().Log("Initializing alpha_map_shader_class", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
     bool result;
     wchar_t vsFilename[128];
@@ -46,8 +46,8 @@ bool AlphaMapShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
         return false;
     }
 
-    // Initialize the vertex and pixel shaders.
-    result = InitializeShader(device, hwnd, vsFilename, psFilename);
+    // initialize the vertex and pixel shaders.
+    result = initialize_shader(device, hwnd, vsFilename, psFilename);
     if (!result)
     {
         Logger::Get().Log("Error initializing shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -58,23 +58,23 @@ bool AlphaMapShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
 }
 
 
-void AlphaMapShaderClass::Shutdown()
+void alpha_map_shader_class::shutdown()
 {
-    // Shutdown the vertex and pixel shaders as well as the related objects.
-    ShutdownShader();
+    // shutdown the vertex and pixel shaders as well as the related objects.
+    shutdown_shader();
 
     return;
 }
 
 
-bool AlphaMapShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+bool alpha_map_shader_class::render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
     ID3D11ShaderResourceView* texture1, ID3D11ShaderResourceView* texture2, ID3D11ShaderResourceView* texture3)
 {
     bool result;
 
 
     // Set the shader parameters that it will use for rendering.
-    result = SetShaderParameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture1, texture2, texture3);
+    result = set_shader_parameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture1, texture2, texture3);
     if (!result)
     {
         Logger::Get().Log("Error setting shader parameters", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -82,13 +82,13 @@ bool AlphaMapShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCo
     }
 
     // Now render the prepared buffers with the shader.
-    RenderShader(deviceContext, indexCount);
+    render_shader(deviceContext, indexCount);
 
     return true;
 }
 
 
-bool AlphaMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
+bool alpha_map_shader_class::initialize_shader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
 {
     Logger::Get().Log("Initializing shader", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -102,7 +102,7 @@ bool AlphaMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
     D3D11_SAMPLER_DESC samplerDesc;
 
 
-    // Initialize the pointers this function will use to null.
+    // initialize the pointers this function will use to null.
     errorMessage = 0;
     vertexShaderBuffer = 0;
     pixelShaderBuffer = 0;
@@ -115,7 +115,7 @@ bool AlphaMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, vsFilename);
+            output_shader_error_message(errorMessage, hwnd, vsFilename);
         }
         // If there was nothing in the error message then it simply could not find the shader file itself.
         else
@@ -134,7 +134,7 @@ bool AlphaMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, psFilename);
+            output_shader_error_message(errorMessage, hwnd, psFilename);
         }
         // If there was nothing in the error message then it simply could not find the file itself.
         else
@@ -146,7 +146,7 @@ bool AlphaMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
     }
 
     // Create the vertex shader from the buffer.
-    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &m_vertexShader);
+    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &vertex_shader_);
     if (FAILED(result))
     {
         Logger::Get().Log("Error creating vertex shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -154,7 +154,7 @@ bool AlphaMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
     }
 
     // Create the pixel shader from the buffer.
-    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &m_pixelShader);
+    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &pixel_shader_);
     if (FAILED(result))
     {
         Logger::Get().Log("Error creating pixel shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -191,7 +191,7 @@ bool AlphaMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
 
     // Create the vertex input layout.
     result = device->CreateInputLayout(polygonLayout, numElements, vertexShaderBuffer->GetBufferPointer(),
-        vertexShaderBuffer->GetBufferSize(), &m_layout);
+        vertexShaderBuffer->GetBufferSize(), &layout_);
     if (FAILED(result))
     {
         Logger::Get().Log("Error creating input layout", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -207,14 +207,14 @@ bool AlphaMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
 
     // Setup the description of the dynamic matrix constant buffer that is in the vertex shader.
     matrixBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    matrixBufferDesc.ByteWidth = sizeof(MatrixBufferType);
+    matrixBufferDesc.ByteWidth = sizeof(matrix_buffer_type);
     matrixBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     matrixBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     matrixBufferDesc.MiscFlags = 0;
     matrixBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&matrixBufferDesc, NULL, &m_matrixBuffer);
+    result = device->CreateBuffer(&matrixBufferDesc, NULL, &matrix_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Error creating constant buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -237,7 +237,7 @@ bool AlphaMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
     samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
 
     // Create the texture sampler state.
-    result = device->CreateSamplerState(&samplerDesc, &m_sampleState);
+    result = device->CreateSamplerState(&samplerDesc, &sample_state_);
     if (FAILED(result))
     {
         Logger::Get().Log("Error creating sampler state", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -250,53 +250,53 @@ bool AlphaMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
 }
 
 
-void AlphaMapShaderClass::ShutdownShader()
+void alpha_map_shader_class::shutdown_shader()
 {
 
     Logger::Get().Log("Shutting down shader", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
     // Release the sampler state.
-    if (m_sampleState)
+    if (sample_state_)
     {
         Logger::Get().Log("Releasing sampler state", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
-        m_sampleState->Release();
-        m_sampleState = 0;
+        sample_state_->Release();
+        sample_state_ = 0;
         Logger::Get().Log("Sampler state released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
     }
 
     // Release the matrix constant buffer.
-    if (m_matrixBuffer)
+    if (matrix_buffer_)
     {
         Logger::Get().Log("Releasing constant buffer", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
-        m_matrixBuffer->Release();
-        m_matrixBuffer = 0;
+        matrix_buffer_->Release();
+        matrix_buffer_ = 0;
         Logger::Get().Log("Constant buffer released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
     }
 
     // Release the layout.
-    if (m_layout)
+    if (layout_)
     {
         Logger::Get().Log("Releasing layout", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
-        m_layout->Release();
-        m_layout = 0;
+        layout_->Release();
+        layout_ = 0;
         Logger::Get().Log("Layout released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
     }
 
     // Release the pixel shader.
-    if (m_pixelShader)
+    if (pixel_shader_)
     {
         Logger::Get().Log("Releasing pixel shader", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
-        m_pixelShader->Release();
-        m_pixelShader = 0;
+        pixel_shader_->Release();
+        pixel_shader_ = 0;
         Logger::Get().Log("Pixel shader released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
     }
 
     // Release the vertex shader.
-    if (m_vertexShader)
+    if (vertex_shader_)
     {
         Logger::Get().Log("Releasing vertex shader", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
-        m_vertexShader->Release();
-        m_vertexShader = 0;
+        vertex_shader_->Release();
+        vertex_shader_ = 0;
         Logger::Get().Log("Vertex shader released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
     }
 
@@ -306,7 +306,7 @@ void AlphaMapShaderClass::ShutdownShader()
 }
 
 
-void AlphaMapShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
+void alpha_map_shader_class::output_shader_error_message(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
 {
     char* compileErrors;
     unsigned long long bufferSize, i;
@@ -342,12 +342,12 @@ void AlphaMapShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWN
 }
 
 
-bool AlphaMapShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+bool alpha_map_shader_class::set_shader_parameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
     ID3D11ShaderResourceView* texture1, ID3D11ShaderResourceView* texture2, ID3D11ShaderResourceView* texture3)
 {
     HRESULT result;
     D3D11_MAPPED_SUBRESOURCE mappedResource;
-    MatrixBufferType* dataPtr;
+    matrix_buffer_type* dataPtr;
     unsigned int bufferNumber;
 
 
@@ -357,7 +357,7 @@ bool AlphaMapShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext
     projectionMatrix = XMMatrixTranspose(projectionMatrix);
 
     // Lock the constant buffer so it can be written to.
-    result = deviceContext->Map(m_matrixBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(matrix_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         Logger::Get().Log("Error mapping constant buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -365,7 +365,7 @@ bool AlphaMapShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr = (MatrixBufferType*)mappedResource.pData;
+    dataPtr = (matrix_buffer_type*)mappedResource.pData;
 
     // Copy the matrices into the constant buffer.
     dataPtr->world = worldMatrix;
@@ -373,13 +373,13 @@ bool AlphaMapShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext
     dataPtr->projection = projectionMatrix;
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_matrixBuffer, 0);
+    deviceContext->Unmap(matrix_buffer_, 0);
 
     // Set the position of the constant buffer in the vertex shader.
     bufferNumber = 0;
 
     // Finally set the constant buffer in the vertex shader with the updated values.
-    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &m_matrixBuffer);
+    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &matrix_buffer_);
 
     // Set shader texture resources in the pixel shader.
     deviceContext->PSSetShaderResources(0, 1, &texture1);
@@ -390,20 +390,20 @@ bool AlphaMapShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext
 }
 
 
-void AlphaMapShaderClass::RenderShader(ID3D11DeviceContext* deviceContext, int indexCount)
+void alpha_map_shader_class::render_shader(ID3D11DeviceContext* deviceContext, int indexCount)
 {
 
     // Set the vertex input layout.
-    deviceContext->IASetInputLayout(m_layout);
+    deviceContext->IASetInputLayout(layout_);
 
     // Set the vertex and pixel shaders that will be used to render this triangle.
-    deviceContext->VSSetShader(m_vertexShader, NULL, 0);
-    deviceContext->PSSetShader(m_pixelShader, NULL, 0);
+    deviceContext->VSSetShader(vertex_shader_, NULL, 0);
+    deviceContext->PSSetShader(pixel_shader_, NULL, 0);
 
     // Set the sampler state in the pixel shader.
-    deviceContext->PSSetSamplers(0, 1, &m_sampleState);
+    deviceContext->PSSetSamplers(0, 1, &sample_state_);
 
-    // Render the triangle.
+    // render the triangle.
     deviceContext->DrawIndexed(indexCount, 0, 0);
 
     return;
diff --git a/enginecustom/src/src/shader/CelShadingShader.cpp b/enginecustom/src/src/shader/celshade_class.cpp
similarity index 68%
rename from enginecustom/src/src/shader/CelShadingShader.cpp
rename to enginecustom/src/src/shader/celshade_class.cpp
index fa31940..1298910 100644
--- a/enginecustom/src/src/shader/CelShadingShader.cpp
+++ b/enginecustom/src/src/shader/celshade_class.cpp
@@ -1,34 +1,34 @@
 ////////////////////////////////////////////////////////////////////////////////
 // Filename: lightshaderclass.cpp
 ////////////////////////////////////////////////////////////////////////////////
-#include "CelShadingShader.h"
+#include "celshade_class.h"
 
 
-CelshadeClass::CelshadeClass()
+celshade_class::celshade_class()
 {
-    m_vertexShader = 0;
-    m_pixelShader = 0;
-    m_layout = 0;
-    m_sampleState = 0;
-    m_matrixBuffer = 0;
-    m_cameraBuffer = 0;
-    m_sunlightBuffer = 0;
-    m_sunlightColorBuffer = 0;
-    m_sunlightPositionBuffer = 0;
+    vertex_shader_ = 0;
+    pixel_shader_ = 0;
+    layout_ = 0;
+    sample_state_ = 0;
+    matrix_buffer_ = 0;
+    camera_buffer_ = 0;
+    sunlight_buffer_ = 0;
+    sunlight_color_buffer_ = 0;
+    sunlight_position_buffer_ = 0;
 }
 
 
-CelshadeClass::CelshadeClass(const CelshadeClass& other)
+celshade_class::celshade_class(const celshade_class& other)
 {
 }
 
 
-CelshadeClass::~CelshadeClass()
+celshade_class::~celshade_class()
 {
 }
 
 
-bool CelshadeClass::Initialize(ID3D11Device* device, HWND hwnd)
+bool celshade_class::initialize(ID3D11Device* device, HWND hwnd)
 {
     Logger::Get().Log("Initializing LightShaderClass", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -52,8 +52,8 @@ bool CelshadeClass::Initialize(ID3D11Device* device, HWND hwnd)
         Logger::Get().Log("Failed to copy string", __FILE__, __LINE__, Logger::LogLevel::Error);
         return false;
     }
-    // Initialize the vertex and pixel shaders.
-    result = InitializeShader(device, hwnd, vsFilename, psFilename);
+    // initialize the vertex and pixel shaders.
+    result = initialize_shader(device, hwnd, vsFilename, psFilename);
     if (!result)
     {
         Logger::Get().Log("Failed to initialize shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -66,22 +66,22 @@ bool CelshadeClass::Initialize(ID3D11Device* device, HWND hwnd)
 }
 
 
-void CelshadeClass::Shutdown()
+void celshade_class::shutdown()
 {
-    // Shutdown the vertex and pixel shaders as well as the related objects.
-    ShutdownShader();
+    // shutdown the vertex and pixel shaders as well as the related objects.
+    shutdown_shader();
 
     return;
 }
 
-bool CelshadeClass::Render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
-    ID3D11ShaderResourceView* texture, XMFLOAT4 diffuseColor, XMFLOAT4 ambientColor, XMFLOAT3 sunDirection, float sunIntensity)
+bool celshade_class::render(ID3D11DeviceContext* deviceContext, int index_count, XMMATRIX world_matrix, XMMATRIX view_matrix, XMMATRIX projection_matrix,
+    ID3D11ShaderResourceView* texture, XMFLOAT4 diffuse_color, XMFLOAT4 ambient_color, XMFLOAT3 sun_direction, float sunIntensity)
 {
     bool result;
 
 
     // Set the shader parameters that it will use for rendering.
-    result = SetShaderParameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture, diffuseColor, ambientColor, sunDirection, sunIntensity);
+    result = set_shader_parameters(deviceContext, world_matrix, view_matrix, projection_matrix, texture, diffuse_color, ambient_color, sun_direction, sunIntensity);
     if (!result)
     {
         Logger::Get().Log("Failed to set shader parameters", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -89,13 +89,13 @@ bool CelshadeClass::Render(ID3D11DeviceContext* deviceContext, int indexCount, X
     }
 
     // Now render the prepared buffers with the shader.
-    RenderShader(deviceContext, indexCount);
+    render_shader(deviceContext, index_count);
 
     return true;
 }
 
 
-bool CelshadeClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
+bool celshade_class::initialize_shader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
 {
     Logger::Get().Log("Initializing shader", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -109,7 +109,7 @@ bool CelshadeClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsF
     D3D11_BUFFER_DESC matrixBufferDesc;
     D3D11_BUFFER_DESC sunlightBufferDesc;
 
-    // Initialize the pointers this function will use to null.
+    // initialize the pointers this function will use to null.
     errorMessage = 0;
     vertexShaderBuffer = 0;
     pixelShaderBuffer = 0;
@@ -120,7 +120,7 @@ bool CelshadeClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsF
     {
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, vsFilename);
+            output_shader_error_message(errorMessage, hwnd, vsFilename);
         }
         else
         {
@@ -135,7 +135,7 @@ bool CelshadeClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsF
     {
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, psFilename);
+            output_shader_error_message(errorMessage, hwnd, psFilename);
         }
         else
         {
@@ -145,7 +145,7 @@ bool CelshadeClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsF
     }
 
     // Create the vertex shader from the buffer.
-    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &m_vertexShader);
+    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &vertex_shader_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create vertex shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -153,7 +153,7 @@ bool CelshadeClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsF
     }
 
     // Create the pixel shader from the buffer.
-    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &m_pixelShader);
+    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &pixel_shader_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create pixel shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -189,7 +189,7 @@ bool CelshadeClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsF
     numElements = sizeof(polygonLayout) / sizeof(polygonLayout[0]);
 
     // Create the vertex input layout.
-    result = device->CreateInputLayout(polygonLayout, numElements, vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), &m_layout);
+    result = device->CreateInputLayout(polygonLayout, numElements, vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), &layout_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create input layout", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -219,7 +219,7 @@ bool CelshadeClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsF
     samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
 
     // Create the texture sampler state.
-    result = device->CreateSamplerState(&samplerDesc, &m_sampleState);
+    result = device->CreateSamplerState(&samplerDesc, &sample_state_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create sampler state", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -228,14 +228,14 @@ bool CelshadeClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsF
 
     // Setup the description of the dynamic matrix constant buffer that is in the vertex shader.
     matrixBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    matrixBufferDesc.ByteWidth = sizeof(MatrixBufferType);
+    matrixBufferDesc.ByteWidth = sizeof(matrix_buffer_type);
     matrixBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     matrixBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     matrixBufferDesc.MiscFlags = 0;
     matrixBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&matrixBufferDesc, NULL, &m_matrixBuffer);
+    result = device->CreateBuffer(&matrixBufferDesc, NULL, &matrix_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create matrix buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -244,14 +244,14 @@ bool CelshadeClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsF
 
     // Setup the description of the dynamic sunlight constant buffer that is in the pixel shader.
     sunlightBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    sunlightBufferDesc.ByteWidth = sizeof(SunLightBufferType);
+    sunlightBufferDesc.ByteWidth = sizeof(sun_light_buffer_type);
     sunlightBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     sunlightBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     sunlightBufferDesc.MiscFlags = 0;
     sunlightBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the pixel shader constant buffer from within this class.
-    result = device->CreateBuffer(&sunlightBufferDesc, NULL, &m_sunlightBuffer);
+    result = device->CreateBuffer(&sunlightBufferDesc, NULL, &sunlight_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create sunlight buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -266,70 +266,70 @@ bool CelshadeClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsF
 
 
 
-void CelshadeClass::ShutdownShader()
+void celshade_class::shutdown_shader()
 {
     Logger::Get().Log("Shutting down SunLightShaderClass", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
     // Release the light constant buffers.
-    if (m_sunlightColorBuffer)
+    if (sunlight_color_buffer_)
     {
-        m_sunlightColorBuffer->Release();
-        m_sunlightColorBuffer = 0;
+        sunlight_color_buffer_->Release();
+        sunlight_color_buffer_ = 0;
     }
 
-    if (m_sunlightPositionBuffer)
+    if (sunlight_position_buffer_)
     {
-        m_sunlightPositionBuffer->Release();
-        m_sunlightPositionBuffer = 0;
+        sunlight_position_buffer_->Release();
+        sunlight_position_buffer_ = 0;
     }
 
     // Release the light constant buffer.
-    if (m_sunlightBuffer)
+    if (sunlight_buffer_)
     {
-        m_sunlightBuffer->Release();
-        m_sunlightBuffer = 0;
+        sunlight_buffer_->Release();
+        sunlight_buffer_ = 0;
     }
 
     // Release the camera constant buffer.
-    if (m_cameraBuffer)
+    if (camera_buffer_)
     {
-        m_cameraBuffer->Release();
-        m_cameraBuffer = 0;
+        camera_buffer_->Release();
+        camera_buffer_ = 0;
     }
 
     // Release the matrix constant buffer.
-    if (m_matrixBuffer)
+    if (matrix_buffer_)
     {
-        m_matrixBuffer->Release();
-        m_matrixBuffer = 0;
+        matrix_buffer_->Release();
+        matrix_buffer_ = 0;
     }
 
     // Release the sampler state.
-    if (m_sampleState)
+    if (sample_state_)
     {
-        m_sampleState->Release();
-        m_sampleState = 0;
+        sample_state_->Release();
+        sample_state_ = 0;
     }
 
     // Release the layout.
-    if (m_layout)
+    if (layout_)
     {
-        m_layout->Release();
-        m_layout = 0;
+        layout_->Release();
+        layout_ = 0;
     }
 
     // Release the pixel shader.
-    if (m_pixelShader)
+    if (pixel_shader_)
     {
-        m_pixelShader->Release();
-        m_pixelShader = 0;
+        pixel_shader_->Release();
+        pixel_shader_ = 0;
     }
 
     // Release the vertex shader.
-    if (m_vertexShader)
+    if (vertex_shader_)
     {
-        m_vertexShader->Release();
-        m_vertexShader = 0;
+        vertex_shader_->Release();
+        vertex_shader_ = 0;
     }
 
     Logger::Get().Log("SunLightShaderClass shut down", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
@@ -338,7 +338,7 @@ void CelshadeClass::ShutdownShader()
 }
 
 
-void CelshadeClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
+void celshade_class::output_shader_error_message(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
 {
     char* compileErrors;
     unsigned __int64 bufferSize, i;
@@ -374,98 +374,98 @@ void CelshadeClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND hwnd
 }
 
 
-bool CelshadeClass::SetShaderParameters(
-    ID3D11DeviceContext* deviceContext,
-    XMMATRIX worldMatrix,
-    XMMATRIX viewMatrix,
-    XMMATRIX projectionMatrix,
+bool celshade_class::set_shader_parameters(
+    ID3D11DeviceContext* device_context,
+    XMMATRIX world_matrix,
+    XMMATRIX view_matrix,
+    XMMATRIX projection_matrix,
     ID3D11ShaderResourceView* texture,
-    XMFLOAT4 ambientColor,
-    XMFLOAT4 diffuseColor,
-    XMFLOAT3 lightDirection,
-    float sunIntensity
+    XMFLOAT4 ambient_color,
+    XMFLOAT4 diffuse_color,
+    XMFLOAT3 light_direction,
+    float sun_intensity
     )
 {
     HRESULT result;
     D3D11_MAPPED_SUBRESOURCE mappedResource;
-    MatrixBufferType* dataPtr;
-    CameraBufferType* dataPtr2;
-    SunLightBufferType* dataPtr3;
+    matrix_buffer_type* dataPtr;
+    camera_buffer_type* dataPtr2;
+    sun_light_buffer_type* dataPtr3;
     unsigned int bufferNumber;
 
     // Transpose the matrices to prepare them for the shader.
-    worldMatrix = XMMatrixTranspose(worldMatrix);
-    viewMatrix = XMMatrixTranspose(viewMatrix);
-    projectionMatrix = XMMatrixTranspose(projectionMatrix);
+    world_matrix = XMMatrixTranspose(world_matrix);
+    view_matrix = XMMatrixTranspose(view_matrix);
+    projection_matrix = XMMatrixTranspose(projection_matrix);
 
     // Lock the constant buffer so it can be written to.
-    result = deviceContext->Map(m_matrixBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = device_context->Map(matrix_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         return false;
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr = (MatrixBufferType*)mappedResource.pData;
+    dataPtr = (matrix_buffer_type*)mappedResource.pData;
 
     // Copy the matrices into the constant buffer.
-    dataPtr->world = worldMatrix;
-    dataPtr->view = viewMatrix;
-    dataPtr->projection = projectionMatrix;
+    dataPtr->world = world_matrix;
+    dataPtr->view = view_matrix;
+    dataPtr->projection = projection_matrix;
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_matrixBuffer, 0);
+    device_context->Unmap(matrix_buffer_, 0);
 
     // Set the position of the constant buffer in the vertex shader.
     bufferNumber = 0;
 
     // Finally set the constant buffer in the vertex shader with the updated values.
-    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &m_matrixBuffer);
+    device_context->VSSetConstantBuffers(bufferNumber, 1, &matrix_buffer_);
 
     // Lock the sunlight constant buffer so it can be written to.
-    result = deviceContext->Map(m_sunlightBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = device_context->Map(sunlight_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         return false;
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr3 = (SunLightBufferType*)mappedResource.pData;
+    dataPtr3 = (sun_light_buffer_type*)mappedResource.pData;
 
     // Copy the lighting variables into the constant buffer.
-    dataPtr3->ambientColor = ambientColor;
-    dataPtr3->diffuseColor = diffuseColor;
-    dataPtr3->sunDirection = lightDirection;
-    dataPtr3->intensity = sunIntensity;
+    dataPtr3->ambient_color = ambient_color;
+    dataPtr3->diffuse_color = diffuse_color;
+    dataPtr3->sun_direction = light_direction;
+    dataPtr3->intensity = sun_intensity;
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_sunlightBuffer, 0);
+    device_context->Unmap(sunlight_buffer_, 0);
 
     // Set the position of the sunlight constant buffer in the pixel shader.
     bufferNumber = 0;
     
     // Finally set the sunlight constant buffer in the pixel shader with the updated values.
-    deviceContext->PSSetConstantBuffers(bufferNumber, 1, &m_sunlightBuffer);
+    device_context->PSSetConstantBuffers(bufferNumber, 1, &sunlight_buffer_);
 
     // Set shader texture resource in the pixel shader.
-    deviceContext->PSSetShaderResources(0, 1, &texture);
+    device_context->PSSetShaderResources(0, 1, &texture);
 
     return true;
 }
 
-void CelshadeClass::RenderShader(ID3D11DeviceContext* deviceContext, int indexCount)
+void celshade_class::render_shader(ID3D11DeviceContext* deviceContext, int indexCount)
 {
     // Set the vertex input layout.
-    deviceContext->IASetInputLayout(m_layout);
+    deviceContext->IASetInputLayout(layout_);
 
     // Set the vertex and pixel shaders that will be used to render this triangle.
-    deviceContext->VSSetShader(m_vertexShader, NULL, 0);
-    deviceContext->PSSetShader(m_pixelShader, NULL, 0);
+    deviceContext->VSSetShader(vertex_shader_, NULL, 0);
+    deviceContext->PSSetShader(pixel_shader_, NULL, 0);
 
     // Set the sampler state in the pixel shader.
-    deviceContext->PSSetSamplers(0, 1, &m_sampleState);
+    deviceContext->PSSetSamplers(0, 1, &sample_state_);
 
-    // Render the triangle.
+    // render the triangle.
     deviceContext->DrawIndexed(indexCount, 0, 0);
 
     return;
diff --git a/enginecustom/src/src/shader/Colorshaderclass.cpp b/enginecustom/src/src/shader/color_shader_class.cpp
similarity index 75%
rename from enginecustom/src/src/shader/Colorshaderclass.cpp
rename to enginecustom/src/src/shader/color_shader_class.cpp
index 2d5cfc9..dae5282 100644
--- a/enginecustom/src/src/shader/Colorshaderclass.cpp
+++ b/enginecustom/src/src/shader/color_shader_class.cpp
@@ -1,29 +1,29 @@
 ////////////////////////////////////////////////////////////////////////////////
 // Filename: colorshaderclass.cpp
 ////////////////////////////////////////////////////////////////////////////////
-#include "colorshaderclass.h"
+#include "color_shader_class.h"
 
-ColorShaderClass::ColorShaderClass()
+color_shader_class::color_shader_class()
 {
-	m_vertexShader = 0;
-	m_pixelShader = 0;
-	m_layout = 0;
-	m_matrixBuffer = 0;
+	vertex_shader_ = 0;
+	pixel_shader_ = 0;
+	layout_ = 0;
+	matrix_buffer_ = 0;
 }
 
 
-ColorShaderClass::ColorShaderClass(const ColorShaderClass& other)
+color_shader_class::color_shader_class(const color_shader_class& other)
 {
 }
 
 
-ColorShaderClass::~ColorShaderClass()
+color_shader_class::~color_shader_class()
 {
 }
 
-bool ColorShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
+bool color_shader_class::initialize(ID3D11Device* device, HWND hwnd)
 {
-	Logger::Get().Log("Initializing ColorShaderClass", __FILE__, __LINE__, Logger::LogLevel::Initialize);
+	Logger::Get().Log("Initializing color_shader_class", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
 	bool result;
 	wchar_t vsFilename[128];
@@ -47,35 +47,35 @@ bool ColorShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
 		return false;
 	}
 
-	// Initialize the vertex and pixel shaders.
-	result = InitializeShader(device, hwnd, vsFilename, psFilename);
+	// initialize the vertex and pixel shaders.
+	result = initialize_shader(device, hwnd, vsFilename, psFilename);
 	if (!result)
 	{
 		Logger::Get().Log("Error initializing shader", __FILE__, __LINE__, Logger::LogLevel::Error);
 		return false;
 	}
 
-	Logger::Get().Log("ColorShaderClass initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
+	Logger::Get().Log("color_shader_class initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
 	return true;
 }
 
-void ColorShaderClass::Shutdown()
+void color_shader_class::shutdown()
 {
-	// Shutdown the vertex and pixel shaders as well as the related objects.
-	ShutdownShader();
+	// shutdown the vertex and pixel shaders as well as the related objects.
+	shutdown_shader();
 
 	return;
 }
 
-bool ColorShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
+bool color_shader_class::render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
 	XMMATRIX projectionMatrix)
 {
 	bool result;
 
 
 	// Set the shader parameters that it will use for rendering.
-	result = SetShaderParameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix);
+	result = set_shader_parameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix);
 	if (!result)
 	{
 		Logger::Get().Log("Error setting shader parameters", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -83,12 +83,12 @@ bool ColorShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCount
 	}
 
 	// Now render the prepared buffers with the shader.
-	RenderShader(deviceContext, indexCount);
+	render_shader(deviceContext, indexCount);
 
 	return true;
 }
 
-bool ColorShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
+bool color_shader_class::initialize_shader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
 {
 	Logger::Get().Log("Initializing shader", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -101,7 +101,7 @@ bool ColorShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
 	D3D11_BUFFER_DESC matrixBufferDesc;
 
 
-	// Initialize the pointers this function will use to null.
+	// initialize the pointers this function will use to null.
 	errorMessage = 0;
 	vertexShaderBuffer = 0;
 	pixelShaderBuffer = 0;
@@ -114,7 +114,7 @@ bool ColorShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
 		// If the shader failed to compile it should have writen something to the error message.
 		if (errorMessage)
 		{
-			OutputShaderErrorMessage(errorMessage, hwnd, vsFilename);
+			output_shader_error_message(errorMessage, hwnd, vsFilename);
 		}
 		// If there was  nothing in the error message then it simply could not find the shader file itself.
 		else
@@ -133,7 +133,7 @@ bool ColorShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
 		// If the shader failed to compile it should have writen something to the error message.
 		if (errorMessage)
 		{
-			OutputShaderErrorMessage(errorMessage, hwnd, psFilename);
+			output_shader_error_message(errorMessage, hwnd, psFilename);
 		}
 		// If there was nothing in the error message then it simply could not find the file itself.
 		else
@@ -145,7 +145,7 @@ bool ColorShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
 	}
 
 	// Create the vertex shader from the buffer.
-	result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &m_vertexShader);
+	result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &vertex_shader_);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Error creating vertex shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -153,7 +153,7 @@ bool ColorShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
 	}
 
 	// Create the pixel shader from the buffer.
-	result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &m_pixelShader);
+	result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &pixel_shader_);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Error creating pixel shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -183,7 +183,7 @@ bool ColorShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
 
 	// Create the vertex input layout.
 	result = device->CreateInputLayout(polygonLayout, numElements, vertexShaderBuffer->GetBufferPointer(),
-		vertexShaderBuffer->GetBufferSize(), &m_layout);
+		vertexShaderBuffer->GetBufferSize(), &layout_);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Error creating input layout", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -199,14 +199,14 @@ bool ColorShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
 
 	// Setup the description of the dynamic matrix constant buffer that is in the vertex shader.
 	matrixBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-	matrixBufferDesc.ByteWidth = sizeof(MatrixBufferType);
+	matrixBufferDesc.ByteWidth = sizeof(matrix_buffer_type);
 	matrixBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
 	matrixBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
 	matrixBufferDesc.MiscFlags = 0;
 	matrixBufferDesc.StructureByteStride = 0;
 
 	// Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-	result = device->CreateBuffer(&matrixBufferDesc, NULL, &m_matrixBuffer);
+	result = device->CreateBuffer(&matrixBufferDesc, NULL, &matrix_buffer_);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Error creating constant buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -218,43 +218,43 @@ bool ColorShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
 	return true;
 }
 
-void ColorShaderClass::ShutdownShader()
+void color_shader_class::shutdown_shader()
 {
 	Logger::Get().Log("Shutting down shader", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
 	// Release the matrix constant buffer.
-	if (m_matrixBuffer)
+	if (matrix_buffer_)
 	{
 		Logger::Get().Log("Releasing matrix buffer", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
-		m_matrixBuffer->Release();
-		m_matrixBuffer = 0;
+		matrix_buffer_->Release();
+		matrix_buffer_ = 0;
 		Logger::Get().Log("Matrix buffer released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	}
 
 	// Release the layout.
-	if (m_layout)
+	if (layout_)
 	{
 		Logger::Get().Log("Releasing layout", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
-		m_layout->Release();
-		m_layout = 0;
+		layout_->Release();
+		layout_ = 0;
 		Logger::Get().Log("Layout released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	}
 
 	// Release the pixel shader.
-	if (m_pixelShader)
+	if (pixel_shader_)
 	{
 		Logger::Get().Log("Releasing pixel shader", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
-		m_pixelShader->Release();
-		m_pixelShader = 0;
+		pixel_shader_->Release();
+		pixel_shader_ = 0;
 		Logger::Get().Log("Pixel shader released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	}
 
 	// Release the vertex shader.
-	if (m_vertexShader)
+	if (vertex_shader_)
 	{
 		Logger::Get().Log("Releasing vertex shader", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
-		m_vertexShader->Release();
-		m_vertexShader = 0;
+		vertex_shader_->Release();
+		vertex_shader_ = 0;
 		Logger::Get().Log("Vertex shader released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	}
 
@@ -263,7 +263,7 @@ void ColorShaderClass::ShutdownShader()
 	return;
 }
 
-void ColorShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
+void color_shader_class::output_shader_error_message(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
 {
 	char* compileErrors;
 	unsigned long long bufferSize, i;
@@ -298,14 +298,14 @@ void ColorShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND h
 	return;
 }
 
-bool ColorShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
+bool color_shader_class::set_shader_parameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
 	XMMATRIX projectionMatrix)
 {
 	Logger::Get().Log("Setting shader parameters", __FILE__, __LINE__);
 
 	HRESULT result;
 	D3D11_MAPPED_SUBRESOURCE mappedResource;
-	MatrixBufferType* dataPtr;
+	matrix_buffer_type* dataPtr;
 	unsigned int bufferNumber;
 
 	// Transpose the matrices to prepare them for the shader.
@@ -314,7 +314,7 @@ bool ColorShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, X
 	projectionMatrix = XMMatrixTranspose(projectionMatrix);
 
 	// Lock the constant buffer so it can be written to.
-	result = deviceContext->Map(m_matrixBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+	result = deviceContext->Map(matrix_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Error mapping constant buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -322,7 +322,7 @@ bool ColorShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, X
 	}
 
 	// Get a pointer to the data in the constant buffer.
-	dataPtr = (MatrixBufferType*)mappedResource.pData;
+	dataPtr = (matrix_buffer_type*)mappedResource.pData;
 
 	// Copy the matrices into the constant buffer.
 	dataPtr->world = worldMatrix;
@@ -330,27 +330,27 @@ bool ColorShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, X
 	dataPtr->projection = projectionMatrix;
 
 	// Unlock the constant buffer.
-	deviceContext->Unmap(m_matrixBuffer, 0);
+	deviceContext->Unmap(matrix_buffer_, 0);
 
 	// Set the position of the constant buffer in the vertex shader.
 	bufferNumber = 0;
 
 	// Finanly set the constant buffer in the vertex shader with the updated values.
-	deviceContext->VSSetConstantBuffers(bufferNumber, 1, &m_matrixBuffer);
+	deviceContext->VSSetConstantBuffers(bufferNumber, 1, &matrix_buffer_);
 
 	return true;
 }
 
-void ColorShaderClass::RenderShader(ID3D11DeviceContext* deviceContext, int indexCount)
+void color_shader_class::render_shader(ID3D11DeviceContext* deviceContext, int indexCount)
 {
 	// Set the vertex input layout.
-	deviceContext->IASetInputLayout(m_layout);
+	deviceContext->IASetInputLayout(layout_);
 
 	// Set the vertex and pixel shaders that will be used to render this triangle.
-	deviceContext->VSSetShader(m_vertexShader, NULL, 0);
-	deviceContext->PSSetShader(m_pixelShader, NULL, 0);
+	deviceContext->VSSetShader(vertex_shader_, NULL, 0);
+	deviceContext->PSSetShader(pixel_shader_, NULL, 0);
 
-	// Render the triangle.
+	// render the triangle.
 	deviceContext->DrawIndexed(indexCount, 0, 0);
 
 	return;
diff --git a/enginecustom/src/src/shader/fontshaderclass.cpp b/enginecustom/src/src/shader/font_shader_class.cpp
similarity index 74%
rename from enginecustom/src/src/shader/fontshaderclass.cpp
rename to enginecustom/src/src/shader/font_shader_class.cpp
index e85bb8a..58fbc77 100644
--- a/enginecustom/src/src/shader/fontshaderclass.cpp
+++ b/enginecustom/src/src/shader/font_shader_class.cpp
@@ -1,30 +1,30 @@
-#include "fontshaderclass.h"
+#include "font_shader_class.h"
 
 
-FontShaderClass::FontShaderClass()
+font_shader_class::font_shader_class()
 {
-    m_vertexShader = 0;
-    m_pixelShader = 0;
-    m_layout = 0;
-    m_matrixBuffer = 0;
-    m_sampleState = 0;
-    m_pixelBuffer = 0;
+    vertex_shader_ = 0;
+    pixel_shader_ = 0;
+    layout_ = 0;
+    matrix_buffer_ = 0;
+    sample_state_ = 0;
+    pixel_buffer_ = 0;
 }
 
 
-FontShaderClass::FontShaderClass(const FontShaderClass& other)
+font_shader_class::font_shader_class(const font_shader_class& other)
 {
 }
 
 
-FontShaderClass::~FontShaderClass()
+font_shader_class::~font_shader_class()
 {
 }
 
 
-bool FontShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
+bool font_shader_class::initialize(ID3D11Device* device, HWND hwnd)
 {
-    Logger::Get().Log("Initializing FontShaderClass", __FILE__, __LINE__, Logger::LogLevel::Initialize);
+    Logger::Get().Log("Initializing font_shader_class", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
     bool result;
     wchar_t vsFilename[128];
@@ -47,35 +47,35 @@ bool FontShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
         return false;
     }
 
-    // Initialize the vertex and pixel shaders.
-    result = InitializeShader(device, hwnd, vsFilename, psFilename);
+    // initialize the vertex and pixel shaders.
+    result = initialize_shader(device, hwnd, vsFilename, psFilename);
     if (!result)
     {
         Logger::Get().Log("Error initializing shader", __FILE__, __LINE__, Logger::LogLevel::Error);
         return false;
     }
     
-    Logger::Get().Log("FontShaderClass initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
+    Logger::Get().Log("font_shader_class initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
     return true;
 }
 
-void FontShaderClass::Shutdown()
+void font_shader_class::shutdown()
 {
-    // Shutdown the vertex and pixel shaders as well as the related objects.
-    ShutdownShader();
+    // shutdown the vertex and pixel shaders as well as the related objects.
+    shutdown_shader();
 
     return;
 }
 
-bool FontShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
+bool font_shader_class::render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
     XMMATRIX projectionMatrix, ID3D11ShaderResourceView* texture, XMFLOAT4 pixelColor)
 {
     bool result;
 
 
     // Set the shader parameters that it will use for rendering.
-    result = SetShaderParameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture, pixelColor);
+    result = set_shader_parameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture, pixelColor);
     if (!result)
     {
         Logger::Get().Log("Error setting shader parameters", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -83,12 +83,12 @@ bool FontShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCount,
     }
 
     // Now render the prepared buffers with the shader.
-    RenderShader(deviceContext, indexCount);
+    render_shader(deviceContext, indexCount);
 
     return true;
 }
 
-bool FontShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
+bool font_shader_class::initialize_shader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
 {
     Logger::Get().Log("Initializing shader", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -103,7 +103,7 @@ bool FontShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* v
     D3D11_BUFFER_DESC pixelBufferDesc;
 
 
-    // Initialize the pointers this function will use to null.
+    // initialize the pointers this function will use to null.
     errorMessage = 0;
     vertexShaderBuffer = 0;
     pixelShaderBuffer = 0;
@@ -116,7 +116,7 @@ bool FontShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* v
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, vsFilename);
+            output_shader_error_message(errorMessage, hwnd, vsFilename);
         }
         // If there was nothing in the error message then it simply could not find the shader file itself.
         else
@@ -135,7 +135,7 @@ bool FontShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* v
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, psFilename);
+            output_shader_error_message(errorMessage, hwnd, psFilename);
         }
         // If there was nothing in the error message then it simply could not find the file itself.
         else
@@ -147,7 +147,7 @@ bool FontShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* v
     }
 
     // Create the vertex shader from the buffer.
-    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &m_vertexShader);
+    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &vertex_shader_);
     if (FAILED(result))
     {
         Logger::Get().Log("Error creating vertex shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -155,7 +155,7 @@ bool FontShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* v
     }
 
     // Create the pixel shader from the buffer.
-    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &m_pixelShader);
+    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &pixel_shader_);
     if (FAILED(result))
     {
         Logger::Get().Log("Error creating pixel shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -185,7 +185,7 @@ bool FontShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* v
 
     // Create the vertex input layout.
     result = device->CreateInputLayout(polygonLayout, numElements, vertexShaderBuffer->GetBufferPointer(),
-        vertexShaderBuffer->GetBufferSize(), &m_layout);
+        vertexShaderBuffer->GetBufferSize(), &layout_);
     if (FAILED(result))
     {
         Logger::Get().Log("Error creating input layout", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -201,14 +201,14 @@ bool FontShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* v
 
     // Setup the description of the dynamic matrix constant buffer that is in the vertex shader.
     matrixBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    matrixBufferDesc.ByteWidth = sizeof(MatrixBufferType);
+    matrixBufferDesc.ByteWidth = sizeof(matrix_buffer_type);
     matrixBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     matrixBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     matrixBufferDesc.MiscFlags = 0;
     matrixBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&matrixBufferDesc, NULL, &m_matrixBuffer);
+    result = device->CreateBuffer(&matrixBufferDesc, NULL, &matrix_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Error creating constant buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -231,7 +231,7 @@ bool FontShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* v
     samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
 
     // Create the texture sampler state.
-    result = device->CreateSamplerState(&samplerDesc, &m_sampleState);
+    result = device->CreateSamplerState(&samplerDesc, &sample_state_);
     if (FAILED(result))
     {
         Logger::Get().Log("Error creating sampler state", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -240,14 +240,14 @@ bool FontShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* v
 
     // Setup the description of the dynamic pixel constant buffer that is in the pixel shader.
     pixelBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    pixelBufferDesc.ByteWidth = sizeof(PixelBufferType);
+    pixelBufferDesc.ByteWidth = sizeof(pixel_buffer_type);
     pixelBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     pixelBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     pixelBufferDesc.MiscFlags = 0;
     pixelBufferDesc.StructureByteStride = 0;
 
     // Create the pixel constant buffer pointer so we can access the pixel shader constant buffer from within this class.
-    result = device->CreateBuffer(&pixelBufferDesc, NULL, &m_pixelBuffer);
+    result = device->CreateBuffer(&pixelBufferDesc, NULL, &pixel_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Error creating constant buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -259,50 +259,50 @@ bool FontShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* v
     return true;
 }
 
-void FontShaderClass::ShutdownShader()
+void font_shader_class::shutdown_shader()
 {
     Logger::Get().Log("Shutting down shader", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
     // Release the pixel constant buffer.
-    if (m_pixelBuffer)
+    if (pixel_buffer_)
     {
-        m_pixelBuffer->Release();
-        m_pixelBuffer = 0;
+        pixel_buffer_->Release();
+        pixel_buffer_ = 0;
     }
 
     // Release the sampler state.
-    if (m_sampleState)
+    if (sample_state_)
     {
-        m_sampleState->Release();
-        m_sampleState = 0;
+        sample_state_->Release();
+        sample_state_ = 0;
     }
 
     // Release the matrix constant buffer.
-    if (m_matrixBuffer)
+    if (matrix_buffer_)
     {
-        m_matrixBuffer->Release();
-        m_matrixBuffer = 0;
+        matrix_buffer_->Release();
+        matrix_buffer_ = 0;
     }
 
     // Release the layout.
-    if (m_layout)
+    if (layout_)
     {
-        m_layout->Release();
-        m_layout = 0;
+        layout_->Release();
+        layout_ = 0;
     }
 
     // Release the pixel shader.
-    if (m_pixelShader)
+    if (pixel_shader_)
     {
-        m_pixelShader->Release();
-        m_pixelShader = 0;
+        pixel_shader_->Release();
+        pixel_shader_ = 0;
     }
 
     // Release the vertex shader.
-    if (m_vertexShader)
+    if (vertex_shader_)
     {
-        m_vertexShader->Release();
-        m_vertexShader = 0;
+        vertex_shader_->Release();
+        vertex_shader_ = 0;
     }
 
     Logger::Get().Log("Shader shut down", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
@@ -310,7 +310,7 @@ void FontShaderClass::ShutdownShader()
     return;
 }
 
-void FontShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
+void font_shader_class::output_shader_error_message(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
 {
     char* compileErrors;
     unsigned long long bufferSize, i;
@@ -345,15 +345,15 @@ void FontShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND hw
     return;
 }
 
-bool FontShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
+bool font_shader_class::set_shader_parameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
     XMMATRIX projectionMatrix, ID3D11ShaderResourceView* texture, XMFLOAT4 pixelColor)
 {
 
     HRESULT result;
     D3D11_MAPPED_SUBRESOURCE mappedResource;
-    MatrixBufferType* dataPtr;
+    matrix_buffer_type* dataPtr;
     unsigned int bufferNumber;
-    PixelBufferType* dataPtr2;
+    pixel_buffer_type* dataPtr2;
 
 
     // Transpose the matrices to prepare them for the shader.
@@ -362,7 +362,7 @@ bool FontShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, XM
     projectionMatrix = XMMatrixTranspose(projectionMatrix);
 
     // Lock the constant buffer so it can be written to.
-    result = deviceContext->Map(m_matrixBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(matrix_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         Logger::Get().Log("Error mapping constant buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -370,7 +370,7 @@ bool FontShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, XM
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr = (MatrixBufferType*)mappedResource.pData;
+    dataPtr = (matrix_buffer_type*)mappedResource.pData;
 
     // Copy the matrices into the constant buffer.
     dataPtr->world = worldMatrix;
@@ -378,19 +378,19 @@ bool FontShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, XM
     dataPtr->projection = projectionMatrix;
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_matrixBuffer, 0);
+    deviceContext->Unmap(matrix_buffer_, 0);
 
     // Set the position of the constant buffer in the vertex shader.
     bufferNumber = 0;
 
     // Finally set the constant buffer in the vertex shader with the updated values.
-    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &m_matrixBuffer);
+    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &matrix_buffer_);
 
     // Set shader texture resource in the pixel shader.
     deviceContext->PSSetShaderResources(0, 1, &texture);
 
     // Lock the pixel constant buffer so it can be written to.
-    result = deviceContext->Map(m_pixelBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(pixel_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         Logger::Get().Log("Error mapping constant buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -398,36 +398,36 @@ bool FontShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, XM
     }
 
     // Get a pointer to the data in the pixel constant buffer.
-    dataPtr2 = (PixelBufferType*)mappedResource.pData;
+    dataPtr2 = (pixel_buffer_type*)mappedResource.pData;
 
     // Copy the pixel color into the pixel constant buffer.
     dataPtr2->pixelColor = pixelColor;
 
     // Unlock the pixel constant buffer.
-    deviceContext->Unmap(m_pixelBuffer, 0);
+    deviceContext->Unmap(pixel_buffer_, 0);
 
     // Set the position of the pixel constant buffer in the pixel shader.
     bufferNumber = 0;
 
     // Now set the pixel constant buffer in the pixel shader with the updated value.
-    deviceContext->PSSetConstantBuffers(bufferNumber, 1, &m_pixelBuffer);
+    deviceContext->PSSetConstantBuffers(bufferNumber, 1, &pixel_buffer_);
 
     return true;
 }
 
-void FontShaderClass::RenderShader(ID3D11DeviceContext* deviceContext, int indexCount)
+void font_shader_class::render_shader(ID3D11DeviceContext* deviceContext, int indexCount)
 {
     // Set the vertex input layout.
-    deviceContext->IASetInputLayout(m_layout);
+    deviceContext->IASetInputLayout(layout_);
 
     // Set the vertex and pixel shaders that will be used to render this triangle.
-    deviceContext->VSSetShader(m_vertexShader, NULL, 0);
-    deviceContext->PSSetShader(m_pixelShader, NULL, 0);
+    deviceContext->VSSetShader(vertex_shader_, NULL, 0);
+    deviceContext->PSSetShader(pixel_shader_, NULL, 0);
 
     // Set the sampler state in the pixel shader.
-    deviceContext->PSSetSamplers(0, 1, &m_sampleState);
+    deviceContext->PSSetSamplers(0, 1, &sample_state_);
 
-    // Render the triangle.
+    // render the triangle.
     deviceContext->DrawIndexed(indexCount, 0, 0);
 
     return;
diff --git a/enginecustom/src/src/shader/lightmapshaderclass.cpp b/enginecustom/src/src/shader/light_map_shader_class.cpp
similarity index 73%
rename from enginecustom/src/src/shader/lightmapshaderclass.cpp
rename to enginecustom/src/src/shader/light_map_shader_class.cpp
index e716ab3..43b4532 100644
--- a/enginecustom/src/src/shader/lightmapshaderclass.cpp
+++ b/enginecustom/src/src/shader/light_map_shader_class.cpp
@@ -1,29 +1,29 @@
-#include "lightmapshaderclass.h"
+#include "light_map_shader_class.h"
 
 
-LightMapShaderClass::LightMapShaderClass()
+light_map_shader_class::light_map_shader_class()
 {
-    m_vertexShader = 0;
-    m_pixelShader = 0;
-    m_layout = 0;
-    m_matrixBuffer = 0;
-    m_sampleState = 0;
+    vertex_shader_ = 0;
+    pixel_shader_ = 0;
+    layout_ = 0;
+    matrix_buffer_ = 0;
+    sample_state_ = 0;
 }
 
 
-LightMapShaderClass::LightMapShaderClass(const LightMapShaderClass& other)
+light_map_shader_class::light_map_shader_class(const light_map_shader_class& other)
 {
 }
 
 
-LightMapShaderClass::~LightMapShaderClass()
+light_map_shader_class::~light_map_shader_class()
 {
 }
 
 
-bool LightMapShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
+bool light_map_shader_class::initialize(ID3D11Device* device, HWND hwnd)
 {
-    Logger::Get().Log("Initializing LightMapShaderClass", __FILE__, __LINE__, Logger::LogLevel::Initialize);
+    Logger::Get().Log("Initializing light_map_shader_class", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
     bool result;
     wchar_t vsFilename[128];
@@ -46,37 +46,37 @@ bool LightMapShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
         return false;
     }
 
-    // Initialize the vertex and pixel shaders.
-    result = InitializeShader(device, hwnd, vsFilename, psFilename);
+    // initialize the vertex and pixel shaders.
+    result = initialize_shader(device, hwnd, vsFilename, psFilename);
     if (!result)
     {
         Logger::Get().Log("Error initializing shader", __FILE__, __LINE__, Logger::LogLevel::Error);
         return false;
     }
 
-    Logger::Get().Log("LightMapShaderClass initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
+    Logger::Get().Log("light_map_shader_class initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
     return true;
 }
 
 
-void LightMapShaderClass::Shutdown()
+void light_map_shader_class::shutdown()
 {
-    // Shutdown the vertex and pixel shaders as well as the related objects.
-    ShutdownShader();
+    // shutdown the vertex and pixel shaders as well as the related objects.
+    shutdown_shader();
 
     return;
 }
 
 
-bool LightMapShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
+bool light_map_shader_class::render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
     XMMATRIX projectionMatrix, ID3D11ShaderResourceView* texture1, ID3D11ShaderResourceView* texture2)
 {
     bool result;
 
 
     // Set the shader parameters that it will use for rendering.
-    result = SetShaderParameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture1, texture2);
+    result = set_shader_parameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture1, texture2);
     if (!result)
     {
         Logger::Get().Log("Error setting shader parameters", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -84,13 +84,13 @@ bool LightMapShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCo
     }
 
     // Now render the prepared buffers with the shader.
-    RenderShader(deviceContext, indexCount);
+    render_shader(deviceContext, indexCount);
 
     return true;
 }
 
 
-bool LightMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
+bool light_map_shader_class::initialize_shader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
 {
     Logger::Get().Log("Initializing shader", __FILE__, __LINE__, Logger::LogLevel::Initialize);
     HRESULT result;
@@ -103,7 +103,7 @@ bool LightMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
     D3D11_SAMPLER_DESC samplerDesc;
 
 
-    // Initialize the pointers this function will use to null.
+    // initialize the pointers this function will use to null.
     errorMessage = 0;
     vertexShaderBuffer = 0;
     pixelShaderBuffer = 0;
@@ -116,7 +116,7 @@ bool LightMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, vsFilename);
+            output_shader_error_message(errorMessage, hwnd, vsFilename);
         }
         // If there was nothing in the error message then it simply could not find the shader file itself.
         else
@@ -135,7 +135,7 @@ bool LightMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, psFilename);
+            output_shader_error_message(errorMessage, hwnd, psFilename);
         }
         // If there was nothing in the error message then it simply could not find the file itself.
         else
@@ -147,7 +147,7 @@ bool LightMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
     }
 
     // Create the vertex shader from the buffer.
-    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &m_vertexShader);
+    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &vertex_shader_);
     if (FAILED(result))
     {
         Logger::Get().Log("Error creating vertex shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -155,7 +155,7 @@ bool LightMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
     }
 
     // Create the pixel shader from the buffer.
-    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &m_pixelShader);
+    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &pixel_shader_);
     if (FAILED(result))
     {
         Logger::Get().Log("Error creating pixel shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -192,7 +192,7 @@ bool LightMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
 
     // Create the vertex input layout.
     result = device->CreateInputLayout(polygonLayout, numElements, vertexShaderBuffer->GetBufferPointer(),
-        vertexShaderBuffer->GetBufferSize(), &m_layout);
+        vertexShaderBuffer->GetBufferSize(), &layout_);
     if (FAILED(result))
     {
         Logger::Get().Log("Error creating input layout", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -208,14 +208,14 @@ bool LightMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
 
     // Setup the description of the dynamic matrix constant buffer that is in the vertex shader.
     matrixBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    matrixBufferDesc.ByteWidth = sizeof(MatrixBufferType);
+    matrixBufferDesc.ByteWidth = sizeof(matrix_buffer_type);
     matrixBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     matrixBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     matrixBufferDesc.MiscFlags = 0;
     matrixBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&matrixBufferDesc, NULL, &m_matrixBuffer);
+    result = device->CreateBuffer(&matrixBufferDesc, NULL, &matrix_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Error creating constant buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -238,7 +238,7 @@ bool LightMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
     samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
 
     // Create the texture sampler state.
-    result = device->CreateSamplerState(&samplerDesc, &m_sampleState);
+    result = device->CreateSamplerState(&samplerDesc, &sample_state_);
     if (FAILED(result))
     {
         Logger::Get().Log("Error creating sampler state", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -251,52 +251,52 @@ bool LightMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
 }
 
 
-void LightMapShaderClass::ShutdownShader()
+void light_map_shader_class::shutdown_shader()
 {
-    Logger::Get().Log("Shutting down LightMapShaderClass", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
+    Logger::Get().Log("Shutting down light_map_shader_class", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
     // Release the sampler state.
-    if (m_sampleState)
+    if (sample_state_)
     {
-        m_sampleState->Release();
-        m_sampleState = 0;
+        sample_state_->Release();
+        sample_state_ = 0;
     }
 
     // Release the matrix constant buffer.
-    if (m_matrixBuffer)
+    if (matrix_buffer_)
     {
-        m_matrixBuffer->Release();
-        m_matrixBuffer = 0;
+        matrix_buffer_->Release();
+        matrix_buffer_ = 0;
     }
 
     // Release the layout.
-    if (m_layout)
+    if (layout_)
     {
-        m_layout->Release();
-        m_layout = 0;
+        layout_->Release();
+        layout_ = 0;
     }
 
     // Release the pixel shader.
-    if (m_pixelShader)
+    if (pixel_shader_)
     {
-        m_pixelShader->Release();
-        m_pixelShader = 0;
+        pixel_shader_->Release();
+        pixel_shader_ = 0;
     }
 
     // Release the vertex shader.
-    if (m_vertexShader)
+    if (vertex_shader_)
     {
-        m_vertexShader->Release();
-        m_vertexShader = 0;
+        vertex_shader_->Release();
+        vertex_shader_ = 0;
     }
 
-    Logger::Get().Log("LightMapShaderClass shut down", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
+    Logger::Get().Log("light_map_shader_class shut down", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
     return;
 }
 
 
-void LightMapShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
+void light_map_shader_class::output_shader_error_message(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
 {
     char* compileErrors;
     unsigned long long bufferSize, i;
@@ -332,12 +332,12 @@ void LightMapShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWN
 }
 
 
-bool LightMapShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
+bool light_map_shader_class::set_shader_parameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
     XMMATRIX projectionMatrix, ID3D11ShaderResourceView* texture1, ID3D11ShaderResourceView* texture2)
 {
     HRESULT result;
     D3D11_MAPPED_SUBRESOURCE mappedResource;
-    MatrixBufferType* dataPtr;
+    matrix_buffer_type* dataPtr;
     unsigned int bufferNumber;
 
 
@@ -347,7 +347,7 @@ bool LightMapShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext
     projectionMatrix = XMMatrixTranspose(projectionMatrix);
 
     // Lock the constant buffer so it can be written to.
-    result = deviceContext->Map(m_matrixBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(matrix_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         Logger::Get().Log("Error mapping constant buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -355,7 +355,7 @@ bool LightMapShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr = (MatrixBufferType*)mappedResource.pData;
+    dataPtr = (matrix_buffer_type*)mappedResource.pData;
 
     // Copy the matrices into the constant buffer.
     dataPtr->world = worldMatrix;
@@ -363,13 +363,13 @@ bool LightMapShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext
     dataPtr->projection = projectionMatrix;
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_matrixBuffer, 0);
+    deviceContext->Unmap(matrix_buffer_, 0);
 
     // Set the position of the constant buffer in the vertex shader.
     bufferNumber = 0;
 
     // Finally set the constant buffer in the vertex shader with the updated values.
-    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &m_matrixBuffer);
+    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &matrix_buffer_);
 
     // Set shader texture resources in the pixel shader.
     deviceContext->PSSetShaderResources(0, 1, &texture1);
@@ -379,19 +379,19 @@ bool LightMapShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext
 }
 
 
-void LightMapShaderClass::RenderShader(ID3D11DeviceContext* deviceContext, int indexCount)
+void light_map_shader_class::render_shader(ID3D11DeviceContext* deviceContext, int indexCount)
 {
     // Set the vertex input layout.
-    deviceContext->IASetInputLayout(m_layout);
+    deviceContext->IASetInputLayout(layout_);
 
     // Set the vertex and pixel shaders that will be used to render this triangle.
-    deviceContext->VSSetShader(m_vertexShader, NULL, 0);
-    deviceContext->PSSetShader(m_pixelShader, NULL, 0);
+    deviceContext->VSSetShader(vertex_shader_, NULL, 0);
+    deviceContext->PSSetShader(pixel_shader_, NULL, 0);
 
     // Set the sampler state in the pixel shader.
-    deviceContext->PSSetSamplers(0, 1, &m_sampleState);
+    deviceContext->PSSetSamplers(0, 1, &sample_state_);
 
-    // Render the triangle.
+    // render the triangle.
     deviceContext->DrawIndexed(indexCount, 0, 0);
 
     return;
diff --git a/enginecustom/src/src/shader/lightshaderclass.cpp b/enginecustom/src/src/shader/light_shader_class.cpp
similarity index 73%
rename from enginecustom/src/src/shader/lightshaderclass.cpp
rename to enginecustom/src/src/shader/light_shader_class.cpp
index fb1135a..baa2e52 100644
--- a/enginecustom/src/src/shader/lightshaderclass.cpp
+++ b/enginecustom/src/src/shader/light_shader_class.cpp
@@ -1,36 +1,36 @@
 ////////////////////////////////////////////////////////////////////////////////
 // Filename: lightshaderclass.cpp
 ////////////////////////////////////////////////////////////////////////////////
-#include "lightshaderclass.h"
+#include "light_shader_class.h"
 
 
-LightShaderClass::LightShaderClass()
+light_shader_class::light_shader_class()
 {
-    m_vertexShader = 0;
-    m_pixelShader = 0;
-    m_layout = 0;
-    m_sampleState = 0;
-    m_matrixBuffer = 0;
-    m_cameraBuffer = 0;
-    m_lightBuffer = 0;
-    m_lightColorBuffer = 0;
-    m_lightPositionBuffer = 0;
+    vertex_shader_ = 0;
+    pixel_shader_ = 0;
+    layout_ = 0;
+    sample_state_ = 0;
+    matrix_buffer_ = 0;
+    camera_buffer_ = 0;
+    light_buffer_ = 0;
+    light_color_buffer_ = 0;
+    light_position_buffer_ = 0;
 }
 
 
-LightShaderClass::LightShaderClass(const LightShaderClass& other)
+light_shader_class::light_shader_class(const light_shader_class& other)
 {
 }
 
 
-LightShaderClass::~LightShaderClass()
+light_shader_class::~light_shader_class()
 {
 }
 
 
-bool LightShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
+bool light_shader_class::initialize(ID3D11Device* device, HWND hwnd)
 {
-    Logger::Get().Log("Initializing LightShaderClass", __FILE__, __LINE__, Logger::LogLevel::Initialize);
+    Logger::Get().Log("Initializing light_shader_class", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
     wchar_t vsFilename[128];
     wchar_t psFilename[128];
@@ -52,36 +52,36 @@ bool LightShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
         Logger::Get().Log("Failed to copy string", __FILE__, __LINE__, Logger::LogLevel::Error);
 		return false;
 	}
-    // Initialize the vertex and pixel shaders.
-    result = InitializeShader(device, hwnd, vsFilename, psFilename);
+    // initialize the vertex and pixel shaders.
+    result = initialize_shader(device, hwnd, vsFilename, psFilename);
     if (!result)
     {
         Logger::Get().Log("Failed to initialize shader", __FILE__, __LINE__, Logger::LogLevel::Error);
         return false;
     }
 
-    Logger::Get().Log("LightShaderClass initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
+    Logger::Get().Log("light_shader_class initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
     return true;
 }
 
 
-void LightShaderClass::Shutdown()
+void light_shader_class::shutdown()
 {
-    // Shutdown the vertex and pixel shaders as well as the related objects.
-    ShutdownShader();
+    // shutdown the vertex and pixel shaders as well as the related objects.
+    shutdown_shader();
 
     return;
 }
 
-bool LightShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+bool light_shader_class::render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
     ID3D11ShaderResourceView* texture, XMFLOAT4 diffuseColor[], XMFLOAT4 lightPosition[], XMFLOAT4 ambientClor[])
 {
     bool result;
 
 
 	// Set the shader parameters that it will use for rendering.
-    result = SetShaderParameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture, diffuseColor, lightPosition, ambientClor);
+    result = set_shader_parameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture, diffuseColor, lightPosition, ambientClor);
 	if(!result)
 	{
         Logger::Get().Log("Failed to set shader parameters", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -89,13 +89,13 @@ bool LightShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCount
 	}
 
     // Now render the prepared buffers with the shader.
-    RenderShader(deviceContext, indexCount);
+    render_shader(deviceContext, indexCount);
 
     return true;
 }
 
 
-bool LightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
+bool light_shader_class::initialize_shader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
 {
     Logger::Get().Log("Initializing shader", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -112,7 +112,7 @@ bool LightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
     D3D11_BUFFER_DESC lightPositionBufferDesc;
 
 
-    // Initialize the pointers this function will use to null.
+    // initialize the pointers this function will use to null.
     errorMessage = 0;
     vertexShaderBuffer = 0;
     pixelShaderBuffer = 0;
@@ -124,7 +124,7 @@ bool LightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, vsFilename);
+            output_shader_error_message(errorMessage, hwnd, vsFilename);
         }
         // If there was nothing in the error message then it simply could not find the shader file itself.
         else
@@ -142,7 +142,7 @@ bool LightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, psFilename);
+            output_shader_error_message(errorMessage, hwnd, psFilename);
         }
         // If there was nothing in the error message then it simply could not find the file itself.
         else
@@ -154,7 +154,7 @@ bool LightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
     }
 
     // Create the vertex shader from the buffer.
-    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &m_vertexShader);
+    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &vertex_shader_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create vertex shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -162,7 +162,7 @@ bool LightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
     }
 
     // Create the pixel shader from the buffer.
-    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &m_pixelShader);
+    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &pixel_shader_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create pixel shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -200,7 +200,7 @@ bool LightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
 
     // Create the vertex input layout.
     result = device->CreateInputLayout(polygonLayout, numElements, vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(),
-        &m_layout);
+        &layout_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create input layout", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -230,7 +230,7 @@ bool LightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
     samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
 
     // Create the texture sampler state.
-    result = device->CreateSamplerState(&samplerDesc, &m_sampleState);
+    result = device->CreateSamplerState(&samplerDesc, &sample_state_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create sampler state", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -239,14 +239,14 @@ bool LightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
 
     // Setup the description of the dynamic matrix constant buffer that is in the vertex shader.
     matrixBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    matrixBufferDesc.ByteWidth = sizeof(MatrixBufferType);
+    matrixBufferDesc.ByteWidth = sizeof(matrix_buffer_type);
     matrixBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     matrixBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     matrixBufferDesc.MiscFlags = 0;
     matrixBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&matrixBufferDesc, NULL, &m_matrixBuffer);
+    result = device->CreateBuffer(&matrixBufferDesc, NULL, &matrix_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create matrix buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -257,14 +257,14 @@ bool LightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
 
     // Setup the description of the camera dynamic constant buffer that is in the vertex shader.
     cameraBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    cameraBufferDesc.ByteWidth = sizeof(CameraBufferType);
+    cameraBufferDesc.ByteWidth = sizeof(camera_buffer_type);
     cameraBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     cameraBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     cameraBufferDesc.MiscFlags = 0;
     cameraBufferDesc.StructureByteStride = 0;
 
     // Create the camera constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&cameraBufferDesc, NULL, &m_cameraBuffer);
+    result = device->CreateBuffer(&cameraBufferDesc, NULL, &camera_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create camera buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -273,14 +273,14 @@ bool LightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
 
     // Setup the description of the dynamic constant buffer that is in the pixel shader.
     lightColorBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    lightColorBufferDesc.ByteWidth = sizeof(LightColorBufferType);
+    lightColorBufferDesc.ByteWidth = sizeof(light_color_buffer_type);
     lightColorBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     lightColorBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     lightColorBufferDesc.MiscFlags = 0;
     lightColorBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the pixel shader constant buffer from within this class.
-    result = device->CreateBuffer(&lightColorBufferDesc, NULL, &m_lightColorBuffer);
+    result = device->CreateBuffer(&lightColorBufferDesc, NULL, &light_color_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create light color buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -289,14 +289,14 @@ bool LightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
 
     // Setup the description of the dynamic constant buffer that is in the vertex shader.
     lightPositionBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    lightPositionBufferDesc.ByteWidth = sizeof(LightPositionBufferType);
+    lightPositionBufferDesc.ByteWidth = sizeof(light_position_buffer_type);
     lightPositionBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     lightPositionBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     lightPositionBufferDesc.MiscFlags = 0;
     lightPositionBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&lightPositionBufferDesc, NULL, &m_lightPositionBuffer);
+    result = device->CreateBuffer(&lightPositionBufferDesc, NULL, &light_position_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create light position buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -309,79 +309,79 @@ bool LightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
 }
 
 
-void LightShaderClass::ShutdownShader()
+void light_shader_class::shutdown_shader()
 {
-    Logger::Get().Log("Shutting down LightShaderClass", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
+    Logger::Get().Log("Shutting down light_shader_class", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
     // Release the light constant buffers.
-    if (m_lightColorBuffer)
+    if (light_color_buffer_)
     {
-        m_lightColorBuffer->Release();
-        m_lightColorBuffer = 0;
+        light_color_buffer_->Release();
+        light_color_buffer_ = 0;
     }
 
-    if (m_lightPositionBuffer)
+    if (light_position_buffer_)
     {
-        m_lightPositionBuffer->Release();
-        m_lightPositionBuffer = 0;
+        light_position_buffer_->Release();
+        light_position_buffer_ = 0;
     }
 
     // Release the light constant buffer.
-    if (m_lightBuffer)
+    if (light_buffer_)
     {
-        m_lightBuffer->Release();
-        m_lightBuffer = 0;
+        light_buffer_->Release();
+        light_buffer_ = 0;
     }
 
     // Release the camera constant buffer.
-    if (m_cameraBuffer)
+    if (camera_buffer_)
     {
-        m_cameraBuffer->Release();
-        m_cameraBuffer = 0;
+        camera_buffer_->Release();
+        camera_buffer_ = 0;
     }
 
     // Release the matrix constant buffer.
-    if (m_matrixBuffer)
+    if (matrix_buffer_)
     {
-        m_matrixBuffer->Release();
-        m_matrixBuffer = 0;
+        matrix_buffer_->Release();
+        matrix_buffer_ = 0;
     }
 
     // Release the sampler state.
-    if (m_sampleState)
+    if (sample_state_)
     {
-        m_sampleState->Release();
-        m_sampleState = 0;
+        sample_state_->Release();
+        sample_state_ = 0;
     }
 
     // Release the layout.
-    if (m_layout)
+    if (layout_)
     {
-        m_layout->Release();
-        m_layout = 0;
+        layout_->Release();
+        layout_ = 0;
     }
 
     // Release the pixel shader.
-    if (m_pixelShader)
+    if (pixel_shader_)
     {
-        m_pixelShader->Release();
-        m_pixelShader = 0;
+        pixel_shader_->Release();
+        pixel_shader_ = 0;
     }
 
     // Release the vertex shader.
-    if (m_vertexShader)
+    if (vertex_shader_)
     {
-        m_vertexShader->Release();
-        m_vertexShader = 0;
+        vertex_shader_->Release();
+        vertex_shader_ = 0;
     }
 
-    Logger::Get().Log("LightShaderClass shut down", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
+    Logger::Get().Log("light_shader_class shut down", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
     return;
 }
 
 
-void LightShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
+void light_shader_class::output_shader_error_message(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
 {
     char* compileErrors;
     unsigned __int64 bufferSize, i;
@@ -417,15 +417,15 @@ void LightShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND h
 }
 
 
-bool LightShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+bool light_shader_class::set_shader_parameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
     ID3D11ShaderResourceView* texture, XMFLOAT4 diffuseColor[], XMFLOAT4 lightPosition[], XMFLOAT4 ambientColor[])
 {
     HRESULT result;
     D3D11_MAPPED_SUBRESOURCE mappedResource;
     unsigned int bufferNumber;
-    MatrixBufferType* dataPtr;
-    LightPositionBufferType* dataPtr2;
-    LightColorBufferType* dataPtr3;
+    matrix_buffer_type* dataPtr;
+    light_position_buffer_type* dataPtr2;
+    light_color_buffer_type* dataPtr3;
 
     // Transpose the matrices to prepare them for the shader.
     worldMatrix = XMMatrixTranspose(worldMatrix);
@@ -433,7 +433,7 @@ bool LightShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, X
     projectionMatrix = XMMatrixTranspose(projectionMatrix);
 
     // Lock the constant buffer so it can be written to.
-    result = deviceContext->Map(m_matrixBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(matrix_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to map matrix buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -441,7 +441,7 @@ bool LightShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, X
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr = (MatrixBufferType*)mappedResource.pData;
+    dataPtr = (matrix_buffer_type*)mappedResource.pData;
 
     // Copy the matrices into the constant buffer.
     dataPtr->world = worldMatrix;
@@ -449,16 +449,16 @@ bool LightShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, X
     dataPtr->projection = projectionMatrix;
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_matrixBuffer, 0);
+    deviceContext->Unmap(matrix_buffer_, 0);
 
     // Set the position of the constant buffer in the vertex shader.
     bufferNumber = 0;
 
     // Now set the constant buffer in the vertex shader with the updated values.
-    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &m_matrixBuffer);
+    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &matrix_buffer_);
 
     // Lock the camera constant buffer so it can be written to.
-    result = deviceContext->Map(m_cameraBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(camera_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to map camera buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -466,7 +466,7 @@ bool LightShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, X
     }
 
     // Lock the light position constant buffer so it can be written to.
-    result = deviceContext->Map(m_lightPositionBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(light_position_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to map light position buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -474,28 +474,28 @@ bool LightShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, X
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr2 = (LightPositionBufferType*)mappedResource.pData;
+    dataPtr2 = (light_position_buffer_type*)mappedResource.pData;
 
     // Copy the light position variables into the constant buffer.
-    for (int i = 0; i < NUM_LIGHTS; i++)
+    for (int i = 0; i < num_lights; i++)
 	{
 		dataPtr2->lightPosition[i] = lightPosition[i];
 	}
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_lightPositionBuffer, 0);
+    deviceContext->Unmap(light_position_buffer_, 0);
 
     // Set the position of the constant buffer in the vertex shader.
     bufferNumber = 1;
 
     // Finally set the constant buffer in the vertex shader with the updated values.
-    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &m_lightPositionBuffer);
+    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &light_position_buffer_);
 
     // Set shader texture resource in the pixel shader.
     deviceContext->PSSetShaderResources(0, 1, &texture);
 
     // Lock the light color constant buffer so it can be written to.
-    result = deviceContext->Map(m_lightColorBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(light_color_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to map light color buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -503,41 +503,41 @@ bool LightShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, X
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr3 = (LightColorBufferType*)mappedResource.pData;
+    dataPtr3 = (light_color_buffer_type*)mappedResource.pData;
 
     // Copy the light color variables into the constant buffer.
-    for (int i = 0; i < NUM_LIGHTS; i++)
+    for (int i = 0; i < num_lights; i++)
     {
         dataPtr3->diffuseColor[i] = diffuseColor[i];
 	}
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_lightColorBuffer, 0);
+    deviceContext->Unmap(light_color_buffer_, 0);
 
     // Set the position of the constant buffer in the pixel shader.
     bufferNumber = 0;
 
     // Finally set the constant buffer in the pixel shader with the updated values.
-    deviceContext->PSSetConstantBuffers(bufferNumber, 1, &m_lightColorBuffer);
+    deviceContext->PSSetConstantBuffers(bufferNumber, 1, &light_color_buffer_);
 
 
     return true;
 }
 
 
-void LightShaderClass::RenderShader(ID3D11DeviceContext* deviceContext, int indexCount)
+void light_shader_class::render_shader(ID3D11DeviceContext* deviceContext, int indexCount)
 {
     // Set the vertex input layout.
-    deviceContext->IASetInputLayout(m_layout);
+    deviceContext->IASetInputLayout(layout_);
 
     // Set the vertex and pixel shaders that will be used to render this triangle.
-    deviceContext->VSSetShader(m_vertexShader, NULL, 0);
-    deviceContext->PSSetShader(m_pixelShader, NULL, 0);
+    deviceContext->VSSetShader(vertex_shader_, NULL, 0);
+    deviceContext->PSSetShader(pixel_shader_, NULL, 0);
 
     // Set the sampler state in the pixel shader.
-    deviceContext->PSSetSamplers(0, 1, &m_sampleState);
+    deviceContext->PSSetSamplers(0, 1, &sample_state_);
 
-    // Render the triangle.
+    // render the triangle.
     deviceContext->DrawIndexed(indexCount, 0, 0);
 
     return;
diff --git a/enginecustom/src/src/shader/Multitextureshaderclass.cpp b/enginecustom/src/src/shader/multi_texture_shader_class.cpp
similarity index 75%
rename from enginecustom/src/src/shader/Multitextureshaderclass.cpp
rename to enginecustom/src/src/shader/multi_texture_shader_class.cpp
index 82873b2..2c167a4 100644
--- a/enginecustom/src/src/shader/Multitextureshaderclass.cpp
+++ b/enginecustom/src/src/shader/multi_texture_shader_class.cpp
@@ -1,32 +1,32 @@
 ////////////////////////////////////////////////////////////////////////////////
 // Filename: multitextureshaderclass.cpp
 ////////////////////////////////////////////////////////////////////////////////
-#include "multitextureshaderclass.h"
+#include "multi_texture_shader_class.h"
 
 
-MultiTextureShaderClass::MultiTextureShaderClass()
+multi_texture_shader_class::multi_texture_shader_class()
 {
-    m_vertexShader = 0;
-    m_pixelShader = 0;
-    m_layout = 0;
-    m_matrixBuffer = 0;
-    m_sampleState = 0;
+    vertex_shader_ = 0;
+    pixel_shader_ = 0;
+    layout_ = 0;
+    matrix_buffer_ = 0;
+    sample_state_ = 0;
 }
 
 
-MultiTextureShaderClass::MultiTextureShaderClass(const MultiTextureShaderClass& other)
+multi_texture_shader_class::multi_texture_shader_class(const multi_texture_shader_class& other)
 {
 }
 
 
-MultiTextureShaderClass::~MultiTextureShaderClass()
+multi_texture_shader_class::~multi_texture_shader_class()
 {
 }
 
 
-bool MultiTextureShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
+bool multi_texture_shader_class::initialize(ID3D11Device* device, HWND hwnd)
 {
-    Logger::Get().Log("Initializing MultiTextureShaderClass", __FILE__, __LINE__, Logger::LogLevel::Initialize);
+    Logger::Get().Log("Initializing multi_texture_shader_class", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
     bool result;
     wchar_t vsFilename[128];
@@ -49,35 +49,35 @@ bool MultiTextureShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
         return false;
     }
 
-    // Initialize the vertex and pixel shaders.
-    result = InitializeShader(device, hwnd, vsFilename, psFilename);
+    // initialize the vertex and pixel shaders.
+    result = initialize_shader(device, hwnd, vsFilename, psFilename);
     if (!result)
     {
         Logger::Get().Log("Failed to initialize the vertex and pixel shaders", __FILE__, __LINE__, Logger::LogLevel::Error);
         return false;
     }
 
-    Logger::Get().Log("MultiTextureShaderClass initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
+    Logger::Get().Log("multi_texture_shader_class initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
     return true;
 }
 
-void MultiTextureShaderClass::Shutdown()
+void multi_texture_shader_class::shutdown()
 {
-    // Shutdown the vertex and pixel shaders as well as the related objects.
-    ShutdownShader();
+    // shutdown the vertex and pixel shaders as well as the related objects.
+    shutdown_shader();
 
     return;
 }
 
-bool MultiTextureShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
+bool multi_texture_shader_class::render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
     XMMATRIX projectionMatrix, ID3D11ShaderResourceView* texture1, ID3D11ShaderResourceView* texture2)
 {
     bool result;
 
 
     // Set the shader parameters that it will use for rendering.
-    result = SetShaderParameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture1, texture2);
+    result = set_shader_parameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture1, texture2);
     if (!result)
     {
         Logger::Get().Log("Failed to set the shader parameters that it will use for rendering", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -85,12 +85,12 @@ bool MultiTextureShaderClass::Render(ID3D11DeviceContext* deviceContext, int ind
     }
 
     // Now render the prepared buffers with the shader.
-    RenderShader(deviceContext, indexCount);
+    render_shader(deviceContext, indexCount);
 
     return true;
 }
 
-bool MultiTextureShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
+bool multi_texture_shader_class::initialize_shader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
 {
     Logger::Get().Log("Initializing the shader", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -104,7 +104,7 @@ bool MultiTextureShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd,
     D3D11_SAMPLER_DESC samplerDesc;
 
 
-    // Initialize the pointers this function will use to null.
+    // initialize the pointers this function will use to null.
     errorMessage = 0;
     vertexShaderBuffer = 0;
     pixelShaderBuffer = 0;
@@ -117,7 +117,7 @@ bool MultiTextureShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd,
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, vsFilename);
+            output_shader_error_message(errorMessage, hwnd, vsFilename);
         }
         // If there was nothing in the error message then it simply could not find the shader file itself.
         else
@@ -136,7 +136,7 @@ bool MultiTextureShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd,
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, psFilename);
+            output_shader_error_message(errorMessage, hwnd, psFilename);
         }
         // If there was nothing in the error message then it simply could not find the file itself.
         else
@@ -148,7 +148,7 @@ bool MultiTextureShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd,
     }
 
     // Create the vertex shader from the buffer.
-    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &m_vertexShader);
+    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &vertex_shader_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create the vertex shader from the buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -156,7 +156,7 @@ bool MultiTextureShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd,
     }
 
     // Create the pixel shader from the buffer.
-    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &m_pixelShader);
+    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &pixel_shader_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create the pixel shader from the buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -193,7 +193,7 @@ bool MultiTextureShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd,
 
     // Create the vertex input layout.
     result = device->CreateInputLayout(polygonLayout, numElements, vertexShaderBuffer->GetBufferPointer(),
-        vertexShaderBuffer->GetBufferSize(), &m_layout);
+        vertexShaderBuffer->GetBufferSize(), &layout_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create the vertex input layout", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -209,14 +209,14 @@ bool MultiTextureShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd,
 
     // Setup the description of the dynamic matrix constant buffer that is in the vertex shader.
     matrixBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    matrixBufferDesc.ByteWidth = sizeof(MatrixBufferType);
+    matrixBufferDesc.ByteWidth = sizeof(matrix_buffer_type);
     matrixBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     matrixBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     matrixBufferDesc.MiscFlags = 0;
     matrixBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&matrixBufferDesc, NULL, &m_matrixBuffer);
+    result = device->CreateBuffer(&matrixBufferDesc, NULL, &matrix_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create the constant buffer pointer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -239,7 +239,7 @@ bool MultiTextureShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd,
     samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
 
     // Create the texture sampler state.
-    result = device->CreateSamplerState(&samplerDesc, &m_sampleState);
+    result = device->CreateSamplerState(&samplerDesc, &sample_state_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create the texture sampler state", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -251,43 +251,43 @@ bool MultiTextureShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd,
     return true;
 }
 
-void MultiTextureShaderClass::ShutdownShader()
+void multi_texture_shader_class::shutdown_shader()
 {
     Logger::Get().Log("Shutting down the shader", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
     // Release the sampler state.
-    if (m_sampleState)
+    if (sample_state_)
     {
-        m_sampleState->Release();
-        m_sampleState = 0;
+        sample_state_->Release();
+        sample_state_ = 0;
     }
 
     // Release the matrix constant buffer.
-    if (m_matrixBuffer)
+    if (matrix_buffer_)
     {
-        m_matrixBuffer->Release();
-        m_matrixBuffer = 0;
+        matrix_buffer_->Release();
+        matrix_buffer_ = 0;
     }
 
     // Release the layout.
-    if (m_layout)
+    if (layout_)
     {
-        m_layout->Release();
-        m_layout = 0;
+        layout_->Release();
+        layout_ = 0;
     }
 
     // Release the pixel shader.
-    if (m_pixelShader)
+    if (pixel_shader_)
     {
-        m_pixelShader->Release();
-        m_pixelShader = 0;
+        pixel_shader_->Release();
+        pixel_shader_ = 0;
     }
 
     // Release the vertex shader.
-    if (m_vertexShader)
+    if (vertex_shader_)
     {
-        m_vertexShader->Release();
-        m_vertexShader = 0;
+        vertex_shader_->Release();
+        vertex_shader_ = 0;
     }
 
     Logger::Get().Log("Shader shut down", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
@@ -295,7 +295,7 @@ void MultiTextureShaderClass::ShutdownShader()
     return;
 }
 
-void MultiTextureShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
+void multi_texture_shader_class::output_shader_error_message(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
 {
     char* compileErrors;
     unsigned long long bufferSize, i;
@@ -330,12 +330,12 @@ void MultiTextureShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage,
     return;
 }
 
-bool MultiTextureShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
+bool multi_texture_shader_class::set_shader_parameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
     XMMATRIX projectionMatrix, ID3D11ShaderResourceView* texture1, ID3D11ShaderResourceView* texture2)
 {
     HRESULT result;
     D3D11_MAPPED_SUBRESOURCE mappedResource;
-    MatrixBufferType* dataPtr;
+    matrix_buffer_type* dataPtr;
     unsigned int bufferNumber;
 
 
@@ -345,7 +345,7 @@ bool MultiTextureShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceCon
     projectionMatrix = XMMatrixTranspose(projectionMatrix);
 
     // Lock the constant buffer so it can be written to.
-    result = deviceContext->Map(m_matrixBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(matrix_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to lock the constant buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -353,7 +353,7 @@ bool MultiTextureShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceCon
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr = (MatrixBufferType*)mappedResource.pData;
+    dataPtr = (matrix_buffer_type*)mappedResource.pData;
 
     // Copy the matrices into the constant buffer.
     dataPtr->world = worldMatrix;
@@ -361,13 +361,13 @@ bool MultiTextureShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceCon
     dataPtr->projection = projectionMatrix;
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_matrixBuffer, 0);
+    deviceContext->Unmap(matrix_buffer_, 0);
 
     // Set the position of the constant buffer in the vertex shader.
     bufferNumber = 0;
 
     // Finally set the constant buffer in the vertex shader with the updated values.
-    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &m_matrixBuffer);
+    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &matrix_buffer_);
 
     // Set shader texture resources in the pixel shader.
     deviceContext->PSSetShaderResources(0, 1, &texture1);
@@ -376,19 +376,19 @@ bool MultiTextureShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceCon
     return true;
 }
 
-void MultiTextureShaderClass::RenderShader(ID3D11DeviceContext* deviceContext, int indexCount)
+void multi_texture_shader_class::render_shader(ID3D11DeviceContext* deviceContext, int indexCount)
 {
     // Set the vertex input layout.
-    deviceContext->IASetInputLayout(m_layout);
+    deviceContext->IASetInputLayout(layout_);
 
     // Set the vertex and pixel shaders that will be used to render this triangle.
-    deviceContext->VSSetShader(m_vertexShader, NULL, 0);
-    deviceContext->PSSetShader(m_pixelShader, NULL, 0);
+    deviceContext->VSSetShader(vertex_shader_, NULL, 0);
+    deviceContext->PSSetShader(pixel_shader_, NULL, 0);
 
     // Set the sampler state in the pixel shader.
-    deviceContext->PSSetSamplers(0, 1, &m_sampleState);
+    deviceContext->PSSetSamplers(0, 1, &sample_state_);
 
-    // Render the triangle.
+    // render the triangle.
     deviceContext->DrawIndexed(indexCount, 0, 0);
 
     return;
diff --git a/enginecustom/src/src/shader/normalmapshaderclass.cpp b/enginecustom/src/src/shader/normal_map_shader_class.cpp
similarity index 77%
rename from enginecustom/src/src/shader/normalmapshaderclass.cpp
rename to enginecustom/src/src/shader/normal_map_shader_class.cpp
index e7ce385..00619c2 100644
--- a/enginecustom/src/src/shader/normalmapshaderclass.cpp
+++ b/enginecustom/src/src/shader/normal_map_shader_class.cpp
@@ -1,28 +1,28 @@
-#include "normalmapshaderclass.h"
+#include "normal_map_shader_class.h"
 
 
-NormalMapShaderClass::NormalMapShaderClass()
+normal_map_shader_class::normal_map_shader_class()
 {
-    m_vertexShader = 0;
-    m_pixelShader = 0;
-    m_layout = 0;
-    m_matrixBuffer = 0;
-    m_sampleState = 0;
-    m_lightBuffer = 0;
+    vertex_shader_ = 0;
+    pixel_shader_ = 0;
+    layout_ = 0;
+    matrix_buffer_ = 0;
+    sample_state_ = 0;
+    light_buffer_ = 0;
 }
 
 
-NormalMapShaderClass::NormalMapShaderClass(const NormalMapShaderClass& other)
+normal_map_shader_class::normal_map_shader_class(const normal_map_shader_class& other)
 {
 }
 
 
-NormalMapShaderClass::~NormalMapShaderClass()
+normal_map_shader_class::~normal_map_shader_class()
 {
 }
 
 
-bool NormalMapShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
+bool normal_map_shader_class::initialize(ID3D11Device* device, HWND hwnd)
 {
     Logger::Get().Log("Initializing normal map shader", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -47,8 +47,8 @@ bool NormalMapShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
         return false;
     }
 
-    // Initialize the vertex and pixel shaders.
-    result = InitializeShader(device, hwnd, vsFilename, psFilename);
+    // initialize the vertex and pixel shaders.
+    result = initialize_shader(device, hwnd, vsFilename, psFilename);
     if (!result)
     {
         Logger::Get().Log("Failed to initialize the vertex and pixel shaders", __FILE__, __LINE__);
@@ -61,22 +61,22 @@ bool NormalMapShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
 }
 
 
-void NormalMapShaderClass::Shutdown()
+void normal_map_shader_class::shutdown()
 {
-    // Shutdown the vertex and pixel shaders as well as the related objects.
-    ShutdownShader();
+    // shutdown the vertex and pixel shaders as well as the related objects.
+    shutdown_shader();
 
     return;
 }
 
-bool NormalMapShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+bool normal_map_shader_class::render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
     ID3D11ShaderResourceView* texture1, ID3D11ShaderResourceView* texture2, XMFLOAT3 lightDirection, XMFLOAT4 diffuseColor)
 {
     bool result;
 
 
     // Set the shader parameters that it will use for rendering.
-    result = SetShaderParameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture1, texture2, lightDirection, diffuseColor);
+    result = set_shader_parameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture1, texture2, lightDirection, diffuseColor);
     if (!result)
     {
         Logger::Get().Log("Failed to set the shader parameters that will be used for rendering", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -84,13 +84,13 @@ bool NormalMapShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexC
     }
 
     // Now render the prepared buffers with the shader.
-    RenderShader(deviceContext, indexCount);
+    render_shader(deviceContext, indexCount);
 
     return true;
 }
 
 
-bool NormalMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
+bool normal_map_shader_class::initialize_shader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
 {
     Logger::Get().Log("Initializing normal map shader", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -105,7 +105,7 @@ bool NormalMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCH
     D3D11_BUFFER_DESC lightBufferDesc;
 
 
-    // Initialize the pointers this function will use to null.
+    // initialize the pointers this function will use to null.
     errorMessage = 0;
     vertexShaderBuffer = 0;
     pixelShaderBuffer = 0;
@@ -118,7 +118,7 @@ bool NormalMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCH
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, vsFilename);
+            output_shader_error_message(errorMessage, hwnd, vsFilename);
         }
         // If there was nothing in the error message then it simply could not find the shader file itself.
         else
@@ -137,7 +137,7 @@ bool NormalMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCH
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, psFilename);
+            output_shader_error_message(errorMessage, hwnd, psFilename);
         }
         // If there was nothing in the error message then it simply could not find the file itself.
         else
@@ -149,7 +149,7 @@ bool NormalMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCH
     }
 
     // Create the vertex shader from the buffer.
-    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &m_vertexShader);
+    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &vertex_shader_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create the vertex shader from the buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -157,7 +157,7 @@ bool NormalMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCH
     }
 
     // Create the pixel shader from the buffer.
-    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &m_pixelShader);
+    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &pixel_shader_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create the pixel shader from the buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -210,7 +210,7 @@ bool NormalMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCH
 
     // Create the vertex input layout.
     result = device->CreateInputLayout(polygonLayout, numElements, vertexShaderBuffer->GetBufferPointer(),
-        vertexShaderBuffer->GetBufferSize(), &m_layout);
+        vertexShaderBuffer->GetBufferSize(), &layout_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create the vertex input layout", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -226,14 +226,14 @@ bool NormalMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCH
 
     // Setup the description of the dynamic matrix constant buffer that is in the vertex shader.
     matrixBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    matrixBufferDesc.ByteWidth = sizeof(MatrixBufferType);
+    matrixBufferDesc.ByteWidth = sizeof(matrix_buffer_type);
     matrixBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     matrixBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     matrixBufferDesc.MiscFlags = 0;
     matrixBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&matrixBufferDesc, NULL, &m_matrixBuffer);
+    result = device->CreateBuffer(&matrixBufferDesc, NULL, &matrix_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create the constant buffer pointer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -256,7 +256,7 @@ bool NormalMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCH
     samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
 
     // Create the texture sampler state.
-    result = device->CreateSamplerState(&samplerDesc, &m_sampleState);
+    result = device->CreateSamplerState(&samplerDesc, &sample_state_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create the texture sampler state", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -265,14 +265,14 @@ bool NormalMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCH
 
     // Setup the description of the light dynamic constant buffer that is in the pixel shader.
     lightBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    lightBufferDesc.ByteWidth = sizeof(LightBufferType);
+    lightBufferDesc.ByteWidth = sizeof(light_buffer_type);
     lightBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     lightBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     lightBufferDesc.MiscFlags = 0;
     lightBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&lightBufferDesc, NULL, &m_lightBuffer);
+    result = device->CreateBuffer(&lightBufferDesc, NULL, &light_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create the light constant buffer pointer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -285,50 +285,50 @@ bool NormalMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCH
 }
 
 
-void NormalMapShaderClass::ShutdownShader()
+void normal_map_shader_class::shutdown_shader()
 {
     Logger::Get().Log("Shutting down normal map shader", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
     // Release the light constant buffer.
-    if (m_lightBuffer)
+    if (light_buffer_)
     {
-        m_lightBuffer->Release();
-        m_lightBuffer = 0;
+        light_buffer_->Release();
+        light_buffer_ = 0;
     }
 
     // Release the sampler state.
-    if (m_sampleState)
+    if (sample_state_)
     {
-        m_sampleState->Release();
-        m_sampleState = 0;
+        sample_state_->Release();
+        sample_state_ = 0;
     }
 
     // Release the matrix constant buffer.
-    if (m_matrixBuffer)
+    if (matrix_buffer_)
     {
-        m_matrixBuffer->Release();
-        m_matrixBuffer = 0;
+        matrix_buffer_->Release();
+        matrix_buffer_ = 0;
     }
 
     // Release the layout.
-    if (m_layout)
+    if (layout_)
     {
-        m_layout->Release();
-        m_layout = 0;
+        layout_->Release();
+        layout_ = 0;
     }
 
     // Release the pixel shader.
-    if (m_pixelShader)
+    if (pixel_shader_)
     {
-        m_pixelShader->Release();
-        m_pixelShader = 0;
+        pixel_shader_->Release();
+        pixel_shader_ = 0;
     }
 
     // Release the vertex shader.
-    if (m_vertexShader)
+    if (vertex_shader_)
     {
-        m_vertexShader->Release();
-        m_vertexShader = 0;
+        vertex_shader_->Release();
+        vertex_shader_ = 0;
     }
 
     Logger::Get().Log("Successfully shut down normal map shader", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
@@ -337,7 +337,7 @@ void NormalMapShaderClass::ShutdownShader()
 }
 
 
-void NormalMapShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
+void normal_map_shader_class::output_shader_error_message(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
 {
     char* compileErrors;
     unsigned long long bufferSize, i;
@@ -373,14 +373,14 @@ void NormalMapShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HW
 }
 
 
-bool NormalMapShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+bool normal_map_shader_class::set_shader_parameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
     ID3D11ShaderResourceView* texture1, ID3D11ShaderResourceView* texture2, XMFLOAT3 lightDirection, XMFLOAT4 diffuseColor)
 {
     HRESULT result;
     D3D11_MAPPED_SUBRESOURCE mappedResource;
-    MatrixBufferType* dataPtr;
+    matrix_buffer_type* dataPtr;
     unsigned int bufferNumber;
-    LightBufferType* dataPtr2;
+    light_buffer_type* dataPtr2;
 
 
     // Transpose the matrices to prepare them for the shader.
@@ -389,7 +389,7 @@ bool NormalMapShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContex
     projectionMatrix = XMMatrixTranspose(projectionMatrix);
 
     // Lock the constant buffer so it can be written to.
-    result = deviceContext->Map(m_matrixBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(matrix_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to lock the constant buffer so it can be written to", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -397,7 +397,7 @@ bool NormalMapShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContex
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr = (MatrixBufferType*)mappedResource.pData;
+    dataPtr = (matrix_buffer_type*)mappedResource.pData;
 
     // Copy the matrices into the constant buffer.
     dataPtr->world = worldMatrix;
@@ -405,20 +405,20 @@ bool NormalMapShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContex
     dataPtr->projection = projectionMatrix;
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_matrixBuffer, 0);
+    deviceContext->Unmap(matrix_buffer_, 0);
 
     // Set the position of the constant buffer in the vertex shader.
     bufferNumber = 0;
 
     // Finally set the constant buffer in the vertex shader with the updated values.
-    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &m_matrixBuffer);
+    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &matrix_buffer_);
 
     // Set shader texture resources in the pixel shader.
     deviceContext->PSSetShaderResources(0, 1, &texture1);
     deviceContext->PSSetShaderResources(1, 1, &texture2);
 
     // Lock the light constant buffer so it can be written to.
-    result = deviceContext->Map(m_lightBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(light_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to lock the light constant buffer so it can be written to", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -426,21 +426,21 @@ bool NormalMapShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContex
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr2 = (LightBufferType*)mappedResource.pData;
+    dataPtr2 = (light_buffer_type*)mappedResource.pData;
 
     // Copy the lighting variables into the constant buffer.
-    dataPtr2->diffuseColor = diffuseColor;
-    dataPtr2->lightDirection = lightDirection;
+    dataPtr2->diffuse_color = diffuseColor;
+    dataPtr2->light_direction = lightDirection;
     dataPtr2->padding = 0.0f;
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_lightBuffer, 0);
+    deviceContext->Unmap(light_buffer_, 0);
 
     // Set the position of the light constant buffer in the pixel shader.
     bufferNumber = 0;
 
     // Finally set the light constant buffer in the pixel shader with the updated values.
-    deviceContext->PSSetConstantBuffers(bufferNumber, 1, &m_lightBuffer);
+    deviceContext->PSSetConstantBuffers(bufferNumber, 1, &light_buffer_);
 
     // Set shader texture resources in the pixel shader.
     deviceContext->PSSetShaderResources(0, 1, &texture1);
@@ -450,19 +450,19 @@ bool NormalMapShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContex
 }
 
 
-void NormalMapShaderClass::RenderShader(ID3D11DeviceContext* deviceContext, int indexCount)
+void normal_map_shader_class::render_shader(ID3D11DeviceContext* deviceContext, int indexCount)
 {
     // Set the vertex input layout.
-    deviceContext->IASetInputLayout(m_layout);
+    deviceContext->IASetInputLayout(layout_);
 
     // Set the vertex and pixel shaders that will be used to render this triangle.
-    deviceContext->VSSetShader(m_vertexShader, NULL, 0);
-    deviceContext->PSSetShader(m_pixelShader, NULL, 0);
+    deviceContext->VSSetShader(vertex_shader_, NULL, 0);
+    deviceContext->PSSetShader(pixel_shader_, NULL, 0);
 
     // Set the sampler state in the pixel shader.
-    deviceContext->PSSetSamplers(0, 1, &m_sampleState);
+    deviceContext->PSSetSamplers(0, 1, &sample_state_);
 
-    // Render the triangle.
+    // render the triangle.
     deviceContext->DrawIndexed(indexCount, 0, 0);
 
     return;
diff --git a/enginecustom/src/src/shader/reflectionshaderclass.cpp b/enginecustom/src/src/shader/reflection_shader_class.cpp
similarity index 75%
rename from enginecustom/src/src/shader/reflectionshaderclass.cpp
rename to enginecustom/src/src/shader/reflection_shader_class.cpp
index 8f51e43..f2ae55d 100644
--- a/enginecustom/src/src/shader/reflectionshaderclass.cpp
+++ b/enginecustom/src/src/shader/reflection_shader_class.cpp
@@ -1,25 +1,25 @@
-#include "reflectionshaderclass.h"
+#include "reflection_shader_class.h"
 
-ReflectionShaderClass::ReflectionShaderClass()
+reflection_shader_class::reflection_shader_class()
 {
-	m_vertexShader = 0;
-	m_pixelShader = 0;
-	m_layout = 0;
-	m_matrixBuffer = 0;
-	m_sampleState = 0;
-	m_reflectionBuffer = 0;
+	vertex_shader_ = 0;
+	pixel_shader_ = 0;
+	layout_ = 0;
+	matrix_buffer_ = 0;
+	sample_state_ = 0;
+	reflection_buffer_ = 0;
 }
 
-ReflectionShaderClass::ReflectionShaderClass(const ReflectionShaderClass& other)
+reflection_shader_class::reflection_shader_class(const reflection_shader_class& other)
 {
 
 }
 
-ReflectionShaderClass::~ReflectionShaderClass()
+reflection_shader_class::~reflection_shader_class()
 {
 }
 
-bool ReflectionShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
+bool reflection_shader_class::initialize(ID3D11Device* device, HWND hwnd)
 {
     Logger::Get().Log("Initializing reflection shader", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -44,8 +44,8 @@ bool ReflectionShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
         return false;
     }
 
-    // Initialize the vertex and pixel shaders.
-    result = InitializeShader(device, hwnd, vsFilename, psFilename);
+    // initialize the vertex and pixel shaders.
+    result = initialize_shader(device, hwnd, vsFilename, psFilename);
     if (!result)
     {
         Logger::Get().Log("Error initializing shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -57,22 +57,22 @@ bool ReflectionShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
     return true;
 }
 
-void ReflectionShaderClass::Shutdown()
+void reflection_shader_class::shutdown()
 {
-    // Shutdown the vertex and pixel shaders as well as the related objects.
-    ShutdownShader();
+    // shutdown the vertex and pixel shaders as well as the related objects.
+    shutdown_shader();
 
     return;
 }
 
-bool ReflectionShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+bool reflection_shader_class::render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
     ID3D11ShaderResourceView* texture, ID3D11ShaderResourceView* reflectionTexture, XMMATRIX reflectionMatrix)
 {
     bool result;
 
 
     // Set the shader parameters that it will use for rendering.
-    result = SetShaderParameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture, reflectionTexture, reflectionMatrix);
+    result = set_shader_parameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture, reflectionTexture, reflectionMatrix);
     if (!result)
     {
         Logger::Get().Log("Error setting shader parameters", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -80,12 +80,12 @@ bool ReflectionShaderClass::Render(ID3D11DeviceContext* deviceContext, int index
     }
 
     // Now render the prepared buffers with the shader.
-    RenderShader(deviceContext, indexCount);
+    render_shader(deviceContext, indexCount);
 
     return true;
 }
 
-bool ReflectionShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
+bool reflection_shader_class::initialize_shader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
 {
     Logger::Get().Log("Initializing reflection shader", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -100,7 +100,7 @@ bool ReflectionShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WC
     D3D11_BUFFER_DESC reflectionBufferDesc;
 
 
-    // Initialize the pointers this function will use to null.
+    // initialize the pointers this function will use to null.
     errorMessage = 0;
     vertexShaderBuffer = 0;
     pixelShaderBuffer = 0;
@@ -113,7 +113,7 @@ bool ReflectionShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WC
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, vsFilename);
+            output_shader_error_message(errorMessage, hwnd, vsFilename);
         }
         // If there was nothing in the error message then it simply could not find the shader file itself.
         else
@@ -131,7 +131,7 @@ bool ReflectionShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WC
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, psFilename);
+            output_shader_error_message(errorMessage, hwnd, psFilename);
         }
         // If there was nothing in the error message then it simply could not find the file itself.
         else
@@ -143,7 +143,7 @@ bool ReflectionShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WC
     }
 
     // Create the vertex shader from the buffer.
-    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &m_vertexShader);
+    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &vertex_shader_);
     if (FAILED(result))
     {
         Logger::Get().Log("Error creating vertex shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -151,7 +151,7 @@ bool ReflectionShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WC
     }
 
     // Create the pixel shader from the buffer.
-    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &m_pixelShader);
+    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &pixel_shader_);
     if (FAILED(result))
     {
         Logger::Get().Log("Error creating pixel shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -180,7 +180,7 @@ bool ReflectionShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WC
 
     // Create the vertex input layout.
     result = device->CreateInputLayout(polygonLayout, numElements, vertexShaderBuffer->GetBufferPointer(),
-        vertexShaderBuffer->GetBufferSize(), &m_layout);
+        vertexShaderBuffer->GetBufferSize(), &layout_);
     if (FAILED(result))
     {
         Logger::Get().Log("Error creating input layout", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -196,14 +196,14 @@ bool ReflectionShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WC
 
     // Setup the description of the dynamic matrix constant buffer that is in the vertex shader.
     matrixBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    matrixBufferDesc.ByteWidth = sizeof(MatrixBufferType);
+    matrixBufferDesc.ByteWidth = sizeof(matrix_buffer_type);
     matrixBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     matrixBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     matrixBufferDesc.MiscFlags = 0;
     matrixBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&matrixBufferDesc, NULL, &m_matrixBuffer);
+    result = device->CreateBuffer(&matrixBufferDesc, NULL, &matrix_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Error creating constant buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -225,7 +225,7 @@ bool ReflectionShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WC
     samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
 
     // Create the texture sampler state.
-    result = device->CreateSamplerState(&samplerDesc, &m_sampleState);
+    result = device->CreateSamplerState(&samplerDesc, &sample_state_);
     if (FAILED(result))
     {
         Logger::Get().Log("Error creating sampler state", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -233,14 +233,14 @@ bool ReflectionShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WC
     }
     // Setup the description of the reflection dynamic constant buffer that is in the vertex shader.
     reflectionBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    reflectionBufferDesc.ByteWidth = sizeof(ReflectionBufferType);
+    reflectionBufferDesc.ByteWidth = sizeof(reflection_buffer_type);
     reflectionBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     reflectionBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     reflectionBufferDesc.MiscFlags = 0;
     reflectionBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&reflectionBufferDesc, NULL, &m_reflectionBuffer);
+    result = device->CreateBuffer(&reflectionBufferDesc, NULL, &reflection_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Error creating constant buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -252,50 +252,50 @@ bool ReflectionShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WC
     return true;
 }
 
-void ReflectionShaderClass::ShutdownShader()
+void reflection_shader_class::shutdown_shader()
 {
     Logger::Get().Log("Shutting down reflection shader", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
     // Release the reflection constant buffer.
-    if (m_reflectionBuffer)
+    if (reflection_buffer_)
     {
-            m_reflectionBuffer->Release();
-            m_reflectionBuffer = 0;
+            reflection_buffer_->Release();
+            reflection_buffer_ = 0;
     }
 
     // Release the sampler state.
-    if (m_sampleState)
+    if (sample_state_)
     {
-        m_sampleState->Release();
-        m_sampleState = 0;
+        sample_state_->Release();
+        sample_state_ = 0;
     }
 
     // Release the matrix constant buffer.
-    if (m_matrixBuffer)
+    if (matrix_buffer_)
     {
-        m_matrixBuffer->Release();
-        m_matrixBuffer = 0;
+        matrix_buffer_->Release();
+        matrix_buffer_ = 0;
     }
 
     // Release the layout.
-    if (m_layout)
+    if (layout_)
     {
-        m_layout->Release();
-        m_layout = 0;
+        layout_->Release();
+        layout_ = 0;
     }
 
     // Release the pixel shader.
-    if (m_pixelShader)
+    if (pixel_shader_)
     {
-        m_pixelShader->Release();
-        m_pixelShader = 0;
+        pixel_shader_->Release();
+        pixel_shader_ = 0;
     }
 
     // Release the vertex shader.
-    if (m_vertexShader)
+    if (vertex_shader_)
     {
-        m_vertexShader->Release();
-        m_vertexShader = 0;
+        vertex_shader_->Release();
+        vertex_shader_ = 0;
     }
 
     Logger::Get().Log("Reflection shader shut down", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
@@ -304,7 +304,7 @@ void ReflectionShaderClass::ShutdownShader()
 }
 
 
-void ReflectionShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
+void reflection_shader_class::output_shader_error_message(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
 {
     char* compileErrors;
     unsigned long long bufferSize, i;
@@ -339,14 +339,14 @@ void ReflectionShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, H
     return;
 }
 
-bool ReflectionShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+bool reflection_shader_class::set_shader_parameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
     ID3D11ShaderResourceView* texture, ID3D11ShaderResourceView* reflectionTexture, XMMATRIX reflectionMatrix)
 {
     HRESULT result;
     D3D11_MAPPED_SUBRESOURCE mappedResource;
-    MatrixBufferType* dataPtr;
+    matrix_buffer_type* dataPtr;
     unsigned int bufferNumber;
-    ReflectionBufferType* dataPtr2;
+    reflection_buffer_type* dataPtr2;
 
 
     // Transpose the matrices to prepare them for the shader.
@@ -358,7 +358,7 @@ bool ReflectionShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceConte
     reflectionMatrix = XMMatrixTranspose(reflectionMatrix);
 
     // Lock the constant buffer so it can be written to.
-    result = deviceContext->Map(m_matrixBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(matrix_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         Logger::Get().Log("Error mapping constant buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -366,7 +366,7 @@ bool ReflectionShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceConte
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr = (MatrixBufferType*)mappedResource.pData;
+    dataPtr = (matrix_buffer_type*)mappedResource.pData;
 
     // Copy the matrices into the constant buffer.
     dataPtr->world = worldMatrix;
@@ -374,16 +374,16 @@ bool ReflectionShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceConte
     dataPtr->projection = projectionMatrix;
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_matrixBuffer, 0);
+    deviceContext->Unmap(matrix_buffer_, 0);
 
     // Set the position of the constant buffer in the vertex shader.
     bufferNumber = 0;
 
     // Finally set the constant buffer in the vertex shader with the updated values.
-    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &m_matrixBuffer);
+    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &matrix_buffer_);
 
     // Lock the reflection constant buffer so it can be written to.
-    result = deviceContext->Map(m_reflectionBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(reflection_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         Logger::Get().Log("Error mapping constant buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -391,19 +391,19 @@ bool ReflectionShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceConte
     }
 
     // Get a pointer to the data in the matrix constant buffer.
-    dataPtr2 = (ReflectionBufferType*)mappedResource.pData;
+    dataPtr2 = (reflection_buffer_type*)mappedResource.pData;
 
     // Copy the matrix into the reflection constant buffer.
-    dataPtr2->reflectionMatrix = reflectionMatrix;
+    dataPtr2->reflection_matrix = reflectionMatrix;
 
     // Unlock the reflection constant buffer.
-    deviceContext->Unmap(m_reflectionBuffer, 0);
+    deviceContext->Unmap(reflection_buffer_, 0);
 
     // Set the position of the reflection constant buffer in the vertex shader.
     bufferNumber = 1;
 
     // Now set the reflection constant buffer in the vertex shader with the updated values.
-    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &m_reflectionBuffer);
+    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &reflection_buffer_);
 
     // Set shader texture resource in the pixel shader.
     deviceContext->PSSetShaderResources(0, 1, &texture);
@@ -415,19 +415,19 @@ bool ReflectionShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceConte
 }
 
 
-void ReflectionShaderClass::RenderShader(ID3D11DeviceContext* deviceContext, int indexCount)
+void reflection_shader_class::render_shader(ID3D11DeviceContext* deviceContext, int indexCount)
 {
     // Set the vertex input layout.
-    deviceContext->IASetInputLayout(m_layout);
+    deviceContext->IASetInputLayout(layout_);
 
     // Set the vertex and pixel shaders that will be used to render the geometry.
-    deviceContext->VSSetShader(m_vertexShader, NULL, 0);
-    deviceContext->PSSetShader(m_pixelShader, NULL, 0);
+    deviceContext->VSSetShader(vertex_shader_, NULL, 0);
+    deviceContext->PSSetShader(pixel_shader_, NULL, 0);
 
     // Set the sampler state in the pixel shader.
-    deviceContext->PSSetSamplers(0, 1, &m_sampleState);
+    deviceContext->PSSetSamplers(0, 1, &sample_state_);
 
-    // Render the geometry.
+    // render the geometry.
     deviceContext->DrawIndexed(indexCount, 0, 0);
 
     return;
diff --git a/enginecustom/src/src/shader/refractionshaderclass.cpp b/enginecustom/src/src/shader/refraction_shader_class.cpp
similarity index 70%
rename from enginecustom/src/src/shader/refractionshaderclass.cpp
rename to enginecustom/src/src/shader/refraction_shader_class.cpp
index 66dff24..914973f 100644
--- a/enginecustom/src/src/shader/refractionshaderclass.cpp
+++ b/enginecustom/src/src/shader/refraction_shader_class.cpp
@@ -1,29 +1,29 @@
-#include "refractionshaderclass.h"
+#include "refraction_shader_class.h"
 
 
-RefractionShaderClass::RefractionShaderClass()
+refraction_shader_class::refraction_shader_class()
 {
-    m_vertexShader = 0;
-    m_pixelShader = 0;
-    m_layout = 0;
-    m_matrixBuffer = 0;
-    m_sampleState = 0;
-    m_lightBuffer = 0;
-    m_clipPlaneBuffer = 0;
+    vertex_shader_ = 0;
+    pixel_shader_ = 0;
+    layout_ = 0;
+    matrix_buffer_ = 0;
+    sample_state_ = 0;
+    light_buffer_ = 0;
+    clip_plane_buffer_ = 0;
 }
 
 
-RefractionShaderClass::RefractionShaderClass(const RefractionShaderClass& other)
+refraction_shader_class::refraction_shader_class(const refraction_shader_class& other)
 {
 }
 
 
-RefractionShaderClass::~RefractionShaderClass()
+refraction_shader_class::~refraction_shader_class()
 {
 }
 
 
-bool RefractionShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
+bool refraction_shader_class::initialize(ID3D11Device* device, HWND hwnd)
 {
     bool result;
     wchar_t vsFilename[128];
@@ -44,8 +44,8 @@ bool RefractionShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
         return false;
     }
 
-    // Initialize the vertex and pixel shaders.
-    result = InitializeShader(device, hwnd, vsFilename, psFilename);
+    // initialize the vertex and pixel shaders.
+    result = initialize_shader(device, hwnd, vsFilename, psFilename);
     if (!result)
     {
         return false;
@@ -55,35 +55,35 @@ bool RefractionShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
 }
 
 
-void RefractionShaderClass::Shutdown()
+void refraction_shader_class::shutdown()
 {
-    // Shutdown the vertex and pixel shaders as well as the related objects.
-    ShutdownShader();
+    // shutdown the vertex and pixel shaders as well as the related objects.
+    shutdown_shader();
 
     return;
 }
 
-bool RefractionShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+bool refraction_shader_class::render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
     ID3D11ShaderResourceView* texture, XMFLOAT3 lightDirection, XMFLOAT4 ambientColor[], XMFLOAT4 diffuseColor[], XMFLOAT4 lightPosition[], XMFLOAT4 clipPlane)
 {
     bool result;
 
 
     // Set the shader parameters that it will use for rendering.
-    result = SetShaderParameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture, lightDirection, ambientColor, diffuseColor, lightPosition, clipPlane);
+    result = set_shader_parameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture, lightDirection, ambientColor, diffuseColor, lightPosition, clipPlane);
     if (!result)
     {
         return false;
     }
 
     // Now render the prepared buffers with the shader.
-    RenderShader(deviceContext, indexCount);
+    render_shader(deviceContext, indexCount);
 
     return true;
 }
 
 
-bool RefractionShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
+bool refraction_shader_class::initialize_shader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
 {
     HRESULT result;
     ID3D10Blob* errorMessage;
@@ -97,7 +97,7 @@ bool RefractionShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WC
     D3D11_BUFFER_DESC clipPlaneBufferDesc;
 
 
-    // Initialize the pointers this function will use to null.
+    // initialize the pointers this function will use to null.
     errorMessage = 0;
     vertexShaderBuffer = 0;
     pixelShaderBuffer = 0;
@@ -110,7 +110,7 @@ bool RefractionShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WC
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, vsFilename);
+            output_shader_error_message(errorMessage, hwnd, vsFilename);
         }
         // If there was nothing in the error message then it simply could not find the shader file itself.
         else
@@ -129,7 +129,7 @@ bool RefractionShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WC
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, psFilename);
+            output_shader_error_message(errorMessage, hwnd, psFilename);
         }
         // If there was nothing in the error message then it simply could not find the file itself.
         else
@@ -141,14 +141,14 @@ bool RefractionShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WC
     }
 
     // Create the vertex shader from the buffer.
-    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &m_vertexShader);
+    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &vertex_shader_);
     if (FAILED(result))
     {
         return false;
     }
 
     // Create the pixel shader from the buffer.
-    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &m_pixelShader);
+    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &pixel_shader_);
     if (FAILED(result))
     {
         return false;
@@ -184,7 +184,7 @@ bool RefractionShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WC
 
     // Create the vertex input layout.
     result = device->CreateInputLayout(polygonLayout, numElements, vertexShaderBuffer->GetBufferPointer(),
-        vertexShaderBuffer->GetBufferSize(), &m_layout);
+        vertexShaderBuffer->GetBufferSize(), &layout_);
     if (FAILED(result))
     {
         return false;
@@ -199,14 +199,14 @@ bool RefractionShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WC
 
     // Setup the description of the dynamic matrix constant buffer that is in the vertex shader.
     matrixBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    matrixBufferDesc.ByteWidth = sizeof(MatrixBufferType);
+    matrixBufferDesc.ByteWidth = sizeof(matrix_buffer_type);
     matrixBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     matrixBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     matrixBufferDesc.MiscFlags = 0;
     matrixBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&matrixBufferDesc, NULL, &m_matrixBuffer);
+    result = device->CreateBuffer(&matrixBufferDesc, NULL, &matrix_buffer_);
     if (FAILED(result))
     {
         return false;
@@ -228,7 +228,7 @@ bool RefractionShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WC
     samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
 
     // Create the texture sampler state.
-    result = device->CreateSamplerState(&samplerDesc, &m_sampleState);
+    result = device->CreateSamplerState(&samplerDesc, &sample_state_);
     if (FAILED(result))
     {
         return false;
@@ -237,14 +237,14 @@ bool RefractionShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WC
     // Setup the description of the light dynamic constant buffer that is in the pixel shader.
     // Note that ByteWidth always needs to be a multiple of 16 if using D3D11_BIND_CONSTANT_BUFFER or CreateBuffer will fail.
     lightBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    lightBufferDesc.ByteWidth = sizeof(LightBufferType);
+    lightBufferDesc.ByteWidth = sizeof(light_buffer_type);
     lightBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     lightBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     lightBufferDesc.MiscFlags = 0;
     lightBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&lightBufferDesc, NULL, &m_lightBuffer);
+    result = device->CreateBuffer(&lightBufferDesc, NULL, &light_buffer_);
     if (FAILED(result))
     {
         return false;
@@ -252,14 +252,14 @@ bool RefractionShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WC
 
     // Setup the description of the clip plane dynamic constant buffer that is in the vertex shader.
     clipPlaneBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    clipPlaneBufferDesc.ByteWidth = sizeof(ClipPlaneBufferType);
+    clipPlaneBufferDesc.ByteWidth = sizeof(clip_plane_buffer_type);
     clipPlaneBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     clipPlaneBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     clipPlaneBufferDesc.MiscFlags = 0;
     clipPlaneBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&clipPlaneBufferDesc, NULL, &m_clipPlaneBuffer);
+    result = device->CreateBuffer(&clipPlaneBufferDesc, NULL, &clip_plane_buffer_);
     if (FAILED(result))
     {
         return false;
@@ -269,62 +269,62 @@ bool RefractionShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WC
 }
 
 
-void RefractionShaderClass::ShutdownShader()
+void refraction_shader_class::shutdown_shader()
 {
     // Release the clip plane constant buffer.
-    if (m_clipPlaneBuffer)
+    if (clip_plane_buffer_)
     {
-        m_clipPlaneBuffer->Release();
-        m_clipPlaneBuffer = 0;
+        clip_plane_buffer_->Release();
+        clip_plane_buffer_ = 0;
     }
 
     // Release the light constant buffer.
-    if (m_lightBuffer)
+    if (light_buffer_)
     {
-        m_lightBuffer->Release();
-        m_lightBuffer = 0;
+        light_buffer_->Release();
+        light_buffer_ = 0;
     }
 
     // Release the sampler state.
-    if (m_sampleState)
+    if (sample_state_)
     {
-        m_sampleState->Release();
-        m_sampleState = 0;
+        sample_state_->Release();
+        sample_state_ = 0;
     }
 
     // Release the matrix constant buffer.
-    if (m_matrixBuffer)
+    if (matrix_buffer_)
     {
-        m_matrixBuffer->Release();
-        m_matrixBuffer = 0;
+        matrix_buffer_->Release();
+        matrix_buffer_ = 0;
     }
 
     // Release the layout.
-    if (m_layout)
+    if (layout_)
     {
-        m_layout->Release();
-        m_layout = 0;
+        layout_->Release();
+        layout_ = 0;
     }
 
     // Release the pixel shader.
-    if (m_pixelShader)
+    if (pixel_shader_)
     {
-        m_pixelShader->Release();
-        m_pixelShader = 0;
+        pixel_shader_->Release();
+        pixel_shader_ = 0;
     }
 
     // Release the vertex shader.
-    if (m_vertexShader)
+    if (vertex_shader_)
     {
-        m_vertexShader->Release();
-        m_vertexShader = 0;
+        vertex_shader_->Release();
+        vertex_shader_ = 0;
     }
 
     return;
 }
 
 
-void RefractionShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
+void refraction_shader_class::output_shader_error_message(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
 {
     char* compileErrors;
     unsigned long long bufferSize, i;
@@ -360,15 +360,15 @@ void RefractionShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, H
 }
 
 
-bool RefractionShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+bool refraction_shader_class::set_shader_parameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
     ID3D11ShaderResourceView* texture, XMFLOAT3 lightDirection, XMFLOAT4 ambientColor[], XMFLOAT4 diffuseColor[], XMFLOAT4 lightPosition[], XMFLOAT4 clipPlane)
 {
     HRESULT result;
     D3D11_MAPPED_SUBRESOURCE mappedResource;
-    MatrixBufferType* dataPtr;
+    matrix_buffer_type* dataPtr;
     unsigned int bufferNumber;
-    ClipPlaneBufferType* dataPtr2;
-    LightBufferType* dataPtr3;
+    clip_plane_buffer_type* dataPtr2;
+    light_buffer_type* dataPtr3;
 
 
     // Transpose the matrices to prepare them for the shader.
@@ -377,14 +377,14 @@ bool RefractionShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceConte
     projectionMatrix = XMMatrixTranspose(projectionMatrix);
 
     // Lock the constant buffer so it can be written to.
-    result = deviceContext->Map(m_matrixBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(matrix_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         return false;
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr = (MatrixBufferType*)mappedResource.pData;
+    dataPtr = (matrix_buffer_type*)mappedResource.pData;
 
     // Copy the matrices into the constant buffer.
     dataPtr->world = worldMatrix;
@@ -392,81 +392,81 @@ bool RefractionShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceConte
     dataPtr->projection = projectionMatrix;
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_matrixBuffer, 0);
+    deviceContext->Unmap(matrix_buffer_, 0);
 
     // Set the position of the constant buffer in the vertex shader.
     bufferNumber = 0;
 
     // Finally set the constant buffer in the vertex shader with the updated values.
-    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &m_matrixBuffer);
+    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &matrix_buffer_);
 
      // Lock the clip plane constant buffer so it can be written to.
-    result = deviceContext->Map(m_clipPlaneBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(clip_plane_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if(FAILED(result))
     {
         return false;
     }
 
     // Get a pointer to the data in the clip plane constant buffer.
-    dataPtr2 = (ClipPlaneBufferType*)mappedResource.pData;
+    dataPtr2 = (clip_plane_buffer_type*)mappedResource.pData;
 
     // Copy the clip plane into the clip plane constant buffer.
-    dataPtr2->clipPlane = clipPlane;
+    dataPtr2->clip_plane = clipPlane;
 
     // Unlock the buffer.
-    deviceContext->Unmap(m_clipPlaneBuffer, 0);
+    deviceContext->Unmap(clip_plane_buffer_, 0);
 
     // Set the position of the clip plane constant buffer in the vertex shader.
     bufferNumber = 1;
 
     // Now set the clip plane constant buffer in the vertex shader with the updated values.
-    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &m_clipPlaneBuffer);
+    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &clip_plane_buffer_);
 
     // Set shader texture resource in the pixel shader.
     deviceContext->PSSetShaderResources(0, 1, &texture);
 
     // Lock the light constant buffer so it can be written to.
-    result = deviceContext->Map(m_lightBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(light_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if(FAILED(result))
     {
         return false;
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr3 = (LightBufferType*)mappedResource.pData;
+    dataPtr3 = (light_buffer_type*)mappedResource.pData;
 
     // Copy the lighting variables into the constant buffer.
-    dataPtr3->ambientColor = ambientColor[0];
-    dataPtr3->diffuseColor = diffuseColor[0];
-    dataPtr3->lightPosition = lightPosition[0];
-    dataPtr3->lightDirection = lightDirection;
+    dataPtr3->ambient_color = ambientColor[0];
+    dataPtr3->diffuse_color = diffuseColor[0];
+    dataPtr3->light_position = lightPosition[0];
+    dataPtr3->light_direction = lightDirection;
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_lightBuffer, 0);
+    deviceContext->Unmap(light_buffer_, 0);
 
     // Set the position of the light constant buffer in the pixel shader.
     bufferNumber = 0;
 
     // Finally set the light constant buffer in the pixel shader with the updated values.
-    deviceContext->PSSetConstantBuffers(bufferNumber, 1, &m_lightBuffer);
+    deviceContext->PSSetConstantBuffers(bufferNumber, 1, &light_buffer_);
 
     return true;
 }
 
 
-void RefractionShaderClass::RenderShader(ID3D11DeviceContext* deviceContext, int indexCount)
+void refraction_shader_class::render_shader(ID3D11DeviceContext* deviceContext, int indexCount)
 {
     // Set the vertex input layout.
-    deviceContext->IASetInputLayout(m_layout);
+    deviceContext->IASetInputLayout(layout_);
 
     // Set the vertex and pixel shaders that will be used to render the geometry.
-    deviceContext->VSSetShader(m_vertexShader, NULL, 0);
-    deviceContext->PSSetShader(m_pixelShader, NULL, 0);
+    deviceContext->VSSetShader(vertex_shader_, NULL, 0);
+    deviceContext->PSSetShader(pixel_shader_, NULL, 0);
 
     // Set the sampler state in the pixel shader.
-    deviceContext->PSSetSamplers(0, 1, &m_sampleState);
+    deviceContext->PSSetSamplers(0, 1, &sample_state_);
 
-    // Render the geometry.
+    // render the geometry.
     deviceContext->DrawIndexed(indexCount, 0, 0);
 
     return;
diff --git a/enginecustom/src/src/shader/shader_manager_class.cpp b/enginecustom/src/src/shader/shader_manager_class.cpp
new file mode 100644
index 0000000..dcdb19c
--- /dev/null
+++ b/enginecustom/src/src/shader/shader_manager_class.cpp
@@ -0,0 +1,479 @@
+#include "shader_manager_class.h"
+
+shader_manager_class::shader_manager_class()
+{
+    texture_shader_ = 0;
+    normal_map_shader_ = 0;
+    multitexture_shader_ = 0;
+    translate_shader_ = 0;
+    alpha_map_shader_ = 0;
+    spec_map_shader_ = 0;
+    transparent_shader_ = 0;
+    light_shader_ = 0;
+    light_map_shader_ = 0;
+    refraction_shader_ = 0;
+    water_shader_ = 0;
+    cel_shading_shader_ = 0;
+}
+
+shader_manager_class::shader_manager_class(const shader_manager_class& other)
+{
+}
+
+shader_manager_class::~shader_manager_class()
+{
+}
+
+bool shader_manager_class::initialize(ID3D11Device* device, HWND hwnd)
+{
+    Logger::Get().Log("Initializing shader_manager_class", __FILE__, __LINE__, Logger::LogLevel::Initialize);
+
+    bool result;
+
+    // Create and initialize the texture shader object.
+    texture_shader_ = new texture_shader_class;
+    result = texture_shader_->initialize(device, hwnd);
+    if (!result)
+    {
+        Logger::Get().Log("Error initializing texture_shader_class", __FILE__, __LINE__, Logger::LogLevel::Error);
+        return false;
+    }
+
+    // Create and initialize the normal map shader object.
+    normal_map_shader_ = new normal_map_shader_class;
+    result = normal_map_shader_->initialize(device, hwnd);
+    if (!result)
+    {
+        Logger::Get().Log("Error initializing normal_map_shader_class", __FILE__, __LINE__, Logger::LogLevel::Error);
+        return false;
+    }
+
+    // Create and initialize the multitexture shader object.
+    multitexture_shader_ = new multi_texture_shader_class;
+    result = multitexture_shader_->initialize(device, hwnd);
+    if (!result)
+    {
+        Logger::Get().Log("Error initializing multi_texture_shader_class", __FILE__, __LINE__, Logger::LogLevel::Error);
+        return false;
+    }
+
+    // Create and initialize the translate shader object.
+    translate_shader_ = new translate_shader_class;
+    result = translate_shader_->initialize(device, hwnd);
+    if (!result)
+    {
+        Logger::Get().Log("Error initializing translate_shader_class", __FILE__, __LINE__, Logger::LogLevel::Error);
+        return false;
+    }
+
+    // Create and initialize the alpha map shader object.
+    alpha_map_shader_ = new alpha_map_shader_class;
+    result = alpha_map_shader_->initialize(device, hwnd);
+    if (!result)
+    {
+        Logger::Get().Log("Error initializing alpha_map_shader_class", __FILE__, __LINE__, Logger::LogLevel::Error);
+        return false;
+    }
+
+    // Create and initialize the specular map shader object.
+    spec_map_shader_ = new spec_map_shader_class;
+    result = spec_map_shader_->initialize(device, hwnd);
+    if (!result)
+    {
+        Logger::Get().Log("Error initializing spec_map_shader_class", __FILE__, __LINE__, Logger::LogLevel::Error);
+        return false;
+    }
+
+    // Create and initialize the transparent shader object.
+    transparent_shader_ = new transparent_shader_class;
+    result = transparent_shader_->initialize(device, hwnd);
+    if (!result)
+    {
+        Logger::Get().Log("Error initializing transparent_shader_class", __FILE__, __LINE__, Logger::LogLevel::Error);
+        return false;
+    }
+
+    // Create and initialize the light shader object.
+    light_shader_ = new light_shader_class;
+    result = light_shader_->initialize(device, hwnd);
+    if (!result)
+    {
+        Logger::Get().Log("Error initializing light_shader_class", __FILE__, __LINE__, Logger::LogLevel::Error);
+        return false;
+    }
+
+    // Create and initialize the light map shader object.
+    light_map_shader_ = new light_map_shader_class;
+    result = light_map_shader_->initialize(device, hwnd);
+    if (!result)
+    {
+        Logger::Get().Log("Error initializing light_map_shader_class", __FILE__, __LINE__, Logger::LogLevel::Error);
+        return false;
+    }
+
+    // Create and initialize the refraction shader object.
+    refraction_shader_ = new refraction_shader_class;
+    result = refraction_shader_->initialize(device, hwnd);
+    if (!result)
+    {
+        return false;
+    }
+
+    // Create and initialize the water shader object.
+    water_shader_ = new water_shader_class;
+    result = water_shader_->initialize(device, hwnd);
+    if (!result)
+    {
+        return false;
+    }
+
+    cel_shading_shader_ = new celshade_class;
+    result = cel_shading_shader_->initialize(device, hwnd);
+    if (!result)
+    {
+        return false;
+    }
+
+	sunlight_shader_ = new sunlight_shader_class;
+	result = sunlight_shader_->initialize(device, hwnd);
+	if (!result)
+	{
+		return false;
+	}
+
+    skybox_shader_ = new skybox_shader_class;
+    result = skybox_shader_->Initialize(device, hwnd);
+    if (!result)
+    {
+        Logger::Get().Log("Error initializing skybox_shader_class", __FILE__, __LINE__, Logger::LogLevel::Error);
+        return false;
+    }
+
+    Logger::Get().Log("shader_manager_class initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
+
+    return true;
+}
+
+void shader_manager_class::shutdown()
+{
+    Logger::Get().Log("Shutting down shader_manager_class", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
+
+    // Release the normal map shader object.
+    if (normal_map_shader_)
+    {
+        normal_map_shader_->shutdown();
+        delete normal_map_shader_;
+        normal_map_shader_ = 0;
+    }
+
+    // Release the texture shader object.
+    if (texture_shader_)
+    {
+        texture_shader_->shutdown();
+        delete texture_shader_;
+        texture_shader_ = 0;
+    }
+
+    // Release the multitexture shader object.
+    if (multitexture_shader_)
+    {
+        multitexture_shader_->shutdown();
+        delete multitexture_shader_;
+        multitexture_shader_ = 0;
+    }
+
+    // Release the translate shader object.
+    if (translate_shader_)
+    {
+        translate_shader_->shutdown();
+        delete translate_shader_;
+        translate_shader_ = 0;
+    }
+
+    // Release the alpha map shader object.
+    if (alpha_map_shader_)
+    {
+        alpha_map_shader_->shutdown();
+        delete alpha_map_shader_;
+        alpha_map_shader_ = 0;
+    }
+
+    // Release the specular map shader object.
+    if (spec_map_shader_)
+    {
+        spec_map_shader_->shutdown();
+        delete spec_map_shader_;
+        spec_map_shader_ = 0;
+    }
+
+    // Release the transparent shader object.
+    if (transparent_shader_)
+    {
+        transparent_shader_->shutdown();
+        delete transparent_shader_;
+        transparent_shader_ = 0;
+    }
+
+    // Release the light shader object.
+    if (light_shader_)
+    {
+        light_shader_->shutdown();
+        delete light_shader_;
+        light_shader_ = 0;
+    }
+
+    // Release the light map shader object.
+    if (light_map_shader_)
+    {
+        light_map_shader_->shutdown();
+        delete light_map_shader_;
+        light_map_shader_ = 0;
+    }
+
+    // Release the refraction shader object.
+    if (refraction_shader_)
+    {
+        refraction_shader_->shutdown();
+        delete refraction_shader_;
+        refraction_shader_ = 0;
+    }
+
+    // Release the water shader object.
+    if (water_shader_)
+    {
+        water_shader_->shutdown();
+        delete water_shader_;
+        water_shader_ = 0;
+    }
+
+    // Release the cel shading shader object.
+    if (cel_shading_shader_)
+    {
+        cel_shading_shader_->shutdown();
+        delete cel_shading_shader_;
+        cel_shading_shader_ = 0;
+    }
+
+	if (sunlight_shader_)
+	{
+		sunlight_shader_->shutdown();
+		delete sunlight_shader_;
+		sunlight_shader_ = 0;
+	}
+
+    if (skybox_shader_)
+    {
+        skybox_shader_->Shutdown();
+        delete skybox_shader_;
+        skybox_shader_ = 0;
+    }
+
+    Logger::Get().Log("shader_manager_class shut down", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
+}
+
+bool shader_manager_class::render_texture_shader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+    ID3D11ShaderResourceView* texture)
+{
+    bool result;
+
+    result = texture_shader_->render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture);
+    if (!result)
+    {
+        Logger::Get().Log("Error rendering texture_shader_class", __FILE__, __LINE__, Logger::LogLevel::Error);
+        return false;
+    }
+
+    return true;
+}
+
+bool shader_manager_class::render_normal_map_shader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+    ID3D11ShaderResourceView* colorTexture, ID3D11ShaderResourceView* normalTexture, XMFLOAT3 lightDirection, XMFLOAT4 diffuseColor)
+{
+    bool result;
+
+    result = normal_map_shader_->render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, colorTexture, normalTexture, lightDirection, diffuseColor);
+    if (!result)
+    {
+        Logger::Get().Log("Error rendering normal_map_shader_class", __FILE__, __LINE__, Logger::LogLevel::Error);
+        return false;
+    }
+
+    return true;
+}
+
+bool shader_manager_class::render_multitexture_shader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+    ID3D11ShaderResourceView* texture1, ID3D11ShaderResourceView* texture2)
+{
+    bool result;
+
+    result = multitexture_shader_->render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture1, texture2);
+    if (!result)
+    {
+        Logger::Get().Log("Error rendering multi_texture_shader_class", __FILE__, __LINE__, Logger::LogLevel::Error);
+        return false;
+    }
+
+    return true;
+}
+
+bool shader_manager_class::render_translate_shader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+    ID3D11ShaderResourceView* texture1, float valeur)
+{
+    bool result;
+
+    result = translate_shader_->render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture1, valeur);
+    if (!result)
+    {
+        Logger::Get().Log("Error rendering translate_shader_class", __FILE__, __LINE__, Logger::LogLevel::Error);
+        return false;
+    }
+
+    return true;
+}
+
+bool shader_manager_class::render_alpha_map_shader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+    ID3D11ShaderResourceView* texture1, ID3D11ShaderResourceView* texture2, ID3D11ShaderResourceView* texture3)
+{
+    bool result;
+
+    result = alpha_map_shader_->render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture1, texture2, texture3);
+    if (!result)
+    {
+        Logger::Get().Log("Error rendering alpha_map_shader_class", __FILE__, __LINE__, Logger::LogLevel::Error);
+        return false;
+    }
+
+    return true;
+}
+
+bool shader_manager_class::render_spec_map_shader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+    ID3D11ShaderResourceView* texture1, ID3D11ShaderResourceView* texture2, ID3D11ShaderResourceView* texture3,
+    XMFLOAT3 lightDirection, XMFLOAT4 diffuseColor, XMFLOAT3 cameraPosition, XMFLOAT4 specularColor, float specularPower)
+{
+    bool result;
+
+    result = spec_map_shader_->render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture1, texture2, texture3, lightDirection,
+        diffuseColor, cameraPosition, specularColor, specularPower);
+    if (!result)
+    {
+        Logger::Get().Log("Error rendering spec_map_shader_class", __FILE__, __LINE__, Logger::LogLevel::Error);
+        return false;
+    }
+
+    return true;
+}
+
+bool shader_manager_class::render_transparent_shader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+    ID3D11ShaderResourceView* texture1, float blendAmount)
+{
+    bool result;
+
+    result = transparent_shader_->render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture1, blendAmount);
+    if (!result)
+    {
+        Logger::Get().Log("Error rendering transparent_shader_class", __FILE__, __LINE__, Logger::LogLevel::Error);
+        return false;
+    }
+
+    return true;
+}
+
+bool shader_manager_class::renderlight_shader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+    ID3D11ShaderResourceView* texture, XMFLOAT4 diffuseColor[], XMFLOAT4 lightPosition[], XMFLOAT4 ambientColor[])
+{
+    bool result;
+
+    result = light_shader_->render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture, diffuseColor, lightPosition, ambientColor);
+    if (!result)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+bool shader_manager_class::renderlight_map_shader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
+    XMMATRIX projectionMatrix, ID3D11ShaderResourceView* texture1, ID3D11ShaderResourceView* texture2)
+{
+    bool result;
+
+    result = light_map_shader_->render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture1, texture2);
+    if (!result)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+bool shader_manager_class::render_refraction_shader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+    ID3D11ShaderResourceView* texture, XMFLOAT3 lightDirection, XMFLOAT4 ambientColor[], XMFLOAT4 diffuseColor[], XMFLOAT4 lightPosition[], XMFLOAT4 clipPlane)
+{
+    bool result;
+
+    result = refraction_shader_->render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture, lightDirection, ambientColor, diffuseColor, lightPosition, clipPlane);
+    if (!result)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+bool shader_manager_class::render_water_shader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+    XMMATRIX reflectionMatrix, ID3D11ShaderResourceView* reflectionTexture, ID3D11ShaderResourceView* refractionTexture,
+    ID3D11ShaderResourceView* normalTexture, float waterTranslation, float reflectRefractScale)
+{
+    bool result;
+
+    result = water_shader_->render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, reflectionMatrix, reflectionTexture,
+        refractionTexture, normalTexture, waterTranslation, reflectRefractScale);
+    if (!result)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+bool shader_manager_class::render_cel_shading_shader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+    ID3D11ShaderResourceView* texture, XMFLOAT4 diffuseColor, XMFLOAT4 ambientColor, XMFLOAT3 sunDirection, float sunIntensity)
+{
+    bool result;
+
+    result = cel_shading_shader_->render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture, diffuseColor, ambientColor, sunDirection, sunIntensity);
+    if (!result)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+bool shader_manager_class::render_sunlight_shader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+	ID3D11ShaderResourceView* texture, XMFLOAT4 diffuseColor, XMFLOAT4 ambientColor, XMFLOAT3 sunDirection, float sunIntensity)
+{
+	bool result;
+
+	result = sunlight_shader_->render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture, diffuseColor, ambientColor, sunDirection, sunIntensity);
+	if (!result)
+	{
+		return false;
+	}
+
+	return true;
+}
+
+bool shader_manager_class::render_skybox_shader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+    ID3D11ShaderResourceView* texture, XMFLOAT4 diffuseColor, XMFLOAT4 ambientColor, XMFLOAT3 sunDirection, float sunIntensity)
+{
+    bool result;
+
+    result = skybox_shader_->Render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture, diffuseColor, ambientColor, sunDirection, sunIntensity);
+    if (!result)
+    {
+        return false;
+    }
+
+    return true;
+}
diff --git a/enginecustom/src/src/shader/shadermanagerclass.cpp b/enginecustom/src/src/shader/shadermanagerclass.cpp
deleted file mode 100644
index ef74b6d..0000000
--- a/enginecustom/src/src/shader/shadermanagerclass.cpp
+++ /dev/null
@@ -1,479 +0,0 @@
-#include "shadermanagerclass.h"
-
-ShaderManagerClass::ShaderManagerClass()
-{
-    m_TextureShader = 0;
-    m_NormalMapShader = 0;
-    m_MultitextureShader = 0;
-    m_TranslateShader = 0;
-    m_AlphaMapShader = 0;
-    m_SpecMapShader = 0;
-    m_TransparentShader = 0;
-    m_LightShader = 0;
-    m_LightMapShader = 0;
-    m_RefractionShader = 0;
-    m_WaterShader = 0;
-    m_CelShadingShader = 0;
-}
-
-ShaderManagerClass::ShaderManagerClass(const ShaderManagerClass& other)
-{
-}
-
-ShaderManagerClass::~ShaderManagerClass()
-{
-}
-
-bool ShaderManagerClass::Initialize(ID3D11Device* device, HWND hwnd)
-{
-    Logger::Get().Log("Initializing ShaderManagerClass", __FILE__, __LINE__, Logger::LogLevel::Initialize);
-
-    bool result;
-
-    // Create and initialize the texture shader object.
-    m_TextureShader = new TextureShaderClass;
-    result = m_TextureShader->Initialize(device, hwnd);
-    if (!result)
-    {
-        Logger::Get().Log("Error initializing TextureShaderClass", __FILE__, __LINE__, Logger::LogLevel::Error);
-        return false;
-    }
-
-    // Create and initialize the normal map shader object.
-    m_NormalMapShader = new NormalMapShaderClass;
-    result = m_NormalMapShader->Initialize(device, hwnd);
-    if (!result)
-    {
-        Logger::Get().Log("Error initializing NormalMapShaderClass", __FILE__, __LINE__, Logger::LogLevel::Error);
-        return false;
-    }
-
-    // Create and initialize the multitexture shader object.
-    m_MultitextureShader = new MultiTextureShaderClass;
-    result = m_MultitextureShader->Initialize(device, hwnd);
-    if (!result)
-    {
-        Logger::Get().Log("Error initializing MultiTextureShaderClass", __FILE__, __LINE__, Logger::LogLevel::Error);
-        return false;
-    }
-
-    // Create and initialize the translate shader object.
-    m_TranslateShader = new TranslateShaderClass;
-    result = m_TranslateShader->Initialize(device, hwnd);
-    if (!result)
-    {
-        Logger::Get().Log("Error initializing TranslateShaderClass", __FILE__, __LINE__, Logger::LogLevel::Error);
-        return false;
-    }
-
-    // Create and initialize the alpha map shader object.
-    m_AlphaMapShader = new AlphaMapShaderClass;
-    result = m_AlphaMapShader->Initialize(device, hwnd);
-    if (!result)
-    {
-        Logger::Get().Log("Error initializing AlphaMapShaderClass", __FILE__, __LINE__, Logger::LogLevel::Error);
-        return false;
-    }
-
-    // Create and initialize the specular map shader object.
-    m_SpecMapShader = new SpecMapShaderClass;
-    result = m_SpecMapShader->Initialize(device, hwnd);
-    if (!result)
-    {
-        Logger::Get().Log("Error initializing SpecMapShaderClass", __FILE__, __LINE__, Logger::LogLevel::Error);
-        return false;
-    }
-
-    // Create and initialize the transparent shader object.
-    m_TransparentShader = new TransparentShaderClass;
-    result = m_TransparentShader->Initialize(device, hwnd);
-    if (!result)
-    {
-        Logger::Get().Log("Error initializing TransparentShaderClass", __FILE__, __LINE__, Logger::LogLevel::Error);
-        return false;
-    }
-
-    // Create and initialize the light shader object.
-    m_LightShader = new LightShaderClass;
-    result = m_LightShader->Initialize(device, hwnd);
-    if (!result)
-    {
-        Logger::Get().Log("Error initializing LightShaderClass", __FILE__, __LINE__, Logger::LogLevel::Error);
-        return false;
-    }
-
-    // Create and initialize the light map shader object.
-    m_LightMapShader = new LightMapShaderClass;
-    result = m_LightMapShader->Initialize(device, hwnd);
-    if (!result)
-    {
-        Logger::Get().Log("Error initializing LightMapShaderClass", __FILE__, __LINE__, Logger::LogLevel::Error);
-        return false;
-    }
-
-    // Create and initialize the refraction shader object.
-    m_RefractionShader = new RefractionShaderClass;
-    result = m_RefractionShader->Initialize(device, hwnd);
-    if (!result)
-    {
-        return false;
-    }
-
-    // Create and initialize the water shader object.
-    m_WaterShader = new WaterShaderClass;
-    result = m_WaterShader->Initialize(device, hwnd);
-    if (!result)
-    {
-        return false;
-    }
-
-    m_CelShadingShader = new CelshadeClass;
-    result = m_CelShadingShader->Initialize(device, hwnd);
-    if (!result)
-    {
-        return false;
-    }
-
-	m_SunlightShader = new SunlightShaderClass;
-	result = m_SunlightShader->Initialize(device, hwnd);
-	if (!result)
-	{
-		return false;
-	}
-
-    m_SkyboxShader = new SkyboxShaderClass;
-    result = m_SkyboxShader->Initialize(device, hwnd);
-    if (!result)
-    {
-        Logger::Get().Log("Error initializing SkyboxShaderClass", __FILE__, __LINE__, Logger::LogLevel::Error);
-        return false;
-    }
-
-    Logger::Get().Log("ShaderManagerClass initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
-
-    return true;
-}
-
-void ShaderManagerClass::Shutdown()
-{
-    Logger::Get().Log("Shutting down ShaderManagerClass", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
-
-    // Release the normal map shader object.
-    if (m_NormalMapShader)
-    {
-        m_NormalMapShader->Shutdown();
-        delete m_NormalMapShader;
-        m_NormalMapShader = 0;
-    }
-
-    // Release the texture shader object.
-    if (m_TextureShader)
-    {
-        m_TextureShader->Shutdown();
-        delete m_TextureShader;
-        m_TextureShader = 0;
-    }
-
-    // Release the multitexture shader object.
-    if (m_MultitextureShader)
-    {
-        m_MultitextureShader->Shutdown();
-        delete m_MultitextureShader;
-        m_MultitextureShader = 0;
-    }
-
-    // Release the translate shader object.
-    if (m_TranslateShader)
-    {
-        m_TranslateShader->Shutdown();
-        delete m_TranslateShader;
-        m_TranslateShader = 0;
-    }
-
-    // Release the alpha map shader object.
-    if (m_AlphaMapShader)
-    {
-        m_AlphaMapShader->Shutdown();
-        delete m_AlphaMapShader;
-        m_AlphaMapShader = 0;
-    }
-
-    // Release the specular map shader object.
-    if (m_SpecMapShader)
-    {
-        m_SpecMapShader->Shutdown();
-        delete m_SpecMapShader;
-        m_SpecMapShader = 0;
-    }
-
-    // Release the transparent shader object.
-    if (m_TransparentShader)
-    {
-        m_TransparentShader->Shutdown();
-        delete m_TransparentShader;
-        m_TransparentShader = 0;
-    }
-
-    // Release the light shader object.
-    if (m_LightShader)
-    {
-        m_LightShader->Shutdown();
-        delete m_LightShader;
-        m_LightShader = 0;
-    }
-
-    // Release the light map shader object.
-    if (m_LightMapShader)
-    {
-        m_LightMapShader->Shutdown();
-        delete m_LightMapShader;
-        m_LightMapShader = 0;
-    }
-
-    // Release the refraction shader object.
-    if (m_RefractionShader)
-    {
-        m_RefractionShader->Shutdown();
-        delete m_RefractionShader;
-        m_RefractionShader = 0;
-    }
-
-    // Release the water shader object.
-    if (m_WaterShader)
-    {
-        m_WaterShader->Shutdown();
-        delete m_WaterShader;
-        m_WaterShader = 0;
-    }
-
-    // Release the cel shading shader object.
-    if (m_CelShadingShader)
-    {
-        m_CelShadingShader->Shutdown();
-        delete m_CelShadingShader;
-        m_CelShadingShader = 0;
-    }
-
-	if (m_SunlightShader)
-	{
-		m_SunlightShader->Shutdown();
-		delete m_SunlightShader;
-		m_SunlightShader = 0;
-	}
-
-    if (m_SkyboxShader)
-    {
-        m_SkyboxShader->Shutdown();
-        delete m_SkyboxShader;
-        m_SkyboxShader = 0;
-    }
-
-    Logger::Get().Log("ShaderManagerClass shut down", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
-}
-
-bool ShaderManagerClass::RenderTextureShader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
-    ID3D11ShaderResourceView* texture)
-{
-    bool result;
-
-    result = m_TextureShader->Render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture);
-    if (!result)
-    {
-        Logger::Get().Log("Error rendering TextureShaderClass", __FILE__, __LINE__, Logger::LogLevel::Error);
-        return false;
-    }
-
-    return true;
-}
-
-bool ShaderManagerClass::RenderNormalMapShader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
-    ID3D11ShaderResourceView* colorTexture, ID3D11ShaderResourceView* normalTexture, XMFLOAT3 lightDirection, XMFLOAT4 diffuseColor)
-{
-    bool result;
-
-    result = m_NormalMapShader->Render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, colorTexture, normalTexture, lightDirection, diffuseColor);
-    if (!result)
-    {
-        Logger::Get().Log("Error rendering NormalMapShaderClass", __FILE__, __LINE__, Logger::LogLevel::Error);
-        return false;
-    }
-
-    return true;
-}
-
-bool ShaderManagerClass::RenderMultitextureShader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
-    ID3D11ShaderResourceView* texture1, ID3D11ShaderResourceView* texture2)
-{
-    bool result;
-
-    result = m_MultitextureShader->Render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture1, texture2);
-    if (!result)
-    {
-        Logger::Get().Log("Error rendering MultiTextureShaderClass", __FILE__, __LINE__, Logger::LogLevel::Error);
-        return false;
-    }
-
-    return true;
-}
-
-bool ShaderManagerClass::RenderTranslateShader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
-    ID3D11ShaderResourceView* texture1, float valeur)
-{
-    bool result;
-
-    result = m_TranslateShader->Render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture1, valeur);
-    if (!result)
-    {
-        Logger::Get().Log("Error rendering TranslateShaderClass", __FILE__, __LINE__, Logger::LogLevel::Error);
-        return false;
-    }
-
-    return true;
-}
-
-bool ShaderManagerClass::RenderAlphaMapShader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
-    ID3D11ShaderResourceView* texture1, ID3D11ShaderResourceView* texture2, ID3D11ShaderResourceView* texture3)
-{
-    bool result;
-
-    result = m_AlphaMapShader->Render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture1, texture2, texture3);
-    if (!result)
-    {
-        Logger::Get().Log("Error rendering AlphaMapShaderClass", __FILE__, __LINE__, Logger::LogLevel::Error);
-        return false;
-    }
-
-    return true;
-}
-
-bool ShaderManagerClass::RenderSpecMapShader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
-    ID3D11ShaderResourceView* texture1, ID3D11ShaderResourceView* texture2, ID3D11ShaderResourceView* texture3,
-    XMFLOAT3 lightDirection, XMFLOAT4 diffuseColor, XMFLOAT3 cameraPosition, XMFLOAT4 specularColor, float specularPower)
-{
-    bool result;
-
-    result = m_SpecMapShader->Render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture1, texture2, texture3, lightDirection,
-        diffuseColor, cameraPosition, specularColor, specularPower);
-    if (!result)
-    {
-        Logger::Get().Log("Error rendering SpecMapShaderClass", __FILE__, __LINE__, Logger::LogLevel::Error);
-        return false;
-    }
-
-    return true;
-}
-
-bool ShaderManagerClass::RenderTransparentShader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
-    ID3D11ShaderResourceView* texture1, float blendAmount)
-{
-    bool result;
-
-    result = m_TransparentShader->Render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture1, blendAmount);
-    if (!result)
-    {
-        Logger::Get().Log("Error rendering TransparentShaderClass", __FILE__, __LINE__, Logger::LogLevel::Error);
-        return false;
-    }
-
-    return true;
-}
-
-bool ShaderManagerClass::RenderlightShader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
-    ID3D11ShaderResourceView* texture, XMFLOAT4 diffuseColor[], XMFLOAT4 lightPosition[], XMFLOAT4 ambientColor[])
-{
-    bool result;
-
-    result = m_LightShader->Render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture, diffuseColor, lightPosition, ambientColor);
-    if (!result)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-bool ShaderManagerClass::RenderlightMapShader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
-    XMMATRIX projectionMatrix, ID3D11ShaderResourceView* texture1, ID3D11ShaderResourceView* texture2)
-{
-    bool result;
-
-    result = m_LightMapShader->Render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture1, texture2);
-    if (!result)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-bool ShaderManagerClass::RenderRefractionShader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
-    ID3D11ShaderResourceView* texture, XMFLOAT3 lightDirection, XMFLOAT4 ambientColor[], XMFLOAT4 diffuseColor[], XMFLOAT4 lightPosition[], XMFLOAT4 clipPlane)
-{
-    bool result;
-
-    result = m_RefractionShader->Render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture, lightDirection, ambientColor, diffuseColor, lightPosition, clipPlane);
-    if (!result)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-bool ShaderManagerClass::RenderWaterShader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
-    XMMATRIX reflectionMatrix, ID3D11ShaderResourceView* reflectionTexture, ID3D11ShaderResourceView* refractionTexture,
-    ID3D11ShaderResourceView* normalTexture, float waterTranslation, float reflectRefractScale)
-{
-    bool result;
-
-    result = m_WaterShader->Render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, reflectionMatrix, reflectionTexture,
-        refractionTexture, normalTexture, waterTranslation, reflectRefractScale);
-    if (!result)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-bool ShaderManagerClass::RenderCelShadingShader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
-    ID3D11ShaderResourceView* texture, XMFLOAT4 diffuseColor, XMFLOAT4 ambientColor, XMFLOAT3 sunDirection, float sunIntensity)
-{
-    bool result;
-
-    result = m_CelShadingShader->Render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture, diffuseColor, ambientColor, sunDirection, sunIntensity);
-    if (!result)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-bool ShaderManagerClass::RenderSunlightShader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
-	ID3D11ShaderResourceView* texture, XMFLOAT4 diffuseColor, XMFLOAT4 ambientColor, XMFLOAT3 sunDirection, float sunIntensity)
-{
-	bool result;
-
-	result = m_SunlightShader->Render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture, diffuseColor, ambientColor, sunDirection, sunIntensity);
-	if (!result)
-	{
-		return false;
-	}
-
-	return true;
-}
-
-bool ShaderManagerClass::RenderSkyboxShader(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
-    ID3D11ShaderResourceView* texture, XMFLOAT4 diffuseColor, XMFLOAT4 ambientColor, XMFLOAT3 sunDirection, float sunIntensity)
-{
-    bool result;
-
-    result = m_SkyboxShader->Render(deviceContext, indexCount, worldMatrix, viewMatrix, projectionMatrix, texture, diffuseColor, ambientColor, sunDirection, sunIntensity);
-    if (!result)
-    {
-        return false;
-    }
-
-    return true;
-}
diff --git a/enginecustom/src/src/shader/SkyboxShaderClass.cpp b/enginecustom/src/src/shader/skybox_shader_class.cpp
similarity index 92%
rename from enginecustom/src/src/shader/SkyboxShaderClass.cpp
rename to enginecustom/src/src/shader/skybox_shader_class.cpp
index 34a1fc8..8330f4f 100644
--- a/enginecustom/src/src/shader/SkyboxShaderClass.cpp
+++ b/enginecustom/src/src/shader/skybox_shader_class.cpp
@@ -1,10 +1,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 // Filename: lightshaderclass.cpp
 ////////////////////////////////////////////////////////////////////////////////
-#include "SkyboxShaderClass.h"
+#include "skybox_shader_class.h"
 
 
-SkyboxShaderClass::SkyboxShaderClass()
+skybox_shader_class::skybox_shader_class()
 {
     m_vertexShader = 0;
     m_pixelShader = 0;
@@ -18,17 +18,17 @@ SkyboxShaderClass::SkyboxShaderClass()
 }
 
 
-SkyboxShaderClass::SkyboxShaderClass(const SkyboxShaderClass& other)
+skybox_shader_class::skybox_shader_class(const skybox_shader_class& other)
 {
 }
 
 
-SkyboxShaderClass::~SkyboxShaderClass()
+skybox_shader_class::~skybox_shader_class()
 {
 }
 
 
-bool SkyboxShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
+bool skybox_shader_class::Initialize(ID3D11Device* device, HWND hwnd)
 {
     Logger::Get().Log("Initializing LightShaderClass", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -60,13 +60,13 @@ bool SkyboxShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
         return false;
     }
 
-    Logger::Get().Log("SkyboxShaderClass initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
+    Logger::Get().Log("skybox_shader_class initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
     return true;
 }
 
 
-void SkyboxShaderClass::Shutdown()
+void skybox_shader_class::Shutdown()
 {
     // Shutdown the vertex and pixel shaders as well as the related objects.
     ShutdownShader();
@@ -74,7 +74,7 @@ void SkyboxShaderClass::Shutdown()
     return;
 }
 
-bool SkyboxShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+bool skybox_shader_class::Render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
     ID3D11ShaderResourceView* texture, XMFLOAT4 diffuseColor, XMFLOAT4 ambientColor, XMFLOAT3 sunDirection, float sunIntensity)
 {
     bool result;
@@ -95,7 +95,7 @@ bool SkyboxShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCoun
 }
 
 
-bool SkyboxShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
+bool skybox_shader_class::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
 {
     Logger::Get().Log("Initializing shader", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -266,7 +266,7 @@ bool SkyboxShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
 
 
 
-void SkyboxShaderClass::ShutdownShader()
+void skybox_shader_class::ShutdownShader()
 {
     Logger::Get().Log("Shutting down SunLightShaderClass", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
@@ -338,7 +338,7 @@ void SkyboxShaderClass::ShutdownShader()
 }
 
 
-void SkyboxShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
+void skybox_shader_class::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
 {
     char* compileErrors;
     unsigned __int64 bufferSize, i;
@@ -374,7 +374,7 @@ void SkyboxShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND
 }
 
 
-bool SkyboxShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix, ID3D11ShaderResourceView* texture, XMFLOAT4 ambientColor, XMFLOAT4 diffuseColor, XMFLOAT3 lightDirection, float sunIntensity)
+bool skybox_shader_class::SetShaderParameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix, ID3D11ShaderResourceView* texture, XMFLOAT4 ambientColor, XMFLOAT4 diffuseColor, XMFLOAT3 lightDirection, float sunIntensity)
 {
     HRESULT result;
     D3D11_MAPPED_SUBRESOURCE mappedResource;
@@ -443,7 +443,7 @@ bool SkyboxShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext,
     return true;
 }
 
-void SkyboxShaderClass::RenderShader(ID3D11DeviceContext* deviceContext, int indexCount)
+void skybox_shader_class::RenderShader(ID3D11DeviceContext* deviceContext, int indexCount)
 {
     // Set the vertex input layout.
     deviceContext->IASetInputLayout(m_layout);
diff --git a/enginecustom/src/src/shader/specmapshaderclass.cpp b/enginecustom/src/src/shader/spec_map_shader_class.cpp
similarity index 72%
rename from enginecustom/src/src/shader/specmapshaderclass.cpp
rename to enginecustom/src/src/shader/spec_map_shader_class.cpp
index 79579de..ce83fa4 100644
--- a/enginecustom/src/src/shader/specmapshaderclass.cpp
+++ b/enginecustom/src/src/shader/spec_map_shader_class.cpp
@@ -1,29 +1,29 @@
-#include "specmapshaderclass.h"
+#include "spec_map_shader_class.h"
 
 
-SpecMapShaderClass::SpecMapShaderClass()
+spec_map_shader_class::spec_map_shader_class()
 {
-    m_vertexShader = 0;
-    m_pixelShader = 0;
-    m_layout = 0;
-    m_matrixBuffer = 0;
-    m_sampleState = 0;
-    m_lightBuffer = 0;
-    m_cameraBuffer = 0;
+    vertex_shader_ = 0;
+    pixel_shader_ = 0;
+    layout_ = 0;
+    matrix_buffer_ = 0;
+    sample_state_ = 0;
+    light_buffer_ = 0;
+    camera_buffer_ = 0;
 }
 
 
-SpecMapShaderClass::SpecMapShaderClass(const SpecMapShaderClass& other)
+spec_map_shader_class::spec_map_shader_class(const spec_map_shader_class& other)
 {
 }
 
 
-SpecMapShaderClass::~SpecMapShaderClass()
+spec_map_shader_class::~spec_map_shader_class()
 {
 }
 
 
-bool SpecMapShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
+bool spec_map_shader_class::initialize(ID3D11Device* device, HWND hwnd)
 {
     bool result;
     wchar_t vsFilename[128];
@@ -44,8 +44,8 @@ bool SpecMapShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
         return false;
     }
 
-    // Initialize the vertex and pixel shaders.
-    result = InitializeShader(device, hwnd, vsFilename, psFilename);
+    // initialize the vertex and pixel shaders.
+    result = initialize_shader(device, hwnd, vsFilename, psFilename);
     if (!result)
     {
         return false;
@@ -55,15 +55,15 @@ bool SpecMapShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
 }
 
 
-void SpecMapShaderClass::Shutdown()
+void spec_map_shader_class::shutdown()
 {
-    // Shutdown the vertex and pixel shaders as well as the related objects.
-    ShutdownShader();
+    // shutdown the vertex and pixel shaders as well as the related objects.
+    shutdown_shader();
 
     return;
 }
 
-bool SpecMapShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+bool spec_map_shader_class::render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
     ID3D11ShaderResourceView* texture1, ID3D11ShaderResourceView* texture2, ID3D11ShaderResourceView* texture3,
     XMFLOAT3 lightDirection, XMFLOAT4 diffuseColor, XMFLOAT3 cameraPosition, XMFLOAT4 specularColor, float specularPower)
 {
@@ -71,7 +71,7 @@ bool SpecMapShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCou
 
 
     // Set the shader parameters that it will use for rendering.
-    result = SetShaderParameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture1, texture2, texture3, lightDirection, diffuseColor,
+    result = set_shader_parameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture1, texture2, texture3, lightDirection, diffuseColor,
         cameraPosition, specularColor, specularPower);
     if (!result)
     {
@@ -79,13 +79,13 @@ bool SpecMapShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCou
     }
 
     // Now render the prepared buffers with the shader.
-    RenderShader(deviceContext, indexCount);
+    render_shader(deviceContext, indexCount);
 
     return true;
 }
 
 
-bool SpecMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
+bool spec_map_shader_class::initialize_shader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
 {
     HRESULT result;
     ID3D10Blob* errorMessage;
@@ -99,7 +99,7 @@ bool SpecMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR
     D3D11_BUFFER_DESC cameraBufferDesc;
 
 
-    // Initialize the pointers this function will use to null.
+    // initialize the pointers this function will use to null.
     errorMessage = 0;
     vertexShaderBuffer = 0;
     pixelShaderBuffer = 0;
@@ -112,7 +112,7 @@ bool SpecMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, vsFilename);
+            output_shader_error_message(errorMessage, hwnd, vsFilename);
         }
         // If there was nothing in the error message then it simply could not find the shader file itself.
         else
@@ -131,7 +131,7 @@ bool SpecMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, psFilename);
+            output_shader_error_message(errorMessage, hwnd, psFilename);
         }
         // If there was nothing in the error message then it simply could not find the file itself.
         else
@@ -143,14 +143,14 @@ bool SpecMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR
     }
 
     // Create the vertex shader from the buffer.
-    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &m_vertexShader);
+    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &vertex_shader_);
     if (FAILED(result))
     {
         return false;
     }
 
     // Create the pixel shader from the buffer.
-    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &m_pixelShader);
+    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &pixel_shader_);
     if (FAILED(result))
     {
         return false;
@@ -202,7 +202,7 @@ bool SpecMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR
 
     // Create the vertex input layout.
     result = device->CreateInputLayout(polygonLayout, numElements, vertexShaderBuffer->GetBufferPointer(),
-        vertexShaderBuffer->GetBufferSize(), &m_layout);
+        vertexShaderBuffer->GetBufferSize(), &layout_);
     if (FAILED(result))
     {
         return false;
@@ -217,14 +217,14 @@ bool SpecMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR
 
     // Setup the description of the dynamic matrix constant buffer that is in the vertex shader.
     matrixBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    matrixBufferDesc.ByteWidth = sizeof(MatrixBufferType);
+    matrixBufferDesc.ByteWidth = sizeof(matrix_buffer_type);
     matrixBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     matrixBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     matrixBufferDesc.MiscFlags = 0;
     matrixBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&matrixBufferDesc, NULL, &m_matrixBuffer);
+    result = device->CreateBuffer(&matrixBufferDesc, NULL, &matrix_buffer_);
     if (FAILED(result))
     {
         return false;
@@ -246,7 +246,7 @@ bool SpecMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR
     samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
 
     // Create the texture sampler state.
-    result = device->CreateSamplerState(&samplerDesc, &m_sampleState);
+    result = device->CreateSamplerState(&samplerDesc, &sample_state_);
     if (FAILED(result))
     {
         return false;
@@ -254,14 +254,14 @@ bool SpecMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR
 
     // Setup the description of the light dynamic constant buffer that is in the pixel shader.
     lightBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    lightBufferDesc.ByteWidth = sizeof(LightBufferType);
+    lightBufferDesc.ByteWidth = sizeof(light_buffer_type);
     lightBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     lightBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     lightBufferDesc.MiscFlags = 0;
     lightBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&lightBufferDesc, NULL, &m_lightBuffer);
+    result = device->CreateBuffer(&lightBufferDesc, NULL, &light_buffer_);
     if (FAILED(result))
     {
         return false;
@@ -269,14 +269,14 @@ bool SpecMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR
 
     // Setup the description of the camera dynamic constant buffer that is in the vertex shader.
     cameraBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    cameraBufferDesc.ByteWidth = sizeof(CameraBufferType);
+    cameraBufferDesc.ByteWidth = sizeof(camera_buffer_type);
     cameraBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     cameraBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     cameraBufferDesc.MiscFlags = 0;
     cameraBufferDesc.StructureByteStride = 0;
 
     // Create the camera constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&cameraBufferDesc, NULL, &m_cameraBuffer);
+    result = device->CreateBuffer(&cameraBufferDesc, NULL, &camera_buffer_);
     if (FAILED(result))
     {
         return false;
@@ -286,62 +286,62 @@ bool SpecMapShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR
 }
 
 
-void SpecMapShaderClass::ShutdownShader()
+void spec_map_shader_class::shutdown_shader()
 {
     // Release the camera constant buffer.
-    if (m_cameraBuffer)
+    if (camera_buffer_)
     {
-        m_cameraBuffer->Release();
-        m_cameraBuffer = 0;
+        camera_buffer_->Release();
+        camera_buffer_ = 0;
     }
 
     // Release the light constant buffer.
-    if (m_lightBuffer)
+    if (light_buffer_)
     {
-        m_lightBuffer->Release();
-        m_lightBuffer = 0;
+        light_buffer_->Release();
+        light_buffer_ = 0;
     }
 
     // Release the sampler state.
-    if (m_sampleState)
+    if (sample_state_)
     {
-        m_sampleState->Release();
-        m_sampleState = 0;
+        sample_state_->Release();
+        sample_state_ = 0;
     }
 
     // Release the matrix constant buffer.
-    if (m_matrixBuffer)
+    if (matrix_buffer_)
     {
-        m_matrixBuffer->Release();
-        m_matrixBuffer = 0;
+        matrix_buffer_->Release();
+        matrix_buffer_ = 0;
     }
 
     // Release the layout.
-    if (m_layout)
+    if (layout_)
     {
-        m_layout->Release();
-        m_layout = 0;
+        layout_->Release();
+        layout_ = 0;
     }
 
     // Release the pixel shader.
-    if (m_pixelShader)
+    if (pixel_shader_)
     {
-        m_pixelShader->Release();
-        m_pixelShader = 0;
+        pixel_shader_->Release();
+        pixel_shader_ = 0;
     }
 
     // Release the vertex shader.
-    if (m_vertexShader)
+    if (vertex_shader_)
     {
-        m_vertexShader->Release();
-        m_vertexShader = 0;
+        vertex_shader_->Release();
+        vertex_shader_ = 0;
     }
 
     return;
 }
 
 
-void SpecMapShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
+void spec_map_shader_class::output_shader_error_message(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
 {
     char* compileErrors;
     unsigned long long bufferSize, i;
@@ -376,16 +376,16 @@ void SpecMapShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND
     return;
 }
 
-bool SpecMapShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+bool spec_map_shader_class::set_shader_parameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
     ID3D11ShaderResourceView* texture1, ID3D11ShaderResourceView* texture2, ID3D11ShaderResourceView* texture3,
     XMFLOAT3 lightDirection, XMFLOAT4 diffuseColor, XMFLOAT3 cameraPosition, XMFLOAT4 specularColor, float specularPower)
 {
     HRESULT result;
     D3D11_MAPPED_SUBRESOURCE mappedResource;
-    MatrixBufferType* dataPtr;
+    matrix_buffer_type* dataPtr;
     unsigned int bufferNumber;
-    LightBufferType* dataPtr2;
-    CameraBufferType* dataPtr3;
+    light_buffer_type* dataPtr2;
+    camera_buffer_type* dataPtr3;
 
 
     // Transpose the matrices to prepare them for the shader.
@@ -394,14 +394,14 @@ bool SpecMapShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext,
     projectionMatrix = XMMatrixTranspose(projectionMatrix);
 
     // Lock the constant buffer so it can be written to.
-    result = deviceContext->Map(m_matrixBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(matrix_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         return false;
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr = (MatrixBufferType*)mappedResource.pData;
+    dataPtr = (matrix_buffer_type*)mappedResource.pData;
 
     // Copy the matrices into the constant buffer.
     dataPtr->world = worldMatrix;
@@ -409,13 +409,13 @@ bool SpecMapShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext,
     dataPtr->projection = projectionMatrix;
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_matrixBuffer, 0);
+    deviceContext->Unmap(matrix_buffer_, 0);
 
     // Set the position of the constant buffer in the vertex shader.
     bufferNumber = 0;
 
     // Finally set the constant buffer in the vertex shader with the updated values.
-    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &m_matrixBuffer);
+    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &matrix_buffer_);
 
     // Set shader texture resources in the pixel shader.
     deviceContext->PSSetShaderResources(0, 1, &texture1);
@@ -423,69 +423,69 @@ bool SpecMapShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext,
     deviceContext->PSSetShaderResources(2, 1, &texture3);
 
     // Lock the light constant buffer so it can be written to.
-    result = deviceContext->Map(m_lightBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(light_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         return false;
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr2 = (LightBufferType*)mappedResource.pData;
+    dataPtr2 = (light_buffer_type*)mappedResource.pData;
 
     // Copy the lighting variables into the constant buffer.
-    dataPtr2->diffuseColor = diffuseColor;
-    dataPtr2->lightDirection = lightDirection;
-    dataPtr2->specularColor = specularColor;
-    dataPtr2->specularPower = specularPower;
+    dataPtr2->diffuse_color = diffuseColor;
+    dataPtr2->light_direction = lightDirection;
+    dataPtr2->specular_color = specularColor;
+    dataPtr2->specular_power = specularPower;
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_lightBuffer, 0);
+    deviceContext->Unmap(light_buffer_, 0);
 
     // Set the position of the light constant buffer in the pixel shader.
     bufferNumber = 0;
 
     // Finally set the light constant buffer in the pixel shader with the updated values.
-    deviceContext->PSSetConstantBuffers(bufferNumber, 1, &m_lightBuffer);
+    deviceContext->PSSetConstantBuffers(bufferNumber, 1, &light_buffer_);
 
     // Lock the camera constant buffer so it can be written to.
-    result = deviceContext->Map(m_cameraBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(camera_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         return false;
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr3 = (CameraBufferType*)mappedResource.pData;
+    dataPtr3 = (camera_buffer_type*)mappedResource.pData;
 
     // Copy the camera position into the constant buffer.
-    dataPtr3->cameraPosition = cameraPosition;
+    dataPtr3->camera_position = cameraPosition;
 
     // Unlock the camera constant buffer.
-    deviceContext->Unmap(m_cameraBuffer, 0);
+    deviceContext->Unmap(camera_buffer_, 0);
 
     // Set the position of the camera constant buffer in the vertex shader as the second buffer.
     bufferNumber = 1;
 
     // Now set the camera constant buffer in the vertex shader with the updated values.
-    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &m_cameraBuffer);
+    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &camera_buffer_);
 
     return true;
 }
 
 
-void SpecMapShaderClass::RenderShader(ID3D11DeviceContext* deviceContext, int indexCount)
+void spec_map_shader_class::render_shader(ID3D11DeviceContext* deviceContext, int indexCount)
 {
     // Set the vertex input layout.
-    deviceContext->IASetInputLayout(m_layout);
+    deviceContext->IASetInputLayout(layout_);
 
     // Set the vertex and pixel shaders that will be used to render this model.
-    deviceContext->VSSetShader(m_vertexShader, NULL, 0);
-    deviceContext->PSSetShader(m_pixelShader, NULL, 0);
+    deviceContext->VSSetShader(vertex_shader_, NULL, 0);
+    deviceContext->PSSetShader(pixel_shader_, NULL, 0);
 
     // Set the sampler state in the pixel shader.
-    deviceContext->PSSetSamplers(0, 1, &m_sampleState);
+    deviceContext->PSSetSamplers(0, 1, &sample_state_);
 
-    // Render the model.
+    // render the model.
     deviceContext->DrawIndexed(indexCount, 0, 0);
 
     return;
diff --git a/enginecustom/src/src/shader/sunlightshaderclass.cpp b/enginecustom/src/src/shader/sunlight_shader_class.cpp
similarity index 71%
rename from enginecustom/src/src/shader/sunlightshaderclass.cpp
rename to enginecustom/src/src/shader/sunlight_shader_class.cpp
index 11d7e70..da53368 100644
--- a/enginecustom/src/src/shader/sunlightshaderclass.cpp
+++ b/enginecustom/src/src/shader/sunlight_shader_class.cpp
@@ -1,34 +1,34 @@
 ////////////////////////////////////////////////////////////////////////////////
 // Filename: lightshaderclass.cpp
 ////////////////////////////////////////////////////////////////////////////////
-#include "sunlightshaderclass.h"
+#include "sunlight_shader_class.h"
 
 
-SunlightShaderClass::SunlightShaderClass()
+sunlight_shader_class::sunlight_shader_class()
 {
-    m_vertexShader = 0;
-    m_pixelShader = 0;
-    m_layout = 0;
-    m_sampleState = 0;
-    m_matrixBuffer = 0;
-    m_cameraBuffer = 0;
-    m_sunlightBuffer = 0;
-    m_sunlightColorBuffer = 0;
-    m_sunlightPositionBuffer = 0;
+    vertex_shader_ = 0;
+    pixel_shader_ = 0;
+    layout_ = 0;
+    sample_state_ = 0;
+    matrix_buffer_ = 0;
+    camera_buffer_ = 0;
+    sunlight_buffer_ = 0;
+    sunlight_color_buffer_ = 0;
+    sunlight_position_buffer_ = 0;
 }
 
 
-SunlightShaderClass::SunlightShaderClass(const SunlightShaderClass& other)
+sunlight_shader_class::sunlight_shader_class(const sunlight_shader_class& other)
 {
 }
 
 
-SunlightShaderClass::~SunlightShaderClass()
+sunlight_shader_class::~sunlight_shader_class()
 {
 }
 
 
-bool SunlightShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
+bool sunlight_shader_class::initialize(ID3D11Device* device, HWND hwnd)
 {
     Logger::Get().Log("Initializing LightShaderClass", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -52,8 +52,8 @@ bool SunlightShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
         Logger::Get().Log("Failed to copy string", __FILE__, __LINE__, Logger::LogLevel::Error);
         return false;
     }
-    // Initialize the vertex and pixel shaders.
-    result = InitializeShader(device, hwnd, vsFilename, psFilename);
+    // initialize the vertex and pixel shaders.
+    result = initialize_shader(device, hwnd, vsFilename, psFilename);
     if (!result)
     {
         Logger::Get().Log("Failed to initialize shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -66,22 +66,22 @@ bool SunlightShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
 }
 
 
-void SunlightShaderClass::Shutdown()
+void sunlight_shader_class::shutdown()
 {
-    // Shutdown the vertex and pixel shaders as well as the related objects.
-    ShutdownShader();
+    // shutdown the vertex and pixel shaders as well as the related objects.
+    shutdown_shader();
 
     return;
 }
 
-bool SunlightShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+bool sunlight_shader_class::render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
     ID3D11ShaderResourceView* texture, XMFLOAT4 diffuseColor, XMFLOAT4 ambientColor, XMFLOAT3 sunDirection, float sunIntensity)
 {
     bool result;
 
 
     // Set the shader parameters that it will use for rendering.
-    result = SetShaderParameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture, diffuseColor, ambientColor, sunDirection, sunIntensity);
+    result = set_shader_parameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture, diffuseColor, ambientColor, sunDirection, sunIntensity);
     if (!result)
     {
         Logger::Get().Log("Failed to set shader parameters", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -89,13 +89,13 @@ bool SunlightShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCo
     }
 
     // Now render the prepared buffers with the shader.
-    RenderShader(deviceContext, indexCount);
+    render_shader(deviceContext, indexCount);
 
     return true;
 }
 
 
-bool SunlightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
+bool sunlight_shader_class::initialize_shader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
 {
     Logger::Get().Log("Initializing shader", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -109,7 +109,7 @@ bool SunlightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
     D3D11_BUFFER_DESC matrixBufferDesc;
     D3D11_BUFFER_DESC sunlightBufferDesc;
 
-    // Initialize the pointers this function will use to null.
+    // initialize the pointers this function will use to null.
     errorMessage = 0;
     vertexShaderBuffer = 0;
     pixelShaderBuffer = 0;
@@ -120,7 +120,7 @@ bool SunlightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
     {
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, vsFilename);
+            output_shader_error_message(errorMessage, hwnd, vsFilename);
         }
         else
         {
@@ -135,7 +135,7 @@ bool SunlightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
     {
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, psFilename);
+            output_shader_error_message(errorMessage, hwnd, psFilename);
         }
         else
         {
@@ -145,7 +145,7 @@ bool SunlightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
     }
 
     // Create the vertex shader from the buffer.
-    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &m_vertexShader);
+    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &vertex_shader_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create vertex shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -153,7 +153,7 @@ bool SunlightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
     }
 
     // Create the pixel shader from the buffer.
-    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &m_pixelShader);
+    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &pixel_shader_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create pixel shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -189,7 +189,7 @@ bool SunlightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
     numElements = sizeof(polygonLayout) / sizeof(polygonLayout[0]);
 
     // Create the vertex input layout.
-    result = device->CreateInputLayout(polygonLayout, numElements, vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), &m_layout);
+    result = device->CreateInputLayout(polygonLayout, numElements, vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), &layout_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create input layout", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -219,7 +219,7 @@ bool SunlightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
     samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
 
     // Create the texture sampler state.
-    result = device->CreateSamplerState(&samplerDesc, &m_sampleState);
+    result = device->CreateSamplerState(&samplerDesc, &sample_state_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create sampler state", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -228,14 +228,14 @@ bool SunlightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
 
     // Setup the description of the dynamic matrix constant buffer that is in the vertex shader.
     matrixBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    matrixBufferDesc.ByteWidth = sizeof(MatrixBufferType);
+    matrixBufferDesc.ByteWidth = sizeof(matrix_buffer_type);
     matrixBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     matrixBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     matrixBufferDesc.MiscFlags = 0;
     matrixBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&matrixBufferDesc, NULL, &m_matrixBuffer);
+    result = device->CreateBuffer(&matrixBufferDesc, NULL, &matrix_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create matrix buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -244,14 +244,14 @@ bool SunlightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
 
     // Setup the description of the dynamic sunlight constant buffer that is in the pixel shader.
     sunlightBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    sunlightBufferDesc.ByteWidth = sizeof(SunLightBufferType);
+    sunlightBufferDesc.ByteWidth = sizeof(sun_light_buffer_type);
     sunlightBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     sunlightBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     sunlightBufferDesc.MiscFlags = 0;
     sunlightBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the pixel shader constant buffer from within this class.
-    result = device->CreateBuffer(&sunlightBufferDesc, NULL, &m_sunlightBuffer);
+    result = device->CreateBuffer(&sunlightBufferDesc, NULL, &sunlight_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create sunlight buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -266,70 +266,70 @@ bool SunlightShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHA
 
 
 
-void SunlightShaderClass::ShutdownShader()
+void sunlight_shader_class::shutdown_shader()
 {
     Logger::Get().Log("Shutting down SunLightShaderClass", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
     // Release the light constant buffers.
-    if (m_sunlightColorBuffer)
+    if (sunlight_color_buffer_)
     {
-        m_sunlightColorBuffer->Release();
-        m_sunlightColorBuffer = 0;
+        sunlight_color_buffer_->Release();
+        sunlight_color_buffer_ = 0;
     }
 
-    if (m_sunlightPositionBuffer)
+    if (sunlight_position_buffer_)
     {
-        m_sunlightPositionBuffer->Release();
-        m_sunlightPositionBuffer = 0;
+        sunlight_position_buffer_->Release();
+        sunlight_position_buffer_ = 0;
     }
 
     // Release the light constant buffer.
-    if (m_sunlightBuffer)
+    if (sunlight_buffer_)
     {
-        m_sunlightBuffer->Release();
-        m_sunlightBuffer = 0;
+        sunlight_buffer_->Release();
+        sunlight_buffer_ = 0;
     }
 
     // Release the camera constant buffer.
-    if (m_cameraBuffer)
+    if (camera_buffer_)
     {
-        m_cameraBuffer->Release();
-        m_cameraBuffer = 0;
+        camera_buffer_->Release();
+        camera_buffer_ = 0;
     }
 
     // Release the matrix constant buffer.
-    if (m_matrixBuffer)
+    if (matrix_buffer_)
     {
-        m_matrixBuffer->Release();
-        m_matrixBuffer = 0;
+        matrix_buffer_->Release();
+        matrix_buffer_ = 0;
     }
 
     // Release the sampler state.
-    if (m_sampleState)
+    if (sample_state_)
     {
-        m_sampleState->Release();
-        m_sampleState = 0;
+        sample_state_->Release();
+        sample_state_ = 0;
     }
 
     // Release the layout.
-    if (m_layout)
+    if (layout_)
     {
-        m_layout->Release();
-        m_layout = 0;
+        layout_->Release();
+        layout_ = 0;
     }
 
     // Release the pixel shader.
-    if (m_pixelShader)
+    if (pixel_shader_)
     {
-        m_pixelShader->Release();
-        m_pixelShader = 0;
+        pixel_shader_->Release();
+        pixel_shader_ = 0;
     }
 
     // Release the vertex shader.
-    if (m_vertexShader)
+    if (vertex_shader_)
     {
-        m_vertexShader->Release();
-        m_vertexShader = 0;
+        vertex_shader_->Release();
+        vertex_shader_ = 0;
     }
 
     Logger::Get().Log("SunLightShaderClass shut down", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
@@ -338,7 +338,7 @@ void SunlightShaderClass::ShutdownShader()
 }
 
 
-void SunlightShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
+void sunlight_shader_class::output_shader_error_message(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
 {
     char* compileErrors;
     unsigned __int64 bufferSize, i;
@@ -374,13 +374,13 @@ void SunlightShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWN
 }
 
 
-bool SunlightShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix, ID3D11ShaderResourceView* texture, XMFLOAT4 ambientColor, XMFLOAT4 diffuseColor, XMFLOAT3 lightDirection, float sunIntensity)
+bool sunlight_shader_class::set_shader_parameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix, ID3D11ShaderResourceView* texture, XMFLOAT4 ambientColor, XMFLOAT4 diffuseColor, XMFLOAT3 lightDirection, float sunIntensity)
 {
     HRESULT result;
     D3D11_MAPPED_SUBRESOURCE mappedResource;
-    MatrixBufferType* dataPtr;
-    CameraBufferType* dataPtr2;
-    SunLightBufferType* dataPtr3;
+    matrix_buffer_type* dataPtr;
+    camera_buffer_type* dataPtr2;
+    sun_light_buffer_type* dataPtr3;
     unsigned int bufferNumber;
 
     // Transpose the matrices to prepare them for the shader.
@@ -389,14 +389,14 @@ bool SunlightShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext
     projectionMatrix = XMMatrixTranspose(projectionMatrix);
 
     // Lock the constant buffer so it can be written to.
-    result = deviceContext->Map(m_matrixBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(matrix_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         return false;
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr = (MatrixBufferType*)mappedResource.pData;
+    dataPtr = (matrix_buffer_type*)mappedResource.pData;
 
     // Copy the matrices into the constant buffer.
     dataPtr->world = worldMatrix;
@@ -404,38 +404,38 @@ bool SunlightShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext
     dataPtr->projection = projectionMatrix;
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_matrixBuffer, 0);
+    deviceContext->Unmap(matrix_buffer_, 0);
 
     // Set the position of the constant buffer in the vertex shader.
     bufferNumber = 0;
 
     // Finally set the constant buffer in the vertex shader with the updated values.
-    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &m_matrixBuffer);
+    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &matrix_buffer_);
 
     // Lock the sunlight constant buffer so it can be written to.
-    result = deviceContext->Map(m_sunlightBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(sunlight_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         return false;
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr3 = (SunLightBufferType*)mappedResource.pData;
+    dataPtr3 = (sun_light_buffer_type*)mappedResource.pData;
 
     // Copy the lighting variables into the constant buffer.
-    dataPtr3->ambientColor = ambientColor;
-    dataPtr3->diffuseColor = diffuseColor;
-    dataPtr3->sunDirection = lightDirection;
+    dataPtr3->ambient_color = ambientColor;
+    dataPtr3->diffuse_color = diffuseColor;
+    dataPtr3->sun_direction = lightDirection;
     dataPtr3->intensity = sunIntensity;
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_sunlightBuffer, 0);
+    deviceContext->Unmap(sunlight_buffer_, 0);
 
     // Set the position of the sunlight constant buffer in the pixel shader.
     bufferNumber = 0;
 
     // Finally set the sunlight constant buffer in the pixel shader with the updated values.
-    deviceContext->PSSetConstantBuffers(bufferNumber, 1, &m_sunlightBuffer);
+    deviceContext->PSSetConstantBuffers(bufferNumber, 1, &sunlight_buffer_);
 
     // Set shader texture resource in the pixel shader.
     deviceContext->PSSetShaderResources(0, 1, &texture);
@@ -443,19 +443,19 @@ bool SunlightShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext
     return true;
 }
 
-void SunlightShaderClass::RenderShader(ID3D11DeviceContext* deviceContext, int indexCount)
+void sunlight_shader_class::render_shader(ID3D11DeviceContext* deviceContext, int indexCount)
 {
     // Set the vertex input layout.
-    deviceContext->IASetInputLayout(m_layout);
+    deviceContext->IASetInputLayout(layout_);
 
     // Set the vertex and pixel shaders that will be used to render this triangle.
-    deviceContext->VSSetShader(m_vertexShader, NULL, 0);
-    deviceContext->PSSetShader(m_pixelShader, NULL, 0);
+    deviceContext->VSSetShader(vertex_shader_, NULL, 0);
+    deviceContext->PSSetShader(pixel_shader_, NULL, 0);
 
     // Set the sampler state in the pixel shader.
-    deviceContext->PSSetSamplers(0, 1, &m_sampleState);
+    deviceContext->PSSetSamplers(0, 1, &sample_state_);
 
-    // Render the triangle.
+    // render the triangle.
     deviceContext->DrawIndexed(indexCount, 0, 0);
 
     return;
diff --git a/enginecustom/src/src/shader/textureshaderclass.cpp b/enginecustom/src/src/shader/texture_shader_class.cpp
similarity index 75%
rename from enginecustom/src/src/shader/textureshaderclass.cpp
rename to enginecustom/src/src/shader/texture_shader_class.cpp
index dadc983..d0a50ac 100644
--- a/enginecustom/src/src/shader/textureshaderclass.cpp
+++ b/enginecustom/src/src/shader/texture_shader_class.cpp
@@ -1,27 +1,27 @@
-#include "textureshaderclass.h"
+#include "texture_shader_class.h"
 
 
-TextureShaderClass::TextureShaderClass()
+texture_shader_class::texture_shader_class()
 {
-	m_vertexShader = 0;
-	m_pixelShader = 0;
-	m_layout = 0;
-	m_matrixBuffer = 0;
-	m_sampleState = 0;
+	vertex_shader_ = 0;
+	pixel_shader_ = 0;
+	layout_ = 0;
+	matrix_buffer_ = 0;
+	sample_state_ = 0;
 }
 
 
-TextureShaderClass::TextureShaderClass(const TextureShaderClass& other)
+texture_shader_class::texture_shader_class(const texture_shader_class& other)
 {
 }
 
 
-TextureShaderClass::~TextureShaderClass()
+texture_shader_class::~texture_shader_class()
 {
 }
 
 
-bool TextureShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
+bool texture_shader_class::initialize(ID3D11Device* device, HWND hwnd)
 {
 	Logger::Get().Log("Initializing texture shader", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -45,8 +45,8 @@ bool TextureShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
 		return false;
 	}
 
-	// Initialize the vertex and pixel shaders.
-	result = InitializeShader(device, hwnd, vsFilename, psFilename);
+	// initialize the vertex and pixel shaders.
+	result = initialize_shader(device, hwnd, vsFilename, psFilename);
 	if (!result)
 	{
 		Logger::Get().Log("Error initializing shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -58,22 +58,22 @@ bool TextureShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
 	return true;
 }
 
-void TextureShaderClass::Shutdown()
+void texture_shader_class::shutdown()
 {
-	// Shutdown the vertex and pixel shaders as well as the related objects.
-	ShutdownShader();
+	// shutdown the vertex and pixel shaders as well as the related objects.
+	shutdown_shader();
 
 	return;
 }
 
-bool TextureShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
+bool texture_shader_class::render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
 	XMMATRIX projectionMatrix, ID3D11ShaderResourceView* texture)
 {
 	bool result;
 
 
 	// Set the shader parameters that it will use for rendering.
-	result = SetShaderParameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture);
+	result = set_shader_parameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture);
 	if (!result)
 	{
 		Logger::Get().Log("Error setting shader parameters", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -81,12 +81,12 @@ bool TextureShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCou
 	}
 
 	// Now render the prepared buffers with the shader.
-	RenderShader(deviceContext, indexCount);
+	render_shader(deviceContext, indexCount);
 
 	return true;
 }
 
-bool TextureShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
+bool texture_shader_class::initialize_shader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
 {
 	Logger::Get().Log("Initializing shader", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -100,7 +100,7 @@ bool TextureShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR
 	D3D11_SAMPLER_DESC samplerDesc;
 
 
-	// Initialize the pointers this function will use to null.
+	// initialize the pointers this function will use to null.
 	errorMessage = 0;
 	vertexShaderBuffer = 0;
 	pixelShaderBuffer = 0;
@@ -112,7 +112,7 @@ bool TextureShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR
 		// If the shader failed to compile it should have writen something to the error message.
 		if (errorMessage)
 		{
-			OutputShaderErrorMessage(errorMessage, hwnd, vsFilename);
+			output_shader_error_message(errorMessage, hwnd, vsFilename);
 		}
 		// If there was nothing in the error message then it simply could not find the shader file itself.
 		else
@@ -131,7 +131,7 @@ bool TextureShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR
 		// If the shader failed to compile it should have writen something to the error message.
 		if (errorMessage)
 		{
-			OutputShaderErrorMessage(errorMessage, hwnd, psFilename);
+			output_shader_error_message(errorMessage, hwnd, psFilename);
 		}
 		// If there was nothing in the error message then it simply could not find the file itself.
 		else
@@ -143,7 +143,7 @@ bool TextureShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR
 	}
 
 	// Create the vertex shader from the buffer.
-	result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &m_vertexShader);
+	result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &vertex_shader_);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Error creating vertex shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -151,7 +151,7 @@ bool TextureShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR
 	}
 
 	// Create the pixel shader from the buffer.
-	result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &m_pixelShader);
+	result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &pixel_shader_);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Error creating pixel shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -180,7 +180,7 @@ bool TextureShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR
 
 	// Create the vertex input layout.
 	result = device->CreateInputLayout(polygonLayout, numElements, vertexShaderBuffer->GetBufferPointer(),
-		vertexShaderBuffer->GetBufferSize(), &m_layout);
+		vertexShaderBuffer->GetBufferSize(), &layout_);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Error creating input layout", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -196,14 +196,14 @@ bool TextureShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR
 
 	// Setup the description of the dynamic matrix constant buffer that is in the vertex shader.
 	matrixBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-	matrixBufferDesc.ByteWidth = sizeof(MatrixBufferType);
+	matrixBufferDesc.ByteWidth = sizeof(matrix_buffer_type);
 	matrixBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
 	matrixBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
 	matrixBufferDesc.MiscFlags = 0;
 	matrixBufferDesc.StructureByteStride = 0;
 
 	// Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-	result = device->CreateBuffer(&matrixBufferDesc, NULL, &m_matrixBuffer);
+	result = device->CreateBuffer(&matrixBufferDesc, NULL, &matrix_buffer_);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Error creating constant buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -225,7 +225,7 @@ bool TextureShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR
 	samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
 
 	// Create the texture sampler state.
-	result = device->CreateSamplerState(&samplerDesc, &m_sampleState);
+	result = device->CreateSamplerState(&samplerDesc, &sample_state_);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Error creating sampler state", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -237,43 +237,43 @@ bool TextureShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR
 	return true;
 }
 
-void TextureShaderClass::ShutdownShader()
+void texture_shader_class::shutdown_shader()
 {
 	Logger::Get().Log("Shutting down shader", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
 	// Release the sampler state.
-	if (m_sampleState)
+	if (sample_state_)
 	{
-		m_sampleState->Release();
-		m_sampleState = 0;
+		sample_state_->Release();
+		sample_state_ = 0;
 	}
 
 	// Release the matrix constant buffer.
-	if (m_matrixBuffer)
+	if (matrix_buffer_)
 	{
-		m_matrixBuffer->Release();
-		m_matrixBuffer = 0;
+		matrix_buffer_->Release();
+		matrix_buffer_ = 0;
 	}
 
 	// Release the layout.
-	if (m_layout)
+	if (layout_)
 	{
-		m_layout->Release();
-		m_layout = 0;
+		layout_->Release();
+		layout_ = 0;
 	}
 
 	// Release the pixel shader.
-	if (m_pixelShader)
+	if (pixel_shader_)
 	{
-		m_pixelShader->Release();
-		m_pixelShader = 0;
+		pixel_shader_->Release();
+		pixel_shader_ = 0;
 	}
 
 	// Release the vertex shader.
-	if (m_vertexShader)
+	if (vertex_shader_)
 	{
-		m_vertexShader->Release();
-		m_vertexShader = 0;
+		vertex_shader_->Release();
+		vertex_shader_ = 0;
 	}
 
 	Logger::Get().Log("Shader shut down", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
@@ -281,7 +281,7 @@ void TextureShaderClass::ShutdownShader()
 	return;
 }
 
-void TextureShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
+void texture_shader_class::output_shader_error_message(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
 {
 	char* compileErrors;
 	unsigned long long bufferSize, i;
@@ -316,12 +316,12 @@ void TextureShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND
 	return;
 }
 
-bool TextureShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
+bool texture_shader_class::set_shader_parameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
 	XMMATRIX projectionMatrix, ID3D11ShaderResourceView* texture)
 {
 	HRESULT result;
 	D3D11_MAPPED_SUBRESOURCE mappedResource;
-	MatrixBufferType* dataPtr;
+	matrix_buffer_type* dataPtr;
 	unsigned int bufferNumber;
 
 
@@ -331,7 +331,7 @@ bool TextureShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext,
 	projectionMatrix = XMMatrixTranspose(projectionMatrix);
 
 	// Lock the constant buffer so it can be written to.
-	result = deviceContext->Map(m_matrixBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+	result = deviceContext->Map(matrix_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Error mapping constant buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -339,7 +339,7 @@ bool TextureShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext,
 	}
 
 	// Get a pointer to the data in the constant buffer.
-	dataPtr = (MatrixBufferType*)mappedResource.pData;
+	dataPtr = (matrix_buffer_type*)mappedResource.pData;
 
 	// Copy the matrices into the constant buffer.
 	dataPtr->world = worldMatrix;
@@ -347,31 +347,31 @@ bool TextureShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext,
 	dataPtr->projection = projectionMatrix;
 
 	// Unlock the constant buffer.
-	deviceContext->Unmap(m_matrixBuffer, 0);
+	deviceContext->Unmap(matrix_buffer_, 0);
 
 	// Set the position of the constant buffer in the vertex shader.
 	bufferNumber = 0;
 
 	// Finanly set the constant buffer in the vertex shader with the updated values.
-	deviceContext->VSSetConstantBuffers(bufferNumber, 1, &m_matrixBuffer);
+	deviceContext->VSSetConstantBuffers(bufferNumber, 1, &matrix_buffer_);
 	// Set shader texture resource in the pixel shader.
 	deviceContext->PSSetShaderResources(0, 1, &texture);
 
 	return true;
 }
 
-void TextureShaderClass::RenderShader(ID3D11DeviceContext* deviceContext, int indexCount)
+void texture_shader_class::render_shader(ID3D11DeviceContext* deviceContext, int indexCount)
 {
 	// Set the vertex input layout.
-	deviceContext->IASetInputLayout(m_layout);
+	deviceContext->IASetInputLayout(layout_);
 
 	// Set the vertex and pixel shaders that will be used to render this triangle.
-	deviceContext->VSSetShader(m_vertexShader, NULL, 0);
-	deviceContext->PSSetShader(m_pixelShader, NULL, 0);
+	deviceContext->VSSetShader(vertex_shader_, NULL, 0);
+	deviceContext->PSSetShader(pixel_shader_, NULL, 0);
 	// Set the sampler state in the pixel shader.
-	deviceContext->PSSetSamplers(0, 1, &m_sampleState);
+	deviceContext->PSSetSamplers(0, 1, &sample_state_);
 
-	// Render the triangle.
+	// render the triangle.
 	deviceContext->DrawIndexed(indexCount, 0, 0);
 
 	return;
diff --git a/enginecustom/src/src/shader/translateshaderclass.cpp b/enginecustom/src/src/shader/translate_shader_class.cpp
similarity index 74%
rename from enginecustom/src/src/shader/translateshaderclass.cpp
rename to enginecustom/src/src/shader/translate_shader_class.cpp
index 9f2ea8b..60cdc9f 100644
--- a/enginecustom/src/src/shader/translateshaderclass.cpp
+++ b/enginecustom/src/src/shader/translate_shader_class.cpp
@@ -1,30 +1,30 @@
-#include "translateshaderclass.h"
+#include "translate_shader_class.h"
 
 
-TranslateShaderClass::TranslateShaderClass()
+translate_shader_class::translate_shader_class()
 {
-    m_vertexShader = 0;
-    m_pixelShader = 0;
-    m_layout = 0;
-    m_matrixBuffer = 0;
-    m_sampleState = 0;
-    m_translateBuffer = 0;
+    vertex_shader_ = 0;
+    pixel_shader_ = 0;
+    layout_ = 0;
+    matrix_buffer_ = 0;
+    sample_state_ = 0;
+    translate_buffer_ = 0;
 }
 
 
-TranslateShaderClass::TranslateShaderClass(const TranslateShaderClass& other)
+translate_shader_class::translate_shader_class(const translate_shader_class& other)
 {
 }
 
 
-TranslateShaderClass::~TranslateShaderClass()
+translate_shader_class::~translate_shader_class()
 {
 }
 
 
-bool TranslateShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
+bool translate_shader_class::initialize(ID3D11Device* device, HWND hwnd)
 {
-    Logger::Get().Log("Initilaizing TranslateShaderClass", __FILE__, __LINE__, Logger::LogLevel::Initialize);
+    Logger::Get().Log("Initilaizing translate_shader_class", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
     bool result;
     wchar_t vsFilename[128];
@@ -47,36 +47,36 @@ bool TranslateShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
         return false;
     }
 
-    // Initialize the vertex and pixel shaders.
-    result = InitializeShader(device, hwnd, vsFilename, psFilename);
+    // initialize the vertex and pixel shaders.
+    result = initialize_shader(device, hwnd, vsFilename, psFilename);
     if (!result)
     {
         Logger::Get().Log("Failed to initialize shader", __FILE__, __LINE__, Logger::LogLevel::Error);
         return false;
     }
 
-    Logger::Get().Log("TranslateShaderClass initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
+    Logger::Get().Log("translate_shader_class initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
     return true;
 }
 
 
-void TranslateShaderClass::Shutdown()
+void translate_shader_class::shutdown()
 {
-    // Shutdown the vertex and pixel shaders as well as the related objects.
-    ShutdownShader();
+    // shutdown the vertex and pixel shaders as well as the related objects.
+    shutdown_shader();
 
     return;
 }
 
-bool TranslateShaderClass::Render(ID3D11DeviceContext * deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
+bool translate_shader_class::render(ID3D11DeviceContext * deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
     XMMATRIX projectionMatrix, ID3D11ShaderResourceView * texture, float translation)
 {
     bool result;
 
 
     // Set the shader parameters that it will use for rendering.
-    result = SetShaderParameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture, translation);
+    result = set_shader_parameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture, translation);
     if (!result)
     {
         Logger::Get().Log("Failed to set shader parameters", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -84,13 +84,13 @@ bool TranslateShaderClass::Render(ID3D11DeviceContext * deviceContext, int index
     }
 
     // Now render the prepared buffers with the shader.
-    RenderShader(deviceContext, indexCount);
+    render_shader(deviceContext, indexCount);
 
     return true;
 }
 
 
-bool TranslateShaderClass::InitializeShader(ID3D11Device * device, HWND hwnd, WCHAR * vsFilename, WCHAR * psFilename)
+bool translate_shader_class::initialize_shader(ID3D11Device * device, HWND hwnd, WCHAR * vsFilename, WCHAR * psFilename)
 {
     Logger::Get().Log("Initializing translate shader", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -105,7 +105,7 @@ bool TranslateShaderClass::InitializeShader(ID3D11Device * device, HWND hwnd, WC
     D3D11_BUFFER_DESC translateBufferDesc;
 
 
-    // Initialize the pointers this function will use to null.
+    // initialize the pointers this function will use to null.
     errorMessage = 0;
     vertexShaderBuffer = 0;
     pixelShaderBuffer = 0;
@@ -118,7 +118,7 @@ bool TranslateShaderClass::InitializeShader(ID3D11Device * device, HWND hwnd, WC
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, vsFilename);
+            output_shader_error_message(errorMessage, hwnd, vsFilename);
         }
         // If there was nothing in the error message then it simply could not find the shader file itself.
         else
@@ -137,7 +137,7 @@ bool TranslateShaderClass::InitializeShader(ID3D11Device * device, HWND hwnd, WC
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, psFilename);
+            output_shader_error_message(errorMessage, hwnd, psFilename);
         }
         // If there was nothing in the error message then it simply could not find the file itself.
         else
@@ -149,7 +149,7 @@ bool TranslateShaderClass::InitializeShader(ID3D11Device * device, HWND hwnd, WC
     }
 
     // Create the vertex shader from the buffer.
-    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &m_vertexShader);
+    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &vertex_shader_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create vertex shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -157,7 +157,7 @@ bool TranslateShaderClass::InitializeShader(ID3D11Device * device, HWND hwnd, WC
     }
 
     // Create the pixel shader from the buffer.
-    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &m_pixelShader);
+    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &pixel_shader_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create pixel shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -186,7 +186,7 @@ bool TranslateShaderClass::InitializeShader(ID3D11Device * device, HWND hwnd, WC
 
     // Create the vertex input layout.
     result = device->CreateInputLayout(polygonLayout, numElements, vertexShaderBuffer->GetBufferPointer(),
-        vertexShaderBuffer->GetBufferSize(), &m_layout);
+        vertexShaderBuffer->GetBufferSize(), &layout_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create input layout", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -202,14 +202,14 @@ bool TranslateShaderClass::InitializeShader(ID3D11Device * device, HWND hwnd, WC
 
     // Setup the description of the dynamic matrix constant buffer that is in the vertex shader.
     matrixBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    matrixBufferDesc.ByteWidth = sizeof(MatrixBufferType);
+    matrixBufferDesc.ByteWidth = sizeof(matrix_buffer_type);
     matrixBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     matrixBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     matrixBufferDesc.MiscFlags = 0;
     matrixBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&matrixBufferDesc, NULL, &m_matrixBuffer);
+    result = device->CreateBuffer(&matrixBufferDesc, NULL, &matrix_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create matrix buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -232,7 +232,7 @@ bool TranslateShaderClass::InitializeShader(ID3D11Device * device, HWND hwnd, WC
     samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
 
     // Create the texture sampler state.
-    result = device->CreateSamplerState(&samplerDesc, &m_sampleState);
+    result = device->CreateSamplerState(&samplerDesc, &sample_state_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create sampler state", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -241,14 +241,14 @@ bool TranslateShaderClass::InitializeShader(ID3D11Device * device, HWND hwnd, WC
 
     // Setup the description of the texture translation dynamic constant buffer that is in the pixel shader.
     translateBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    translateBufferDesc.ByteWidth = sizeof(TranslateBufferType);
+    translateBufferDesc.ByteWidth = sizeof(translate_buffer_type);
     translateBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     translateBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     translateBufferDesc.MiscFlags = 0;
     translateBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the pixel shader constant buffer from within this class.
-    result = device->CreateBuffer(&translateBufferDesc, NULL, &m_translateBuffer);
+    result = device->CreateBuffer(&translateBufferDesc, NULL, &translate_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create translate buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -261,50 +261,50 @@ bool TranslateShaderClass::InitializeShader(ID3D11Device * device, HWND hwnd, WC
 }
 
 
-void TranslateShaderClass::ShutdownShader()
+void translate_shader_class::shutdown_shader()
 {
     Logger::Get().Log("Shutting down translate shader", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
     // Release the texture translation constant buffer.
-    if (m_translateBuffer)
+    if (translate_buffer_)
     {
-            m_translateBuffer->Release();
-            m_translateBuffer = 0;
+            translate_buffer_->Release();
+            translate_buffer_ = 0;
     }
 
     // Release the sampler state.
-    if (m_sampleState)
+    if (sample_state_)
     {
-        m_sampleState->Release();
-        m_sampleState = 0;
+        sample_state_->Release();
+        sample_state_ = 0;
     }
 
     // Release the matrix constant buffer.
-    if (m_matrixBuffer)
+    if (matrix_buffer_)
     {
-        m_matrixBuffer->Release();
-        m_matrixBuffer = 0;
+        matrix_buffer_->Release();
+        matrix_buffer_ = 0;
     }
 
     // Release the layout.
-    if (m_layout)
+    if (layout_)
     {
-        m_layout->Release();
-        m_layout = 0;
+        layout_->Release();
+        layout_ = 0;
     }
 
     // Release the pixel shader.
-    if (m_pixelShader)
+    if (pixel_shader_)
     {
-        m_pixelShader->Release();
-        m_pixelShader = 0;
+        pixel_shader_->Release();
+        pixel_shader_ = 0;
     }
 
     // Release the vertex shader.
-    if (m_vertexShader)
+    if (vertex_shader_)
     {
-        m_vertexShader->Release();
-        m_vertexShader = 0;
+        vertex_shader_->Release();
+        vertex_shader_ = 0;
     }
 
     Logger::Get().Log("Translate shader shut down", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
@@ -313,7 +313,7 @@ void TranslateShaderClass::ShutdownShader()
 }
 
 
-void TranslateShaderClass::OutputShaderErrorMessage(ID3D10Blob * errorMessage, HWND hwnd, WCHAR * shaderFilename)
+void translate_shader_class::output_shader_error_message(ID3D10Blob * errorMessage, HWND hwnd, WCHAR * shaderFilename)
 {
     char* compileErrors;
     unsigned long long bufferSize, i;
@@ -349,14 +349,14 @@ void TranslateShaderClass::OutputShaderErrorMessage(ID3D10Blob * errorMessage, H
 }
 
 
-bool TranslateShaderClass::SetShaderParameters(ID3D11DeviceContext * deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
+bool translate_shader_class::set_shader_parameters(ID3D11DeviceContext * deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
     XMMATRIX projectionMatrix, ID3D11ShaderResourceView * texture, float translation)
 {
     HRESULT result;
     D3D11_MAPPED_SUBRESOURCE mappedResource;
-    MatrixBufferType* dataPtr;
+    matrix_buffer_type* dataPtr;
     unsigned int bufferNumber;
-    TranslateBufferType* dataPtr2;
+    translate_buffer_type* dataPtr2;
 
 
     // Transpose the matrices to prepare them for the shader.
@@ -365,7 +365,7 @@ bool TranslateShaderClass::SetShaderParameters(ID3D11DeviceContext * deviceConte
     projectionMatrix = XMMatrixTranspose(projectionMatrix);
 
     // Lock the constant buffer so it can be written to.
-    result = deviceContext->Map(m_matrixBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(matrix_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to map matrix buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -373,7 +373,7 @@ bool TranslateShaderClass::SetShaderParameters(ID3D11DeviceContext * deviceConte
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr = (MatrixBufferType*)mappedResource.pData;
+    dataPtr = (matrix_buffer_type*)mappedResource.pData;
 
     // Copy the matrices into the constant buffer.
     dataPtr->world = worldMatrix;
@@ -381,19 +381,19 @@ bool TranslateShaderClass::SetShaderParameters(ID3D11DeviceContext * deviceConte
     dataPtr->projection = projectionMatrix;
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_matrixBuffer, 0);
+    deviceContext->Unmap(matrix_buffer_, 0);
 
     // Set the position of the constant buffer in the vertex shader.
     bufferNumber = 0;
 
     // Finally set the constant buffer in the vertex shader with the updated values.
-    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &m_matrixBuffer);
+    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &matrix_buffer_);
 
     // Set shader texture resource in the pixel shader.
     deviceContext->PSSetShaderResources(0, 1, &texture);
 
     // Lock the texture translation constant buffer so it can be written to.
-    result = deviceContext->Map(m_translateBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(translate_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to map translate buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -401,37 +401,37 @@ bool TranslateShaderClass::SetShaderParameters(ID3D11DeviceContext * deviceConte
     }
 
     // Get a pointer to the data in the texture translation constant buffer.
-    dataPtr2 = (TranslateBufferType*)mappedResource.pData;
+    dataPtr2 = (translate_buffer_type*)mappedResource.pData;
 
     // Copy the translation value into the texture translation constant buffer.
     dataPtr2->translation = translation;
 
     // Unlock the buffer.
-    deviceContext->Unmap(m_translateBuffer, 0);
+    deviceContext->Unmap(translate_buffer_, 0);
 
     // Set the position of the texture translation constant buffer in the pixel shader.
     bufferNumber = 0;
 
     // Now set the texture translation constant buffer in the pixel shader with the updated values.
-    deviceContext->PSSetConstantBuffers(bufferNumber, 1, &m_translateBuffer);
+    deviceContext->PSSetConstantBuffers(bufferNumber, 1, &translate_buffer_);
 
     return true;
 }
 
 
-void TranslateShaderClass::RenderShader(ID3D11DeviceContext * deviceContext, int indexCount)
+void translate_shader_class::render_shader(ID3D11DeviceContext * deviceContext, int indexCount)
 {
     // Set the vertex input layout.
-    deviceContext->IASetInputLayout(m_layout);
+    deviceContext->IASetInputLayout(layout_);
 
     // Set the vertex and pixel shaders that will be used to render this triangle.
-    deviceContext->VSSetShader(m_vertexShader, NULL, 0);
-    deviceContext->PSSetShader(m_pixelShader, NULL, 0);
+    deviceContext->VSSetShader(vertex_shader_, NULL, 0);
+    deviceContext->PSSetShader(pixel_shader_, NULL, 0);
 
     // Set the sampler state in the pixel shader.
-    deviceContext->PSSetSamplers(0, 1, &m_sampleState);
+    deviceContext->PSSetSamplers(0, 1, &sample_state_);
 
-    // Render the geometry.
+    // render the geometry.
     deviceContext->DrawIndexed(indexCount, 0, 0);
 
     return;
diff --git a/enginecustom/src/src/shader/transparentshaderclass.cpp b/enginecustom/src/src/shader/transparent_shader_class.cpp
similarity index 74%
rename from enginecustom/src/src/shader/transparentshaderclass.cpp
rename to enginecustom/src/src/shader/transparent_shader_class.cpp
index dfa280b..9472121 100644
--- a/enginecustom/src/src/shader/transparentshaderclass.cpp
+++ b/enginecustom/src/src/shader/transparent_shader_class.cpp
@@ -1,30 +1,30 @@
-#include "transparentshaderclass.h"
+#include "transparent_shader_class.h"
 
 
-TransparentShaderClass::TransparentShaderClass()
+transparent_shader_class::transparent_shader_class()
 {
-    m_vertexShader = 0;
-    m_pixelShader = 0;
-    m_layout = 0;
-    m_matrixBuffer = 0;
-    m_sampleState = 0;
-    m_transparentBuffer = 0;
+    vertex_shader_ = 0;
+    pixel_shader_ = 0;
+    layout_ = 0;
+    matrix_buffer_ = 0;
+    sample_state_ = 0;
+    transparent_buffer_ = 0;
 }
 
 
-TransparentShaderClass::TransparentShaderClass(const TransparentShaderClass& other)
+transparent_shader_class::transparent_shader_class(const transparent_shader_class& other)
 {
 }
 
 
-TransparentShaderClass::~TransparentShaderClass()
+transparent_shader_class::~transparent_shader_class()
 {
 }
 
 
-bool TransparentShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
+bool transparent_shader_class::initialize(ID3D11Device* device, HWND hwnd)
 {
-    Logger::Get().Log("Initializing TransparentShaderClass", __FILE__, __LINE__, Logger::LogLevel::Initialize);
+    Logger::Get().Log("Initializing transparent_shader_class", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
     bool result;
     wchar_t vsFilename[128];
@@ -47,36 +47,36 @@ bool TransparentShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
         return false;
     }
 
-    // Initialize the vertex and pixel shaders.
-    result = InitializeShader(device, hwnd, vsFilename, psFilename);
+    // initialize the vertex and pixel shaders.
+    result = initialize_shader(device, hwnd, vsFilename, psFilename);
     if (!result)
     {
         Logger::Get().Log("Failed to initialize shader", __FILE__, __LINE__, Logger::LogLevel::Error);
         return false;
     }
 
-    Logger::Get().Log("TransparentShaderClass initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
+    Logger::Get().Log("transparent_shader_class initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
     return true;
 }
 
 
-void TransparentShaderClass::Shutdown()
+void transparent_shader_class::shutdown()
 {
-    // Shutdown the vertex and pixel shaders as well as the related objects.
-    ShutdownShader();
+    // shutdown the vertex and pixel shaders as well as the related objects.
+    shutdown_shader();
 
     return;
 }
 
-bool TransparentShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
+bool transparent_shader_class::render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
     XMMATRIX projectionMatrix, ID3D11ShaderResourceView* texture, float blend)
 {
     bool result;
 
 
     // Set the shader parameters that it will use for rendering.
-    result = SetShaderParameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture, blend);
+    result = set_shader_parameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture, blend);
     if (!result)
     {
         Logger::Get().Log("Failed to set shader parameters", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -84,13 +84,13 @@ bool TransparentShaderClass::Render(ID3D11DeviceContext* deviceContext, int inde
     }
 
     // Now render the prepared buffers with the shader.
-    RenderShader(deviceContext, indexCount);
+    render_shader(deviceContext, indexCount);
 
     return true;
 }
 
 
-bool TransparentShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
+bool transparent_shader_class::initialize_shader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
 {
     Logger::Get().Log("Initializing transparent shader", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -105,7 +105,7 @@ bool TransparentShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, W
     D3D11_BUFFER_DESC transparentBufferDesc;
 
 
-    // Initialize the pointers this function will use to null.
+    // initialize the pointers this function will use to null.
     errorMessage = 0;
     vertexShaderBuffer = 0;
     pixelShaderBuffer = 0;
@@ -118,7 +118,7 @@ bool TransparentShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, W
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, vsFilename);
+            output_shader_error_message(errorMessage, hwnd, vsFilename);
         }
         // If there was nothing in the error message then it simply could not find the shader file itself.
         else
@@ -137,7 +137,7 @@ bool TransparentShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, W
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, psFilename);
+            output_shader_error_message(errorMessage, hwnd, psFilename);
         }
         // If there was nothing in the error message then it simply could not find the file itself.
         else
@@ -149,7 +149,7 @@ bool TransparentShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, W
     }
 
     // Create the vertex shader from the buffer.
-    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &m_vertexShader);
+    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &vertex_shader_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create vertex shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -157,7 +157,7 @@ bool TransparentShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, W
     }
 
     // Create the pixel shader from the buffer.
-    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &m_pixelShader);
+    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &pixel_shader_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create pixel shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -186,7 +186,7 @@ bool TransparentShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, W
 
     // Create the vertex input layout.
     result = device->CreateInputLayout(polygonLayout, numElements, vertexShaderBuffer->GetBufferPointer(),
-        vertexShaderBuffer->GetBufferSize(), &m_layout);
+        vertexShaderBuffer->GetBufferSize(), &layout_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create input layout", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -202,14 +202,14 @@ bool TransparentShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, W
 
     // Setup the description of the dynamic matrix constant buffer that is in the vertex shader.
     matrixBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    matrixBufferDesc.ByteWidth = sizeof(MatrixBufferType);
+    matrixBufferDesc.ByteWidth = sizeof(matrix_buffer_type);
     matrixBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     matrixBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     matrixBufferDesc.MiscFlags = 0;
     matrixBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&matrixBufferDesc, NULL, &m_matrixBuffer);
+    result = device->CreateBuffer(&matrixBufferDesc, NULL, &matrix_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create matrix buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -232,7 +232,7 @@ bool TransparentShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, W
     samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
 
     // Create the texture sampler state.
-    result = device->CreateSamplerState(&samplerDesc, &m_sampleState);
+    result = device->CreateSamplerState(&samplerDesc, &sample_state_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create sampler state", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -241,14 +241,14 @@ bool TransparentShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, W
 
     // Setup the description of the transparent dynamic constant buffer that is in the pixel shader.
     transparentBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    transparentBufferDesc.ByteWidth = sizeof(TransparentBufferType);
+    transparentBufferDesc.ByteWidth = sizeof(transparent_buffer_type);
     transparentBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     transparentBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     transparentBufferDesc.MiscFlags = 0;
     transparentBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the pixel shader constant buffer from within this class.
-    result = device->CreateBuffer(&transparentBufferDesc, NULL, &m_transparentBuffer);
+    result = device->CreateBuffer(&transparentBufferDesc, NULL, &transparent_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create transparent buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -261,50 +261,50 @@ bool TransparentShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, W
 }
 
 
-void TransparentShaderClass::ShutdownShader()
+void transparent_shader_class::shutdown_shader()
 {
     Logger::Get().Log("Shutting down transparent shader", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
     // Release the transparent constant buffer.
-    if (m_transparentBuffer)
+    if (transparent_buffer_)
     {
-        m_transparentBuffer->Release();
-        m_transparentBuffer = 0;
+        transparent_buffer_->Release();
+        transparent_buffer_ = 0;
     }
 
     // Release the sampler state.
-    if (m_sampleState)
+    if (sample_state_)
     {
-        m_sampleState->Release();
-        m_sampleState = 0;
+        sample_state_->Release();
+        sample_state_ = 0;
     }
 
     // Release the matrix constant buffer.
-    if (m_matrixBuffer)
+    if (matrix_buffer_)
     {
-        m_matrixBuffer->Release();
-        m_matrixBuffer = 0;
+        matrix_buffer_->Release();
+        matrix_buffer_ = 0;
     }
 
     // Release the layout.
-    if (m_layout)
+    if (layout_)
     {
-        m_layout->Release();
-        m_layout = 0;
+        layout_->Release();
+        layout_ = 0;
     }
 
     // Release the pixel shader.
-    if (m_pixelShader)
+    if (pixel_shader_)
     {
-        m_pixelShader->Release();
-        m_pixelShader = 0;
+        pixel_shader_->Release();
+        pixel_shader_ = 0;
     }
 
     // Release the vertex shader.
-    if (m_vertexShader)
+    if (vertex_shader_)
     {
-        m_vertexShader->Release();
-        m_vertexShader = 0;
+        vertex_shader_->Release();
+        vertex_shader_ = 0;
     }
 
     Logger::Get().Log("Transparent shader shut down", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
@@ -313,7 +313,7 @@ void TransparentShaderClass::ShutdownShader()
 }
 
 
-void TransparentShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
+void transparent_shader_class::output_shader_error_message(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
 {
     char* compileErrors;
     unsigned long long bufferSize, i;
@@ -348,14 +348,14 @@ void TransparentShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage,
     return;
 }
 
-bool TransparentShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
+bool transparent_shader_class::set_shader_parameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix,
     XMMATRIX projectionMatrix, ID3D11ShaderResourceView* texture, float blend)
 {
     HRESULT result;
     D3D11_MAPPED_SUBRESOURCE mappedResource;
-    MatrixBufferType* dataPtr;
+    matrix_buffer_type* dataPtr;
     unsigned int bufferNumber;
-    TransparentBufferType* dataPtr2;
+    transparent_buffer_type* dataPtr2;
 
 
     // Transpose the matrices to prepare them for the shader.
@@ -364,7 +364,7 @@ bool TransparentShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceCont
     projectionMatrix = XMMatrixTranspose(projectionMatrix);
 
     // Lock the constant buffer so it can be written to.
-    result = deviceContext->Map(m_matrixBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(matrix_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to map matrix buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -372,7 +372,7 @@ bool TransparentShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceCont
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr = (MatrixBufferType*)mappedResource.pData;
+    dataPtr = (matrix_buffer_type*)mappedResource.pData;
 
     // Copy the matrices into the constant buffer.
     dataPtr->world = worldMatrix;
@@ -380,19 +380,19 @@ bool TransparentShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceCont
     dataPtr->projection = projectionMatrix;
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_matrixBuffer, 0);
+    deviceContext->Unmap(matrix_buffer_, 0);
 
     // Set the position of the constant buffer in the vertex shader.
     bufferNumber = 0;
 
     // Finally set the constant buffer in the vertex shader with the updated values.
-    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &m_matrixBuffer);
+    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &matrix_buffer_);
 
     // Set shader texture resource in the pixel shader.
     deviceContext->PSSetShaderResources(0, 1, &texture);
 
     // Lock the transparent constant buffer so it can be written to.
-    result = deviceContext->Map(m_transparentBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(transparent_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to map transparent buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -400,37 +400,37 @@ bool TransparentShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceCont
     }
 
     // Get a pointer to the data in the transparent constant buffer.
-    dataPtr2 = (TransparentBufferType*)mappedResource.pData;
+    dataPtr2 = (transparent_buffer_type*)mappedResource.pData;
 
     // Copy the alpha blending value into the transparent constant buffer.
-    dataPtr2->blendAmount = blend;
+    dataPtr2->blend_amount = blend;
 
     // Unlock the buffer.
-    deviceContext->Unmap(m_transparentBuffer, 0);
+    deviceContext->Unmap(transparent_buffer_, 0);
 
     // Set the position of the transparent constant buffer in the pixel shader.
     bufferNumber = 0;
 
     // Now set the transparent constant buffer in the pixel shader with the updated values.
-    deviceContext->PSSetConstantBuffers(bufferNumber, 1, &m_transparentBuffer);
+    deviceContext->PSSetConstantBuffers(bufferNumber, 1, &transparent_buffer_);
 
     return true;
 }
 
 
-void TransparentShaderClass::RenderShader(ID3D11DeviceContext* deviceContext, int indexCount)
+void transparent_shader_class::render_shader(ID3D11DeviceContext* deviceContext, int indexCount)
 {
     // Set the vertex input layout.
-    deviceContext->IASetInputLayout(m_layout);
+    deviceContext->IASetInputLayout(layout_);
 
     // Set the vertex and pixel shaders that will be used to render the geometry.
-    deviceContext->VSSetShader(m_vertexShader, NULL, 0);
-    deviceContext->PSSetShader(m_pixelShader, NULL, 0);
+    deviceContext->VSSetShader(vertex_shader_, NULL, 0);
+    deviceContext->PSSetShader(pixel_shader_, NULL, 0);
 
     // Set the sampler state in the pixel shader.
-    deviceContext->PSSetSamplers(0, 1, &m_sampleState);
+    deviceContext->PSSetSamplers(0, 1, &sample_state_);
 
-    // Render the geometry.
+    // render the geometry.
     deviceContext->DrawIndexed(indexCount, 0, 0);
 
     return;
diff --git a/enginecustom/src/src/shader/watershaderclass.cpp b/enginecustom/src/src/shader/water_shader_class.cpp
similarity index 72%
rename from enginecustom/src/src/shader/watershaderclass.cpp
rename to enginecustom/src/src/shader/water_shader_class.cpp
index 8452f39..b7c230e 100644
--- a/enginecustom/src/src/shader/watershaderclass.cpp
+++ b/enginecustom/src/src/shader/water_shader_class.cpp
@@ -1,29 +1,29 @@
-#include "watershaderclass.h"
+#include "water_shader_class.h"
 
 
-WaterShaderClass::WaterShaderClass()
+water_shader_class::water_shader_class()
 {
-    m_vertexShader = 0;
-    m_pixelShader = 0;
-    m_layout = 0;
-    m_sampleState = 0;
-    m_matrixBuffer = 0;
-    m_reflectionBuffer = 0;
-    m_waterBuffer = 0;
+    vertex_shader_ = 0;
+    pixel_shader_ = 0;
+    layout_ = 0;
+    sample_state_ = 0;
+    matrix_buffer_ = 0;
+    reflection_buffer_ = 0;
+    water_buffer_ = 0;
 }
 
 
-WaterShaderClass::WaterShaderClass(const WaterShaderClass& other)
+water_shader_class::water_shader_class(const water_shader_class& other)
 {
 }
 
 
-WaterShaderClass::~WaterShaderClass()
+water_shader_class::~water_shader_class()
 {
 }
 
 
-bool WaterShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
+bool water_shader_class::initialize(ID3D11Device* device, HWND hwnd)
 {
     bool result;
     wchar_t vsFilename[128];
@@ -44,8 +44,8 @@ bool WaterShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
         return false;
     }
 
-    // Initialize the vertex and pixel shaders.
-    result = InitializeShader(device, hwnd, vsFilename, psFilename);
+    // initialize the vertex and pixel shaders.
+    result = initialize_shader(device, hwnd, vsFilename, psFilename);
     if (!result)
     {
         return false;
@@ -55,15 +55,15 @@ bool WaterShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
 }
 
 
-void WaterShaderClass::Shutdown()
+void water_shader_class::shutdown()
 {
-    // Shutdown the vertex and pixel shaders as well as the related objects.
-    ShutdownShader();
+    // shutdown the vertex and pixel shaders as well as the related objects.
+    shutdown_shader();
 
     return;
 }
 
-bool WaterShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
+bool water_shader_class::render(ID3D11DeviceContext* deviceContext, int indexCount, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix,
     XMMATRIX reflectionMatrix, ID3D11ShaderResourceView* reflectionTexture, ID3D11ShaderResourceView* refractionTexture,
     ID3D11ShaderResourceView* normalTexture, float waterTranslation, float reflectRefractScale)
 {
@@ -71,7 +71,7 @@ bool WaterShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCount
 
 
     // Set the shader parameters that it will use for rendering.
-    result = SetShaderParameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, reflectionMatrix, reflectionTexture,
+    result = set_shader_parameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, reflectionMatrix, reflectionTexture,
         refractionTexture, normalTexture, waterTranslation, reflectRefractScale);
     if (!result)
     {
@@ -79,13 +79,13 @@ bool WaterShaderClass::Render(ID3D11DeviceContext* deviceContext, int indexCount
     }
 
     // Now render the prepared buffers with the shader.
-    RenderShader(deviceContext, indexCount);
+    render_shader(deviceContext, indexCount);
 
     return true;
 }
 
 
-bool WaterShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
+bool water_shader_class::initialize_shader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
 {
     HRESULT result;
     ID3D10Blob* errorMessage;
@@ -99,7 +99,7 @@ bool WaterShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
     D3D11_BUFFER_DESC waterBufferDesc;
 
 
-    // Initialize the pointers this function will use to null.
+    // initialize the pointers this function will use to null.
     errorMessage = 0;
     vertexShaderBuffer = 0;
     pixelShaderBuffer = 0;
@@ -112,7 +112,7 @@ bool WaterShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, vsFilename);
+            output_shader_error_message(errorMessage, hwnd, vsFilename);
         }
         // If there was nothing in the error message then it simply could not find the shader file itself.
         else
@@ -131,7 +131,7 @@ bool WaterShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
         // If the shader failed to compile it should have writen something to the error message.
         if (errorMessage)
         {
-            OutputShaderErrorMessage(errorMessage, hwnd, psFilename);
+            output_shader_error_message(errorMessage, hwnd, psFilename);
         }
         // If there was nothing in the error message then it simply could not find the file itself.
         else
@@ -143,14 +143,14 @@ bool WaterShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
     }
 
     // Create the vertex shader from the buffer.
-    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &m_vertexShader);
+    result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &vertex_shader_);
     if (FAILED(result))
     {
         return false;
     }
 
     // Create the pixel shader from the buffer.
-    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &m_pixelShader);
+    result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &pixel_shader_);
     if (FAILED(result))
     {
         return false;
@@ -178,7 +178,7 @@ bool WaterShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
 
     // Create the vertex input layout.
     result = device->CreateInputLayout(polygonLayout, numElements, vertexShaderBuffer->GetBufferPointer(),
-        vertexShaderBuffer->GetBufferSize(), &m_layout);
+        vertexShaderBuffer->GetBufferSize(), &layout_);
     if (FAILED(result))
     {
         return false;
@@ -193,14 +193,14 @@ bool WaterShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
 
     // Setup the description of the dynamic matrix constant buffer that is in the vertex shader.
     matrixBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    matrixBufferDesc.ByteWidth = sizeof(MatrixBufferType);
+    matrixBufferDesc.ByteWidth = sizeof(matrix_buffer_type);
     matrixBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     matrixBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     matrixBufferDesc.MiscFlags = 0;
     matrixBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&matrixBufferDesc, NULL, &m_matrixBuffer);
+    result = device->CreateBuffer(&matrixBufferDesc, NULL, &matrix_buffer_);
     if (FAILED(result))
     {
         return false;
@@ -222,7 +222,7 @@ bool WaterShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
     samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
 
     // Create the texture sampler state.
-    result = device->CreateSamplerState(&samplerDesc, &m_sampleState);
+    result = device->CreateSamplerState(&samplerDesc, &sample_state_);
     if (FAILED(result))
     {
         return false;
@@ -230,14 +230,14 @@ bool WaterShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
 
     // Setup the description of the reflection dynamic constant buffer that is in the vertex shader.
     reflectionBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    reflectionBufferDesc.ByteWidth = sizeof(ReflectionBufferType);
+    reflectionBufferDesc.ByteWidth = sizeof(reflection_buffer_type);
     reflectionBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     reflectionBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     reflectionBufferDesc.MiscFlags = 0;
     reflectionBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the vertex shader constant buffer from within this class.
-    result = device->CreateBuffer(&reflectionBufferDesc, NULL, &m_reflectionBuffer);
+    result = device->CreateBuffer(&reflectionBufferDesc, NULL, &reflection_buffer_);
     if (FAILED(result))
     {
         return false;
@@ -245,14 +245,14 @@ bool WaterShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
 
     // Setup the description of the water dynamic constant buffer that is in the pixel shader.
     waterBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    waterBufferDesc.ByteWidth = sizeof(WaterBufferType);
+    waterBufferDesc.ByteWidth = sizeof(water_buffer_type);
     waterBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     waterBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     waterBufferDesc.MiscFlags = 0;
     waterBufferDesc.StructureByteStride = 0;
 
     // Create the constant buffer pointer so we can access the pixel shader constant buffer from within this class.
-    result = device->CreateBuffer(&waterBufferDesc, NULL, &m_waterBuffer);
+    result = device->CreateBuffer(&waterBufferDesc, NULL, &water_buffer_);
     if (FAILED(result))
     {
         return false;
@@ -262,62 +262,62 @@ bool WaterShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
 }
 
 
-void WaterShaderClass::ShutdownShader()
+void water_shader_class::shutdown_shader()
 {
     // Release the water constant buffer.
-    if (m_waterBuffer)
+    if (water_buffer_)
     {
-        m_waterBuffer->Release();
-        m_waterBuffer = 0;
+        water_buffer_->Release();
+        water_buffer_ = 0;
     }
 
     // Release the reflection constant buffer.
-    if (m_reflectionBuffer)
+    if (reflection_buffer_)
     {
-        m_reflectionBuffer->Release();
-        m_reflectionBuffer = 0;
+        reflection_buffer_->Release();
+        reflection_buffer_ = 0;
     }
 
     // Release the sampler state.
-    if (m_sampleState)
+    if (sample_state_)
     {
-        m_sampleState->Release();
-        m_sampleState = 0;
+        sample_state_->Release();
+        sample_state_ = 0;
     }
 
     // Release the matrix constant buffer.
-    if (m_matrixBuffer)
+    if (matrix_buffer_)
     {
-        m_matrixBuffer->Release();
-        m_matrixBuffer = 0;
+        matrix_buffer_->Release();
+        matrix_buffer_ = 0;
     }
 
     // Release the layout.
-    if (m_layout)
+    if (layout_)
     {
-        m_layout->Release();
-        m_layout = 0;
+        layout_->Release();
+        layout_ = 0;
     }
 
     // Release the pixel shader.
-    if (m_pixelShader)
+    if (pixel_shader_)
     {
-        m_pixelShader->Release();
-        m_pixelShader = 0;
+        pixel_shader_->Release();
+        pixel_shader_ = 0;
     }
 
     // Release the vertex shader.
-    if (m_vertexShader)
+    if (vertex_shader_)
     {
-        m_vertexShader->Release();
-        m_vertexShader = 0;
+        vertex_shader_->Release();
+        vertex_shader_ = 0;
     }
 
     return;
 }
 
 
-void WaterShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
+void water_shader_class::output_shader_error_message(ID3D10Blob* errorMessage, HWND hwnd, WCHAR* shaderFilename)
 {
     char* compileErrors;
     unsigned long long bufferSize, i;
@@ -352,16 +352,16 @@ void WaterShaderClass::OutputShaderErrorMessage(ID3D10Blob* errorMessage, HWND h
     return;
 }
 
-bool WaterShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix, XMMATRIX reflectionMatrix,
+bool water_shader_class::set_shader_parameters(ID3D11DeviceContext* deviceContext, XMMATRIX worldMatrix, XMMATRIX viewMatrix, XMMATRIX projectionMatrix, XMMATRIX reflectionMatrix,
     ID3D11ShaderResourceView* reflectionTexture, ID3D11ShaderResourceView* refractionTexture, ID3D11ShaderResourceView* normalTexture,
     float waterTranslation, float reflectRefractScale)
 {
     HRESULT result;
     D3D11_MAPPED_SUBRESOURCE mappedResource;
-    MatrixBufferType* dataPtr;
+    matrix_buffer_type* dataPtr;
     unsigned int bufferNumber;
-    ReflectionBufferType* dataPtr2;
-    WaterBufferType* dataPtr3;
+    reflection_buffer_type* dataPtr2;
+    water_buffer_type* dataPtr3;
 
     // Transpose the matrices to prepare them for the shader.
     worldMatrix = XMMatrixTranspose(worldMatrix);
@@ -370,14 +370,14 @@ bool WaterShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, X
     reflectionMatrix = XMMatrixTranspose(reflectionMatrix);
 
     // Lock the constant buffer so it can be written to.
-    result = deviceContext->Map(m_matrixBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(matrix_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         return false;
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr = (MatrixBufferType*)mappedResource.pData;
+    dataPtr = (matrix_buffer_type*)mappedResource.pData;
 
     // Copy the matrices into the constant buffer.
     dataPtr->world = worldMatrix;
@@ -385,35 +385,35 @@ bool WaterShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, X
     dataPtr->projection = projectionMatrix;
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_matrixBuffer, 0);
+    deviceContext->Unmap(matrix_buffer_, 0);
 
     // Set the position of the constant buffer in the vertex shader.
     bufferNumber = 0;
 
     // Finanly set the constant buffer in the vertex shader with the updated values.
-    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &m_matrixBuffer);
+    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &matrix_buffer_);
 
     // Lock the reflection constant buffer so it can be written to.
-    result = deviceContext->Map(m_reflectionBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(reflection_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         return false;
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr2 = (ReflectionBufferType*)mappedResource.pData;
+    dataPtr2 = (reflection_buffer_type*)mappedResource.pData;
 
     // Copy the reflection matrix into the constant buffer.
     dataPtr2->reflection = reflectionMatrix;
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_reflectionBuffer, 0);
+    deviceContext->Unmap(reflection_buffer_, 0);
 
     // Set the position of the reflection constant buffer in the vertex shader.
     bufferNumber = 1;
 
     // Finally set the reflection constant buffer in the vertex shader with the updated values.
-    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &m_reflectionBuffer);
+    deviceContext->VSSetConstantBuffers(bufferNumber, 1, &reflection_buffer_);
 
     // Set the reflection texture resource in the pixel shader.
     deviceContext->PSSetShaderResources(0, 1, &reflectionTexture);
@@ -425,45 +425,45 @@ bool WaterShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext, X
     deviceContext->PSSetShaderResources(2, 1, &normalTexture);
 
     // Lock the water constant buffer so it can be written to.
-    result = deviceContext->Map(m_waterBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContext->Map(water_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         return false;
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr3 = (WaterBufferType*)mappedResource.pData;
+    dataPtr3 = (water_buffer_type*)mappedResource.pData;
 
     // Copy the water data into the constant buffer.
-    dataPtr3->waterTranslation = waterTranslation;
-    dataPtr3->reflectRefractScale = reflectRefractScale;
+    dataPtr3->water_translation = waterTranslation;
+    dataPtr3->reflect_refract_scale = reflectRefractScale;
     dataPtr3->padding = XMFLOAT2(0.0f, 0.0f);
 
     // Unlock the constant buffer.
-    deviceContext->Unmap(m_waterBuffer, 0);
+    deviceContext->Unmap(water_buffer_, 0);
 
     // Set the position of the water constant buffer in the pixel shader.
     bufferNumber = 0;
 
     // Finally set the water constant buffer in the pixel shader with the updated values.
-    deviceContext->PSSetConstantBuffers(bufferNumber, 1, &m_waterBuffer);
+    deviceContext->PSSetConstantBuffers(bufferNumber, 1, &water_buffer_);
 
     return true;
 }
 
-void WaterShaderClass::RenderShader(ID3D11DeviceContext* deviceContext, int indexCount)
+void water_shader_class::render_shader(ID3D11DeviceContext* deviceContext, int indexCount)
 {
     // Set the vertex input layout.
-    deviceContext->IASetInputLayout(m_layout);
+    deviceContext->IASetInputLayout(layout_);
 
     // Set the vertex and pixel shaders that will be used to render this triangle.
-    deviceContext->VSSetShader(m_vertexShader, NULL, 0);
-    deviceContext->PSSetShader(m_pixelShader, NULL, 0);
+    deviceContext->VSSetShader(vertex_shader_, NULL, 0);
+    deviceContext->PSSetShader(pixel_shader_, NULL, 0);
 
     // Set the sampler state in the pixel shader.
-    deviceContext->PSSetSamplers(0, 1, &m_sampleState);
+    deviceContext->PSSetSamplers(0, 1, &sample_state_);
 
-    // Render the geometry.
+    // render the geometry.
     deviceContext->DrawIndexed(indexCount, 0, 0);
 
     return;
diff --git a/enginecustom/src/src/system/Main.cpp b/enginecustom/src/src/system/Main.cpp
index f641411..3b5cba1 100644
--- a/enginecustom/src/src/system/Main.cpp
+++ b/enginecustom/src/src/system/Main.cpp
@@ -1,9 +1,9 @@
-#include "systemclass.h"
+#include "system_class.h"
 
 
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR pScmdline, int iCmdshow)
 {
-	SystemClass* System;
+	system_class* System;
 	bool result;
 
 	wchar_t path[MAX_PATH];
@@ -17,19 +17,19 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR pScmdline,
 	std::filesystem::path WFolder = exePath.parent_path();
 
 	// Create the system object.
-	System = new SystemClass;
+	System = new system_class;
 
-	// Initialize and run the system object.
-	result = System->Initialize();
+	// initialize and run the system object.
+	result = System->initialize();
 	if (result)
 	{
 		Logger::Get().Log("System initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
-		System->SendPath(path,WFolder);
-		System->Run();
+		System->send_path(path,WFolder);
+		System->run();
 	}
 
-	// Shutdown and release the system object.
-	System->Shutdown();
+	// shutdown and release the system object.
+	System->shutdown();
 	delete System;
 	System = 0;
 
diff --git a/enginecustom/src/src/system/Skybox.cpp b/enginecustom/src/src/system/Skybox.cpp
index e6e3112..74f3e8f 100644
--- a/enginecustom/src/src/system/Skybox.cpp
+++ b/enginecustom/src/src/system/Skybox.cpp
@@ -18,12 +18,12 @@ Skybox::~Skybox()
     translations.clear();
 }
 
-void Skybox::Initialize(D3DClass* d3dClassRef)
+void Skybox::Initialize(d_3d_class* d3dClassRef)
 {
     m_d3dClassRef = d3dClassRef;
 }
 
-Object* Skybox::ConstructSkybox()
+object* Skybox::ConstructSkybox()
 {
     Logger::Get().Log("Construct skybox", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -40,7 +40,7 @@ Object* Skybox::ConstructSkybox()
     for (const auto& textureFilename : skyboxTextures)
     {
         ID3D11ShaderResourceView* texture = nullptr;
-        HRESULT result = DirectX::CreateWICTextureFromFile(m_d3dClassRef->GetDevice(), m_d3dClassRef->GetDeviceContext(), textureFilename.c_str(), nullptr, &texture);
+        HRESULT result = DirectX::CreateWICTextureFromFile(m_d3dClassRef->get_device(), m_d3dClassRef->get_device_context(), textureFilename.c_str(), nullptr, &texture);
         if (FAILED(result))
         {
             Logger::Get().Log("Failed to load texture: " + std::string(textureFilename.begin(), textureFilename.end()), __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -51,8 +51,8 @@ Object* Skybox::ConstructSkybox()
     }
 
     // Create the model object
-    m_Skybox = new Object();
-    HRESULT result = m_Skybox->Initialize(m_d3dClassRef->GetDevice(), m_d3dClassRef->GetDeviceContext(), modelFilename, SkyboxTextures);
+    m_Skybox = new object();
+    HRESULT result = m_Skybox->Initialize(m_d3dClassRef->get_device(), m_d3dClassRef->get_device_context(), modelFilename, SkyboxTextures);
     if (!result)
     {
         Logger::Get().Log("Could not initialize the skybox model object", __FILE__, __LINE__, Logger::LogLevel::Error);
diff --git a/enginecustom/src/src/system/applicationclass.cpp b/enginecustom/src/src/system/application_class.cpp
similarity index 61%
rename from enginecustom/src/src/system/applicationclass.cpp
rename to enginecustom/src/src/system/application_class.cpp
index de21155..b291414 100644
--- a/enginecustom/src/src/system/applicationclass.cpp
+++ b/enginecustom/src/src/system/application_class.cpp
@@ -1,76 +1,76 @@
-#include "applicationclass.h"
+#include "application_class.h"
 
-#include "systemclass.h"
+#include "system_class.h"
 
-ApplicationClass::ApplicationClass() : m_ShouldQuit(false)
+application_class::application_class() : should_quit_(false)
 {
-	m_Direct3D = nullptr;
-	m_Camera = nullptr;
-	m_Model = nullptr;
-	m_Bitmap = nullptr;
-	m_Sprite = nullptr;
-	m_Timer = nullptr;
-	m_MouseStrings = nullptr;
-	m_FontShader = nullptr;
-	m_Font = nullptr;
-	m_Fps = nullptr;
-	m_FpsString = nullptr;
-	m_ShaderManager = nullptr;
-	m_RenderCountString = nullptr;
-	m_ModelList = nullptr;
-	m_Position = nullptr;
-	m_DisplayPlane = nullptr;
-	m_BathModel = nullptr;
-	m_WaterModel = nullptr;
-	m_Light = nullptr;
-	m_RefractionTexture = nullptr;
-	m_ReflectionTexture = nullptr;
-	m_SceneTexture = nullptr;
-	m_Physics = nullptr;
-	m_cubes.clear();
-	m_terrainChunk.clear();
-	m_object.clear();
-	m_RenderQueues.clear();
-	m_Skybox.clear();
-	m_Lights.clear();
-	m_SunLight = nullptr;
-	m_swapChain = nullptr;
-	m_GroundModel = nullptr;
-	m_WallModel = nullptr;
-	m_hwnd = nullptr;
-	m_baseViewMatrix = XMMatrixIdentity();
-	m_RenderTexture = nullptr;
-	m_screenWidth = 0;
-	m_screenHeight = 0;
-	m_numLights = 0;
-	m_waterHeight = 0.0f;
-	m_waterTranslation = 0.0f;
-	TrueLightPosition = XMFLOAT3(0.0f, 0.0f, 0.0f);
-	m_LightModel = nullptr;
-	m_renderCount = 0;
-	m_drawcalls = 0;
+	direct_3d_ = nullptr;
+	camera_ = nullptr;
+	model_ = nullptr;
+	bitmap_ = nullptr;
+	sprite_ = nullptr;
+	timer_ = nullptr;
+	mouse_strings_ = nullptr;
+	font_shader_ = nullptr;
+	font_ = nullptr;
+	fps_ = nullptr;
+	fps_string_ = nullptr;
+	shader_manager_ = nullptr;
+	render_count_string_ = nullptr;
+	model_list_ = nullptr;
+	position_ = nullptr;
+	display_plane_ = nullptr;
+	bath_model_ = nullptr;
+	water_model_ = nullptr;
+	m_light_ = nullptr;
+	refraction_texture_ = nullptr;
+	reflection_texture_ = nullptr;
+	scene_texture_ = nullptr;
+	physics_ = nullptr;
+	cubes_.clear();
+	terrain_chunk_.clear();
+	object_.clear();
+	render_queues_.clear();
+	skybox_.clear();
+	lights_.clear();
+	sun_light_ = nullptr;
+	swap_chain_ = nullptr;
+	ground_model_ = nullptr;
+	wall_model_ = nullptr;
+	hwnd_ = nullptr;
+	base_view_matrix_ = XMMatrixIdentity();
+	render_texture_ = nullptr;
+	screen_width_ = 0;
+	screen_height_ = 0;
+	num_lights_ = 0;
+	water_height_ = 0.0f;
+	water_translation_ = 0.0f;
+	true_light_position_ = XMFLOAT3(0.0f, 0.0f, 0.0f);
+	light_model_ = nullptr;
+	render_count_ = 0;
+	drawcalls_ = 0;
 }
 
-ApplicationClass::~ApplicationClass()
+application_class::~application_class()
 {
-	m_ShouldQuit = true;
-	m_CullingActive = false;
+	should_quit_ = true;
+	culling_active_ = false;
 
 	// Joindre les threads pour s'assurer qu'ils se terminent correctement
-	if (m_PhysicsThread.joinable())
+	if (physics_thread_.joinable())
 	{
-		m_PhysicsThread.join();
+		physics_thread_.join();
 	}
     
-	if (m_CullingThread.joinable())
+	if (culling_thread_.joinable())
 	{
-		m_CullingThread.join();
+		culling_thread_.join();
 	}
 
 }
 
 
-bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd, bool IsVulkan)
+bool application_class::initialize(int screenWidth, int screenHeight, HWND hwnd, bool is_vulkan)
 {
 
 	Logger::Get().Log("Initializing application class", __FILE__, __LINE__, Logger::LogLevel::Initialize);
@@ -85,28 +85,28 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		bool result;
 		HRESULT Hresult;
 
-		m_RenderQueues.push_back(std::ref(m_Skybox)); // Skybox doit être rendu en premier pour être derrière touts les autres objets
-		m_RenderQueues.push_back(std::ref(m_object));
-		m_RenderQueues.push_back(std::ref(m_cubes));
-		m_RenderQueues.push_back(std::ref(m_terrainChunk));
+		render_queues_.push_back(std::ref(skybox_)); // Skybox doit être rendu en premier pour être derrière touts les autres objets
+		render_queues_.push_back(std::ref(object_));
+		render_queues_.push_back(std::ref(cubes_));
+		render_queues_.push_back(std::ref(terrain_chunk_));
 
-		m_screenWidth = screenWidth;
-		m_screenHeight = screenHeight;
+		screen_width_ = screenWidth;
+		screen_height_ = screenHeight;
 
-		SetHwnd(hwnd);
-		SetWindowed(FULL_SCREEN);
-		SetScreenHeight(screenHeight);
-		SetScreenWidth(screenWidth);
+		set_hwnd(hwnd);
+		set_windowed(full_screen);
+		set_screen_height(screenHeight);
+		set_screen_width(screenWidth);
 
 		// Create the Direct3D object.
-		m_Direct3D = new D3DClass;
-		if (!m_Direct3D)
+		direct_3d_ = new d_3d_class;
+		if (!direct_3d_)
 		{
 			Logger::Get().Log("Could not create the Direct3D object", __FILE__, __LINE__, Logger::LogLevel::Error);
 			return false;
 		}
 
-		result = m_Direct3D->Initialize(m_screenWidth, m_screenHeight, VSYNC_ENABLED, hwnd, FULL_SCREEN, SCREEN_DEPTH, SCREEN_NEAR);
+		result = direct_3d_->initialize(screen_width_, screen_height_, vsync_enabled_, hwnd, full_screen, screen_depth, screen_near);
 		if (!result)
 		{
 			Logger::Get().Log("Could not initialize Direct3D", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -114,23 +114,23 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		}
 
 		// Create the camera object.
-		m_Camera = new CameraClass;
-		if (!m_Camera)
+		camera_ = new camera_class;
+		if (!camera_)
 		{
 			Logger::Get().Log("Could not create the camera object", __FILE__, __LINE__, Logger::LogLevel::Error);
 			return false;
 		}
 
 		// Set the initial position of the camera.
-		m_Camera->SetPosition(0.0f, 0.0f, -12.0f);
-		m_Camera->SetRotation(0.0f, 0.0f, 0.0f);
-		m_Camera->Render();
-		m_Camera->GetViewMatrix(m_baseViewMatrix);
+		camera_->set_position(0.0f, 0.0f, -12.0f);
+		camera_->set_rotation(0.0f, 0.0f, 0.0f);
+		camera_->render();
+		camera_->get_view_matrix(base_view_matrix_);
 
 		// Create and initialize the font shader object.
-		m_FontShader = new FontShaderClass;
+		font_shader_ = new font_shader_class;
 
-		result = m_FontShader->Initialize(m_Direct3D->GetDevice(), hwnd);
+		result = font_shader_->initialize(direct_3d_->get_device(), hwnd);
 		if (!result)
 		{
 			Logger::Get().Log("Could not initialize the font shader object", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -138,9 +138,9 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		}
 
 		// Create and initialize the font object.
-		m_Font = new FontClass;
+		font_ = new font_class;
 
-		result = m_Font->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), 0);
+		result = font_->Initialize(direct_3d_->get_device(), direct_3d_->get_device_context(), 0);
 		if (!result)
 		{
 			Logger::Get().Log("Could not initialize the font object", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -148,9 +148,9 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		}
 
 		// Create and initialize the render to texture object.
-		m_RenderTexture = new RenderTextureClass;
+		render_texture_ = new render_texture_class;
 
-		result = m_RenderTexture->Initialize(m_Direct3D->GetDevice(), 256, 256, SCREEN_DEPTH, SCREEN_NEAR, 1);
+		result = render_texture_->Initialize(direct_3d_->get_device(), 256, 256, screen_depth, screen_near, 1);
 		if (!result)
 		{
 			Logger::Get().Log("Could not initialize the render texture object", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -160,8 +160,8 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		//ImVec2 availableSize = ImGui::GetContentRegionAvail();
 
 		// Create and initialize the scene render to texture object.
-		m_SceneTexture = new RenderTextureClass();
-		result = m_SceneTexture->Initialize(m_Direct3D->GetDevice(), 256, 256, SCREEN_DEPTH, SCREEN_NEAR, 1);
+		scene_texture_ = new render_texture_class();
+		result = scene_texture_->Initialize(direct_3d_->get_device(), 256, 256, screen_depth, screen_near, 1);
 		if (!result)
 		{
 			Logger::Get().Log("Could not initialize the render texture object", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -169,9 +169,9 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		}
 
 		// Create and initialize the display plane object.
-		m_DisplayPlane = new DisplayPlaneClass;
+		display_plane_ = new display_plane_class;
 
-		result = m_DisplayPlane->Initialize(m_Direct3D->GetDevice(), 1.0f, 1.0f);
+		result = display_plane_->Initialize(direct_3d_->get_device(), 1.0f, 1.0f);
 		if (!result)
 		{	
 			Logger::Get().Log("Could not initialize the display plane object", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -184,9 +184,9 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		strcpy_s(spriteFilename, "sprite_data_01.txt");
 
 		// Create and initialize the sprite object.
-		m_Sprite = new SpriteClass;
+		sprite_ = new sprite_class;
 
-		result = m_Sprite->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), screenWidth, screenHeight, spriteFilename, 50, 50);
+		result = sprite_->Initialize(direct_3d_->get_device(), direct_3d_->get_device_context(), screenWidth, screenHeight, spriteFilename, 50, 50);
 		if (!result)
 		{
 			Logger::Get().Log("Could not initialize the sprite object", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -199,12 +199,12 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		strcpy_s(mouseString3, "Mouse Button: No");
 
 		// Create and initialize the text objects for the mouse strings.
-		m_MouseStrings = new TextClass[3];
+		mouse_strings_ = new text_class[3];
 
 		for (int i = 0; i < 3; i++)
 		{
 			int y = 10 + (i * 25);
-			result = m_MouseStrings[i].Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), screenWidth, screenHeight, 32, m_Font, mouseString1, 10, y, 1.0f, 1.0f, 1.0f);
+			result = mouse_strings_[i].Initialize(direct_3d_->get_device(), direct_3d_->get_device_context(), screenWidth, screenHeight, 32, font_, mouseString1, 10, y, 1.0f, 1.0f, 1.0f);
 			if (!result)
 			{
 				Logger::Get().Log("Could not initialize the mouse strings", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -216,9 +216,9 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		strcpy_s(bitmapFilename, "assets/Texture/stone01.tga");
 
 		// Create and initialize the bitmap object.
-		m_Bitmap = new BitmapClass;
+		bitmap_ = new bitmap_class;
 
-		result = m_Bitmap->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), screenWidth, screenHeight, bitmapFilename, 50, 50);
+		result = bitmap_->initialize(direct_3d_->get_device(), direct_3d_->get_device_context(), screenWidth, screenHeight, bitmapFilename, 50, 50);
 		if (!result)
 		{
 			Logger::Get().Log("Could not initialize the bitmap object", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -228,7 +228,7 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		// Set the file name of the model.
 		strcpy_s(modelFilename, "assets/Model/TXT/cube.txt");
 
-		// Charger les textures
+		// Charger les textures_
 		std::vector<std::wstring> textureFilenames = {
 			L"assets/Texture/stone01.png"
 		};
@@ -238,7 +238,7 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		for (const auto& textureFilename : textureFilenames)
 		{
 			ID3D11ShaderResourceView* texture = nullptr;
-			Hresult = DirectX::CreateWICTextureFromFile(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), textureFilename.c_str(), nullptr, &texture);
+			Hresult = DirectX::CreateWICTextureFromFile(direct_3d_->get_device(), direct_3d_->get_device_context(), textureFilename.c_str(), nullptr, &texture);
 			if (FAILED(Hresult))
 			{
 				Logger::Get().Log("Failed to load texture: " + std::string(textureFilename.begin(), textureFilename.end()), __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -248,10 +248,10 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		}
 
 		// Create and initialize the model object.
-		m_Model = new ModelClass;
+		model_ = new model_class;
 		
 
-		result = m_Model->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, CubeTextures);
+		result = model_->Initialize(direct_3d_->get_device(), direct_3d_->get_device_context(), modelFilename, CubeTextures);
 		if (!result)
 		{
 			Logger::Get().Log("Could not initialize the model object", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -259,66 +259,66 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		}
 
 		// Create and initialize the light object.
-		m_Light = new LightClass;
+		m_light_ = new light_class;
 
-		m_Light->SetDiffuseColor(1.0f, 1.0f, 1.0f, 1.0f);
-		m_Light->SetDirection(0.0f, 0.0f, -1.0f);
-		m_Light->SetAmbientColor(0.15f, 0.15f, 0.15f, 1.0f);
-		m_Light->SetSpecularColor(1.0f, 1.0f, 1.0f, 1.0f);
-		m_Light->SetSpecularPower(16.0f);
+		m_light_->SetDiffuseColor(1.0f, 1.0f, 1.0f, 1.0f);
+		m_light_->SetDirection(0.0f, 0.0f, -1.0f);
+		m_light_->SetAmbientColor(0.15f, 0.15f, 0.15f, 1.0f);
+		m_light_->SetSpecularColor(1.0f, 1.0f, 1.0f, 1.0f);
+		m_light_->SetSpecularPower(16.0f);
 
 		// Set the number of lights we will use.
-		m_numLights = 4;
+		num_lights_ = 4;
 		// Create and initialize the light objects array.
-		m_Lights.resize(m_numLights);
+		lights_.resize(num_lights_);
 
-		m_Lights[0] = new LightClass;
-		m_Lights[0]->SetDiffuseColor(1.0f, 1.0f, 1.0f, 1.0f);  // White
-		m_Lights[0]->SetDirection(0.0f, 0.0f, -1.0f);
-		m_Lights[0]->SetAmbientColor(0.15f, 0.15f, 0.15f, 1.0f);
-		m_Lights[0]->SetSpecularColor(1.0f, 1.0f, 1.0f, 1.0f);
-		m_Lights[0]->SetSpecularPower(16.0f);
-		m_Lights[0]->SetPosition(10.0f, 7.0f, -5.0f);
+		lights_[0] = new light_class;
+		lights_[0]->SetDiffuseColor(1.0f, 1.0f, 1.0f, 1.0f);  // White
+		lights_[0]->SetDirection(0.0f, 0.0f, -1.0f);
+		lights_[0]->SetAmbientColor(0.15f, 0.15f, 0.15f, 1.0f);
+		lights_[0]->SetSpecularColor(1.0f, 1.0f, 1.0f, 1.0f);
+		lights_[0]->SetSpecularPower(16.0f);
+		lights_[0]->SetPosition(10.0f, 7.0f, -5.0f);
 
-		m_Lights[1] = new LightClass;
-		m_Lights[1]->SetDiffuseColor(1.0f, 0.0f, 0.0f, 1.0f);  // Red
-		m_Lights[1]->SetDirection(0.0f, 0.0f, -1.0f);
-		m_Lights[1]->SetAmbientColor(0.15f, 0.15f, 0.15f, 1.0f);
-		m_Lights[1]->SetSpecularColor(1.0f, 0.0f, 0.0f, 1.0f);
-		m_Lights[1]->SetSpecularPower(16.0f);
-		m_Lights[1]->SetPosition(-10.0f, 7.0f, -5.0f);
+		lights_[1] = new light_class;
+		lights_[1]->SetDiffuseColor(1.0f, 0.0f, 0.0f, 1.0f);  // Red
+		lights_[1]->SetDirection(0.0f, 0.0f, -1.0f);
+		lights_[1]->SetAmbientColor(0.15f, 0.15f, 0.15f, 1.0f);
+		lights_[1]->SetSpecularColor(1.0f, 0.0f, 0.0f, 1.0f);
+		lights_[1]->SetSpecularPower(16.0f);
+		lights_[1]->SetPosition(-10.0f, 7.0f, -5.0f);
 
-		m_Lights[2] = new LightClass;
-		m_Lights[2]->SetDiffuseColor(0.0f, 1.0f, 0.0f, 1.0f);  // Green
-		m_Lights[2]->SetDirection(0.0f, 0.0f, -1.0f);
-		m_Lights[2]->SetAmbientColor(0.15f, 0.15f, 0.15f, 1.0f);
-		m_Lights[2]->SetSpecularColor(0.0f, 1.0f, 0.0f, 1.0f);
-		m_Lights[2]->SetSpecularPower(16.0f);
-		m_Lights[2]->SetPosition(10.0f, 7.0f, 5.0f);
+		lights_[2] = new light_class;
+		lights_[2]->SetDiffuseColor(0.0f, 1.0f, 0.0f, 1.0f);  // Green
+		lights_[2]->SetDirection(0.0f, 0.0f, -1.0f);
+		lights_[2]->SetAmbientColor(0.15f, 0.15f, 0.15f, 1.0f);
+		lights_[2]->SetSpecularColor(0.0f, 1.0f, 0.0f, 1.0f);
+		lights_[2]->SetSpecularPower(16.0f);
+		lights_[2]->SetPosition(10.0f, 7.0f, 5.0f);
 
-		m_Lights[3] = new LightClass;
-		m_Lights[3]->SetDiffuseColor(0.0f, 0.0f, 1.0f, 1.0f);  // Blue
-		m_Lights[3]->SetDirection(0.0f, 0.0f, -1.0f);
-		m_Lights[3]->SetAmbientColor(0.15f, 0.15f, 0.15f, 1.0f);
-		m_Lights[3]->SetSpecularColor(0.0f, 0.0f, 1.0f, 1.0f);
-		m_Lights[3]->SetSpecularPower(16.0f);
-		m_Lights[3]->SetPosition(-10.0f, 7.0f, 5.0f);
+		lights_[3] = new light_class;
+		lights_[3]->SetDiffuseColor(0.0f, 0.0f, 1.0f, 1.0f);  // Blue
+		lights_[3]->SetDirection(0.0f, 0.0f, -1.0f);
+		lights_[3]->SetAmbientColor(0.15f, 0.15f, 0.15f, 1.0f);
+		lights_[3]->SetSpecularColor(0.0f, 0.0f, 1.0f, 1.0f);
+		lights_[3]->SetSpecularPower(16.0f);
+		lights_[3]->SetPosition(-10.0f, 7.0f, 5.0f);
 
 		// ------------------------------------------------------------- //
 		// ----------------------- || THE SUN || ----------------------- //
 		// ------------------------------------------------------------- //
 
-		m_SunLight = new LightClass;
-		m_SunLight->SetDiffuseColor(1.0f, 1.0f, 1.0f, 1.0f);  // White
-		m_SunLight->SetDirection(0.0f, -1.0f, 0.0f);
-		m_SunLight->SetAmbientColor(0.15f, 0.15f, 0.15f, 1.0f);
-		m_SunLight->SetPosition(0.0f, 100.0f, 0.0f);
-		m_SunLight->SetIntensity(1.0f);
+		sun_light_ = new light_class;
+		sun_light_->SetDiffuseColor(1.0f, 1.0f, 1.0f, 1.0f);  // White
+		sun_light_->SetDirection(0.0f, -1.0f, 0.0f);
+		sun_light_->SetAmbientColor(0.15f, 0.15f, 0.15f, 1.0f);
+		sun_light_->SetPosition(0.0f, 100.0f, 0.0f);
+		sun_light_->SetIntensity(1.0f);
 
 		// Create and initialize the normal map shader object.
-		m_ShaderManager = new ShaderManagerClass;
+		shader_manager_ = new shader_manager_class;
 
-		result = m_ShaderManager->Initialize(m_Direct3D->GetDevice(), hwnd);
+		result = shader_manager_->initialize(direct_3d_->get_device(), hwnd);
 		if (!result)
 		{
 			Logger::Get().Log("Could not initialize the shader manager object", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -326,12 +326,12 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		}
 
 		// Set the initial render count string.
-		strcpy_s(renderString, "Render Count: 0");
+		strcpy_s(renderString, "render Count: 0");
 
 		// Create and initialize the text object for the render count string.
-		m_RenderCountString = new TextClass;
+		render_count_string_ = new text_class;
 
-		result = m_RenderCountString->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), screenWidth, screenHeight, 32, m_Font, renderString, 10, 10, 1.0f, 1.0f, 1.0f);
+		result = render_count_string_->Initialize(direct_3d_->get_device(), direct_3d_->get_device_context(), screenWidth, screenHeight, 32, font_, renderString, 10, 10, 1.0f, 1.0f, 1.0f);
 		if (!result)
 		{
 			Logger::Get().Log("Could not initialize the render count string", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -339,10 +339,10 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		}
 
 		// Create and initialize the model list object.
-		m_ModelList = new ModelListClass;
-		m_ModelList->Initialize(25);
+		model_list_ = new ModelListClass;
+		model_list_->Initialize(25);
 
-		// Charger les textures initiales pour m_BathModel
+		// Charger les textures_ initiales pour bath_model_
 		std::vector<std::wstring> bathTextures = {
 			L"assets/Texture/marble01.png"
 		};
@@ -353,7 +353,7 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		for (const auto& textureFilename : bathTextures)
 		{
 			ID3D11ShaderResourceView* texture = nullptr;
-			Hresult = DirectX::CreateWICTextureFromFile(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), textureFilename.c_str(), nullptr, &texture);
+			Hresult = DirectX::CreateWICTextureFromFile(direct_3d_->get_device(), direct_3d_->get_device_context(), textureFilename.c_str(), nullptr, &texture);
 			if (FAILED(Hresult))
 			{
 				Logger::Get().Log("Failed to load texture: " + std::string(textureFilename.begin(), textureFilename.end()), __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -366,9 +366,9 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		strcpy_s(modelFilename, "assets/Model/TXT/bath.txt");
 
 		// Create and initialize the bath model object.
-		m_BathModel = new ModelClass;
+		bath_model_ = new model_class;
 
-		result = m_BathModel->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, BathTextures);
+		result = bath_model_->Initialize(direct_3d_->get_device(), direct_3d_->get_device_context(), modelFilename, BathTextures);
 		if (!result)
 		{
 			MessageBox(hwnd, L"Could not initialize the bath model object.", L"Error", MB_OK);
@@ -388,7 +388,7 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		for (const auto& textureFilename : waterTextures)
 		{
 			ID3D11ShaderResourceView* texture = nullptr;
-			Hresult = DirectX::CreateWICTextureFromFile(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), textureFilename.c_str(), nullptr, &texture);
+			Hresult = DirectX::CreateWICTextureFromFile(direct_3d_->get_device(), direct_3d_->get_device_context(), textureFilename.c_str(), nullptr, &texture);
 			if (FAILED(Hresult))
 			{
 				Logger::Get().Log("Failed to load texture: " + std::string(textureFilename.begin(), textureFilename.end()), __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -398,9 +398,9 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		}
 
 		// Create and initialize the water model object.
-		m_WaterModel = new ModelClass;
+		water_model_ = new model_class;
 
-		result = m_WaterModel->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, WaterTextures);
+		result = water_model_->Initialize(direct_3d_->get_device(), direct_3d_->get_device_context(), modelFilename, WaterTextures);
 		if (!result)
 		{
 			MessageBox(hwnd, L"Could not initialize the water model object.", L"Error", MB_OK);
@@ -408,9 +408,9 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		}
 
 		// Create and initialize the refraction render to texture object.
-		m_RefractionTexture = new RenderTextureClass;
+		refraction_texture_ = new render_texture_class;
 
-		result = m_RefractionTexture->Initialize(m_Direct3D->GetDevice(), screenWidth, screenHeight, SCREEN_DEPTH, SCREEN_NEAR, 1);
+		result = refraction_texture_->Initialize(direct_3d_->get_device(), screenWidth, screenHeight, screen_depth, screen_near, 1);
 		if (!result)
 		{
 			MessageBox(hwnd, L"Could not initialize the refraction render texture object.", L"Error", MB_OK);
@@ -418,9 +418,9 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		}
 
 		// Create and initialize the reflection render to texture object.
-		m_ReflectionTexture = new RenderTextureClass;
+		reflection_texture_ = new render_texture_class;
 
-		result = m_ReflectionTexture->Initialize(m_Direct3D->GetDevice(), screenWidth, screenHeight, SCREEN_DEPTH, SCREEN_NEAR, 1);
+		result = reflection_texture_->Initialize(direct_3d_->get_device(), screenWidth, screenHeight, screen_depth, screen_near, 1);
 		if (!result)
 		{
 			MessageBox(hwnd, L"Could not initialize the reflection render texture object.", L"Error", MB_OK);
@@ -428,15 +428,15 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		}
 
 		// Set the height of the water.
-		m_waterHeight = -9.25f;
+		water_height_ = -9.25f;
 
-		// Initialize the position of the water.
-		m_waterTranslation = 100.0f;
+		// initialize the position of the water.
+		water_translation_ = 100.0f;
 
 		// Create and initialize the timer object.
-		m_Timer = new TimerClass;
+		timer_ = new timer_class;
 
-		result = m_Timer->Initialize();
+		result = timer_->Initialize();
 		if (!result)
 		{
 			Logger::Get().Log("Could not initialize the timer object", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -444,38 +444,38 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 		}
 
 		// Create the position class object.
-		m_Position = new PositionClass;
+		position_ = new position_class;
 
 		// Create and initialize the fps object.
-		m_Fps = new FpsClass();
+		fps_ = new fps_class();
 
-		m_Fps->Initialize();
+		fps_->Initialize();
 
 		// Set the initial fps and fps string.
-		m_previousFps = -1;
+		previous_fps_ = -1;
 		strcpy_s(fpsString, "Fps: 0");
 
 		// Create and initialize the text object for the fps string.
-		m_FpsString = new TextClass;
+		fps_string_ = new text_class;
 
-		result = m_FpsString->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), screenWidth, screenHeight, 32, m_Font, fpsString, 10, 10, 0.0f, 1.0f, 0.0f);
+		result = fps_string_->Initialize(direct_3d_->get_device(), direct_3d_->get_device_context(), screenWidth, screenHeight, 32, font_, fpsString, 10, 10, 0.0f, 1.0f, 0.0f);
 		if (!result)
 		{
 			Logger::Get().Log("Could not initialize the fps string", __FILE__, __LINE__, Logger::LogLevel::Error);
 			return false;
 		}
 
-		m_Physics = new Physics;
+		physics_ = new physics;
 
-		m_PhysicsThread = std::thread(&ApplicationClass::PhysicsThreadFunction, this);
+		physics_thread_ = std::thread(&application_class::physics_thread_function, this);
 
 		//ConstructSkyboxWithPlanes();
 		Skybox* skybox = new Skybox;
-		skybox->Initialize(m_Direct3D);
-		m_Skybox.push_back(skybox->ConstructSkybox());
+		skybox->Initialize(direct_3d_);
+		skybox_.push_back(skybox->ConstructSkybox());
 
-		m_CullingActive = true;
-		m_CullingThread = std::thread(&ApplicationClass::CullingThreadFunction, this);
+		culling_active_ = true;
+		culling_thread_ = std::thread(&application_class::culling_thread_function, this);
 
 	}
 	catch (const std::exception& e)
@@ -490,193 +490,193 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
 	return true;
 }
 
-void ApplicationClass::Shutdown()
+void application_class::shutdown()
 {
 	Logger::Get().Log("Shutting down application class", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	
 	// Release the shader manager object.
-	if (m_ShaderManager)
+	if (shader_manager_)
 	{
 		Logger::Get().Log("Releasing the shader manager object", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
-		m_ShaderManager->Shutdown();
-		delete m_ShaderManager;
-		m_ShaderManager = 0;
+		shader_manager_->shutdown();
+		delete shader_manager_;
+		shader_manager_ = 0;
 
 		Logger::Get().Log("Shader manager object released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	}
 
 	// Release the reflection render texture object.
-	if (m_ReflectionTexture)
+	if (reflection_texture_)
 	{
-		m_ReflectionTexture->Shutdown();
-		delete m_ReflectionTexture;
-		m_ReflectionTexture = 0;
+		reflection_texture_->Shutdown();
+		delete reflection_texture_;
+		reflection_texture_ = 0;
 	}
 
 	// Release the refraction render texture object.
-	if (m_RefractionTexture)
+	if (refraction_texture_)
 	{
-		m_RefractionTexture->Shutdown();
-		delete m_RefractionTexture;
-		m_RefractionTexture = 0;
+		refraction_texture_->Shutdown();
+		delete refraction_texture_;
+		refraction_texture_ = 0;
 	}
 
 	// Release the water model object.
-	if (m_WaterModel)
+	if (water_model_)
 	{
-		m_WaterModel->Shutdown();
-		delete m_WaterModel;
-		m_WaterModel = 0;
+		water_model_->Shutdown();
+		delete water_model_;
+		water_model_ = 0;
 	}
 
 	// Release the bath model object.
-	if (m_BathModel)
+	if (bath_model_)
 	{
-		m_BathModel->Shutdown();
-		delete m_BathModel;
-		m_BathModel = 0;
+		bath_model_->Shutdown();
+		delete bath_model_;
+		bath_model_ = 0;
 	}
 	// Release the physics object.
-	if (m_Physics)
+	if (physics_)
 	{
-		delete m_Physics;
-		m_Physics = 0;
+		delete physics_;
+		physics_ = 0;
 	}
 
 	// Release the display plane object.
-	if (m_DisplayPlane)
+	if (display_plane_)
 	{
 		Logger::Get().Log("Releasing the display plane object", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
-		m_DisplayPlane->Shutdown();
-		delete m_DisplayPlane;
-		m_DisplayPlane = 0;
+		display_plane_->Shutdown();
+		delete display_plane_;
+		display_plane_ = 0;
 
 		Logger::Get().Log("Display plane object released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	}
 
 	// Release the position object.
-	if (m_Position)
+	if (position_)
 	{
 		Logger::Get().Log("Releasing the position object", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
-		delete m_Position;
-		m_Position = 0;
+		delete position_;
+		position_ = 0;
 
 		Logger::Get().Log("Position object released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	}
 
 	// Release the model list object.
-	if (m_ModelList)
+	if (model_list_)
 	{
 		Logger::Get().Log("Releasing the model list object", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
-		m_ModelList->Shutdown();
-		delete m_ModelList;
-		m_ModelList = 0;
+		model_list_->Shutdown();
+		delete model_list_;
+		model_list_ = 0;
 
 		Logger::Get().Log("Model list object released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	}
 
 	// Release the text objects for the render count string.
-	if (m_RenderCountString)
+	if (render_count_string_)
 	{
 		Logger::Get().Log("Releasing the render count string object", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
-		m_RenderCountString->Shutdown();
-		delete m_RenderCountString;
-		m_RenderCountString = 0;
+		render_count_string_->Shutdown();
+		delete render_count_string_;
+		render_count_string_ = 0;
 
-		Logger::Get().Log("Render count string object released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
+		Logger::Get().Log("render count string object released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	}
 
 	// Release the text objects for the mouse strings.
-	if (m_MouseStrings)
+	if (mouse_strings_)
 	{
 		Logger::Get().Log("Releasing the mouse strings", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
-		m_MouseStrings[0].Shutdown();
-		m_MouseStrings[1].Shutdown();
-		m_MouseStrings[2].Shutdown();
+		mouse_strings_[0].Shutdown();
+		mouse_strings_[1].Shutdown();
+		mouse_strings_[2].Shutdown();
 
-		delete[] m_MouseStrings;
-		m_MouseStrings = 0;
+		delete[] mouse_strings_;
+		mouse_strings_ = 0;
 
 		Logger::Get().Log("Mouse strings released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	}
 
 	// Release the text object for the fps string.
-	if (m_FpsString)
+	if (fps_string_)
 	{
 		Logger::Get().Log("Releasing the fps string object", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
-		m_FpsString->Shutdown();
-		delete m_FpsString;
-		m_FpsString = 0;
+		fps_string_->Shutdown();
+		delete fps_string_;
+		fps_string_ = 0;
 
 		Logger::Get().Log("Fps string object released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	}
 
 	// Release the fps object.
-	if (m_Fps)
+	if (fps_)
 	{
 		Logger::Get().Log("Releasing the fps object", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
-		delete m_Fps;
-		m_Fps = 0;
+		delete fps_;
+		fps_ = 0;
 
 		Logger::Get().Log("Fps object released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	}
 
 	// Release the font object.
-	if (m_Font)
+	if (font_)
 	{
 		Logger::Get().Log("Releasing the font object", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
-		m_Font->Shutdown();
-		delete m_Font;
-		m_Font = 0;
+		font_->Shutdown();
+		delete font_;
+		font_ = 0;
 
 		Logger::Get().Log("Font object released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	}
 
 	// Release the font shader object.
-	if (m_FontShader)
+	if (font_shader_)
 	{
 		Logger::Get().Log("Releasing the font shader object", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
-		m_FontShader->Shutdown();
-		delete m_FontShader;
-		m_FontShader = 0;
+		font_shader_->shutdown();
+		delete font_shader_;
+		font_shader_ = 0;
 
 		Logger::Get().Log("Font shader object released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	}
 
 	// Release the timer object.
-	if (m_Timer)
+	if (timer_)
 	{
 		Logger::Get().Log("Releasing the timer object", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
-		delete m_Timer;
-		m_Timer = 0;
+		delete timer_;
+		timer_ = 0;
 
 		Logger::Get().Log("Timer object released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	}
 
 	// Release the sprite object.
-	if (m_Sprite)
+	if (sprite_)
 	{
 		Logger::Get().Log("Releasing the sprite object", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
-		m_Sprite->Shutdown();
-		delete m_Sprite;
-		m_Sprite = 0;
+		sprite_->Shutdown();
+		delete sprite_;
+		sprite_ = 0;
 
 		Logger::Get().Log("Sprite object released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	}
 
-	for (auto light : m_Lights)
+	for (auto light : lights_)
 	{
 		Logger::Get().Log("Releasing the light object", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 		if (light)
@@ -688,39 +688,39 @@ void ApplicationClass::Shutdown()
 	}
 
 	// Release the light object.
-	if (m_Light)
+	if (m_light_)
 	{
 		Logger::Get().Log("Releasing the light object", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
-		delete m_Light;
-		m_Light = 0;
+		delete m_light_;
+		m_light_ = 0;
 		Logger::Get().Log("Light object released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	}
 
 	// Release the model object.
-	if (m_Model)
+	if (model_)
 	{
 		Logger::Get().Log("Releasing the model object", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
-		m_Model->Shutdown();
-		delete m_Model;
-		m_Model = 0;
+		model_->Shutdown();
+		delete model_;
+		model_ = 0;
 		Logger::Get().Log("Model object released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	}
 
-	if (m_SceneTexture)
+	if (scene_texture_)
 	{
-		m_SceneTexture->Shutdown();
-		delete m_SceneTexture;
-		m_SceneTexture = nullptr;
+		scene_texture_->Shutdown();
+		delete scene_texture_;
+		scene_texture_ = nullptr;
 	}
 
 	Logger::Get().Log("Application class shut down", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 }
 
-bool ApplicationClass::Frame(InputClass* Input)
+bool application_class::frame(input_class* Input)
 {
 
-	ProcessTerrainGeneration();
-	ResetDrawCallCount();
+	process_terrain_generation();
+	reset_draw_call_count();
 	
 	int mouseX, mouseY, currentMouseX, currentMouseY;
 	bool result, leftMouseDown, rightMouseDown, buttonQ, buttonD, buttonZ, buttonS, buttonA, buttonE, scrollUp, scrollDown;
@@ -737,16 +737,16 @@ bool ApplicationClass::Frame(InputClass* Input)
 	static float z = 0.0f;
 
 	// Update the system stats.
-	m_Timer->Frame();
+	timer_->Frame();
 
 	// Get the current frame time.
-	frameTime = m_Timer->GetTime();
+	frameTime = timer_->GetTime();
 
 	// Check if the user pressed escape and wants to exit the application.
 	if (Input->IsEscapePressed())
 	{
 		Logger::Get().Log("User pressed escape, exiting application", __FILE__, __LINE__, Logger::LogLevel::Input);
-		m_ShouldQuit = true;
+		should_quit_ = true;
 	}
 
 	// Get the location of the mouse from the input object,
@@ -767,12 +767,12 @@ bool ApplicationClass::Frame(InputClass* Input)
 	lastMouseY = currentMouseY;  // Update the last mouse position for the next frame
 
 	// Set the frame time for calculating the updated position.
-	m_Position->SetFrameTime(m_Timer->GetTime());
+	position_->SetFrameTime(timer_->GetTime());
 
-	m_Position->TurnMouse((float)deltaX, (float)deltaY, 0.1f, rightMouseDown);
+	position_->TurnMouse((float)deltaX, (float)deltaY, 0.1f, rightMouseDown);
 
 	// Get the current view point rotation.
-	m_Position->GetRotation(rotationY, rotationX);
+	position_->GetRotation(rotationY, rotationX);
 
 	scrollUp = Input->IsScrollUp();
 	scrollDown = Input->IsScrollDown();
@@ -784,16 +784,16 @@ bool ApplicationClass::Frame(InputClass* Input)
 	buttonS = Input->IsSPressed();
 	buttonA = Input->IsQPressed();
 	buttonE = Input->IsEPressed();
-	m_Position->MoveCamera(buttonZ, buttonS, buttonQ, buttonD, buttonE, buttonA, scrollUp, scrollDown, rightMouseDown);
-	m_Position->GetPosition(positionX, positionY, positionZ);
+	position_->MoveCamera(buttonZ, buttonS, buttonQ, buttonD, buttonE, buttonA, scrollUp, scrollDown, rightMouseDown);
+	position_->GetPosition(positionX, positionY, positionZ);
 
 	// Set the postion and rotation of the camera.
-	m_Camera->SetPosition(positionX, positionY, positionZ);
-	m_Camera->SetRotation(rotationX, rotationY, 0.0f);
-	m_Camera->Render();
+	camera_->set_position(positionX, positionY, positionZ);
+	camera_->set_rotation(rotationX, rotationY, 0.0f);
+	camera_->render();
 
-	// Render the static graphics scene.
-	result = Render(rotation, x, y, z, textureTranslation);
+	// render the static graphics scene.
+	result = render(rotation, x, y, z, textureTranslation);
 	if (!result)
 	{
 		Logger::Get().Log("Could not render the graphics scene", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -801,7 +801,7 @@ bool ApplicationClass::Frame(InputClass* Input)
 	}
 
 	// Update the frames per second each frame.
-	result = UpdateFps();
+	result = update_fps();
 	if (!result)
 	{
 		Logger::Get().Log("Could not update the frames per second", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -809,40 +809,40 @@ bool ApplicationClass::Frame(InputClass* Input)
 	}
 
 	// Update the rotation variable each frame.
-	rotation -= 0.0174532925f * m_speed;
+	rotation -= 0.0174532925f * speed_;
 	if (rotation < 0.0f)
 	{
 		rotation += 360.0f;
 	}
 
 	// Update the position of the water to simulate motion.
-	m_waterTranslation += 0.001f;
-	if (m_waterTranslation > 1.0f)
+	water_translation_ += 0.001f;
+	if (water_translation_ > 1.0f)
 	{
-		m_waterTranslation -= 1.0f;
+		water_translation_ -= 1.0f;
 	}
 
-	// Render the refraction of the scene to a texture.
-	result = RenderRefractionToTexture();
+	// render the refraction of the scene to a texture.
+	result = render_refraction_to_texture();
 	if (!result)
 	{
 		return false;
 	}
 
-	// Render the reflection of the scene to a texture.
-	result = RenderReflectionToTexture();
+	// render the reflection of the scene to a texture.
+	result = render_reflection_to_texture();
 	if (!result)
 	{
 		return false;
 	}
 
-	m_Inputs.m_KeyLeft = Input->IsLeftArrowPressed();
-	m_Inputs.m_KeyRight = Input->IsRightArrowPressed();
-	m_Inputs.m_KeyUp = Input->IsUpArrowPressed();
-	m_Inputs.m_KeyDown = Input->IsDownArrowPressed();
+	inputs_.key_left = Input->IsLeftArrowPressed();
+	inputs_.key_right = Input->IsRightArrowPressed();
+	inputs_.key_up = Input->IsUpArrowPressed();
+	inputs_.key_down = Input->IsDownArrowPressed();
 
-	// Render the scene to a render texture.
-	result = RenderSceneToTexture(rotation);
+	// render the scene to a render texture.
+	result = render_scene_to_texture(rotation);
 	if (!result)
 	{
 		Logger::Get().Log("Could not render the scene to the render texture", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -850,7 +850,7 @@ bool ApplicationClass::Frame(InputClass* Input)
 	}
 
 	// Update the mouse strings each frame.
-	result = UpdateMouseStrings(mouseX, mouseY, leftMouseDown);
+	result = update_mouse_strings(mouseX, mouseY, leftMouseDown);
 	if (!result)
 	{
 		Logger::Get().Log("Could not update the mouse strings", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -858,7 +858,7 @@ bool ApplicationClass::Frame(InputClass* Input)
 	}
 
 	// Update the sprite object using the frame time.
-	m_Sprite->Update(frameTime);
+	sprite_->Update(frameTime);
 
 	// Increment the texture translation.
 	textureTranslation += 0.01f;
@@ -870,7 +870,7 @@ bool ApplicationClass::Frame(InputClass* Input)
 	return true;
 }
 
-bool ApplicationClass::RenderRefractionToTexture()
+bool application_class::render_refraction_to_texture()
 {
 	XMMATRIX worldMatrix, viewMatrix, projectionMatrix;
 	XMFLOAT4 diffuseColor[4], lightPosition[4], ambientColor[4];
@@ -879,107 +879,107 @@ bool ApplicationClass::RenderRefractionToTexture()
 	bool result;
 
 	// Setup a clipping plane based on the height of the water to clip everything above it.
-	clipPlane = XMFLOAT4(0.0f, -1.0f, 0.0f, m_waterHeight + 0.1f);
+	clipPlane = XMFLOAT4(0.0f, -1.0f, 0.0f, water_height_ + 0.1f);
 
 	// Set the render target to be the refraction render to texture and clear it.
-	m_RefractionTexture->SetRenderTarget(m_Direct3D->GetDeviceContext());
-	m_RefractionTexture->ClearRenderTarget(m_Direct3D->GetDeviceContext(), 0.0f, 0.0f, 0.0f, 1.0f);
+	refraction_texture_->SetRenderTarget(direct_3d_->get_device_context());
+	refraction_texture_->ClearRenderTarget(direct_3d_->get_device_context(), 0.0f, 0.0f, 0.0f, 1.0f);
 
 	// Generate the view matrix based on the camera's position.
-	m_Camera->Render();
-	m_Camera->GetViewMatrix(viewMatrix);
-	projectionMatrix = m_Direct3D->GetProjectionMatrix();
+	camera_->render();
+	camera_->get_view_matrix(viewMatrix);
+	projectionMatrix = direct_3d_->get_projection_matrix();
 
 	// Get the light properties.
-	for (i = 0; i < m_numLights; i++)
+	for (i = 0; i < num_lights_; i++)
 	{
 		// Create the diffuse color array from the four light colors.
-		diffuseColor[i] = m_Lights[i]->GetDiffuseColor();
+		diffuseColor[i] = lights_[i]->GetDiffuseColor();
 
 		// Create the light position array from the four light positions.
-		lightPosition[i] = m_Lights[i]->GetPosition();
+		lightPosition[i] = lights_[i]->GetPosition();
 
 		// Create the light position array from the four light positions.
-		ambientColor[i] = m_Lights[i]->GetAmbientColor();
+		ambientColor[i] = lights_[i]->GetAmbientColor();
 	}
 
 	// Translate to where the bath model will be rendered.
 	worldMatrix = XMMatrixTranslation(0.0f, -10.0f, 0.0f);
 
-	// Render the bath model using the refraction shader.
-	m_BathModel->Render(m_Direct3D->GetDeviceContext());
+	// render the bath model using the refraction shader.
+	bath_model_->Render(direct_3d_->get_device_context());
 
-	result = m_ShaderManager->RenderRefractionShader(m_Direct3D->GetDeviceContext(), m_BathModel->GetIndexCount(), worldMatrix, viewMatrix, projectionMatrix, 
-		m_BathModel->GetTexture(TextureType::Diffuse,0), m_Lights[0]->GetDirection(), ambientColor, diffuseColor, lightPosition, clipPlane);
+	result = shader_manager_->render_refraction_shader(direct_3d_->get_device_context(), bath_model_->GetIndexCount(), worldMatrix, viewMatrix, projectionMatrix, 
+		bath_model_->GetTexture(TextureType::Diffuse,0), lights_[0]->GetDirection(), ambientColor, diffuseColor, lightPosition, clipPlane);
 	if (!result)
 	{
 		return false;
 	}
 
 	// Reset the render target back to the original back buffer and not the render to texture anymore.  And reset the viewport back to the original.
-	m_Direct3D->SetBackBufferRenderTarget();
-	m_Direct3D->ResetViewport();
+	direct_3d_->set_back_buffer_render_target();
+	direct_3d_->reset_viewport();
 
 	return true;
 }
 
-bool ApplicationClass::RenderReflectionToTexture()
+bool application_class::render_reflection_to_texture()
 {
 	XMMATRIX reflectionViewMatrix;
 	
 	// Set the render target to be the reflection render to texture and clear it.
-	m_ReflectionTexture->SetRenderTarget(m_Direct3D->GetDeviceContext());
-	m_ReflectionTexture->ClearRenderTarget(m_Direct3D->GetDeviceContext(), 0.0f, 0.0f, 0.0f, 1.0f);
+	reflection_texture_->SetRenderTarget(direct_3d_->get_device_context());
+	reflection_texture_->ClearRenderTarget(direct_3d_->get_device_context(), 0.0f, 0.0f, 0.0f, 1.0f);
 
 	// Use the camera to render the reflection and create a reflection view matrix.
-	m_Camera->RenderReflection(m_waterHeight);
+	camera_->render_reflection(water_height_);
 
 	// Get the camera reflection view matrix instead of the normal view matrix.
-	m_Camera->GetReflectionViewMatrix(reflectionViewMatrix);
+	camera_->get_reflection_view_matrix(reflectionViewMatrix);
 	
 	// Reset the render target back to the original back buffer and not the render to texture anymore.  And reset the viewport back to the original.
-	m_Direct3D->SetBackBufferRenderTarget();
-	m_Direct3D->ResetViewport();
+	direct_3d_->set_back_buffer_render_target();
+	direct_3d_->reset_viewport();
 
 	return true;
 }
 
-bool ApplicationClass::RenderSceneToTexture(float rotation)
+bool application_class::render_scene_to_texture(float rotation)
 {
 	XMMATRIX worldMatrix, viewMatrix, projectionMatrix;
 	bool result;
 
 	// Set the render target to be the render texture and clear it.
-	m_RenderTexture->SetRenderTarget(m_Direct3D->GetDeviceContext());
-	m_RenderTexture->ClearRenderTarget(m_Direct3D->GetDeviceContext(), 0.0f, 0.5f, 1.0f, 1.0f);
+	render_texture_->SetRenderTarget(direct_3d_->get_device_context());
+	render_texture_->ClearRenderTarget(direct_3d_->get_device_context(), 0.0f, 0.5f, 1.0f, 1.0f);
 
 	// Set the position of the camera for viewing the cube.
-	m_Camera->Render();
+	camera_->render();
 	
-	m_Camera->GetViewMatrix(viewMatrix);
-	m_RenderTexture->GetProjectionMatrix(projectionMatrix);
+	camera_->get_view_matrix(viewMatrix);
+	render_texture_->GetProjectionMatrix(projectionMatrix);
 
 	// Rotate the world matrix by the rotation value so that the cube will spin.
 	worldMatrix = XMMatrixRotationY(rotation);
 
-	// Render the model using the texture shader.
-	m_Model->Render(m_Direct3D->GetDeviceContext());
+	// render the model using the texture shader.
+	model_->Render(direct_3d_->get_device_context());
 
-	result = m_ShaderManager->RenderTextureShader(m_Direct3D->GetDeviceContext(), m_Model->GetIndexCount(), worldMatrix, viewMatrix, projectionMatrix,
-		m_Model->GetTexture(TextureType::Diffuse,0));
+	result = shader_manager_->render_texture_shader(direct_3d_->get_device_context(), model_->GetIndexCount(), worldMatrix, viewMatrix, projectionMatrix,
+		model_->GetTexture(TextureType::Diffuse,0));
 	if (!result)
 	{
 		return false;
 	}
 
 	// Reset the render target back to the original back buffer and not the render to texture anymore.  And reset the viewport back to the original.
-	m_Direct3D->SetBackBufferRenderTarget();
-	m_Direct3D->ResetViewport();
+	direct_3d_->set_back_buffer_render_target();
+	direct_3d_->reset_viewport();
 
 	return true;
 }
 
-bool ApplicationClass::Render(float rotation, float x, float y, float z, float textureTranslation)
+bool application_class::render(float rotation, float x, float y, float z, float textureTranslation)
 {
 	XMMATRIX worldMatrix, viewMatrix, orthoMatrix, projectionMatrix, rotateMatrix, translateMatrix, scaleMatrix, srMatrix, reflectionMatrix;
 	XMFLOAT4 diffuseColor[4], lightPosition[4], ambientColor[4];
@@ -991,48 +991,48 @@ bool ApplicationClass::Render(float rotation, float x, float y, float z, float t
 	blendAmount = 0.1f;
 
 	// Generate the view matrix based on the camera's position.
-	m_Camera->Render();
+	camera_->render();
 
 	// Get the world, view, and projection matrices from the camera and d3d objects.
-	worldMatrix = m_Direct3D->GetWorldMatrix();
-	m_Camera->GetViewMatrix(viewMatrix);
-	projectionMatrix = m_Direct3D->GetProjectionMatrix();
-	orthoMatrix = m_Direct3D->GetOrthoMatrix();
+	worldMatrix = direct_3d_->get_world_matrix();
+	camera_->get_view_matrix(viewMatrix);
+	projectionMatrix = direct_3d_->get_projection_matrix();
+	orthoMatrix = direct_3d_->get_ortho_matrix();
 
-	//Render Sky box
+	//render Sky box
 	//RenderSkybox(viewMatrix, projectionMatrix);
 
 	// Get the light properties.
-	for (i = 0; i < m_numLights; i++)
+	for (i = 0; i < num_lights_; i++)
 	{
 		// Create the diffuse color array from the four light colors.
-		diffuseColor[i] = m_Lights[i]->GetDiffuseColor();
+		diffuseColor[i] = lights_[i]->GetDiffuseColor();
 
 		// Create the light position array from the four light positions.
-		lightPosition[i] = m_Lights[i]->GetPosition();
+		lightPosition[i] = lights_[i]->GetPosition();
 
 		// Create the light position array from the four light positions.
-		ambientColor[i] = m_Lights[i]->GetPosition();
+		ambientColor[i] = lights_[i]->GetPosition();
 	}
 
 	// Redimensionner la texture de rendu si nécessaire
 	if (DEBUG_MODE)
 	{
-		if ((float)m_SceneTexture->GetTextureWidth() != windowSize.x || (float)m_SceneTexture->GetTextureHeight() != windowSize.y)
+		if ((float)scene_texture_->GetTextureWidth() != window_size_.x || (float)scene_texture_->GetTextureHeight() != window_size_.y)
 		{
-			m_SceneTexture->Shutdown();
-			m_SceneTexture->Initialize(m_Direct3D->GetDevice(), (int)windowSize.x, (int)windowSize.y, SCREEN_DEPTH, SCREEN_NEAR, 1);
+			scene_texture_->Shutdown();
+			scene_texture_->Initialize(direct_3d_->get_device(), (int)window_size_.x, (int)window_size_.y, screen_depth, screen_near, 1);
 		}
 	
-		m_Direct3D->SetBackBufferRenderTarget();
-		m_Direct3D->ResetViewport();
+		direct_3d_->set_back_buffer_render_target();
+		direct_3d_->reset_viewport();
 	}
 
 	/// CPT ALED C'EST ICI QUE CA SE PASSE ///
 
 	
-	//m_SceneTexture->SetRenderTarget(m_Direct3D->GetDeviceContext());
-	//m_SceneTexture->ClearRenderTarget(m_Direct3D->GetDeviceContext(), 0.0f, 0.0f, 0.0f, 0.0f);
+	//scene_texture_->SetRenderTarget(direct_3d_->get_device_context());
+	//scene_texture_->ClearRenderTarget(direct_3d_->get_device_context(), 0.0f, 0.0f, 0.0f, 0.0f);
 
 	scaleMatrix = XMMatrixScaling(0.5f, 0.5f, 0.5f);  // Build the scaling matrix.
 	rotateMatrix = XMMatrixRotationY(rotation);  // Build the rotation matrix.
@@ -1043,20 +1043,20 @@ bool ApplicationClass::Render(float rotation, float x, float y, float z, float t
 	worldMatrix = XMMatrixMultiply(srMatrix, translateMatrix);
 
 	// Put the model vertex and index buffers on the graphics pipeline to prepare them for drawing.
-	m_Model->Render(m_Direct3D->GetDeviceContext());
+	model_->Render(direct_3d_->get_device_context());
 
-	// Render the model using the light shader.
-	result = m_ShaderManager->RenderlightShader(m_Direct3D->GetDeviceContext(), m_Model->GetIndexCount(), worldMatrix, viewMatrix, projectionMatrix, m_Model->GetTexture(TextureType::Diffuse,0),
+	// render the model using the light shader.
+	result = shader_manager_->renderlight_shader(direct_3d_->get_device_context(), model_->GetIndexCount(), worldMatrix, viewMatrix, projectionMatrix, model_->GetTexture(TextureType::Diffuse,0),
 		diffuseColor, lightPosition, ambientColor);
 
-	UpdateSkyboxPosition(); // Update the position of the skybox to match the camera position.
+	update_skybox_position(); // Update the position of the skybox to match the camera position.
 	
-	m_Direct3D->TurnZBufferOn(); // Enable the Z buffer after rendering the skybox.
+	direct_3d_->turn_z_buffer_on(); // Enable the Z buffer after rendering the skybox.
 
 	// -------------------------------------------------------- //
-	// ------------ Render the object in the queue ------------ //
+	// ------------ render the object in the queue ------------ //
 	// -------------------------------------------------------- //
-	result = RenderPass(m_RenderQueues, diffuseColor, lightPosition, ambientColor, viewMatrix, projectionMatrix);
+	result = render_pass(render_queues_, diffuseColor, lightPosition, ambientColor, viewMatrix, projectionMatrix);
 	if (!result)
 	{
 		Logger::Get().Log("Could not render the model using any shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -1065,7 +1065,7 @@ bool ApplicationClass::Render(float rotation, float x, float y, float z, float t
 
 	
 	// Update the render count text.
-	result = UpdateRenderCountString(GetRenderCount());
+	result = update_render_count_string(get_render_count());
 	if (!result)
 	{
 		Logger::Get().Log("Could not update the render count string", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -1077,73 +1077,73 @@ bool ApplicationClass::Render(float rotation, float x, float y, float z, float t
 	worldMatrix = XMMatrixTranslation(0.0f, -10.0f, 0.0f);
 
 	// Put the bath model vertex and index buffers on the graphics pipeline to prepare them for drawing.
-	m_BathModel->Render(m_Direct3D->GetDeviceContext());
+	bath_model_->Render(direct_3d_->get_device_context());
 
-	// Render the bath model using the light shader.
-	result = m_ShaderManager->RenderlightShader(m_Direct3D->GetDeviceContext(), m_BathModel->GetIndexCount(), worldMatrix, viewMatrix, projectionMatrix,
-		m_BathModel->GetTexture(TextureType::Diffuse,0), diffuseColor, lightPosition, ambientColor);
+	// render the bath model using the light shader.
+	result = shader_manager_->renderlight_shader(direct_3d_->get_device_context(), bath_model_->GetIndexCount(), worldMatrix, viewMatrix, projectionMatrix,
+		bath_model_->GetTexture(TextureType::Diffuse,0), diffuseColor, lightPosition, ambientColor);
 	if (!result)
 	{
 		return false;
 	}
 
 	// Reset the world matrix.
-	worldMatrix = m_Direct3D->GetWorldMatrix();
+	worldMatrix = direct_3d_->get_world_matrix();
 
 	// Get the camera reflection view matrix.
-	m_Camera->GetReflectionViewMatrix(reflectionMatrix);
+	camera_->get_reflection_view_matrix(reflectionMatrix);
 
 	// Translate to where the water model will be rendered.
-	worldMatrix = XMMatrixTranslation(0.0f, m_waterHeight, 0.0f);
+	worldMatrix = XMMatrixTranslation(0.0f, water_height_, 0.0f);
 
 	// Put the water model vertex and index buffers on the graphics pipeline to prepare them for drawing.
-	m_WaterModel->Render(m_Direct3D->GetDeviceContext());
+	water_model_->Render(direct_3d_->get_device_context());
 
-	// Render the water model using the water shader.
-	result = m_ShaderManager->RenderWaterShader(m_Direct3D->GetDeviceContext(), m_WaterModel->GetIndexCount(), worldMatrix, viewMatrix, projectionMatrix, reflectionMatrix,
-		m_ReflectionTexture->GetShaderResourceView(), m_RefractionTexture->GetShaderResourceView(), m_WaterModel->GetTexture(TextureType::Diffuse,0),
-		m_waterTranslation, 0.01f);
+	// render the water model using the water shader.
+	result = shader_manager_->render_water_shader(direct_3d_->get_device_context(), water_model_->GetIndexCount(), worldMatrix, viewMatrix, projectionMatrix, reflectionMatrix,
+		reflection_texture_->GetShaderResourceView(), refraction_texture_->GetShaderResourceView(), water_model_->GetTexture(TextureType::Diffuse,0),
+		water_translation_, 0.01f);
 	if (!result)
 	{
 		return false;
 	}
 
 	// Disable the Z buffer and enable alpha blending for 2D rendering.
-	m_Direct3D->TurnZBufferOff();
-	m_Direct3D->EnableAlphaBlending();
+	direct_3d_->turn_z_buffer_off();
+	direct_3d_->enable_alpha_blending();
 
 	// Reset the world matrix.
-	worldMatrix = m_Direct3D->GetWorldMatrix();
+	worldMatrix = direct_3d_->get_world_matrix();
 
-	// Render the render count text string using the font shader.
-	m_RenderCountString->Render(m_Direct3D->GetDeviceContext());
+	// render the render count text string using the font shader.
+	render_count_string_->Render(direct_3d_->get_device_context());
 
-	result = m_FontShader->Render(m_Direct3D->GetDeviceContext(), m_RenderCountString->GetIndexCount(), worldMatrix, m_baseViewMatrix, orthoMatrix,
-		m_Font->GetTexture(), m_RenderCountString->GetPixelColor());
+	result = font_shader_->render(direct_3d_->get_device_context(), render_count_string_->GetIndexCount(), worldMatrix, base_view_matrix_, orthoMatrix,
+		font_->GetTexture(), render_count_string_->GetPixelColor());
 	if (!result)
 	{
 		Logger::Get().Log("Could not render the render count text string using the font shader", __FILE__, __LINE__, Logger::LogLevel::Error);
 		return false;
 	}
 
-	// Render the fps text string using the font shader.
-	m_FpsString->Render(m_Direct3D->GetDeviceContext());
+	// render the fps text string using the font shader.
+	fps_string_->Render(direct_3d_->get_device_context());
 
-	result = m_FontShader->Render(m_Direct3D->GetDeviceContext(), m_FpsString->GetIndexCount(), worldMatrix, m_baseViewMatrix, orthoMatrix,
-		m_Font->GetTexture(), m_FpsString->GetPixelColor());
+	result = font_shader_->render(direct_3d_->get_device_context(), fps_string_->GetIndexCount(), worldMatrix, base_view_matrix_, orthoMatrix,
+		font_->GetTexture(), fps_string_->GetPixelColor());
 	if (!result)
 	{
 		Logger::Get().Log("Could not render the fps text string using the font shader", __FILE__, __LINE__, Logger::LogLevel::Error);
 		return false;
 	}
 
-	// Render the mouse text strings using the font shader.
+	// render the mouse text strings using the font shader.
 	for (i = 0; i < 3; i++)
 	{
-		m_MouseStrings[i].Render(m_Direct3D->GetDeviceContext());
+		mouse_strings_[i].Render(direct_3d_->get_device_context());
 
-		result = m_FontShader->Render(m_Direct3D->GetDeviceContext(), m_MouseStrings[i].GetIndexCount(), worldMatrix, m_baseViewMatrix, orthoMatrix,
-			m_Font->GetTexture(), m_MouseStrings[i].GetPixelColor());
+		result = font_shader_->render(direct_3d_->get_device_context(), mouse_strings_[i].GetIndexCount(), worldMatrix, base_view_matrix_, orthoMatrix,
+			font_->GetTexture(), mouse_strings_[i].GetPixelColor());
 		if (!result)
 		{
 			Logger::Get().Log("Could not render the mouse text strings using the font shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -1152,15 +1152,15 @@ bool ApplicationClass::Render(float rotation, float x, float y, float z, float t
 	}
 
 	// Put the sprite vertex and index buffers on the graphics pipeline to prepare them for drawing.
-	result = m_Sprite->Render(m_Direct3D->GetDeviceContext());
+	result = sprite_->Render(direct_3d_->get_device_context());
 	if (!result)
 	{
 		return false;
 	}
 
-	// Render the sprite with the texture shader.
-	result = m_ShaderManager->RenderTextureShader(m_Direct3D->GetDeviceContext(), m_Model->GetIndexCount(), worldMatrix, viewMatrix, orthoMatrix,
-		m_Sprite->GetTexture());
+	// render the sprite with the texture shader.
+	result = shader_manager_->render_texture_shader(direct_3d_->get_device_context(), model_->GetIndexCount(), worldMatrix, viewMatrix, orthoMatrix,
+		sprite_->GetTexture());
 	if (!result)
 	{
 		Logger::Get().Log("Could not render the sprite using the texture shader", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -1168,47 +1168,47 @@ bool ApplicationClass::Render(float rotation, float x, float y, float z, float t
 	}
 
 	// Turn off alpha blending after rendering the 2D text.
-	m_Direct3D->DisableAlphaBlending();
+	direct_3d_->disable_alpha_blending();
 
 	// turn on the Z buffer
-	m_Direct3D->TurnZBufferOn();
+	direct_3d_->turn_z_buffer_on();
 	
 	// Get the light properties.
-	for (i = 0; i < m_numLights; i++)
+	for (i = 0; i < num_lights_; i++)
 	{
 		// Create the diffuse color array from the four light colors.
-		diffuseColor[i] = m_Lights[i]->GetDiffuseColor();
+		diffuseColor[i] = lights_[i]->GetDiffuseColor();
 	
 		// Create the light position array from the four light positions.
-		lightPosition[i] = m_Lights[i]->GetPosition();
+		lightPosition[i] = lights_[i]->GetPosition();
 	}
 	// Réinitialiser la cible de rendu au back buffer.
-	m_Direct3D->SetBackBufferRenderTarget();
+	direct_3d_->set_back_buffer_render_target();
 	
 	return true;
 }
 
-D3DClass* ApplicationClass::GetDirect3D()
+d_3d_class* application_class::get_direct_3d()
 {
-	return m_Direct3D;
+	return direct_3d_;
 }
 
-int ApplicationClass::GetScreenWidth() const
+int application_class::get_screen_width() const
 {
 	return GetSystemMetrics(SM_CXSCREEN);
 }
 
-int ApplicationClass::GetScreenHeight() const
+int application_class::get_screen_height() const
 {
 	return GetSystemMetrics(SM_CYSCREEN);
 }
 
-void ApplicationClass::GenerateTerrain()
+void application_class::generate_terrain()
 {
     Logger::Get().Log("Génération du terrain avec instanciation", __FILE__, __LINE__, Logger::LogLevel::Info);
 
     // Nettoyer les objets terrain existants pour éviter les fuites
-    for (auto* chunk : m_terrainChunk)
+    for (auto* chunk : terrain_chunk_)
     {
         if (chunk)
         {
@@ -1216,7 +1216,7 @@ void ApplicationClass::GenerateTerrain()
             delete chunk;
         }
     }
-    m_terrainChunk.clear();
+    terrain_chunk_.clear();
 
     // Dimensions du terrain
     float scaleX = 10.0f;
@@ -1225,15 +1225,15 @@ void ApplicationClass::GenerateTerrain()
     int gridSizeX = 20;
     int gridSizeZ = 20;
 
-    // Créer un conteneur de textures partagé
+    // Créer un conteneur de textures_ partagé
     TextureContainer textureContainer;
     textureContainer.diffusePaths.push_back(L"assets/Texture/Bricks2K.png");
     textureContainer.normalPaths.push_back(L"assets/Texture/BricksNRM2K.png");
     textureContainer.specularPaths.push_back(L"assets/Texture/BricksGLOSS2K.png");
 
-    // Précharger les textures une seule fois
-    ModelClass* sharedModel = new ModelClass();
-    sharedModel->PreloadTextures(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), textureContainer);
+    // Précharger les textures_ une seule fois
+    model_class* sharedModel = new model_class();
+    sharedModel->PreloadTextures(direct_3d_->get_device(), direct_3d_->get_device_context(), textureContainer);
 
     char modelFilename[128];
     strcpy_s(modelFilename, "assets/Model/OBJ/plane.obj");
@@ -1244,10 +1244,10 @@ void ApplicationClass::GenerateTerrain()
         for (int j = 0; j < gridSizeZ; j++)
         {
             // Créer un nouvel objet de terrain
-            Object* terrain = new Object();
+            object* terrain = new object();
 
-            // Initialiser avec le modèle et les textures préchargées
-            if (!terrain->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, textureContainer))
+            // Initialiser avec le modèle et les textures_ préchargées
+            if (!terrain->Initialize(direct_3d_->get_device(), direct_3d_->get_device_context(), modelFilename, textureContainer))
             {
                 Logger::Get().Log("Échec de l'initialisation d'une tuile de terrain", __FILE__, __LINE__, Logger::LogLevel::Error);
                 delete terrain;
@@ -1265,17 +1265,17 @@ void ApplicationClass::GenerateTerrain()
             terrain->SetName("TerrainTile_" + std::to_string(i) + "_" + std::to_string(j));
             terrain->SetType(ObjectType::Cube);
             terrain->SetActiveShader(ShaderType::SUNLIGHT);
-            terrain->SetId(m_ObjectId++);
+            terrain->SetId(object_id_++);
 
             // Ajouter à la liste des chunks de terrain
-            m_terrainChunk.push_back(terrain);
+            terrain_chunk_.push_back(terrain);
         }
     }
 
-    Logger::Get().Log("Terrain généré avec " + std::to_string(m_terrainChunk.size()) + " tuiles", __FILE__, __LINE__, Logger::LogLevel::Info);
+    Logger::Get().Log("Terrain généré avec " + std::to_string(terrain_chunk_.size()) + " tuiles", __FILE__, __LINE__, Logger::LogLevel::Info);
 }
 
-void ApplicationClass::AddKobject(std::wstring& filepath)
+void application_class::add_kobject(std::wstring& filepath)
 {
 	Logger::Get().Log("Adding object", __FILE__, __LINE__);
 
@@ -1288,7 +1288,7 @@ void ApplicationClass::AddKobject(std::wstring& filepath)
 	size_t convertedChars = 0;
 	(void)wcstombs_s(&convertedChars, modelFilename, sizeof(modelFilename), filepath.c_str(), _TRUNCATE);
 
-	filesystem::current_path(m_WFolder);
+	filesystem::current_path(w_folder_);
 	
 	// Liste des fichiers de texture
 	std::vector<std::wstring> kobjTexture = {
@@ -1297,27 +1297,27 @@ void ApplicationClass::AddKobject(std::wstring& filepath)
 		L"assets/Texture/BricksGLOSS2K.png"
 	};
 
-	Object* newObject = new Object();
-	newObject->LoadTexturesFromPath(kobjTexture,KobjectsTextures, m_Direct3D); // Load textures from the path
-	newObject->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, KobjectsTextures);
+	object* newObject = new object();
+	newObject->LoadTexturesFromPath(kobjTexture,KobjectsTextures, direct_3d_); // Load textures_ from the path
+	newObject->Initialize(direct_3d_->get_device(), direct_3d_->get_device_context(), modelFilename, KobjectsTextures);
 	newObject->SetMass(1.0f);
 	newObject->SetTranslateMatrix(XMMatrixTranslation(0.0f, 50.0f, 0.0f));
 	newObject->SetName(filename);
-	newObject->SetId(m_ObjectId);
+	newObject->SetId(object_id_);
 	newObject->SetModelPath(filepath); // Store the path as std::wstring
 
-	m_ObjectId++;
+	object_id_++;
 
-	m_object.push_back(newObject);
+	object_.push_back(newObject);
 
-	// Vérifiez que l'objet a bien reçu les textures
+	// Vérifiez que l'objet a bien reçu les textures_
 	if (newObject->GetTexture(TextureType::Diffuse,0) == nullptr)
 	{
-		Logger::Get().Log("Object texture is null after initialization", __FILE__, __LINE__, Logger::LogLevel::Error);
+		Logger::Get().Log("object texture is null after initialization", __FILE__, __LINE__, Logger::LogLevel::Error);
 	}
 }
 
-void ApplicationClass::AddCube()
+void application_class::add_cube()
 {
 	Logger::Get().Log("Adding cube", __FILE__, __LINE__);
 
@@ -1333,40 +1333,40 @@ void ApplicationClass::AddCube()
 
 	static int cubeCount = 0;
 	float position = cubeCount * 2.0f;
-	Object* newCube = new Object();
-	newCube->LoadTexturesFromPath(cubeTexture, CubeTexture, m_Direct3D); // Load textures from the path
-	newCube->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, CubeTexture);
+	object* newCube = new object();
+	newCube->LoadTexturesFromPath(cubeTexture, CubeTexture, direct_3d_); // Load textures_ from the path
+	newCube->Initialize(direct_3d_->get_device(), direct_3d_->get_device_context(), modelFilename, CubeTexture);
 	newCube->SetTranslateMatrix(XMMatrixTranslation(position, 0.0f, 0.0f));
 
-	m_cubes.push_back(newCube);
+	cubes_.push_back(newCube);
 
 }
 
-void ApplicationClass::DeleteKobject(int index)
+void application_class::delete_kobject(int index)
 {
 	Logger::Get().Log("Deleting object", __FILE__, __LINE__);
 
-	if (index < m_object.size())
+	if (index < object_.size())
 	{
-		m_object[index]->Shutdown();
-		delete m_object[index];
-		m_object.erase(m_object.begin() + index);
+		object_[index]->Shutdown();
+		delete object_[index];
+		object_.erase(object_.begin() + index);
 	}
 }
 
-void ApplicationClass::DeleteTerrain()
+void application_class::delete_terrain()
 {
 	Logger::Get().Log("Deleting terrain", __FILE__, __LINE__);
 
-	for (auto cube : m_terrainChunk)
+	for (auto cube : terrain_chunk_)
 	{
 		cube->Shutdown();
 		delete cube;
 	}
-	m_terrainChunk.clear();
+	terrain_chunk_.clear();
 }
 
-bool ApplicationClass::UpdateMouseStrings(int mouseX, int mouseY, bool mouseDown)
+bool application_class::update_mouse_strings(int mouseX, int mouseY, bool mouseDown)
 {
 	char tempString[16], finalString[32];
 	bool result;
@@ -1380,7 +1380,7 @@ bool ApplicationClass::UpdateMouseStrings(int mouseX, int mouseY, bool mouseDown
 	strcat_s(finalString, tempString);
 
 	// Update the sentence vertex buffer with the new string information.
-	result = m_MouseStrings[0].UpdateText(m_Direct3D->GetDeviceContext(), m_Font, finalString, 10, 50, 1.0f, 1.0f, 1.0f);
+	result = mouse_strings_[0].UpdateText(direct_3d_->get_device_context(), font_, finalString, 10, 50, 1.0f, 1.0f, 1.0f);
 	if (!result)
 	{
 		Logger::Get().Log("Could not update the mouse X string", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -1395,7 +1395,7 @@ bool ApplicationClass::UpdateMouseStrings(int mouseX, int mouseY, bool mouseDown
 	strcat_s(finalString, tempString);
 
 	// Update the sentence vertex buffer with the new string information.
-	result = m_MouseStrings[1].UpdateText(m_Direct3D->GetDeviceContext(), m_Font, finalString, 10, 75, 1.0f, 1.0f, 1.0f);
+	result = mouse_strings_[1].UpdateText(direct_3d_->get_device_context(), font_, finalString, 10, 75, 1.0f, 1.0f, 1.0f);
 	if (!result)
 	{
 		Logger::Get().Log("Could not update the mouse Y string", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -1413,7 +1413,7 @@ bool ApplicationClass::UpdateMouseStrings(int mouseX, int mouseY, bool mouseDown
 	}
 
 	// Update the sentence vertex buffer with the new string information.
-	result = m_MouseStrings[2].UpdateText(m_Direct3D->GetDeviceContext(), m_Font, finalString, 10, 100, 1.0f, 1.0f, 1.0f);
+	result = mouse_strings_[2].UpdateText(direct_3d_->get_device_context(), font_, finalString, 10, 100, 1.0f, 1.0f, 1.0f);
 
 	if (!result)
 	{
@@ -1424,7 +1424,7 @@ bool ApplicationClass::UpdateMouseStrings(int mouseX, int mouseY, bool mouseDown
 	return true;
 }
 
-bool ApplicationClass::UpdateFps()
+bool application_class::update_fps()
 {
 	int fps;
 	char tempString[16], finalString[16];
@@ -1433,19 +1433,19 @@ bool ApplicationClass::UpdateFps()
 
 
 	// Update the fps each frame.
-	m_Fps->Frame();
+	fps_->Frame();
 
 	// Get the current fps.
-	fps = m_Fps->GetFps();
+	fps = fps_->GetFps();
 
 	// Check if the fps from the previous frame was the same, if so don't need to update the text string.
-	if (m_previousFps == fps)
+	if (previous_fps_ == fps)
 	{
 		return true;
 	}
 
 	// Store the fps for checking next frame.
-	m_previousFps = fps;
+	previous_fps_ = fps;
 
 	// Truncate the fps to below 100,000.
 	if (fps > 99999)
@@ -1485,7 +1485,7 @@ bool ApplicationClass::UpdateFps()
 	}
 
 	// Update the sentence vertex buffer with the new string information.
-	result = m_FpsString->UpdateText(m_Direct3D->GetDeviceContext(), m_Font, finalString, 10, 10, red, green, blue);
+	result = fps_string_->UpdateText(direct_3d_->get_device_context(), font_, finalString, 10, 10, red, green, blue);
 	if (!result)
 	{
 		Logger::Get().Log("Could not update the fps string", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -1495,7 +1495,7 @@ bool ApplicationClass::UpdateFps()
 	return true;
 }
 
-bool ApplicationClass::UpdateRenderCountString(int renderCount)
+bool application_class::update_render_count_string(int renderCount)
 {
 	char tempString[16], finalString[32];
 	bool result;
@@ -1505,11 +1505,11 @@ bool ApplicationClass::UpdateRenderCountString(int renderCount)
 	sprintf_s(tempString, "%d", renderCount);
 
 	// Setup the render count string.
-	strcpy_s(finalString, "Render Count: ");
+	strcpy_s(finalString, "render Count: ");
 	strcat_s(finalString, tempString);
 
 	// Update the sentence vertex buffer with the new string information.
-	result = m_RenderCountString->UpdateText(m_Direct3D->GetDeviceContext(), m_Font, finalString, 10, 30, 1.0f, 1.0f, 1.0f);
+	result = render_count_string_->UpdateText(direct_3d_->get_device_context(), font_, finalString, 10, 30, 1.0f, 1.0f, 1.0f);
 	if (!result)
 	{
 		Logger::Get().Log("Could not update the render count string", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -1519,102 +1519,102 @@ bool ApplicationClass::UpdateRenderCountString(int renderCount)
 	return true;
 }
 
-XMVECTOR ApplicationClass::GetLightColor(int index)
+XMVECTOR application_class::get_light_color(int index)
 {
 	//convert to XMVECTOR
-	XMVECTOR lightColor = XMVectorSet(m_Lights[index]->GetDiffuseColor().x, m_Lights[index]->GetDiffuseColor().y, m_Lights[index]->GetDiffuseColor().z, 1.0f);
+	XMVECTOR lightColor = XMVectorSet(lights_[index]->GetDiffuseColor().x, lights_[index]->GetDiffuseColor().y, lights_[index]->GetDiffuseColor().z, 1.0f);
 
 	return lightColor;
 }
 
-XMVECTOR ApplicationClass::GetLightPosition(int index)
+XMVECTOR application_class::get_light_position(int index)
 {
 	//convert to XMVECTOR
-	XMVECTOR lightPosition = XMVectorSet(m_Lights[index]->GetPosition().x, m_Lights[index]->GetPosition().y, m_Lights[index]->GetPosition().z, 1.0f);
+	XMVECTOR lightPosition = XMVectorSet(lights_[index]->GetPosition().x, lights_[index]->GetPosition().y, lights_[index]->GetPosition().z, 1.0f);
 
 	return lightPosition;
 }
 
-void ApplicationClass::SetLightColor(int index, XMVECTOR color)
+void application_class::set_light_color(int index, XMVECTOR color)
 {
 	//convert to XMFLOAT4
 	XMFLOAT4 lightColor;
 	XMStoreFloat4(&lightColor, color);
 
 	//set the color
-	m_Lights[index]->SetDiffuseColor(lightColor.x, lightColor.y, lightColor.z, 1.0f);
+	lights_[index]->SetDiffuseColor(lightColor.x, lightColor.y, lightColor.z, 1.0f);
 }
 
-void ApplicationClass::SetLightPosition(int index, XMVECTOR position)
+void application_class::set_light_position(int index, XMVECTOR position)
 {
 	//convert to XMFLOAT4
 	XMFLOAT4 lightPosition;
 	XMStoreFloat4(&lightPosition, position);
 
 	//set the position
-	m_Lights[index]->SetPosition(lightPosition.x, lightPosition.y, lightPosition.z);
+	lights_[index]->SetPosition(lightPosition.x, lightPosition.y, lightPosition.z);
 }
 
-void ApplicationClass::SetVsync(bool vsync)
+void application_class::set_vsync(bool vsync)
 {
-	VSYNC_ENABLED = vsync;
+	vsync_enabled_ = vsync;
 
-	if (m_Direct3D)
+	if (direct_3d_)
 	{
-		Logger::Get().Log("Setting Vsync to " + std::to_string(vsync) + " with a screen width : " + std::to_string(GetScreenWidth()) + "and a screen height : " + std::to_string(GetScreenHeight()), __FILE__, __LINE__);
-		m_Direct3D->SetVsync(vsync);
+		Logger::Get().Log("Setting Vsync to " + std::to_string(vsync) + " with a screen width : " + std::to_string(get_screen_width()) + "and a screen height : " + std::to_string(get_screen_height()), __FILE__, __LINE__);
+		direct_3d_->set_vsync(vsync);
 	}
 }
 
-HWND ApplicationClass::GetHwnd() const
+HWND application_class::get_hwnd() const
 {
-	return m_hwnd;
+	return hwnd_;
 }
 
-void ApplicationClass::SetHwnd(HWND hwnd)
+void application_class::set_hwnd(HWND hwnd)
 {
-	m_hwnd = hwnd;
+	hwnd_ = hwnd;
 }
 
-bool ApplicationClass::IsWindowed() const
+bool application_class::is_windowed() const
 {
-	return m_windowed;
+	return windowed_;
 }
 
-void ApplicationClass::SetWindowed(bool windowed)
+void application_class::set_windowed(bool windowed)
 {
 	// log the new windowed mode
 	Logger::Get().Log("Setting windowed mode to " + std::to_string(windowed), __FILE__, __LINE__);
-	m_windowed = windowed;
+	windowed_ = windowed;
 }
 
-void ApplicationClass::SetScreenHeight(int height)
+void application_class::set_screen_height(int height)
 {
 	// log the new screen height
 	Logger::Get().Log("Setting screen height to " + std::to_string(height), __FILE__, __LINE__);
-	m_screenHeight = height;
+	screen_height_ = height;
 }
 
-void ApplicationClass::SetScreenWidth(int width)
+void application_class::set_screen_width(int width)
 {
 	// log the new screen width
 	Logger::Get().Log("Setting screen width to " + std::to_string(width), __FILE__, __LINE__);
-	m_screenWidth = width;
+	screen_width_ = width;
 }
 
-void ApplicationClass::CullingThreadFunction()
+void application_class::culling_thread_function()
 {
     Logger::Get().Log("Thread de culling démarré", __FILE__, __LINE__, Logger::LogLevel::Info);
 
-    while (m_CullingActive)
+    while (culling_active_)
     {
         // Construction du frustum une fois par cycle de culling
-        ConstructFrustum();
+        construct_frustum();
 
         // S'assurer que la skybox est toujours visible
         {
-            std::lock_guard<std::mutex> lock(m_ObjectsMutex);
-            for (auto* skyboxObject : m_Skybox)
+            std::lock_guard<std::mutex> lock(objects_mutex_);
+            for (auto* skyboxObject : skybox_)
             {
                 if (skyboxObject)
                 {
@@ -1624,15 +1624,15 @@ void ApplicationClass::CullingThreadFunction()
         }
 
         // Traitement des files d'objets normaux (sans la skybox)
-        std::vector<std::reference_wrapper<std::vector<Object*>>> queues = {
-            std::ref(m_object), std::ref(m_cubes), std::ref(m_terrainChunk)
+        std::vector<std::reference_wrapper<std::vector<object*>>> queues = {
+            std::ref(object_), std::ref(cubes_), std::ref(terrain_chunk_)
         };
 
         for (auto& queueRef : queues)
         {
-            std::vector<Object*>& queue = queueRef.get();
+            std::vector<object*>& queue = queueRef.get();
             
-            std::lock_guard<std::mutex> lock(m_ObjectsMutex);
+            std::lock_guard<std::mutex> lock(objects_mutex_);
             
             for (auto* object : queue)
             {
@@ -1649,7 +1649,7 @@ void ApplicationClass::CullingThreadFunction()
                 float radius = max(max(XMVectorGetX(scale), XMVectorGetY(scale)), XMVectorGetZ(scale));
 
                 // Vérification du frustum
-                bool visible = m_FrustumCulling.CheckCube(x, y, z, radius, GetFrustumTolerance());
+                bool visible = frustum_culling_.CheckCube(x, y, z, radius, get_frustum_tolerance());
                 object->SetVisible(visible);
             	
             }
@@ -1664,37 +1664,37 @@ void ApplicationClass::CullingThreadFunction()
 
 
 
-bool ApplicationClass::RenderPass(const std::vector<std::reference_wrapper<std::vector<Object*>>>& RenderQueues, XMFLOAT4* diffuse, XMFLOAT4* position, XMFLOAT4* ambient, XMMATRIX view, XMMATRIX projection)
+bool application_class::render_pass(const std::vector<std::reference_wrapper<std::vector<object*>>>& RenderQueues, XMFLOAT4* diffuse, XMFLOAT4* position, XMFLOAT4* ambient, XMMATRIX view, XMMATRIX projection)
 {
-	std::lock_guard<std::mutex> lock(m_ObjectsMutex);
+	std::lock_guard<std::mutex> lock(objects_mutex_);
 	XMMATRIX scaleMatrix, rotateMatrix, translateMatrix ;
 	bool result;
 
 	int renderCount = 0;
 
-	//ConstructFrustum();	
+	//construct_frustum();	
 
 	for (const auto& RenderQueue : RenderQueues)
 	{
-		// Désactiver le Z-buffer si la RenderQueue est m_Skybox
-		bool isSkybox = (&RenderQueue.get() == &m_Skybox);
+		// Désactiver le Z-buffer si la RenderQueue est skybox_
+		bool isSkybox = (&RenderQueue.get() == &skybox_);
 		if (isSkybox)
 		{
-			m_Direct3D->TurnZBufferOff();
+			direct_3d_->turn_z_buffer_off();
 		}
 
 		for (auto& object : RenderQueue.get())
 		{
 			if (object == nullptr)
 			{
-				Logger::Get().Log("Object is null", __FILE__, __LINE__, Logger::LogLevel::Error);
+				Logger::Get().Log("object is null", __FILE__, __LINE__, Logger::LogLevel::Error);
 				return false;
 			}
 
 			// Check if the object has physics enabled
 			if (object->IsPhysicsEnabled())
 			{
-				object->UpdatePosition(m_Timer->GetTime());
+				object->UpdatePosition(timer_->GetTime());
 			}
 			
 			if (!object->IsVisible())
@@ -1713,7 +1713,7 @@ bool ApplicationClass::RenderPass(const std::vector<std::reference_wrapper<std::
 				translateMatrix
 			);
 
-			object->Render(m_Direct3D->GetDeviceContext());
+			object->Render(direct_3d_->get_device_context());
 
 			// Utiliser l'enum ShaderType pour déterminer quel shader utiliser
 			switch (object->GetActiveShader())
@@ -1722,10 +1722,10 @@ bool ApplicationClass::RenderPass(const std::vector<std::reference_wrapper<std::
 			case ShaderType::ALPHA_MAPPING:
 
 				// Enable alpha blending for transparency.
-				m_Direct3D->EnableAlphaBlending();
+				direct_3d_->enable_alpha_blending();
 				
-				result = m_ShaderManager->RenderAlphaMapShader(
-					m_Direct3D->GetDeviceContext(),
+				result = shader_manager_->render_alpha_map_shader(
+					direct_3d_->get_device_context(),
 					object->GetIndexCount(),
 					worldMatrix,
 					view,
@@ -1737,24 +1737,24 @@ bool ApplicationClass::RenderPass(const std::vector<std::reference_wrapper<std::
 				if (!result)
 				{
 					Logger::Get().Log("Could not render the model using the alpha map shader", __FILE__, __LINE__, Logger::LogLevel::Error);
-					m_Direct3D->DisableAlphaBlending();
+					direct_3d_->disable_alpha_blending();
 					return false;
 				}
-				m_Direct3D->DisableAlphaBlending();
+				direct_3d_->disable_alpha_blending();
 				break;
 			
 			case ShaderType::CEL_SHADING:
-				result = m_ShaderManager->RenderCelShadingShader(
-					m_Direct3D->GetDeviceContext(),
+				result = shader_manager_->render_cel_shading_shader(
+					direct_3d_->get_device_context(),
 					object->GetIndexCount(),
 					worldMatrix,
 					view,
 					projection,
 					object->GetTexture(TextureType::Diffuse,0),
-					m_SunLight->GetDiffuseColor(),
-					m_SunLight->GetAmbientColor(),
-					m_SunLight->GetDirection(),
-					m_SunLight->GetIntensity()
+					sun_light_->GetDiffuseColor(),
+					sun_light_->GetAmbientColor(),
+					sun_light_->GetDirection(),
+					sun_light_->GetIntensity()
 					);
 				if (!result)
 				{
@@ -1764,16 +1764,16 @@ bool ApplicationClass::RenderPass(const std::vector<std::reference_wrapper<std::
 				break;
 
 			case ShaderType::NORMAL_MAPPING:
-				result = m_ShaderManager->RenderNormalMapShader(
-					m_Direct3D->GetDeviceContext(),
+				result = shader_manager_->render_normal_map_shader(
+					direct_3d_->get_device_context(),
 					object->GetIndexCount(),
 					worldMatrix,
 					view,
 					projection,
 					object->GetTexture(TextureType::Diffuse,0),
 					object->GetTexture(TextureType::Normal,0),
-					m_Lights[0]->GetDirection(),
-					m_Lights[0]->GetDiffuseColor()
+					lights_[0]->GetDirection(),
+					lights_[0]->GetDiffuseColor()
 					);
 				if (!result)
 				{
@@ -1783,8 +1783,8 @@ bool ApplicationClass::RenderPass(const std::vector<std::reference_wrapper<std::
 				break;
 
 			case ShaderType::SPECULAR_MAPPING:
-				result = m_ShaderManager->RenderSpecMapShader(
-					m_Direct3D->GetDeviceContext(),
+				result = shader_manager_->render_spec_map_shader(
+					direct_3d_->get_device_context(),
 					object->GetIndexCount(),
 					worldMatrix,
 					view,
@@ -1792,11 +1792,11 @@ bool ApplicationClass::RenderPass(const std::vector<std::reference_wrapper<std::
 					object->GetTexture(TextureType::Diffuse,0),
 					object->GetTexture(TextureType::Normal,0),
 					object->GetTexture(TextureType::Specular,0),
-					m_Lights[0]->GetDirection(),
-					m_Lights[0]->GetDiffuseColor(),
-					m_Camera->GetPosition(),
-					m_Lights[0]->GetSpecularColor(),
-					m_Lights[0]->GetSpecularPower()
+					lights_[0]->GetDirection(),
+					lights_[0]->GetDiffuseColor(),
+					camera_->get_position(),
+					lights_[0]->GetSpecularColor(),
+					lights_[0]->GetSpecularPower()
 					);
 				if (!result)
 				{
@@ -1806,8 +1806,8 @@ bool ApplicationClass::RenderPass(const std::vector<std::reference_wrapper<std::
 				break;
 				
 			case ShaderType::TEXTURE:
-				result = m_ShaderManager->RenderTextureShader(
-					m_Direct3D->GetDeviceContext(),
+				result = shader_manager_->render_texture_shader(
+					direct_3d_->get_device_context(),
 					object->GetIndexCount(),
 					worldMatrix,
 					view,
@@ -1822,8 +1822,8 @@ bool ApplicationClass::RenderPass(const std::vector<std::reference_wrapper<std::
 				break;
 
 			case ShaderType::LIGHTING:
-				result = m_ShaderManager->RenderlightShader(
-					m_Direct3D->GetDeviceContext(),
+				result = shader_manager_->renderlight_shader(
+					direct_3d_->get_device_context(),
 					object->GetIndexCount(),
 					worldMatrix,
 					view,
@@ -1841,17 +1841,17 @@ bool ApplicationClass::RenderPass(const std::vector<std::reference_wrapper<std::
 				break;
 
 			case ShaderType::SKYBOX:
-				result = m_ShaderManager->RenderSkyboxShader(
-					m_Direct3D->GetDeviceContext(),
+				result = shader_manager_->render_skybox_shader(
+					direct_3d_->get_device_context(),
 					object->GetIndexCount(),
 					worldMatrix,
 					view,
 					projection,
 					object->GetTexture(TextureType::Diffuse,0),
-					m_SunLight->GetDiffuseColor(),
-					m_SunLight->GetAmbientColor(),
-					m_SunLight->GetDirection(),
-					m_SunLight->GetIntensity()
+					sun_light_->GetDiffuseColor(),
+					sun_light_->GetAmbientColor(),
+					sun_light_->GetDirection(),
+					sun_light_->GetIntensity()
 					);
 				if (!result)
 				{
@@ -1861,17 +1861,17 @@ bool ApplicationClass::RenderPass(const std::vector<std::reference_wrapper<std::
 				break;
 
 			case ShaderType::SUNLIGHT:
-				result = m_ShaderManager->RenderSunlightShader(
-					m_Direct3D->GetDeviceContext(),
+				result = shader_manager_->render_sunlight_shader(
+					direct_3d_->get_device_context(),
 					object->GetIndexCount(),
 					worldMatrix,
 					view,
 					projection,
 					object->GetTexture(TextureType::Diffuse,0),
-					m_SunLight->GetDiffuseColor(),
-					m_SunLight->GetAmbientColor(),
-					m_SunLight->GetDirection(),
-					m_SunLight->GetIntensity()
+					sun_light_->GetDiffuseColor(),
+					sun_light_->GetAmbientColor(),
+					sun_light_->GetDirection(),
+					sun_light_->GetIntensity()
 					);
 				if (!result)
 				{
@@ -1880,8 +1880,8 @@ bool ApplicationClass::RenderPass(const std::vector<std::reference_wrapper<std::
 				}
 				break;
 			default:
-				result = m_ShaderManager->RenderlightShader(
-					m_Direct3D->GetDeviceContext(),
+				result = shader_manager_->renderlight_shader(
+					direct_3d_->get_device_context(),
 					object->GetIndexCount(),
 					worldMatrix,
 					view,
@@ -1899,50 +1899,50 @@ bool ApplicationClass::RenderPass(const std::vector<std::reference_wrapper<std::
 				break;
 			}
 
-			IncrementDrawCallCount();
+			increment_draw_call_count();
 		}
 
 		if (isSkybox)
 		{
-			m_Direct3D->TurnZBufferOn();
+			direct_3d_->turn_z_buffer_on();
 		}
 	}
 	
 
-	SetRenderCount(renderCount);
+	set_render_count(renderCount);
 
 	return true;
 }
 
-void ApplicationClass::ConstructFrustum()
+void application_class::construct_frustum()
 {
-	XMMATRIX projectionMatrix = m_Direct3D->GetProjectionMatrix();
+	XMMATRIX projectionMatrix = direct_3d_->get_projection_matrix();
 	XMMATRIX viewMatrix;
-	m_Camera->GetViewMatrix(viewMatrix);
+	camera_->get_view_matrix(viewMatrix);
 
-	m_FrustumCulling.ConstructFrustum(SCREEN_DEPTH, projectionMatrix, viewMatrix);
+	frustum_culling_.ConstructFrustum(screen_depth, projectionMatrix, viewMatrix);
 }
 
 // Update the position of the skybox based on the camera position
-void ApplicationClass::UpdateSkyboxPosition()
+void application_class::update_skybox_position()
 {
 
-	if (m_Skybox.empty())
+	if (skybox_.empty())
 	{
 		Logger::Get().Log("Skybox is empty", __FILE__, __LINE__, Logger::LogLevel::Error);
 		return;
 	}
 
-	m_Skybox[0]->SetTranslateMatrix(XMMatrixTranslation(m_Camera->GetPosition().x, m_Camera->GetPosition().y, m_Camera->GetPosition().z));
+	skybox_[0]->SetTranslateMatrix(XMMatrixTranslation(camera_->get_position().x, camera_->get_position().y, camera_->get_position().z));
 	
 }
 
-bool ApplicationClass::RenderPhysics(bool keyLeft, bool keyRight, bool keyUp, bool keyDown, float deltaTime) {
+bool application_class::render_physics(bool key_left, bool key_right, bool key_up, bool key_down, float delta_time) {
 	const float maxSpeed = 50.0f; // Limite de vitesse maximale
 
-	for (auto& object : m_object) {
+	for (auto& object : object_) {
 		if (object == nullptr) {
-			Logger::Get().Log("Object is null", __FILE__, __LINE__, Logger::LogLevel::Error);
+			Logger::Get().Log("object is null", __FILE__, __LINE__, Logger::LogLevel::Error);
 			return false;
 		}
 
@@ -1954,8 +1954,8 @@ bool ApplicationClass::RenderPhysics(bool keyLeft, bool keyRight, bool keyUp, bo
 		object->SetAcceleration(XMVectorZero());
 		object->SetGrounded(false);
 
-		for (auto& chunk : m_terrainChunk) {
-			if (!m_Physics->IsColliding(object, chunk)) {
+		for (auto& chunk : terrain_chunk_) {
+			if (!physics_->IsColliding(object, chunk)) {
 				continue;
 			}
 
@@ -1964,12 +1964,12 @@ bool ApplicationClass::RenderPhysics(bool keyLeft, bool keyRight, bool keyUp, bo
 			object->SetGrounded(true);
 		}
 
-		for (auto& object2 : m_object) {
+		for (auto& object2 : object_) {
 			if (object->GetId() == object2->GetId()) {
 				continue;
 			}
 
-			if (!m_Physics->IsColliding(object, object2)) {
+			if (!physics_->IsColliding(object, object2)) {
 				continue;
 			}
 
@@ -1979,23 +1979,23 @@ bool ApplicationClass::RenderPhysics(bool keyLeft, bool keyRight, bool keyUp, bo
 
 		float forceX = 0, forceY = 0, forceZ = 0, forceW = 0;
 
-		if (keyLeft) {
+		if (key_left) {
 			forceX = -40.0f;
 		}
-		if (keyRight) {
+		if (key_right) {
 			forceX = 40.0f;
 		}
-		if (keyUp) {
+		if (key_up) {
 			forceY = 40.0f;
 		}
-		if (keyDown && !object->IsGrounded()) {
+		if (key_down && !object->IsGrounded()) {
 			forceY = -40.0f;
 		}
 
 		XMVECTOR force = XMVectorSet(forceX, forceY, forceZ, forceW);
-		m_Physics->AddForce(object, force);
+		physics_->AddForce(object, force);
 
-		object->AddVelocity(deltaTime);
+		object->AddVelocity(delta_time);
 
 		XMVECTOR velocity = object->GetVelocity();
 		float speed = XMVectorGetX(XMVector3Length(velocity));
@@ -2005,7 +2005,7 @@ bool ApplicationClass::RenderPhysics(bool keyLeft, bool keyRight, bool keyUp, bo
 		}
 
 		if (object->m_gravityEnabled) {
-			m_Physics->ApplyGravity(object, deltaTime);
+			physics_->ApplyGravity(object, delta_time);
 		}
 
 		if (XMVectorGetY(object->GetPosition()) < -30.0f) {
@@ -2019,20 +2019,20 @@ bool ApplicationClass::RenderPhysics(bool keyLeft, bool keyRight, bool keyUp, bo
 	return true;
 }
 
-void ApplicationClass::PhysicsThreadFunction()
+void application_class::physics_thread_function()
 {
-	auto fixedUpdateInterval = std::chrono::milliseconds(1000 / m_PhysicsTickRate);
+	auto fixedUpdateInterval = std::chrono::milliseconds(1000 / physics_tick_rate_);
 	auto lastTime = std::chrono::steady_clock::now();
 
-	while (!m_ShouldQuit)
+	while (!should_quit_)
 	{
 		auto now = std::chrono::steady_clock::now();
 		if (now - lastTime >= fixedUpdateInterval)
 		{
 			lastTime = now;
 
-			float deltaTime = 1.0f / static_cast<float>(m_PhysicsTickRate);
-			bool result = RenderPhysics(m_Inputs.m_KeyLeft, m_Inputs.m_KeyRight, m_Inputs.m_KeyUp, m_Inputs.m_KeyDown, deltaTime);
+			float deltaTime = 1.0f / static_cast<float>(physics_tick_rate_);
+			bool result = render_physics(inputs_.key_left, inputs_.key_right, inputs_.key_up, inputs_.key_down, deltaTime);
 			if (!result)
 			{
 				Logger::Get().Log("Could not render the physics scene", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -2044,7 +2044,7 @@ void ApplicationClass::PhysicsThreadFunction()
 	}
 }
 
-std::string ApplicationClass::ConvertWStringToString(const std::wstring& wstr)
+std::string application_class::convert_w_string_to_string(const std::wstring& wstr)
 {
 	if (wstr.empty()) return std::string();
 
@@ -2054,19 +2054,19 @@ std::string ApplicationClass::ConvertWStringToString(const std::wstring& wstr)
 	return str;
 }
 
-void ApplicationClass::SaveScene() {
-    if (m_scenePath.empty()) {
+void application_class::save_scene() {
+    if (scene_path_.empty()) {
         Logger::Get().Log("Scene path is empty. Cannot save scene.", __FILE__, __LINE__, Logger::LogLevel::Error);
         return;
     }
 
-    std::ofstream outFile(m_scenePath);
+    std::ofstream outFile(scene_path_);
     if (!outFile.is_open()) {
         Logger::Get().Log("Failed to open file for saving scene", __FILE__, __LINE__, Logger::LogLevel::Error);
         return;
     }
 
-    for (const auto& object : m_object) {
+    for (const auto& object : object_) {
         XMFLOAT3 position, scale, rotation;
         XMStoreFloat3(&position, object->GetPosition());
         XMStoreFloat3(&scale, object->GetScale());
@@ -2078,64 +2078,64 @@ void ApplicationClass::SaveScene() {
                 << position.x << " " << position.y << " " << position.z << " "
                 << rotation.x << " " << rotation.y << " " << rotation.z << " "
                 << scale.x << " " << scale.y << " " << scale.z << " "
-                << ConvertWStringToString(object->GetModelPath()) << " "
+                << convert_w_string_to_string(object->GetModelPath()) << " "
                 << object->ShaderTypeToString(object->GetActiveShader()) << " "
                 << object->GetBoundingRadius() << " "
                 << object->ObjectTypeToString(object->GetType()) << " "
                 << object->GetMass() << " "
                 << object->IsPhysicsEnabled();
         
-        // Sauvegarder les chemins des textures
-        // Format: nombre de textures diffuses, puis les chemins
-        // Même chose pour les autres types de textures
+        // Sauvegarder les chemins des textures_
+        // Format: nombre de textures_ diffuses, puis les chemins
+        // Même chose pour les autres types de textures_
         
         // Textures diffuses
         const auto& diffusePaths = object->GetTextureContainer().GetPaths(TextureType::Diffuse);
         outFile << " " << diffusePaths.size();
         for (const auto& path : diffusePaths) {
-            outFile << " " << ConvertWStringToString(path);
+            outFile << " " << convert_w_string_to_string(path);
         }
         
         // Textures normales
         const auto& normalPaths = object->GetTextureContainer().GetPaths(TextureType::Normal);
         outFile << " " << normalPaths.size();
         for (const auto& path : normalPaths) {
-            outFile << " " << ConvertWStringToString(path);
+            outFile << " " << convert_w_string_to_string(path);
         }
         
         // Textures spéculaires
         const auto& specularPaths = object->GetTextureContainer().GetPaths(TextureType::Specular);
         outFile << " " << specularPaths.size();
         for (const auto& path : specularPaths) {
-            outFile << " " << ConvertWStringToString(path);
+            outFile << " " << convert_w_string_to_string(path);
         }
         
         // Textures alpha
         const auto& alphaPaths = object->GetTextureContainer().GetPaths(TextureType::Alpha);
         outFile << " " << alphaPaths.size();
         for (const auto& path : alphaPaths) {
-            outFile << " " << ConvertWStringToString(path);
+            outFile << " " << convert_w_string_to_string(path);
         }
         
         outFile << std::endl;
     }
 
     outFile.close();
-    Logger::Get().Log("Scene saved successfully to " + m_scenePath, __FILE__, __LINE__, Logger::LogLevel::Info);
+    Logger::Get().Log("Scene saved successfully to " + scene_path_, __FILE__, __LINE__, Logger::LogLevel::Info);
 }
 
 
 
-bool ApplicationClass::LoadScene() {
+bool application_class::load_scene() {
 	Logger::Get().Log("Loading scene from " , __FILE__, __LINE__, Logger::LogLevel::Info);
 
-	std::wstring scenePath = GetScenePath();
+	std::wstring scenePath = get_scene_path();
 	if (!scenePath.empty())
 	{
-		SetScenePath(ConvertWStringToString(scenePath));
+		set_scene_path(convert_w_string_to_string(scenePath));
 	}
 	
-	if (m_scenePath.empty()) {
+	if (scene_path_.empty()) {
 		Logger::Get().Log("Scene path is empty. Cannot load scene.", __FILE__, __LINE__, Logger::LogLevel::Error);
 		return false;
 	}
@@ -2147,17 +2147,17 @@ bool ApplicationClass::LoadScene() {
 	}
 
     // Nettoyer les objets existants
-    for (auto& obj : m_object) {
+    for (auto& obj : object_) {
         if (obj) {
             obj->Shutdown();
             delete obj;
         }
     }
-    m_object.clear();
-    m_ObjectId = 0;
+    object_.clear();
+    object_id_ = 0;
 
 	// Sauvegarder le répertoire de travail actuel
-	std::wstring currentDirectory = m_WFolder;
+	std::wstring currentDirectory = w_folder_;
 
     std::string line;
     while (std::getline(inFile, line)) {
@@ -2187,7 +2187,7 @@ bool ApplicationClass::LoadScene() {
         }
 
         // Créer un nouvel objet
-        Object* newObject = new Object();
+        object* newObject = new object();
 
         // Convertir le chemin du modèle en wstring
         std::wstring wModelPath(modelPath.begin(), modelPath.end());
@@ -2203,16 +2203,16 @@ bool ApplicationClass::LoadScene() {
     		}
     	}
 
-        // Créer le conteneur de textures pour stocker les chemins
+        // Créer le conteneur de textures_ pour stocker les chemins
         TextureContainer objectTextures;
         
-        // IMPORTANT: Vider les conteneurs de chemins de textures
+        // IMPORTANT: Vider les conteneurs de chemins de textures_
         objectTextures.diffusePaths.clear();
         objectTextures.normalPaths.clear();
         objectTextures.specularPaths.clear();
         objectTextures.alphaPaths.clear();
 
-        // Lire les chemins des textures diffuses
+        // Lire les chemins des textures_ diffuses
         int diffuseTextureCount;
         iss >> diffuseTextureCount;
         for (int i = 0; i < diffuseTextureCount; i++) {
@@ -2222,7 +2222,7 @@ bool ApplicationClass::LoadScene() {
             objectTextures.diffusePaths.push_back(wTexturePath);
         }
 
-        // Lire les chemins des textures normales
+        // Lire les chemins des textures_ normales
         int normalTextureCount;
         iss >> normalTextureCount;
         for (int i = 0; i < normalTextureCount; i++) {
@@ -2232,7 +2232,7 @@ bool ApplicationClass::LoadScene() {
             objectTextures.normalPaths.push_back(wTexturePath);
         }
 
-        // Lire les chemins des textures spéculaires
+        // Lire les chemins des textures_ spéculaires
         int specularTextureCount;
         iss >> specularTextureCount;
         for (int i = 0; i < specularTextureCount; i++) {
@@ -2242,7 +2242,7 @@ bool ApplicationClass::LoadScene() {
             objectTextures.specularPaths.push_back(wTexturePath);
         }
 
-        // Lire les chemins des textures alpha
+        // Lire les chemins des textures_ alpha
         int alphaTextureCount;
         iss >> alphaTextureCount;
         for (int i = 0; i < alphaTextureCount; i++) {
@@ -2253,22 +2253,22 @@ bool ApplicationClass::LoadScene() {
         }
 
     	// preload texture
-    	if (!newObject->PreloadTextures(m_Direct3D->GetDevice(),  m_Direct3D->GetDeviceContext(), objectTextures))
+    	if (!newObject->PreloadTextures(direct_3d_->get_device(),  direct_3d_->get_device_context(), objectTextures))
     	{
     		// Gérer l'erreur
     		return false;
     	}
 
-        // Initialiser l'objet avec le modèle et les chemins de textures
+        // Initialiser l'objet avec le modèle et les chemins de textures_
         char modelFilename[256];
         size_t convertedChars = 0;
         wcstombs_s(&convertedChars, modelFilename, sizeof(modelFilename), wModelPath.c_str(), _TRUNCATE);
 
         Logger::Get().Log("Loading model: " + std::string(modelFilename), __FILE__, __LINE__, Logger::LogLevel::Info);
 
-        // NE PAS charger les textures avant Initialize
-        // Laisser la méthode Initialize s'en charger à partir des chemins
-        if (!newObject->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, objectTextures)) {
+        // NE PAS charger les textures_ avant initialize
+        // Laisser la méthode initialize s'en charger à partir des chemins
+        if (!newObject->Initialize(direct_3d_->get_device(), direct_3d_->get_device_context(), modelFilename, objectTextures)) {
             Logger::Get().Log("Failed to initialize object: " + name, __FILE__, __LINE__, Logger::LogLevel::Error);
             delete newObject;
             continue;
@@ -2288,11 +2288,11 @@ bool ApplicationClass::LoadScene() {
         newObject->SetPhysicsEnabled(physicsEnabled);
 
         // Mettre à jour l'ID global si nécessaire
-        if (id >= m_ObjectId) {
-            m_ObjectId = id + 1;
+        if (id >= object_id_) {
+            object_id_ = id + 1;
         }
 
-        m_object.push_back(newObject);
+        object_.push_back(newObject);
         Logger::Get().Log("Loaded object: " + name, __FILE__, __LINE__, Logger::LogLevel::Info);
     }
 	
@@ -2300,14 +2300,14 @@ bool ApplicationClass::LoadScene() {
     return true;
 }
 
-std::wstring ApplicationClass::GetScenePath()
+std::wstring application_class::get_scene_path()
 {
 	OPENFILENAME ofn;
 	wchar_t szFile[260];
 
 	ZeroMemory(&ofn, sizeof(ofn));
 	ofn.lStructSize = sizeof(ofn);
-	ofn.hwndOwner = m_hwnd;
+	ofn.hwndOwner = hwnd_;
 	ofn.lpstrFile = szFile;
 	ofn.lpstrFile[0] = '\0';
 	ofn.nMaxFile = sizeof(szFile);
@@ -2326,10 +2326,10 @@ std::wstring ApplicationClass::GetScenePath()
 	return L"";
 }
 
-int ApplicationClass::GetTotalVertexCount() const
+int application_class::get_total_vertex_count() const
 {
 	int totalVertices = 0;
-	for (const auto& obj : m_object)
+	for (const auto& obj : object_)
 	{
 		if (obj)
 		{
@@ -2337,7 +2337,7 @@ int ApplicationClass::GetTotalVertexCount() const
 		}
 	}
 	// Ajoutez le nombre de sommets pour les cubes
-	for (const auto& cube : m_cubes)
+	for (const auto& cube : cubes_)
 	{
 		if (cube)
 		{
@@ -2345,7 +2345,7 @@ int ApplicationClass::GetTotalVertexCount() const
 		}
 	}
 	// Ajoutez le nombre de sommets pour le terrain
-	for (const auto& chunk : m_terrainChunk)
+	for (const auto& chunk : terrain_chunk_)
 	{
 		if (chunk)
 		{
@@ -2355,10 +2355,10 @@ int ApplicationClass::GetTotalVertexCount() const
 	return totalVertices;
 }
 
-int ApplicationClass::GetTotalTriangleCount() const
+int application_class::get_total_triangle_count() const
 {
 	int totalTriangles = 0;
-	for (const auto& obj : m_object)
+	for (const auto& obj : object_)
 	{
 		if (obj)
 		{
@@ -2367,7 +2367,7 @@ int ApplicationClass::GetTotalTriangleCount() const
 		}
 	}
 	// Ajoutez le nombre de triangles pour les cubes
-	for (const auto& cube : m_cubes)
+	for (const auto& cube : cubes_)
 	{
 		if (cube)
 		{
@@ -2375,7 +2375,7 @@ int ApplicationClass::GetTotalTriangleCount() const
 		}
 	}
 	// Ajoutez le nombre de triangles pour le terrain
-	for (const auto& chunk : m_terrainChunk)
+	for (const auto& chunk : terrain_chunk_)
 	{
 		if (chunk)
 		{
@@ -2385,10 +2385,10 @@ int ApplicationClass::GetTotalTriangleCount() const
 	return totalTriangles;
 }
 
-int ApplicationClass::GetVisibleTriangleCount() const
+int application_class::get_visible_triangle_count() const
 {
 	int visibleTriangles = 0;
-	for (const auto& obj : m_object)
+	for (const auto& obj : object_)
 	{
 		if (obj && obj->IsVisible())
 		{
@@ -2396,7 +2396,7 @@ int ApplicationClass::GetVisibleTriangleCount() const
 		}
 	}
 	// Ajoutez le nombre de triangles visibles pour les cubes
-	for (const auto& cube : m_cubes)
+	for (const auto& cube : cubes_)
 	{
 		if (cube && cube->IsVisible())
 		{
@@ -2404,7 +2404,7 @@ int ApplicationClass::GetVisibleTriangleCount() const
 		}
 	}
 	// Ajoutez le nombre de triangles visibles pour le terrain
-	for (const auto& chunk : m_terrainChunk)
+	for (const auto& chunk : terrain_chunk_)
 	{
 		if (chunk && chunk->IsVisible())
 		{
@@ -2414,56 +2414,56 @@ int ApplicationClass::GetVisibleTriangleCount() const
 	return visibleTriangles;
 }
 
-int ApplicationClass::GetCurrentFps() const
+int application_class::get_current_fps() const
 {
-	return m_Fps->GetFps();
+	return fps_->GetFps();
 }
 
-int ApplicationClass::GetMinFps() const
+int application_class::get_min_fps() const
 {
-	return m_Fps->GetMinFps();
+	return fps_->GetMinFps();
 }
 
-int ApplicationClass::GetMaxFps() const
+int application_class::get_max_fps() const
 {
-	return m_Fps->GetMaxFps();
+	return fps_->GetMaxFps();
 }
 
-float ApplicationClass::GetFrameTime() const
+float application_class::get_frame_time() const
 {
-	return m_Fps->GetFrameTime();
+	return fps_->GetFrameTime();
 }
 
-int ApplicationClass::GetDrawCalls() const
+int application_class::get_draw_calls() const
 {
-	return m_drawcalls;
+	return drawcalls_;
 }
 
-void ApplicationClass::ResetFpsStats()
+void application_class::reset_fps_stats()
 {
-	m_Fps->ResetStats();
+	fps_->ResetStats();
 }
 
-void ApplicationClass::IncrementDrawCallCount()
+void application_class::increment_draw_call_count()
 {
-	m_drawcalls++;
+	drawcalls_++;
 }
 
-void ApplicationClass::ResetDrawCallCount()
+void application_class::reset_draw_call_count()
 {
-	m_drawcalls = 0;
+	drawcalls_ = 0;
 }
 
-void ApplicationClass::CreateBigCube(int sideCount)
+void application_class::create_big_cube(int side_count)
 {
     Logger::Get().Log("Lancement de la génération du terrain dans un thread séparé", __FILE__, __LINE__, Logger::LogLevel::Info);
     
     // Créer un thread qui exécutera la génération du terrain
-    std::thread generationThread([this, sideCount]() {
+    std::thread generationThread([this, side_count]() {
         Logger::Get().Log("Thread de génération de terrain démarré", __FILE__, __LINE__, Logger::LogLevel::Info);
         
         // Stockage temporaire pour les nouveaux objets
-        std::vector<Object*> newTerrainChunks;
+        std::vector<object*> newTerrainChunks;
 
         // Dimensions du terrain
         float scaleX = 1.0f;
@@ -2472,14 +2472,14 @@ void ApplicationClass::CreateBigCube(int sideCount)
 
         // Préparer les données pour la création des cubes
         std::vector<std::tuple<float, float, float, std::string, int>> cubeData;
-        int objectId = m_ObjectId;
+        int objectId = object_id_;
 
         // Générer les données des cubes
-        for (int i = 0; i < sideCount; i++) {
-            for (int j = 0; j < sideCount; j++) {
-                for (int k = 0; k < sideCount; k++) {
+        for (int i = 0; i < side_count; i++) {
+            for (int j = 0; j < side_count; j++) {
+                for (int k = 0; k < side_count; k++) {
                     // Vérifier si nous devons arrêter le thread
-                    if (m_ShouldQuit) {
+                    if (should_quit_) {
                         Logger::Get().Log("Génération de terrain annulée", __FILE__, __LINE__, Logger::LogLevel::Info);
                         return;
                     }
@@ -2498,56 +2498,56 @@ void ApplicationClass::CreateBigCube(int sideCount)
         
         // Synchroniser avec le thread principal pour créer les objets
         // Cette partie doit être exécutée dans le thread principal (via une file d'attente ou autre mécanisme)
-        std::lock_guard<std::mutex> lock(m_TerrainMutex);
-        m_TerrainGenerationData = std::move(cubeData);
-        m_TerrainGenerationReady = true;
-        m_NextTerrainObjectId = objectId;
+        std::lock_guard<std::mutex> lock(terrain_mutex_);
+        terrain_generation_data_ = std::move(cubeData);
+        terrain_generation_ready_ = true;
+        next_terrain_object_id_ = objectId;
         
-        Logger::Get().Log("Données de génération de terrain préparées (" + std::to_string(m_TerrainGenerationData.size()) + " cubes)", __FILE__, __LINE__, Logger::LogLevel::Info);
+        Logger::Get().Log("Données de génération de terrain préparées (" + std::to_string(terrain_generation_data_.size()) + " cubes)", __FILE__, __LINE__, Logger::LogLevel::Info);
     });
     
     // Détacher le thread pour qu'il s'exécute en arrière-plan
     generationThread.detach();
 }
 
-void ApplicationClass::ProcessTerrainGeneration()
+void application_class::process_terrain_generation()
 {
     // Vérifier si des données de terrain sont prêtes à être traitées
-    if (!m_TerrainGenerationReady) {
+    if (!terrain_generation_ready_) {
         return;
     }
     
     // Acquérir les données générées
     std::vector<std::tuple<float, float, float, std::string, int>> cubeData;
     {
-        std::lock_guard<std::mutex> lock(m_TerrainMutex);
-        cubeData = std::move(m_TerrainGenerationData);
-        m_TerrainGenerationData.clear();
-        m_TerrainGenerationReady = false;
-        m_ObjectId = m_NextTerrainObjectId;
+        std::lock_guard<std::mutex> lock(terrain_mutex_);
+        cubeData = std::move(terrain_generation_data_);
+        terrain_generation_data_.clear();
+        terrain_generation_ready_ = false;
+        object_id_ = next_terrain_object_id_;
     }
     
     Logger::Get().Log("Création des objets terrain à partir des données préparées", __FILE__, __LINE__, Logger::LogLevel::Info);
     
     // Nettoyer les objets terrain existants
-    for (auto* chunk : m_terrainChunk)
+    for (auto* chunk : terrain_chunk_)
     {
         if (chunk) {
             chunk->Shutdown();
             delete chunk;
         }
     }
-    m_terrainChunk.clear();
+    terrain_chunk_.clear();
     
-    // Créer un conteneur de textures partagé
+    // Créer un conteneur de textures_ partagé
     TextureContainer textureContainer;
     textureContainer.diffusePaths.push_back(L"assets/Texture/Bricks2K.png");
     textureContainer.normalPaths.push_back(L"assets/Texture/BricksNRM2K.png");
     textureContainer.specularPaths.push_back(L"assets/Texture/BricksGLOSS2K.png");
     
-    // Précharger les textures une seule fois
-    ModelClass* sharedModel = new ModelClass();
-    sharedModel->PreloadTextures(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), textureContainer);
+    // Précharger les textures_ une seule fois
+    model_class* sharedModel = new model_class();
+    sharedModel->PreloadTextures(direct_3d_->get_device(), direct_3d_->get_device_context(), textureContainer);
     
     char modelFilename[128];
     strcpy_s(modelFilename, "assets/Model/TXT/cube.txt");
@@ -2556,10 +2556,10 @@ void ApplicationClass::ProcessTerrainGeneration()
     for (const auto& [posX, posY, posZ, name, id] : cubeData)
     {
         // Créer un nouvel objet de terrain
-        Object* terrain = new Object();
+        object* terrain = new object();
         
-        // Initialiser avec le modèle et les textures
-        if (!terrain->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, textureContainer))
+        // Initialiser avec le modèle et les textures_
+        if (!terrain->Initialize(direct_3d_->get_device(), direct_3d_->get_device_context(), modelFilename, textureContainer))
         {
             Logger::Get().Log("Échec de l'initialisation d'une tuile de terrain", __FILE__, __LINE__, Logger::LogLevel::Error);
             delete terrain;
@@ -2578,10 +2578,10 @@ void ApplicationClass::ProcessTerrainGeneration()
         terrain->SetId(id);
         
         // Ajouter à la liste des chunks de terrain
-        m_terrainChunk.push_back(terrain);
+        terrain_chunk_.push_back(terrain);
     }
     
     delete sharedModel;
     
-    Logger::Get().Log("Génération du terrain terminée avec " + std::to_string(m_terrainChunk.size()) + " cubes", __FILE__, __LINE__, Logger::LogLevel::Info);
+    Logger::Get().Log("Génération du terrain terminée avec " + std::to_string(terrain_chunk_.size()) + " cubes", __FILE__, __LINE__, Logger::LogLevel::Info);
 }
\ No newline at end of file
diff --git a/enginecustom/src/src/system/bitmapclass.cpp b/enginecustom/src/src/system/bitmap_class.cpp
similarity index 68%
rename from enginecustom/src/src/system/bitmapclass.cpp
rename to enginecustom/src/src/system/bitmap_class.cpp
index 17ff2ba..f1ff8a5 100644
--- a/enginecustom/src/src/system/bitmapclass.cpp
+++ b/enginecustom/src/src/system/bitmap_class.cpp
@@ -1,39 +1,39 @@
-#include "bitmapclass.h"
+#include "bitmap_class.h"
 
-BitmapClass::BitmapClass()
+bitmap_class::bitmap_class()
 {
-    m_vertexBuffer = 0;
-    m_indexBuffer = 0;
-    m_Texture = 0;
+    vertex_buffer_ = 0;
+    index_buffer_ = 0;
+    texture_ = 0;
 }
 
 
-BitmapClass::BitmapClass(const BitmapClass& other)
+bitmap_class::bitmap_class(const bitmap_class& other)
 {
 }
 
 
-BitmapClass::~BitmapClass()
+bitmap_class::~bitmap_class()
 {
 }
 
 
-bool BitmapClass::Initialize(ID3D11Device* device, ID3D11DeviceContext* deviceContext, int screenWidth, int screenHeight, char* textureFilename, int renderX, int renderY)
+bool bitmap_class::initialize(ID3D11Device* device, ID3D11DeviceContext* deviceContext, int screenWidth, int screenHeight, char* textureFilename, int renderX, int renderY)
 {
     Logger::Get().Log("Initializing bitmap class", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
     bool result;
 
     // Store the screen size.
-    m_screenWidth = screenWidth;
-    m_screenHeight = screenHeight;
+    screen_width_ = screenWidth;
+    screen_height_ = screenHeight;
 
     // Store where the bitmap should be rendered to.
-    m_renderX = renderX;
-    m_renderY = renderY;
+    render_x_ = renderX;
+    render_y_ = renderY;
 
-    // Initialize the vertex and index buffer that hold the geometry for the bitmap quad.
-    result = InitializeBuffers(device);
+    // initialize the vertex and index buffer that hold the geometry for the bitmap quad.
+    result = initialize_buffers(device);
     if (!result)
     {
         Logger::Get().Log("Failed to initialize buffers", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -41,7 +41,7 @@ bool BitmapClass::Initialize(ID3D11Device* device, ID3D11DeviceContext* deviceCo
     }
 
     // Load the texture for this bitmap.
-    result = LoadTexture(device, deviceContext, textureFilename);
+    result = load_texture(device, deviceContext, textureFilename);
     if (!result)
     {
         Logger::Get().Log("Failed to load texture", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -53,24 +53,24 @@ bool BitmapClass::Initialize(ID3D11Device* device, ID3D11DeviceContext* deviceCo
     return true;
 }
 
-void BitmapClass::Shutdown()
+void bitmap_class::shutdown()
 {
     // Release the bitmap texture.
-    ReleaseTexture();
+    release_texture();
 
     // Release the vertex and index buffers.
-    ShutdownBuffers();
+    shutdown_buffers();
 
     return;
 }
 
-bool BitmapClass::Render(ID3D11DeviceContext* deviceContext)
+bool bitmap_class::render(ID3D11DeviceContext* deviceContext)
 {
     bool result;
 
 
     // Update the buffers if the position of the bitmap has changed from its original position.
-    result = UpdateBuffers(deviceContext);
+    result = update_buffers(deviceContext);
     if (!result)
     {
         Logger::Get().Log("Failed to update buffers", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -78,60 +78,60 @@ bool BitmapClass::Render(ID3D11DeviceContext* deviceContext)
     }
 
     // Put the vertex and index buffers on the graphics pipeline to prepare them for drawing.
-    RenderBuffers(deviceContext);
+    render_buffers(deviceContext);
 
     return true;
 }
 
-int BitmapClass::GetIndexCount()
+int bitmap_class::get_index_count()
 {
-    return m_indexCount;
+    return index_count_;
 }
 
-ID3D11ShaderResourceView* BitmapClass::GetTexture()
+ID3D11ShaderResourceView* bitmap_class::get_texture()
 {
-    return m_Texture->GetTexture();
+    return texture_->GetTexture();
 }
 
-bool BitmapClass::InitializeBuffers(ID3D11Device* device)
+bool bitmap_class::initialize_buffers(ID3D11Device* device)
 {
     Logger::Get().Log("Initializing buffers", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
-    VertexType* vertices;
+    vertex_type* vertices;
     unsigned long* indices;
     D3D11_BUFFER_DESC vertexBufferDesc, indexBufferDesc;
     D3D11_SUBRESOURCE_DATA vertexData, indexData;
     HRESULT result;
     int i;
 
-    // Initialize the previous rendering position to negative one.
-    m_prevPosX = -1;
-    m_prevPosY = -1;
+    // initialize the previous rendering position to negative one.
+    prev_pos_x_ = -1;
+    prev_pos_y_ = -1;
 
     // Set the number of vertices in the vertex array.
-    m_vertexCount = 6;
+    vertex_count_ = 6;
 
     // Set the number of indices in the index array.
-    m_indexCount = m_vertexCount;
+    index_count_ = vertex_count_;
 
     // Create the vertex array.
-    vertices = new VertexType[m_vertexCount];
+    vertices = new vertex_type[vertex_count_];
 
     // Create the index array.
-    indices = new unsigned long[m_indexCount];
+    indices = new unsigned long[index_count_];
 
-    // Initialize vertex array to zeros at first.
-    memset(vertices, 0, (sizeof(VertexType) * m_vertexCount));
+    // initialize vertex array to zeros at first.
+    memset(vertices, 0, (sizeof(vertex_type) * vertex_count_));
 
     // Load the index array with data.
-    for (i = 0; i < m_indexCount; i++)
+    for (i = 0; i < index_count_; i++)
     {
         indices[i] = i;
     }
 
     // Set up the description of the dynamic vertex buffer.
     vertexBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    vertexBufferDesc.ByteWidth = sizeof(VertexType) * m_vertexCount;
+    vertexBufferDesc.ByteWidth = sizeof(vertex_type) * vertex_count_;
     vertexBufferDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
     vertexBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     vertexBufferDesc.MiscFlags = 0;
@@ -143,7 +143,7 @@ bool BitmapClass::InitializeBuffers(ID3D11Device* device)
     vertexData.SysMemSlicePitch = 0;
 
     // Now finally create the vertex buffer.
-    result = device->CreateBuffer(&vertexBufferDesc, &vertexData, &m_vertexBuffer);
+    result = device->CreateBuffer(&vertexBufferDesc, &vertexData, &vertex_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create vertex buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -152,7 +152,7 @@ bool BitmapClass::InitializeBuffers(ID3D11Device* device)
 
     // Set up the description of the index buffer.
     indexBufferDesc.Usage = D3D11_USAGE_DEFAULT;
-    indexBufferDesc.ByteWidth = sizeof(unsigned long) * m_indexCount;
+    indexBufferDesc.ByteWidth = sizeof(unsigned long) * index_count_;
     indexBufferDesc.BindFlags = D3D11_BIND_INDEX_BUFFER;
     indexBufferDesc.CPUAccessFlags = 0;
     indexBufferDesc.MiscFlags = 0;
@@ -164,7 +164,7 @@ bool BitmapClass::InitializeBuffers(ID3D11Device* device)
     indexData.SysMemSlicePitch = 0;
 
     // Create the index buffer.
-    result = device->CreateBuffer(&indexBufferDesc, &indexData, &m_indexBuffer);
+    result = device->CreateBuffer(&indexBufferDesc, &indexData, &index_buffer_);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to create index buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -183,25 +183,25 @@ bool BitmapClass::InitializeBuffers(ID3D11Device* device)
     return true;
 }
 
-void BitmapClass::ShutdownBuffers()
+void bitmap_class::shutdown_buffers()
 {
     Logger::Get().Log("Shutting down buffers", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
     // Release the index buffer.
-    if (m_indexBuffer)
+    if (index_buffer_)
     {
         Logger::Get().Log("Releasing index buffer", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
-        m_indexBuffer->Release();
-        m_indexBuffer = 0;
+        index_buffer_->Release();
+        index_buffer_ = 0;
         Logger::Get().Log("Index buffer released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
     }
 
     // Release the vertex buffer.
-    if (m_vertexBuffer)
+    if (vertex_buffer_)
     {
         Logger::Get().Log("Releasing vertex buffer", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
-        m_vertexBuffer->Release();
-        m_vertexBuffer = 0;
+        vertex_buffer_->Release();
+        vertex_buffer_ = 0;
         Logger::Get().Log("Vertex buffer released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
     }
 
@@ -210,38 +210,38 @@ void BitmapClass::ShutdownBuffers()
     return;
 }
 
-bool BitmapClass::UpdateBuffers(ID3D11DeviceContext* deviceContent)
+bool bitmap_class::update_buffers(ID3D11DeviceContext* deviceContent)
 {
     float left, right, top, bottom;
-    VertexType* vertices;
+    vertex_type* vertices;
     D3D11_MAPPED_SUBRESOURCE mappedResource;
-    VertexType* dataPtr;
+    vertex_type* dataPtr;
     HRESULT result;
 
     // If the position we are rendering this bitmap to hasn't changed then don't update the vertex buffer.
-    if ((m_prevPosX == m_renderX) && (m_prevPosY == m_renderY))
+    if ((prev_pos_x_ == render_x_) && (prev_pos_y_ == render_y_))
     {
         return true;
     }
 
     // If the rendering location has changed then store the new position and update the vertex buffer.
-    m_prevPosX = m_renderX;
-    m_prevPosY = m_renderY;
+    prev_pos_x_ = render_x_;
+    prev_pos_y_ = render_y_;
 
     // Create the vertex array.
-    vertices = new VertexType[m_vertexCount];
+    vertices = new vertex_type[vertex_count_];
 
     // Calculate the screen coordinates of the left side of the bitmap.
-    left = (float)((m_screenWidth / 2) * -1) + (float)m_renderX;
+    left = (float)((screen_width_ / 2) * -1) + (float)render_x_;
 
     // Calculate the screen coordinates of the right side of the bitmap.
-    right = left + (float)m_bitmapWidth;
+    right = left + (float)bitmap_width_;
 
     // Calculate the screen coordinates of the top of the bitmap.
-    top = (float)(m_screenHeight / 2) - (float)m_renderY;
+    top = (float)(screen_height_ / 2) - (float)render_y_;
 
     // Calculate the screen coordinates of the bottom of the bitmap.
-    bottom = top - (float)m_bitmapHeight;
+    bottom = top - (float)bitmap_height_;
 
     // Load the vertex array with data.
 // First triangle.
@@ -265,7 +265,7 @@ bool BitmapClass::UpdateBuffers(ID3D11DeviceContext* deviceContent)
     vertices[5].texture = XMFLOAT2(1.0f, 1.0f);
 
     // Lock the vertex buffer.
-    result = deviceContent->Map(m_vertexBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    result = deviceContent->Map(vertex_buffer_, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
         Logger::Get().Log("Failed to map vertex buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -273,13 +273,13 @@ bool BitmapClass::UpdateBuffers(ID3D11DeviceContext* deviceContent)
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr = (VertexType*)mappedResource.pData;
+    dataPtr = (vertex_type*)mappedResource.pData;
 
     // Copy the data into the vertex buffer.
-    memcpy(dataPtr, (void*)vertices, (sizeof(VertexType) * m_vertexCount));
+    memcpy(dataPtr, (void*)vertices, (sizeof(vertex_type) * vertex_count_));
 
     // Unlock the vertex buffer.
-    deviceContent->Unmap(m_vertexBuffer, 0);
+    deviceContent->Unmap(vertex_buffer_, 0);
 
     // Release the pointer reference.
     dataPtr = 0;
@@ -291,21 +291,21 @@ bool BitmapClass::UpdateBuffers(ID3D11DeviceContext* deviceContent)
     return true;
 }
 
-void BitmapClass::RenderBuffers(ID3D11DeviceContext* deviceContext)
+void bitmap_class::render_buffers(ID3D11DeviceContext* deviceContext)
 {
     unsigned int stride;
     unsigned int offset;
 
 
     // Set vertex buffer stride and offset.
-    stride = sizeof(VertexType);
+    stride = sizeof(vertex_type);
     offset = 0;
 
     // Set the vertex buffer to active in the input assembler so it can be rendered.
-    deviceContext->IASetVertexBuffers(0, 1, &m_vertexBuffer, &stride, &offset);
+    deviceContext->IASetVertexBuffers(0, 1, &vertex_buffer_, &stride, &offset);
 
     // Set the index buffer to active in the input assembler so it can be rendered.
-    deviceContext->IASetIndexBuffer(m_indexBuffer, DXGI_FORMAT_R32_UINT, 0);
+    deviceContext->IASetIndexBuffer(index_buffer_, DXGI_FORMAT_R32_UINT, 0);
 
     // Set the type of primitive that should be rendered from this vertex buffer, in this case triangles.
     deviceContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
@@ -313,15 +313,15 @@ void BitmapClass::RenderBuffers(ID3D11DeviceContext* deviceContext)
     return;
 }
 
-bool BitmapClass::LoadTexture(ID3D11Device* device, ID3D11DeviceContext* deviceContext, char* filename)
+bool bitmap_class::load_texture(ID3D11Device* device, ID3D11DeviceContext* deviceContext, char* filename)
 {
     bool result;
 
 
     // Create and initialize the texture object.
-    m_Texture = new TextureClass;
+    texture_ = new texture_class;
 
-    result = m_Texture->Initialize(device, deviceContext, filename);
+    result = texture_->Initialize(device, deviceContext, filename);
     if (!result)
     {
         Logger::Get().Log("Failed to initialize texture object", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -329,22 +329,22 @@ bool BitmapClass::LoadTexture(ID3D11Device* device, ID3D11DeviceContext* deviceC
     }
 
     // Store the size in pixels that this bitmap should be rendered at.
-    m_bitmapWidth = m_Texture->GetWidth();
-    m_bitmapHeight = m_Texture->GetHeight();
+    bitmap_width_ = texture_->GetWidth();
+    bitmap_height_ = texture_->GetHeight();
 
     return true;
 }
 
-void BitmapClass::ReleaseTexture()
+void bitmap_class::release_texture()
 {
     Logger::Get().Log("Releasing texture", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
     // Release the texture object.
-    if (m_Texture)
+    if (texture_)
     {
         Logger::Get().Log("Releasing texture object", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
-        m_Texture->Shutdown();
-        delete m_Texture;
-        m_Texture = 0;
+        texture_->Shutdown();
+        delete texture_;
+        texture_ = 0;
         Logger::Get().Log("Texture object released", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
     }
 
@@ -353,9 +353,9 @@ void BitmapClass::ReleaseTexture()
     return;
 }
 
-void BitmapClass::SetRenderLocation(int x, int y)
+void bitmap_class::set_render_location(int x, int y)
 {
-    m_renderX = x;
-    m_renderY = y;
+    render_x_ = x;
+    render_y_ = y;
     return;
 }
\ No newline at end of file
diff --git a/enginecustom/src/src/system/Cameraclass.cpp b/enginecustom/src/src/system/camera_class.cpp
similarity index 64%
rename from enginecustom/src/src/system/Cameraclass.cpp
rename to enginecustom/src/src/system/camera_class.cpp
index 1160ad6..9d34883 100644
--- a/enginecustom/src/src/system/Cameraclass.cpp
+++ b/enginecustom/src/src/system/camera_class.cpp
@@ -1,58 +1,58 @@
 ////////////////////////////////////////////////////////////////////////////////
 // Filename: cameraclass.cpp
 ////////////////////////////////////////////////////////////////////////////////
-#include "cameraclass.h"
+#include "camera_class.h"
 
-CameraClass::CameraClass()
+camera_class::camera_class()
 {
-	m_positionX = 0.0f;
-	m_positionY = 0.0f;
-	m_positionZ = 0.0f;
+	position_x_ = 0.0f;
+	position_y_ = 0.0f;
+	position_z_ = 0.0f;
 
-	m_rotationX = 0.0f;
-	m_rotationY = 0.0f;
-	m_rotationZ = 0.0f;
+	rotation_x_ = 0.0f;
+	rotation_y_ = 0.0f;
+	rotation_z_ = 0.0f;
 }
 
 
-CameraClass::CameraClass(const CameraClass& other)
+camera_class::camera_class(const camera_class& other)
 {
 }
 
 
-CameraClass::~CameraClass()
+camera_class::~camera_class()
 {
 }
 
-void CameraClass::SetPosition(float x, float y, float z)
+void camera_class::set_position(float x, float y, float z)
 {
-	m_positionX = x;
-	m_positionY = y;
-	m_positionZ = z;
+	position_x_ = x;
+	position_y_ = y;
+	position_z_ = z;
 	return;
 }
 
 
-void CameraClass::SetRotation(float x, float y, float z)
+void camera_class::set_rotation(float x, float y, float z)
 {
-	m_rotationX = x;
-	m_rotationY = y;
-	m_rotationZ = z;
+	rotation_x_ = x;
+	rotation_y_ = y;
+	rotation_z_ = z;
 	return;
 }
 
-XMFLOAT3 CameraClass::GetPosition()
+XMFLOAT3 camera_class::get_position()
 {
-	return XMFLOAT3(m_positionX, m_positionY, m_positionZ);
+	return XMFLOAT3(position_x_, position_y_, position_z_);
 }
 
 
-XMFLOAT3 CameraClass::GetRotation()
+XMFLOAT3 camera_class::get_rotation()
 {
-	return XMFLOAT3(m_rotationX, m_rotationY, m_rotationZ);
+	return XMFLOAT3(rotation_x_, rotation_y_, rotation_z_);
 }
 
-void CameraClass::Render()
+void camera_class::render()
 {
 	XMFLOAT3 up, position, lookAt;
 	XMVECTOR upVector, positionVector, lookAtVector;
@@ -69,9 +69,9 @@ void CameraClass::Render()
 	upVector = XMLoadFloat3(&up);
 
 	// Setup the position of the camera in the world.
-	position.x = m_positionX;
-	position.y = m_positionY;
-	position.z = m_positionZ;
+	position.x = position_x_;
+	position.y = position_y_;
+	position.z = position_z_;
 
 	// Load it into a XMVECTOR structure.
 	positionVector = XMLoadFloat3(&position);
@@ -85,9 +85,9 @@ void CameraClass::Render()
 	lookAtVector = XMLoadFloat3(&lookAt);
 
 	// Set the yaw (Y axis), pitch (X axis), and roll (Z axis) rotations in radians.
-	pitch = m_rotationX * 0.0174532925f;
-	yaw = m_rotationY * 0.0174532925f;
-	roll = m_rotationZ * 0.0174532925f;
+	pitch = rotation_x_ * 0.0174532925f;
+	yaw = rotation_y_ * 0.0174532925f;
+	roll = rotation_z_ * 0.0174532925f;
 
 	// Create the rotation matrix from the yaw, pitch, and roll values.
 	rotationMatrix = XMMatrixRotationRollPitchYaw(pitch, yaw, roll);
@@ -100,18 +100,18 @@ void CameraClass::Render()
 	lookAtVector = XMVectorAdd(positionVector, lookAtVector);
 
 	// Finally create the view matrix from the three updated vectors.
-	m_viewMatrix = XMMatrixLookAtLH(positionVector, lookAtVector, upVector);
+	view_matrix_ = XMMatrixLookAtLH(positionVector, lookAtVector, upVector);
 
 	return;
 }
 
-XMMATRIX CameraClass::GetViewMatrix(XMMATRIX& viewMatrix) const
+XMMATRIX camera_class::get_view_matrix(XMMATRIX& view_matrix) const
 {
-	viewMatrix = m_viewMatrix;
-	return viewMatrix;
+	view_matrix = view_matrix_;
+	return view_matrix;
 }
 
-void CameraClass::RenderReflection(float height)
+void camera_class::render_reflection(float height)
 {
 	XMFLOAT3 up, position, lookAt;
 	XMVECTOR upVector, positionVector, lookAtVector;
@@ -128,9 +128,9 @@ void CameraClass::RenderReflection(float height)
 	upVector = XMLoadFloat3(&up);
 
 	// Setup the position of the camera in the world.
-	position.x = m_positionX;
-	position.y = -m_positionY + (height * 2.0f);
-	position.z = m_positionZ;
+	position.x = position_x_;
+	position.y = -position_y_ + (height * 2.0f);
+	position.z = position_z_;
 
 	// Load it into a XMVECTOR structure.
 	positionVector = XMLoadFloat3(&position);
@@ -144,9 +144,9 @@ void CameraClass::RenderReflection(float height)
 	lookAtVector = XMLoadFloat3(&lookAt);
 
 	// Set the yaw (Y axis), pitch (X axis), and roll (Z axis) rotations in radians.
-	pitch = (-1.0f * m_rotationX) * 0.0174532925f;  // Invert for reflection
-	yaw = m_rotationY * 0.0174532925f;
-	roll = m_rotationZ * 0.0174532925f;
+	pitch = (-1.0f * rotation_x_) * 0.0174532925f;  // Invert for reflection
+	yaw = rotation_y_ * 0.0174532925f;
+	roll = rotation_z_ * 0.0174532925f;
 
 	// Create the rotation matrix from the yaw, pitch, and roll values.
 	rotationMatrix = XMMatrixRotationRollPitchYaw(pitch, yaw, roll);
@@ -159,13 +159,13 @@ void CameraClass::RenderReflection(float height)
 	lookAtVector = XMVectorAdd(positionVector, lookAtVector);
 
 	// Finally create the view matrix from the three updated vectors.
-	m_reflectionViewMatrix = XMMatrixLookAtLH(positionVector, lookAtVector, upVector);
+	reflection_view_matrix_ = XMMatrixLookAtLH(positionVector, lookAtVector, upVector);
 
 	return;
 }
 
-void CameraClass::GetReflectionViewMatrix(XMMATRIX& reflectionViewMatrix) const
+void camera_class::get_reflection_view_matrix(XMMATRIX& reflectionViewMatrix) const
 {
-	reflectionViewMatrix = m_reflectionViewMatrix;
+	reflectionViewMatrix = reflection_view_matrix_;
 	return;
 }
\ No newline at end of file
diff --git a/enginecustom/src/src/system/d3dclass.cpp b/enginecustom/src/src/system/d_3d_class.cpp
similarity index 73%
rename from enginecustom/src/src/system/d3dclass.cpp
rename to enginecustom/src/src/system/d_3d_class.cpp
index 188a10e..f6d05c0 100644
--- a/enginecustom/src/src/system/d3dclass.cpp
+++ b/enginecustom/src/src/system/d_3d_class.cpp
@@ -1,36 +1,36 @@
 ////////////////////////////////////////////////////////////////////////////////
 // Filename: d3dclass.cpp
 ////////////////////////////////////////////////////////////////////////////////
-#include "d3dclass.h"
+#include "d_3d_class.h"
 
 
-D3DClass::D3DClass()
+d_3d_class::d_3d_class()
 {
-	m_swapChain = 0;
-	m_device = 0;
-	m_deviceContext = 0;
-	m_renderTargetView = 0;
-	m_depthStencilBuffer = 0;
-	m_depthStencilState = 0;
-	m_depthStencilView = 0;
-	m_rasterState = 0;
-	m_depthDisabledStencilState = 0;
-	m_alphaEnableBlendingState = 0;
-	m_alphaDisableBlendingState = 0;
+	swap_chain = 0;
+	device_ = 0;
+	device_context_ = 0;
+	render_target_view_ = 0;
+	depth_stencil_buffer_ = 0;
+	depth_stencil_state_ = 0;
+	depth_stencil_view_ = 0;
+	raster_state_ = 0;
+	depth_disabled_stencil_state_ = 0;
+	alpha_enable_blending_state_ = 0;
+	alpha_disable_blending_state_ = 0;
 }
 
 
-D3DClass::D3DClass(const D3DClass& other)
+d_3d_class::d_3d_class(const d_3d_class& other)
 {
 }
 
 
-D3DClass::~D3DClass()
+d_3d_class::~d_3d_class()
 {
 }
 
 
-bool D3DClass::Initialize(int screenWidth, int screenHeight, bool vsync, HWND hwnd, bool fullscreen, float screenDepth, float screenNear)
+bool d_3d_class::initialize(int screenWidth, int screenHeight, bool vsync, HWND hwnd, bool fullscreen, float screenDepth, float screenNear)
 {
 	Logger::Get().Log("Initializing D3Dclass", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -55,7 +55,7 @@ bool D3DClass::Initialize(int screenWidth, int screenHeight, bool vsync, HWND hw
 	D3D11_BLEND_DESC blendStateDescription;
 
 	// Store the vsync setting.
-	m_vsync_enabled = vsync;
+	vsync_enabled_ = vsync;
 
 	// Create a DirectX graphics interface factory.
 	result = CreateDXGIFactory(__uuidof(IDXGIFactory), (void**)&factory);
@@ -128,10 +128,10 @@ bool D3DClass::Initialize(int screenWidth, int screenHeight, bool vsync, HWND hw
 	}
 
 	// Store the dedicated video card memory in megabytes.
-	m_videoCardMemory = (int)(adapterDesc.DedicatedVideoMemory / 1024 / 1024);
+	video_card_memory_ = (int)(adapterDesc.DedicatedVideoMemory / 1024 / 1024);
 
 	// Convert the name of the video card to a character array and store it.
-	error = wcstombs_s(&stringLength, m_videoCardDescription, 128, adapterDesc.Description, 128);
+	error = wcstombs_s(&stringLength, video_card_description_, 128, adapterDesc.Description, 128);
 	if (error != 0)
 	{
 		Logger::Get().Log("Failed to convert video card name to character array", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -154,7 +154,7 @@ bool D3DClass::Initialize(int screenWidth, int screenHeight, bool vsync, HWND hw
 	factory->Release();
 	factory = 0;
 
-	// Initialize the swap chain description.
+	// initialize the swap chain description.
 	ZeroMemory(&swapChainDesc, sizeof(swapChainDesc));
 
 	// Set to a single back buffer.
@@ -168,7 +168,7 @@ bool D3DClass::Initialize(int screenWidth, int screenHeight, bool vsync, HWND hw
 	swapChainDesc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
 
 	// Set the refresh rate of the back buffer.
-	if (m_vsync_enabled)
+	if (vsync_enabled_)
 	{
 		swapChainDesc.BufferDesc.RefreshRate.Numerator = numerator;
 		swapChainDesc.BufferDesc.RefreshRate.Denominator = denominator;
@@ -214,7 +214,7 @@ bool D3DClass::Initialize(int screenWidth, int screenHeight, bool vsync, HWND hw
 
 	// Create the swap chain, Direct3D device, and Direct3D device context.
 	result = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, &featureLevel, 1,
-		D3D11_SDK_VERSION, &swapChainDesc, &m_swapChain, &m_device, NULL, &m_deviceContext);
+		D3D11_SDK_VERSION, &swapChainDesc, &swap_chain, &device_, NULL, &device_context_);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Failed to create swap chain, device and device context", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -222,7 +222,7 @@ bool D3DClass::Initialize(int screenWidth, int screenHeight, bool vsync, HWND hw
 	}
 
 	// Get the pointer to the back buffer.
-	result = m_swapChain->GetBuffer(0, __uuidof(ID3D11Texture2D), (LPVOID*)&backBufferPtr);
+	result = swap_chain->GetBuffer(0, __uuidof(ID3D11Texture2D), (LPVOID*)&backBufferPtr);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Failed to get pointer to back buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -230,7 +230,7 @@ bool D3DClass::Initialize(int screenWidth, int screenHeight, bool vsync, HWND hw
 	}
 
 	// Create the render target view with the back buffer pointer.
-	result = m_device->CreateRenderTargetView(backBufferPtr, NULL, &m_renderTargetView);
+	result = device_->CreateRenderTargetView(backBufferPtr, NULL, &render_target_view_);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Failed to create render target view", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -241,7 +241,7 @@ bool D3DClass::Initialize(int screenWidth, int screenHeight, bool vsync, HWND hw
 	backBufferPtr->Release();
 	backBufferPtr = 0;
 
-	// Initialize the description of the depth buffer.
+	// initialize the description of the depth buffer.
 	ZeroMemory(&depthBufferDesc, sizeof(depthBufferDesc));
 
 	// Set up the description of the depth buffer.
@@ -258,14 +258,14 @@ bool D3DClass::Initialize(int screenWidth, int screenHeight, bool vsync, HWND hw
 	depthBufferDesc.MiscFlags = 0;
 
 	// Create the texture for the depth buffer using the filled out description.
-	result = m_device->CreateTexture2D(&depthBufferDesc, NULL, &m_depthStencilBuffer);
+	result = device_->CreateTexture2D(&depthBufferDesc, NULL, &depth_stencil_buffer_);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Failed to create texture for depth buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
 		return false;
 	}
 
-	// Initialize the description of the stencil state.
+	// initialize the description of the stencil state.
 	ZeroMemory(&depthStencilDesc, sizeof(depthStencilDesc));
 
 	// Set up the description of the stencil state.
@@ -290,7 +290,7 @@ bool D3DClass::Initialize(int screenWidth, int screenHeight, bool vsync, HWND hw
 	depthStencilDesc.BackFace.StencilFunc = D3D11_COMPARISON_ALWAYS;
 
 	// Create the depth stencil state.
-	result = m_device->CreateDepthStencilState(&depthStencilDesc, &m_depthStencilState);
+	result = device_->CreateDepthStencilState(&depthStencilDesc, &depth_stencil_state_);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Failed to create depth stencil state", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -298,9 +298,9 @@ bool D3DClass::Initialize(int screenWidth, int screenHeight, bool vsync, HWND hw
 	}
 
 	// Set the depth stencil state.
-	m_deviceContext->OMSetDepthStencilState(m_depthStencilState, 1);
+	device_context_->OMSetDepthStencilState(depth_stencil_state_, 1);
 
-	// Initialize the depth stencil view.
+	// initialize the depth stencil view.
 	ZeroMemory(&depthStencilViewDesc, sizeof(depthStencilViewDesc));
 
 	// Set up the depth stencil view description.
@@ -309,7 +309,7 @@ bool D3DClass::Initialize(int screenWidth, int screenHeight, bool vsync, HWND hw
 	depthStencilViewDesc.Texture2D.MipSlice = 0;
 
 	// Create the depth stencil view.
-	result = m_device->CreateDepthStencilView(m_depthStencilBuffer, &depthStencilViewDesc, &m_depthStencilView);
+	result = device_->CreateDepthStencilView(depth_stencil_buffer_, &depthStencilViewDesc, &depth_stencil_view_);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Failed to create depth stencil view", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -317,7 +317,7 @@ bool D3DClass::Initialize(int screenWidth, int screenHeight, bool vsync, HWND hw
 	}
 
 	// Bind the render target view and depth stencil buffer to the output render pipeline.
-	m_deviceContext->OMSetRenderTargets(1, &m_renderTargetView, m_depthStencilView);
+	device_context_->OMSetRenderTargets(1, &render_target_view_, depth_stencil_view_);
 
 	// Setup the raster description which will determine how and what polygons will be drawn.
 	rasterDesc.AntialiasedLineEnable = false;
@@ -332,7 +332,7 @@ bool D3DClass::Initialize(int screenWidth, int screenHeight, bool vsync, HWND hw
 	rasterDesc.SlopeScaledDepthBias = 0.0f;
 
 	// Create the rasterizer state from the description we just filled out.
-	result = m_device->CreateRasterizerState(&rasterDesc, &m_rasterState);
+	result = device_->CreateRasterizerState(&rasterDesc, &raster_state_);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Failed to create rasterizer state", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -340,31 +340,31 @@ bool D3DClass::Initialize(int screenWidth, int screenHeight, bool vsync, HWND hw
 	}
 
 	// Now set the rasterizer state.
-	m_deviceContext->RSSetState(m_rasterState);
+	device_context_->RSSetState(raster_state_);
 
 	// Setup the viewport for rendering.
-	m_viewport.Width = (float)screenWidth;
-	m_viewport.Height = (float)screenHeight;
-	m_viewport.MinDepth = 0.0f;
-	m_viewport.MaxDepth = 1.0f;
-	m_viewport.TopLeftX = 0.0f;
-	m_viewport.TopLeftY = 0.0f;
+	viewport_.Width = (float)screenWidth;
+	viewport_.Height = (float)screenHeight;
+	viewport_.MinDepth = 0.0f;
+	viewport_.MaxDepth = 1.0f;
+	viewport_.TopLeftX = 0.0f;
+	viewport_.TopLeftY = 0.0f;
 
 	// Create the viewport.
-	m_deviceContext->RSSetViewports(1, &m_viewport);
+	device_context_->RSSetViewports(1, &viewport_);
 
 	// Setup the projection matrix.
 	fieldOfView = 3.141592654f / 4.0f;
 	screenAspect = (float)screenWidth / (float)screenHeight;
 
 	// Create the projection matrix for 3D rendering.
-	m_projectionMatrix = XMMatrixPerspectiveFovLH(fieldOfView, screenAspect, screenNear, screenDepth);
+	projection_matrix_ = XMMatrixPerspectiveFovLH(fieldOfView, screenAspect, screenNear, screenDepth);
 
-	// Initialize the world matrix to the identity matrix.
-	m_worldMatrix = XMMatrixIdentity();
+	// initialize the world matrix to the identity matrix.
+	world_matrix_ = XMMatrixIdentity();
 
 	// Create an orthographic projection matrix for 2D rendering.
-	m_orthoMatrix = XMMatrixOrthographicLH((float)screenWidth, (float)screenHeight, screenNear, screenDepth);
+	ortho_matrix_ = XMMatrixOrthographicLH((float)screenWidth, (float)screenHeight, screenNear, screenDepth);
 
 	// Clear the second depth stencil state before setting the parameters.
 	ZeroMemory(&depthDisabledStencilDesc, sizeof(depthDisabledStencilDesc));
@@ -387,7 +387,7 @@ bool D3DClass::Initialize(int screenWidth, int screenHeight, bool vsync, HWND hw
 	depthDisabledStencilDesc.BackFace.StencilFunc = D3D11_COMPARISON_ALWAYS;
 
 	// Create the state using the device.
-	result = m_device->CreateDepthStencilState(&depthDisabledStencilDesc, &m_depthDisabledStencilState);
+	result = device_->CreateDepthStencilState(&depthDisabledStencilDesc, &depth_disabled_stencil_state_);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Failed to create depth disabled stencil state", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -408,7 +408,7 @@ bool D3DClass::Initialize(int screenWidth, int screenHeight, bool vsync, HWND hw
 	blendStateDescription.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
 
 	// Create the blend state using the description.
-	result = m_device->CreateBlendState(&blendStateDescription, &m_alphaEnableBlendingState);
+	result = device_->CreateBlendState(&blendStateDescription, &alpha_enable_blending_state_);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Failed to create alpha enabled blend state", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -419,7 +419,7 @@ bool D3DClass::Initialize(int screenWidth, int screenHeight, bool vsync, HWND hw
 	blendStateDescription.RenderTarget[0].BlendEnable = FALSE;
 
 	// Create the blend state using the description.
-	result = m_device->CreateBlendState(&blendStateDescription, &m_alphaDisableBlendingState);
+	result = device_->CreateBlendState(&blendStateDescription, &alpha_disable_blending_state_);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Failed to create alpha disabled blend state", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -430,81 +430,81 @@ bool D3DClass::Initialize(int screenWidth, int screenHeight, bool vsync, HWND hw
 }
 
 
-void D3DClass::Shutdown()
+void d_3d_class::shutdown()
 {
 
 	Logger::Get().Log("Shutting down D3Dclass", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
 	// Before shutting down set to windowed mode or when you release the swap chain it will throw an exception.
-	if (m_swapChain)
+	if (swap_chain)
 	{
-		m_swapChain->SetFullscreenState(false, NULL);
+		swap_chain->SetFullscreenState(false, NULL);
 	}
 
-	if (m_alphaEnableBlendingState)
+	if (alpha_enable_blending_state_)
 	{
-		m_alphaEnableBlendingState->Release();
-		m_alphaEnableBlendingState = 0;
+		alpha_enable_blending_state_->Release();
+		alpha_enable_blending_state_ = 0;
 	}
 
-	if (m_alphaDisableBlendingState)
+	if (alpha_disable_blending_state_)
 	{
-		m_alphaDisableBlendingState->Release();
-		m_alphaDisableBlendingState = 0;
+		alpha_disable_blending_state_->Release();
+		alpha_disable_blending_state_ = 0;
 	}
 
-	if (m_depthDisabledStencilState)
+	if (depth_disabled_stencil_state_)
 	{
-		m_depthDisabledStencilState->Release();
-		m_depthDisabledStencilState = 0;
+		depth_disabled_stencil_state_->Release();
+		depth_disabled_stencil_state_ = 0;
 	}
 
-	if (m_rasterState)
+	if (raster_state_)
 	{
-		m_rasterState->Release();
-		m_rasterState = 0;
+		raster_state_->Release();
+		raster_state_ = 0;
 	}
 
-	if (m_depthStencilView)
+	if (depth_stencil_view_)
 	{
-		m_depthStencilView->Release();
-		m_depthStencilView = 0;
+		depth_stencil_view_->Release();
+		depth_stencil_view_ = 0;
 	}
 
-	if (m_depthStencilState)
+	if (depth_stencil_state_)
 	{
-		m_depthStencilState->Release();
-		m_depthStencilState = 0;
+		depth_stencil_state_->Release();
+		depth_stencil_state_ = 0;
 	}
 
-	if (m_depthStencilBuffer)
+	if (depth_stencil_buffer_)
 	{
-		m_depthStencilBuffer->Release();
-		m_depthStencilBuffer = 0;
+		depth_stencil_buffer_->Release();
+		depth_stencil_buffer_ = 0;
 	}
 
-	if (m_renderTargetView)
+	if (render_target_view_)
 	{
-		m_renderTargetView->Release();
-		m_renderTargetView = 0;
+		render_target_view_->Release();
+		render_target_view_ = 0;
 	}
 
-	if (m_deviceContext)
+	if (device_context_)
 	{
-		m_deviceContext->Release();
-		m_deviceContext = 0;
+		device_context_->Release();
+		device_context_ = 0;
 	}
 
-	if (m_device)
+	if (device_)
 	{
-		m_device->Release();
-		m_device = 0;
+		device_->Release();
+		device_ = 0;
 	}
 
-	if (m_swapChain)
+	if (swap_chain)
 	{
-		m_swapChain->Release();
-		m_swapChain = 0;
+		swap_chain->Release();
+		swap_chain = 0;
 	}
 
 	Logger::Get().Log("D3Dclass shutdown", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
@@ -513,7 +513,7 @@ void D3DClass::Shutdown()
 }
 
 
-void D3DClass::BeginScene(float red, float green, float blue, float alpha)
+void d_3d_class::begin_scene(float red, float green, float blue, float alpha)
 {
 	float color[4];
 
@@ -525,115 +525,115 @@ void D3DClass::BeginScene(float red, float green, float blue, float alpha)
 	color[3] = alpha;
 
 	// Clear the back buffer.
-	m_deviceContext->ClearRenderTargetView(m_renderTargetView, color);
+	device_context_->ClearRenderTargetView(render_target_view_, color);
 
 
 
 	// Clear the depth buffer.
-	m_deviceContext->ClearDepthStencilView(m_depthStencilView, D3D11_CLEAR_DEPTH, 1.0f, 0);
+	device_context_->ClearDepthStencilView(depth_stencil_view_, D3D11_CLEAR_DEPTH, 1.0f, 0);
 
 	return;
 }
 
 
-void D3DClass::EndScene()
+void d_3d_class::end_scene()
 {
 	// Present the back buffer to the screen since rendering is complete.
-	if (m_vsync_enabled)
+	if (vsync_enabled_)
 	{
 		// Lock to screen refresh rate.
-		m_swapChain->Present(1, 0);
+		swap_chain->Present(1, 0);
 	}
 	else
 	{
 		// Present as fast as possible.
-		m_swapChain->Present(0, 0);
+		swap_chain->Present(0, 0);
 	}
 
 	return;
 }
 
 
-ID3D11Device* D3DClass::GetDevice()
+ID3D11Device* d_3d_class::get_device()
 {
-	return m_device;
+	return device_;
 }
 
 
-ID3D11DeviceContext* D3DClass::GetDeviceContext()
+ID3D11DeviceContext* d_3d_class::get_device_context()
 {
-	return m_deviceContext;
+	return device_context_;
 }
 
-void D3DClass::GetVideoCardInfo(char* cardName, int& memory)
+void d_3d_class::get_video_card_info(char* cardName, int& memory)
 {
-	strcpy_s(cardName, 128, m_videoCardDescription);
-	memory = m_videoCardMemory;
+	strcpy_s(cardName, 128, video_card_description_);
+	memory = video_card_memory_;
 	return;
 }
 
 
-void D3DClass::SetBackBufferRenderTarget()
+void d_3d_class::set_back_buffer_render_target()
 {
 	// Bind the render target view and depth stencil buffer to the output render pipeline.
-	m_deviceContext->OMSetRenderTargets(1, &m_renderTargetView, m_depthStencilView);
+	device_context_->OMSetRenderTargets(1, &render_target_view_, depth_stencil_view_);
 
 	return;
 }
 
 
-void D3DClass::ResetViewport()
+void d_3d_class::reset_viewport()
 {
 	// Set the viewport.
-	m_deviceContext->RSSetViewports(1, &m_viewport);
+	device_context_->RSSetViewports(1, &viewport_);
 
 	return;
 }
 
-void D3DClass::ReleaseResources()
+void d_3d_class::release_resources()
 {
 	Logger::Get().Log("Releasing D3D resources", __FILE__, __LINE__);
 
 	// libere la vue
-	if (m_renderTargetView)
+	if (render_target_view_)
 	{
-		m_renderTargetView->Release();
-		m_renderTargetView = 0;
+		render_target_view_->Release();
+		render_target_view_ = 0;
 	}
 
 	// libere le buffer de profondeur
-	if (m_depthStencilBuffer)
+	if (depth_stencil_buffer_)
 	{
-		m_depthStencilBuffer->Release();
-		m_depthStencilBuffer = 0;
+		depth_stencil_buffer_->Release();
+		depth_stencil_buffer_ = 0;
 	}
 
 	// libere la vue de profondeur
-	if (m_depthStencilView)
+	if (depth_stencil_view_)
 	{
-		m_depthStencilView->Release();
-		m_depthStencilView = 0;
+		depth_stencil_view_->Release();
+		depth_stencil_view_ = 0;
 	}
 
 	Logger::Get().Log("D3D resources released", __FILE__, __LINE__);
 }
 
 // Reset the resources for the swap chain
-void D3DClass::ResetResources(int newWidth, int newHeight)
+void d_3d_class::reset_resources(int newWidth, int newHeight)
 {
 	Logger::Get().Log("Resetting D3D resources", __FILE__, __LINE__);
 
 	HRESULT result;
 
 	ID3D11Texture2D* backBuffer;
-	result = m_swapChain->GetBuffer(0, __uuidof(ID3D11Texture2D), (LPVOID*)&backBuffer);
+	result = swap_chain->GetBuffer(0, __uuidof(ID3D11Texture2D), (LPVOID*)&backBuffer);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Failed to get back buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
 		return;
 	}
 
-	result = m_device->CreateRenderTargetView(backBuffer, NULL, &m_renderTargetView);
+	result = device_->CreateRenderTargetView(backBuffer, NULL, &render_target_view_);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Failed to create render target view", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -669,14 +669,14 @@ void D3DClass::ResetResources(int newWidth, int newHeight)
 	depthStencilViewDesc.Texture2D.MipSlice = 0;
 
 	// Other depthStencilDesc settings...
-	result = m_device->CreateTexture2D(&depthBufferDesc, NULL, &m_depthStencilBuffer);
+	result = device_->CreateTexture2D(&depthBufferDesc, NULL, &depth_stencil_buffer_);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Failed to create depth stencil buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
 		return;
 	}
 
-	result = m_device->CreateDepthStencilView(m_depthStencilBuffer, &depthStencilViewDesc, &m_depthStencilView); 
+	result = device_->CreateDepthStencilView(depth_stencil_buffer_, &depthStencilViewDesc, &depth_stencil_view_); 
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Failed to create depth stencil view", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -684,15 +684,15 @@ void D3DClass::ResetResources(int newWidth, int newHeight)
 	}
 
 	// Set the new render target and depth/stencil views for rendering
-	m_deviceContext->OMSetRenderTargets(1, &m_renderTargetView, m_depthStencilView);
+	device_context_->OMSetRenderTargets(1, &render_target_view_, depth_stencil_view_);
 }
 
-IDXGISwapChain* D3DClass::GetSwapChain()
+IDXGISwapChain* d_3d_class::get_swap_chain()
 {
-	return m_swapChain;
+	return swap_chain;
 }
 
-void D3DClass::ResizeSwapChain(int newWidth, int newHeight)
+void d_3d_class::resize_swap_chain(int newWidth, int newHeight)
 {
 
 	// log the new width and height
@@ -701,11 +701,11 @@ void D3DClass::ResizeSwapChain(int newWidth, int newHeight)
 	HRESULT result;
 
 	// Release existing DirectX resources
-	ReleaseResources();
-	m_deviceContext->Flush();
+	release_resources();
+	device_context_->Flush();
 
 	// Resize the swap chain
-	result = m_swapChain->ResizeBuffers(0, newWidth, newHeight, DXGI_FORMAT_UNKNOWN, 0);
+	result = swap_chain->ResizeBuffers(0, newWidth, newHeight, DXGI_FORMAT_UNKNOWN, 0);
 	if (FAILED(result))
 	{
 		Logger::Get().Log("Failed to resize swap chain", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -713,28 +713,28 @@ void D3DClass::ResizeSwapChain(int newWidth, int newHeight)
 	}
 
 	// Reset the resources
-	ResetResources(newWidth, newHeight);
+	reset_resources(newWidth, newHeight);
 	
 	// Update the viewport
-	m_viewport.Width = static_cast<float>(newWidth);
-	m_viewport.Height = static_cast<float>(newHeight);
-	m_deviceContext->RSSetViewports(1, &m_viewport);
+	viewport_.Width = static_cast<float>(newWidth);
+	viewport_.Height = static_cast<float>(newHeight);
+	device_context_->RSSetViewports(1, &viewport_);
 }
 
-void D3DClass::TurnZBufferOn()
+void d_3d_class::turn_z_buffer_on()
 {
-	m_deviceContext->OMSetDepthStencilState(m_depthStencilState, 1);
+	device_context_->OMSetDepthStencilState(depth_stencil_state_, 1);
 	return;
 }
 
 
-void D3DClass::TurnZBufferOff()
+void d_3d_class::turn_z_buffer_off()
 {
-	m_deviceContext->OMSetDepthStencilState(m_depthDisabledStencilState, 1);
+	device_context_->OMSetDepthStencilState(depth_disabled_stencil_state_, 1);
 	return;
 }
 
-void D3DClass::EnableAlphaBlending()
+void d_3d_class::enable_alpha_blending()
 {
 	float blendFactor[4];
 
@@ -746,12 +746,12 @@ void D3DClass::EnableAlphaBlending()
 	blendFactor[3] = 0.0f;
 
 	// Turn on the alpha blending.
-	m_deviceContext->OMSetBlendState(m_alphaEnableBlendingState, blendFactor, 0xffffffff);
+	device_context_->OMSetBlendState(alpha_enable_blending_state_, blendFactor, 0xffffffff);
 
 	return;
 }
 
-void D3DClass::DisableAlphaBlending()
+void d_3d_class::disable_alpha_blending()
 {
 	float blendFactor[4];
 
@@ -763,12 +763,12 @@ void D3DClass::DisableAlphaBlending()
 	blendFactor[3] = 0.0f;
 
 	// Turn off the alpha blending.
-	m_deviceContext->OMSetBlendState(m_alphaDisableBlendingState, blendFactor, 0xffffffff);
+	device_context_->OMSetBlendState(alpha_disable_blending_state_, blendFactor, 0xffffffff);
 
 	return;
 }
 
-void D3DClass::SetVsync(bool vsync)
+void d_3d_class::set_vsync(bool vsync)
 {
-	m_vsync_enabled = vsync;
+	vsync_enabled_ = vsync;
 }
\ No newline at end of file
diff --git a/enginecustom/src/src/system/displayplaneclass.cpp b/enginecustom/src/src/system/display_plane_class.cpp
similarity index 85%
rename from enginecustom/src/src/system/displayplaneclass.cpp
rename to enginecustom/src/src/system/display_plane_class.cpp
index ab6c4d8..f910bc4 100644
--- a/enginecustom/src/src/system/displayplaneclass.cpp
+++ b/enginecustom/src/src/system/display_plane_class.cpp
@@ -1,29 +1,29 @@
-#include "displayplaneclass.h"
+#include "display_plane_class.h"
 
 
-DisplayPlaneClass::DisplayPlaneClass()
+display_plane_class::display_plane_class()
 {
     m_vertexBuffer = 0;
     m_indexBuffer = 0;
 }
 
 
-DisplayPlaneClass::DisplayPlaneClass(const DisplayPlaneClass& other)
+display_plane_class::display_plane_class(const display_plane_class& other)
 {
 }
 
 
-DisplayPlaneClass::~DisplayPlaneClass()
+display_plane_class::~display_plane_class()
 {
 }
 
-bool DisplayPlaneClass::Initialize(ID3D11Device* device, float width, float height)
+bool display_plane_class::Initialize(ID3D11Device* device, float width, float height)
 {
-    Logger::Get().Log("Initializing DisplayPlaneClass, width: " + std::to_string(width) + ", height: " + std::to_string(height), __FILE__, __LINE__, Logger::LogLevel::Initialize);
+    Logger::Get().Log("Initializing display_plane_class, width: " + std::to_string(width) + ", height: " + std::to_string(height), __FILE__, __LINE__, Logger::LogLevel::Initialize);
     bool result;
 
 
-    // Initialize the vertex and index buffer that hold the geometry for the button.
+    // initialize the vertex and index buffer that hold the geometry for the button.
     result = InitializeBuffers(device, width, height);
     if (!result)
     {
@@ -35,7 +35,7 @@ bool DisplayPlaneClass::Initialize(ID3D11Device* device, float width, float heig
 }
 
 
-void DisplayPlaneClass::Shutdown()
+void display_plane_class::Shutdown()
 {
     // Release the vertex and index buffers.
     ShutdownBuffers();
@@ -44,7 +44,7 @@ void DisplayPlaneClass::Shutdown()
 }
 
 
-void DisplayPlaneClass::Render(ID3D11DeviceContext* deviceContext)
+void display_plane_class::Render(ID3D11DeviceContext* deviceContext)
 {
     // Put the vertex and index buffers on the graphics pipeline to prepare them for drawing.
     RenderBuffers(deviceContext);
@@ -53,12 +53,12 @@ void DisplayPlaneClass::Render(ID3D11DeviceContext* deviceContext)
 }
 
 
-int DisplayPlaneClass::GetIndexCount()
+int display_plane_class::GetIndexCount()
 {
     return m_indexCount;
 }
 
-bool DisplayPlaneClass::InitializeBuffers(ID3D11Device* device, float width, float height)
+bool display_plane_class::InitializeBuffers(ID3D11Device* device, float width, float height)
 {
     Logger::Get().Log("Initializing buffers", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -164,7 +164,7 @@ bool DisplayPlaneClass::InitializeBuffers(ID3D11Device* device, float width, flo
 }
 
 
-void DisplayPlaneClass::ShutdownBuffers()
+void display_plane_class::ShutdownBuffers()
 {
     Logger::Get().Log("Shutting down Plane buffers", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
@@ -188,7 +188,7 @@ void DisplayPlaneClass::ShutdownBuffers()
 }
 
 
-void DisplayPlaneClass::RenderBuffers(ID3D11DeviceContext* deviceContext)
+void display_plane_class::RenderBuffers(ID3D11DeviceContext* deviceContext)
 {
     unsigned int stride;
     unsigned int offset;
diff --git a/enginecustom/src/src/system/fontclass.cpp b/enginecustom/src/src/system/font_class.cpp
similarity index 88%
rename from enginecustom/src/src/system/fontclass.cpp
rename to enginecustom/src/src/system/font_class.cpp
index 2fe58b7..1ad1062 100644
--- a/enginecustom/src/src/system/fontclass.cpp
+++ b/enginecustom/src/src/system/font_class.cpp
@@ -1,22 +1,22 @@
-#include "fontclass.h"
+#include "font_class.h"
 
-FontClass::FontClass()
+font_class::font_class()
 {
     m_Font = 0;
     m_Texture = 0;
 }
 
 
-FontClass::FontClass(const FontClass& other)
+font_class::font_class(const font_class& other)
 {
 }
 
 
-FontClass::~FontClass()
+font_class::~font_class()
 {
 }
 
-bool FontClass::Initialize(ID3D11Device* device, ID3D11DeviceContext* deviceContext, int fontChoice)
+bool font_class::Initialize(ID3D11Device* device, ID3D11DeviceContext* deviceContext, int fontChoice)
 {
     Logger::Get().Log("Initializing font class", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -66,7 +66,7 @@ bool FontClass::Initialize(ID3D11Device* device, ID3D11DeviceContext* deviceCont
     return true;
 }
 
-void FontClass::Shutdown()
+void font_class::Shutdown()
 {
     // Release the font texture.
     ReleaseTexture();
@@ -77,7 +77,7 @@ void FontClass::Shutdown()
     return;
 }
 
-bool FontClass::LoadFontData(char* filename)
+bool font_class::LoadFontData(char* filename)
 {
     Logger::Get().Log(("Loading font data from %s", filename), __FILE__, __LINE__);
 
@@ -123,7 +123,7 @@ bool FontClass::LoadFontData(char* filename)
     return true;
 }
 
-void FontClass::ReleaseFontData()
+void font_class::ReleaseFontData()
 {
     // Release the font data array.
     if (m_Font)
@@ -135,7 +135,7 @@ void FontClass::ReleaseFontData()
     return;
 }
 
-bool FontClass::LoadTexture(ID3D11Device* device, ID3D11DeviceContext* deviceContext, char* filename)
+bool font_class::LoadTexture(ID3D11Device* device, ID3D11DeviceContext* deviceContext, char* filename)
 {
     Logger::Get().Log(("Loading font texture from %s", filename), __FILE__, __LINE__);
 
@@ -143,7 +143,7 @@ bool FontClass::LoadTexture(ID3D11Device* device, ID3D11DeviceContext* deviceCon
 
 
     // Create and initialize the font texture object.
-    m_Texture = new TextureClass;
+    m_Texture = new texture_class;
 
     result = m_Texture->Initialize(device, deviceContext, filename);
     if (!result)
@@ -157,7 +157,7 @@ bool FontClass::LoadTexture(ID3D11Device* device, ID3D11DeviceContext* deviceCon
     return true;
 }
 
-void FontClass::ReleaseTexture()
+void font_class::ReleaseTexture()
 {
     // Release the texture object.
     if (m_Texture)
@@ -170,12 +170,12 @@ void FontClass::ReleaseTexture()
     return;
 }
 
-ID3D11ShaderResourceView* FontClass::GetTexture()
+ID3D11ShaderResourceView* font_class::GetTexture()
 {
     return m_Texture->GetTexture();
 }
 
-void FontClass::BuildVertexArray(void* vertices, char* sentence, float drawX, float drawY)
+void font_class::BuildVertexArray(void* vertices, char* sentence, float drawX, float drawY)
 {
     VertexType* vertexPtr;
     int numLetters, index, i, letter;
@@ -236,7 +236,7 @@ void FontClass::BuildVertexArray(void* vertices, char* sentence, float drawX, fl
     return;
 }
 
-int FontClass::GetSentencePixelLength(char* sentence)
+int font_class::GetSentencePixelLength(char* sentence)
 {
     int pixelLength, numLetters, i, letter;
 
@@ -262,7 +262,7 @@ int FontClass::GetSentencePixelLength(char* sentence)
     return pixelLength;
 }
 
-int FontClass::GetFontHeight()
+int font_class::GetFontHeight()
 {
     return (int)m_fontHeight;
 }
diff --git a/enginecustom/src/src/system/fpsclass.cpp b/enginecustom/src/src/system/fps_class.cpp
similarity index 71%
rename from enginecustom/src/src/system/fpsclass.cpp
rename to enginecustom/src/src/system/fps_class.cpp
index 3e4b3ca..36d4a30 100644
--- a/enginecustom/src/src/system/fpsclass.cpp
+++ b/enginecustom/src/src/system/fps_class.cpp
@@ -1,21 +1,21 @@
-#include "fpsclass.h"
+#include "fps_class.h"
 
 
-FpsClass::FpsClass()
+fps_class::fps_class()
 {
 }
 
 
-FpsClass::FpsClass(const FpsClass& other)
+fps_class::fps_class(const fps_class& other)
 {
 }
 
 
-FpsClass::~FpsClass()
+fps_class::~fps_class()
 {
 }
 
-void FpsClass::Initialize()
+void fps_class::Initialize()
 {
     m_fps = 0;
     m_count = 0;
@@ -28,7 +28,7 @@ void FpsClass::Initialize()
     return;
 }
 
-void FpsClass::Frame()
+void fps_class::Frame()
 {
 
     unsigned int currentTime = timeGetTime();
@@ -55,28 +55,28 @@ void FpsClass::Frame()
     return;
 }
 
-int FpsClass::GetMinFps() const
+int fps_class::GetMinFps() const
 {
     return m_minFps;
 }
 
-int FpsClass::GetMaxFps() const
+int fps_class::GetMaxFps() const
 {
     return m_maxFps;
 }
 
-float FpsClass::GetFrameTime() const
+float fps_class::GetFrameTime() const
 {
     return m_frameTime;
 }
 
-void FpsClass::ResetStats()
+void fps_class::ResetStats()
 {
     m_minFps = INT_MAX;
     m_maxFps = 0;
 }
 
-int FpsClass::GetFps()
+int fps_class::GetFps()
 {
     return m_fps;
 }
\ No newline at end of file
diff --git a/enginecustom/src/src/system/frustum.cpp b/enginecustom/src/src/system/frustum.cpp
index 2057088..c2c7908 100644
--- a/enginecustom/src/src/system/frustum.cpp
+++ b/enginecustom/src/src/system/frustum.cpp
@@ -1,6 +1,6 @@
 #include "frustum.h"
 
-void Frustum::ConstructFrustum(float screenDepth, XMMATRIX projectionMatrix, XMMATRIX viewMatrix)
+void frustum::ConstructFrustum(float screenDepth, XMMATRIX projectionMatrix, XMMATRIX viewMatrix)
 {
     XMMATRIX matrix;
     XMVECTOR planes[6];
@@ -56,7 +56,7 @@ void Frustum::ConstructFrustum(float screenDepth, XMMATRIX projectionMatrix, XMM
     }
 }
 
-bool Frustum::CheckCube(float xCenter, float yCenter, float zCenter, float radius, float tolerance)
+bool frustum::CheckCube(float xCenter, float yCenter, float zCenter, float radius, float tolerance)
 {
     // Vérifiez chaque plan du frustum pour voir si le cube est à l'intérieur
     for (int i = 0; i < 6; i++)
diff --git a/enginecustom/src/src/system/imguiManager.cpp b/enginecustom/src/src/system/imguiManager.cpp
index ab7546e..6a631c0 100644
--- a/enginecustom/src/src/system/imguiManager.cpp
+++ b/enginecustom/src/src/system/imguiManager.cpp
@@ -1,16 +1,37 @@
 #include "imguiManager.h"
-#include "applicationclass.h"
+#include "application_class.h"
+
+static fps_limiter fpsLimiter(60.0f);
 
 imguiManager::imguiManager()
 {
 	io = nullptr;
 	m_frameTimeHistoryIndex = 0;
+
+	current_fps_ = 0;
+	min_fps_ = 0;
+	max_fps_ = 0;
+	draw_calls_ = 0;
+	total_vertex_count_ = 0;
+	total_triangle_count_ = 0;
+	visible_triangle_count_ = 0;
+	current_frame_time_ = 0;
     
 	// Initialiser l'historique des frametimes à zéro
 	for (int i = 0; i < FRAME_HISTORY_COUNT; i++)
 	{
 		m_frameTimeHistory[i] = 0.0f;
 	}
+
+	widgets_ = {
+		{&showObjectWindow, [&](){WidgetObjectWindow();}},
+		{&showEngineSettingsWindow, [&](){WidgetEngineSettingsWindow();}},
+		{&showTerrainWindow, [&](){WidgetTerrainWindow();}},
+		{&showLightWindow, [&](){WidgetLightWindow();}},
+		{&showLogWindow, [&](){WidgetLogWindow();}},
+		{&showOldSceneWindow, [&](){WidgetRenderWindow(ImVec2(800, 600));}},
+		{&showStatsWindow, [&](){WidgetRenderStats();}}
+	};
 }
 
 imguiManager::~imguiManager()
@@ -154,17 +175,17 @@ void imguiManager::Shutdown()
 	Logger::Get().Log("imgui shutdown", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 }
 
-void imguiManager::Render(ApplicationClass* app)
+void imguiManager::Render()
 {
 	ImGui::Render();
 
-	//app->GetDirect3D()->TurnZBufferOff();
-	//app->GetDirect3D()->EnableAlphaBlending();
+	//app->get_direct_3d()->turn_z_buffer_off();
+	//app->get_direct_3d()->enable_alpha_blending();
 	
 	ImGui_ImplDX11_RenderDrawData(ImGui::GetDrawData());
 
-	//app->GetDirect3D()->DisableAlphaBlending();
-	//app->GetDirect3D()->TurnZBufferOn();
+	//app->get_direct_3d()->disable_alpha_blending();
+	//app->get_direct_3d()->turn_z_buffer_on();
 }
 
 void imguiManager::NewFrame()
@@ -174,7 +195,7 @@ void imguiManager::NewFrame()
 	ImGui::NewFrame();
 }
 
-void imguiManager::SetupDockspace(ApplicationClass* app) {
+void imguiManager::SetupDockspace() {
     // Configuration du style pour supprimer l'espace autour des fenêtres dockées
     ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
     ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
@@ -212,16 +233,16 @@ void imguiManager::SetupDockspace(ApplicationClass* app) {
             ImGui::MenuItem("Light Window", NULL, &showLightWindow);
             ImGui::MenuItem("Engine Settings Window", NULL, &showEngineSettingsWindow);
             ImGui::MenuItem("Log Window", NULL, &showLogWindow);
-            ImGui::MenuItem("Render Stats", NULL, &showStatsWindow);
+            ImGui::MenuItem("render Stats", NULL, &showStatsWindow);
             ImGui::EndMenu();
         }
 
         if (ImGui::BeginMenu("Scene")) {
             if (ImGui::MenuItem("Save Scene")) {
-                app->SaveScene();
+                app_->save_scene();
             }
             if (ImGui::MenuItem("Load Scene")) {
-                app->LoadScene();
+                app_->load_scene();
             }
             ImGui::EndMenu();
         }
@@ -247,13 +268,13 @@ void imguiManager::WidgetButton()
 	ImGui::Text("counter = %d", counter);
 }
 
-void imguiManager::WidgetAddObject(ApplicationClass* app)
+void imguiManager::WidgetAddObject()
 {
 	if (ImGui::CollapsingHeader("Objects"))
 	{
 		if (ImGui::Button("Add Cube"))
 		{
-			app->AddCube();
+			app_->add_cube();
 		}
 		ImGui::SameLine();
 		if (ImGui::Button("Import Object"))
@@ -333,22 +354,22 @@ void imguiManager::WidgetAddObject(ApplicationClass* app)
         
 					// Remplacer les antislashs par des slashs
 					std::replace(relativePath.begin(), relativePath.end(), L'\\', L'/');
-					app->AddKobject(relativePath);
+					app_->add_kobject(relativePath);
 				}
 				
 			}
 
 		}
 		ImGui::SameLine();
-		ImGui::Text("Number of cubes: %d", app->GetCubeCount());
+		ImGui::Text("Number of cubes: %d", app_->get_cube_count());
 	}
 }
 
-void imguiManager::WidgetObjectWindow(ApplicationClass* app)
+void imguiManager::WidgetObjectWindow()
 {
 	ImGui::Begin("Objects", &showObjectWindow);
 	int index = 0;
-	for (auto& object : app->GetKobjects())
+	for (auto& object : app_->get_kobjects())
 	{
 		std::string headerName = object->GetName() + " " + std::to_string(index);
 		if (ImGui::CollapsingHeader(headerName.c_str()))
@@ -381,7 +402,7 @@ void imguiManager::WidgetObjectWindow(ApplicationClass* app)
 			
 			 ImGui::Separator();
 
-            // Définir les types de textures
+            // Définir les types de textures_
             std::vector<std::string> textureCategories = {
                 "Diffuse", "Normal", "Specular", "Alpha"
             };
@@ -391,7 +412,7 @@ void imguiManager::WidgetObjectWindow(ApplicationClass* app)
                 TextureType::Specular, TextureType::Alpha
             };
 
-            // Créer un espace pour afficher les textures avec défilement
+            // Créer un espace pour afficher les textures_ avec défilement
             ImGui::BeginChild("TextureChild", ImVec2(0, 200), true, ImGuiWindowFlags_HorizontalScrollbar);
             
             // Pour chaque type de texture
@@ -404,14 +425,14 @@ void imguiManager::WidgetObjectWindow(ApplicationClass* app)
                 ImGui::Text("%s:", typeName.c_str());
                 ImGui::SameLine();
 
-                // Compter combien de textures de ce type existent
+                // Compter combien de textures_ de ce type existent
                 int textureCount = 0;
                 while (object->GetTexture(type, textureCount) != nullptr)
                 {
                     textureCount++;
                 }
 
-                // Afficher toutes les textures existantes
+                // Afficher toutes les textures_ existantes
                 ImGui::BeginGroup();
                 for (int texIndex = 0; texIndex < textureCount; texIndex++)
                 {
@@ -496,7 +517,7 @@ void imguiManager::WidgetObjectWindow(ApplicationClass* app)
 			std::string deleteLabel = "Delete##" + std::to_string(index);
 			if (ImGui::Button(deleteLabel.c_str()))
 			{
-				app->DeleteKobject(index);
+				app_->delete_kobject(index);
 			}
 
 			ImGui::Separator();
@@ -547,8 +568,8 @@ void imguiManager::WidgetObjectWindow(ApplicationClass* app)
 			
 			ImGui::Separator();
 
-			// Physics
-			std::string physicsLabel = "Physics##" + std::to_string(index);
+			// physics
+			std::string physicsLabel = "physics##" + std::to_string(index);
 			
 			if (ImGui::Checkbox(physicsLabel.c_str(), &m_isPhyiscsEnabled)) 
 			{
@@ -629,17 +650,17 @@ void imguiManager::WidgetObjectWindow(ApplicationClass* app)
 	ImGui::End();
 }
 
-void imguiManager::WidgetTerrainWindow(ApplicationClass* app)
+void imguiManager::WidgetTerrainWindow()
 {
 	ImGui::Begin("Terrain", &showTerrainWindow);
 
-	ImGui::Text("Number of terrain cubes: %d", app->GetTerrainCubeCount());
+	ImGui::Text("Number of terrain cubes: %d", app_->get_terrain_cube_count());
 
 	ImGui::Separator();
 
 	if (ImGui::Button("Generate Flat Terrain"))
 	{
-		app->GenerateTerrain();
+		app_->generate_terrain();
 	}
 	
 	ImGui::Separator();
@@ -657,14 +678,14 @@ void imguiManager::WidgetTerrainWindow(ApplicationClass* app)
 
 	if (ImGui::Button("Generate BigCube Terrain"))
 	{
-		app->CreateBigCube(m_SideCount);
+		app_->create_big_cube(m_SideCount);
 	}
 
 	ImGui::Separator();
 
 	if (ImGui::Button("Delete All Terrain Cubes"))
 	{
-		app->DeleteTerrain();
+		app_->delete_terrain();
 	}
 
 
@@ -672,76 +693,45 @@ void imguiManager::WidgetTerrainWindow(ApplicationClass* app)
 	ImGui::End();
 }
 
-bool imguiManager::ImGuiWidgetRenderer(ApplicationClass* app)
+bool imguiManager::ImGuiWidgetRenderer()
 {
 	// Start the Dear ImGui frame
 	NewFrame();
 
 	// Setup the dockspace
-	SetupDockspace(app);
+	SetupDockspace();
 
 	//ImGui Widget
 	ImGui::Begin("Khaotic Engine", NULL);
 
-	float speed = app->GetSpeed();
+	float speed = app_->get_speed();
+	
 	WidgetSpeedSlider(&speed);
-	app->SetSpeed(speed);
+	app_->set_speed(speed);
 	WidgetButton();
-	// WidgetFPS();
-	WidgetAddObject(app);
+	WidgetAddObject();
 
 	ImGui::End();
 
-	// Show windows if their corresponding variables are true
-	if (showObjectWindow)
+	// Read the widget list and call the function if the show variable is true
+	for (const auto& entry : widgets_)
 	{
-		WidgetObjectWindow(app);
-	}
-
-	if (showTerrainWindow)
-	{
-		WidgetTerrainWindow(app);
-	}
-
-	if (showLightWindow)
-	{
-		WidgetLightWindow(app);
-	}
-
-	if (showEngineSettingsWindow)
-	{
-		WidgetEngineSettingsWindow(app);
-	}
-
-	if (showLogWindow)
-	{
-		WidgetLogWindow(app);
-	}
-
-	if (showOldSceneWindow)
-	{
-		WidgetRenderWindow(app, ImVec2(800, 600));
-	}
-
-	if (showStatsWindow)
-	{
-		WidgetRenderStats(app);
+		if (*entry.show == true) {entry.func();}
 	}
 	
-
 	//render imgui
-	Render(app);
+	Render();
 
 	return true;
 }
 
-void imguiManager::WidgetLightWindow(ApplicationClass* app)
+void imguiManager::WidgetLightWindow()
 {
 	ImGui::Begin("Light", &showLightWindow);
 	
 
 	// Sun light settings
-	LightClass* sunLight = app->GetSunLight();
+	light_class* sunLight = app_->get_sun_light();
 	// Direction input
 	XMFLOAT3 direction = sunLight->GetDirection();
 	float dir[3] = { direction.x, direction.y, direction.z };
@@ -770,13 +760,13 @@ void imguiManager::WidgetLightWindow(ApplicationClass* app)
 
 	// Area light settings
 
-	for(auto& light : app->GetLights())
+	for(auto& light : app_->get_lights())
 	{
 		std::string headerName = "Light " + std::to_string(index);
 		if (ImGui::CollapsingHeader(headerName.c_str()))
 		{
-			XMVECTOR position = app->GetLightPosition(index);
-			XMVECTOR color = app->GetLightColor(index);
+			XMVECTOR position = app_->get_light_position(index);
+			XMVECTOR color = app_->get_light_color(index);
 			float pos[3] = { XMVectorGetX(position), XMVectorGetY(position), XMVectorGetZ(position) };
 			float col[3] = { XMVectorGetX(color), XMVectorGetY(color), XMVectorGetZ(color) };
 
@@ -785,12 +775,12 @@ void imguiManager::WidgetLightWindow(ApplicationClass* app)
 
 			if (ImGui::DragFloat3(posLabel.c_str(), pos))
 			{
-				app->SetLightPosition(index, XMVectorSet(pos[0], pos[1], pos[2], 0.0f));
+				app_->set_light_position(index, XMVectorSet(pos[0], pos[1], pos[2], 0.0f));
 			}
 
 			if (ImGui::ColorEdit3(colLabel.c_str(), col))
 			{
-				app->SetLightColor(index, XMVectorSet(col[0], col[1], col[2], 0.0f));
+				app_->set_light_color(index, XMVectorSet(col[0], col[1], col[2], 0.0f));
 			}
 
 		}
@@ -800,18 +790,18 @@ void imguiManager::WidgetLightWindow(ApplicationClass* app)
 	ImGui::End();
 }
 
-void imguiManager::WidgetEngineSettingsWindow(ApplicationClass* app)
+void imguiManager::WidgetEngineSettingsWindow()
 {
 	ImGui::Begin("Engine Settings", &showEngineSettingsWindow);
 
 	// Begining Of General Setting
 	ImGui::Text("General");
 
-	// Checkbox for toggling vsync globally in the application class by calling the SetVsync function in the application class when the checkbox state changes
-	bool vsync = app->GetVsync();
+	// Checkbox for toggling vsync globally in the application class by calling the set_vsync function in the application class when the checkbox state changes
+	bool vsync = app_->get_vsync();
 	if (ImGui::Checkbox("Vsync", &vsync))
 	{
-		app->SetVsync(vsync);
+		app_->set_vsync(vsync);
 	}
 
 	// End Of General Setting
@@ -820,37 +810,37 @@ void imguiManager::WidgetEngineSettingsWindow(ApplicationClass* app)
 	ImGui::Text("Culling");
 
 	// float input for frustum tolerance
-	float frustumTolerance = app->GetFrustumTolerance();
+	float frustumTolerance = app_->get_frustum_tolerance();
 	if (ImGui::DragFloat("Frustum Tolerance", &frustumTolerance, 0.1f, 0.0f, 100.0f))
 	{
-		app->SetFrustumTolerance(frustumTolerance);
+		app_->set_frustum_tolerance(frustumTolerance);
 	}
 
 	// End Of Culling Setting
 	ImGui::Separator();
 
-	// Physics section
-	ImGui::Text("Physics");
+	// physics section
+	ImGui::Text("physics");
 
 	// Input To set the Fixed Update Interval
-	int physicsInterval = app->GetPhysicsTickRate();
-	if (ImGui::InputInt("Physics Tick Rate", &physicsInterval))
+	int physicsInterval = app_->get_physics_tick_rate();
+	if (ImGui::InputInt("physics Tick Rate", &physicsInterval))
 	{
-		app->SetPhysicsTickRate(physicsInterval);
+		app_->set_physics_tick_rate(physicsInterval);
 	}
 
 	// Input to change the gravity on same line
-	XMVECTOR gravity = app->GetPhysics()->GetGravity();
+	XMVECTOR gravity = app_->get_physics()->GetGravity();
 	float gravityValues[3] = { XMVectorGetX(gravity), XMVectorGetY(gravity), XMVectorGetZ(gravity) };
 	if (ImGui::DragFloat3("Gravity", gravityValues))
 	{
-		app->GetPhysics()->SetGravity(XMVectorSet(gravityValues[0], gravityValues[1], gravityValues[2], 0.0f));
+		app_->get_physics()->SetGravity(XMVectorSet(gravityValues[0], gravityValues[1], gravityValues[2], 0.0f));
 	}
 
 	ImGui::End();
 }
 
-void imguiManager::WidgetLogWindow(ApplicationClass* app)
+void imguiManager::WidgetLogWindow()
 {
     ImGui::Begin("Log Window" , &showLogWindow);
 
@@ -931,9 +921,9 @@ void imguiManager::WidgetLogWindow(ApplicationClass* app)
     ImGui::End();
 }
 
-void imguiManager::WidgetRenderWindow(ApplicationClass* app, ImVec2 availableSize)
+void imguiManager::WidgetRenderWindow(ImVec2 availableSize)
 {
-	ImGui::Begin("Render Window");
+	ImGui::Begin("render Window");
 
 	ImVec2 oldWindowSize = windowSize;
 	windowSize = ImGui::GetContentRegionAvail();
@@ -941,12 +931,12 @@ void imguiManager::WidgetRenderWindow(ApplicationClass* app, ImVec2 availableSiz
 	// Si la taille de la fenêtre a changé, ajustez la taille de la fenêtre de l'application
 	if (oldWindowSize.x != windowSize.x || oldWindowSize.y != windowSize.y)
 	{
-		app->SetWindowSize(windowSize);
+		app_->set_window_size(windowSize);
 	}
 	
 
 	// Get the aspect ratio of the scene in app
-	float aspectRatio = app->GetAspectRatio();
+	float aspectRatio = app_->get_aspect_ratio();
 	// calculate the size of the window
 	if (windowSize.x / windowSize.y > aspectRatio)
 	{
@@ -957,40 +947,48 @@ void imguiManager::WidgetRenderWindow(ApplicationClass* app, ImVec2 availableSiz
 		windowSize.y = windowSize.x / aspectRatio;
 	}
 	
-	ID3D11ShaderResourceView* texture = app->GetSceneTexture()->GetShaderResourceView();
+	ID3D11ShaderResourceView* texture = app_->get_scene_texture()->GetShaderResourceView();
 	if (texture)
 	{
 		
 		// Affichez la scenne projeté sur texture dans une fenêtre ImGui
 		// alpha blend is not enable to render the texture
 
-		app->GetDirect3D()->TurnZBufferOff();
-		app->GetDirect3D()->EnableAlphaBlending();
+		app_->get_direct_3d()->turn_z_buffer_off();
+		app_->get_direct_3d()->enable_alpha_blending();
 		
 		ImGui::Image((ImTextureID)texture, windowSize, ImVec2(0, 0), ImVec2(1, 1), ImVec4(1, 1, 1, 1));
 	}
 	else
 	{
-		ImGui::Text("Render texture is not available.");
+		ImGui::Text("render texture is not available.");
 	}
 
 	ImGui::End();
 }
 
-void imguiManager::WidgetRenderStats(ApplicationClass* app)
+void imguiManager::WidgetRenderStats()
 {
-    ImGui::Begin("Render Stats");
+    ImGui::Begin("render Stats");
 
-    // Récupérer le frametime actuel et le mettre dans l'historique
-    float currentFrameTime = app->GetFrameTime();
-    m_frameTimeHistory[m_frameTimeHistoryIndex] = currentFrameTime;
+
+	current_fps_ = app_->get_current_fps();
+	min_fps_ = app_->get_min_fps();
+	max_fps_ = app_->get_max_fps();
+	draw_calls_ = app_->get_draw_calls();
+	total_vertex_count_ = app_->get_total_vertex_count();
+	total_triangle_count_ = app_->get_total_triangle_count();
+	visible_triangle_count_ = app_->get_visible_triangle_count();
+	current_frame_time_ = app_->get_frame_time();
+	
+    m_frameTimeHistory[m_frameTimeHistoryIndex] = current_frame_time_;
     m_frameTimeHistoryIndex = (m_frameTimeHistoryIndex + 1) % FRAME_HISTORY_COUNT;
 
-    ImGui::Text("FPS: %d", app->GetCurrentFps());
+    ImGui::Text("FPS: %d", current_fps_);
     ImGui::SameLine();
-    ImGui::Text("Min Fps: %d", app->GetMinFps());
+    ImGui::Text("Min Fps: %d", min_fps_);
     ImGui::SameLine();
-    ImGui::Text("Max Fps: %d", app->GetMaxFps());
+    ImGui::Text("Max Fps: %d", max_fps_);
 
     ImGui::Separator();
 
@@ -1013,7 +1011,7 @@ void imguiManager::WidgetRenderStats(ApplicationClass* app)
     frameTimeMax += margin;
 
     // Afficher le graphique
-    ImGui::Text("Frame Time: %.3f ms", currentFrameTime * 1000.0f);
+    ImGui::Text("Frame Time: %.3f ms", current_frame_time_ * 1000.0f);
 	ImGui::PlotLines("FrameTimeGraph", // Au lieu de chaîne vide ""
 				 m_frameTimeHistory, 
 				 FRAME_HISTORY_COUNT, 
@@ -1023,16 +1021,16 @@ void imguiManager::WidgetRenderStats(ApplicationClass* app)
 				 frameTimeMax, 
 				 ImVec2(0, 80));
 
-    ImGui::Text("Draw Calls: %d", app->GetDrawCalls());
+    ImGui::Text("Draw Calls: %d", draw_calls_);
 
     ImGui::Separator();
 
     ImGui::Text("Statistiques de rendu:");
-    ImGui::Text("Vertices total: %d", app->GetTotalVertexCount());
+    ImGui::Text("Vertices total: %d", total_vertex_count_);
 
-    ImGui::Text("Triangles total: %d", app->GetTotalTriangleCount());
+    ImGui::Text("Triangles total: %d", total_triangle_count_);
     ImGui::SameLine();
-    ImGui::Text("Triangles visibles: %d", app->GetVisibleTriangleCount());
+    ImGui::Text("Triangles visibles: %d", visible_triangle_count_);
 
     ImGui::End();
 }
\ No newline at end of file
diff --git a/enginecustom/src/src/system/inputclass.cpp b/enginecustom/src/src/system/input_class.cpp
similarity index 86%
rename from enginecustom/src/src/system/inputclass.cpp
rename to enginecustom/src/src/system/input_class.cpp
index 34dee76..1c72dbe 100644
--- a/enginecustom/src/src/system/inputclass.cpp
+++ b/enginecustom/src/src/system/input_class.cpp
@@ -1,7 +1,7 @@
-#include "inputclass.h"
+#include "input_class.h"
 
 
-InputClass::InputClass()
+input_class::input_class()
 {
 	m_directInput = 0;
 	m_keyboard = 0;
@@ -10,16 +10,16 @@ InputClass::InputClass()
 }
 
 
-InputClass::InputClass(const InputClass& other)
+input_class::input_class(const input_class& other)
 {
 }
 
 
-InputClass::~InputClass()
+input_class::~input_class()
 {
 }
 
-bool InputClass::Initialize(HINSTANCE hinstance, HWND hwnd, int screenWidth, int screenHeight)
+bool input_class::Initialize(HINSTANCE hinstance, HWND hwnd, int screenWidth, int screenHeight)
 {
 	Logger::Get().Log("Initializing input class", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -118,7 +118,7 @@ bool InputClass::Initialize(HINSTANCE hinstance, HWND hwnd, int screenWidth, int
 }
 
 
-void InputClass::KeyDown(unsigned int input)
+void input_class::KeyDown(unsigned int input)
 {
 	// If a key is pressed then save that state in the key array.
 	Logger::Get().Log("Key down: " + std::to_string(input), __FILE__, __LINE__, Logger::LogLevel::Input);
@@ -127,7 +127,7 @@ void InputClass::KeyDown(unsigned int input)
 }
 
 
-void InputClass::KeyUp(unsigned int input)
+void input_class::KeyUp(unsigned int input)
 {
 	// If a key is released then clear that state in the key array.
 	m_keys[input] = false;
@@ -135,13 +135,13 @@ void InputClass::KeyUp(unsigned int input)
 }
 
 
-bool InputClass::IsKeyDown(unsigned int key) const
+bool input_class::IsKeyDown(unsigned int key) const
 {
 	// Return what state the key is in (pressed/not pressed).
 	return m_keys[key];
 }
 
-void InputClass::Shutdown()
+void input_class::Shutdown()
 {
 	Logger::Get().Log("Shutting down input class", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
@@ -173,7 +173,7 @@ void InputClass::Shutdown()
 	return;
 }
 
-bool InputClass::Frame()
+bool input_class::Frame()
 {
 	bool result;
 
@@ -200,7 +200,7 @@ bool InputClass::Frame()
 	return true;
 }
 
-bool InputClass::ReadKeyboard()
+bool input_class::ReadKeyboard()
 {
 	HRESULT result;
 
@@ -224,7 +224,7 @@ bool InputClass::ReadKeyboard()
 	return true;
 }
 
-bool InputClass::ReadMouse()
+bool input_class::ReadMouse()
 {
 	HRESULT result;
 
@@ -248,7 +248,7 @@ bool InputClass::ReadMouse()
 	return true;
 }
 
-void InputClass::ProcessInput()
+void input_class::ProcessInput()
 {
 	// Update the location of the mouse cursor based on the change of the mouse location during the frame.
 	m_mouseX += m_mouseState.lX;
@@ -264,7 +264,7 @@ void InputClass::ProcessInput()
 	return;
 }
 
-bool InputClass::IsEscapePressed() const
+bool input_class::IsEscapePressed() const
 {
 	// Do a bitwise and on the keyboard state to check if the escape key is currently being pressed.
 	if (m_keyboardState[DIK_ESCAPE] & 0x80)
@@ -275,7 +275,7 @@ bool InputClass::IsEscapePressed() const
 	return false;
 }
 
-bool InputClass::IsLeftArrowPressed() const
+bool input_class::IsLeftArrowPressed() const
 {
 	if (m_keyboardState[DIK_LEFT] & 0x80)
 	{
@@ -286,7 +286,7 @@ bool InputClass::IsLeftArrowPressed() const
 }
 
 
-bool InputClass::IsRightArrowPressed() const
+bool input_class::IsRightArrowPressed() const
 {
 	if (m_keyboardState[DIK_RIGHT] & 0x80)
 	{
@@ -296,7 +296,7 @@ bool InputClass::IsRightArrowPressed() const
 	return false;
 }
 
-bool InputClass::IsUpArrowPressed() const
+bool input_class::IsUpArrowPressed() const
 {
 	if (m_keyboardState[DIK_UP] & 0x80)
 	{
@@ -307,7 +307,7 @@ bool InputClass::IsUpArrowPressed() const
 }
 
 
-bool InputClass::IsDownArrowPressed() const
+bool input_class::IsDownArrowPressed() const
 {
 	if (m_keyboardState[DIK_DOWN] & 0x80)
 	{
@@ -321,7 +321,7 @@ bool InputClass::IsDownArrowPressed() const
 // Les touches correspondent aux claviers QWERTY //
 ///////////////////////////////////////////////////
 
-bool InputClass::IsAPressed() const
+bool input_class::IsAPressed() const
 {
 	// Touche A sur QWERTY, Q sur AZERTY
 	if (m_keyboardState[DIK_A] & 0x80)
@@ -332,7 +332,7 @@ bool InputClass::IsAPressed() const
 	return false;
 }
 
-bool InputClass::IsDPressed() const
+bool input_class::IsDPressed() const
 {
 	if (m_keyboardState[DIK_D] & 0x80)
 	{
@@ -342,7 +342,7 @@ bool InputClass::IsDPressed() const
 	return false;
 }
 
-bool InputClass::IsWPressed() const
+bool input_class::IsWPressed() const
 {
 	// Touche W sur QWERTY, Z sur AZERTY
 	if (m_keyboardState[DIK_W] & 0x80)
@@ -353,7 +353,7 @@ bool InputClass::IsWPressed() const
 	return false;
 }
 
-bool InputClass::IsSPressed() const
+bool input_class::IsSPressed() const
 {
 	if (m_keyboardState[DIK_S] & 0x80)
 	{
@@ -363,7 +363,7 @@ bool InputClass::IsSPressed() const
 	return false;
 }
 
-bool InputClass::IsQPressed() const
+bool input_class::IsQPressed() const
 {
 	// Touche Q sur QWERTY, A sur AZERTY
 	if (m_keyboardState[DIK_Q] & 0x80)
@@ -374,7 +374,7 @@ bool InputClass::IsQPressed() const
 	return false;
 }
 
-bool InputClass::IsEPressed() const
+bool input_class::IsEPressed() const
 {
 	if (m_keyboardState[DIK_E] & 0x80)
 	{
@@ -384,14 +384,14 @@ bool InputClass::IsEPressed() const
 	return false;
 }
 
-void InputClass::GetMouseLocation(int& mouseX, int& mouseY) const
+void input_class::GetMouseLocation(int& mouseX, int& mouseY) const
 {
 	mouseX = m_mouseX;
 	mouseY = m_mouseY;
 	return;
 }
 
-bool InputClass::IsLeftMousePressed() const
+bool input_class::IsLeftMousePressed() const
 {
 	// Check the left mouse button state.
 	if (m_mouseState.rgbButtons[0] & 0x80)
@@ -402,7 +402,7 @@ bool InputClass::IsLeftMousePressed() const
 	return false;
 }
 
-bool InputClass::IsRightMousePressed() const
+bool input_class::IsRightMousePressed() const
 {
 	// Check the left mouse button state.
 	if (m_mouseState.rgbButtons[1] & 0x80)
@@ -413,7 +413,7 @@ bool InputClass::IsRightMousePressed() const
 	return false;
 }
 
-bool InputClass::IsScrollUp() const
+bool input_class::IsScrollUp() const
 {
 	if (m_mouseState.lZ > 0)
 	{
@@ -423,7 +423,7 @@ bool InputClass::IsScrollUp() const
 	return false;
 }
 
-bool InputClass::IsScrollDown() const
+bool input_class::IsScrollDown() const
 {
 	if (m_mouseState.lZ < 0)
 	{
diff --git a/enginecustom/src/src/system/lightclass.cpp b/enginecustom/src/src/system/light_class.cpp
similarity index 51%
rename from enginecustom/src/src/system/lightclass.cpp
rename to enginecustom/src/src/system/light_class.cpp
index d3e55a4..8e4ad86 100644
--- a/enginecustom/src/src/system/lightclass.cpp
+++ b/enginecustom/src/src/system/light_class.cpp
@@ -1,24 +1,24 @@
 ////////////////////////////////////////////////////////////////////////////////
 // Filename: lightclass.cpp
 ////////////////////////////////////////////////////////////////////////////////
-#include "lightclass.h"
+#include "light_class.h"
 
 
-LightClass::LightClass()
+light_class::light_class()
 {
 }
 
 
-LightClass::LightClass(const LightClass& other)
+light_class::light_class(const light_class& other)
 {
 }
 
 
-LightClass::~LightClass()
+light_class::~light_class()
 {
 }
 
-void LightClass::SetAmbientColor(float red, float green, float blue, float alpha)
+void light_class::SetAmbientColor(float red, float green, float blue, float alpha)
 {
 	m_ambientColor = XMFLOAT4(red, green, blue, alpha);
 	return;
@@ -26,66 +26,66 @@ void LightClass::SetAmbientColor(float red, float green, float blue, float alpha
 
 
 
-void LightClass::SetDiffuseColor(float red, float green, float blue, float alpha)
+void light_class::SetDiffuseColor(float red, float green, float blue, float alpha)
 {
     m_diffuseColor = XMFLOAT4(red, green, blue, alpha);
     return;
 }
 
 
-void LightClass::SetDirection(float x, float y, float z)
+void light_class::SetDirection(float x, float y, float z)
 {
     m_direction = XMFLOAT3(x, y, z);
     return;
 }
 
-void LightClass::SetSpecularColor(float red, float green, float blue, float alpha)
+void light_class::SetSpecularColor(float red, float green, float blue, float alpha)
 {
     m_specularColor = XMFLOAT4(red, green, blue, alpha);
     return;
 }
 
 
-void LightClass::SetSpecularPower(float power)
+void light_class::SetSpecularPower(float power)
 {
     m_specularPower = power;
     return;
 }
 
-void LightClass::SetPosition(float x, float y, float z)
+void light_class::SetPosition(float x, float y, float z)
 {
     m_position = XMFLOAT4(x, y, z, 1.0f);
     return;
 }
 
-XMFLOAT4 LightClass::GetAmbientColor()
+XMFLOAT4 light_class::GetAmbientColor()
 {
 	return m_ambientColor;
 }
 
 
-XMFLOAT4 LightClass::GetDiffuseColor()
+XMFLOAT4 light_class::GetDiffuseColor()
 {
     return m_diffuseColor;
 }
 
-XMFLOAT3 LightClass::GetDirection()
+XMFLOAT3 light_class::GetDirection()
 {
     return m_direction;
 }
 
-XMFLOAT4 LightClass::GetSpecularColor()
+XMFLOAT4 light_class::GetSpecularColor()
 {
     return m_specularColor;
 }
 
 
-float LightClass::GetSpecularPower()
+float light_class::GetSpecularPower()
 {
     return m_specularPower;
 }
 
-XMFLOAT4 LightClass::GetPosition()
+XMFLOAT4 light_class::GetPosition()
 {
     return m_position;
 }
diff --git a/enginecustom/src/src/system/modelclass.cpp b/enginecustom/src/src/system/model_class.cpp
similarity index 92%
rename from enginecustom/src/src/system/modelclass.cpp
rename to enginecustom/src/src/system/model_class.cpp
index 55fe2ad..655a006 100644
--- a/enginecustom/src/src/system/modelclass.cpp
+++ b/enginecustom/src/src/system/model_class.cpp
@@ -1,7 +1,7 @@
-#include "modelclass.h"
+#include "model_class.h"
 
 
-ModelClass::ModelClass()
+model_class::model_class()
 {
 	m_vertexBuffer = 0;
 	m_indexBuffer = 0;
@@ -18,14 +18,14 @@ ModelClass::ModelClass()
 	m_Textures.alphaPaths.clear();
 }
 
-ModelClass::~ModelClass()
+model_class::~model_class()
 {
 
 	// Destructor
 	Shutdown();
 }
 
-bool ModelClass::Initialize(ID3D11Device* device, ID3D11DeviceContext* deviceContext, char* modelFilename, const TextureContainer& textures) {
+bool model_class::Initialize(ID3D11Device* device, ID3D11DeviceContext* deviceContext, char* modelFilename, const TextureContainer& textures) {
 
 	bool result = Initialize(device, deviceContext, modelFilename);
 	if (!result) {
@@ -37,7 +37,7 @@ bool ModelClass::Initialize(ID3D11Device* device, ID3D11DeviceContext* deviceCon
 	return true;
 }
 
-bool ModelClass::Initialize(ID3D11Device* device, ID3D11DeviceContext* deviceContext, char* modelFilename) {
+bool model_class::Initialize(ID3D11Device* device, ID3D11DeviceContext* deviceContext, char* modelFilename) {
 
 	bool result;
 
@@ -61,7 +61,7 @@ bool ModelClass::Initialize(ID3D11Device* device, ID3D11DeviceContext* deviceCon
 	return true;
 }
 
-void ModelClass::Shutdown()
+void model_class::Shutdown()
 {
 	// Release the model textures.
 	ReleaseTextures();
@@ -76,7 +76,7 @@ void ModelClass::Shutdown()
 }
 
 
-void ModelClass::Render(ID3D11DeviceContext* deviceContext)
+void model_class::Render(ID3D11DeviceContext* deviceContext)
 {
 	// Put the vertex and index buffers on the graphics pipeline to prepare them for drawing.
 	RenderBuffers(deviceContext);
@@ -85,16 +85,16 @@ void ModelClass::Render(ID3D11DeviceContext* deviceContext)
 }
 
 
-int ModelClass::GetIndexCount()
+int model_class::GetIndexCount()
 {
 	return m_indexCount;
 }
 
-ID3D11ShaderResourceView* ModelClass::GetTexture(TextureType type, int index) const {
+ID3D11ShaderResourceView* model_class::GetTexture(TextureType type, int index) const {
 	return m_Textures.GetTexture(type, index);
 }
 
-bool ModelClass::InitializeBuffers(ID3D11Device* device)
+bool model_class::InitializeBuffers(ID3D11Device* device)
 {
 
 	VertexType* vertices;
@@ -174,13 +174,13 @@ bool ModelClass::InitializeBuffers(ID3D11Device* device)
 }
 
 
-void ModelClass::ShutdownBuffers()
+void model_class::ShutdownBuffers()
 {
 	if (m_indexBuffer)    { m_indexBuffer->Release();    m_indexBuffer    = nullptr; }
 	if (m_vertexBuffer)   { m_vertexBuffer->Release();   m_vertexBuffer   = nullptr; }
 }
 
-void ModelClass::RenderBuffers(ID3D11DeviceContext* deviceContext)
+void model_class::RenderBuffers(ID3D11DeviceContext* deviceContext)
 {
 	unsigned int stride;
 	unsigned int offset;
@@ -202,14 +202,14 @@ void ModelClass::RenderBuffers(ID3D11DeviceContext* deviceContext)
 	return;
 }
 
-void ModelClass::ReleaseTextures()
+void model_class::ReleaseTextures()
 {
     
 	// Utilise la méthode ReleaseAll de TextureContainer
 	m_Textures.ReleaseAll();
 }
 
-bool ModelClass::LoadModel(char* filename)
+bool model_class::LoadModel(char* filename)
 {
 
 	std::string fileStr(filename);
@@ -232,7 +232,7 @@ bool ModelClass::LoadModel(char* filename)
 	}
 }
 
-bool ModelClass::LoadObjModel(char* filename)
+bool model_class::LoadObjModel(char* filename)
 {
     // Lecture optimisée du fichier en mode binaire
     std::ifstream fin(filename, std::ios::in | std::ios::binary);
@@ -338,7 +338,7 @@ bool ModelClass::LoadObjModel(char* filename)
     return true;
 }
 
-bool ModelClass::LoadTxtModel(char* filename)
+bool model_class::LoadTxtModel(char* filename)
 {
 	ifstream fin;
 	char input;
@@ -394,7 +394,7 @@ bool ModelClass::LoadTxtModel(char* filename)
 	return true;
 }
 
-void ModelClass::CalculateModelVectors()
+void model_class::CalculateModelVectors()
 {
 	int faceCount, i, index;
 	TempVertexType vertex1, vertex2, vertex3;
@@ -459,7 +459,7 @@ void ModelClass::CalculateModelVectors()
 	}
 }
 
-void ModelClass::CalculateTangentBinormal(TempVertexType vertex1, TempVertexType vertex2, TempVertexType vertex3, VectorType& tangent, VectorType& binormal)
+void model_class::CalculateTangentBinormal(TempVertexType vertex1, TempVertexType vertex2, TempVertexType vertex3, VectorType& tangent, VectorType& binormal)
 {
 
 	float vector1[3], vector2[3];
@@ -513,7 +513,7 @@ void ModelClass::CalculateTangentBinormal(TempVertexType vertex1, TempVertexType
 	binormal.z = binormal.z / length;
 }
 
-void ModelClass::ReleaseModel()
+void model_class::ReleaseModel()
 {
 
 	if (m_model)
@@ -523,7 +523,7 @@ void ModelClass::ReleaseModel()
 	}
 }
 
-bool ModelClass::PreloadTextures(ID3D11Device* device, ID3D11DeviceContext* deviceContext, TextureContainer& textureContainer)
+bool model_class::PreloadTextures(ID3D11Device* device, ID3D11DeviceContext* deviceContext, TextureContainer& textureContainer)
 {
     HRESULT hResult;
     
@@ -582,7 +582,7 @@ bool ModelClass::PreloadTextures(ID3D11Device* device, ID3D11DeviceContext* devi
     return true;
 }
 
-bool ModelClass::ChangeTexture(ID3D11Device* device, ID3D11DeviceContext* deviceContext, std::wstring filename, TextureType type, int index) {
+bool model_class::ChangeTexture(ID3D11Device* device, ID3D11DeviceContext* deviceContext, std::wstring filename, TextureType type, int index) {
 	Logger::Get().Log("Changing texture", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
 	HRESULT result;
@@ -643,7 +643,7 @@ bool ModelClass::ChangeTexture(ID3D11Device* device, ID3D11DeviceContext* device
 	return true;
 }
 
-bool ModelClass::AddTexture(ID3D11Device* device, ID3D11DeviceContext* deviceContext, std::wstring filename, TextureType type) {
+bool model_class::AddTexture(ID3D11Device* device, ID3D11DeviceContext* deviceContext, std::wstring filename, TextureType type) {
 	Logger::Get().Log("Adding texture", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
 	HRESULT result;
@@ -680,7 +680,7 @@ bool ModelClass::AddTexture(ID3D11Device* device, ID3D11DeviceContext* deviceCon
 	return true;
 }
 
-bool ModelClass::AddTexture(ID3D11ShaderResourceView* texture, TextureType type) {
+bool model_class::AddTexture(ID3D11ShaderResourceView* texture, TextureType type) {
 	if (!texture) {
 		Logger::Get().Log("Cannot add null texture", __FILE__, __LINE__, Logger::LogLevel::Error);
 		return false;
diff --git a/enginecustom/src/src/system/object.cpp b/enginecustom/src/src/system/object.cpp
index 8ac285d..00c0793 100644
--- a/enginecustom/src/src/system/object.cpp
+++ b/enginecustom/src/src/system/object.cpp
@@ -2,9 +2,9 @@
 
 #include <comdef.h>
 
-#include "d3dclass.h"
+#include "d_3d_class.h"
 
-Object::Object()// Initialize the reference here
+object::object()// initialize the reference here
 {
 	m_scaleMatrix = XMMatrixIdentity();
 	m_rotateMatrix = XMMatrixIdentity();
@@ -20,68 +20,68 @@ Object::Object()// Initialize the reference here
 	m_boundingRadius = 1.0f;
 }
 
-Object::~Object()
+object::~object()
 {
 }
 
-void Object::SetScaleMatrix(XMMATRIX scaleMatrix)
+void object::SetScaleMatrix(XMMATRIX scaleMatrix)
 {
 	m_scaleMatrix = scaleMatrix;
 }
 
-void Object::SetRotateMatrix(XMMATRIX rotateMatrix)
+void object::SetRotateMatrix(XMMATRIX rotateMatrix)
 {
 	m_rotateMatrix = rotateMatrix;
 }
 
-void Object::SetTranslateMatrix(XMMATRIX translateMatrix)
+void object::SetTranslateMatrix(XMMATRIX translateMatrix)
 {
 	m_translateMatrix = translateMatrix;
 }
 
-void Object::SetSRMatrix(XMMATRIX srMatrix)
+void object::SetSRMatrix(XMMATRIX srMatrix)
 {
 	m_srMatrix = srMatrix;
 }
 
-void Object::SetWorldMatrix(XMMATRIX worldMatrix)
+void object::SetWorldMatrix(XMMATRIX worldMatrix)
 {
 	m_worldMatrix = worldMatrix;
 }
 
-XMMATRIX Object::GetScaleMatrix() const
+XMMATRIX object::GetScaleMatrix() const
 {
 	return m_scaleMatrix;
 }
 
-XMMATRIX Object::GetRotateMatrix() const
+XMMATRIX object::GetRotateMatrix() const
 {
 	return m_rotateMatrix;
 }
 
-XMMATRIX Object::GetTranslateMatrix() const
+XMMATRIX object::GetTranslateMatrix() const
 {
 	return m_translateMatrix;
 }
 
-XMMATRIX Object::GetSRMatrix() const
+XMMATRIX object::GetSRMatrix() const
 {
 	return m_srMatrix;
 }
 
-XMMATRIX Object::GetWorldMatrix() const
+XMMATRIX object::GetWorldMatrix() const
 {
 	return m_worldMatrix;
 }
 
-XMVECTOR Object::GetPosition()
+XMVECTOR object::GetPosition()
 {
 	XMFLOAT4X4 matrix;
 	XMStoreFloat4x4(&matrix, m_translateMatrix);
 	return XMVectorSet(matrix._41, matrix._42, matrix._43, 0.0f);
 }
 
-XMVECTOR Object::GetRotation()
+XMVECTOR object::GetRotation()
 {
 	XMFLOAT4X4 matrix;
 	XMStoreFloat4x4(&matrix, m_rotateMatrix);
@@ -91,7 +91,7 @@ XMVECTOR Object::GetRotation()
 	return XMVectorSet(rotationX, rotationY, rotationZ, 0.0f);
 }
 
-XMVECTOR Object::GetScale()
+XMVECTOR object::GetScale()
 {
 	XMFLOAT4X4 matrix;
 	XMStoreFloat4x4(&matrix, m_scaleMatrix);
@@ -114,7 +114,7 @@ XMVECTOR Object::GetScale()
 
 
 
-void Object::SetPosition(XMVECTOR position)
+void object::SetPosition(XMVECTOR position)
 {
 	XMFLOAT4X4 matrix;
 	XMStoreFloat4x4(&matrix, m_translateMatrix);
@@ -124,7 +124,7 @@ void Object::SetPosition(XMVECTOR position)
 	m_translateMatrix = XMLoadFloat4x4(&matrix);
 }
 
-void Object::SetRotation(XMVECTOR rotation)
+void object::SetRotation(XMVECTOR rotation)
 {
 	XMFLOAT4X4 matrix;
 	XMStoreFloat4x4(&matrix, m_rotateMatrix);
@@ -132,7 +132,7 @@ void Object::SetRotation(XMVECTOR rotation)
 	m_rotateMatrix = rotationMatrix;
 }
 
-void Object::SetScale(XMVECTOR scale)
+void object::SetScale(XMVECTOR scale)
 {
 	XMFLOAT4X4 matrix;
 	XMStoreFloat4x4(&matrix, m_scaleMatrix);
@@ -142,32 +142,32 @@ void Object::SetScale(XMVECTOR scale)
 	m_scaleMatrix = XMLoadFloat4x4(&matrix);
 }
 
-void Object::UpdateWorldMatrix()
+void object::UpdateWorldMatrix()
 {
 	m_worldMatrix = m_scaleMatrix * m_rotateMatrix * m_translateMatrix;
 }
 
-void Object::UpdateSRMatrix()
+void object::UpdateSRMatrix()
 {
 	m_srMatrix = m_scaleMatrix * m_rotateMatrix;
 }
 
-void Object::UpdateTranslateMatrix()
+void object::UpdateTranslateMatrix()
 {
 	m_translateMatrix = XMMatrixTranslationFromVector(GetPosition());
 }
 
-void Object::UpdateRotateMatrix()
+void object::UpdateRotateMatrix()
 {
 	m_rotateMatrix = XMMatrixRotationRollPitchYawFromVector(GetRotation());
 }
 
-void Object::UpdateScaleMatrix()
+void object::UpdateScaleMatrix()
 {
 	m_scaleMatrix = XMMatrixScalingFromVector(GetScale());
 }
 
-void Object::Update()
+void object::Update()
 {
 	UpdateWorldMatrix();
 	UpdateSRMatrix();
@@ -176,99 +176,99 @@ void Object::Update()
 	UpdateScaleMatrix();
 }
 
-std::string Object::GetName()
+std::string object::GetName()
 {
 	return m_name;
 }
 
-void Object::SetName(std::string name)
+void object::SetName(std::string name)
 {
 	m_name = name;
 }
 
-void Object::SetVelocity(XMVECTOR velocity)
+void object::SetVelocity(XMVECTOR velocity)
 {
 	m_velocity = velocity;
 }
 
-void Object::AddVelocity(float deltaTime)
+void object::AddVelocity(float deltaTime)
 {
 	m_velocity += m_acceleration * deltaTime;
 }
 
-XMVECTOR Object::GetVelocity() const
+XMVECTOR object::GetVelocity() const
 {
 	return m_velocity;
 }
 
-void Object::SetAcceleration(XMVECTOR acceleration)
+void object::SetAcceleration(XMVECTOR acceleration)
 {
 	m_acceleration = acceleration;
 }
 
-XMVECTOR Object::GetAcceleration() const
+XMVECTOR object::GetAcceleration() const
 {
 	return m_acceleration;
 }
 
-void Object::SetMass(float mass)
+void object::SetMass(float mass)
 {
 	m_mass = mass;
 }
 
-float Object::GetMass() const
+float object::GetMass() const
 {
 	return m_mass;
 }
 
-void Object::SetGrounded(bool isGrounded)
+void object::SetGrounded(bool isGrounded)
 {
 	m_isGrounded = isGrounded;
 }
 
-bool Object::IsGrounded() const
+bool object::IsGrounded() const
 {
 	return m_isGrounded;
 }
 
-int Object::SetId(int id)
+int object::SetId(int id)
 {
 	return m_id = id;
 }
 
-int Object::GetId() const
+int object::GetId() const
 {
 	return m_id;
 }
 
-bool Object::IsPhysicsEnabled() const
+bool object::IsPhysicsEnabled() const
 {
 	return m_isPhysicsEnabled;
 }
 
-void Object::SetPhysicsEnabled(bool state)
+void object::SetPhysicsEnabled(bool state)
 {
 	m_isPhysicsEnabled = state;
 }
 
-float Object::GetBoundingRadius() const
+float object::GetBoundingRadius() const
 {
 	return m_boundingRadius;
 }
 
-void Object::UpdatePosition(float deltaTime)
+void object::UpdatePosition(float deltaTime)
 {
 	XMVECTOR position = GetPosition();
 	position = position + GetVelocity() * deltaTime;
 	SetPosition(position);
 }
 
-void Object::SetType(ObjectType type)
+void object::SetType(ObjectType type)
 {
 	m_type = type;
 }
 
-std::string Object::ObjectTypeToString(ObjectType type) {
+std::string object::ObjectTypeToString(ObjectType type) {
 	switch (type) {
 		case ObjectType::Cube: return "Cube";
 		case ObjectType::Sphere: return "Sphere";
@@ -277,14 +277,14 @@ std::string Object::ObjectTypeToString(ObjectType type) {
 	}
 }
 
-ObjectType Object::StringToObjectType(const std::string& str) {
+ObjectType object::StringToObjectType(const std::string& str) {
 	if (str == "Cube") return ObjectType::Cube;
 	if (str == "Sphere") return ObjectType::Sphere;
 	// Add other cases as needed
 	return ObjectType::Unknown;
 }
 
-std::string Object::ShaderTypeToString(ShaderType type) {
+std::string object::ShaderTypeToString(ShaderType type) {
 	switch (type) {
 		case ShaderType::ALPHA_MAPPING: return "ALPHA_MAPPING";
 		case ShaderType::CEL_SHADING: return "CEL_SHADING";
@@ -298,7 +298,7 @@ std::string Object::ShaderTypeToString(ShaderType type) {
 	}
 }
 
-ShaderType Object::StringToShaderType(const std::string& str) {
+ShaderType object::StringToShaderType(const std::string& str) {
 	if (str == "ALPHA_MAPPING") return ShaderType::ALPHA_MAPPING;
 	if (str == "CEL_SHADING") return ShaderType::CEL_SHADING;
 	if (str == "NORMAL_MAPPING") return ShaderType::NORMAL_MAPPING;
@@ -310,7 +310,7 @@ ShaderType Object::StringToShaderType(const std::string& str) {
 	return ShaderType::TEXTURE;
 }
 
-void Object::LaunchObject()
+void object::LaunchObject()
 {
 	// Constants
 	const float gravity = -9.81f;
@@ -352,8 +352,8 @@ void Object::LaunchObject()
 	OutputDebugStringA(buffer);
 }
 
-bool Object::LoadTexturesFromPath(std::vector<std::wstring>& texturePaths, TextureContainer& texturesContainer,
-                                  D3DClass* m_Direct3D)
+bool object::LoadTexturesFromPath(std::vector<std::wstring>& texturePaths, TextureContainer& texturesContainer,
+                                  d_3d_class* m_Direct3D)
 {
 
 	HRESULT result;
@@ -363,7 +363,7 @@ bool Object::LoadTexturesFromPath(std::vector<std::wstring>& texturePaths, Textu
 	for (const auto& texturePath : texturePaths)
 	{
 		ID3D11ShaderResourceView* texture = nullptr;
-		result = DirectX::CreateWICTextureFromFile(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), texturePath.c_str(), nullptr, &texture);
+		result = DirectX::CreateWICTextureFromFile(m_Direct3D->get_device(), m_Direct3D->get_device_context(), texturePath.c_str(), nullptr, &texture);
 		if (FAILED(result))
 		{
 			
diff --git a/enginecustom/src/src/system/physics.cpp b/enginecustom/src/src/system/physics.cpp
index 4ec2524..2cfd893 100644
--- a/enginecustom/src/src/system/physics.cpp
+++ b/enginecustom/src/src/system/physics.cpp
@@ -1,34 +1,34 @@
 #include "physics.h"
 
 
-Physics::Physics() 
+physics::physics() 
 {
-    m_gravity = XMVectorSet(0.0f, -9.81f, 0.0f, 0.0f); // Initialize the gravity vector
+    m_gravity = XMVectorSet(0.0f, -9.81f, 0.0f, 0.0f); // initialize the gravity vector
 }
 
-Physics::Physics(const Physics& other)
+physics::physics(const physics& other)
 {
 	m_gravity = other.m_gravity; // Copy the gravity value
 }
 
-Physics::~Physics()
+physics::~physics()
 {
 }
 
 // Get the gravity value
-XMVECTOR Physics::GetGravity() const
+XMVECTOR physics::GetGravity() const
 {
 	return m_gravity;
 }
 
 // Define the gravity value
-void Physics::SetGravity(XMVECTOR gravity)
+void physics::SetGravity(XMVECTOR gravity)
 {
 	m_gravity = gravity;
 }
 
 // Apply gravity to an object
-void Physics::ApplyGravity(Object* object, float dragValue)
+void physics::ApplyGravity(object* object, float dragValue)
 {
     if (this == nullptr || object == nullptr) // Verify if 'this' and 'object' are not null
     {
@@ -60,7 +60,7 @@ void Physics::ApplyGravity(Object* object, float dragValue)
     }
 }
 
-void Physics::AddForce(Object* object, XMVECTOR force)
+void physics::AddForce(object* object, XMVECTOR force)
 {
 	if (object == nullptr) // Verify if the object is not null
 	{
@@ -77,7 +77,7 @@ void Physics::AddForce(Object* object, XMVECTOR force)
 	object->SetAcceleration(object->GetAcceleration() + acceleration);
 }
 
-bool Physics::IsColliding(Object* object1, Object* object2)
+bool physics::IsColliding(object* object1, object* object2)
 {
     ObjectType type1 = object1->GetType();
     ObjectType type2 = object2->GetType();
@@ -116,7 +116,7 @@ bool Physics::IsColliding(Object* object1, Object* object2)
 // AABB method for collision detection //
 /////////////////////////////////////////
 
-bool Physics::CubesOverlap(Object* cube1, Object* cube2)
+bool physics::CubesOverlap(object* cube1, object* cube2)
 {
     XMVECTOR position1 = cube1->GetPosition();
     XMVECTOR position2 = cube2->GetPosition();
@@ -134,7 +134,7 @@ bool Physics::CubesOverlap(Object* cube1, Object* cube2)
         min1.m128_f32[2] <= max2.m128_f32[2] && max1.m128_f32[2] >= min2.m128_f32[2]);
 }
 
-bool Physics::SpheresOverlap(Object* sphere1, Object* sphere2)
+bool physics::SpheresOverlap(object* sphere1, object* sphere2)
 {
     XMVECTOR position1 = sphere1->GetPosition();
     XMVECTOR position2 = sphere2->GetPosition();
@@ -154,7 +154,7 @@ bool Physics::SpheresOverlap(Object* sphere1, Object* sphere2)
     return distance < radius1 + radius2;
 }
 
-bool Physics::SphereCubeOverlap(Object* cube, Object* sphere)
+bool physics::SphereCubeOverlap(object* cube, object* sphere)
 {
     XMVECTOR position1 = cube->GetPosition();
     XMVECTOR position2 = sphere->GetPosition();
diff --git a/enginecustom/src/src/system/Positionclass.cpp b/enginecustom/src/src/system/position_class.cpp
similarity index 88%
rename from enginecustom/src/src/system/Positionclass.cpp
rename to enginecustom/src/src/system/position_class.cpp
index 3005071..88083a2 100644
--- a/enginecustom/src/src/system/Positionclass.cpp
+++ b/enginecustom/src/src/system/position_class.cpp
@@ -1,6 +1,6 @@
-#include "positionclass.h"
+#include "position_class.h"
 
-PositionClass::PositionClass()
+position_class::position_class()
 {
     m_frameTime = 0.0f;
     m_rotationY = 0.0f;
@@ -17,29 +17,29 @@ PositionClass::PositionClass()
 }
 
 
-PositionClass::PositionClass(const PositionClass& other)
+position_class::position_class(const position_class& other)
 {
 }
 
 
-PositionClass::~PositionClass()
+position_class::~position_class()
 {
 }
 
-void PositionClass::SetFrameTime(float time)
+void position_class::SetFrameTime(float time)
 {
     m_frameTime = time;
     return;
 }
 
-void PositionClass::GetRotation(float& y, float& x) const
+void position_class::GetRotation(float& y, float& x) const
 {
     y = m_rotationY;
     x = m_rotationX;
     return;
 }
 
-void PositionClass::GetPosition(float& x, float& y, float& z) const
+void position_class::GetPosition(float& x, float& y, float& z) const
 {
     x = m_positionX;
     y = m_positionY;
@@ -47,7 +47,7 @@ void PositionClass::GetPosition(float& x, float& y, float& z) const
     return;
 }
 
-void PositionClass::TurnLeft(bool keydown)
+void position_class::TurnLeft(bool keydown)
 {
     // If the key is pressed increase the speed at which the camera turns left.  If not slow down the turn speed.
     if (keydown)
@@ -80,7 +80,7 @@ void PositionClass::TurnLeft(bool keydown)
 }
 
 
-void PositionClass::TurnRight(bool keydown)
+void position_class::TurnRight(bool keydown)
 {
     // If the key is pressed increase the speed at which the camera turns right.  If not slow down the turn speed.
     if (keydown)
@@ -112,7 +112,7 @@ void PositionClass::TurnRight(bool keydown)
     return;
 }
 
-void PositionClass::TurnMouse(float deltaX, float deltaY, float sensitivity, bool rightMouseDown)
+void position_class::TurnMouse(float deltaX, float deltaY, float sensitivity, bool rightMouseDown)
 {
     // The turning speed is proportional to the horizontal mouse movement
     m_horizontalTurnSpeed = deltaX * sensitivity;
@@ -147,7 +147,7 @@ void PositionClass::TurnMouse(float deltaX, float deltaY, float sensitivity, boo
     return;
 }
 
-void PositionClass::MoveCamera(bool forward, bool backward, bool left, bool right, bool up, bool down, bool scrollUp, bool scrollDown, bool rightClick)
+void position_class::MoveCamera(bool forward, bool backward, bool left, bool right, bool up, bool down, bool scrollUp, bool scrollDown, bool rightClick)
 {
     float radiansY, radiansX, speed;
 
diff --git a/enginecustom/src/src/system/rendertextureclass.cpp b/enginecustom/src/src/system/render_texture_class.cpp
similarity index 83%
rename from enginecustom/src/src/system/rendertextureclass.cpp
rename to enginecustom/src/src/system/render_texture_class.cpp
index 79fcfbe..81e9f7c 100644
--- a/enginecustom/src/src/system/rendertextureclass.cpp
+++ b/enginecustom/src/src/system/render_texture_class.cpp
@@ -1,6 +1,6 @@
-#include "rendertextureclass.h"
+#include "render_texture_class.h"
 
-RenderTextureClass::RenderTextureClass()
+render_texture_class::render_texture_class()
 {
     m_renderTargetTexture = 0;
     m_renderTargetView = 0;
@@ -10,18 +10,18 @@ RenderTextureClass::RenderTextureClass()
 }
 
 
-RenderTextureClass::RenderTextureClass(const RenderTextureClass& other)
+render_texture_class::render_texture_class(const render_texture_class& other)
 {
 }
 
 
-RenderTextureClass::~RenderTextureClass()
+render_texture_class::~render_texture_class()
 {
 }
 
-bool RenderTextureClass::Initialize(ID3D11Device * device, int textureWidth, int textureHeight, float screenDepth, float screenNear, int format)
+bool render_texture_class::Initialize(ID3D11Device * device, int textureWidth, int textureHeight, float screenDepth, float screenNear, int format)
 {
-    Logger::Get().Log("Initializing RenderTextureClass", __FILE__, __LINE__, Logger::LogLevel::Initialize);
+    Logger::Get().Log("Initializing render_texture_class", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
     D3D11_TEXTURE2D_DESC textureDesc;
     HRESULT result;
@@ -155,14 +155,14 @@ bool RenderTextureClass::Initialize(ID3D11Device * device, int textureWidth, int
     // Create an orthographic projection matrix for 2D rendering.
     m_orthoMatrix = XMMatrixOrthographicLH((float)textureWidth, (float)textureHeight, screenNear, screenDepth);
 
-    Logger::Get().Log("RenderTextureClass initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
+    Logger::Get().Log("render_texture_class initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
     return true;
 }
 
-void RenderTextureClass::Shutdown()
+void render_texture_class::Shutdown()
 {
-    Logger::Get().Log("Shutting down RenderTextureClass", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
+    Logger::Get().Log("Shutting down render_texture_class", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
     if (m_depthStencilView)
     {
@@ -194,12 +194,12 @@ void RenderTextureClass::Shutdown()
         m_renderTargetTexture = 0;
     }
 
-    Logger::Get().Log("RenderTextureClass shut down", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
+    Logger::Get().Log("render_texture_class shut down", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
     return;
 }
 
-void RenderTextureClass::SetRenderTarget(ID3D11DeviceContext * deviceContext)
+void render_texture_class::SetRenderTarget(ID3D11DeviceContext * deviceContext)
 {
     // Bind the render target view and depth stencil buffer to the output render pipeline.
     deviceContext->OMSetRenderTargets(1, &m_renderTargetView, m_depthStencilView);
@@ -210,7 +210,7 @@ void RenderTextureClass::SetRenderTarget(ID3D11DeviceContext * deviceContext)
     return;
 }
 
-void RenderTextureClass::ClearRenderTarget(ID3D11DeviceContext * deviceContext, float red, float green, float blue, float alpha)
+void render_texture_class::ClearRenderTarget(ID3D11DeviceContext * deviceContext, float red, float green, float blue, float alpha)
 {
     float color[4];
 
@@ -230,32 +230,32 @@ void RenderTextureClass::ClearRenderTarget(ID3D11DeviceContext * deviceContext,
     return;
 }
 
-ID3D11ShaderResourceView* RenderTextureClass::GetShaderResourceView()
+ID3D11ShaderResourceView* render_texture_class::GetShaderResourceView()
 {
     return m_shaderResourceView;
 }
 
-void RenderTextureClass::GetProjectionMatrix(XMMATRIX & projectionMatrix)
+void render_texture_class::GetProjectionMatrix(XMMATRIX & projectionMatrix)
 {
     projectionMatrix = m_projectionMatrix;
     return;
 }
 
 
-void RenderTextureClass::GetOrthoMatrix(XMMATRIX & orthoMatrix)
+void render_texture_class::GetOrthoMatrix(XMMATRIX & orthoMatrix)
 {
     orthoMatrix = m_orthoMatrix;
     return;
 }
 
 
-int RenderTextureClass::GetTextureWidth()
+int render_texture_class::GetTextureWidth()
 {
     return m_textureWidth;
 }
 
 
-int RenderTextureClass::GetTextureHeight()
+int render_texture_class::GetTextureHeight()
 {
     return m_textureHeight;
 }
\ No newline at end of file
diff --git a/enginecustom/src/src/system/Spriteclass.cpp b/enginecustom/src/src/system/sprite_class.cpp
similarity index 90%
rename from enginecustom/src/src/system/Spriteclass.cpp
rename to enginecustom/src/src/system/sprite_class.cpp
index 40aa1e6..946b132 100644
--- a/enginecustom/src/src/system/Spriteclass.cpp
+++ b/enginecustom/src/src/system/sprite_class.cpp
@@ -1,7 +1,7 @@
-#include "spriteclass.h"
+#include "sprite_class.h"
 
 
-SpriteClass::SpriteClass()
+sprite_class::sprite_class()
 {
     m_vertexBuffer = 0;
     m_indexBuffer = 0;
@@ -9,16 +9,16 @@ SpriteClass::SpriteClass()
 }
 
 
-SpriteClass::SpriteClass(const SpriteClass& other)
+sprite_class::sprite_class(const sprite_class& other)
 {
 }
 
 
-SpriteClass::~SpriteClass()
+sprite_class::~sprite_class()
 {
 }
 
-bool SpriteClass::Initialize(ID3D11Device* device, ID3D11DeviceContext* deviceContext, int screenWidth, int screenHeight, char* spriteFilename, int renderX, int renderY)
+bool sprite_class::Initialize(ID3D11Device* device, ID3D11DeviceContext* deviceContext, int screenWidth, int screenHeight, char* spriteFilename, int renderX, int renderY)
 {
     bool result;
 
@@ -52,7 +52,7 @@ bool SpriteClass::Initialize(ID3D11Device* device, ID3D11DeviceContext* deviceCo
 }
 
 
-void SpriteClass::Shutdown()
+void sprite_class::Shutdown()
 {
     // Release the textures used for this sprite.
     ReleaseTextures();
@@ -64,7 +64,7 @@ void SpriteClass::Shutdown()
 }
 
 
-bool SpriteClass::Render(ID3D11DeviceContext* deviceContext)
+bool sprite_class::Render(ID3D11DeviceContext* deviceContext)
 {
     bool result;
 
@@ -82,7 +82,7 @@ bool SpriteClass::Render(ID3D11DeviceContext* deviceContext)
     return true;
 }
 
-void SpriteClass::Update(float frameTime)
+void sprite_class::Update(float frameTime)
 {
     // Increment the frame time each frame.
     m_frameTime += frameTime;
@@ -106,18 +106,18 @@ void SpriteClass::Update(float frameTime)
 }
 
 
-int SpriteClass::GetIndexCount()
+int sprite_class::GetIndexCount()
 {
     return m_indexCount;
 }
 
-ID3D11ShaderResourceView* SpriteClass::GetTexture()
+ID3D11ShaderResourceView* sprite_class::GetTexture()
 {
     return m_Textures[m_currentTexture].GetTexture();
 }
 
 
-bool SpriteClass::InitializeBuffers(ID3D11Device* device)
+bool sprite_class::InitializeBuffers(ID3D11Device* device)
 {
     VertexType* vertices;
     unsigned long* indices;
@@ -203,7 +203,7 @@ bool SpriteClass::InitializeBuffers(ID3D11Device* device)
 }
 
 
-void SpriteClass::ShutdownBuffers()
+void sprite_class::ShutdownBuffers()
 {
     // Release the index buffer.
     if (m_indexBuffer)
@@ -223,7 +223,7 @@ void SpriteClass::ShutdownBuffers()
 }
 
 
-bool SpriteClass::UpdateBuffers(ID3D11DeviceContext* deviceContent)
+bool sprite_class::UpdateBuffers(ID3D11DeviceContext* deviceContent)
 {
     float left, right, top, bottom;
     VertexType* vertices;
@@ -305,7 +305,7 @@ bool SpriteClass::UpdateBuffers(ID3D11DeviceContext* deviceContent)
 }
 
 
-void SpriteClass::RenderBuffers(ID3D11DeviceContext* deviceContext)
+void sprite_class::RenderBuffers(ID3D11DeviceContext* deviceContext)
 {
     unsigned int stride;
     unsigned int offset;
@@ -327,7 +327,7 @@ void SpriteClass::RenderBuffers(ID3D11DeviceContext* deviceContext)
     return;
 }
 
-bool SpriteClass::LoadTextures(ID3D11Device* device, ID3D11DeviceContext* deviceContext, char* filename)
+bool sprite_class::LoadTextures(ID3D11Device* device, ID3D11DeviceContext* deviceContext, char* filename)
 {
     std::string textureFilename(256, '0');
     std::ifstream fin;
@@ -347,7 +347,7 @@ bool SpriteClass::LoadTextures(ID3D11Device* device, ID3D11DeviceContext* device
     fin >> m_textureCount;
 
     // Create and initialize the texture array with the texture count from the file.
-    m_Textures = new TextureClass[m_textureCount];
+    m_Textures = new texture_class[m_textureCount];
 
     // Read to start of next line.
     fin.get(input);
@@ -392,7 +392,7 @@ bool SpriteClass::LoadTextures(ID3D11Device* device, ID3D11DeviceContext* device
     return true;
 }
 
-void SpriteClass::ReleaseTextures()
+void sprite_class::ReleaseTextures()
 {
     int i;
 
@@ -413,7 +413,7 @@ void SpriteClass::ReleaseTextures()
 }
 
 
-void SpriteClass::SetRenderLocation(int x, int y)
+void sprite_class::SetRenderLocation(int x, int y)
 {
     m_renderX = x;
     m_renderY = y;
diff --git a/enginecustom/src/src/system/Systemclass.cpp b/enginecustom/src/src/system/system_class.cpp
similarity index 69%
rename from enginecustom/src/src/system/Systemclass.cpp
rename to enginecustom/src/src/system/system_class.cpp
index 60f2b08..e7394e1 100644
--- a/enginecustom/src/src/system/Systemclass.cpp
+++ b/enginecustom/src/src/system/system_class.cpp
@@ -1,28 +1,49 @@
-#include "systemclass.h"
+#include "system_class.h"
 #include <iostream>
 #include <shellapi.h> // Include for DragAcceptFiles and DragQueryFile
 #include <windows.h>
 extern IMGUI_IMPL_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
 
-SystemClass::SystemClass()
+system_class::system_class()
 {
-	m_Input = 0;
-	m_Application = 0;
-	m_imguiManager = 0;
-	m_applicationName = 0;
-	m_hinstance = 0;
-	m_hwnd = 0;
-	m_initialWindowWidth = 0;
-	m_initialWindowHeight = 0;
-	m_isDirect3DInitialized = false;
+	input_ = 0;
+	application_ = 0;
+	imgui_manager_ = 0;
+	application_name_ = 0;
+	hinstance_ = 0;
+	hwnd_ = 0;
+	initial_window_width_ = 0;
+	initial_window_height_ = 0;
+	is_direct_3d_initialized_ = false;
 	
 }
 
-SystemClass::~SystemClass()
+system_class::~system_class()
 {
+
+	if (application_handle)
+	{
+		delete application_handle;
+		application_handle = 0;
+	}
+
+	if (input_)
+	{
+		delete input_;
+		input_ = 0;
+	}
+
+	if (imgui_manager_)
+	{
+		delete imgui_manager_;
+		imgui_manager_ = 0;
+	}
+
+	
+	
 }
 
-bool SystemClass::Initialize()
+bool system_class::initialize()
 {
 	int screenHeight, screenWidth = 0;
 	bool result;
@@ -31,13 +52,13 @@ bool SystemClass::Initialize()
 
 	try
 	{
-		// Initialize the windows api.
-		InitializeWindows(screenWidth, screenHeight);
+		// initialize the windows api.
+		initialize_windows(screenWidth, screenHeight);
 
 		// Create and initialize the input object.  This object will be used to handle reading the keyboard input from the user.
-		m_Input = new InputClass;
+		input_ = new input_class;
 
-		result = m_Input->Initialize(m_hinstance, m_hwnd, screenWidth, screenHeight);
+		result = input_->Initialize(hinstance_, hwnd_, screenWidth, screenHeight);
 		if (!result)
 		{
 			Logger::Get().Log("Failed to initialize input class", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -45,27 +66,28 @@ bool SystemClass::Initialize()
 		}
 
 		// Create and initialize the application class object.  This object will handle rendering all the graphics for this application.
-		m_Application = new ApplicationClass;
+		application_ = new application_class;
 
-		result = m_Application->Initialize(screenWidth, screenHeight, m_hwnd, false);
+		result = application_->initialize(screenWidth, screenHeight, hwnd_, false);
 		if (!result)
 		{
 			return false;
 		}
 
-		m_isDirect3DInitialized = true;
+		is_direct_3d_initialized_ = true;
 
 		// If we received a WM_SIZE message before Direct3D was initialized, resize the swap chain now
-		if (m_initialWindowWidth > 0 && m_initialWindowHeight > 0)
+		if (initial_window_width_ > 0 && initial_window_height_ > 0)
 		{
-			m_Application->GetDirect3D()->ResizeSwapChain(m_initialWindowWidth, m_initialWindowHeight);
+			application_->get_direct_3d()->resize_swap_chain(initial_window_width_, initial_window_height_);
 		}
 
-		// Initialize imgui
+		// initialize imgui
 		if(DEBUG_MODE)
 		{
-			m_imguiManager = new imguiManager;
-			result = m_imguiManager->Initialize(m_hwnd, m_Application->GetDirect3D()->GetDevice(), m_Application->GetDirect3D()->GetDeviceContext());
+			imgui_manager_ = new imguiManager;
+			imgui_manager_->SetApp(application_);
+			result = imgui_manager_->Initialize(hwnd_, application_->get_direct_3d()->get_device(), application_->get_direct_3d()->get_device_context());
 			if (!result)
 			{
 				return false;
@@ -84,65 +106,65 @@ bool SystemClass::Initialize()
 	return true;
 }
 
-void SystemClass::Shutdown()
+void system_class::shutdown()
 {
 	Logger::Get().Log("Shutting down system class", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
-	std::lock_guard<std::mutex> guard(renderMutex);
+	std::lock_guard<std::mutex> guard(render_mutex_);
 
-	// Shutdown imgui
-	if (m_imguiManager)
+	// shutdown imgui
+	if (imgui_manager_)
 	{
 		Logger::Get().Log("Shutting down imgui manager", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
-		m_imguiManager->Shutdown();
-		delete m_imguiManager;
-		m_imguiManager = 0;
+		imgui_manager_->Shutdown();
+		delete imgui_manager_;
+		imgui_manager_ = 0;
 
 		Logger::Get().Log("Imgui manager shut down", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	}
 
 	// Release the application class object.
-	if (m_Application)
+	if (application_)
 	{
 		Logger::Get().Log("Shutting down application", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
-		m_Application->Shutdown();
-		delete m_Application;
-		m_Application = 0;
+		application_->shutdown();
+		delete application_;
+		application_ = 0;
 
 		Logger::Get().Log("Application shut down", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	}
 
 	// Release the input object.
-	if (m_Input)
+	if (input_)
 	{
 		Logger::Get().Log("Shutting down input", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
-		delete m_Input;
-		m_Input = 0;
+		delete input_;
+		input_ = 0;
 
 		Logger::Get().Log("Input shut down", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	}
 
 
 
-	// Shutdown the window.
-	ShutdownWindows();
+	// shutdown the window.
+	shutdown_windows();
 
 	Logger::Get().Log("System class shut down", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 
 	return;
 }
 
-void SystemClass::Run()
+void system_class::run()
 {
 	MSG msg;
 	bool done, result;
 
 	Logger::Get().Log("Running the system", __FILE__, __LINE__);
 
-	// Initialize the message structure.
+	// initialize the message structure.
 	ZeroMemory(&msg, sizeof(MSG));
 
 	// Loop until there is a quit message from the window or the user.
@@ -153,7 +175,7 @@ void SystemClass::Run()
 	int result_scene = MessageBox(NULL, L"Do you want to load a saved scene?", L"Load Scene", MB_YESNO | MB_ICONQUESTION);
 	if (result_scene == IDYES)
 	{
-		m_Application->LoadScene();
+		application_->load_scene();
 	}
 	else
 	{
@@ -161,7 +183,7 @@ void SystemClass::Run()
 		wchar_t szFile[260] = L"";
 		ZeroMemory(&ofn, sizeof(ofn));
 		ofn.lStructSize = sizeof(ofn);
-		ofn.hwndOwner = m_hwnd;
+		ofn.hwndOwner = hwnd_;
 		ofn.lpstrFile = szFile;
 		ofn.nMaxFile = sizeof(szFile);
 		// Allow multiple extensions
@@ -190,12 +212,12 @@ void SystemClass::Run()
 				break;
 			}
 
-			m_Application->SetScenePath(path);
+			application_->set_scene_path(path);
 			// Create a new scene file
 			std::ofstream outFile(path);
 			if (outFile.is_open())
 			{
-				// Initialize the new scene file with default content if needed
+				// initialize the new scene file with default content if needed
 				outFile.close();
 				Logger::Get().Log("New scene file created successfully", __FILE__, __LINE__, Logger::LogLevel::Info);
 			}
@@ -223,7 +245,7 @@ void SystemClass::Run()
 		}
 
 		// If windows signals to end the application then exit out.
-		if (m_Application != nullptr && m_Application->GetShouldQuit())
+		if (application_ != nullptr && application_->get_should_quit())
 		{
 			Logger::Get().Log("Received quit signal from application", __FILE__, __LINE__);
 			done = true;
@@ -231,7 +253,7 @@ void SystemClass::Run()
 		else
 		{
 			// Otherwise do the frame processing.
-			result = Frame();
+			result = frame();
 			if (!result)
 			{
 				Logger::Get().Log("Failed to process frame", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -244,16 +266,15 @@ void SystemClass::Run()
 	return;
 }
 
-bool SystemClass::Frame()
+bool system_class::frame()
 {
 	// Clear the buffers to begin the scene.
-	m_Application->GetDirect3D()->BeginScene(0.0f, 0.0f, 0.0f, 1.0f);
+	application_->get_direct_3d()->begin_scene(0.0f, 0.0f, 0.0f, 1.0f);
 
-	std::lock_guard<std::mutex> guard(renderMutex);
+	std::lock_guard<std::mutex> guard(render_mutex_);
 	bool result;
-
-	// Do the input frame processing.
-	result = m_Input->Frame();
+	
+	result = input_->Frame();
 	if (!result)
 	{
 		Logger::Get().Log("Failed to process input frame", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -261,44 +282,42 @@ bool SystemClass::Frame()
 	}
 
 	// Do the frame processing for the application class object.
-	result = m_Application->Frame(m_Input);
+	result = application_->frame(input_);
 	if (!result)
 	{
 		Logger::Get().Log("Failed to process application frame", __FILE__, __LINE__, Logger::LogLevel::Error);
 		return false;
 	}
 
-	if(!m_Input->IsKeyDown(222))
+	if(!input_->IsKeyDown(222))
 	{
 		//log the key press
-		m_IsDebugKeyPressed = false;
+		is_debug_key_pressed_ = false;
 	}
-	else if (m_Input->IsKeyDown(222) && !m_IsDebugKeyPressed)
+	else if (input_->IsKeyDown(222) && !is_debug_key_pressed_)
 	{
 		// Log the key release state
-		m_IsDebugKeyPressed = true;
+		is_debug_key_pressed_ = true;
 		DEBUG_MODE = !DEBUG_MODE;
 	}
-
-
+	
 	if (DEBUG_MODE)
 	{
-		// Render ImGui 
-		result = m_imguiManager->ImGuiWidgetRenderer(m_Application);
+		// render ImGui
+		result = imgui_manager_->ImGuiWidgetRenderer();
 		if (!result)
 		{
 			Logger::Get().Log("Failed to render ImGui widgets", __FILE__, __LINE__, Logger::LogLevel::Error);
 			return false;
 		}
 	}
-
 	
-	m_Application->GetDirect3D()->EndScene();
+	application_->get_direct_3d()->end_scene();
 
 	return true;
 }
 
-LRESULT CALLBACK SystemClass::MessageHandler(HWND hwnd, UINT umsg, WPARAM wparam, LPARAM lparam)
+LRESULT CALLBACK system_class::message_handler(HWND hwnd, UINT umsg, WPARAM wparam, LPARAM lparam)
 {
 
 	if (ImGui_ImplWin32_WndProcHandler(hwnd, umsg, wparam, lparam))
@@ -312,7 +331,7 @@ LRESULT CALLBACK SystemClass::MessageHandler(HWND hwnd, UINT umsg, WPARAM wparam
 		case WM_KEYDOWN:
 		{
 			// If a key is pressed send it to the input object so it can record that state.
-			m_Input->KeyDown((unsigned int)wparam);
+			input_->KeyDown((unsigned int)wparam);
 			return 0;
 		}
 
@@ -320,7 +339,7 @@ LRESULT CALLBACK SystemClass::MessageHandler(HWND hwnd, UINT umsg, WPARAM wparam
 		case WM_KEYUP:
 		{
 			// If a key is released then send it to the input object so it can unset the state for that key.
-			m_Input->KeyUp((unsigned int)wparam);
+			input_->KeyUp((unsigned int)wparam);
 			return 0;
 		}
 		case WM_SIZE:
@@ -329,27 +348,27 @@ LRESULT CALLBACK SystemClass::MessageHandler(HWND hwnd, UINT umsg, WPARAM wparam
 			int newHeight = HIWORD(lparam);
 
 			//  If Direct3D is initialized, update the swap chain. Otherwise, store the window dimensions
-			if (m_isDirect3DInitialized && m_Application && m_Application->GetDirect3D())
+			if (is_direct_3d_initialized_ && application_ && application_->get_direct_3d())
 			{
-				m_Application->SetScreenWidth(newWidth);
-				m_Application->SetScreenHeight(newHeight);
-				m_Application->GetDirect3D()->ResizeSwapChain(newWidth, newHeight);
+				application_->set_screen_width(newWidth);
+				application_->set_screen_height(newHeight);
+				application_->get_direct_3d()->resize_swap_chain(newWidth, newHeight);
 			}
 			else
 			{
-				m_initialWindowWidth = newWidth;
-				m_initialWindowHeight = newHeight;
+				initial_window_width_ = newWidth;
+				initial_window_height_ = newHeight;
 			}
 			return 0;
 		}
 		case WM_ENTERSIZEMOVE:
 		{
-			m_isResizing = true;
+			is_resizing_ = true;
 			break;
 		}
 		case WM_EXITSIZEMOVE:
 		{
-			m_isResizing = false;
+			is_resizing_ = false;
 			break;
 		}
 		case WM_DROPFILES:
@@ -370,7 +389,7 @@ LRESULT CALLBACK SystemClass::MessageHandler(HWND hwnd, UINT umsg, WPARAM wparam
 					if (extension == L"txt" || extension == L"kobj") {
 						// Handle dropped files with valid extensions
 						std::wcout << L"File dropped: " << filePath << std::endl;
-						m_Application->AddKobject(fileName);
+						application_->add_kobject(fileName);
 					}
 					else {
 						// Handle files with invalid extensions (optional)
@@ -385,7 +404,7 @@ LRESULT CALLBACK SystemClass::MessageHandler(HWND hwnd, UINT umsg, WPARAM wparam
 		case WM_CLOSE:
 		{
 			Logger::Get().Log("WM_CLOSE message received", __FILE__, __LINE__);
-			m_Application->SetShouldQuit(true);
+			application_->set_should_quit(true);
 			return 0;
 		}
 		// Any other messages send to the default message handler as our application won't make use of them.
@@ -399,7 +418,7 @@ LRESULT CALLBACK SystemClass::MessageHandler(HWND hwnd, UINT umsg, WPARAM wparam
 	return 0;
 }
 
-void SystemClass::InitializeWindows(int& screenWidth, int& screenHeight)
+void system_class::initialize_windows(int& screenWidth, int& screenHeight)
 {
 	WNDCLASSEX wc;
 	DEVMODE dmScreenSettings;
@@ -407,26 +426,26 @@ void SystemClass::InitializeWindows(int& screenWidth, int& screenHeight)
 
 	Logger::Get().Log("Initializing windows", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 	// Get an external pointer to this object.	
-	ApplicationHandle = this;
+	application_handle = this;
 
 	// Get the instance of this application.
-	m_hinstance = GetModuleHandle(NULL);
+	hinstance_ = GetModuleHandle(NULL);
 
 	// Give the application a name.
-	m_applicationName = L"Khaotic Engine";
+	application_name_ = L"Khaotic Engine";
 
 	// Setup the windows class with default settings.
 	wc.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC;
-	wc.lpfnWndProc = WndProc;
+	wc.lpfnWndProc = wnd_proc;
 	wc.cbClsExtra = 0;
 	wc.cbWndExtra = 0;
-	wc.hInstance = m_hinstance;
-	wc.hIcon = LoadIcon(m_hinstance,MAKEINTRESOURCE(IDI_ICON1));
-	wc.hIconSm = LoadIcon(m_hinstance, MAKEINTRESOURCE(IDI_ICON1));
+	wc.hInstance = hinstance_;
+	wc.hIcon = LoadIcon(hinstance_,MAKEINTRESOURCE(IDI_ICON1));
+	wc.hIconSm = LoadIcon(hinstance_, MAKEINTRESOURCE(IDI_ICON1));
 	wc.hCursor = LoadCursor(NULL, IDC_ARROW);
 	wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH);
 	wc.lpszMenuName = NULL;
-	wc.lpszClassName = m_applicationName;
+	wc.lpszClassName = application_name_;
 	wc.cbSize = sizeof(WNDCLASSEX);
 
 	// Register the window class.
@@ -437,7 +456,7 @@ void SystemClass::InitializeWindows(int& screenWidth, int& screenHeight)
 	screenHeight = GetSystemMetrics(SM_CYSCREEN);
 
 	// Setup the screen settings depending on whether it is running in full screen or in windowed mode.
-	if (FULL_SCREEN)
+	if (full_screen)
 	{
 		// If full screen set the screen to maximum size of the users desktop and 32bit.
 		memset(&dmScreenSettings, 0, sizeof(dmScreenSettings));
@@ -465,51 +484,51 @@ void SystemClass::InitializeWindows(int& screenWidth, int& screenHeight)
 	}
 
 	// Create the window with the screen settings and get the handle to it.
-	m_hwnd = CreateWindowEx(WS_EX_APPWINDOW, m_applicationName, m_applicationName,
+	hwnd_ = CreateWindowEx(WS_EX_APPWINDOW, application_name_, application_name_,
 		WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX,
-		posX, posY, screenWidth, screenHeight, NULL, NULL, m_hinstance, NULL);
+		posX, posY, screenWidth, screenHeight, NULL, NULL, hinstance_, NULL);
 
 	// Bring the window up on the screen and set it as main focus.
-	ShowWindow(m_hwnd, SW_SHOW);
-	SetForegroundWindow(m_hwnd);
-	SetFocus(m_hwnd);
+	ShowWindow(hwnd_, SW_SHOW);
+	SetForegroundWindow(hwnd_);
+	SetFocus(hwnd_);
 
 	// Hide the mouse cursor.
 	ShowCursor(true);
 
 	//drag and drop 
-	DragAcceptFiles(m_hwnd, TRUE);
+	DragAcceptFiles(hwnd_, TRUE);
 
 	return;
 }
 
-void SystemClass::ShutdownWindows()
+void system_class::shutdown_windows()
 {
 	Logger::Get().Log("Shutting down the windows", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
 	// Show the mouse cursor.
 	ShowCursor(true);
 
 	// Fix the display settings if leaving full screen mode.
-	if (FULL_SCREEN)
+	if (full_screen)
 	{
 		ChangeDisplaySettings(NULL, 0);
 	}
 
 	// Remove the window.
-	DestroyWindow(m_hwnd);
-	m_hwnd = NULL;
+	DestroyWindow(hwnd_);
+	hwnd_ = NULL;
 
 	// Remove the application instance.
-	UnregisterClass(m_applicationName, m_hinstance);
-	m_hinstance = NULL;
+	UnregisterClass(application_name_, hinstance_);
+	hinstance_ = NULL;
 
 	// Release the pointer to this class.
-	ApplicationHandle = NULL;
+	application_handle = NULL;
 
 	return;
 }
 
-LRESULT CALLBACK WndProc(HWND hwnd, UINT umessage, WPARAM wparam, LPARAM lparam)
+LRESULT CALLBACK wnd_proc(HWND hwnd, UINT umessage, WPARAM wparam, LPARAM lparam)
 {
 	switch (umessage)
 	{
@@ -529,20 +548,20 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT umessage, WPARAM wparam, LPARAM lparam)
 
 	case WM_DROPFILES:
 	{
-		ApplicationHandle->MessageHandler(hwnd, umessage, wparam, lparam);
+		application_handle->message_handler(hwnd, umessage, wparam, lparam);
 		return(0);
 	}
 
 	// All other messages pass to the message handler in the system class.
 	default:
 	{
-		return ApplicationHandle->MessageHandler(hwnd, umessage, wparam, lparam);
+		return application_handle->message_handler(hwnd, umessage, wparam, lparam);
 	}
 	}
 }
 
-void SystemClass::SendPath(wchar_t* path, std::filesystem::path WFolder)
+void system_class::send_path(wchar_t* path, std::filesystem::path w_folder)
 {
-	m_Application->SetPath(path);
-	m_Application->SetWFolder(WFolder);
+	application_->set_path(path);
+	application_->set_w_folder(w_folder);
 }
\ No newline at end of file
diff --git a/enginecustom/src/src/system/textclass.cpp b/enginecustom/src/src/system/text_class.cpp
similarity index 86%
rename from enginecustom/src/src/system/textclass.cpp
rename to enginecustom/src/src/system/text_class.cpp
index 33df17a..30e879d 100644
--- a/enginecustom/src/src/system/textclass.cpp
+++ b/enginecustom/src/src/system/text_class.cpp
@@ -1,23 +1,23 @@
-#include "textclass.h"
+#include "text_class.h"
 
 
-TextClass::TextClass()
+text_class::text_class()
 {
     m_vertexBuffer = 0;
     m_indexBuffer = 0;
 }
 
 
-TextClass::TextClass(const TextClass& other)
+text_class::text_class(const text_class& other)
 {
 }
 
 
-TextClass::~TextClass()
+text_class::~text_class()
 {
 }
 
-bool TextClass::Initialize(ID3D11Device* device, ID3D11DeviceContext* deviceContext, int screenWidth, int screenHeight, int maxLength, FontClass* Font, char* text,
+bool text_class::Initialize(ID3D11Device* device, ID3D11DeviceContext* deviceContext, int screenWidth, int screenHeight, int maxLength, font_class* Font, char* text,
     int positionX, int positionY, float red, float green, float blue)
 {
     bool result;
@@ -40,7 +40,7 @@ bool TextClass::Initialize(ID3D11Device* device, ID3D11DeviceContext* deviceCont
     return true;
 }
 
-void TextClass::Shutdown()
+void text_class::Shutdown()
 {
     // Release the vertex and index buffers.
     ShutdownBuffers();
@@ -48,7 +48,7 @@ void TextClass::Shutdown()
     return;
 }
 
-void TextClass::Render(ID3D11DeviceContext* deviceContext)
+void text_class::Render(ID3D11DeviceContext* deviceContext)
 {
     // Put the vertex and index buffers on the graphics pipeline to prepare them for drawing.
     RenderBuffers(deviceContext);
@@ -56,12 +56,12 @@ void TextClass::Render(ID3D11DeviceContext* deviceContext)
     return;
 }
 
-int TextClass::GetIndexCount()
+int text_class::GetIndexCount()
 {
     return m_indexCount;
 }
 
-bool TextClass::InitializeBuffers(ID3D11Device* device, ID3D11DeviceContext* deviceContext, FontClass* Font, char* text, int positionX, int positionY, float red, float green, float blue)
+bool text_class::InitializeBuffers(ID3D11Device* device, ID3D11DeviceContext* deviceContext, font_class* Font, char* text, int positionX, int positionY, float red, float green, float blue)
 {
     VertexType* vertices;
     unsigned long* indices;
@@ -147,7 +147,7 @@ bool TextClass::InitializeBuffers(ID3D11Device* device, ID3D11DeviceContext* dev
     return true;
 }
 
-void TextClass::ShutdownBuffers()
+void text_class::ShutdownBuffers()
 {
     // Release the index buffer.
     if (m_indexBuffer)
@@ -166,7 +166,7 @@ void TextClass::ShutdownBuffers()
     return;
 }
 
-bool TextClass::UpdateText(ID3D11DeviceContext* deviceContext, FontClass* Font, char* text, int positionX, int positionY, float red, float green, float blue)
+bool text_class::UpdateText(ID3D11DeviceContext* deviceContext, font_class* Font, char* text, int positionX, int positionY, float red, float green, float blue)
 {
     int numLetters;
     VertexType* vertices;
@@ -223,7 +223,7 @@ bool TextClass::UpdateText(ID3D11DeviceContext* deviceContext, FontClass* Font,
     return true;
 }
 
-void TextClass::RenderBuffers(ID3D11DeviceContext* deviceContext)
+void text_class::RenderBuffers(ID3D11DeviceContext* deviceContext)
 {
     unsigned int stride, offset;
 
@@ -244,7 +244,7 @@ void TextClass::RenderBuffers(ID3D11DeviceContext* deviceContext)
     return;
 }
 
-XMFLOAT4 TextClass::GetPixelColor()
+XMFLOAT4 text_class::GetPixelColor()
 {
     return m_pixelColor;
 }
diff --git a/enginecustom/src/src/system/textureclass.cpp b/enginecustom/src/src/system/texture_class.cpp
similarity index 93%
rename from enginecustom/src/src/system/textureclass.cpp
rename to enginecustom/src/src/system/texture_class.cpp
index 81e5c8d..b500dae 100644
--- a/enginecustom/src/src/system/textureclass.cpp
+++ b/enginecustom/src/src/system/texture_class.cpp
@@ -1,6 +1,6 @@
-#include "textureclass.h"
+#include "texture_class.h"
 
-TextureClass::TextureClass()
+texture_class::texture_class()
 {
 	m_targaData = 0;
 	m_texture = 0;
@@ -8,16 +8,16 @@ TextureClass::TextureClass()
 }
 
 
-TextureClass::TextureClass(const TextureClass& other)
+texture_class::texture_class(const texture_class& other)
 {
 }
 
 
-TextureClass::~TextureClass()
+texture_class::~texture_class()
 {
 }
 
-bool TextureClass::Initialize(ID3D11Device * device, ID3D11DeviceContext * deviceContext, std::string filename)
+bool texture_class::Initialize(ID3D11Device * device, ID3D11DeviceContext * deviceContext, std::string filename)
 {
 	Logger::Get().Log(("Iinitializing texture: %s", filename), __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -84,7 +84,7 @@ bool TextureClass::Initialize(ID3D11Device * device, ID3D11DeviceContext * devic
 	return true;
 }
 
-void TextureClass::Shutdown()
+void texture_class::Shutdown()
 {
 
 	Logger::Get().Log("Shutting down texture", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
@@ -114,12 +114,12 @@ void TextureClass::Shutdown()
 	return;
 }
 
-ID3D11ShaderResourceView* TextureClass::GetTexture()
+ID3D11ShaderResourceView* texture_class::GetTexture()
 {
 	return m_textureView;
 }
 
-bool TextureClass::LoadTarga(std::string filename)
+bool texture_class::LoadTarga(std::string filename)
 {
 
 	Logger::Get().Log(("Loading targa file: %s", filename), __FILE__, __LINE__);
@@ -230,13 +230,13 @@ bool TextureClass::LoadTarga(std::string filename)
 }
 
 
-int TextureClass::GetWidth()
+int texture_class::GetWidth()
 {
 	return m_width;
 }
 
 
-int TextureClass::GetHeight()
+int texture_class::GetHeight()
 {
 	return m_height;
 }
diff --git a/enginecustom/src/src/system/Timerclass.cpp b/enginecustom/src/src/system/timer_class.cpp
similarity index 84%
rename from enginecustom/src/src/system/Timerclass.cpp
rename to enginecustom/src/src/system/timer_class.cpp
index 2e5a08b..0e8d764 100644
--- a/enginecustom/src/src/system/Timerclass.cpp
+++ b/enginecustom/src/src/system/timer_class.cpp
@@ -1,21 +1,21 @@
-#include "timerclass.h"
+#include "timer_class.h"
 
 
-TimerClass::TimerClass()
+timer_class::timer_class()
 {
 }
 
 
-TimerClass::TimerClass(const TimerClass& other)
+timer_class::timer_class(const timer_class& other)
 {
 }
 
 
-TimerClass::~TimerClass()
+timer_class::~timer_class()
 {
 }
 
-bool TimerClass::Initialize()
+bool timer_class::Initialize()
 {
     Logger::Get().Log("Initilazing timer class", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -41,7 +41,7 @@ bool TimerClass::Initialize()
     return true;
 }
 
-void TimerClass::Frame()
+void timer_class::Frame()
 {
     INT64 currentTime;
     INT64 elapsedTicks;
@@ -62,7 +62,7 @@ void TimerClass::Frame()
     return;
 }
 
-float TimerClass::GetTime()
+float timer_class::GetTime()
 {
     return m_frameTime;
 }