diff --git a/database/api.h b/database_api/api.h
similarity index 100%
rename from database/api.h
rename to database_api/api.h
diff --git a/examples/InsertTest.cpp b/examples/InsertTest.cpp
index c5f77987..2b84c4c0 100644
--- a/examples/InsertTest.cpp
+++ b/examples/InsertTest.cpp
@@ -26,7 +26,7 @@
 #include <iostream>
 #include <sqlpp11/insert.h>
 #include <sqlpp11/select.h>
-#include <sqlpp11/examples/TabSample.h>
+#include "TabSample.h"
 
 #include <iostream>
 class DbMock
diff --git a/examples/RemoveTest.cpp b/examples/RemoveTest.cpp
index 530fa331..6e548841 100644
--- a/examples/RemoveTest.cpp
+++ b/examples/RemoveTest.cpp
@@ -26,7 +26,7 @@
 #include <iostream>
 #include <sqlpp11/remove.h>
 #include <sqlpp11/select.h>
-#include <sqlpp11/examples/TabSample.h>
+#include "TabSample.h"
 
 #include <iostream>
 class DbMock
diff --git a/examples/SelectTest.cpp b/examples/SelectTest.cpp
index aa4f97cc..4420cabd 100644
--- a/examples/SelectTest.cpp
+++ b/examples/SelectTest.cpp
@@ -23,7 +23,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/examples/TabSample.h>
+#include "TabSample.h"
 #include <sqlpp11/select.h>
 
 #include <iostream>
diff --git a/examples/UpdateTest.cpp b/examples/UpdateTest.cpp
index cbe50f3a..3d32b106 100644
--- a/examples/UpdateTest.cpp
+++ b/examples/UpdateTest.cpp
@@ -26,7 +26,7 @@
 #include <iostream>
 #include <sqlpp11/update.h>
 #include <sqlpp11/select.h>
-#include <sqlpp11/examples/TabSample.h>
+#include "TabSample.h"
 
 #include <iostream>
 class DbMock
diff --git a/examples/compile.sh b/examples/compile.sh
index 86dd4b2b..55cf4410 100644
--- a/examples/compile.sh
+++ b/examples/compile.sh
@@ -1,3 +1,3 @@
 # to be called from the sqlpp11 folder
-clang++ -std=c++11 -stdlib=libc++ examples/SelectTest.cpp -I..
+clang++ -std=c++11 -stdlib=libc++ examples/SelectTest.cpp -Iinclude
 
diff --git a/alias.h b/include/sqlpp11/alias.h
similarity index 100%
rename from alias.h
rename to include/sqlpp11/alias.h
diff --git a/assignment_list.h b/include/sqlpp11/assignment_list.h
similarity index 100%
rename from assignment_list.h
rename to include/sqlpp11/assignment_list.h
diff --git a/boolean.h b/include/sqlpp11/boolean.h
similarity index 100%
rename from boolean.h
rename to include/sqlpp11/boolean.h
diff --git a/column.h b/include/sqlpp11/column.h
similarity index 100%
rename from column.h
rename to include/sqlpp11/column.h
diff --git a/column_fwd.h b/include/sqlpp11/column_fwd.h
similarity index 100%
rename from column_fwd.h
rename to include/sqlpp11/column_fwd.h
diff --git a/column_types.h b/include/sqlpp11/column_types.h
similarity index 100%
rename from column_types.h
rename to include/sqlpp11/column_types.h
diff --git a/connection.h b/include/sqlpp11/connection.h
similarity index 100%
rename from connection.h
rename to include/sqlpp11/connection.h
diff --git a/detail/basic_operators.h b/include/sqlpp11/detail/basic_operators.h
similarity index 100%
rename from detail/basic_operators.h
rename to include/sqlpp11/detail/basic_operators.h
diff --git a/detail/make_expression_tuple.h b/include/sqlpp11/detail/make_expression_tuple.h
similarity index 100%
rename from detail/make_expression_tuple.h
rename to include/sqlpp11/detail/make_expression_tuple.h
diff --git a/detail/make_flag_tuple.h b/include/sqlpp11/detail/make_flag_tuple.h
similarity index 100%
rename from detail/make_flag_tuple.h
rename to include/sqlpp11/detail/make_flag_tuple.h
diff --git a/detail/serialize_tuple.h b/include/sqlpp11/detail/serialize_tuple.h
similarity index 100%
rename from detail/serialize_tuple.h
rename to include/sqlpp11/detail/serialize_tuple.h
diff --git a/detail/set.h b/include/sqlpp11/detail/set.h
similarity index 100%
rename from detail/set.h
rename to include/sqlpp11/detail/set.h
diff --git a/detail/tag.h b/include/sqlpp11/detail/tag.h
similarity index 100%
rename from detail/tag.h
rename to include/sqlpp11/detail/tag.h
diff --git a/detail/wrap_operand.h b/include/sqlpp11/detail/wrap_operand.h
similarity index 100%
rename from detail/wrap_operand.h
rename to include/sqlpp11/detail/wrap_operand.h
diff --git a/detail/wrong.h b/include/sqlpp11/detail/wrong.h
similarity index 100%
rename from detail/wrong.h
rename to include/sqlpp11/detail/wrong.h
diff --git a/exception.h b/include/sqlpp11/exception.h
similarity index 100%
rename from exception.h
rename to include/sqlpp11/exception.h
diff --git a/expression.h b/include/sqlpp11/expression.h
similarity index 100%
rename from expression.h
rename to include/sqlpp11/expression.h
diff --git a/expression_fwd.h b/include/sqlpp11/expression_fwd.h
similarity index 100%
rename from expression_fwd.h
rename to include/sqlpp11/expression_fwd.h
diff --git a/from.h b/include/sqlpp11/from.h
similarity index 100%
rename from from.h
rename to include/sqlpp11/from.h
diff --git a/functions.h b/include/sqlpp11/functions.h
similarity index 100%
rename from functions.h
rename to include/sqlpp11/functions.h
diff --git a/group_by.h b/include/sqlpp11/group_by.h
similarity index 100%
rename from group_by.h
rename to include/sqlpp11/group_by.h
diff --git a/having.h b/include/sqlpp11/having.h
similarity index 100%
rename from having.h
rename to include/sqlpp11/having.h
diff --git a/insert.h b/include/sqlpp11/insert.h
similarity index 100%
rename from insert.h
rename to include/sqlpp11/insert.h
diff --git a/join.h b/include/sqlpp11/join.h
similarity index 100%
rename from join.h
rename to include/sqlpp11/join.h
diff --git a/limit.h b/include/sqlpp11/limit.h
similarity index 100%
rename from limit.h
rename to include/sqlpp11/limit.h
diff --git a/multi_column.h b/include/sqlpp11/multi_column.h
similarity index 100%
rename from multi_column.h
rename to include/sqlpp11/multi_column.h
diff --git a/no_value.h b/include/sqlpp11/no_value.h
similarity index 100%
rename from no_value.h
rename to include/sqlpp11/no_value.h
diff --git a/noop.h b/include/sqlpp11/noop.h
similarity index 100%
rename from noop.h
rename to include/sqlpp11/noop.h
diff --git a/noop_fwd.h b/include/sqlpp11/noop_fwd.h
similarity index 100%
rename from noop_fwd.h
rename to include/sqlpp11/noop_fwd.h
diff --git a/numeric.h b/include/sqlpp11/numeric.h
similarity index 100%
rename from numeric.h
rename to include/sqlpp11/numeric.h
diff --git a/order_by.h b/include/sqlpp11/order_by.h
similarity index 100%
rename from order_by.h
rename to include/sqlpp11/order_by.h
diff --git a/raw_result_row.h b/include/sqlpp11/raw_result_row.h
similarity index 100%
rename from raw_result_row.h
rename to include/sqlpp11/raw_result_row.h
diff --git a/remove.h b/include/sqlpp11/remove.h
similarity index 100%
rename from remove.h
rename to include/sqlpp11/remove.h
diff --git a/result.h b/include/sqlpp11/result.h
similarity index 100%
rename from result.h
rename to include/sqlpp11/result.h
diff --git a/result_row.h b/include/sqlpp11/result_row.h
similarity index 100%
rename from result_row.h
rename to include/sqlpp11/result_row.h
diff --git a/select.h b/include/sqlpp11/select.h
similarity index 100%
rename from select.h
rename to include/sqlpp11/select.h
diff --git a/select_expression_list.h b/include/sqlpp11/select_expression_list.h
similarity index 100%
rename from select_expression_list.h
rename to include/sqlpp11/select_expression_list.h
diff --git a/select_flag_list.h b/include/sqlpp11/select_flag_list.h
similarity index 100%
rename from select_flag_list.h
rename to include/sqlpp11/select_flag_list.h
diff --git a/select_fwd.h b/include/sqlpp11/select_fwd.h
similarity index 100%
rename from select_fwd.h
rename to include/sqlpp11/select_fwd.h
diff --git a/select_pseudo_table.h b/include/sqlpp11/select_pseudo_table.h
similarity index 100%
rename from select_pseudo_table.h
rename to include/sqlpp11/select_pseudo_table.h
diff --git a/sort_order.h b/include/sqlpp11/sort_order.h
similarity index 100%
rename from sort_order.h
rename to include/sqlpp11/sort_order.h
diff --git a/table_base.h b/include/sqlpp11/table_base.h
similarity index 100%
rename from table_base.h
rename to include/sqlpp11/table_base.h
diff --git a/text.h b/include/sqlpp11/text.h
similarity index 100%
rename from text.h
rename to include/sqlpp11/text.h
diff --git a/transaction.h b/include/sqlpp11/transaction.h
similarity index 100%
rename from transaction.h
rename to include/sqlpp11/transaction.h
diff --git a/type_traits.h b/include/sqlpp11/type_traits.h
similarity index 100%
rename from type_traits.h
rename to include/sqlpp11/type_traits.h
diff --git a/update.h b/include/sqlpp11/update.h
similarity index 100%
rename from update.h
rename to include/sqlpp11/update.h
diff --git a/using.h b/include/sqlpp11/using.h
similarity index 100%
rename from using.h
rename to include/sqlpp11/using.h
diff --git a/where.h b/include/sqlpp11/where.h
similarity index 100%
rename from where.h
rename to include/sqlpp11/where.h