diff --git a/Makefile b/Makefile
index 514a2ac..e2a2853 100644
--- a/Makefile
+++ b/Makefile
@@ -12,8 +12,8 @@ SRC_DIR			= src
 BUILD_DIR		= build
 INC_DIR			= include
 LIBFT_DIR		= libft
-TEST_DIR		= test
-GTEST_DIR		= test/gtest
+TEST_DIR		= test/unit
+GTEST_DIR		= test/unit/gtest
 TEST_BUILD_DIR	= test/build
 
 SRC				= $(SRC_DIR)/main.c \
diff --git a/test/test_check_args.cpp b/test/unit/test_check_args.cpp
similarity index 100%
rename from test/test_check_args.cpp
rename to test/unit/test_check_args.cpp
diff --git a/test/test_greedy_operation.cpp b/test/unit/test_greedy_operation.cpp
similarity index 100%
rename from test/test_greedy_operation.cpp
rename to test/unit/test_greedy_operation.cpp
diff --git a/test/test_is_sorted_stack.cpp b/test/unit/test_is_sorted_stack.cpp
similarity index 100%
rename from test/test_is_sorted_stack.cpp
rename to test/unit/test_is_sorted_stack.cpp
diff --git a/test/test_push_b_segmented.cpp b/test/unit/test_push_b_segmented.cpp
similarity index 100%
rename from test/test_push_b_segmented.cpp
rename to test/unit/test_push_b_segmented.cpp
diff --git a/test/test_push_stack.cpp b/test/unit/test_push_stack.cpp
similarity index 100%
rename from test/test_push_stack.cpp
rename to test/unit/test_push_stack.cpp
diff --git a/test/test_reverse_rotate_stack.cpp b/test/unit/test_reverse_rotate_stack.cpp
similarity index 100%
rename from test/test_reverse_rotate_stack.cpp
rename to test/unit/test_reverse_rotate_stack.cpp
diff --git a/test/test_rotate_stack.cpp b/test/unit/test_rotate_stack.cpp
similarity index 100%
rename from test/test_rotate_stack.cpp
rename to test/unit/test_rotate_stack.cpp
diff --git a/test/test_set_cost.cpp b/test/unit/test_set_cost.cpp
similarity index 100%
rename from test/test_set_cost.cpp
rename to test/unit/test_set_cost.cpp
diff --git a/test/test_set_is_target.cpp b/test/unit/test_set_is_target.cpp
similarity index 100%
rename from test/test_set_is_target.cpp
rename to test/unit/test_set_is_target.cpp
diff --git a/test/test_set_min_cost_opt_method.cpp b/test/unit/test_set_min_cost_opt_method.cpp
similarity index 100%
rename from test/test_set_min_cost_opt_method.cpp
rename to test/unit/test_set_min_cost_opt_method.cpp
diff --git a/test/test_sort.cpp b/test/unit/test_sort.cpp
similarity index 100%
rename from test/test_sort.cpp
rename to test/unit/test_sort.cpp
diff --git a/test/test_swap_stack.cpp b/test/unit/test_swap_stack.cpp
similarity index 100%
rename from test/test_swap_stack.cpp
rename to test/unit/test_swap_stack.cpp