diff --git a/src/cli/main.cpp b/src/cli/main.cpp
index 0ac6782..21e715b 100644
--- a/src/cli/main.cpp
+++ b/src/cli/main.cpp
@@ -24,10 +24,10 @@
 #include "parse_options.hpp"
 #include "uri.hpp"
 #include "types.hpp"
-#include "csv.hpp"
-#include "adoc.hpp"
-#include "bookmarks.hpp"
-#include "simple.hpp"
+#include "export/csv.hpp"
+#include "export/adoc.hpp"
+#include "export/bookmarks.hpp"
+#include "export/simple.hpp"
 #include "search.hpp"
 
 using std::cout;
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 42a9687..87a77f6 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -18,7 +18,7 @@ link_directories(${SQLITE3_LIBRARY_DIRS})
 link_directories(${CURLPP_LIBRARY_DIRS})
 link_directories(${ICU_LIBRARY_DIRS})
 
-file(GLOB sources_lib *.cpp)
+file(GLOB sources_lib *.cpp export/*.cpp)
 add_library(${PROJECT_NAME} SHARED ${sources_lib})
 target_link_libraries(${PROJECT_NAME} ${LIBXDG_BASEDIR_LIBRARIES}
   vsqlitepp stdc++fs ${CURLPP_LIBRARIES} ${ICU_LIBRARIES})
diff --git a/src/lib/adoc.cpp b/src/lib/export/adoc.cpp
similarity index 100%
rename from src/lib/adoc.cpp
rename to src/lib/export/adoc.cpp
diff --git a/src/lib/adoc.hpp b/src/lib/export/adoc.hpp
similarity index 100%
rename from src/lib/adoc.hpp
rename to src/lib/export/adoc.hpp
diff --git a/src/lib/bookmarks.cpp b/src/lib/export/bookmarks.cpp
similarity index 100%
rename from src/lib/bookmarks.cpp
rename to src/lib/export/bookmarks.cpp
diff --git a/src/lib/bookmarks.hpp b/src/lib/export/bookmarks.hpp
similarity index 100%
rename from src/lib/bookmarks.hpp
rename to src/lib/export/bookmarks.hpp
diff --git a/src/lib/csv.cpp b/src/lib/export/csv.cpp
similarity index 100%
rename from src/lib/csv.cpp
rename to src/lib/export/csv.cpp
diff --git a/src/lib/csv.hpp b/src/lib/export/csv.hpp
similarity index 100%
rename from src/lib/csv.hpp
rename to src/lib/export/csv.hpp
diff --git a/src/lib/export.cpp b/src/lib/export/export.cpp
similarity index 100%
rename from src/lib/export.cpp
rename to src/lib/export/export.cpp
diff --git a/src/lib/export.hpp b/src/lib/export/export.hpp
similarity index 100%
rename from src/lib/export.hpp
rename to src/lib/export/export.hpp
diff --git a/src/lib/simple.cpp b/src/lib/export/simple.cpp
similarity index 100%
rename from src/lib/simple.cpp
rename to src/lib/export/simple.cpp
diff --git a/src/lib/simple.hpp b/src/lib/export/simple.hpp
similarity index 100%
rename from src/lib/simple.hpp
rename to src/lib/export/simple.hpp