diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdafd10..8c3ec34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
-project(klotski)
-
 set(CMAKE_CXX_STANDARD 14)
+project(klotski)
 
-add_executable(klotski main.cc case.cc common.cc klotski.cc)
+add_subdirectory(src)
diff --git a/case.h b/include/case.h
similarity index 100%
rename from case.h
rename to include/case.h
diff --git a/common.h b/include/common.h
similarity index 100%
rename from common.h
rename to include/common.h
diff --git a/klotski.h b/include/klotski.h
similarity index 100%
rename from klotski.h
rename to include/klotski.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..0e513aa
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.0)
+set(CMAKE_CXX_STANDARD 14)
+
+include_directories(${PROJECT_SOURCE_DIR}/include)
+
+aux_source_directory(${PROJECT_SOURCE_DIR}/src SRC)
+add_executable(klotski ${SRC})
diff --git a/case.cc b/src/case.cc
similarity index 100%
rename from case.cc
rename to src/case.cc
diff --git a/common.cc b/src/common.cc
similarity index 100%
rename from common.cc
rename to src/common.cc
diff --git a/klotski.cc b/src/klotski.cc
similarity index 100%
rename from klotski.cc
rename to src/klotski.cc
diff --git a/main.cc b/src/main.cc
similarity index 100%
rename from main.cc
rename to src/main.cc