diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2a23030..21fdc195 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,6 @@ set( CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/bin )
 
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin )
 set( LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin )
-set( EXECUTABLE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin )
 
 set( CMAKE_MODULE_PATH
        ${CMAKE_MODULE_PATH}
@@ -29,23 +28,32 @@ configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/src/common/Version.cpp.in"
                 "${CMAKE_CURRENT_SOURCE_DIR}/src/common/Version.cpp" @ONLY )
 
 ##############################
-#             Mysql          #
+#           Mysql            #
 ##############################
 find_package( MySQL )
 
-##########################################################################
+##############################
+#        Dependencies        #
+##############################
 add_subdirectory( "deps/zlib" )
 add_subdirectory( "deps/MySQL" )
 add_subdirectory( "deps/datReader" )
 add_subdirectory( "deps/mysqlConnector" )
 add_subdirectory( "src/common" )
 
+
+##############################
+#  Main Sapphire Components  #
+##############################
 add_subdirectory( "src/api" )
 add_subdirectory( "src/lobby" )
 add_subdirectory( "src/world" )
 add_subdirectory( "src/dbm" )
 add_subdirectory( "src/scripts" )
 
+##############################
+#           Tools            #
+##############################
 add_subdirectory( "src/tools/exd_common_gen" )
 add_subdirectory( "src/tools/exd_struct_gen" )
 add_subdirectory( "src/tools/exd_struct_test" )
@@ -53,4 +61,4 @@ add_subdirectory( "src/tools/quest_parser" )
 add_subdirectory( "src/tools/discovery_parser" )
 add_subdirectory( "src/tools/mob_parse" )
 add_subdirectory( "src/tools/pcb_reader" )
-add_subdirectory( "src/tools/event_object_parser" )
\ No newline at end of file
+add_subdirectory( "src/tools/event_object_parser" )
diff --git a/src/scripts/CMakeLists.txt b/src/scripts/CMakeLists.txt
index 710f957d..a6949a5c 100644
--- a/src/scripts/CMakeLists.txt
+++ b/src/scripts/CMakeLists.txt
@@ -3,9 +3,9 @@ project(Script)
 
 file(GLOB SCRIPT_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
 
-message("exec: ${EXECUTABLE_OUTPUT_DIRECTORY}")
+message("exec: ${EXECUTABLE_OUTPUT_PATH}")
 
-set(SCRIPT_LIB_DIR "${EXECUTABLE_OUTPUT_DIRECTORY}/compiledscripts/" )
+set(SCRIPT_LIB_DIR "${EXECUTABLE_OUTPUT_PATH}/compiledscripts/" )
 set(EXECUTABLE_OUTPUT_PATH "${SCRIPT_LIB_DIR}")
 set(LIBRARY_OUTPUT_PATH "${SCRIPT_LIB_DIR}")
 set(RUNTIME_OUTPUT_DIRECTORY "${SCRIPT_LIB_DIR}")