diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 5e311df1f..ae87e0f63 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -110,8 +110,10 @@ jobs:
       working-directory: ${{github.workspace}}/build
       shell: bash
       run: |
-        cmake -S $GITHUB_WORKSPACE/doc/dox/dev/devsamp/main -B test_install_devsamp -DCMAKE_PREFIX_PATH=${{github.workspace}}/install || (cat test_install_devsamp/CMakeFiles/CMakeOutput.log && cat test_install_devsamp/CMakeFiles/CMakeError.log)
-        cmake --build test_install_devsamp
+        cmake -S $GITHUB_WORKSPACE/doc/dox/dev/devsamp/main -B test_install_devsamp_main -DCMAKE_PREFIX_PATH=${{github.workspace}}/install || (cat test_install_devsamp_main/CMakeFiles/CMakeOutput.log && cat test_install_devsamp_main/CMakeFiles/CMakeError.log)
+        cmake --build test_install_devsamp_main
+        cmake -S $GITHUB_WORKSPACE/doc/dox/dev/devsamp/fibonacci -B test_install_devsamp_fibonacci -DCMAKE_PREFIX_PATH=${{github.workspace}}/install || (cat test_install_devsamp_fibonacci/CMakeFiles/CMakeOutput.log && cat test_install_devsamp_fibonacci/CMakeFiles/CMakeError.log)
+        cmake --build test_install_devsamp_fibonacci
         cmake -E make_directory test_install_userexamples
         cat > test_install_userexamples/CMakeLists.txt <<EOF
         cmake_minimum_required(VERSION 3.14)
diff --git a/doc/dox/dev/devsamp/fibonacci/CMakeLists.txt b/doc/dox/dev/devsamp/fibonacci/CMakeLists.txt
new file mode 100644
index 000000000..e5058cb43
--- /dev/null
+++ b/doc/dox/dev/devsamp/fibonacci/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.14)
+project(ttg-devsample-fibonacci)
+
+find_package(ttg REQUIRED)
+
+add_ttg_executable(fibonacci fibonacci.cc NOT_EXCLUDE_FROM_ALL)
+# Fib device test
+if (TTG_HAVE_CUDA)
+    add_ttg_executable(fibonacci_cuda
+            fibonacci_device.cc
+            fibonacci_cuda_kernel.h
+            fibonacci_cuda_kernel.cu
+            LINK_LIBRARIES std::coroutine RUNTIMES "parsec" NOT_EXCLUDE_FROM_ALL)
+endif()
\ No newline at end of file
diff --git a/doc/dox/dev/devsamp/main/fibonacci/fibonacci.cc b/doc/dox/dev/devsamp/fibonacci/fibonacci.cc
similarity index 100%
rename from doc/dox/dev/devsamp/main/fibonacci/fibonacci.cc
rename to doc/dox/dev/devsamp/fibonacci/fibonacci.cc
diff --git a/doc/dox/dev/devsamp/main/fibonacci/fibonacci_cuda_kernel.cu b/doc/dox/dev/devsamp/fibonacci/fibonacci_cuda_kernel.cu
similarity index 100%
rename from doc/dox/dev/devsamp/main/fibonacci/fibonacci_cuda_kernel.cu
rename to doc/dox/dev/devsamp/fibonacci/fibonacci_cuda_kernel.cu
diff --git a/doc/dox/dev/devsamp/main/fibonacci/fibonacci_cuda_kernel.h b/doc/dox/dev/devsamp/fibonacci/fibonacci_cuda_kernel.h
similarity index 100%
rename from doc/dox/dev/devsamp/main/fibonacci/fibonacci_cuda_kernel.h
rename to doc/dox/dev/devsamp/fibonacci/fibonacci_cuda_kernel.h
diff --git a/doc/dox/dev/devsamp/main/fibonacci/fibonacci_device.cc b/doc/dox/dev/devsamp/fibonacci/fibonacci_device.cc
similarity index 100%
rename from doc/dox/dev/devsamp/main/fibonacci/fibonacci_device.cc
rename to doc/dox/dev/devsamp/fibonacci/fibonacci_device.cc
diff --git a/doc/dox/dev/devsamp/main/CMakeLists.txt b/doc/dox/dev/devsamp/main/CMakeLists.txt
index 6e7777462..5a127cd97 100644
--- a/doc/dox/dev/devsamp/main/CMakeLists.txt
+++ b/doc/dox/dev/devsamp/main/CMakeLists.txt
@@ -1,16 +1,6 @@
 cmake_minimum_required(VERSION 3.14)
-project(test)
+project(ttg-devsample-main)
 
 find_package(ttg REQUIRED)
 
 add_ttg_executable(test test.cpp NOT_EXCLUDE_FROM_ALL)
-
-add_ttg_executable(fibonacci fibonacci/fibonacci.cc NOT_EXCLUDE_FROM_ALL)
-# Fib device test
-if (TTG_HAVE_CUDA)
-    add_ttg_executable(fibonacci/fibonacci_device
-            fibonacci/fibonacci_device.cc
-            fibonacci/fibonacci_cuda_kernel.h
-            fibonacci/fibonacci_cuda_kernel.cu
-            LINK_LIBRARIES std::coroutine RUNTIMES "parsec" NOT_EXCLUDE_FROM_ALL)
-endif()
\ No newline at end of file