diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..567609b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+build/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0a6f00..71d9454 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,8 +3,12 @@ project (a-star)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
-include_directories(source)
+option(BUILD_EXAMPLE "Build a-star example" OFF)
 add_library(a-star source/AStar.cpp)
 
-add_executable(main main.cpp)
-target_link_libraries(main a-star)
+if(BUILD_EXAMPLE)
+	add_executable(main main.cpp)
+	target_link_libraries(main a-star)
+endif()
+
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/incl)
diff --git a/main.cpp b/example/main.cpp
similarity index 100%
rename from main.cpp
rename to example/main.cpp
diff --git a/source/AStar.hpp b/incl/a-star/AStar.hpp
similarity index 100%
rename from source/AStar.hpp
rename to incl/a-star/AStar.hpp
diff --git a/source/AStar.cpp b/source/AStar.cpp
index 7bf471a..8a1a834 100644
--- a/source/AStar.cpp
+++ b/source/AStar.cpp
@@ -1,7 +1,9 @@
-#include "AStar.hpp"
 #include <algorithm>
+#include <cmath>
+#include "a-star/AStar.hpp"
 
 using namespace std::placeholders;
+using namespace std;
 
 bool AStar::Vec2i::operator == (const Vec2i& coordinates_)
 {