diff --git a/CMakeLists.txt b/CMakeLists.txt
index bfcc8ad..0e239be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,4 @@ message(STATUS "Linker flags ${CMAKE_EXE_LINKER_FLAGS}")
 add_subdirectory(src)
 add_subdirectory(test)
 add_subdirectory(backends)
-
-add_executable(query main.cpp
-  include/matador/sql/column_name_generator.hpp)
-target_link_libraries(query matador)
+add_subdirectory(demo)
diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt
new file mode 100644
index 0000000..b36df9e
--- /dev/null
+++ b/demo/CMakeLists.txt
@@ -0,0 +1,8 @@
+
+
+add_executable(demo main.cpp)
+target_link_libraries(demo PRIVATE
+  matador
+  ${CMAKE_DL_LIBS}
+  ${SQLite3_LIBRARIES}
+)
diff --git a/main.cpp b/demo/main.cpp
similarity index 100%
rename from main.cpp
rename to demo/main.cpp