diff --git a/.github/workflows/ci_pipeline.yml b/.github/workflows/ci_pipeline.yml
index 64e134d..9efaef8 100644
--- a/.github/workflows/ci_pipeline.yml
+++ b/.github/workflows/ci_pipeline.yml
@@ -60,5 +60,5 @@ jobs:
 
       - name: Test manually
         run: |
-          gcc @configs/options src/evaluate_game.c src/game.c -o src/evaluate_game.e
-          python scripts/tester.py evaluate_game.c 4 manual
+          gcc @configs/options src/lab2/evaluate_game.c src/lab2/game.c -o src/lab2/evaluate_game.e
+          python scripts/tester.py lab2/evaluate_game.c 4 manual
diff --git a/scripts/test_detector.sh b/scripts/test_detector.sh
index 6b6a968..ec6ea57 100644
--- a/scripts/test_detector.sh
+++ b/scripts/test_detector.sh
@@ -5,7 +5,7 @@ test_folder=$1
 declare -A tests_dict
 
 shopt -s globstar
-for file in tests/*/*/$test_folder/*.in; do
+for file in tests/**/$test_folder/*.in; do
     file_path=$(dirname "${file#tests/}")
     src_file_path=$(dirname "$file_path")
     file_name=$(basename "$file")
diff --git a/src/lab1/zad1/divisible_sequence.c b/src/lab1/divisible_sequence.c
similarity index 100%
rename from src/lab1/zad1/divisible_sequence.c
rename to src/lab1/divisible_sequence.c
diff --git a/src/lab1/zad1/divisible_sequence.cpp b/src/lab1/divisible_sequence.cpp
similarity index 100%
rename from src/lab1/zad1/divisible_sequence.cpp
rename to src/lab1/divisible_sequence.cpp
diff --git a/tests/lab1/zad1/c/divisible_sequence0.in b/tests/lab1/c/divisible_sequence0.in
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence0.in
rename to tests/lab1/c/divisible_sequence0.in
diff --git a/tests/lab1/zad1/c/divisible_sequence0.out b/tests/lab1/c/divisible_sequence0.out
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence0.out
rename to tests/lab1/c/divisible_sequence0.out
diff --git a/tests/lab1/zad1/c/divisible_sequence1.in b/tests/lab1/c/divisible_sequence1.in
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence1.in
rename to tests/lab1/c/divisible_sequence1.in
diff --git a/tests/lab1/zad1/c/divisible_sequence1.out b/tests/lab1/c/divisible_sequence1.out
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence1.out
rename to tests/lab1/c/divisible_sequence1.out
diff --git a/tests/lab1/zad1/c/divisible_sequence10.in b/tests/lab1/c/divisible_sequence10.in
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence10.in
rename to tests/lab1/c/divisible_sequence10.in
diff --git a/tests/lab1/zad1/c/divisible_sequence10.out b/tests/lab1/c/divisible_sequence10.out
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence10.out
rename to tests/lab1/c/divisible_sequence10.out
diff --git a/tests/lab1/zad1/c/divisible_sequence11.in b/tests/lab1/c/divisible_sequence11.in
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence11.in
rename to tests/lab1/c/divisible_sequence11.in
diff --git a/tests/lab1/zad1/c/divisible_sequence11.out b/tests/lab1/c/divisible_sequence11.out
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence11.out
rename to tests/lab1/c/divisible_sequence11.out
diff --git a/tests/lab1/zad1/c/divisible_sequence12.in b/tests/lab1/c/divisible_sequence12.in
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence12.in
rename to tests/lab1/c/divisible_sequence12.in
diff --git a/tests/lab1/zad1/c/divisible_sequence12.out b/tests/lab1/c/divisible_sequence12.out
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence12.out
rename to tests/lab1/c/divisible_sequence12.out
diff --git a/tests/lab1/zad1/c/divisible_sequence13.in b/tests/lab1/c/divisible_sequence13.in
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence13.in
rename to tests/lab1/c/divisible_sequence13.in
diff --git a/tests/lab1/zad1/c/divisible_sequence13.out b/tests/lab1/c/divisible_sequence13.out
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence13.out
rename to tests/lab1/c/divisible_sequence13.out
diff --git a/tests/lab1/zad1/c/divisible_sequence14.in b/tests/lab1/c/divisible_sequence14.in
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence14.in
rename to tests/lab1/c/divisible_sequence14.in
diff --git a/tests/lab1/zad1/c/divisible_sequence14.out b/tests/lab1/c/divisible_sequence14.out
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence14.out
rename to tests/lab1/c/divisible_sequence14.out
diff --git a/tests/lab1/zad1/c/divisible_sequence15.in b/tests/lab1/c/divisible_sequence15.in
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence15.in
rename to tests/lab1/c/divisible_sequence15.in
diff --git a/tests/lab1/zad1/c/divisible_sequence15.out b/tests/lab1/c/divisible_sequence15.out
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence15.out
rename to tests/lab1/c/divisible_sequence15.out
diff --git a/tests/lab1/zad1/c/divisible_sequence2.in b/tests/lab1/c/divisible_sequence2.in
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence2.in
rename to tests/lab1/c/divisible_sequence2.in
diff --git a/tests/lab1/zad1/c/divisible_sequence2.out b/tests/lab1/c/divisible_sequence2.out
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence2.out
rename to tests/lab1/c/divisible_sequence2.out
diff --git a/tests/lab1/zad1/c/divisible_sequence3.in b/tests/lab1/c/divisible_sequence3.in
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence3.in
rename to tests/lab1/c/divisible_sequence3.in
diff --git a/tests/lab1/zad1/c/divisible_sequence3.out b/tests/lab1/c/divisible_sequence3.out
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence3.out
rename to tests/lab1/c/divisible_sequence3.out
diff --git a/tests/lab1/zad1/c/divisible_sequence4.in b/tests/lab1/c/divisible_sequence4.in
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence4.in
rename to tests/lab1/c/divisible_sequence4.in
diff --git a/tests/lab1/zad1/c/divisible_sequence4.out b/tests/lab1/c/divisible_sequence4.out
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence4.out
rename to tests/lab1/c/divisible_sequence4.out
diff --git a/tests/lab1/zad1/c/divisible_sequence5.in b/tests/lab1/c/divisible_sequence5.in
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence5.in
rename to tests/lab1/c/divisible_sequence5.in
diff --git a/tests/lab1/zad1/c/divisible_sequence5.out b/tests/lab1/c/divisible_sequence5.out
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence5.out
rename to tests/lab1/c/divisible_sequence5.out
diff --git a/tests/lab1/zad1/c/divisible_sequence6.in b/tests/lab1/c/divisible_sequence6.in
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence6.in
rename to tests/lab1/c/divisible_sequence6.in
diff --git a/tests/lab1/zad1/c/divisible_sequence6.out b/tests/lab1/c/divisible_sequence6.out
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence6.out
rename to tests/lab1/c/divisible_sequence6.out
diff --git a/tests/lab1/zad1/c/divisible_sequence7.in b/tests/lab1/c/divisible_sequence7.in
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence7.in
rename to tests/lab1/c/divisible_sequence7.in
diff --git a/tests/lab1/zad1/c/divisible_sequence7.out b/tests/lab1/c/divisible_sequence7.out
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence7.out
rename to tests/lab1/c/divisible_sequence7.out
diff --git a/tests/lab1/zad1/c/divisible_sequence8.in b/tests/lab1/c/divisible_sequence8.in
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence8.in
rename to tests/lab1/c/divisible_sequence8.in
diff --git a/tests/lab1/zad1/c/divisible_sequence8.out b/tests/lab1/c/divisible_sequence8.out
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence8.out
rename to tests/lab1/c/divisible_sequence8.out
diff --git a/tests/lab1/zad1/c/divisible_sequence9.in b/tests/lab1/c/divisible_sequence9.in
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence9.in
rename to tests/lab1/c/divisible_sequence9.in
diff --git a/tests/lab1/zad1/c/divisible_sequence9.out b/tests/lab1/c/divisible_sequence9.out
similarity index 100%
rename from tests/lab1/zad1/c/divisible_sequence9.out
rename to tests/lab1/c/divisible_sequence9.out
diff --git a/tests/lab1/zad1/cpp/divisible_sequence0.in b/tests/lab1/cpp/divisible_sequence0.in
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence0.in
rename to tests/lab1/cpp/divisible_sequence0.in
diff --git a/tests/lab1/zad1/cpp/divisible_sequence0.out b/tests/lab1/cpp/divisible_sequence0.out
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence0.out
rename to tests/lab1/cpp/divisible_sequence0.out
diff --git a/tests/lab1/zad1/cpp/divisible_sequence1.in b/tests/lab1/cpp/divisible_sequence1.in
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence1.in
rename to tests/lab1/cpp/divisible_sequence1.in
diff --git a/tests/lab1/zad1/cpp/divisible_sequence1.out b/tests/lab1/cpp/divisible_sequence1.out
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence1.out
rename to tests/lab1/cpp/divisible_sequence1.out
diff --git a/tests/lab1/zad1/cpp/divisible_sequence10.in b/tests/lab1/cpp/divisible_sequence10.in
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence10.in
rename to tests/lab1/cpp/divisible_sequence10.in
diff --git a/tests/lab1/zad1/cpp/divisible_sequence10.out b/tests/lab1/cpp/divisible_sequence10.out
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence10.out
rename to tests/lab1/cpp/divisible_sequence10.out
diff --git a/tests/lab1/zad1/cpp/divisible_sequence11.in b/tests/lab1/cpp/divisible_sequence11.in
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence11.in
rename to tests/lab1/cpp/divisible_sequence11.in
diff --git a/tests/lab1/zad1/cpp/divisible_sequence11.out b/tests/lab1/cpp/divisible_sequence11.out
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence11.out
rename to tests/lab1/cpp/divisible_sequence11.out
diff --git a/tests/lab1/zad1/cpp/divisible_sequence12.in b/tests/lab1/cpp/divisible_sequence12.in
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence12.in
rename to tests/lab1/cpp/divisible_sequence12.in
diff --git a/tests/lab1/zad1/cpp/divisible_sequence12.out b/tests/lab1/cpp/divisible_sequence12.out
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence12.out
rename to tests/lab1/cpp/divisible_sequence12.out
diff --git a/tests/lab1/zad1/cpp/divisible_sequence13.in b/tests/lab1/cpp/divisible_sequence13.in
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence13.in
rename to tests/lab1/cpp/divisible_sequence13.in
diff --git a/tests/lab1/zad1/cpp/divisible_sequence13.out b/tests/lab1/cpp/divisible_sequence13.out
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence13.out
rename to tests/lab1/cpp/divisible_sequence13.out
diff --git a/tests/lab1/zad1/cpp/divisible_sequence14.in b/tests/lab1/cpp/divisible_sequence14.in
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence14.in
rename to tests/lab1/cpp/divisible_sequence14.in
diff --git a/tests/lab1/zad1/cpp/divisible_sequence14.out b/tests/lab1/cpp/divisible_sequence14.out
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence14.out
rename to tests/lab1/cpp/divisible_sequence14.out
diff --git a/tests/lab1/zad1/cpp/divisible_sequence15.in b/tests/lab1/cpp/divisible_sequence15.in
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence15.in
rename to tests/lab1/cpp/divisible_sequence15.in
diff --git a/tests/lab1/zad1/cpp/divisible_sequence15.out b/tests/lab1/cpp/divisible_sequence15.out
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence15.out
rename to tests/lab1/cpp/divisible_sequence15.out
diff --git a/tests/lab1/zad1/cpp/divisible_sequence2.in b/tests/lab1/cpp/divisible_sequence2.in
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence2.in
rename to tests/lab1/cpp/divisible_sequence2.in
diff --git a/tests/lab1/zad1/cpp/divisible_sequence2.out b/tests/lab1/cpp/divisible_sequence2.out
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence2.out
rename to tests/lab1/cpp/divisible_sequence2.out
diff --git a/tests/lab1/zad1/cpp/divisible_sequence3.in b/tests/lab1/cpp/divisible_sequence3.in
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence3.in
rename to tests/lab1/cpp/divisible_sequence3.in
diff --git a/tests/lab1/zad1/cpp/divisible_sequence3.out b/tests/lab1/cpp/divisible_sequence3.out
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence3.out
rename to tests/lab1/cpp/divisible_sequence3.out
diff --git a/tests/lab1/zad1/cpp/divisible_sequence4.in b/tests/lab1/cpp/divisible_sequence4.in
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence4.in
rename to tests/lab1/cpp/divisible_sequence4.in
diff --git a/tests/lab1/zad1/cpp/divisible_sequence4.out b/tests/lab1/cpp/divisible_sequence4.out
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence4.out
rename to tests/lab1/cpp/divisible_sequence4.out
diff --git a/tests/lab1/zad1/cpp/divisible_sequence5.in b/tests/lab1/cpp/divisible_sequence5.in
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence5.in
rename to tests/lab1/cpp/divisible_sequence5.in
diff --git a/tests/lab1/zad1/cpp/divisible_sequence5.out b/tests/lab1/cpp/divisible_sequence5.out
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence5.out
rename to tests/lab1/cpp/divisible_sequence5.out
diff --git a/tests/lab1/zad1/cpp/divisible_sequence6.in b/tests/lab1/cpp/divisible_sequence6.in
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence6.in
rename to tests/lab1/cpp/divisible_sequence6.in
diff --git a/tests/lab1/zad1/cpp/divisible_sequence6.out b/tests/lab1/cpp/divisible_sequence6.out
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence6.out
rename to tests/lab1/cpp/divisible_sequence6.out
diff --git a/tests/lab1/zad1/cpp/divisible_sequence7.in b/tests/lab1/cpp/divisible_sequence7.in
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence7.in
rename to tests/lab1/cpp/divisible_sequence7.in
diff --git a/tests/lab1/zad1/cpp/divisible_sequence7.out b/tests/lab1/cpp/divisible_sequence7.out
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence7.out
rename to tests/lab1/cpp/divisible_sequence7.out
diff --git a/tests/lab1/zad1/cpp/divisible_sequence8.in b/tests/lab1/cpp/divisible_sequence8.in
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence8.in
rename to tests/lab1/cpp/divisible_sequence8.in
diff --git a/tests/lab1/zad1/cpp/divisible_sequence8.out b/tests/lab1/cpp/divisible_sequence8.out
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence8.out
rename to tests/lab1/cpp/divisible_sequence8.out
diff --git a/tests/lab1/zad1/cpp/divisible_sequence9.in b/tests/lab1/cpp/divisible_sequence9.in
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence9.in
rename to tests/lab1/cpp/divisible_sequence9.in
diff --git a/tests/lab1/zad1/cpp/divisible_sequence9.out b/tests/lab1/cpp/divisible_sequence9.out
similarity index 100%
rename from tests/lab1/zad1/cpp/divisible_sequence9.out
rename to tests/lab1/cpp/divisible_sequence9.out