diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ed7a4a..4622694 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,10 @@
 cmake_minimum_required (VERSION 2.6)
 project (maatframe)
+set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -Wall)
+include_directories(${PROJECT_SOURCE_DIR}/inc/)
+include_directories(/opt/MESA/include/MESA/)
+
 add_subdirectory (src) 
 add_subdirectory (test)
 add_subdirectory (tools)
+
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 53a95f3..0000000
--- a/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#opt: OPTFLAGS = -O2
-#export OPTFLAGS
-
-.PHONY: all clean opt
-
-all:
-	cd src/entry/ && $(MAKE)
-	cd test && $(MAKE)
-	cd tools && $(MAKE)
-clean:
-	cd src/entry/ && $(MAKE) clean
-	cd test && $(MAKE) clean
-	cd tools && $(MAKE) clean
-			 
-opt:
-	$(MAKE) all
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 26f9717..007f7e3 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,12 +1,6 @@
-set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -Wall)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../inc/)
-include_directories(/opt/MESA/include/MESA/)
-
 add_executable(maat_test maat_test.cpp)
 target_link_libraries(maat_test maat_frame_shared)
 
-#configure_file(${CMAKE_CURRENT_SOURCE_DIR}/maat_json.json ${CMAKE_CURRENT_SOURCE_DIR}/maat_json.json COPYONLY)
 configure_file(table_info.conf table_info.conf COPYONLY)
 configure_file(maat_json.json maat_json.json COPYONLY)
 configure_file(reset_redis4maat.sh reset_redis4maat.sh COPYONLY)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 381a97e..5cb7cc2 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -Wall)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../inc/)
-include_directories(/opt/MESA/include/MESA/)
-
 add_executable(digest_gen digest_gen.c)
 add_dependencies(digest_gen maat_frame_shared)
 target_link_libraries(digest_gen maat_frame_shared)
@@ -10,7 +5,7 @@ target_link_libraries(digest_gen maat_frame_shared)
 add_executable(maat_redis_tool maat_redis_tool.cpp)
 add_dependencies(maat_redis_tool maat_frame_shared)
 target_link_libraries(maat_redis_tool maat_frame_shared)
-target_include_directories(maat_redis_tool PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../src/inc_internal/)
-target_include_directories(maat_redis_tool PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../src/inc_internal/hiredis)
+target_include_directories(maat_redis_tool PRIVATE ${PROJECT_SOURCE_DIR}/src/inc_internal/)
+target_include_directories(maat_redis_tool PRIVATE ${PROJECT_SOURCE_DIR}/src/inc_internal/hiredis)