diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0800fcf93..3a491fa32 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,11 +68,10 @@ if (WIN32)
     endif()
 else()
     include(GNUInstallDirs)
-    set(INCLUDEDIR_INIT ${PROJECT_NAME})
     set(CMakeFilesLocation "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
 endif(WIN32)
 set(${PROJECT_NAME}_INSTALL_INCLUDEDIR
-        "${CMAKE_INSTALL_INCLUDEDIR}/${INCLUDEDIR_INIT}" CACHE PATH
+        "${CMAKE_INSTALL_INCLUDEDIR}/" CACHE PATH
         "directory to install ${PROJECT_NAME} include files to")
 
 # Instruct CMake to run moc automatically when needed.
@@ -112,86 +111,86 @@ endif()
 
 # Set up source files
 list(APPEND lib_SRCS
-    lib/quotient_common.h
-    lib/quotient_export.h
-    lib/function_traits.h lib/function_traits.cpp
-    lib/omittable.h
-    lib/expected.h
-    lib/networkaccessmanager.h lib/networkaccessmanager.cpp
-    lib/connectiondata.h lib/connectiondata.cpp
-    lib/connection.h lib/connection.cpp
-    lib/connection_p.h
-    lib/ssosession.h lib/ssosession.cpp
-    lib/logging.h lib/logging.cpp
-    lib/room.h lib/room.cpp
-    lib/roomstateview.h lib/roomstateview.cpp
-    lib/user.h lib/user.cpp
-    lib/avatar.h lib/avatar.cpp
-    lib/uri.h lib/uri.cpp
-    lib/uriresolver.h lib/uriresolver.cpp
-    lib/eventstats.h lib/eventstats.cpp
-    lib/syncdata.h lib/syncdata.cpp
-    lib/settings.h lib/settings.cpp
-    lib/networksettings.h lib/networksettings.cpp
-    lib/converters.h lib/converters.cpp
-    lib/util.h lib/util.cpp
-    lib/eventitem.h lib/eventitem.cpp
-    lib/accountregistry.h lib/accountregistry.cpp
-    lib/mxcreply.h lib/mxcreply.cpp
-    lib/e2ee/e2ee_common.h # because it's used by generated API
-    lib/events/event.h lib/events/event.cpp
-    lib/events/eventloader.h
-    lib/events/roomevent.h lib/events/roomevent.cpp
-    lib/events/stateevent.h lib/events/stateevent.cpp
-    lib/events/single_key_value.h
-    lib/events/simplestateevents.h
-    lib/events/eventcontent.h lib/events/eventcontent.cpp
-    lib/events/eventrelation.h lib/events/eventrelation.cpp
-    lib/events/roomcreateevent.h lib/events/roomcreateevent.cpp
-    lib/events/roomtombstoneevent.h lib/events/roomtombstoneevent.cpp
-    lib/events/roommessageevent.h lib/events/roommessageevent.cpp
-    lib/events/roommemberevent.h lib/events/roommemberevent.cpp
-    lib/events/roomcanonicalaliasevent.h
-    lib/events/roomavatarevent.h
-    lib/events/roompowerlevelsevent.h lib/events/roompowerlevelsevent.cpp
-    lib/events/typingevent.h
-    lib/events/accountdataevents.h
-    lib/events/receiptevent.h lib/events/receiptevent.cpp
-    lib/events/reactionevent.h
-    lib/events/callevents.h lib/events/callevents.cpp
-    lib/events/directchatevent.h lib/events/directchatevent.cpp
-    lib/events/encryptionevent.h lib/events/encryptionevent.cpp
-    lib/events/encryptedevent.h lib/events/encryptedevent.cpp
-    lib/events/roomkeyevent.h
-    lib/events/stickerevent.h
-    lib/events/filesourceinfo.h lib/events/filesourceinfo.cpp
-    lib/jobs/requestdata.h lib/jobs/requestdata.cpp
-    lib/jobs/basejob.h lib/jobs/basejob.cpp
-    lib/jobs/syncjob.h lib/jobs/syncjob.cpp
-    lib/jobs/mediathumbnailjob.h lib/jobs/mediathumbnailjob.cpp
-    lib/jobs/downloadfilejob.h lib/jobs/downloadfilejob.cpp
+    Quotient/quotient_common.h
+    Quotient/quotient_export.h
+    Quotient/function_traits.h Quotient/function_traits.cpp
+    Quotient/omittable.h
+    Quotient/expected.h
+    Quotient/networkaccessmanager.h Quotient/networkaccessmanager.cpp
+    Quotient/connectiondata.h Quotient/connectiondata.cpp
+    Quotient/connection.h Quotient/connection.cpp
+    Quotient/connection_p.h
+    Quotient/ssosession.h Quotient/ssosession.cpp
+    Quotient/logging.h Quotient/logging.cpp
+    Quotient/room.h Quotient/room.cpp
+    Quotient/roomstateview.h Quotient/roomstateview.cpp
+    Quotient/user.h Quotient/user.cpp
+    Quotient/avatar.h Quotient/avatar.cpp
+    Quotient/uri.h Quotient/uri.cpp
+    Quotient/uriresolver.h Quotient/uriresolver.cpp
+    Quotient/eventstats.h Quotient/eventstats.cpp
+    Quotient/syncdata.h Quotient/syncdata.cpp
+    Quotient/settings.h Quotient/settings.cpp
+    Quotient/networksettings.h Quotient/networksettings.cpp
+    Quotient/converters.h Quotient/converters.cpp
+    Quotient/util.h Quotient/util.cpp
+    Quotient/eventitem.h Quotient/eventitem.cpp
+    Quotient/accountregistry.h Quotient/accountregistry.cpp
+    Quotient/mxcreply.h Quotient/mxcreply.cpp
+    Quotient/e2ee/e2ee_common.h # because it's used by generated API
+    Quotient/events/event.h Quotient/events/event.cpp
+    Quotient/events/eventloader.h
+    Quotient/events/roomevent.h Quotient/events/roomevent.cpp
+    Quotient/events/stateevent.h Quotient/events/stateevent.cpp
+    Quotient/events/single_key_value.h
+    Quotient/events/simplestateevents.h
+    Quotient/events/eventcontent.h Quotient/events/eventcontent.cpp
+    Quotient/events/eventrelation.h Quotient/events/eventrelation.cpp
+    Quotient/events/roomcreateevent.h Quotient/events/roomcreateevent.cpp
+    Quotient/events/roomtombstoneevent.h Quotient/events/roomtombstoneevent.cpp
+    Quotient/events/roommessageevent.h Quotient/events/roommessageevent.cpp
+    Quotient/events/roommemberevent.h Quotient/events/roommemberevent.cpp
+    Quotient/events/roomcanonicalaliasevent.h
+    Quotient/events/roomavatarevent.h
+    Quotient/events/roompowerlevelsevent.h Quotient/events/roompowerlevelsevent.cpp
+    Quotient/events/typingevent.h
+    Quotient/events/accountdataevents.h
+    Quotient/events/receiptevent.h Quotient/events/receiptevent.cpp
+    Quotient/events/reactionevent.h
+    Quotient/events/callevents.h Quotient/events/callevents.cpp
+    Quotient/events/directchatevent.h Quotient/events/directchatevent.cpp
+    Quotient/events/encryptionevent.h Quotient/events/encryptionevent.cpp
+    Quotient/events/encryptedevent.h Quotient/events/encryptedevent.cpp
+    Quotient/events/roomkeyevent.h
+    Quotient/events/stickerevent.h
+    Quotient/events/filesourceinfo.h Quotient/events/filesourceinfo.cpp
+    Quotient/jobs/requestdata.h Quotient/jobs/requestdata.cpp
+    Quotient/jobs/basejob.h Quotient/jobs/basejob.cpp
+    Quotient/jobs/syncjob.h Quotient/jobs/syncjob.cpp
+    Quotient/jobs/mediathumbnailjob.h Quotient/jobs/mediathumbnailjob.cpp
+    Quotient/jobs/downloadfilejob.h Quotient/jobs/downloadfilejob.cpp
     libquotientemojis.qrc
 )
 if (${PROJECT_NAME}_ENABLE_E2EE)
     list(APPEND lib_SRCS
-        lib/database.h lib/database.cpp
-        lib/keyverificationsession.h lib/keyverificationsession.cpp
-        lib/e2ee/e2ee_common.cpp # .h is in the common sources list
-        lib/e2ee/qolmaccount.h lib/e2ee/qolmaccount.cpp
-        lib/e2ee/qolmsession.h lib/e2ee/qolmsession.cpp
-        lib/e2ee/qolminboundsession.h lib/e2ee/qolminboundsession.cpp
-        lib/e2ee/qolmoutboundsession.h lib/e2ee/qolmoutboundsession.cpp
-        lib/e2ee/qolmutility.h lib/e2ee/qolmutility.cpp
-        lib/e2ee/qolmsession.h lib/e2ee/qolmsession.cpp
-        lib/e2ee/qolmmessage.h lib/e2ee/qolmmessage.cpp
-        lib/events/keyverificationevent.h
+        Quotient/database.h Quotient/database.cpp
+        Quotient/keyverificationsession.h Quotient/keyverificationsession.cpp
+        Quotient/e2ee/e2ee_common.cpp # .h is in the common sources list
+        Quotient/e2ee/qolmaccount.h Quotient/e2ee/qolmaccount.cpp
+        Quotient/e2ee/qolmsession.h Quotient/e2ee/qolmsession.cpp
+        Quotient/e2ee/qolminboundsession.h Quotient/e2ee/qolminboundsession.cpp
+        Quotient/e2ee/qolmoutboundsession.h Quotient/e2ee/qolmoutboundsession.cpp
+        Quotient/e2ee/qolmutility.h Quotient/e2ee/qolmutility.cpp
+        Quotient/e2ee/qolmsession.h Quotient/e2ee/qolmsession.cpp
+        Quotient/e2ee/qolmmessage.h Quotient/e2ee/qolmmessage.cpp
+        Quotient/events/keyverificationevent.h
     )
 endif()
 
 # Configure API files generation
 
 set(CSAPI_DIR csapi)
-set(FULL_CSAPI_DIR lib/${CSAPI_DIR})
+set(FULL_CSAPI_DIR Quotient/${CSAPI_DIR})
 set(ASAPI_DEF_DIR application-service/definitions)
 set(ISAPI_DEF_DIR identity/definitions)
 
@@ -242,7 +241,7 @@ if (API_GENERATION_ENABLED)
             key_backup.yaml- # immature and buggy in terms of API definition
             sync.yaml- # we have a better handcrafted implementation
             ${GTAD_ARGS}
-        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/lib
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/Quotient
         SOURCES gtad/gtad.yaml
                 gtad/data.h.mustache
                 gtad/operation.h.mustache
@@ -263,7 +262,7 @@ add_feature_info(EnableApiCodeGeneration "${API_GENERATION_ENABLED}"
 # which would trigger the reconfiguration specifically before the next build.
 # For now CONFIGURE_DEPENDS is the best approximation of that.
 file(GLOB_RECURSE api_ALL_SRCS CONFIGURE_DEPENDS
-     ${FULL_CSAPI_DIR}/*.* lib/${ASAPI_DEF_DIR}/*.* lib/${ISAPI_DEF_DIR}/*.*)
+     ${FULL_CSAPI_DIR}/*.* Quotient/${ASAPI_DEF_DIR}/*.* Quotient/${ISAPI_DEF_DIR}/*.*)
 
 add_compile_options(
     -DQT_NO_CAST_TO_ASCII
@@ -310,11 +309,12 @@ endif()
 
 # Don't use PCH w/GCC (https://bugzilla.redhat.com/show_bug.cgi?id=1721553#c34)
 if (NOT CMAKE_CXX_COMPILER_ID STREQUAL GNU)
-    target_precompile_headers(${PROJECT_NAME} PRIVATE lib/converters.h)
+    target_precompile_headers(${PROJECT_NAME} PRIVATE Quotient/converters.h)
 endif ()
 
 target_include_directories(${PROJECT_NAME} PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<BUILD_INTERFACE:$<$<NOT:$<BOOL:${QUOTIENT_FORCE_NAMESPACED_INCLUDES}>>:${CMAKE_CURRENT_SOURCE_DIR}/Quotient>>
     $<INSTALL_INTERFACE:${${PROJECT_NAME}_INSTALL_INCLUDEDIR}>
 )
 
@@ -353,9 +353,8 @@ endif()
 install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
         LIBRARY RUNTIME
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        INCLUDES DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDEDIR}
 )
-install(DIRECTORY lib/ DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDEDIR}
+install(DIRECTORY Quotient/ DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDEDIR}/Quotient
         FILES_MATCHING PATTERN "*.h")
 
 include(CMakePackageConfigHelpers)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6def5ed0f..a3ed1bc6a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -383,7 +383,7 @@ preprocessor symbol (i.e. passing `-DPROFILE_LOG_USECS=<usecs>` to the compiler
 if you're on Linux/macOS).
 
 ### Generated C++ code for CS API
-The code in `lib/csapi`, `lib/identity` and `lib/application-service`, although
+The code in `Quotient/csapi`, `Quotient/identity` and `Quotient/application-service`, although
 stored in Git, is actually generated from the official Matrix Client-Server API
 definition files. If you're unhappy with something in there and want to improve
 that, you have to understand the way these files are produced and setup some
@@ -438,7 +438,7 @@ that also briefly touches on GTAD - the tool written for the purpose.
    an additional build target called `update-api` will be configured.
 2. Generate the code: `cmake --build <your build dir> --target update-api`.
    Building this target will create (overwriting without warning) source files
-   in `lib/csapi`, `lib/identity`, `lib/application-service` for all YAML files
+   in `Quotient/csapi`, `Quotient/identity`, `Quotient/application-service` for all YAML files
    it can find in `/path/to/matrix-spec/data/api/client-server` and their
    dependencies.
 
diff --git a/lib/accountregistry.cpp b/Quotient/accountregistry.cpp
similarity index 100%
rename from lib/accountregistry.cpp
rename to Quotient/accountregistry.cpp
diff --git a/lib/accountregistry.h b/Quotient/accountregistry.h
similarity index 100%
rename from lib/accountregistry.h
rename to Quotient/accountregistry.h
diff --git a/lib/application-service/definitions/location.h b/Quotient/application-service/definitions/location.h
similarity index 96%
rename from lib/application-service/definitions/location.h
rename to Quotient/application-service/definitions/location.h
index 6801c99fc..5541b1690 100644
--- a/lib/application-service/definitions/location.h
+++ b/Quotient/application-service/definitions/location.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 
diff --git a/lib/application-service/definitions/protocol.h b/Quotient/application-service/definitions/protocol.h
similarity index 99%
rename from lib/application-service/definitions/protocol.h
rename to Quotient/application-service/definitions/protocol.h
index 213dbf19a..4c774e426 100644
--- a/lib/application-service/definitions/protocol.h
+++ b/Quotient/application-service/definitions/protocol.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 /// Definition of valid values for a field.
diff --git a/lib/application-service/definitions/user.h b/Quotient/application-service/definitions/user.h
similarity index 96%
rename from lib/application-service/definitions/user.h
rename to Quotient/application-service/definitions/user.h
index 3342ef80f..ea6a939e5 100644
--- a/lib/application-service/definitions/user.h
+++ b/Quotient/application-service/definitions/user.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 
diff --git a/lib/avatar.cpp b/Quotient/avatar.cpp
similarity index 100%
rename from lib/avatar.cpp
rename to Quotient/avatar.cpp
diff --git a/lib/avatar.h b/Quotient/avatar.h
similarity index 100%
rename from lib/avatar.h
rename to Quotient/avatar.h
diff --git a/lib/connection.cpp b/Quotient/connection.cpp
similarity index 100%
rename from lib/connection.cpp
rename to Quotient/connection.cpp
diff --git a/lib/connection.h b/Quotient/connection.h
similarity index 100%
rename from lib/connection.h
rename to Quotient/connection.h
diff --git a/lib/connection_p.h b/Quotient/connection_p.h
similarity index 100%
rename from lib/connection_p.h
rename to Quotient/connection_p.h
diff --git a/lib/connectiondata.cpp b/Quotient/connectiondata.cpp
similarity index 100%
rename from lib/connectiondata.cpp
rename to Quotient/connectiondata.cpp
diff --git a/lib/connectiondata.h b/Quotient/connectiondata.h
similarity index 100%
rename from lib/connectiondata.h
rename to Quotient/connectiondata.h
diff --git a/lib/converters.cpp b/Quotient/converters.cpp
similarity index 100%
rename from lib/converters.cpp
rename to Quotient/converters.cpp
diff --git a/lib/converters.h b/Quotient/converters.h
similarity index 100%
rename from lib/converters.h
rename to Quotient/converters.h
diff --git a/lib/csapi/account-data.cpp b/Quotient/csapi/account-data.cpp
similarity index 100%
rename from lib/csapi/account-data.cpp
rename to Quotient/csapi/account-data.cpp
diff --git a/lib/csapi/account-data.h b/Quotient/csapi/account-data.h
similarity index 99%
rename from lib/csapi/account-data.h
rename to Quotient/csapi/account-data.h
index 70d4e492e..e4ec4d3fc 100644
--- a/lib/csapi/account-data.h
+++ b/Quotient/csapi/account-data.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/admin.cpp b/Quotient/csapi/admin.cpp
similarity index 100%
rename from lib/csapi/admin.cpp
rename to Quotient/csapi/admin.cpp
diff --git a/lib/csapi/admin.h b/Quotient/csapi/admin.h
similarity index 99%
rename from lib/csapi/admin.h
rename to Quotient/csapi/admin.h
index c53ddd7ed..a09e8e685 100644
--- a/lib/csapi/admin.h
+++ b/Quotient/csapi/admin.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/administrative_contact.cpp b/Quotient/csapi/administrative_contact.cpp
similarity index 100%
rename from lib/csapi/administrative_contact.cpp
rename to Quotient/csapi/administrative_contact.cpp
diff --git a/lib/csapi/administrative_contact.h b/Quotient/csapi/administrative_contact.h
similarity index 98%
rename from lib/csapi/administrative_contact.h
rename to Quotient/csapi/administrative_contact.h
index 273348502..2e4682186 100644
--- a/lib/csapi/administrative_contact.h
+++ b/Quotient/csapi/administrative_contact.h
@@ -4,12 +4,11 @@
 
 #pragma once
 
-#include "csapi/definitions/auth_data.h"
-#include "csapi/definitions/request_email_validation.h"
-#include "csapi/definitions/request_msisdn_validation.h"
-#include "csapi/definitions/request_token_response.h"
-
-#include "jobs/basejob.h"
+#include <Quotient/csapi/definitions/auth_data.h>
+#include <Quotient/csapi/definitions/request_email_validation.h>
+#include <Quotient/csapi/definitions/request_msisdn_validation.h>
+#include <Quotient/csapi/definitions/request_token_response.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/appservice_room_directory.cpp b/Quotient/csapi/appservice_room_directory.cpp
similarity index 100%
rename from lib/csapi/appservice_room_directory.cpp
rename to Quotient/csapi/appservice_room_directory.cpp
diff --git a/lib/csapi/appservice_room_directory.h b/Quotient/csapi/appservice_room_directory.h
similarity index 97%
rename from lib/csapi/appservice_room_directory.h
rename to Quotient/csapi/appservice_room_directory.h
index d62689795..084e012ef 100644
--- a/lib/csapi/appservice_room_directory.h
+++ b/Quotient/csapi/appservice_room_directory.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/banning.cpp b/Quotient/csapi/banning.cpp
similarity index 100%
rename from lib/csapi/banning.cpp
rename to Quotient/csapi/banning.cpp
diff --git a/lib/csapi/banning.h b/Quotient/csapi/banning.h
similarity index 98%
rename from lib/csapi/banning.h
rename to Quotient/csapi/banning.h
index e4c60ce31..8f415e93b 100644
--- a/lib/csapi/banning.h
+++ b/Quotient/csapi/banning.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/capabilities.cpp b/Quotient/csapi/capabilities.cpp
similarity index 100%
rename from lib/csapi/capabilities.cpp
rename to Quotient/csapi/capabilities.cpp
diff --git a/lib/csapi/capabilities.h b/Quotient/csapi/capabilities.h
similarity index 98%
rename from lib/csapi/capabilities.h
rename to Quotient/csapi/capabilities.h
index 81b47cd4e..aa03f29ed 100644
--- a/lib/csapi/capabilities.h
+++ b/Quotient/csapi/capabilities.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/content-repo.cpp b/Quotient/csapi/content-repo.cpp
similarity index 100%
rename from lib/csapi/content-repo.cpp
rename to Quotient/csapi/content-repo.cpp
diff --git a/lib/csapi/content-repo.h b/Quotient/csapi/content-repo.h
similarity index 99%
rename from lib/csapi/content-repo.h
rename to Quotient/csapi/content-repo.h
index aad0d4777..9b334e127 100644
--- a/lib/csapi/content-repo.h
+++ b/Quotient/csapi/content-repo.h
@@ -4,11 +4,11 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
-
 #include <QtCore/QIODevice>
 #include <QtNetwork/QNetworkReply>
 
+#include <Quotient/jobs/basejob.h>
+
 namespace Quotient {
 
 /*! \brief Upload some content to the content repository.
diff --git a/lib/csapi/create_room.cpp b/Quotient/csapi/create_room.cpp
similarity index 100%
rename from lib/csapi/create_room.cpp
rename to Quotient/csapi/create_room.cpp
diff --git a/lib/csapi/create_room.h b/Quotient/csapi/create_room.h
similarity index 99%
rename from lib/csapi/create_room.h
rename to Quotient/csapi/create_room.h
index c5c01bd8d..dcc92bfb8 100644
--- a/lib/csapi/create_room.h
+++ b/Quotient/csapi/create_room.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/cross_signing.cpp b/Quotient/csapi/cross_signing.cpp
similarity index 100%
rename from lib/csapi/cross_signing.cpp
rename to Quotient/csapi/cross_signing.cpp
diff --git a/lib/csapi/cross_signing.h b/Quotient/csapi/cross_signing.h
similarity index 94%
rename from lib/csapi/cross_signing.h
rename to Quotient/csapi/cross_signing.h
index 6cea73e68..9e66d935b 100644
--- a/lib/csapi/cross_signing.h
+++ b/Quotient/csapi/cross_signing.h
@@ -4,10 +4,9 @@
 
 #pragma once
 
-#include "csapi/definitions/auth_data.h"
-#include "csapi/definitions/cross_signing_key.h"
-
-#include "jobs/basejob.h"
+#include <Quotient/csapi/definitions/auth_data.h>
+#include <Quotient/csapi/definitions/cross_signing_key.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/definitions/auth_data.h b/Quotient/csapi/definitions/auth_data.h
similarity index 97%
rename from lib/csapi/definitions/auth_data.h
rename to Quotient/csapi/definitions/auth_data.h
index a99723232..b25a88ca7 100644
--- a/lib/csapi/definitions/auth_data.h
+++ b/Quotient/csapi/definitions/auth_data.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 /// Used by clients to submit authentication information to the
diff --git a/lib/csapi/definitions/client_device.h b/Quotient/csapi/definitions/client_device.h
similarity index 97%
rename from lib/csapi/definitions/client_device.h
rename to Quotient/csapi/definitions/client_device.h
index a5ab1bfce..73fe7c0a7 100644
--- a/lib/csapi/definitions/client_device.h
+++ b/Quotient/csapi/definitions/client_device.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 /// A client device
diff --git a/lib/csapi/definitions/cross_signing_key.h b/Quotient/csapi/definitions/cross_signing_key.h
similarity index 97%
rename from lib/csapi/definitions/cross_signing_key.h
rename to Quotient/csapi/definitions/cross_signing_key.h
index 0cec8161e..8cfec3717 100644
--- a/lib/csapi/definitions/cross_signing_key.h
+++ b/Quotient/csapi/definitions/cross_signing_key.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 /// Cross signing key
diff --git a/lib/csapi/definitions/device_keys.h b/Quotient/csapi/definitions/device_keys.h
similarity index 98%
rename from lib/csapi/definitions/device_keys.h
rename to Quotient/csapi/definitions/device_keys.h
index 84ecefae9..47a9c6eaf 100644
--- a/lib/csapi/definitions/device_keys.h
+++ b/Quotient/csapi/definitions/device_keys.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 /// Device identity keys
diff --git a/lib/csapi/definitions/event_filter.h b/Quotient/csapi/definitions/event_filter.h
similarity index 98%
rename from lib/csapi/definitions/event_filter.h
rename to Quotient/csapi/definitions/event_filter.h
index c55d4f929..b9d2cb722 100644
--- a/lib/csapi/definitions/event_filter.h
+++ b/Quotient/csapi/definitions/event_filter.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/definitions/openid_token.h b/Quotient/csapi/definitions/openid_token.h
similarity index 97%
rename from lib/csapi/definitions/openid_token.h
rename to Quotient/csapi/definitions/openid_token.h
index 9b026deaa..76e06781f 100644
--- a/lib/csapi/definitions/openid_token.h
+++ b/Quotient/csapi/definitions/openid_token.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/definitions/public_rooms_response.h b/Quotient/csapi/definitions/public_rooms_response.h
similarity index 98%
rename from lib/csapi/definitions/public_rooms_response.h
rename to Quotient/csapi/definitions/public_rooms_response.h
index 7c7d9cc63..354657e6f 100644
--- a/lib/csapi/definitions/public_rooms_response.h
+++ b/Quotient/csapi/definitions/public_rooms_response.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/definitions/push_condition.h b/Quotient/csapi/definitions/push_condition.h
similarity index 98%
rename from lib/csapi/definitions/push_condition.h
rename to Quotient/csapi/definitions/push_condition.h
index 6a048ba87..8a85343db 100644
--- a/lib/csapi/definitions/push_condition.h
+++ b/Quotient/csapi/definitions/push_condition.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/definitions/push_rule.h b/Quotient/csapi/definitions/push_rule.h
similarity index 95%
rename from lib/csapi/definitions/push_rule.h
rename to Quotient/csapi/definitions/push_rule.h
index 135537c13..2d27ede1e 100644
--- a/lib/csapi/definitions/push_rule.h
+++ b/Quotient/csapi/definitions/push_rule.h
@@ -4,9 +4,8 @@
 
 #pragma once
 
-#include "converters.h"
-
-#include "csapi/definitions/push_condition.h"
+#include <Quotient/converters.h>
+#include <Quotient/csapi/definitions/push_condition.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/definitions/push_ruleset.h b/Quotient/csapi/definitions/push_ruleset.h
similarity index 93%
rename from lib/csapi/definitions/push_ruleset.h
rename to Quotient/csapi/definitions/push_ruleset.h
index ba780a339..ae4bdaf0d 100644
--- a/lib/csapi/definitions/push_ruleset.h
+++ b/Quotient/csapi/definitions/push_ruleset.h
@@ -4,9 +4,8 @@
 
 #pragma once
 
-#include "converters.h"
-
-#include "csapi/definitions/push_rule.h"
+#include <Quotient/converters.h>
+#include <Quotient/csapi/definitions/push_rule.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/definitions/request_email_validation.h b/Quotient/csapi/definitions/request_email_validation.h
similarity index 92%
rename from lib/csapi/definitions/request_email_validation.h
rename to Quotient/csapi/definitions/request_email_validation.h
index da8fc0606..c41c34588 100644
--- a/lib/csapi/definitions/request_email_validation.h
+++ b/Quotient/csapi/definitions/request_email_validation.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "converters.h"
-#include "identity/definitions/request_email_validation.h"
+#include <Quotient/converters.h>
+#include <Quotient/csapi/definitions/../../identity/definitions/request_email_validation.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/definitions/request_msisdn_validation.h b/Quotient/csapi/definitions/request_msisdn_validation.h
similarity index 92%
rename from lib/csapi/definitions/request_msisdn_validation.h
rename to Quotient/csapi/definitions/request_msisdn_validation.h
index 18d4ba264..78b9a781c 100644
--- a/lib/csapi/definitions/request_msisdn_validation.h
+++ b/Quotient/csapi/definitions/request_msisdn_validation.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "converters.h"
-#include "identity/definitions/request_msisdn_validation.h"
+#include <Quotient/converters.h>
+#include <Quotient/csapi/definitions/../../identity/definitions/request_msisdn_validation.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/definitions/request_token_response.h b/Quotient/csapi/definitions/request_token_response.h
similarity index 98%
rename from lib/csapi/definitions/request_token_response.h
rename to Quotient/csapi/definitions/request_token_response.h
index d5fbbadbe..f89dd0eda 100644
--- a/lib/csapi/definitions/request_token_response.h
+++ b/Quotient/csapi/definitions/request_token_response.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/definitions/room_event_filter.h b/Quotient/csapi/definitions/room_event_filter.h
similarity index 97%
rename from lib/csapi/definitions/room_event_filter.h
rename to Quotient/csapi/definitions/room_event_filter.h
index 293e54929..416a5cf35 100644
--- a/lib/csapi/definitions/room_event_filter.h
+++ b/Quotient/csapi/definitions/room_event_filter.h
@@ -4,9 +4,8 @@
 
 #pragma once
 
-#include "converters.h"
-
-#include "csapi/definitions/event_filter.h"
+#include <Quotient/converters.h>
+#include <Quotient/csapi/definitions/event_filter.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/definitions/sync_filter.h b/Quotient/csapi/definitions/sync_filter.h
similarity index 96%
rename from lib/csapi/definitions/sync_filter.h
rename to Quotient/csapi/definitions/sync_filter.h
index c68b7ef78..73060efd5 100644
--- a/lib/csapi/definitions/sync_filter.h
+++ b/Quotient/csapi/definitions/sync_filter.h
@@ -4,10 +4,9 @@
 
 #pragma once
 
-#include "converters.h"
-
-#include "csapi/definitions/event_filter.h"
-#include "csapi/definitions/room_event_filter.h"
+#include <Quotient/converters.h>
+#include <Quotient/csapi/definitions/event_filter.h>
+#include <Quotient/csapi/definitions/room_event_filter.h>
 
 namespace Quotient {
 /// Filters to be applied to room data.
diff --git a/lib/csapi/definitions/third_party_signed.h b/Quotient/csapi/definitions/third_party_signed.h
similarity index 97%
rename from lib/csapi/definitions/third_party_signed.h
rename to Quotient/csapi/definitions/third_party_signed.h
index 7097bda43..a1116df8c 100644
--- a/lib/csapi/definitions/third_party_signed.h
+++ b/Quotient/csapi/definitions/third_party_signed.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 /// A signature of an `m.third_party_invite` token to prove that this user
diff --git a/lib/csapi/definitions/user_identifier.h b/Quotient/csapi/definitions/user_identifier.h
similarity index 96%
rename from lib/csapi/definitions/user_identifier.h
rename to Quotient/csapi/definitions/user_identifier.h
index cb585a6ad..b741217db 100644
--- a/lib/csapi/definitions/user_identifier.h
+++ b/Quotient/csapi/definitions/user_identifier.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 /// Identification information for a user
diff --git a/lib/csapi/definitions/wellknown/full.h b/Quotient/csapi/definitions/wellknown/full.h
similarity index 90%
rename from lib/csapi/definitions/wellknown/full.h
rename to Quotient/csapi/definitions/wellknown/full.h
index a0ef2076b..d9ab5d034 100644
--- a/lib/csapi/definitions/wellknown/full.h
+++ b/Quotient/csapi/definitions/wellknown/full.h
@@ -4,10 +4,9 @@
 
 #pragma once
 
-#include "converters.h"
-
-#include "csapi/definitions/wellknown/homeserver.h"
-#include "csapi/definitions/wellknown/identity_server.h"
+#include <Quotient/converters.h>
+#include <Quotient/csapi/definitions/wellknown/homeserver.h>
+#include <Quotient/csapi/definitions/wellknown/identity_server.h>
 
 namespace Quotient {
 /// Used by clients to determine the homeserver, identity server, and other
diff --git a/lib/csapi/definitions/wellknown/homeserver.h b/Quotient/csapi/definitions/wellknown/homeserver.h
similarity index 95%
rename from lib/csapi/definitions/wellknown/homeserver.h
rename to Quotient/csapi/definitions/wellknown/homeserver.h
index b7db41823..ef742bc2a 100644
--- a/lib/csapi/definitions/wellknown/homeserver.h
+++ b/Quotient/csapi/definitions/wellknown/homeserver.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 /// Used by clients to discover homeserver information.
diff --git a/lib/csapi/definitions/wellknown/identity_server.h b/Quotient/csapi/definitions/wellknown/identity_server.h
similarity index 95%
rename from lib/csapi/definitions/wellknown/identity_server.h
rename to Quotient/csapi/definitions/wellknown/identity_server.h
index 885e3d34a..38e1a9ed0 100644
--- a/lib/csapi/definitions/wellknown/identity_server.h
+++ b/Quotient/csapi/definitions/wellknown/identity_server.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 /// Used by clients to discover identity server information.
diff --git a/lib/csapi/device_management.cpp b/Quotient/csapi/device_management.cpp
similarity index 100%
rename from lib/csapi/device_management.cpp
rename to Quotient/csapi/device_management.cpp
diff --git a/lib/csapi/device_management.h b/Quotient/csapi/device_management.h
similarity index 96%
rename from lib/csapi/device_management.h
rename to Quotient/csapi/device_management.h
index c10389b35..62e0b2856 100644
--- a/lib/csapi/device_management.h
+++ b/Quotient/csapi/device_management.h
@@ -4,10 +4,9 @@
 
 #pragma once
 
-#include "csapi/definitions/auth_data.h"
-#include "csapi/definitions/client_device.h"
-
-#include "jobs/basejob.h"
+#include <Quotient/csapi/definitions/auth_data.h>
+#include <Quotient/csapi/definitions/client_device.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/directory.cpp b/Quotient/csapi/directory.cpp
similarity index 100%
rename from lib/csapi/directory.cpp
rename to Quotient/csapi/directory.cpp
diff --git a/lib/csapi/directory.h b/Quotient/csapi/directory.h
similarity index 99%
rename from lib/csapi/directory.h
rename to Quotient/csapi/directory.h
index 0ffb0e097..fad52ee59 100644
--- a/lib/csapi/directory.h
+++ b/Quotient/csapi/directory.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/event_context.cpp b/Quotient/csapi/event_context.cpp
similarity index 100%
rename from lib/csapi/event_context.cpp
rename to Quotient/csapi/event_context.cpp
diff --git a/lib/csapi/event_context.h b/Quotient/csapi/event_context.h
similarity index 96%
rename from lib/csapi/event_context.h
rename to Quotient/csapi/event_context.h
index 065c8e075..f94c9e1db 100644
--- a/lib/csapi/event_context.h
+++ b/Quotient/csapi/event_context.h
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "events/roomevent.h"
-#include "events/stateevent.h"
-#include "jobs/basejob.h"
+#include <Quotient/events/roomevent.h>
+#include <Quotient/events/stateevent.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/filter.cpp b/Quotient/csapi/filter.cpp
similarity index 100%
rename from lib/csapi/filter.cpp
rename to Quotient/csapi/filter.cpp
diff --git a/lib/csapi/filter.h b/Quotient/csapi/filter.h
similarity index 95%
rename from lib/csapi/filter.h
rename to Quotient/csapi/filter.h
index 9518a461a..22bb29872 100644
--- a/lib/csapi/filter.h
+++ b/Quotient/csapi/filter.h
@@ -4,9 +4,8 @@
 
 #pragma once
 
-#include "csapi/definitions/sync_filter.h"
-
-#include "jobs/basejob.h"
+#include <Quotient/csapi/definitions/sync_filter.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/inviting.cpp b/Quotient/csapi/inviting.cpp
similarity index 100%
rename from lib/csapi/inviting.cpp
rename to Quotient/csapi/inviting.cpp
diff --git a/lib/csapi/inviting.h b/Quotient/csapi/inviting.h
similarity index 97%
rename from lib/csapi/inviting.h
rename to Quotient/csapi/inviting.h
index ff40672e9..2d667b2c3 100644
--- a/lib/csapi/inviting.h
+++ b/Quotient/csapi/inviting.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/joining.cpp b/Quotient/csapi/joining.cpp
similarity index 100%
rename from lib/csapi/joining.cpp
rename to Quotient/csapi/joining.cpp
diff --git a/lib/csapi/joining.h b/Quotient/csapi/joining.h
similarity index 97%
rename from lib/csapi/joining.h
rename to Quotient/csapi/joining.h
index c86baa905..2c70774e9 100644
--- a/lib/csapi/joining.h
+++ b/Quotient/csapi/joining.h
@@ -4,9 +4,8 @@
 
 #pragma once
 
-#include "csapi/definitions/third_party_signed.h"
-
-#include "jobs/basejob.h"
+#include <Quotient/csapi/definitions/third_party_signed.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/keys.cpp b/Quotient/csapi/keys.cpp
similarity index 100%
rename from lib/csapi/keys.cpp
rename to Quotient/csapi/keys.cpp
diff --git a/lib/csapi/keys.h b/Quotient/csapi/keys.h
similarity index 98%
rename from lib/csapi/keys.h
rename to Quotient/csapi/keys.h
index b5e398594..2f82ddb89 100644
--- a/lib/csapi/keys.h
+++ b/Quotient/csapi/keys.h
@@ -4,12 +4,10 @@
 
 #pragma once
 
-#include "csapi/definitions/cross_signing_key.h"
-#include "csapi/definitions/device_keys.h"
-
-#include "e2ee/e2ee_common.h"
-
-#include "jobs/basejob.h"
+#include <Quotient/csapi/definitions/cross_signing_key.h>
+#include <Quotient/csapi/definitions/device_keys.h>
+#include <Quotient/e2ee/e2ee_common.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/kicking.cpp b/Quotient/csapi/kicking.cpp
similarity index 100%
rename from lib/csapi/kicking.cpp
rename to Quotient/csapi/kicking.cpp
diff --git a/lib/csapi/kicking.h b/Quotient/csapi/kicking.h
similarity index 97%
rename from lib/csapi/kicking.h
rename to Quotient/csapi/kicking.h
index 6ac106e25..8850778a8 100644
--- a/lib/csapi/kicking.h
+++ b/Quotient/csapi/kicking.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/knocking.cpp b/Quotient/csapi/knocking.cpp
similarity index 100%
rename from lib/csapi/knocking.cpp
rename to Quotient/csapi/knocking.cpp
diff --git a/lib/csapi/knocking.h b/Quotient/csapi/knocking.h
similarity index 98%
rename from lib/csapi/knocking.h
rename to Quotient/csapi/knocking.h
index f43033a82..e59d5c578 100644
--- a/lib/csapi/knocking.h
+++ b/Quotient/csapi/knocking.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/leaving.cpp b/Quotient/csapi/leaving.cpp
similarity index 100%
rename from lib/csapi/leaving.cpp
rename to Quotient/csapi/leaving.cpp
diff --git a/lib/csapi/leaving.h b/Quotient/csapi/leaving.h
similarity index 98%
rename from lib/csapi/leaving.h
rename to Quotient/csapi/leaving.h
index 19cac3f0a..760629185 100644
--- a/lib/csapi/leaving.h
+++ b/Quotient/csapi/leaving.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/list_joined_rooms.cpp b/Quotient/csapi/list_joined_rooms.cpp
similarity index 100%
rename from lib/csapi/list_joined_rooms.cpp
rename to Quotient/csapi/list_joined_rooms.cpp
diff --git a/lib/csapi/list_joined_rooms.h b/Quotient/csapi/list_joined_rooms.h
similarity index 96%
rename from lib/csapi/list_joined_rooms.h
rename to Quotient/csapi/list_joined_rooms.h
index aea68afd8..5f2520dfb 100644
--- a/lib/csapi/list_joined_rooms.h
+++ b/Quotient/csapi/list_joined_rooms.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/list_public_rooms.cpp b/Quotient/csapi/list_public_rooms.cpp
similarity index 100%
rename from lib/csapi/list_public_rooms.cpp
rename to Quotient/csapi/list_public_rooms.cpp
diff --git a/lib/csapi/list_public_rooms.h b/Quotient/csapi/list_public_rooms.h
similarity index 98%
rename from lib/csapi/list_public_rooms.h
rename to Quotient/csapi/list_public_rooms.h
index 3b6b91b93..47c6c79a3 100644
--- a/lib/csapi/list_public_rooms.h
+++ b/Quotient/csapi/list_public_rooms.h
@@ -4,9 +4,8 @@
 
 #pragma once
 
-#include "csapi/definitions/public_rooms_response.h"
-
-#include "jobs/basejob.h"
+#include <Quotient/csapi/definitions/public_rooms_response.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/login.cpp b/Quotient/csapi/login.cpp
similarity index 100%
rename from lib/csapi/login.cpp
rename to Quotient/csapi/login.cpp
diff --git a/lib/csapi/login.h b/Quotient/csapi/login.h
similarity index 97%
rename from lib/csapi/login.h
rename to Quotient/csapi/login.h
index b9f14266d..97bc2730d 100644
--- a/lib/csapi/login.h
+++ b/Quotient/csapi/login.h
@@ -4,10 +4,9 @@
 
 #pragma once
 
-#include "csapi/definitions/user_identifier.h"
-#include "csapi/definitions/wellknown/full.h"
-
-#include "jobs/basejob.h"
+#include <Quotient/csapi/definitions/user_identifier.h>
+#include <Quotient/csapi/definitions/wellknown/full.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/logout.cpp b/Quotient/csapi/logout.cpp
similarity index 100%
rename from lib/csapi/logout.cpp
rename to Quotient/csapi/logout.cpp
diff --git a/lib/csapi/logout.h b/Quotient/csapi/logout.h
similarity index 98%
rename from lib/csapi/logout.h
rename to Quotient/csapi/logout.h
index 3f1ac7fad..ac831edb4 100644
--- a/lib/csapi/logout.h
+++ b/Quotient/csapi/logout.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/message_pagination.cpp b/Quotient/csapi/message_pagination.cpp
similarity index 100%
rename from lib/csapi/message_pagination.cpp
rename to Quotient/csapi/message_pagination.cpp
diff --git a/lib/csapi/message_pagination.h b/Quotient/csapi/message_pagination.h
similarity index 98%
rename from lib/csapi/message_pagination.h
rename to Quotient/csapi/message_pagination.h
index b4f3a38a3..6ffb22ddd 100644
--- a/lib/csapi/message_pagination.h
+++ b/Quotient/csapi/message_pagination.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "events/roomevent.h"
-#include "jobs/basejob.h"
+#include <Quotient/events/roomevent.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/notifications.cpp b/Quotient/csapi/notifications.cpp
similarity index 100%
rename from lib/csapi/notifications.cpp
rename to Quotient/csapi/notifications.cpp
diff --git a/lib/csapi/notifications.h b/Quotient/csapi/notifications.h
similarity index 98%
rename from lib/csapi/notifications.h
rename to Quotient/csapi/notifications.h
index ff8aa47f1..59ace290a 100644
--- a/lib/csapi/notifications.h
+++ b/Quotient/csapi/notifications.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "events/event.h"
-#include "jobs/basejob.h"
+#include <Quotient/events/event.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/openid.cpp b/Quotient/csapi/openid.cpp
similarity index 100%
rename from lib/csapi/openid.cpp
rename to Quotient/csapi/openid.cpp
diff --git a/lib/csapi/openid.h b/Quotient/csapi/openid.h
similarity index 95%
rename from lib/csapi/openid.h
rename to Quotient/csapi/openid.h
index 918dce7d3..5125f4408 100644
--- a/lib/csapi/openid.h
+++ b/Quotient/csapi/openid.h
@@ -4,9 +4,8 @@
 
 #pragma once
 
-#include "csapi/definitions/openid_token.h"
-
-#include "jobs/basejob.h"
+#include <Quotient/csapi/definitions/openid_token.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/peeking_events.cpp b/Quotient/csapi/peeking_events.cpp
similarity index 100%
rename from lib/csapi/peeking_events.cpp
rename to Quotient/csapi/peeking_events.cpp
diff --git a/lib/csapi/peeking_events.h b/Quotient/csapi/peeking_events.h
similarity index 96%
rename from lib/csapi/peeking_events.h
rename to Quotient/csapi/peeking_events.h
index a67d2e4af..4489185fa 100644
--- a/lib/csapi/peeking_events.h
+++ b/Quotient/csapi/peeking_events.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "events/roomevent.h"
-#include "jobs/basejob.h"
+#include <Quotient/events/roomevent.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/presence.cpp b/Quotient/csapi/presence.cpp
similarity index 100%
rename from lib/csapi/presence.cpp
rename to Quotient/csapi/presence.cpp
diff --git a/lib/csapi/presence.h b/Quotient/csapi/presence.h
similarity index 98%
rename from lib/csapi/presence.h
rename to Quotient/csapi/presence.h
index 524452058..d84107d42 100644
--- a/lib/csapi/presence.h
+++ b/Quotient/csapi/presence.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/profile.cpp b/Quotient/csapi/profile.cpp
similarity index 100%
rename from lib/csapi/profile.cpp
rename to Quotient/csapi/profile.cpp
diff --git a/lib/csapi/profile.h b/Quotient/csapi/profile.h
similarity index 99%
rename from lib/csapi/profile.h
rename to Quotient/csapi/profile.h
index b00c944b8..0c64d368d 100644
--- a/lib/csapi/profile.h
+++ b/Quotient/csapi/profile.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/pusher.cpp b/Quotient/csapi/pusher.cpp
similarity index 100%
rename from lib/csapi/pusher.cpp
rename to Quotient/csapi/pusher.cpp
diff --git a/lib/csapi/pusher.h b/Quotient/csapi/pusher.h
similarity index 99%
rename from lib/csapi/pusher.h
rename to Quotient/csapi/pusher.h
index 4abcf8569..8e157fe40 100644
--- a/lib/csapi/pusher.h
+++ b/Quotient/csapi/pusher.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/pushrules.cpp b/Quotient/csapi/pushrules.cpp
similarity index 100%
rename from lib/csapi/pushrules.cpp
rename to Quotient/csapi/pushrules.cpp
diff --git a/lib/csapi/pushrules.h b/Quotient/csapi/pushrules.h
similarity index 97%
rename from lib/csapi/pushrules.h
rename to Quotient/csapi/pushrules.h
index aa9460335..ff71a348e 100644
--- a/lib/csapi/pushrules.h
+++ b/Quotient/csapi/pushrules.h
@@ -4,11 +4,10 @@
 
 #pragma once
 
-#include "csapi/definitions/push_condition.h"
-#include "csapi/definitions/push_rule.h"
-#include "csapi/definitions/push_ruleset.h"
-
-#include "jobs/basejob.h"
+#include <Quotient/csapi/definitions/push_condition.h>
+#include <Quotient/csapi/definitions/push_rule.h>
+#include <Quotient/csapi/definitions/push_ruleset.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/read_markers.cpp b/Quotient/csapi/read_markers.cpp
similarity index 100%
rename from lib/csapi/read_markers.cpp
rename to Quotient/csapi/read_markers.cpp
diff --git a/lib/csapi/read_markers.h b/Quotient/csapi/read_markers.h
similarity index 97%
rename from lib/csapi/read_markers.h
rename to Quotient/csapi/read_markers.h
index 1024076fa..3a1b7454d 100644
--- a/lib/csapi/read_markers.h
+++ b/Quotient/csapi/read_markers.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/receipts.cpp b/Quotient/csapi/receipts.cpp
similarity index 100%
rename from lib/csapi/receipts.cpp
rename to Quotient/csapi/receipts.cpp
diff --git a/lib/csapi/receipts.h b/Quotient/csapi/receipts.h
similarity index 97%
rename from lib/csapi/receipts.h
rename to Quotient/csapi/receipts.h
index 91c3e83ff..e7a3e2329 100644
--- a/lib/csapi/receipts.h
+++ b/Quotient/csapi/receipts.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/redaction.cpp b/Quotient/csapi/redaction.cpp
similarity index 100%
rename from lib/csapi/redaction.cpp
rename to Quotient/csapi/redaction.cpp
diff --git a/lib/csapi/redaction.h b/Quotient/csapi/redaction.h
similarity index 98%
rename from lib/csapi/redaction.h
rename to Quotient/csapi/redaction.h
index 2f85793e8..e5ada24d7 100644
--- a/lib/csapi/redaction.h
+++ b/Quotient/csapi/redaction.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/refresh.cpp b/Quotient/csapi/refresh.cpp
similarity index 100%
rename from lib/csapi/refresh.cpp
rename to Quotient/csapi/refresh.cpp
diff --git a/lib/csapi/refresh.h b/Quotient/csapi/refresh.h
similarity index 98%
rename from lib/csapi/refresh.h
rename to Quotient/csapi/refresh.h
index 1fd7f9982..118ddef0f 100644
--- a/lib/csapi/refresh.h
+++ b/Quotient/csapi/refresh.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/registration.cpp b/Quotient/csapi/registration.cpp
similarity index 100%
rename from lib/csapi/registration.cpp
rename to Quotient/csapi/registration.cpp
diff --git a/lib/csapi/registration.h b/Quotient/csapi/registration.h
similarity index 98%
rename from lib/csapi/registration.h
rename to Quotient/csapi/registration.h
index 21d7f9d76..f46af065a 100644
--- a/lib/csapi/registration.h
+++ b/Quotient/csapi/registration.h
@@ -4,12 +4,11 @@
 
 #pragma once
 
-#include "csapi/definitions/auth_data.h"
-#include "csapi/definitions/request_email_validation.h"
-#include "csapi/definitions/request_msisdn_validation.h"
-#include "csapi/definitions/request_token_response.h"
-
-#include "jobs/basejob.h"
+#include <Quotient/csapi/definitions/auth_data.h>
+#include <Quotient/csapi/definitions/request_email_validation.h>
+#include <Quotient/csapi/definitions/request_msisdn_validation.h>
+#include <Quotient/csapi/definitions/request_token_response.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/registration_tokens.cpp b/Quotient/csapi/registration_tokens.cpp
similarity index 100%
rename from lib/csapi/registration_tokens.cpp
rename to Quotient/csapi/registration_tokens.cpp
diff --git a/lib/csapi/registration_tokens.h b/Quotient/csapi/registration_tokens.h
similarity index 97%
rename from lib/csapi/registration_tokens.h
rename to Quotient/csapi/registration_tokens.h
index e3008dd46..8c99e3dfe 100644
--- a/lib/csapi/registration_tokens.h
+++ b/Quotient/csapi/registration_tokens.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/relations.cpp b/Quotient/csapi/relations.cpp
similarity index 100%
rename from lib/csapi/relations.cpp
rename to Quotient/csapi/relations.cpp
diff --git a/lib/csapi/relations.h b/Quotient/csapi/relations.h
similarity index 99%
rename from lib/csapi/relations.h
rename to Quotient/csapi/relations.h
index 5d6efd1c5..233df070e 100644
--- a/lib/csapi/relations.h
+++ b/Quotient/csapi/relations.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "events/roomevent.h"
-#include "jobs/basejob.h"
+#include <Quotient/events/roomevent.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/report_content.cpp b/Quotient/csapi/report_content.cpp
similarity index 100%
rename from lib/csapi/report_content.cpp
rename to Quotient/csapi/report_content.cpp
diff --git a/lib/csapi/report_content.h b/Quotient/csapi/report_content.h
similarity index 96%
rename from lib/csapi/report_content.h
rename to Quotient/csapi/report_content.h
index 8c533c198..41e625c3b 100644
--- a/lib/csapi/report_content.h
+++ b/Quotient/csapi/report_content.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/room_event_by_timestamp.cpp b/Quotient/csapi/room_event_by_timestamp.cpp
similarity index 100%
rename from lib/csapi/room_event_by_timestamp.cpp
rename to Quotient/csapi/room_event_by_timestamp.cpp
diff --git a/lib/csapi/room_event_by_timestamp.h b/Quotient/csapi/room_event_by_timestamp.h
similarity index 98%
rename from lib/csapi/room_event_by_timestamp.h
rename to Quotient/csapi/room_event_by_timestamp.h
index 1355af60a..354efbabd 100644
--- a/lib/csapi/room_event_by_timestamp.h
+++ b/Quotient/csapi/room_event_by_timestamp.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/room_send.cpp b/Quotient/csapi/room_send.cpp
similarity index 100%
rename from lib/csapi/room_send.cpp
rename to Quotient/csapi/room_send.cpp
diff --git a/lib/csapi/room_send.h b/Quotient/csapi/room_send.h
similarity index 98%
rename from lib/csapi/room_send.h
rename to Quotient/csapi/room_send.h
index abe5f2074..208a7ab87 100644
--- a/lib/csapi/room_send.h
+++ b/Quotient/csapi/room_send.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/room_state.cpp b/Quotient/csapi/room_state.cpp
similarity index 100%
rename from lib/csapi/room_state.cpp
rename to Quotient/csapi/room_state.cpp
diff --git a/lib/csapi/room_state.h b/Quotient/csapi/room_state.h
similarity index 98%
rename from lib/csapi/room_state.h
rename to Quotient/csapi/room_state.h
index a00b09470..8e32a1573 100644
--- a/lib/csapi/room_state.h
+++ b/Quotient/csapi/room_state.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/room_upgrades.cpp b/Quotient/csapi/room_upgrades.cpp
similarity index 100%
rename from lib/csapi/room_upgrades.cpp
rename to Quotient/csapi/room_upgrades.cpp
diff --git a/lib/csapi/room_upgrades.h b/Quotient/csapi/room_upgrades.h
similarity index 95%
rename from lib/csapi/room_upgrades.h
rename to Quotient/csapi/room_upgrades.h
index 0432f6673..8dba4dc44 100644
--- a/lib/csapi/room_upgrades.h
+++ b/Quotient/csapi/room_upgrades.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/rooms.cpp b/Quotient/csapi/rooms.cpp
similarity index 100%
rename from lib/csapi/rooms.cpp
rename to Quotient/csapi/rooms.cpp
diff --git a/lib/csapi/rooms.h b/Quotient/csapi/rooms.h
similarity index 98%
rename from lib/csapi/rooms.h
rename to Quotient/csapi/rooms.h
index 7823a1b0a..7d441fe52 100644
--- a/lib/csapi/rooms.h
+++ b/Quotient/csapi/rooms.h
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "events/roomevent.h"
-#include "events/stateevent.h"
-#include "jobs/basejob.h"
+#include <Quotient/events/roomevent.h>
+#include <Quotient/events/stateevent.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/search.cpp b/Quotient/csapi/search.cpp
similarity index 100%
rename from lib/csapi/search.cpp
rename to Quotient/csapi/search.cpp
diff --git a/lib/csapi/search.h b/Quotient/csapi/search.h
similarity index 98%
rename from lib/csapi/search.h
rename to Quotient/csapi/search.h
index 30095f323..14f6b1065 100644
--- a/lib/csapi/search.h
+++ b/Quotient/csapi/search.h
@@ -4,11 +4,10 @@
 
 #pragma once
 
-#include "csapi/definitions/room_event_filter.h"
-
-#include "events/roomevent.h"
-#include "events/stateevent.h"
-#include "jobs/basejob.h"
+#include <Quotient/csapi/definitions/room_event_filter.h>
+#include <Quotient/events/roomevent.h>
+#include <Quotient/events/stateevent.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/space_hierarchy.cpp b/Quotient/csapi/space_hierarchy.cpp
similarity index 100%
rename from lib/csapi/space_hierarchy.cpp
rename to Quotient/csapi/space_hierarchy.cpp
diff --git a/lib/csapi/space_hierarchy.h b/Quotient/csapi/space_hierarchy.h
similarity index 98%
rename from lib/csapi/space_hierarchy.h
rename to Quotient/csapi/space_hierarchy.h
index e5da6df24..850ef03c9 100644
--- a/lib/csapi/space_hierarchy.h
+++ b/Quotient/csapi/space_hierarchy.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "events/stateevent.h"
-#include "jobs/basejob.h"
+#include <Quotient/events/stateevent.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/sso_login_redirect.cpp b/Quotient/csapi/sso_login_redirect.cpp
similarity index 100%
rename from lib/csapi/sso_login_redirect.cpp
rename to Quotient/csapi/sso_login_redirect.cpp
diff --git a/lib/csapi/sso_login_redirect.h b/Quotient/csapi/sso_login_redirect.h
similarity index 98%
rename from lib/csapi/sso_login_redirect.h
rename to Quotient/csapi/sso_login_redirect.h
index f4f81c1ee..f322b17d1 100644
--- a/lib/csapi/sso_login_redirect.h
+++ b/Quotient/csapi/sso_login_redirect.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/tags.cpp b/Quotient/csapi/tags.cpp
similarity index 100%
rename from lib/csapi/tags.cpp
rename to Quotient/csapi/tags.cpp
diff --git a/lib/csapi/tags.h b/Quotient/csapi/tags.h
similarity index 99%
rename from lib/csapi/tags.h
rename to Quotient/csapi/tags.h
index f4250674b..539062973 100644
--- a/lib/csapi/tags.h
+++ b/Quotient/csapi/tags.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/third_party_lookup.cpp b/Quotient/csapi/third_party_lookup.cpp
similarity index 100%
rename from lib/csapi/third_party_lookup.cpp
rename to Quotient/csapi/third_party_lookup.cpp
diff --git a/lib/csapi/third_party_lookup.h b/Quotient/csapi/third_party_lookup.h
similarity index 96%
rename from lib/csapi/third_party_lookup.h
rename to Quotient/csapi/third_party_lookup.h
index 55f70b326..72993b2d8 100644
--- a/lib/csapi/third_party_lookup.h
+++ b/Quotient/csapi/third_party_lookup.h
@@ -4,11 +4,10 @@
 
 #pragma once
 
-#include "application-service/definitions/location.h"
-#include "application-service/definitions/protocol.h"
-#include "application-service/definitions/user.h"
-
-#include "jobs/basejob.h"
+#include <Quotient/csapi/../application-service/definitions/location.h>
+#include <Quotient/csapi/../application-service/definitions/protocol.h>
+#include <Quotient/csapi/../application-service/definitions/user.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/third_party_membership.cpp b/Quotient/csapi/third_party_membership.cpp
similarity index 100%
rename from lib/csapi/third_party_membership.cpp
rename to Quotient/csapi/third_party_membership.cpp
diff --git a/lib/csapi/third_party_membership.h b/Quotient/csapi/third_party_membership.h
similarity index 98%
rename from lib/csapi/third_party_membership.h
rename to Quotient/csapi/third_party_membership.h
index a517ce471..a1f55e5e3 100644
--- a/lib/csapi/third_party_membership.h
+++ b/Quotient/csapi/third_party_membership.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/threads_list.cpp b/Quotient/csapi/threads_list.cpp
similarity index 100%
rename from lib/csapi/threads_list.cpp
rename to Quotient/csapi/threads_list.cpp
diff --git a/lib/csapi/threads_list.h b/Quotient/csapi/threads_list.h
similarity index 97%
rename from lib/csapi/threads_list.h
rename to Quotient/csapi/threads_list.h
index defc00e21..1b5587375 100644
--- a/lib/csapi/threads_list.h
+++ b/Quotient/csapi/threads_list.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "events/roomevent.h"
-#include "jobs/basejob.h"
+#include <Quotient/events/roomevent.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/to_device.cpp b/Quotient/csapi/to_device.cpp
similarity index 100%
rename from lib/csapi/to_device.cpp
rename to Quotient/csapi/to_device.cpp
diff --git a/lib/csapi/to_device.h b/Quotient/csapi/to_device.h
similarity index 97%
rename from lib/csapi/to_device.h
rename to Quotient/csapi/to_device.h
index 548283372..0bd99fcb8 100644
--- a/lib/csapi/to_device.h
+++ b/Quotient/csapi/to_device.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/typing.cpp b/Quotient/csapi/typing.cpp
similarity index 100%
rename from lib/csapi/typing.cpp
rename to Quotient/csapi/typing.cpp
diff --git a/lib/csapi/typing.h b/Quotient/csapi/typing.h
similarity index 97%
rename from lib/csapi/typing.h
rename to Quotient/csapi/typing.h
index 234e91b01..b9bb04fa2 100644
--- a/lib/csapi/typing.h
+++ b/Quotient/csapi/typing.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/users.cpp b/Quotient/csapi/users.cpp
similarity index 100%
rename from lib/csapi/users.cpp
rename to Quotient/csapi/users.cpp
diff --git a/lib/csapi/users.h b/Quotient/csapi/users.h
similarity index 98%
rename from lib/csapi/users.h
rename to Quotient/csapi/users.h
index 3c99758b7..df729a504 100644
--- a/lib/csapi/users.h
+++ b/Quotient/csapi/users.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/versions.cpp b/Quotient/csapi/versions.cpp
similarity index 100%
rename from lib/csapi/versions.cpp
rename to Quotient/csapi/versions.cpp
diff --git a/lib/csapi/versions.h b/Quotient/csapi/versions.h
similarity index 98%
rename from lib/csapi/versions.h
rename to Quotient/csapi/versions.h
index 9f799cb04..050b22eae 100644
--- a/lib/csapi/versions.h
+++ b/Quotient/csapi/versions.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/voip.cpp b/Quotient/csapi/voip.cpp
similarity index 100%
rename from lib/csapi/voip.cpp
rename to Quotient/csapi/voip.cpp
diff --git a/lib/csapi/voip.h b/Quotient/csapi/voip.h
similarity index 96%
rename from lib/csapi/voip.h
rename to Quotient/csapi/voip.h
index 38904f60e..79b9953ad 100644
--- a/lib/csapi/voip.h
+++ b/Quotient/csapi/voip.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/wellknown.cpp b/Quotient/csapi/wellknown.cpp
similarity index 100%
rename from lib/csapi/wellknown.cpp
rename to Quotient/csapi/wellknown.cpp
diff --git a/lib/csapi/wellknown.h b/Quotient/csapi/wellknown.h
similarity index 93%
rename from lib/csapi/wellknown.h
rename to Quotient/csapi/wellknown.h
index 8615191cc..d6143243b 100644
--- a/lib/csapi/wellknown.h
+++ b/Quotient/csapi/wellknown.h
@@ -4,9 +4,8 @@
 
 #pragma once
 
-#include "csapi/definitions/wellknown/full.h"
-
-#include "jobs/basejob.h"
+#include <Quotient/csapi/definitions/wellknown/full.h>
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/csapi/whoami.cpp b/Quotient/csapi/whoami.cpp
similarity index 100%
rename from lib/csapi/whoami.cpp
rename to Quotient/csapi/whoami.cpp
diff --git a/lib/csapi/whoami.h b/Quotient/csapi/whoami.h
similarity index 98%
rename from lib/csapi/whoami.h
rename to Quotient/csapi/whoami.h
index 3451dbc39..a81086d09 100644
--- a/lib/csapi/whoami.h
+++ b/Quotient/csapi/whoami.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
 
diff --git a/lib/database.cpp b/Quotient/database.cpp
similarity index 100%
rename from lib/database.cpp
rename to Quotient/database.cpp
diff --git a/lib/database.h b/Quotient/database.h
similarity index 100%
rename from lib/database.h
rename to Quotient/database.h
diff --git a/lib/e2ee/e2ee_common.cpp b/Quotient/e2ee/e2ee_common.cpp
similarity index 98%
rename from lib/e2ee/e2ee_common.cpp
rename to Quotient/e2ee/e2ee_common.cpp
index 18a952e64..78554a646 100644
--- a/lib/e2ee/e2ee_common.cpp
+++ b/Quotient/e2ee/e2ee_common.cpp
@@ -2,9 +2,9 @@
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include "e2ee/e2ee_common.h"
+#include "e2ee_common.h"
 
-#include "logging.h"
+#include <Quotient/logging.h>
 
 #include <QtCore/QRandomGenerator>
 
diff --git a/lib/e2ee/e2ee_common.h b/Quotient/e2ee/e2ee_common.h
similarity index 99%
rename from lib/e2ee/e2ee_common.h
rename to Quotient/e2ee/e2ee_common.h
index 83b848d72..43b0a592f 100644
--- a/lib/e2ee/e2ee_common.h
+++ b/Quotient/e2ee/e2ee_common.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 #include <QtCore/QMetaType>
 #include <QtCore/QStringBuilder>
@@ -13,7 +13,7 @@
 #include <array>
 
 #ifdef Quotient_E2EE_ENABLED
-#    include "expected.h"
+#    include <Quotient/expected.h>
 
 #    include <olm/error.h>
 #    include <span>
diff --git a/lib/e2ee/qolmaccount.cpp b/Quotient/e2ee/qolmaccount.cpp
similarity index 98%
rename from lib/e2ee/qolmaccount.cpp
rename to Quotient/e2ee/qolmaccount.cpp
index 7ea2ce2e6..31423b451 100644
--- a/lib/e2ee/qolmaccount.cpp
+++ b/Quotient/e2ee/qolmaccount.cpp
@@ -4,11 +4,11 @@
 
 #include "qolmaccount.h"
 
-#include "connection.h"
-#include "e2ee/qolmsession.h"
-#include "e2ee/qolmutility.h"
+#include <Quotient/connection.h>
+#include <Quotient/e2ee/qolmsession.h>
+#include <Quotient/e2ee/qolmutility.h>
 
-#include "csapi/keys.h"
+#include <Quotient/csapi/keys.h>
 
 #include <QtCore/QRandomGenerator>
 
diff --git a/lib/e2ee/qolmaccount.h b/Quotient/e2ee/qolmaccount.h
similarity index 97%
rename from lib/e2ee/qolmaccount.h
rename to Quotient/e2ee/qolmaccount.h
index 300fab880..6eae09141 100644
--- a/lib/e2ee/qolmaccount.h
+++ b/Quotient/e2ee/qolmaccount.h
@@ -5,10 +5,10 @@
 
 #pragma once
 
-#include "e2ee/e2ee_common.h"
-#include "e2ee/qolmmessage.h"
+#include <Quotient/e2ee/e2ee_common.h>
+#include <Quotient/e2ee/qolmmessage.h>
 
-#include "csapi/keys.h"
+#include <Quotient/csapi/keys.h>
 
 #include <QtCore/QObject>
 
diff --git a/lib/e2ee/qolminboundsession.cpp b/Quotient/e2ee/qolminboundsession.cpp
similarity index 100%
rename from lib/e2ee/qolminboundsession.cpp
rename to Quotient/e2ee/qolminboundsession.cpp
diff --git a/lib/e2ee/qolminboundsession.h b/Quotient/e2ee/qolminboundsession.h
similarity index 98%
rename from lib/e2ee/qolminboundsession.h
rename to Quotient/e2ee/qolminboundsession.h
index 17ad21df0..4d51a08a1 100644
--- a/lib/e2ee/qolminboundsession.h
+++ b/Quotient/e2ee/qolminboundsession.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "e2ee/e2ee_common.h"
+#include <Quotient/e2ee/e2ee_common.h>
 
 struct OlmInboundGroupSession;
 
diff --git a/lib/e2ee/qolmmessage.cpp b/Quotient/e2ee/qolmmessage.cpp
similarity index 96%
rename from lib/e2ee/qolmmessage.cpp
rename to Quotient/e2ee/qolmmessage.cpp
index b9cb8bd2f..9618626a7 100644
--- a/lib/e2ee/qolmmessage.cpp
+++ b/Quotient/e2ee/qolmmessage.cpp
@@ -4,7 +4,7 @@
 
 #include "qolmmessage.h"
 
-#include "util.h"
+#include <Quotient/util.h>
 
 using namespace Quotient;
 
diff --git a/lib/e2ee/qolmmessage.h b/Quotient/e2ee/qolmmessage.h
similarity index 96%
rename from lib/e2ee/qolmmessage.h
rename to Quotient/e2ee/qolmmessage.h
index ea73b3e34..d2640b93d 100644
--- a/lib/e2ee/qolmmessage.h
+++ b/Quotient/e2ee/qolmmessage.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "quotient_export.h"
+#include <Quotient/quotient_export.h>
 
 #include <QtCore/QByteArray>
 #include <qobjectdefs.h>
diff --git a/lib/e2ee/qolmoutboundsession.cpp b/Quotient/e2ee/qolmoutboundsession.cpp
similarity index 99%
rename from lib/e2ee/qolmoutboundsession.cpp
rename to Quotient/e2ee/qolmoutboundsession.cpp
index 37b7eb183..9331050a3 100644
--- a/lib/e2ee/qolmoutboundsession.cpp
+++ b/Quotient/e2ee/qolmoutboundsession.cpp
@@ -4,7 +4,7 @@
 
 #include "qolmoutboundsession.h"
 
-#include "logging.h"
+#include <Quotient/logging.h>
 
 #include <olm/olm.h>
 
diff --git a/lib/e2ee/qolmoutboundsession.h b/Quotient/e2ee/qolmoutboundsession.h
similarity index 97%
rename from lib/e2ee/qolmoutboundsession.h
rename to Quotient/e2ee/qolmoutboundsession.h
index b02bb0ce8..807671521 100644
--- a/lib/e2ee/qolmoutboundsession.h
+++ b/Quotient/e2ee/qolmoutboundsession.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "e2ee/e2ee_common.h"
+#include <Quotient/e2ee/e2ee_common.h>
 
 struct OlmOutboundGroupSession;
 
diff --git a/lib/e2ee/qolmsession.cpp b/Quotient/e2ee/qolmsession.cpp
similarity index 99%
rename from lib/e2ee/qolmsession.cpp
rename to Quotient/e2ee/qolmsession.cpp
index 6a24bc7b4..ca091dc77 100644
--- a/lib/e2ee/qolmsession.cpp
+++ b/Quotient/e2ee/qolmsession.cpp
@@ -4,7 +4,7 @@
 
 #include "qolmsession.h"
 
-#include "logging.h"
+#include <Quotient/logging.h>
 
 #include <cstring>
 #include <olm/olm.h>
diff --git a/lib/e2ee/qolmsession.h b/Quotient/e2ee/qolmsession.h
similarity index 96%
rename from lib/e2ee/qolmsession.h
rename to Quotient/e2ee/qolmsession.h
index 92b9f7cf6..d715e4958 100644
--- a/lib/e2ee/qolmsession.h
+++ b/Quotient/e2ee/qolmsession.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "e2ee/e2ee_common.h"
-#include "e2ee/qolmmessage.h"
+#include <Quotient/e2ee/e2ee_common.h>
+#include <Quotient/e2ee/qolmmessage.h>
 
 struct OlmSession;
 
diff --git a/lib/e2ee/qolmutility.cpp b/Quotient/e2ee/qolmutility.cpp
similarity index 97%
rename from lib/e2ee/qolmutility.cpp
rename to Quotient/e2ee/qolmutility.cpp
index 27149e187..a1cb0d066 100644
--- a/lib/e2ee/qolmutility.cpp
+++ b/Quotient/e2ee/qolmutility.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include "e2ee/qolmutility.h"
+#include "qolmutility.h"
 
 #include "e2ee_common.h"
 
diff --git a/lib/e2ee/qolmutility.h b/Quotient/e2ee/qolmutility.h
similarity index 97%
rename from lib/e2ee/qolmutility.h
rename to Quotient/e2ee/qolmutility.h
index 9d01fefd1..48c59b26c 100644
--- a/lib/e2ee/qolmutility.h
+++ b/Quotient/e2ee/qolmutility.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "util.h"
+#include <Quotient/util.h>
 
 #include <olm/error.h>
 
diff --git a/lib/eventitem.cpp b/Quotient/eventitem.cpp
similarity index 100%
rename from lib/eventitem.cpp
rename to Quotient/eventitem.cpp
diff --git a/lib/eventitem.h b/Quotient/eventitem.h
similarity index 100%
rename from lib/eventitem.h
rename to Quotient/eventitem.h
diff --git a/lib/events/accountdataevents.h b/Quotient/events/accountdataevents.h
similarity index 100%
rename from lib/events/accountdataevents.h
rename to Quotient/events/accountdataevents.h
diff --git a/lib/events/callevents.cpp b/Quotient/events/callevents.cpp
similarity index 98%
rename from lib/events/callevents.cpp
rename to Quotient/events/callevents.cpp
index 3873614dc..03f7c4be0 100644
--- a/lib/events/callevents.cpp
+++ b/Quotient/events/callevents.cpp
@@ -3,7 +3,7 @@
 
 #include "callevents.h"
 
-#include "logging.h"
+#include <Quotient/logging.h>
 
 using namespace Quotient;
 
diff --git a/lib/events/callevents.h b/Quotient/events/callevents.h
similarity index 100%
rename from lib/events/callevents.h
rename to Quotient/events/callevents.h
diff --git a/lib/events/directchatevent.cpp b/Quotient/events/directchatevent.cpp
similarity index 100%
rename from lib/events/directchatevent.cpp
rename to Quotient/events/directchatevent.cpp
diff --git a/lib/events/directchatevent.h b/Quotient/events/directchatevent.h
similarity index 100%
rename from lib/events/directchatevent.h
rename to Quotient/events/directchatevent.h
diff --git a/lib/events/encryptedevent.cpp b/Quotient/events/encryptedevent.cpp
similarity index 98%
rename from lib/events/encryptedevent.cpp
rename to Quotient/events/encryptedevent.cpp
index d23cab7eb..ffe4ffa17 100644
--- a/lib/events/encryptedevent.cpp
+++ b/Quotient/events/encryptedevent.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "encryptedevent.h"
-#include "e2ee/e2ee_common.h"
+#include <Quotient/e2ee/e2ee_common.h>
 
 using namespace Quotient;
 
diff --git a/lib/events/encryptedevent.h b/Quotient/events/encryptedevent.h
similarity index 100%
rename from lib/events/encryptedevent.h
rename to Quotient/events/encryptedevent.h
diff --git a/lib/events/encryptionevent.cpp b/Quotient/events/encryptionevent.cpp
similarity index 96%
rename from lib/events/encryptionevent.cpp
rename to Quotient/events/encryptionevent.cpp
index ab9ca0063..a8b99676b 100644
--- a/lib/events/encryptionevent.cpp
+++ b/Quotient/events/encryptionevent.cpp
@@ -3,9 +3,9 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "encryptionevent.h"
-#include "logging.h"
+#include <Quotient/logging.h>
 
-#include "e2ee/e2ee_common.h"
+#include <Quotient/e2ee/e2ee_common.h>
 
 using namespace Quotient;
 
diff --git a/lib/events/encryptionevent.h b/Quotient/events/encryptionevent.h
similarity index 97%
rename from lib/events/encryptionevent.h
rename to Quotient/events/encryptionevent.h
index 4bf7459c9..21ad95a4a 100644
--- a/lib/events/encryptionevent.h
+++ b/Quotient/events/encryptionevent.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "quotient_common.h"
+#include <Quotient/quotient_common.h>
 #include "stateevent.h"
 
 namespace Quotient {
diff --git a/lib/events/event.cpp b/Quotient/events/event.cpp
similarity index 98%
rename from lib/events/event.cpp
rename to Quotient/events/event.cpp
index 3d4f2276e..1346802b7 100644
--- a/lib/events/event.cpp
+++ b/Quotient/events/event.cpp
@@ -4,7 +4,7 @@
 #include "event.h"
 
 #include "callevents.h"
-#include "logging.h"
+#include <Quotient/logging.h>
 #include "stateevent.h"
 
 #include <QtCore/QJsonDocument>
diff --git a/lib/events/event.h b/Quotient/events/event.h
similarity index 99%
rename from lib/events/event.h
rename to Quotient/events/event.h
index d10186418..af353cac2 100644
--- a/lib/events/event.h
+++ b/Quotient/events/event.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "converters.h"
-#include "function_traits.h"
+#include <Quotient/converters.h>
+#include <Quotient/function_traits.h>
 #include "single_key_value.h"
 
 namespace Quotient {
diff --git a/lib/events/eventcontent.cpp b/Quotient/events/eventcontent.cpp
similarity index 98%
rename from lib/events/eventcontent.cpp
rename to Quotient/events/eventcontent.cpp
index 222ec90d7..e82e6ee9e 100644
--- a/lib/events/eventcontent.cpp
+++ b/Quotient/events/eventcontent.cpp
@@ -3,8 +3,8 @@
 
 #include "eventcontent.h"
 
-#include "converters.h"
-#include "logging.h"
+#include <Quotient/converters.h>
+#include <Quotient/logging.h>
 
 #include <QtCore/QMimeDatabase>
 #include <QtCore/QFileInfo>
diff --git a/lib/events/eventcontent.h b/Quotient/events/eventcontent.h
similarity index 99%
rename from lib/events/eventcontent.h
rename to Quotient/events/eventcontent.h
index 109ae85ae..8ce99282b 100644
--- a/lib/events/eventcontent.h
+++ b/Quotient/events/eventcontent.h
@@ -7,7 +7,7 @@
 // message events as well as other events (e.g., avatars).
 
 #include "filesourceinfo.h"
-#include "quotient_export.h"
+#include <Quotient/quotient_export.h>
 
 #include <QtCore/QJsonObject>
 #include <QtCore/QMetaType>
diff --git a/lib/events/eventloader.h b/Quotient/events/eventloader.h
similarity index 100%
rename from lib/events/eventloader.h
rename to Quotient/events/eventloader.h
diff --git a/lib/events/eventrelation.cpp b/Quotient/events/eventrelation.cpp
similarity index 100%
rename from lib/events/eventrelation.cpp
rename to Quotient/events/eventrelation.cpp
diff --git a/lib/events/eventrelation.h b/Quotient/events/eventrelation.h
similarity index 97%
rename from lib/events/eventrelation.h
rename to Quotient/events/eventrelation.h
index 1c2a7a14c..403ece19a 100644
--- a/lib/events/eventrelation.h
+++ b/Quotient/events/eventrelation.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 
diff --git a/lib/events/filesourceinfo.cpp b/Quotient/events/filesourceinfo.cpp
similarity index 98%
rename from lib/events/filesourceinfo.cpp
rename to Quotient/events/filesourceinfo.cpp
index 715413733..ac3cad36e 100644
--- a/lib/events/filesourceinfo.cpp
+++ b/Quotient/events/filesourceinfo.cpp
@@ -4,11 +4,11 @@
 
 #include "filesourceinfo.h"
 
-#include "logging.h"
-#include "util.h"
+#include <Quotient/logging.h>
+#include <Quotient/util.h>
 
 #ifdef Quotient_E2EE_ENABLED
-#    include "e2ee/e2ee_common.h"
+#    include <Quotient/e2ee/e2ee_common.h>
 
 #    include <QtCore/QCryptographicHash>
 
diff --git a/lib/events/filesourceinfo.h b/Quotient/events/filesourceinfo.h
similarity index 98%
rename from lib/events/filesourceinfo.h
rename to Quotient/events/filesourceinfo.h
index 8f7e3cbe5..49321c118 100644
--- a/lib/events/filesourceinfo.h
+++ b/Quotient/events/filesourceinfo.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 #include <array>
 
diff --git a/lib/events/keyverificationevent.h b/Quotient/events/keyverificationevent.h
similarity index 100%
rename from lib/events/keyverificationevent.h
rename to Quotient/events/keyverificationevent.h
diff --git a/lib/events/reactionevent.h b/Quotient/events/reactionevent.h
similarity index 100%
rename from lib/events/reactionevent.h
rename to Quotient/events/reactionevent.h
diff --git a/lib/events/receiptevent.cpp b/Quotient/events/receiptevent.cpp
similarity index 98%
rename from lib/events/receiptevent.cpp
rename to Quotient/events/receiptevent.cpp
index d8f9fa0be..156dade62 100644
--- a/lib/events/receiptevent.cpp
+++ b/Quotient/events/receiptevent.cpp
@@ -20,7 +20,7 @@ Example of a Receipt Event:
 
 #include "receiptevent.h"
 
-#include "logging.h"
+#include <Quotient/logging.h>
 
 using namespace Quotient;
 
diff --git a/lib/events/receiptevent.h b/Quotient/events/receiptevent.h
similarity index 100%
rename from lib/events/receiptevent.h
rename to Quotient/events/receiptevent.h
diff --git a/lib/events/redactionevent.h b/Quotient/events/redactionevent.h
similarity index 100%
rename from lib/events/redactionevent.h
rename to Quotient/events/redactionevent.h
diff --git a/lib/events/roomavatarevent.h b/Quotient/events/roomavatarevent.h
similarity index 100%
rename from lib/events/roomavatarevent.h
rename to Quotient/events/roomavatarevent.h
diff --git a/lib/events/roomcanonicalaliasevent.h b/Quotient/events/roomcanonicalaliasevent.h
similarity index 100%
rename from lib/events/roomcanonicalaliasevent.h
rename to Quotient/events/roomcanonicalaliasevent.h
diff --git a/lib/events/roomcreateevent.cpp b/Quotient/events/roomcreateevent.cpp
similarity index 100%
rename from lib/events/roomcreateevent.cpp
rename to Quotient/events/roomcreateevent.cpp
diff --git a/lib/events/roomcreateevent.h b/Quotient/events/roomcreateevent.h
similarity index 93%
rename from lib/events/roomcreateevent.h
rename to Quotient/events/roomcreateevent.h
index 5968e187e..e73c02dac 100644
--- a/lib/events/roomcreateevent.h
+++ b/Quotient/events/roomcreateevent.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "stateevent.h"
-#include "quotient_common.h"
+#include <Quotient/quotient_common.h>
 
 namespace Quotient {
 class QUOTIENT_API RoomCreateEvent : public StateEvent {
diff --git a/lib/events/roomevent.cpp b/Quotient/events/roomevent.cpp
similarity index 98%
rename from lib/events/roomevent.cpp
rename to Quotient/events/roomevent.cpp
index 126b73b69..09c1f6228 100644
--- a/lib/events/roomevent.cpp
+++ b/Quotient/events/roomevent.cpp
@@ -3,7 +3,7 @@
 
 #include "roomevent.h"
 
-#include "logging.h"
+#include <Quotient/logging.h>
 #include "redactionevent.h"
 
 using namespace Quotient;
diff --git a/lib/events/roomevent.h b/Quotient/events/roomevent.h
similarity index 100%
rename from lib/events/roomevent.h
rename to Quotient/events/roomevent.h
diff --git a/lib/events/roomkeyevent.h b/Quotient/events/roomkeyevent.h
similarity index 100%
rename from lib/events/roomkeyevent.h
rename to Quotient/events/roomkeyevent.h
diff --git a/lib/events/roommemberevent.cpp b/Quotient/events/roommemberevent.cpp
similarity index 99%
rename from lib/events/roommemberevent.cpp
rename to Quotient/events/roommemberevent.cpp
index 4e7eae1bb..017e90b83 100644
--- a/lib/events/roommemberevent.cpp
+++ b/Quotient/events/roommemberevent.cpp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "roommemberevent.h"
-#include "logging.h"
+#include <Quotient/logging.h>
 
 namespace Quotient {
 template <>
diff --git a/lib/events/roommemberevent.h b/Quotient/events/roommemberevent.h
similarity index 98%
rename from lib/events/roommemberevent.h
rename to Quotient/events/roommemberevent.h
index 9f0631366..11e452512 100644
--- a/lib/events/roommemberevent.h
+++ b/Quotient/events/roommemberevent.h
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "stateevent.h"
-#include "quotient_common.h"
+#include <Quotient/quotient_common.h>
 
 namespace Quotient {
 class QUOTIENT_API MemberEventContent {
diff --git a/lib/events/roommessageevent.cpp b/Quotient/events/roommessageevent.cpp
similarity index 99%
rename from lib/events/roommessageevent.cpp
rename to Quotient/events/roommessageevent.cpp
index 0d9500873..73d43c366 100644
--- a/lib/events/roommessageevent.cpp
+++ b/Quotient/events/roommessageevent.cpp
@@ -5,8 +5,8 @@
 
 #include "roommessageevent.h"
 
-#include "logging.h"
-#include "events/eventrelation.h"
+#include <Quotient/logging.h>
+#include "eventrelation.h"
 
 #include <QtCore/QFileInfo>
 #include <QtCore/QMimeDatabase>
diff --git a/lib/events/roommessageevent.h b/Quotient/events/roommessageevent.h
similarity index 100%
rename from lib/events/roommessageevent.h
rename to Quotient/events/roommessageevent.h
diff --git a/lib/events/roompowerlevelsevent.cpp b/Quotient/events/roompowerlevelsevent.cpp
similarity index 100%
rename from lib/events/roompowerlevelsevent.cpp
rename to Quotient/events/roompowerlevelsevent.cpp
diff --git a/lib/events/roompowerlevelsevent.h b/Quotient/events/roompowerlevelsevent.h
similarity index 100%
rename from lib/events/roompowerlevelsevent.h
rename to Quotient/events/roompowerlevelsevent.h
diff --git a/lib/events/roomtombstoneevent.cpp b/Quotient/events/roomtombstoneevent.cpp
similarity index 100%
rename from lib/events/roomtombstoneevent.cpp
rename to Quotient/events/roomtombstoneevent.cpp
diff --git a/lib/events/roomtombstoneevent.h b/Quotient/events/roomtombstoneevent.h
similarity index 100%
rename from lib/events/roomtombstoneevent.h
rename to Quotient/events/roomtombstoneevent.h
diff --git a/lib/events/simplestateevents.h b/Quotient/events/simplestateevents.h
similarity index 100%
rename from lib/events/simplestateevents.h
rename to Quotient/events/simplestateevents.h
diff --git a/lib/events/single_key_value.h b/Quotient/events/single_key_value.h
similarity index 97%
rename from lib/events/single_key_value.h
rename to Quotient/events/single_key_value.h
index ca2bd331a..03cf7d84f 100644
--- a/lib/events/single_key_value.h
+++ b/Quotient/events/single_key_value.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 
diff --git a/lib/events/stateevent.cpp b/Quotient/events/stateevent.cpp
similarity index 97%
rename from lib/events/stateevent.cpp
rename to Quotient/events/stateevent.cpp
index b024fca2b..752c0320e 100644
--- a/lib/events/stateevent.cpp
+++ b/Quotient/events/stateevent.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "stateevent.h"
-#include "logging.h"
+#include <Quotient/logging.h>
 
 using namespace Quotient;
 
diff --git a/lib/events/stateevent.h b/Quotient/events/stateevent.h
similarity index 100%
rename from lib/events/stateevent.h
rename to Quotient/events/stateevent.h
diff --git a/lib/events/stickerevent.h b/Quotient/events/stickerevent.h
similarity index 100%
rename from lib/events/stickerevent.h
rename to Quotient/events/stickerevent.h
diff --git a/lib/events/typingevent.h b/Quotient/events/typingevent.h
similarity index 100%
rename from lib/events/typingevent.h
rename to Quotient/events/typingevent.h
diff --git a/lib/eventstats.cpp b/Quotient/eventstats.cpp
similarity index 100%
rename from lib/eventstats.cpp
rename to Quotient/eventstats.cpp
diff --git a/lib/eventstats.h b/Quotient/eventstats.h
similarity index 100%
rename from lib/eventstats.h
rename to Quotient/eventstats.h
diff --git a/lib/expected.h b/Quotient/expected.h
similarity index 100%
rename from lib/expected.h
rename to Quotient/expected.h
diff --git a/lib/function_traits.cpp b/Quotient/function_traits.cpp
similarity index 100%
rename from lib/function_traits.cpp
rename to Quotient/function_traits.cpp
diff --git a/lib/function_traits.h b/Quotient/function_traits.h
similarity index 100%
rename from lib/function_traits.h
rename to Quotient/function_traits.h
diff --git a/lib/identity/definitions/request_email_validation.h b/Quotient/identity/definitions/request_email_validation.h
similarity index 98%
rename from lib/identity/definitions/request_email_validation.h
rename to Quotient/identity/definitions/request_email_validation.h
index 875495058..455417d0c 100644
--- a/lib/identity/definitions/request_email_validation.h
+++ b/Quotient/identity/definitions/request_email_validation.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 
diff --git a/lib/identity/definitions/request_msisdn_validation.h b/Quotient/identity/definitions/request_msisdn_validation.h
similarity index 98%
rename from lib/identity/definitions/request_msisdn_validation.h
rename to Quotient/identity/definitions/request_msisdn_validation.h
index d2ea463ff..4ea29f8e8 100644
--- a/lib/identity/definitions/request_msisdn_validation.h
+++ b/Quotient/identity/definitions/request_msisdn_validation.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 
 namespace Quotient {
 
diff --git a/lib/jobs/basejob.cpp b/Quotient/jobs/basejob.cpp
similarity index 99%
rename from lib/jobs/basejob.cpp
rename to Quotient/jobs/basejob.cpp
index be18e5e65..a788842dd 100644
--- a/lib/jobs/basejob.cpp
+++ b/Quotient/jobs/basejob.cpp
@@ -4,7 +4,7 @@
 
 #include "basejob.h"
 
-#include "connectiondata.h"
+#include <Quotient/connectiondata.h>
 
 #include <QtCore/QRegularExpression>
 #include <QtCore/QTimer>
diff --git a/lib/jobs/basejob.h b/Quotient/jobs/basejob.h
similarity index 98%
rename from lib/jobs/basejob.h
rename to Quotient/jobs/basejob.h
index 54662793f..07a702558 100644
--- a/lib/jobs/basejob.h
+++ b/Quotient/jobs/basejob.h
@@ -5,9 +5,9 @@
 #pragma once
 
 #include "requestdata.h"
-#include "logging.h"
-#include "converters.h" // Common for csapi/ headers even though not used here
-#include "quotient_common.h" // For DECL_DEPRECATED_ENUMERATOR
+#include <Quotient/logging.h>
+#include <Quotient/converters.h> // Common for csapi/ headers even though not used here
+#include <Quotient/quotient_common.h> // For DECL_DEPRECATED_ENUMERATOR
 
 #include <QtCore/QObject>
 #include <QtCore/QStringBuilder>
diff --git a/lib/jobs/downloadfilejob.cpp b/Quotient/jobs/downloadfilejob.cpp
similarity index 99%
rename from lib/jobs/downloadfilejob.cpp
rename to Quotient/jobs/downloadfilejob.cpp
index df1549605..81fa157b6 100644
--- a/lib/jobs/downloadfilejob.cpp
+++ b/Quotient/jobs/downloadfilejob.cpp
@@ -8,7 +8,7 @@
 #include <QtNetwork/QNetworkReply>
 
 #ifdef Quotient_E2EE_ENABLED
-#    include "events/filesourceinfo.h"
+#    include <Quotient/events/filesourceinfo.h>
 
 #    include <QtCore/QCryptographicHash>
 #endif
diff --git a/lib/jobs/downloadfilejob.h b/Quotient/jobs/downloadfilejob.h
similarity index 91%
rename from lib/jobs/downloadfilejob.h
rename to Quotient/jobs/downloadfilejob.h
index cbbfd244f..c212d05be 100644
--- a/lib/jobs/downloadfilejob.h
+++ b/Quotient/jobs/downloadfilejob.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include "csapi/content-repo.h"
+#include <Quotient/csapi/content-repo.h>
 
-#include "events/filesourceinfo.h"
+#include <Quotient/events/filesourceinfo.h>
 
 namespace Quotient {
 class QUOTIENT_API DownloadFileJob : public GetContentJob {
diff --git a/lib/jobs/mediathumbnailjob.cpp b/Quotient/jobs/mediathumbnailjob.cpp
similarity index 100%
rename from lib/jobs/mediathumbnailjob.cpp
rename to Quotient/jobs/mediathumbnailjob.cpp
diff --git a/lib/jobs/mediathumbnailjob.h b/Quotient/jobs/mediathumbnailjob.h
similarity index 95%
rename from lib/jobs/mediathumbnailjob.h
rename to Quotient/jobs/mediathumbnailjob.h
index c9f6da35f..0a0fde495 100644
--- a/lib/jobs/mediathumbnailjob.h
+++ b/Quotient/jobs/mediathumbnailjob.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "csapi/content-repo.h"
+#include <Quotient/csapi/content-repo.h>
 
 #include <QtGui/QPixmap>
 
diff --git a/lib/jobs/requestdata.cpp b/Quotient/jobs/requestdata.cpp
similarity index 100%
rename from lib/jobs/requestdata.cpp
rename to Quotient/jobs/requestdata.cpp
diff --git a/lib/jobs/requestdata.h b/Quotient/jobs/requestdata.h
similarity index 97%
rename from lib/jobs/requestdata.h
rename to Quotient/jobs/requestdata.h
index accc8f71d..122204b0b 100644
--- a/lib/jobs/requestdata.h
+++ b/Quotient/jobs/requestdata.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "util.h"
+#include <Quotient/util.h>
 
 class QJsonObject;
 class QJsonArray;
diff --git a/lib/jobs/syncjob.cpp b/Quotient/jobs/syncjob.cpp
similarity index 100%
rename from lib/jobs/syncjob.cpp
rename to Quotient/jobs/syncjob.cpp
diff --git a/lib/jobs/syncjob.h b/Quotient/jobs/syncjob.h
similarity index 100%
rename from lib/jobs/syncjob.h
rename to Quotient/jobs/syncjob.h
diff --git a/lib/keyverificationsession.cpp b/Quotient/keyverificationsession.cpp
similarity index 100%
rename from lib/keyverificationsession.cpp
rename to Quotient/keyverificationsession.cpp
diff --git a/lib/keyverificationsession.h b/Quotient/keyverificationsession.h
similarity index 100%
rename from lib/keyverificationsession.h
rename to Quotient/keyverificationsession.h
diff --git a/lib/logging.cpp b/Quotient/logging.cpp
similarity index 100%
rename from lib/logging.cpp
rename to Quotient/logging.cpp
diff --git a/lib/logging.h b/Quotient/logging.h
similarity index 100%
rename from lib/logging.h
rename to Quotient/logging.h
diff --git a/lib/mxcreply.cpp b/Quotient/mxcreply.cpp
similarity index 100%
rename from lib/mxcreply.cpp
rename to Quotient/mxcreply.cpp
diff --git a/lib/mxcreply.h b/Quotient/mxcreply.h
similarity index 100%
rename from lib/mxcreply.h
rename to Quotient/mxcreply.h
diff --git a/lib/networkaccessmanager.cpp b/Quotient/networkaccessmanager.cpp
similarity index 100%
rename from lib/networkaccessmanager.cpp
rename to Quotient/networkaccessmanager.cpp
diff --git a/lib/networkaccessmanager.h b/Quotient/networkaccessmanager.h
similarity index 100%
rename from lib/networkaccessmanager.h
rename to Quotient/networkaccessmanager.h
diff --git a/lib/networksettings.cpp b/Quotient/networksettings.cpp
similarity index 100%
rename from lib/networksettings.cpp
rename to Quotient/networksettings.cpp
diff --git a/lib/networksettings.h b/Quotient/networksettings.h
similarity index 100%
rename from lib/networksettings.h
rename to Quotient/networksettings.h
diff --git a/lib/omittable.h b/Quotient/omittable.h
similarity index 100%
rename from lib/omittable.h
rename to Quotient/omittable.h
diff --git a/lib/qt_connection_util.h b/Quotient/qt_connection_util.h
similarity index 100%
rename from lib/qt_connection_util.h
rename to Quotient/qt_connection_util.h
diff --git a/lib/quotient_common.h b/Quotient/quotient_common.h
similarity index 100%
rename from lib/quotient_common.h
rename to Quotient/quotient_common.h
diff --git a/lib/quotient_export.h b/Quotient/quotient_export.h
similarity index 100%
rename from lib/quotient_export.h
rename to Quotient/quotient_export.h
diff --git a/lib/room.cpp b/Quotient/room.cpp
similarity index 100%
rename from lib/room.cpp
rename to Quotient/room.cpp
diff --git a/lib/room.h b/Quotient/room.h
similarity index 100%
rename from lib/room.h
rename to Quotient/room.h
diff --git a/lib/roomstateview.cpp b/Quotient/roomstateview.cpp
similarity index 100%
rename from lib/roomstateview.cpp
rename to Quotient/roomstateview.cpp
diff --git a/lib/roomstateview.h b/Quotient/roomstateview.h
similarity index 100%
rename from lib/roomstateview.h
rename to Quotient/roomstateview.h
diff --git a/lib/settings.cpp b/Quotient/settings.cpp
similarity index 100%
rename from lib/settings.cpp
rename to Quotient/settings.cpp
diff --git a/lib/settings.h b/Quotient/settings.h
similarity index 100%
rename from lib/settings.h
rename to Quotient/settings.h
diff --git a/lib/ssosession.cpp b/Quotient/ssosession.cpp
similarity index 100%
rename from lib/ssosession.cpp
rename to Quotient/ssosession.cpp
diff --git a/lib/ssosession.h b/Quotient/ssosession.h
similarity index 100%
rename from lib/ssosession.h
rename to Quotient/ssosession.h
diff --git a/lib/syncdata.cpp b/Quotient/syncdata.cpp
similarity index 100%
rename from lib/syncdata.cpp
rename to Quotient/syncdata.cpp
diff --git a/lib/syncdata.h b/Quotient/syncdata.h
similarity index 100%
rename from lib/syncdata.h
rename to Quotient/syncdata.h
diff --git a/lib/uri.cpp b/Quotient/uri.cpp
similarity index 100%
rename from lib/uri.cpp
rename to Quotient/uri.cpp
diff --git a/lib/uri.h b/Quotient/uri.h
similarity index 100%
rename from lib/uri.h
rename to Quotient/uri.h
diff --git a/lib/uriresolver.cpp b/Quotient/uriresolver.cpp
similarity index 100%
rename from lib/uriresolver.cpp
rename to Quotient/uriresolver.cpp
diff --git a/lib/uriresolver.h b/Quotient/uriresolver.h
similarity index 100%
rename from lib/uriresolver.h
rename to Quotient/uriresolver.h
diff --git a/lib/user.cpp b/Quotient/user.cpp
similarity index 100%
rename from lib/user.cpp
rename to Quotient/user.cpp
diff --git a/lib/user.h b/Quotient/user.h
similarity index 100%
rename from lib/user.h
rename to Quotient/user.h
diff --git a/lib/util.cpp b/Quotient/util.cpp
similarity index 100%
rename from lib/util.cpp
rename to Quotient/util.cpp
diff --git a/lib/util.h b/Quotient/util.h
similarity index 100%
rename from lib/util.h
rename to Quotient/util.h
diff --git a/README.md b/README.md
index cd6094d53..b37400016 100644
--- a/README.md
+++ b/README.md
@@ -282,7 +282,7 @@ where
 - `<category>` is one of: `main`, `jobs`, `jobs.sync`, `jobs.thumbnail`,
   `events`, `events.state` (covering both the "usual" room state and account
   data), `events.members`, `events.messages`, `events.ephemeral`, `database`,
-  `e2ee` and `profiler` - you can always find the full list in `lib/logging.cpp`;
+  `e2ee` and `profiler` - you can always find the full list in `Quotient/logging.cpp`;
 - `<level>` is one of `debug`, `info`, and `warning`;
 - `<flag>` is either `true` or `false`.
 
diff --git a/autotests/callcandidateseventtest.cpp b/autotests/callcandidateseventtest.cpp
index 679fbed4d..4b170ba48 100644
--- a/autotests/callcandidateseventtest.cpp
+++ b/autotests/callcandidateseventtest.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include "events/callevents.h"
+#include <Quotient/events/callevents.h>
 
 #include <QtTest/QtTest>
 
diff --git a/autotests/testfilecrypto.cpp b/autotests/testfilecrypto.cpp
index 29521060c..3fd497542 100644
--- a/autotests/testfilecrypto.cpp
+++ b/autotests/testfilecrypto.cpp
@@ -4,7 +4,7 @@
 
 #include "testfilecrypto.h"
 
-#include "events/filesourceinfo.h"
+#include <Quotient/events/filesourceinfo.h>
 
 #include <qtest.h>
 
diff --git a/autotests/testgroupsession.cpp b/autotests/testgroupsession.cpp
index f25360837..70e968118 100644
--- a/autotests/testgroupsession.cpp
+++ b/autotests/testgroupsession.cpp
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "testgroupsession.h"
-#include "e2ee/qolminboundsession.h"
-#include "e2ee/qolmoutboundsession.h"
+#include <Quotient/e2ee/qolminboundsession.h>
+#include <Quotient/e2ee/qolmoutboundsession.h>
 
 using namespace Quotient;
 
diff --git a/autotests/testkeyverification.cpp b/autotests/testkeyverification.cpp
index c32951fad..39f9f12f4 100644
--- a/autotests/testkeyverification.cpp
+++ b/autotests/testkeyverification.cpp
@@ -6,7 +6,7 @@
 #include <QTest>
 #include "testutils.h"
 #include <QtCore/QDateTime>
-#include <e2ee/qolmaccount.h>
+#include <Quotient/e2ee/qolmaccount.h>
 #include "olm/sas.h"
 
 class TestKeyVerificationSession : public QObject
diff --git a/autotests/testolmaccount.cpp b/autotests/testolmaccount.cpp
index 1d4ac1507..390235d18 100644
--- a/autotests/testolmaccount.cpp
+++ b/autotests/testolmaccount.cpp
@@ -5,14 +5,14 @@
 
 #include "testolmaccount.h"
 
-#include <connection.h>
-#include <csapi/joining.h>
-#include <e2ee/qolmaccount.h>
-#include <e2ee/qolmutility.h>
-#include <events/encryptionevent.h>
-#include <events/filesourceinfo.h>
-#include <networkaccessmanager.h>
-#include <room.h>
+#include <Quotient/connection.h>
+#include <Quotient/csapi/joining.h>
+#include <Quotient/e2ee/qolmaccount.h>
+#include <Quotient/e2ee/qolmutility.h>
+#include <Quotient/events/encryptionevent.h>
+#include <Quotient/events/filesourceinfo.h>
+#include <Quotient/networkaccessmanager.h>
+#include <Quotient/room.h>
 
 #include "testutils.h"
 
diff --git a/autotests/testolmsession.cpp b/autotests/testolmsession.cpp
index 4078ee678..932549b91 100644
--- a/autotests/testolmsession.cpp
+++ b/autotests/testolmsession.cpp
@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include "e2ee/qolmsession.h"
-#include "e2ee/qolmaccount.h"
+#include <Quotient/e2ee/qolmsession.h>
+#include <Quotient/e2ee/qolmaccount.h>
 #include "testolmsession.h"
 
 using namespace Quotient;
diff --git a/autotests/testolmutility.cpp b/autotests/testolmutility.cpp
index abf7fc6ed..9e8524bbd 100644
--- a/autotests/testolmutility.cpp
+++ b/autotests/testolmutility.cpp
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "testolmutility.h"
-#include "e2ee/qolmaccount.h"
-#include "e2ee/qolmutility.h"
+#include <Quotient/e2ee/qolmaccount.h>
+#include <Quotient/e2ee/qolmutility.h>
 
 #include <olm/olm.h>
 
diff --git a/autotests/testutils.h b/autotests/testutils.h
index d967454fa..8b615ab9b 100644
--- a/autotests/testutils.h
+++ b/autotests/testutils.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <connection.h>
-#include <networkaccessmanager.h>
+#include <Quotient/connection.h>
+#include <Quotient/networkaccessmanager.h>
 
 #include <QtTest/QSignalSpy>
 
diff --git a/autotests/utiltests.cpp b/autotests/utiltests.cpp
index e3ec63d03..ce808d0a4 100644
--- a/autotests/utiltests.cpp
+++ b/autotests/utiltests.cpp
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2021 Kitsune Ral <kitsune-ral@users.sf.net>
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include "omittable.h"
+#include <Quotient/omittable.h>
 
 #include <QtTest/QtTest>
 
diff --git a/cmake/QuotientConfig.cmake.in b/cmake/QuotientConfig.cmake.in
index 798fa87a6..1ddd0e209 100644
--- a/cmake/QuotientConfig.cmake.in
+++ b/cmake/QuotientConfig.cmake.in
@@ -3,3 +3,9 @@ include(CMakeFindDependencyMacro)
 @FIND_DEPS@
 
 include("${CMAKE_CURRENT_LIST_DIR}/QuotientTargets.cmake")
+
+if (NOT QUOTIENT_FORCE_NAMESPACED_INCLUDES)
+    get_target_property(_include_dir @PROJECT_NAME@ INTERFACE_INCLUDE_DIRECTORIES)
+    list(APPEND _include_dir "${_include_dir}/Quotient")
+    set_target_properties(@PROJECT_NAME@ PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_include_dir}")
+endif()
diff --git a/gtad/data.h.mustache b/gtad/data.h.mustache
index 1b511262f..3d5fd9853 100644
--- a/gtad/data.h.mustache
+++ b/gtad/data.h.mustache
@@ -4,7 +4,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later
 }}{{>preamble}}
 #pragma once
 
-#include "converters.h"
+#include <Quotient/converters.h>
 {{#imports}}
 #include {{_}}{{/imports}}
 
diff --git a/gtad/gtad.yaml b/gtad/gtad.yaml
index 174ae8789..d71e23207 100644
--- a/gtad/gtad.yaml
+++ b/gtad/gtad.yaml
@@ -47,7 +47,7 @@ analyzer:
   types:
   - +set: &UseOmittable
       useOmittable:
-      omittedValue: 'none' # Quotient::none in lib/omittable.h
+      omittedValue: 'none' # Quotient::none in Quotient/omittable.h
     +on:
     - integer:
       - int64: qint64
@@ -87,17 +87,17 @@ analyzer:
         +on:
         - /state_event.yaml$/:
             type: StateEventPtr
-            imports: '"events/stateevent.h"'
+            imports: '<Quotient/events/stateevent.h>'
         - /(room|client)_event.yaml$/:
             type: RoomEventPtr
-            imports: '"events/roomevent.h"'
+            imports: '<Quotient/events/roomevent.h>'
         - /event(_without_room_id)?.yaml$/:
             type: EventPtr
-            imports: '"events/event.h"'
+            imports: '<Quotient/events/event.h>'
       - +set:
           # This renderer applies to everything actually $ref'ed
           # (not substituted)
-          _importRenderer: '"{{#segments}}{{_}}{{#_join}}/{{/_join}}{{/segments}}.h"'
+          _importRenderer: '<Quotient/{{#segments}}{{_}}{{#_join}}/{{/_join}}{{/segments}}.h>'
         +on:
         - '/^(\./)?definitions/request_email_validation.yaml$/':
             title: EmailValidationData
@@ -130,7 +130,7 @@ analyzer:
       - RoomFilter: # A structure inside Filter, same story as with *_filter.yaml
       - OneTimeKeys:
           type: OneTimeKeys
-          imports: '"e2ee/e2ee_common.h"'
+          imports: '<Quotient/e2ee/e2ee_common.h>'
       - //: *UseOmittable
     - array:
       - string: QStringList
@@ -139,7 +139,7 @@ analyzer:
         - /^Notification|Result|ChildRoomsChunk$/: "std::vector<{{1}}>"
         - /^StrippedChildStateEvent$|state_event.yaml$/:
             type: StateEvents
-            imports: '"events/stateevent.h"' # For StrippedChildStateEvent
+            imports: '<Quotient/events/stateevent.h>' # For StrippedChildStateEvent
         - /(room|client)_event.yaml$/: RoomEvents
         - /event(_without_room_id)?.yaml$/: Events
       - //: "QVector<{{1}}>"
diff --git a/gtad/operation.h.mustache b/gtad/operation.h.mustache
index 4f983cba5..3aca29654 100644
--- a/gtad/operation.h.mustache
+++ b/gtad/operation.h.mustache
@@ -4,7 +4,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later
 }}{{>preamble}}
 #pragma once
 
-#include "jobs/basejob.h"
+#include <Quotient/jobs/basejob.h>
 {{#imports}}
 #include {{_}}{{/imports}}
 {{#operations.producesNonJson?}}
diff --git a/quotest/quotest.cpp b/quotest/quotest.cpp
index 447234e63..7baddbb4d 100644
--- a/quotest/quotest.cpp
+++ b/quotest/quotest.cpp
@@ -1,21 +1,21 @@
 // SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include "connection.h"
-#include "room.h"
-#include "user.h"
-#include "uriresolver.h"
-#include "networkaccessmanager.h"
-#include "qt_connection_util.h"
-
-#include "csapi/joining.h"
-#include "csapi/leaving.h"
-#include "csapi/room_send.h"
-
-#include "events/reactionevent.h"
-#include "events/redactionevent.h"
-#include "events/simplestateevents.h"
-#include "events/roommemberevent.h"
+#include <Quotient/connection.h>
+#include <Quotient/room.h>
+#include <Quotient/user.h>
+#include <Quotient/uriresolver.h>
+#include <Quotient/networkaccessmanager.h>
+#include <Quotient/qt_connection_util.h>
+
+#include <Quotient/csapi/joining.h>
+#include <Quotient/csapi/leaving.h>
+#include <Quotient/csapi/room_send.h>
+
+#include <Quotient/events/reactionevent.h>
+#include <Quotient/events/redactionevent.h>
+#include <Quotient/events/simplestateevents.h>
+#include <Quotient/events/roommemberevent.h>
 
 #include <QtTest/QSignalSpy>
 #include <QtCore/QCoreApplication>