diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
index b2ae331..35ddeaf 100644
--- a/engine/CMakeLists.txt
+++ b/engine/CMakeLists.txt
@@ -6,44 +6,51 @@ set(CMAKE_C_STANDARD 11)
 set(BUILD_EXAMPLES false)
 add_subdirectory(libs/raylib-4.5.0)
 
-set(
-        lib_sources
-        libs/cute_tiled.c
-        libs/flecs/flecs.c
+set(librarySources
+    libs/cute_tiled.c
+    libs/flecs/flecs.c
 )
 
-set(
-        lib_dirs
-        libs/cute_tiled
-        libs/flecs
+set(libraryDirs
+    libs/cute_tiled
+    libs/flecs
 )
 
 
-add_library(Breeze STATIC
+set(BreezeSources
         breeze/core/logger.c
-        breeze/core/logger.h
-        breeze/core/logger_module.h
         breeze/core/module_system.c
-        breeze/core/module_system.h
+
+        breeze/utils/tokenizer.c
+    )
+
+set(BreezeHeaders
+        breeze/core/logger.h
 
         breeze/math/vec2i.h
 
-        breeze/utils/tokenizer.c
         breeze/utils/tokenizer.h
 
         breeze/defines.h
         breeze/game.h
 
         breeze.h
+    )
 
-        ${lib_sources}
+set(BreezeInternalHeaders
+        breeze/core/logger_module.h
+        breeze/core/module_system.h
 )
 
-set(BreezePublicHeaders
-    breeze.h)
+add_library(Breeze STATIC
+        ${BreezeSources}
+        ${BreezeInternalHeaders}
+        ${BreezeHeaders}
+        ${librarySources}
+)
 
 set_target_properties(Breeze PROPERTIES
-                      PUBLIC_HEADER ${BreezePublicHeaders})
+                      PUBLIC_HEADER "${BreezeHeaders}")
 
 target_link_libraries(Breeze raylib)
 
@@ -52,9 +59,9 @@ target_include_directories(Breeze
         PUBLIC
         $<INSTALL_INTERFACE:include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-        ${lib_dirs})
+        ${libraryDirs})
 
-file(COPY ${BreezePublicHeader} DESTINATION "include")
+file(COPY ${BreezeHeaders} DESTINATION "include")
 
 if (${BUILD_BREEZE_TESTS})
     MESSAGE(STATUS "Building breeze tests is enabled")
diff --git a/engine/breeze/game.h b/engine/breeze/game.h
index 9f50b12..2ceb06b 100644
--- a/engine/breeze/game.h
+++ b/engine/breeze/game.h
@@ -12,6 +12,7 @@ typedef struct BzAppDesc {
     int32_t    width;
     int32_t    height;
     const char *title;
+    int32_t fps;
 
     BzAppInitFunc   init;
     BzAppUpdateFunc update;
@@ -24,8 +25,6 @@ typedef struct BzAppDesc {
 extern bool bzMain(BzAppDesc *appDesc, int argc, const char **argv);
 
 #ifdef BZ_GAME_ENTRYPOINT
-
-
 #include <raylib.h>
 
 
@@ -38,7 +37,8 @@ int main(int argc, const char **argv) {
     BzAppDesc appDesc = {
             1280,
             720,
-            "Breeze Engine"
+            "Breeze Engine",
+            60
     };
 
     bool successful = bzMain(&appDesc, argc, argv);
@@ -51,6 +51,8 @@ int main(int argc, const char **argv) {
     }
     bzLogInfo("[Breeze] User initialization (bzMain) successful.");
 
+    InitWindow(appDesc.width, appDesc.height, appDesc.title);
+    SetTargetFPS(appDesc.fps);
     // Initialize modules
 
     // User initialize
diff --git a/engine/tests/window_test.c b/engine/tests/window_test.c
index a2d4be6..4b9571a 100644
--- a/engine/tests/window_test.c
+++ b/engine/tests/window_test.c
@@ -1,3 +1,4 @@
+#define BZ_GAME_ENTRYPOINT
 #include <breeze.h>
 
 #include <raylib.h>