diff --git a/.gitignore b/.gitignore
index ade92a0..2f1faa4 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 **.swp
 log*
 **.o
+*.o
+*/**.o
+*/**/**.o
 launch_*
 
diff --git a/Makefile b/Makefile
index 19efeb7..a9bb36d 100644
--- a/Makefile
+++ b/Makefile
@@ -9,9 +9,9 @@ SRC_DIR=$(ROOT_DIR)/src
 SRC=$(wildcard */*/*.c) 
 OBJ=$(SRC:.c=.o)
 #HEADS=$(OBJS:.o=.h)
-TEST_DIR=$(ROOT_DIR)
+TEST_DIR=$(ROOT_DIR)/test
 EXECSRC=$(TEST_DIR)/$(NAME_TEST).c
-EXEC=$(ROOT_DIR)/launch_$(NAME_TEST)
+EXEC=$(ROOT_DIR)/launch_$(NAME_TEST)_m
 PERMSRC=$(wildcard */**perm*.c)
 PERMSRC_O=$(PERMSRC:.c=.o)
 SETTSRC=$(wildcard */**set*.c)
diff --git a/compile.sh b/compile.sh
old mode 100644
new mode 100755
index 38e7ed8..bd869d8
--- a/compile.sh
+++ b/compile.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
-gcc is_good.c src/test_t/test_t.c src/tools_t/tools_t.c \
+gcc test/is_good.c src/ftest/ftest.c src/tools_t/tools_t.c \
   src/permutation_t/permutation_t.c src/set_theoric_t/set_theoric_t.c \
-  -I./src -o lunch_is_good_c && ./lunch_is_good_c -h -p
+  -I./src -o launch_is_good_c && ./launch_is_good_c -h -p
diff --git a/isgood b/isgood
deleted file mode 100644
index d680ace..0000000
Binary files a/isgood and /dev/null differ
diff --git a/launch_is_good b/launch_is_good
deleted file mode 100755
index 7b7a227..0000000
Binary files a/launch_is_good and /dev/null differ
diff --git a/src/Makefile b/src/Makefile
index abedddd..640288a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -18,7 +18,7 @@ SETTSRC=$(wildcard set*/set*.c)
 SETTSRC_O=$(SETTSRC:.c=.o)
 TOOLSRC=$(wildcard too*/tool*.c)
 TOOLSRC_O=$(TOOLSRC:.c=.o)
-TESTSRC=$(wildcard test*/test*.c)
+TESTSRC=$(wildcard *test*/*test*.c)
 TESTSRC_O=$(TESTSRC:.c=.o)
 
 
diff --git a/src/test_t/test_t.c b/src/ftest/ftest.c
similarity index 99%
rename from src/test_t/test_t.c
rename to src/ftest/ftest.c
index 199ca77..48cc487 100644
--- a/src/test_t/test_t.c
+++ b/src/ftest/ftest.c
@@ -1,4 +1,4 @@
-#include "test_t/test_t.h"
+#include "ftest/ftest.h"
 
 /*
 #define DEFAULT_K "\033[0m" //Resets the text to default color
diff --git a/src/test_t/test_t.h b/src/ftest/ftest.h
similarity index 100%
rename from src/test_t/test_t.h
rename to src/ftest/ftest.h
diff --git a/src/is_good.c b/src/is_good.c
index 883ef75..b62472c 100644
--- a/src/is_good.c
+++ b/src/is_good.c
@@ -9,7 +9,7 @@
   #include <windows.h>
 #endif
 
-#include "test_t/test_t.h"
+#include "ftest/ftest.h"
 
 #include "permutation_t/permutation_t.h"
 
diff --git a/src/launch_is_good b/src/launch_is_good
old mode 100644
new mode 100755
index b35e1d9..4255fe2
Binary files a/src/launch_is_good and b/src/launch_is_good differ
diff --git a/src/test_t/test_t.o b/src/test_t/test_t.o
deleted file mode 100644
index a681ff2..0000000
Binary files a/src/test_t/test_t.o and /dev/null differ
diff --git a/src/tools_t/tools_t.o b/src/tools_t/tools_t.o
deleted file mode 100644
index 868d52c..0000000
Binary files a/src/tools_t/tools_t.o and /dev/null differ
diff --git a/is_good.c b/test/is_good.c
similarity index 99%
rename from is_good.c
rename to test/is_good.c
index 883ef75..b62472c 100644
--- a/is_good.c
+++ b/test/is_good.c
@@ -9,7 +9,7 @@
   #include <windows.h>
 #endif
 
-#include "test_t/test_t.h"
+#include "ftest/ftest.h"
 
 #include "permutation_t/permutation_t.h"