diff --git a/types/PEP440.d.ts b/types/PEP440.d.ts
index f5c0a18..f55b2b9 100644
--- a/types/PEP440.d.ts
+++ b/types/PEP440.d.ts
@@ -11,4 +11,4 @@ type PreRelease = Join<[['a' | 'b' | 'rc'], number], '.'>;
 type PRVersion = BaseVersion | `${BaseVersion}${PreRelease}`;
 
 /** A PEP440 subset used to describe backend module versions */
-declare type PEP440Version = PRVersion | `${PRVersion}.dev${number}`;
\ No newline at end of file
+declare type PEP440Version = PRVersion | `${PRVersion}.dev${number}`;
diff --git a/types/api.d.ts b/types/api.d.ts
new file mode 100644
index 0000000..2d473bb
--- /dev/null
+++ b/types/api.d.ts
@@ -0,0 +1,27 @@
+/// <reference path="PEP440.d.ts" />
+/**
+ * Types used for communicating with the API
+ */
+
+declare namespace FG {
+  interface BackendPlugin {
+    permissions: string[];
+    version: PEP440Version;
+  }
+  interface Backend {
+    plugins: { [key: string]: BackendPlugin };
+    version: PEP440Version;
+  }
+  interface PaginationFilter {
+    limit?: number;
+    offset?: number;
+    from?: Date;
+    to?: Date;
+    /** Default to ascending */
+    descending?: boolean;
+  }
+  interface PaginationResponse<T> {
+    result: T[];
+    count: number;
+  }
+}
diff --git a/types/index.d.ts b/types/index.d.ts
index b79cf34..2995593 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -1,4 +1,5 @@
-/// <reference path="flaschengeist.d.ts" />
+/// <reference path="api.d.ts" />
+/// <reference path="models.d.ts" />
 /// <reference path="PEP440.d.ts" />
 
 export * from './plugin';
diff --git a/types/flaschengeist.d.ts b/types/models.d.ts
similarity index 53%
rename from types/flaschengeist.d.ts
rename to types/models.d.ts
index 4133763..c8972c8 100644
--- a/types/flaschengeist.d.ts
+++ b/types/models.d.ts
@@ -1,17 +1,5 @@
-/// <reference path="PEP440.d.ts" />
-/**
- * Types used for communicating with the API
- */
-
+/** Models exported from backend */
 declare namespace FG {
-  interface BackendPlugin {
-    permissions: string[];
-    version: PEP440Version;
-  }
-  interface Backend {
-    plugins: {[key: string]: BackendPlugin};
-    version: PEP440Version;
-  }
   interface Notification {
     id: number;
     plugin: string;
@@ -21,6 +9,7 @@ declare namespace FG {
   }
   interface User {
     userid: string;
+    deleted: boolean;
     display_name: string;
     firstname: string;
     lastname: string;
@@ -28,7 +17,6 @@ declare namespace FG {
     birthday?: Date;
     roles: Array<string>;
     permissions?: Array<string>;
-    avatar_url?: string;
   }
   interface Session {
     expires: Date;
@@ -44,16 +32,4 @@ declare namespace FG {
     name: string;
     permissions: Array<Permission>;
   }
-  interface PaginationFilter {
-    limit?: number;
-    offset?: number;
-    from?: Date;
-    to?: Date;
-    /** Default to ascending */
-    descending?: boolean;
-  }
-  interface PaginationResponse<T> {
-    result: T[];
-    count: number;
-  }
 }