diff --git a/DevPlayground/CMakeLists.txt b/DevPlayground/CMakeLists.txt
new file mode 100644
index 0000000..9340c9f
--- /dev/null
+++ b/DevPlayground/CMakeLists.txt
@@ -0,0 +1,21 @@
+cmake_minimum_required(VERSION 3.15...3.30)
+
+project(DevPlayground)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++")  
+
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../Engine/Source/Runtime ${CMAKE_BINARY_DIR}/Engine)
+
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}../Engine/Source/Runtime)
+
+add_executable(DevPlayground 
+    DevPlayground.cpp
+)
+
+
+add_compile_definitions(P_LINUX_BUILD)
+add_compile_definitions(P_DEBUG)
+
+target_link_libraries(DevPlayground PRIVATE PhanesCore)
\ No newline at end of file
diff --git a/DevPlayground/DevPlayground.cpp b/DevPlayground/DevPlayground.cpp
index 960f4ee..67f970f 100644
--- a/DevPlayground/DevPlayground.cpp
+++ b/DevPlayground/DevPlayground.cpp
@@ -1,9 +1,8 @@
 #define P_USE_NAMESPACE_ALIAS
 
-
 #include "Phanes.h"
 
-class DevPlayground : public PApp::PhanesProject 
+class DevPlayground : public PApp::PhanesProject
 {
     using PhanesProject::PhanesProject;
 };
diff --git a/Engine/Source/Runtime/CMakeLists.txt b/Engine/Source/Runtime/CMakeLists.txt
new file mode 100644
index 0000000..13e60e9
--- /dev/null
+++ b/Engine/Source/Runtime/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.15...3.30)
+
+project(PhanesRuntime)
+
+add_subdirectory(Core)
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Core/CMakeLists.txt b/Engine/Source/Runtime/Core/CMakeLists.txt
new file mode 100644
index 0000000..c76489b
--- /dev/null
+++ b/Engine/Source/Runtime/Core/CMakeLists.txt
@@ -0,0 +1,26 @@
+cmake_minimum_required(VERSION 3.15...3.30)
+
+project(PhanesCore)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+include(Logging/CMakeLists.txt)
+include(StartingPoint/CMakeLists.txt)
+
+add_library(PhanesCore STATIC 
+Core.h 
+${Logging}
+${StartingPoint}
+)
+
+target_precompile_headers(PhanesCore PUBLIC 
+${LoggingPCH}
+${StartingPointPCH}
+)
+
+add_compile_definitions(P_LINUX_BUILD)
+add_compile_definitions(P_DEBUG)
+
+
+target_include_directories(PhanesCore PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../)
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Core/Core.h b/Engine/Source/Runtime/Core/Core.h
index dede1cf..54e1c68 100644
--- a/Engine/Source/Runtime/Core/Core.h
+++ b/Engine/Source/Runtime/Core/Core.h
@@ -26,9 +26,17 @@
 
 	#define FORCEINLINE __forceinline
 
-#elif defined(P_UNIX_BUILD)
+#elif defined(P_LINUX_BUILD)
 
-	#error Only Windows is supported at the moment.	
+	#ifdef P_DEBUG
+	
+		#define P_DEBUGBREAK __builtin_trap();
+
+	#else
+
+		#define P_DEBUGBREAK
+
+	#endif
 
 #elif defined(P_ARM_BUILD)
 	
@@ -43,7 +51,6 @@
 
 namespace Phanes
 {
-
 	// Alias for shared_ptr
 	template<typename T>
 	using Ref = std::shared_ptr<T>;
@@ -65,5 +72,4 @@ namespace Phanes
 	{
 		return std::make_unique<T>(std::forward<Args>(args)...);
 	}
-
 }
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Core/public/HAL/Platform.h b/Engine/Source/Runtime/Core/HAL/Platform.h
similarity index 100%
rename from Engine/Source/Runtime/Core/public/HAL/Platform.h
rename to Engine/Source/Runtime/Core/HAL/Platform.h
diff --git a/Engine/Source/Runtime/Core/public/HAL/PlatformTypes.h b/Engine/Source/Runtime/Core/HAL/PlatformTypes.h
similarity index 100%
rename from Engine/Source/Runtime/Core/public/HAL/PlatformTypes.h
rename to Engine/Source/Runtime/Core/HAL/PlatformTypes.h
diff --git a/Engine/Source/Runtime/Core/public/HAL/README.md b/Engine/Source/Runtime/Core/HAL/README.md
similarity index 100%
rename from Engine/Source/Runtime/Core/public/HAL/README.md
rename to Engine/Source/Runtime/Core/HAL/README.md
diff --git a/Engine/Source/Runtime/Core/Include.h b/Engine/Source/Runtime/Core/Include.h
index 0d1d938..bd4d87f 100644
--- a/Engine/Source/Runtime/Core/Include.h
+++ b/Engine/Source/Runtime/Core/Include.h
@@ -2,16 +2,11 @@
 
 // --- Logging -------------------------------------
 
-#include "Core/public/Logging/Logging.h"
+#include "Core/Logging/Logging.h"
 
 // --- Starting point ------------------------------
-#include "Core/public/StartingPoint/StartingPoint.h"
-#include "Core/public/StartingPoint/EntryPoint.h"
-
-
-// --- OSAL ----------------------------------------
-
-#include "Core/public/HAL/PlatformTypes.h"
+#include "Core/StartingPoint/StartingPoint.h"
+#include "Core/StartingPoint/EntryPoint.h"
 
 
 #ifdef P_USE_NAMESPACE_ALIAS
diff --git a/Engine/Source/Runtime/Core/Logging/CMakeLists.txt b/Engine/Source/Runtime/Core/Logging/CMakeLists.txt
new file mode 100644
index 0000000..cd7699a
--- /dev/null
+++ b/Engine/Source/Runtime/Core/Logging/CMakeLists.txt
@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 3.15...3.30)
+
+project(PhanesLogging)
+
+set(Logging 
+    Logging/Logging.h
+    Logging/private/Logging.cpp
+)
+
+set(LoggingPCH
+    Logging/LoggingPCH.h
+)
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Core/public/Logging/Logging.h b/Engine/Source/Runtime/Core/Logging/Logging.h
similarity index 76%
rename from Engine/Source/Runtime/Core/public/Logging/Logging.h
rename to Engine/Source/Runtime/Core/Logging/Logging.h
index 9b0f0c9..5ff70bf 100644
--- a/Engine/Source/Runtime/Core/public/Logging/Logging.h
+++ b/Engine/Source/Runtime/Core/Logging/Logging.h
@@ -1,22 +1,18 @@
 #pragma once
 
 
-#include "PhanesEnginePCH.h"
+#include "Core/Logging/LoggingPCH.h"
 #include "Core/Core.h"
 
-#ifndef P_DEBUG
-#pragma warning(disable : 4251) // Disable STL dll export warning
-#endif
-
 namespace Phanes::Core::Logging
 {
-	static std::shared_ptr<spdlog::logger> _PEngineLogger;
-	static std::shared_ptr<spdlog::logger> _PAppLogger;
+	static Phanes::Ref<spdlog::logger> _PEngineLogger;
+	static Phanes::Ref<spdlog::logger> _PAppLogger;
 
-	PHANES_CORE void Init();
+	void Init();
 
-	PHANES_CORE inline std::shared_ptr<spdlog::logger>& PEngineLogger() { return _PEngineLogger; };
-	PHANES_CORE inline std::shared_ptr<spdlog::logger>& PAppLogger() { return _PAppLogger; };
+	inline std::shared_ptr<spdlog::logger>& PEngineLogger() { return _PEngineLogger; };
+	inline std::shared_ptr<spdlog::logger>& PAppLogger() { return _PAppLogger; };
 }
 
 
diff --git a/Engine/Source/Runtime/Core/Logging/LoggingPCH.h b/Engine/Source/Runtime/Core/Logging/LoggingPCH.h
new file mode 100644
index 0000000..25f396c
--- /dev/null
+++ b/Engine/Source/Runtime/Core/Logging/LoggingPCH.h
@@ -0,0 +1,3 @@
+#   // spdlog
+#   include <spdlog/sinks/stdout_color_sinks.h>
+#   include <spdlog/spdlog.h>
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Core/private/Logging/Logging.cpp b/Engine/Source/Runtime/Core/Logging/private/Logging.cpp
similarity index 80%
rename from Engine/Source/Runtime/Core/private/Logging/Logging.cpp
rename to Engine/Source/Runtime/Core/Logging/private/Logging.cpp
index 4f77860..21542d2 100644
--- a/Engine/Source/Runtime/Core/private/Logging/Logging.cpp
+++ b/Engine/Source/Runtime/Core/Logging/private/Logging.cpp
@@ -1,6 +1,4 @@
-#include "PhanesEnginePCH.h"
-
-#include "Core/public/Logging/Logging.h"
+#include "Core/Logging/Logging.h"
 
 void Phanes::Core::Logging::Init()
 {
diff --git a/Engine/Source/Runtime/Core/public/Math/Boilerplate.h b/Engine/Source/Runtime/Core/Math/Boilerplate.h
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Boilerplate.h
rename to Engine/Source/Runtime/Core/Math/Boilerplate.h
diff --git a/Engine/Source/Runtime/Core/public/Math/Detail/IntVector2Decl.inl b/Engine/Source/Runtime/Core/Math/Detail/IntVector2Decl.inl
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Detail/IntVector2Decl.inl
rename to Engine/Source/Runtime/Core/Math/Detail/IntVector2Decl.inl
diff --git a/Engine/Source/Runtime/Core/public/Math/Detail/IntVector3Decl.inl b/Engine/Source/Runtime/Core/Math/Detail/IntVector3Decl.inl
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Detail/IntVector3Decl.inl
rename to Engine/Source/Runtime/Core/Math/Detail/IntVector3Decl.inl
diff --git a/Engine/Source/Runtime/Core/public/Math/Detail/IntVector4Decl.inl b/Engine/Source/Runtime/Core/Math/Detail/IntVector4Decl.inl
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Detail/IntVector4Decl.inl
rename to Engine/Source/Runtime/Core/Math/Detail/IntVector4Decl.inl
diff --git a/Engine/Source/Runtime/Core/public/Math/Detail/Matrix3Decl.inl b/Engine/Source/Runtime/Core/Math/Detail/Matrix3Decl.inl
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Detail/Matrix3Decl.inl
rename to Engine/Source/Runtime/Core/Math/Detail/Matrix3Decl.inl
diff --git a/Engine/Source/Runtime/Core/public/Math/Detail/Matrix4Decl.inl b/Engine/Source/Runtime/Core/Math/Detail/Matrix4Decl.inl
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Detail/Matrix4Decl.inl
rename to Engine/Source/Runtime/Core/Math/Detail/Matrix4Decl.inl
diff --git a/Engine/Source/Runtime/Core/public/Math/Detail/PlaneDecl.inl b/Engine/Source/Runtime/Core/Math/Detail/PlaneDecl.inl
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Detail/PlaneDecl.inl
rename to Engine/Source/Runtime/Core/Math/Detail/PlaneDecl.inl
diff --git a/Engine/Source/Runtime/Core/public/Math/Detail/Vector2Decl.inl b/Engine/Source/Runtime/Core/Math/Detail/Vector2Decl.inl
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Detail/Vector2Decl.inl
rename to Engine/Source/Runtime/Core/Math/Detail/Vector2Decl.inl
diff --git a/Engine/Source/Runtime/Core/public/Math/Detail/Vector3Decl.inl b/Engine/Source/Runtime/Core/Math/Detail/Vector3Decl.inl
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Detail/Vector3Decl.inl
rename to Engine/Source/Runtime/Core/Math/Detail/Vector3Decl.inl
diff --git a/Engine/Source/Runtime/Core/public/Math/Detail/Vector4Decl.inl b/Engine/Source/Runtime/Core/Math/Detail/Vector4Decl.inl
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Detail/Vector4Decl.inl
rename to Engine/Source/Runtime/Core/Math/Detail/Vector4Decl.inl
diff --git a/Engine/Source/Runtime/Core/public/Math/Include.h b/Engine/Source/Runtime/Core/Math/Include.h
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Include.h
rename to Engine/Source/Runtime/Core/Math/Include.h
diff --git a/Engine/Source/Runtime/Core/public/Math/IntPoint.hpp b/Engine/Source/Runtime/Core/Math/IntPoint.hpp
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/IntPoint.hpp
rename to Engine/Source/Runtime/Core/Math/IntPoint.hpp
diff --git a/Engine/Source/Runtime/Core/public/Math/IntVector2.hpp b/Engine/Source/Runtime/Core/Math/IntVector2.hpp
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/IntVector2.hpp
rename to Engine/Source/Runtime/Core/Math/IntVector2.hpp
diff --git a/Engine/Source/Runtime/Core/public/Math/IntVector2.inl b/Engine/Source/Runtime/Core/Math/IntVector2.inl
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/IntVector2.inl
rename to Engine/Source/Runtime/Core/Math/IntVector2.inl
diff --git a/Engine/Source/Runtime/Core/public/Math/IntVector3.hpp b/Engine/Source/Runtime/Core/Math/IntVector3.hpp
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/IntVector3.hpp
rename to Engine/Source/Runtime/Core/Math/IntVector3.hpp
diff --git a/Engine/Source/Runtime/Core/public/Math/IntVector3.inl b/Engine/Source/Runtime/Core/Math/IntVector3.inl
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/IntVector3.inl
rename to Engine/Source/Runtime/Core/Math/IntVector3.inl
diff --git a/Engine/Source/Runtime/Core/public/Math/IntVector4.hpp b/Engine/Source/Runtime/Core/Math/IntVector4.hpp
similarity index 98%
rename from Engine/Source/Runtime/Core/public/Math/IntVector4.hpp
rename to Engine/Source/Runtime/Core/Math/IntVector4.hpp
index b4b2eff..1f08a43 100644
--- a/Engine/Source/Runtime/Core/public/Math/IntVector4.hpp
+++ b/Engine/Source/Runtime/Core/Math/IntVector4.hpp
@@ -471,7 +471,7 @@ namespace Phanes::Core::Math {
     /// <summary>
     /// Gets componentwise max of both vectors.
     /// </summary>
-    /// <typeparam name="T">Type of vector</typeparam>
+    /// <typeparam name="T">Type of vector</typeparam>				 * @note z does not hold the component, but is a reference two the second item in the components array. The varibale exists wholly for convenience.
     /// <typeparam name="A">Vector is aligned?</typeparam>
     /// <param name="v1">Vector one</param>
     /// <param name="v2">Vector two</param>
diff --git a/Engine/Source/Runtime/Core/public/Math/IntVector4.inl b/Engine/Source/Runtime/Core/Math/IntVector4.inl
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/IntVector4.inl
rename to Engine/Source/Runtime/Core/Math/IntVector4.inl
diff --git a/Engine/Source/Runtime/Core/public/Math/Line.hpp b/Engine/Source/Runtime/Core/Math/Line.hpp
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Line.hpp
rename to Engine/Source/Runtime/Core/Math/Line.hpp
diff --git a/Engine/Source/Runtime/Core/public/Math/MathAbstractTypes.h b/Engine/Source/Runtime/Core/Math/MathAbstractTypes.h
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/MathAbstractTypes.h
rename to Engine/Source/Runtime/Core/Math/MathAbstractTypes.h
diff --git a/Engine/Source/Runtime/Core/public/Math/MathCommon.hpp b/Engine/Source/Runtime/Core/Math/MathCommon.hpp
similarity index 90%
rename from Engine/Source/Runtime/Core/public/Math/MathCommon.hpp
rename to Engine/Source/Runtime/Core/Math/MathCommon.hpp
index 2a1984b..a7f4e46 100644
--- a/Engine/Source/Runtime/Core/public/Math/MathCommon.hpp
+++ b/Engine/Source/Runtime/Core/Math/MathCommon.hpp
@@ -4,11 +4,11 @@
 #define P_FLT_INAC				0.00001f					// float inaccuracy (1*10^-5);
 #define P_FLT_INAC_SMALL		0.000001f					// small float inaccuracy (1*10^-6);
 
-#define P_180_PI				57.29577951308232			// (double) 180°/pi;
-#define P_180_PI_FLT			57.29577951308232f			// (float) 180°/pi;
+#define P_180_PI				57.29577951308232			// (double) 180�/pi;
+#define P_180_PI_FLT			57.29577951308232f			// (float) 180�/pi;
 
-#define P_PI_180				0.0174532925199432			// double pi/180°
-#define P_PI_180_FLT			0.0174532925199432f			// (float) pi/180°
+#define P_PI_180				0.0174532925199432			// double pi/180�
+#define P_PI_180_FLT			0.0174532925199432f			// (float) pi/180�
 
 #define P_PI					3.1415926535897932			// PI 
 #define P_PI_FLT				3.1415926535897932f			// PI 
@@ -48,7 +48,7 @@ namespace Phanes::Core::Math {
      */
 
     template<typename T>
-    inline T Max(T x, T y)
+    constexpr T Max(T x, T y)
     {
         return (x > y) ? x : y;
     }
@@ -64,7 +64,7 @@ namespace Phanes::Core::Math {
      */
 
     template<typename T>
-    inline T Min(T x, T y)
+    constexpr T Min(T x, T y)
     {
         return (x < y) ? x : y;
     }
diff --git a/Engine/Source/Runtime/Core/public/Math/MathFwd.h b/Engine/Source/Runtime/Core/Math/MathFwd.h
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/MathFwd.h
rename to Engine/Source/Runtime/Core/Math/MathFwd.h
diff --git a/Engine/Source/Runtime/Core/public/Math/MathPCH.h b/Engine/Source/Runtime/Core/Math/MathPCH.h
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/MathPCH.h
rename to Engine/Source/Runtime/Core/Math/MathPCH.h
diff --git a/Engine/Source/Runtime/Core/public/Math/MathTypeConversion.hpp b/Engine/Source/Runtime/Core/Math/MathTypeConversion.hpp
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/MathTypeConversion.hpp
rename to Engine/Source/Runtime/Core/Math/MathTypeConversion.hpp
diff --git a/Engine/Source/Runtime/Core/public/Math/MathTypes.h b/Engine/Source/Runtime/Core/Math/MathTypes.h
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/MathTypes.h
rename to Engine/Source/Runtime/Core/Math/MathTypes.h
diff --git a/Engine/Source/Runtime/Core/public/Math/MathUnitConversion.hpp b/Engine/Source/Runtime/Core/Math/MathUnitConversion.hpp
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/MathUnitConversion.hpp
rename to Engine/Source/Runtime/Core/Math/MathUnitConversion.hpp
diff --git a/Engine/Source/Runtime/Core/public/Math/Matrix2.hpp b/Engine/Source/Runtime/Core/Math/Matrix2.hpp
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Matrix2.hpp
rename to Engine/Source/Runtime/Core/Math/Matrix2.hpp
diff --git a/Engine/Source/Runtime/Core/public/Math/Matrix3.hpp b/Engine/Source/Runtime/Core/Math/Matrix3.hpp
similarity index 99%
rename from Engine/Source/Runtime/Core/public/Math/Matrix3.hpp
rename to Engine/Source/Runtime/Core/Math/Matrix3.hpp
index 82c740d..e0f0e7d 100644
--- a/Engine/Source/Runtime/Core/public/Math/Matrix3.hpp
+++ b/Engine/Source/Runtime/Core/Math/Matrix3.hpp
@@ -480,7 +480,7 @@ namespace Phanes::Core::Math {
      */
 
     template<RealType T, bool S>
-    TMatrix3<T, S> TransposeV(TMatrix3<T, S>& m1);
+    TMatrix3<T, S>& TransposeV(TMatrix3<T, S>& m1);
 
 
     // =============== //
diff --git a/Engine/Source/Runtime/Core/public/Math/Matrix3.inl b/Engine/Source/Runtime/Core/Math/Matrix3.inl
similarity index 90%
rename from Engine/Source/Runtime/Core/public/Math/Matrix3.inl
rename to Engine/Source/Runtime/Core/Math/Matrix3.inl
index 159f579..1e6dc9f 100644
--- a/Engine/Source/Runtime/Core/public/Math/Matrix3.inl
+++ b/Engine/Source/Runtime/Core/Math/Matrix3.inl
@@ -10,7 +10,7 @@
 namespace Phanes::Core::Math
 {
     template<RealType T, bool S>
-    TMatrix3<T, S> TransposeV(TMatrix3<T, S>& m)
+    TMatrix3<T, S>& TransposeV(TMatrix3<T, S>& m)
     {
         Detail::compute_mat3_transpose<T, S>::map(m, m);
         return m;
@@ -26,7 +26,7 @@ namespace Phanes::Core::Math
     }
 
     template<RealType T, bool S>
-    TMatrix3<T, S> operator*= (TMatrix3<T, S>& m1, const TMatrix3<T, S>& m2)
+    TMatrix3<T, S>& operator*= (TMatrix3<T, S>& m1, const TMatrix3<T, S>& m2)
     {
         TMatrix3<T, S> r;
         Detail::compute_mat3_mul<T, S>::map(r, m1, m2);
diff --git a/Engine/Source/Runtime/Core/public/Math/Matrix4.hpp b/Engine/Source/Runtime/Core/Math/Matrix4.hpp
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Matrix4.hpp
rename to Engine/Source/Runtime/Core/Math/Matrix4.hpp
diff --git a/Engine/Source/Runtime/Core/public/Math/Matrix4.inl b/Engine/Source/Runtime/Core/Math/Matrix4.inl
similarity index 92%
rename from Engine/Source/Runtime/Core/public/Math/Matrix4.inl
rename to Engine/Source/Runtime/Core/Math/Matrix4.inl
index 80a574e..e6bada3 100644
--- a/Engine/Source/Runtime/Core/public/Math/Matrix4.inl
+++ b/Engine/Source/Runtime/Core/Math/Matrix4.inl
@@ -23,7 +23,7 @@ namespace Phanes::Core::Math
     }
 
     template<RealType T, bool S>
-    TMatrix4<T, S> TransposeV(TMatrix4<T, S>& a)
+    TMatrix4<T, S>& TransposeV(TMatrix4<T, S>& a)
     {
         Detail::compute_mat4_transpose<T, S>::map(a, a);
         return a;
@@ -44,7 +44,7 @@ namespace Phanes::Core::Math
     }
 
     template<RealType T, bool S>
-    TMatrix4<T, S> operator*= (TMatrix4<T, S>& m1, const TMatrix4<T, S>& m2)
+    TMatrix4<T, S>& operator*= (TMatrix4<T, S>& m1, const TMatrix4<T, S>& m2)
     {
         TMatrix4<T, S> r;
         Detail::compute_mat4_mul<T, S>::map(r, m1, m2);
diff --git a/Engine/Source/Runtime/Core/public/Math/Plane.hpp b/Engine/Source/Runtime/Core/Math/Plane.hpp
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Plane.hpp
rename to Engine/Source/Runtime/Core/Math/Plane.hpp
diff --git a/Engine/Source/Runtime/Core/public/Math/Plane.inl b/Engine/Source/Runtime/Core/Math/Plane.inl
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Plane.inl
rename to Engine/Source/Runtime/Core/Math/Plane.inl
diff --git a/Engine/Source/Runtime/Core/public/Math/PlatformTypes.h b/Engine/Source/Runtime/Core/Math/PlatformTypes.h
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/PlatformTypes.h
rename to Engine/Source/Runtime/Core/Math/PlatformTypes.h
diff --git a/Engine/Source/Runtime/Core/public/Math/Point.hpp b/Engine/Source/Runtime/Core/Math/Point.hpp
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Point.hpp
rename to Engine/Source/Runtime/Core/Math/Point.hpp
diff --git a/Engine/Source/Runtime/Core/public/Math/README.md b/Engine/Source/Runtime/Core/Math/README.md
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/README.md
rename to Engine/Source/Runtime/Core/Math/README.md
diff --git a/Engine/Source/Runtime/Core/public/Math/Ray.hpp b/Engine/Source/Runtime/Core/Math/Ray.hpp
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Ray.hpp
rename to Engine/Source/Runtime/Core/Math/Ray.hpp
diff --git a/Engine/Source/Runtime/Core/public/Math/SIMD/Alignment.h b/Engine/Source/Runtime/Core/Math/SIMD/Alignment.h
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/SIMD/Alignment.h
rename to Engine/Source/Runtime/Core/Math/SIMD/Alignment.h
diff --git a/Engine/Source/Runtime/Core/public/Math/SIMD/PhanesSIMDTypes.h b/Engine/Source/Runtime/Core/Math/SIMD/PhanesSIMDTypes.h
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/SIMD/PhanesSIMDTypes.h
rename to Engine/Source/Runtime/Core/Math/SIMD/PhanesSIMDTypes.h
diff --git a/Engine/Source/Runtime/Core/public/Math/SIMD/PhanesVectorMathAVX.hpp b/Engine/Source/Runtime/Core/Math/SIMD/PhanesVectorMathAVX.hpp
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/SIMD/PhanesVectorMathAVX.hpp
rename to Engine/Source/Runtime/Core/Math/SIMD/PhanesVectorMathAVX.hpp
diff --git a/Engine/Source/Runtime/Core/public/Math/SIMD/PhanesVectorMathAVX2.hpp b/Engine/Source/Runtime/Core/Math/SIMD/PhanesVectorMathAVX2.hpp
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/SIMD/PhanesVectorMathAVX2.hpp
rename to Engine/Source/Runtime/Core/Math/SIMD/PhanesVectorMathAVX2.hpp
diff --git a/Engine/Source/Runtime/Core/public/Math/SIMD/PhanesVectorMathFPU.hpp b/Engine/Source/Runtime/Core/Math/SIMD/PhanesVectorMathFPU.hpp
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/SIMD/PhanesVectorMathFPU.hpp
rename to Engine/Source/Runtime/Core/Math/SIMD/PhanesVectorMathFPU.hpp
diff --git a/Engine/Source/Runtime/Core/public/Math/SIMD/PhanesVectorMathNeon.hpp b/Engine/Source/Runtime/Core/Math/SIMD/PhanesVectorMathNeon.hpp
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/SIMD/PhanesVectorMathNeon.hpp
rename to Engine/Source/Runtime/Core/Math/SIMD/PhanesVectorMathNeon.hpp
diff --git a/Engine/Source/Runtime/Core/public/Math/SIMD/PhanesVectorMathSSE.hpp b/Engine/Source/Runtime/Core/Math/SIMD/PhanesVectorMathSSE.hpp
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/SIMD/PhanesVectorMathSSE.hpp
rename to Engine/Source/Runtime/Core/Math/SIMD/PhanesVectorMathSSE.hpp
diff --git a/Engine/Source/Runtime/Core/public/Math/SIMD/Platform.h b/Engine/Source/Runtime/Core/Math/SIMD/Platform.h
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/SIMD/Platform.h
rename to Engine/Source/Runtime/Core/Math/SIMD/Platform.h
diff --git a/Engine/Source/Runtime/Core/public/Math/SIMD/SIMDIntrinsics.h b/Engine/Source/Runtime/Core/Math/SIMD/SIMDIntrinsics.h
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/SIMD/SIMDIntrinsics.h
rename to Engine/Source/Runtime/Core/Math/SIMD/SIMDIntrinsics.h
diff --git a/Engine/Source/Runtime/Core/public/Math/SIMD/Storage.h b/Engine/Source/Runtime/Core/Math/SIMD/Storage.h
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/SIMD/Storage.h
rename to Engine/Source/Runtime/Core/Math/SIMD/Storage.h
diff --git a/Engine/Source/Runtime/Core/public/Math/Vector2.hpp b/Engine/Source/Runtime/Core/Math/Vector2.hpp
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Vector2.hpp
rename to Engine/Source/Runtime/Core/Math/Vector2.hpp
diff --git a/Engine/Source/Runtime/Core/public/Math/Vector2.inl b/Engine/Source/Runtime/Core/Math/Vector2.inl
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Vector2.inl
rename to Engine/Source/Runtime/Core/Math/Vector2.inl
diff --git a/Engine/Source/Runtime/Core/public/Math/Vector3.hpp b/Engine/Source/Runtime/Core/Math/Vector3.hpp
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Vector3.hpp
rename to Engine/Source/Runtime/Core/Math/Vector3.hpp
diff --git a/Engine/Source/Runtime/Core/public/Math/Vector3.inl b/Engine/Source/Runtime/Core/Math/Vector3.inl
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Vector3.inl
rename to Engine/Source/Runtime/Core/Math/Vector3.inl
diff --git a/Engine/Source/Runtime/Core/public/Math/Vector4.hpp b/Engine/Source/Runtime/Core/Math/Vector4.hpp
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Vector4.hpp
rename to Engine/Source/Runtime/Core/Math/Vector4.hpp
diff --git a/Engine/Source/Runtime/Core/public/Math/Vector4.inl b/Engine/Source/Runtime/Core/Math/Vector4.inl
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Math/Vector4.inl
rename to Engine/Source/Runtime/Core/Math/Vector4.inl
diff --git a/Engine/Source/Runtime/Core/public/Misc/Boilerplate.h b/Engine/Source/Runtime/Core/Misc/Boilerplate.h
similarity index 100%
rename from Engine/Source/Runtime/Core/public/Misc/Boilerplate.h
rename to Engine/Source/Runtime/Core/Misc/Boilerplate.h
diff --git a/Engine/Source/Runtime/Core/StartingPoint/CMakeLists.txt b/Engine/Source/Runtime/Core/StartingPoint/CMakeLists.txt
new file mode 100644
index 0000000..f07c155
--- /dev/null
+++ b/Engine/Source/Runtime/Core/StartingPoint/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.15...3.30)
+
+project(StartingPoint)
+
+set(StartingPoint
+    StartingPoint/EntryPoint.h
+    StartingPoint/StartingPoint.h
+    StartingPoint/private/StartingPoint.cpp
+)
+
+set(StartingPointPCH
+    StartingPoint/StartingPointPCH.h
+)
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Core/public/StartingPoint/EntryPoint.h b/Engine/Source/Runtime/Core/StartingPoint/EntryPoint.h
similarity index 95%
rename from Engine/Source/Runtime/Core/public/StartingPoint/EntryPoint.h
rename to Engine/Source/Runtime/Core/StartingPoint/EntryPoint.h
index 00cef89..edc7fdd 100644
--- a/Engine/Source/Runtime/Core/public/StartingPoint/EntryPoint.h
+++ b/Engine/Source/Runtime/Core/StartingPoint/EntryPoint.h
@@ -1,7 +1,7 @@
 #pragma once
 // Entry point for Phanes game 
 
-#if defined(P_WIN_BUILD)
+#if defined(P_LINUX_BUILD)
 
 extern Phanes::Core::Application::PhanesProject* Phanes::Core::Application::CreatePhanesGame();
 
diff --git a/Engine/Source/Runtime/Core/public/StartingPoint/StartingPoint.h b/Engine/Source/Runtime/Core/StartingPoint/StartingPoint.h
similarity index 85%
rename from Engine/Source/Runtime/Core/public/StartingPoint/StartingPoint.h
rename to Engine/Source/Runtime/Core/StartingPoint/StartingPoint.h
index e39a29c..9f43f28 100644
--- a/Engine/Source/Runtime/Core/public/StartingPoint/StartingPoint.h
+++ b/Engine/Source/Runtime/Core/StartingPoint/StartingPoint.h
@@ -1,12 +1,13 @@
 #pragma once
 
+#include "StartingPointPCH.h"
 #include "Core/Core.h"
 
 // Entrypoint class for any Phanes game. 
 
 namespace Phanes::Core::Application
 {
-  class PHANES_CORE PhanesProject
+  class PhanesProject
   {
     
   private:
@@ -27,7 +28,7 @@ namespace Phanes::Core::Application
      * Getter for project name;
      */
 
-    FORCEINLINE std::string GetName();
+    std::string GetName();
 
   };
 
diff --git a/Engine/Source/Runtime/Core/StartingPoint/StartingPointPCH.h b/Engine/Source/Runtime/Core/StartingPoint/StartingPointPCH.h
new file mode 100644
index 0000000..8c398e5
--- /dev/null
+++ b/Engine/Source/Runtime/Core/StartingPoint/StartingPointPCH.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#include <string>
+#include <iostream>
+#include <thread>
+#include <chrono>
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Core/private/StartingPoint/StartingPoint.cpp b/Engine/Source/Runtime/Core/StartingPoint/private/StartingPoint.cpp
similarity index 78%
rename from Engine/Source/Runtime/Core/private/StartingPoint/StartingPoint.cpp
rename to Engine/Source/Runtime/Core/StartingPoint/private/StartingPoint.cpp
index d8d5d98..3afd49b 100644
--- a/Engine/Source/Runtime/Core/private/StartingPoint/StartingPoint.cpp
+++ b/Engine/Source/Runtime/Core/StartingPoint/private/StartingPoint.cpp
@@ -1,19 +1,9 @@
-#include "PhanesEnginePCH.h"
-
-#define P_USE_NAMESPACE_ALIAS
-#define P_TEST
-
-#include "Core/public/StartingPoint/StartingPoint.h"
+#include "Core/StartingPoint/StartingPoint.h"
 
 static void IdleMsg()
 {
-    HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
-    SetConsoleTextAttribute(hConsole, 12);
-    
     std::cout << "\n\nWelcome to PhanesEngine!" << std::endl << std::endl;
     
-    SetConsoleTextAttribute(hConsole, 15);
-    
     std::this_thread::sleep_for(std::chrono::seconds(5));
     
     std::cout << "It's silent..." << std::endl << std::endl;
diff --git a/Engine/Source/Runtime/PhanesEnginePCH.h b/Engine/Source/Runtime/PhanesEnginePCH.h
index bfa8020..a4c80e1 100644
--- a/Engine/Source/Runtime/PhanesEnginePCH.h
+++ b/Engine/Source/Runtime/PhanesEnginePCH.h
@@ -23,13 +23,4 @@
 #
 #       include <windows.h>
 #
-#   endif
-#
-#
-#
-#   // spdlog
-#   include <spdlog/sinks/stdout_color_sinks.h>
-#   include <spdlog/spdlog.h>
-#
-#   // Local PCH
-#   include "Core/public/Math/MathPCH.h"
\ No newline at end of file
+#   endif
\ No newline at end of file
diff --git a/MathTestFPU/CMakeLists.txt b/MathTestFPU/CMakeLists.txt
deleted file mode 100644
index 8e006d2..0000000
--- a/MathTestFPU/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-cmake_minimum_required(2.8)
-
-project(MathTestFPU)
-
diff --git a/MathTestFPU/packages.config b/MathTestFPU/packages.config
deleted file mode 100644
index be1fa03..0000000
--- a/MathTestFPU/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" version="1.8.1.7" targetFramework="native" />
-</packages>
\ No newline at end of file