diff --git a/packages/server/src/server/application/Application.ts b/packages/server/src/application/Application.ts
similarity index 100%
rename from packages/server/src/server/application/Application.ts
rename to packages/server/src/application/Application.ts
diff --git a/packages/server/src/server/application/Bootstrap.ts b/packages/server/src/application/Bootstrap.ts
similarity index 100%
rename from packages/server/src/server/application/Bootstrap.ts
rename to packages/server/src/application/Bootstrap.ts
diff --git a/packages/server/src/server/application/IApplication.ts b/packages/server/src/application/IApplication.ts
similarity index 100%
rename from packages/server/src/server/application/IApplication.ts
rename to packages/server/src/application/IApplication.ts
diff --git a/packages/server/src/server/application/IBootstrap.ts b/packages/server/src/application/IBootstrap.ts
similarity index 100%
rename from packages/server/src/server/application/IBootstrap.ts
rename to packages/server/src/application/IBootstrap.ts
diff --git a/packages/server/src/server/application/IConfig.ts b/packages/server/src/application/IConfig.ts
similarity index 100%
rename from packages/server/src/server/application/IConfig.ts
rename to packages/server/src/application/IConfig.ts
diff --git a/packages/server/src/server/application/index.ts b/packages/server/src/application/index.ts
similarity index 100%
rename from packages/server/src/server/application/index.ts
rename to packages/server/src/application/index.ts
diff --git a/packages/server/src/server/bootstrap.ts b/packages/server/src/bootstrap.ts
similarity index 100%
rename from packages/server/src/server/bootstrap.ts
rename to packages/server/src/bootstrap.ts
diff --git a/packages/server/src/common/IAPIDef.ts b/packages/server/src/common/IAPIDef.ts
deleted file mode 100644
index d115a97..0000000
--- a/packages/server/src/common/IAPIDef.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-export interface IAPIDef {
-  '/auth/register': {
-    'post': {
-      body: {
-        username: string
-        password: string
-      }
-    }
-  }
-  '/auth/login': {
-    'post': {
-      body: {
-        username: string
-        password: string
-      }
-    }
-  }
-  '/auth/logout': {
-    'get': {}
-  },
-  '/users/password': {
-    'post': {
-      body: {
-        oldPassword: string
-        newPassword: string
-      }
-    }
-  }
-  '/users/profile': {
-    'get': {
-      response: {
-        id: number
-      }
-    }
-  }
-}
diff --git a/packages/server/src/common/REST.ts b/packages/server/src/common/REST.ts
deleted file mode 100644
index 12d2789..0000000
--- a/packages/server/src/common/REST.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export type IMethod = 'get'
- | 'post'
- | 'put'
- | 'delete'
- | 'patch'
- | 'head'
- | 'options'
-
-export interface IRoutes {
-  // has to be any because otherwise TypeScript will start
-  // throwing error and interfaces without an index signature
-  // would not be usable
-  [route: string]: any
-}
-
-export interface IRoute {
-  params: any
-  query: any
-  body: any
-  response: any
-}
diff --git a/packages/server/src/server/config.ts b/packages/server/src/config.ts
similarity index 100%
rename from packages/server/src/server/config.ts
rename to packages/server/src/config.ts
diff --git a/packages/server/src/server/database/Database.ts b/packages/server/src/database/Database.ts
similarity index 100%
rename from packages/server/src/server/database/Database.ts
rename to packages/server/src/database/Database.ts
diff --git a/packages/server/src/server/database/IDatabase.ts b/packages/server/src/database/IDatabase.ts
similarity index 100%
rename from packages/server/src/server/database/IDatabase.ts
rename to packages/server/src/database/IDatabase.ts
diff --git a/packages/server/src/server/database/ITransactionManager.ts b/packages/server/src/database/ITransactionManager.ts
similarity index 100%
rename from packages/server/src/server/database/ITransactionManager.ts
rename to packages/server/src/database/ITransactionManager.ts
diff --git a/packages/server/src/server/database/TransactionManager.ts b/packages/server/src/database/TransactionManager.ts
similarity index 100%
rename from packages/server/src/server/database/TransactionManager.ts
rename to packages/server/src/database/TransactionManager.ts
diff --git a/packages/server/src/server/database/index.test.ts b/packages/server/src/database/index.test.ts
similarity index 100%
rename from packages/server/src/server/database/index.test.ts
rename to packages/server/src/database/index.test.ts
diff --git a/packages/server/src/server/database/index.ts b/packages/server/src/database/index.ts
similarity index 100%
rename from packages/server/src/server/database/index.ts
rename to packages/server/src/database/index.ts
diff --git a/packages/server/src/server/entities/Session.ts b/packages/server/src/entities/Session.ts
similarity index 100%
rename from packages/server/src/server/entities/Session.ts
rename to packages/server/src/entities/Session.ts
diff --git a/packages/server/src/server/entities/User.ts b/packages/server/src/entities/User.ts
similarity index 100%
rename from packages/server/src/server/entities/User.ts
rename to packages/server/src/entities/User.ts
diff --git a/packages/server/src/server/entities/UserEmail.ts b/packages/server/src/entities/UserEmail.ts
similarity index 100%
rename from packages/server/src/server/entities/UserEmail.ts
rename to packages/server/src/entities/UserEmail.ts
diff --git a/packages/server/src/server/logger/ILogger.ts b/packages/server/src/logger/ILogger.ts
similarity index 100%
rename from packages/server/src/server/logger/ILogger.ts
rename to packages/server/src/logger/ILogger.ts
diff --git a/packages/server/src/server/logger/ILoggerFactory.ts b/packages/server/src/logger/ILoggerFactory.ts
similarity index 100%
rename from packages/server/src/server/logger/ILoggerFactory.ts
rename to packages/server/src/logger/ILoggerFactory.ts
diff --git a/packages/server/src/server/logger/LoggerFactory.test.ts b/packages/server/src/logger/LoggerFactory.test.ts
similarity index 100%
rename from packages/server/src/server/logger/LoggerFactory.test.ts
rename to packages/server/src/logger/LoggerFactory.test.ts
diff --git a/packages/server/src/server/logger/LoggerFactory.ts b/packages/server/src/logger/LoggerFactory.ts
similarity index 100%
rename from packages/server/src/server/logger/LoggerFactory.ts
rename to packages/server/src/logger/LoggerFactory.ts
diff --git a/packages/server/src/server/logger/SqlLogger.ts b/packages/server/src/logger/SqlLogger.ts
similarity index 100%
rename from packages/server/src/server/logger/SqlLogger.ts
rename to packages/server/src/logger/SqlLogger.ts
diff --git a/packages/server/src/server/logger/index.ts b/packages/server/src/logger/index.ts
similarity index 100%
rename from packages/server/src/server/logger/index.ts
rename to packages/server/src/logger/index.ts
diff --git a/packages/server/src/server/middleware/Authenticator.test.ts b/packages/server/src/middleware/Authenticator.test.ts
similarity index 100%
rename from packages/server/src/server/middleware/Authenticator.test.ts
rename to packages/server/src/middleware/Authenticator.test.ts
diff --git a/packages/server/src/server/middleware/Authenticator.ts b/packages/server/src/middleware/Authenticator.ts
similarity index 100%
rename from packages/server/src/server/middleware/Authenticator.ts
rename to packages/server/src/middleware/Authenticator.ts
diff --git a/packages/server/src/server/middleware/ErrorApiHandler.ts b/packages/server/src/middleware/ErrorApiHandler.ts
similarity index 100%
rename from packages/server/src/server/middleware/ErrorApiHandler.ts
rename to packages/server/src/middleware/ErrorApiHandler.ts
diff --git a/packages/server/src/server/middleware/ErrorPageHandler.ts b/packages/server/src/middleware/ErrorPageHandler.ts
similarity index 100%
rename from packages/server/src/server/middleware/ErrorPageHandler.ts
rename to packages/server/src/middleware/ErrorPageHandler.ts
diff --git a/packages/server/src/server/middleware/IErrorHandler.ts b/packages/server/src/middleware/IErrorHandler.ts
similarity index 100%
rename from packages/server/src/server/middleware/IErrorHandler.ts
rename to packages/server/src/middleware/IErrorHandler.ts
diff --git a/packages/server/src/server/middleware/IHandler.ts b/packages/server/src/middleware/IHandler.ts
similarity index 100%
rename from packages/server/src/server/middleware/IHandler.ts
rename to packages/server/src/middleware/IHandler.ts
diff --git a/packages/server/src/server/middleware/IMiddleware.ts b/packages/server/src/middleware/IMiddleware.ts
similarity index 100%
rename from packages/server/src/server/middleware/IMiddleware.ts
rename to packages/server/src/middleware/IMiddleware.ts
diff --git a/packages/server/src/server/middleware/IPromiseHandler.ts b/packages/server/src/middleware/IPromiseHandler.ts
similarity index 100%
rename from packages/server/src/server/middleware/IPromiseHandler.ts
rename to packages/server/src/middleware/IPromiseHandler.ts
diff --git a/packages/server/src/server/middleware/RequestLogger.ts b/packages/server/src/middleware/RequestLogger.ts
similarity index 100%
rename from packages/server/src/server/middleware/RequestLogger.ts
rename to packages/server/src/middleware/RequestLogger.ts
diff --git a/packages/server/src/server/middleware/Session.ts b/packages/server/src/middleware/Session.ts
similarity index 100%
rename from packages/server/src/server/middleware/Session.ts
rename to packages/server/src/middleware/Session.ts
diff --git a/packages/server/src/server/middleware/Transaction.ts b/packages/server/src/middleware/Transaction.ts
similarity index 100%
rename from packages/server/src/server/middleware/Transaction.ts
rename to packages/server/src/middleware/Transaction.ts
diff --git a/packages/server/src/server/middleware/csrf.ts b/packages/server/src/middleware/csrf.ts
similarity index 100%
rename from packages/server/src/server/middleware/csrf.ts
rename to packages/server/src/middleware/csrf.ts
diff --git a/packages/server/src/server/middleware/ensureLoggedIn.test.ts b/packages/server/src/middleware/ensureLoggedIn.test.ts
similarity index 100%
rename from packages/server/src/server/middleware/ensureLoggedIn.test.ts
rename to packages/server/src/middleware/ensureLoggedIn.test.ts
diff --git a/packages/server/src/server/middleware/ensureLoggedIn.ts b/packages/server/src/middleware/ensureLoggedIn.ts
similarity index 100%
rename from packages/server/src/server/middleware/ensureLoggedIn.ts
rename to packages/server/src/middleware/ensureLoggedIn.ts
diff --git a/packages/server/src/server/middleware/handlePromise.ts b/packages/server/src/middleware/handlePromise.ts
similarity index 100%
rename from packages/server/src/server/middleware/handlePromise.ts
rename to packages/server/src/middleware/handlePromise.ts
diff --git a/packages/server/src/server/middleware/index.ts b/packages/server/src/middleware/index.ts
similarity index 100%
rename from packages/server/src/server/middleware/index.ts
rename to packages/server/src/middleware/index.ts
diff --git a/packages/server/src/server/migrations/1547031984999-user.ts b/packages/server/src/migrations/1547031984999-user.ts
similarity index 100%
rename from packages/server/src/server/migrations/1547031984999-user.ts
rename to packages/server/src/migrations/1547031984999-user.ts
diff --git a/packages/server/src/server/migrations/1547474320589-session.ts b/packages/server/src/migrations/1547474320589-session.ts
similarity index 100%
rename from packages/server/src/server/migrations/1547474320589-session.ts
rename to packages/server/src/migrations/1547474320589-session.ts
diff --git a/packages/server/src/server/migrations/1547480973242-sessionUserId.ts b/packages/server/src/migrations/1547480973242-sessionUserId.ts
similarity index 100%
rename from packages/server/src/server/migrations/1547480973242-sessionUserId.ts
rename to packages/server/src/migrations/1547480973242-sessionUserId.ts
diff --git a/packages/server/src/server/router/AsyncRouter.test.ts b/packages/server/src/router/AsyncRouter.test.ts
similarity index 100%
rename from packages/server/src/server/router/AsyncRouter.test.ts
rename to packages/server/src/router/AsyncRouter.test.ts
diff --git a/packages/server/src/server/router/AsyncRouter.ts b/packages/server/src/router/AsyncRouter.ts
similarity index 100%
rename from packages/server/src/server/router/AsyncRouter.ts
rename to packages/server/src/router/AsyncRouter.ts
diff --git a/packages/server/src/server/router/TransactionalRouter.ts b/packages/server/src/router/TransactionalRouter.ts
similarity index 100%
rename from packages/server/src/server/router/TransactionalRouter.ts
rename to packages/server/src/router/TransactionalRouter.ts
diff --git a/packages/server/src/server/router/index.ts b/packages/server/src/router/index.ts
similarity index 100%
rename from packages/server/src/server/router/index.ts
rename to packages/server/src/router/index.ts
diff --git a/packages/server/src/server/routes/BaseRoute.ts b/packages/server/src/routes/BaseRoute.ts
similarity index 100%
rename from packages/server/src/server/routes/BaseRoute.ts
rename to packages/server/src/routes/BaseRoute.ts
diff --git a/packages/server/src/server/routes/LoginRoutes.test.ts b/packages/server/src/routes/LoginRoutes.test.ts
similarity index 100%
rename from packages/server/src/server/routes/LoginRoutes.test.ts
rename to packages/server/src/routes/LoginRoutes.test.ts
diff --git a/packages/server/src/server/routes/LoginRoutes.ts b/packages/server/src/routes/LoginRoutes.ts
similarity index 100%
rename from packages/server/src/server/routes/LoginRoutes.ts
rename to packages/server/src/routes/LoginRoutes.ts
diff --git a/packages/server/src/server/routes/UserRoutes.test.ts b/packages/server/src/routes/UserRoutes.test.ts
similarity index 100%
rename from packages/server/src/server/routes/UserRoutes.test.ts
rename to packages/server/src/routes/UserRoutes.test.ts
diff --git a/packages/server/src/server/routes/UserRoutes.ts b/packages/server/src/routes/UserRoutes.ts
similarity index 100%
rename from packages/server/src/server/routes/UserRoutes.ts
rename to packages/server/src/routes/UserRoutes.ts
diff --git a/packages/server/src/server/routes/application.tsx b/packages/server/src/routes/application.tsx
similarity index 100%
rename from packages/server/src/server/routes/application.tsx
rename to packages/server/src/routes/application.tsx
diff --git a/packages/server/src/server/routes/index.ts b/packages/server/src/routes/index.ts
similarity index 100%
rename from packages/server/src/server/routes/index.ts
rename to packages/server/src/routes/index.ts
diff --git a/packages/server/src/server/services/BaseService.ts b/packages/server/src/services/BaseService.ts
similarity index 100%
rename from packages/server/src/server/services/BaseService.ts
rename to packages/server/src/services/BaseService.ts
diff --git a/packages/server/src/server/services/ICredentials.ts b/packages/server/src/services/ICredentials.ts
similarity index 100%
rename from packages/server/src/server/services/ICredentials.ts
rename to packages/server/src/services/ICredentials.ts
diff --git a/packages/server/src/server/services/IUser.ts b/packages/server/src/services/IUser.ts
similarity index 100%
rename from packages/server/src/server/services/IUser.ts
rename to packages/server/src/services/IUser.ts
diff --git a/packages/server/src/server/services/IUserService.ts b/packages/server/src/services/IUserService.ts
similarity index 100%
rename from packages/server/src/server/services/IUserService.ts
rename to packages/server/src/services/IUserService.ts
diff --git a/packages/server/src/server/services/UserService.test.ts b/packages/server/src/services/UserService.test.ts
similarity index 100%
rename from packages/server/src/server/services/UserService.test.ts
rename to packages/server/src/services/UserService.test.ts
diff --git a/packages/server/src/server/services/UserService.ts b/packages/server/src/services/UserService.ts
similarity index 100%
rename from packages/server/src/server/services/UserService.ts
rename to packages/server/src/services/UserService.ts
diff --git a/packages/server/src/server/services/index.ts b/packages/server/src/services/index.ts
similarity index 100%
rename from packages/server/src/server/services/index.ts
rename to packages/server/src/services/index.ts
diff --git a/packages/server/src/server/session/ISession.ts b/packages/server/src/session/ISession.ts
similarity index 100%
rename from packages/server/src/server/session/ISession.ts
rename to packages/server/src/session/ISession.ts
diff --git a/packages/server/src/server/session/SessionStore.test.ts b/packages/server/src/session/SessionStore.test.ts
similarity index 100%
rename from packages/server/src/server/session/SessionStore.test.ts
rename to packages/server/src/session/SessionStore.test.ts
diff --git a/packages/server/src/server/session/SessionStore.ts b/packages/server/src/session/SessionStore.ts
similarity index 100%
rename from packages/server/src/server/session/SessionStore.ts
rename to packages/server/src/session/SessionStore.ts
diff --git a/packages/server/src/server/test-utils/NamespaceMock.ts b/packages/server/src/test-utils/NamespaceMock.ts
similarity index 100%
rename from packages/server/src/server/test-utils/NamespaceMock.ts
rename to packages/server/src/test-utils/NamespaceMock.ts
diff --git a/packages/server/src/server/test-utils/RequestTester.test.ts b/packages/server/src/test-utils/RequestTester.test.ts
similarity index 100%
rename from packages/server/src/server/test-utils/RequestTester.test.ts
rename to packages/server/src/test-utils/RequestTester.test.ts
diff --git a/packages/server/src/server/test-utils/RequestTester.ts b/packages/server/src/test-utils/RequestTester.ts
similarity index 100%
rename from packages/server/src/server/test-utils/RequestTester.ts
rename to packages/server/src/test-utils/RequestTester.ts
diff --git a/packages/server/src/server/test-utils/TestUtils.ts b/packages/server/src/test-utils/TestUtils.ts
similarity index 100%
rename from packages/server/src/server/test-utils/TestUtils.ts
rename to packages/server/src/test-utils/TestUtils.ts
diff --git a/packages/server/src/server/test-utils/index.ts b/packages/server/src/test-utils/index.ts
similarity index 100%
rename from packages/server/src/server/test-utils/index.ts
rename to packages/server/src/test-utils/index.ts
diff --git a/packages/server/src/server/test.ts b/packages/server/src/test.ts
similarity index 100%
rename from packages/server/src/server/test.ts
rename to packages/server/src/test.ts