diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1795712..02e897a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,9 +25,9 @@ add_library(wormhole_lib
   src/config/config_db.cpp
   src/config/config_loader.cpp
   src/config/config_instance.cpp
-  src/type/thread_pool.cpp
+  src/types/user.cpp
+  src/thread_pool.cpp
   src/random.cpp
-  src/user.cpp
   src/control.cpp
   src/logger.cpp)
 
diff --git a/src/control.cpp b/src/control.cpp
index a1d5c2a..5c53510 100644
--- a/src/control.cpp
+++ b/src/control.cpp
@@ -28,7 +28,7 @@
 #include <getopt.h>
 #include "control.h"
 #include "database/database.h"
-#include "user.h"
+#include "types/user.h"
 
 namespace {
     constexpr int CMD_GAP = 27; 
diff --git a/src/database/database.h b/src/database/database.h
index 51d87b0..9727685 100644
--- a/src/database/database.h
+++ b/src/database/database.h
@@ -20,7 +20,7 @@
 
 #include <string>
 #include <memory>
-#include "user.h"
+#include "types/user.h"
 #include "crypt/rsa.h"
 
 namespace DB
diff --git a/src/http/response.h b/src/http/response.h
index 2abf1c9..fe21430 100644
--- a/src/http/response.h
+++ b/src/http/response.h
@@ -24,7 +24,7 @@
 #include <map>
 #include "mime.h"
 #include "responsecode.h"
-#include "type/stringvariant.h"
+#include "stringvariant.h"
 
 namespace HTTP
 {
diff --git a/src/protocol/activitypub/activitypub.cpp b/src/protocol/activitypub/activitypub.cpp
index 5fd6c54..b6892a9 100644
--- a/src/protocol/activitypub/activitypub.cpp
+++ b/src/protocol/activitypub/activitypub.cpp
@@ -24,7 +24,7 @@
 #include "http/mime.h"
 #include "http/response.h"
 #include "http/responsecode.h"
-#include "user.h"
+#include "types/user.h"
 #include "activitypub.h"
 #include "types/object.h"
 #include "http/httpserver.h"
diff --git a/src/protocol/host-meta/hostmeta.cpp b/src/protocol/host-meta/hostmeta.cpp
index ffe493c..f1f9d7e 100644
--- a/src/protocol/host-meta/hostmeta.cpp
+++ b/src/protocol/host-meta/hostmeta.cpp
@@ -24,7 +24,7 @@
 #include "http/mime.h"
 #include "http/response.h"
 #include "http/responsecode.h"
-#include "user.h"
+#include "types/user.h"
 #include "hostmeta.h"
 #include "http/httpserver.h"
 #include "http/request.h"
diff --git a/src/protocol/masto-api/CMakeLists.txt b/src/protocol/masto-api/CMakeLists.txt
index 69361b9..7211cb6 100644
--- a/src/protocol/masto-api/CMakeLists.txt
+++ b/src/protocol/masto-api/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_library(wormhole_masto_api_module
-  mastoapi.cpp)
+  mastoapi.cpp apps.cpp)
 include_directories(wormhole_masto_api_module ${WORMHOLE_INCLUDE_DIRS})
 target_link_libraries(wormhole_masto_api_module wormhole_lib)
diff --git a/src/protocol/masto-api/mastoapi.cpp b/src/protocol/masto-api/mastoapi.cpp
index f523d25..5f8d03d 100644
--- a/src/protocol/masto-api/mastoapi.cpp
+++ b/src/protocol/masto-api/mastoapi.cpp
@@ -27,7 +27,7 @@
 #include "http/httpserver.h"
 #include "http/error_response.h"
 #include "http/request.h"
-#include "user.h"
+#include "types/user.h"
 #include "logger.h"
 #include "jsonhelper.h"
 #include "route_args.h"
diff --git a/src/protocol/oauth/oauth.cpp b/src/protocol/oauth/oauth.cpp
index 48d10c0..7761986 100644
--- a/src/protocol/oauth/oauth.cpp
+++ b/src/protocol/oauth/oauth.cpp
@@ -29,7 +29,7 @@
 #include "http/error_response.h"
 #include "http/request.h"
 #include "random.h"
-#include "user.h"
+#include "types/user.h"
 #include "logger.h"
 #include "jsonhelper.h"
 #include "route_args.h"
diff --git a/src/protocol/webfinger/webfinger.cpp b/src/protocol/webfinger/webfinger.cpp
index 6f57557..8db2155 100644
--- a/src/protocol/webfinger/webfinger.cpp
+++ b/src/protocol/webfinger/webfinger.cpp
@@ -24,7 +24,7 @@
 #include "http/mime.h"
 #include "http/response.h"
 #include "http/responsecode.h"
-#include "user.h"
+#include "types/user.h"
 #include "webfinger.h"
 #include "stringhelper.h"
 #include "http/httpserver.h"
diff --git a/src/type/stringvariant.h b/src/stringvariant.h
similarity index 100%
rename from src/type/stringvariant.h
rename to src/stringvariant.h
diff --git a/src/type/thread_pool.cpp b/src/thread_pool.cpp
similarity index 100%
rename from src/type/thread_pool.cpp
rename to src/thread_pool.cpp
diff --git a/src/type/thread_pool.h b/src/thread_pool.h
similarity index 100%
rename from src/type/thread_pool.h
rename to src/thread_pool.h
diff --git a/src/user.cpp b/src/types/user.cpp
similarity index 100%
rename from src/user.cpp
rename to src/types/user.cpp
diff --git a/src/user.h b/src/types/user.h
similarity index 100%
rename from src/user.h
rename to src/types/user.h