diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c06e7fa..6ce3bcd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,8 +13,9 @@ build:
     stage: build
     artifacts:
         paths:
-            - build/src/1D
-            - build/src/2D
+            - build/app/1D
+            - build/app/2D
+            - build/app/Comp2D
         expire_in: 100s
     script:
         - mkdir build && cd build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a18d9cc..068023f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,4 +7,5 @@ set(CMAKE_CXX_STANDARD 14)
 
 find_package(Eigen3 REQUIRED NO_MODULE)
 
+add_subdirectory(app)
 add_subdirectory(src)
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
new file mode 100644
index 0000000..c92d35b
--- /dev/null
+++ b/app/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_executable(1D main_1D.cpp)
+target_link_libraries(1D PUBLIC diffusion)
+
+add_executable(2D main_2D.cpp)
+target_link_libraries(2D PUBLIC diffusion)
+
+add_executable(Comp2D main_2D_mdl.cpp)
+target_link_libraries(Comp2D PUBLIC diffusion)
diff --git a/src/main_1D.cpp b/app/main_1D.cpp
similarity index 100%
rename from src/main_1D.cpp
rename to app/main_1D.cpp
diff --git a/src/main_2D.cpp b/app/main_2D.cpp
similarity index 100%
rename from src/main_2D.cpp
rename to app/main_2D.cpp
diff --git a/src/main_2D_mdl.cpp b/app/main_2D_mdl.cpp
similarity index 100%
rename from src/main_2D_mdl.cpp
rename to app/main_2D_mdl.cpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0f82139..ffc3958 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,11 +1,3 @@
 add_library(diffusion OBJECT BTCSDiffusion.cpp BTCSDiffusion.hpp)
 target_link_libraries(diffusion Eigen3::Eigen)
-
-add_executable(1D main_1D.cpp)
-target_link_libraries(1D PUBLIC diffusion)
-
-add_executable(2D main_2D.cpp)
-target_link_libraries(2D PUBLIC diffusion)
-
-add_executable(Comp2D main_2D_mdl.cpp)
-target_link_libraries(Comp2D PUBLIC diffusion)
+target_include_directories(diffusion PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})