diff --git a/etebase_server/asgi.py b/etebase_server/asgi.py
index 25dbf77..5a7ffa7 100644
--- a/etebase_server/asgi.py
+++ b/etebase_server/asgi.py
@@ -7,7 +7,7 @@ django_application = get_asgi_application()
 
 
 def create_application():
-    from etebase_fastapi.main import create_application
+    from etebase_server.fastapi.main import create_application
 
     app = create_application()
 
diff --git a/etebase_fastapi/__init__.py b/etebase_server/fastapi/__init__.py
similarity index 100%
rename from etebase_fastapi/__init__.py
rename to etebase_server/fastapi/__init__.py
diff --git a/etebase_fastapi/db_hack.py b/etebase_server/fastapi/db_hack.py
similarity index 100%
rename from etebase_fastapi/db_hack.py
rename to etebase_server/fastapi/db_hack.py
diff --git a/etebase_fastapi/dependencies.py b/etebase_server/fastapi/dependencies.py
similarity index 100%
rename from etebase_fastapi/dependencies.py
rename to etebase_server/fastapi/dependencies.py
diff --git a/etebase_fastapi/exceptions.py b/etebase_server/fastapi/exceptions.py
similarity index 100%
rename from etebase_fastapi/exceptions.py
rename to etebase_server/fastapi/exceptions.py
diff --git a/etebase_fastapi/main.py b/etebase_server/fastapi/main.py
similarity index 97%
rename from etebase_fastapi/main.py
rename to etebase_server/fastapi/main.py
index 3e0c1e9..74798a4 100644
--- a/etebase_fastapi/main.py
+++ b/etebase_server/fastapi/main.py
@@ -43,7 +43,7 @@ def create_application(prefix="", middlewares=[]):
     app.include_router(websocket_router, prefix=f"{BASE_PATH}/ws", tags=["websocket"])
 
     if settings.DEBUG:
-        from etebase_fastapi.routers.test_reset_view import test_reset_view_router
+        from .routers.test_reset_view import test_reset_view_router
 
         app.include_router(test_reset_view_router, prefix=f"{BASE_PATH}/test/authentication")
 
diff --git a/etebase_fastapi/msgpack.py b/etebase_server/fastapi/msgpack.py
similarity index 100%
rename from etebase_fastapi/msgpack.py
rename to etebase_server/fastapi/msgpack.py
diff --git a/etebase_fastapi/redis.py b/etebase_server/fastapi/redis.py
similarity index 100%
rename from etebase_fastapi/redis.py
rename to etebase_server/fastapi/redis.py
diff --git a/etebase_fastapi/routers/__init__.py b/etebase_server/fastapi/routers/__init__.py
similarity index 100%
rename from etebase_fastapi/routers/__init__.py
rename to etebase_server/fastapi/routers/__init__.py
diff --git a/etebase_fastapi/routers/authentication.py b/etebase_server/fastapi/routers/authentication.py
similarity index 100%
rename from etebase_fastapi/routers/authentication.py
rename to etebase_server/fastapi/routers/authentication.py
diff --git a/etebase_fastapi/routers/collection.py b/etebase_server/fastapi/routers/collection.py
similarity index 100%
rename from etebase_fastapi/routers/collection.py
rename to etebase_server/fastapi/routers/collection.py
diff --git a/etebase_fastapi/routers/invitation.py b/etebase_server/fastapi/routers/invitation.py
similarity index 100%
rename from etebase_fastapi/routers/invitation.py
rename to etebase_server/fastapi/routers/invitation.py
diff --git a/etebase_fastapi/routers/member.py b/etebase_server/fastapi/routers/member.py
similarity index 100%
rename from etebase_fastapi/routers/member.py
rename to etebase_server/fastapi/routers/member.py
diff --git a/etebase_fastapi/routers/test_reset_view.py b/etebase_server/fastapi/routers/test_reset_view.py
similarity index 100%
rename from etebase_fastapi/routers/test_reset_view.py
rename to etebase_server/fastapi/routers/test_reset_view.py
diff --git a/etebase_fastapi/routers/websocket.py b/etebase_server/fastapi/routers/websocket.py
similarity index 100%
rename from etebase_fastapi/routers/websocket.py
rename to etebase_server/fastapi/routers/websocket.py
diff --git a/etebase_fastapi/sendfile/LICENSE b/etebase_server/fastapi/sendfile/LICENSE
similarity index 100%
rename from etebase_fastapi/sendfile/LICENSE
rename to etebase_server/fastapi/sendfile/LICENSE
diff --git a/etebase_fastapi/sendfile/README.md b/etebase_server/fastapi/sendfile/README.md
similarity index 100%
rename from etebase_fastapi/sendfile/README.md
rename to etebase_server/fastapi/sendfile/README.md
diff --git a/etebase_fastapi/sendfile/__init__.py b/etebase_server/fastapi/sendfile/__init__.py
similarity index 100%
rename from etebase_fastapi/sendfile/__init__.py
rename to etebase_server/fastapi/sendfile/__init__.py
diff --git a/etebase_fastapi/sendfile/backends/__init__.py b/etebase_server/fastapi/sendfile/backends/__init__.py
similarity index 100%
rename from etebase_fastapi/sendfile/backends/__init__.py
rename to etebase_server/fastapi/sendfile/backends/__init__.py
diff --git a/etebase_fastapi/sendfile/backends/mod_wsgi.py b/etebase_server/fastapi/sendfile/backends/mod_wsgi.py
similarity index 100%
rename from etebase_fastapi/sendfile/backends/mod_wsgi.py
rename to etebase_server/fastapi/sendfile/backends/mod_wsgi.py
diff --git a/etebase_fastapi/sendfile/backends/nginx.py b/etebase_server/fastapi/sendfile/backends/nginx.py
similarity index 100%
rename from etebase_fastapi/sendfile/backends/nginx.py
rename to etebase_server/fastapi/sendfile/backends/nginx.py
diff --git a/etebase_fastapi/sendfile/backends/simple.py b/etebase_server/fastapi/sendfile/backends/simple.py
similarity index 100%
rename from etebase_fastapi/sendfile/backends/simple.py
rename to etebase_server/fastapi/sendfile/backends/simple.py
diff --git a/etebase_fastapi/sendfile/backends/xsendfile.py b/etebase_server/fastapi/sendfile/backends/xsendfile.py
similarity index 100%
rename from etebase_fastapi/sendfile/backends/xsendfile.py
rename to etebase_server/fastapi/sendfile/backends/xsendfile.py
diff --git a/etebase_fastapi/sendfile/utils.py b/etebase_server/fastapi/sendfile/utils.py
similarity index 100%
rename from etebase_fastapi/sendfile/utils.py
rename to etebase_server/fastapi/sendfile/utils.py
diff --git a/etebase_fastapi/stoken_handler.py b/etebase_server/fastapi/stoken_handler.py
similarity index 100%
rename from etebase_fastapi/stoken_handler.py
rename to etebase_server/fastapi/stoken_handler.py
diff --git a/etebase_fastapi/utils.py b/etebase_server/fastapi/utils.py
similarity index 100%
rename from etebase_fastapi/utils.py
rename to etebase_server/fastapi/utils.py