diff --git a/CMakeLists.txt b/CMakeLists.txt
index 466550e..fa0bc61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,29 +24,29 @@ file(GLOB primitive_src "primitive/*.cpp")
 file(GLOB renderer_src "renderer/*.cpp")
 file(GLOB scene_src "scene/*.cpp")
 file(GLOB shader_src "shader/*.cpp")
-file(GLOB effect_src "effect/*.cpp")
 file(GLOB post_processing_src "post_processing/*.cpp")
+file(GLOB homework_src "homeworkMains/*.cpp")
 
 # The tracey library
 add_library(tracey STATIC ${common_src} ${noise_src} ${camera_src} ${light_src}
-        ${primitive_src} ${renderer_src} ${scene_src} ${shader_src} ${effect_src}
-        ${post_processing_src})
+        ${primitive_src} ${renderer_src} ${scene_src} ${shader_src}
+        ${post_processing_src} ${homework_src})
 if(NOT WIN32)
     target_link_libraries(tracey ${CMAKE_THREAD_LIBS_INIT} ${X11_LIBRARIES})
 endif()
 
 # Executables
 
-add_executable(tracey_ex1 ex1.cpp)
+add_executable(tracey_ex1 homeworkMains/ex1.cpp)
 target_link_libraries(tracey_ex1 tracey)
 
-add_executable(tracey_ex2 ex2.cpp)
+add_executable(tracey_ex2 homeworkMains/ex2.cpp)
 target_link_libraries(tracey_ex2 tracey)
 
-add_executable(tracey_ex3_1 ex3.cpp)
+add_executable(tracey_ex3_1 homeworkMains/ex3.cpp)
 target_link_libraries(tracey_ex3_1 tracey)
 target_compile_definitions(tracey_ex3_1 PUBLIC SITUATION=1)
-add_executable(tracey_ex3_2 ex3.cpp)
+add_executable(tracey_ex3_2 homeworkMains/ex3.cpp)
 target_link_libraries(tracey_ex3_2 tracey)
 target_compile_definitions(tracey_ex3_2 PUBLIC SITUATION=2)
 if("${CMAKE_CURRENT_LIST_DIR}/light/ambientlight.cpp" IN_LIST light_src)
@@ -59,14 +59,14 @@ if("${CMAKE_CURRENT_LIST_DIR}/primitive/objmodel.cpp" IN_LIST primitive_src)
     add_definitions(-DOBJMODEL_FOUND)
 endif()
 
-add_executable(tracey_ex4 ex4.cpp)
+add_executable(tracey_ex4 homeworkMains/ex4.cpp)
 target_link_libraries(tracey_ex4 tracey)
 
 
-add_executable(tracey_ex5 ex5.cpp)
+add_executable(tracey_ex5 homeworkMains/ex5.cpp)
 target_link_libraries(tracey_ex5 tracey)
 
-add_executable(tracey_ex6 ex6.cpp)
+add_executable(tracey_ex6 homeworkMains/ex6.cpp)
 target_link_libraries(tracey_ex6 tracey)
 if("${CMAKE_CURRENT_LIST_DIR}/renderer/superrenderer.cpp" IN_LIST renderer_src)
     add_definitions(-DSUPERRENDERER_FOUND)
diff --git a/ex1.cpp b/homeworkMains/ex1.cpp
similarity index 100%
rename from ex1.cpp
rename to homeworkMains/ex1.cpp
diff --git a/ex2.cpp b/homeworkMains/ex2.cpp
similarity index 100%
rename from ex2.cpp
rename to homeworkMains/ex2.cpp
diff --git a/ex3.cpp b/homeworkMains/ex3.cpp
similarity index 100%
rename from ex3.cpp
rename to homeworkMains/ex3.cpp
diff --git a/ex4.cpp b/homeworkMains/ex4.cpp
similarity index 100%
rename from ex4.cpp
rename to homeworkMains/ex4.cpp
diff --git a/ex5.cpp b/homeworkMains/ex5.cpp
similarity index 100%
rename from ex5.cpp
rename to homeworkMains/ex5.cpp
diff --git a/ex6.cpp b/homeworkMains/ex6.cpp
similarity index 100%
rename from ex6.cpp
rename to homeworkMains/ex6.cpp