diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c75d4b..7de3846 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,50 +1,41 @@
-# Cmake OwO
-
 cmake_minimum_required(VERSION 3.7)
 project(AEON)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} CMakeModules/)
 cmake_policy(SET CMP0037 OLD) # alow for spaces in file names
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_BUILD_TYPE debug)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20")
 
-set(CMAKE_BUILD_TYPE Debug)
+# set(CMAKE_BUILD_TYPE Debug)
 # set(CMAKE_CXX_FLAGS "-Ofast")
 
-set(exe output)
-set(src ./src)
-set(include ./include)
-
 # Adds RESOURCES constant in C++
 add_definitions(-DRESOURCES="${CMAKE_SOURCE_DIR}/resources/")
 message(${CMAKE_SOURCE_DIR}/resources)
 
-file(GLOB src 
-	${src}/*
+set(exe out)
+
+file(GLOB EngineSource
+	Aeon/*
+	Aeon/ThirdParty/*
+	Aeon/Maths/*
 )
 
+
 set(THREADS_PREFER_PTHREAD_FLAD ON)
 find_package(Threads REQUIRED)
 
 # Find GL and GLX package
 find_package(OpenGL REQUIRED)
 
-include_directories(${include})
+include_directories(Aeon)
+include_directories(${WinSDK})
 
-
-if (UNIX)
-    find_package(X11 REQUIRED)
-    find_package(PNG REQUIRED)
-    include_directories(${PNG_INCLUDE_DIR})
-endif (UNIX)
-
-if (WIN32)
-    include_directories(${WinSDK})
-endif (WIN32)
-
-add_executable(${exe} 
-    ${src}
+add_executable(${out} 
+    ${EngineSource}
 )
 
 link_libraries(${exe}
@@ -52,17 +43,5 @@ link_libraries(${exe}
     OpenGL::OpenGL
     OpenGL::GL
     OpenGL::GLX
+    ${WinSDK}
 )
-
-if (UNIX) 
-    link_libraries(${exe} 
-        ${X11_LIBRARIES}
-        PNG::PNG
-    )
-endif (UNIX)
-
-if (WIN32)
-    link_libraries(${exe} 
-        ${WinSDK}
-    )
-endif (WIN32)
diff --git a/Game/ExampleGame.cpp b/Game/ExampleGame.cpp
index d04a801..985b7f0 100644
--- a/Game/ExampleGame.cpp
+++ b/Game/ExampleGame.cpp
@@ -1,5 +1,5 @@
-
-int main()
-{
-
-}
+
+int main()
+{
+
+}