diff --git a/.gitignore b/.gitignore
index 2e52e28f73077f0ea9ddeaf996aae920822411d5..8c8e1c4cc8418f2fb81bab23bed485839950c628 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,4 +78,6 @@ dkms.conf
 # End of https://www.toptal.com/developers/gitignore/api/c,visualstudiocode
 
 # Custom gitignore for project
-puissance
\ No newline at end of file
+puissance
+cmake-build-debug
+.idea
\ No newline at end of file
diff --git a/makefile b/makefile
index 86ccf0e709171408d7bd94df087555e53e3db3da..adfc54e386d25486ac89d359b2c41738f51e2546 100644
--- a/makefile
+++ b/makefile
@@ -8,5 +8,8 @@ puissance.o: puissance.c puissance.h
 	$(CC) -c $< $(LIB)
 main.o: main.c
 	$(CC) -c $< $(LIB)
+tests: puissance
+	$(MAKE) -C testbed
 clean:
-	rm -f *.o puissance test
\ No newline at end of file
+	rm -f *.o puissance test
+	$(MAKE) -C testbed clean
\ No newline at end of file
diff --git a/skeleton_for_students/Makefile b/skeleton_for_students/Makefile
deleted file mode 100644
index 57c7cd62f3d1b3b3db4cf8b9d50106740c620218..0000000000000000000000000000000000000000
--- a/skeleton_for_students/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-puissance4: 
-	@echo "first rule which must create the puissance4 executable"
-
-clean:
-	@echo "this rule must clean everything up (including candidate files in testbed)"
-	$(MAKE) -C testbed clean
-
-tests: puissance4
-	$(MAKE) -C testbed
\ No newline at end of file
diff --git a/skeleton_for_students/puissance4 b/skeleton_for_students/puissance4
deleted file mode 100755
index c73ed624297549082e6abff83ff60652fc3c34c8..0000000000000000000000000000000000000000
Binary files a/skeleton_for_students/puissance4 and /dev/null differ
diff --git a/skeleton_for_students/testbed/2players/Makefile b/testbed/2players/Makefile
similarity index 100%
rename from skeleton_for_students/testbed/2players/Makefile
rename to testbed/2players/Makefile
diff --git a/skeleton_for_students/testbed/2players/test1.in b/testbed/2players/test1.in
similarity index 100%
rename from skeleton_for_students/testbed/2players/test1.in
rename to testbed/2players/test1.in
diff --git a/skeleton_for_students/testbed/2players/test1.ref b/testbed/2players/test1.ref
similarity index 100%
rename from skeleton_for_students/testbed/2players/test1.ref
rename to testbed/2players/test1.ref
diff --git a/skeleton_for_students/testbed/2players/test2.in b/testbed/2players/test2.in
similarity index 100%
rename from skeleton_for_students/testbed/2players/test2.in
rename to testbed/2players/test2.in
diff --git a/skeleton_for_students/testbed/2players/test2.ref b/testbed/2players/test2.ref
similarity index 100%
rename from skeleton_for_students/testbed/2players/test2.ref
rename to testbed/2players/test2.ref
diff --git a/skeleton_for_students/testbed/2players/test3.in b/testbed/2players/test3.in
similarity index 100%
rename from skeleton_for_students/testbed/2players/test3.in
rename to testbed/2players/test3.in
diff --git a/skeleton_for_students/testbed/2players/test3.ref b/testbed/2players/test3.ref
similarity index 100%
rename from skeleton_for_students/testbed/2players/test3.ref
rename to testbed/2players/test3.ref
diff --git a/skeleton_for_students/testbed/2players/test4.in b/testbed/2players/test4.in
similarity index 100%
rename from skeleton_for_students/testbed/2players/test4.in
rename to testbed/2players/test4.in
diff --git a/skeleton_for_students/testbed/2players/test4.ref b/testbed/2players/test4.ref
similarity index 100%
rename from skeleton_for_students/testbed/2players/test4.ref
rename to testbed/2players/test4.ref
diff --git a/skeleton_for_students/testbed/2players/test5.in b/testbed/2players/test5.in
similarity index 100%
rename from skeleton_for_students/testbed/2players/test5.in
rename to testbed/2players/test5.in
diff --git a/skeleton_for_students/testbed/2players/test5.ref b/testbed/2players/test5.ref
similarity index 100%
rename from skeleton_for_students/testbed/2players/test5.ref
rename to testbed/2players/test5.ref
diff --git a/skeleton_for_students/testbed/Makefile b/testbed/Makefile
similarity index 100%
rename from skeleton_for_students/testbed/Makefile
rename to testbed/Makefile
diff --git a/skeleton_for_students/testbed/common.mk b/testbed/common.mk
similarity index 100%
rename from skeleton_for_students/testbed/common.mk
rename to testbed/common.mk
diff --git a/skeleton_for_students/testbed/rand_ai/Makefile b/testbed/rand_ai/Makefile
similarity index 100%
rename from skeleton_for_students/testbed/rand_ai/Makefile
rename to testbed/rand_ai/Makefile
diff --git a/skeleton_for_students/testbed/rand_ai/test1.in b/testbed/rand_ai/test1.in
similarity index 100%
rename from skeleton_for_students/testbed/rand_ai/test1.in
rename to testbed/rand_ai/test1.in
diff --git a/skeleton_for_students/testbed/rand_ai/test1.ref b/testbed/rand_ai/test1.ref
similarity index 100%
rename from skeleton_for_students/testbed/rand_ai/test1.ref
rename to testbed/rand_ai/test1.ref
diff --git a/skeleton_for_students/testbed/rand_ai/test2.in b/testbed/rand_ai/test2.in
similarity index 100%
rename from skeleton_for_students/testbed/rand_ai/test2.in
rename to testbed/rand_ai/test2.in
diff --git a/skeleton_for_students/testbed/rand_ai/test2.ref b/testbed/rand_ai/test2.ref
similarity index 100%
rename from skeleton_for_students/testbed/rand_ai/test2.ref
rename to testbed/rand_ai/test2.ref
diff --git a/skeleton_for_students/testbed/rand_ai/test3.in b/testbed/rand_ai/test3.in
similarity index 100%
rename from skeleton_for_students/testbed/rand_ai/test3.in
rename to testbed/rand_ai/test3.in
diff --git a/skeleton_for_students/testbed/rand_ai/test3.ref b/testbed/rand_ai/test3.ref
similarity index 100%
rename from skeleton_for_students/testbed/rand_ai/test3.ref
rename to testbed/rand_ai/test3.ref
diff --git a/skeleton_for_students/testbed/rand_ai/test4.in b/testbed/rand_ai/test4.in
similarity index 100%
rename from skeleton_for_students/testbed/rand_ai/test4.in
rename to testbed/rand_ai/test4.in
diff --git a/skeleton_for_students/testbed/rand_ai/test4.ref b/testbed/rand_ai/test4.ref
similarity index 100%
rename from skeleton_for_students/testbed/rand_ai/test4.ref
rename to testbed/rand_ai/test4.ref
diff --git a/skeleton_for_students/testbed/smart_ai/Makefile b/testbed/smart_ai/Makefile
similarity index 100%
rename from skeleton_for_students/testbed/smart_ai/Makefile
rename to testbed/smart_ai/Makefile
diff --git a/skeleton_for_students/testbed/smart_ai/test1.in b/testbed/smart_ai/test1.in
similarity index 100%
rename from skeleton_for_students/testbed/smart_ai/test1.in
rename to testbed/smart_ai/test1.in
diff --git a/skeleton_for_students/testbed/smart_ai/test1.ref b/testbed/smart_ai/test1.ref
similarity index 100%
rename from skeleton_for_students/testbed/smart_ai/test1.ref
rename to testbed/smart_ai/test1.ref
diff --git a/skeleton_for_students/testbed/smart_ai/test2.in b/testbed/smart_ai/test2.in
similarity index 100%
rename from skeleton_for_students/testbed/smart_ai/test2.in
rename to testbed/smart_ai/test2.in
diff --git a/skeleton_for_students/testbed/smart_ai/test2.ref b/testbed/smart_ai/test2.ref
similarity index 100%
rename from skeleton_for_students/testbed/smart_ai/test2.ref
rename to testbed/smart_ai/test2.ref
diff --git a/skeleton_for_students/testbed/smart_ai/test3.in b/testbed/smart_ai/test3.in
similarity index 100%
rename from skeleton_for_students/testbed/smart_ai/test3.in
rename to testbed/smart_ai/test3.in
diff --git a/skeleton_for_students/testbed/smart_ai/test3.ref b/testbed/smart_ai/test3.ref
similarity index 100%
rename from skeleton_for_students/testbed/smart_ai/test3.ref
rename to testbed/smart_ai/test3.ref
diff --git a/skeleton_for_students/testbed/smart_ai/test4.in b/testbed/smart_ai/test4.in
similarity index 100%
rename from skeleton_for_students/testbed/smart_ai/test4.in
rename to testbed/smart_ai/test4.in
diff --git a/skeleton_for_students/testbed/smart_ai/test4.ref b/testbed/smart_ai/test4.ref
similarity index 100%
rename from skeleton_for_students/testbed/smart_ai/test4.ref
rename to testbed/smart_ai/test4.ref
diff --git a/skeleton_for_students/testbed/smart_ai/test5.in b/testbed/smart_ai/test5.in
similarity index 100%
rename from skeleton_for_students/testbed/smart_ai/test5.in
rename to testbed/smart_ai/test5.in
diff --git a/skeleton_for_students/testbed/smart_ai/test5.ref b/testbed/smart_ai/test5.ref
similarity index 100%
rename from skeleton_for_students/testbed/smart_ai/test5.ref
rename to testbed/smart_ai/test5.ref