diff --git a/backend/src/typeorm/entity/Balance.ts b/database/entity/0001-init_db/Balance.ts
similarity index 100%
rename from backend/src/typeorm/entity/Balance.ts
rename to database/entity/0001-init_db/Balance.ts
diff --git a/backend/src/typeorm/entity/Migration.ts b/database/entity/0001-init_db/Migration.ts
similarity index 100%
rename from backend/src/typeorm/entity/Migration.ts
rename to database/entity/0001-init_db/Migration.ts
diff --git a/backend/src/typeorm/entity/Transaction.ts b/database/entity/0001-init_db/Transaction.ts
similarity index 100%
rename from backend/src/typeorm/entity/Transaction.ts
rename to database/entity/0001-init_db/Transaction.ts
diff --git a/backend/src/typeorm/entity/TransactionCreation.ts b/database/entity/0001-init_db/TransactionCreation.ts
similarity index 100%
rename from backend/src/typeorm/entity/TransactionCreation.ts
rename to database/entity/0001-init_db/TransactionCreation.ts
diff --git a/backend/src/typeorm/entity/TransactionSendCoin.ts b/database/entity/0001-init_db/TransactionSendCoin.ts
similarity index 100%
rename from backend/src/typeorm/entity/TransactionSendCoin.ts
rename to database/entity/0001-init_db/TransactionSendCoin.ts
diff --git a/database/entity/0001-init_db/User.ts b/database/entity/0001-init_db/User.ts
new file mode 100644
index 000000000..d76711eb1
--- /dev/null
+++ b/database/entity/0001-init_db/User.ts
@@ -0,0 +1,26 @@
+import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm'
+
+// Moriz: I do not like the idea of having two user tables
+@Entity('state_users')
+export class User extends BaseEntity {
+  @PrimaryGeneratedColumn()
+  id: number
+
+  @Column({ type: 'binary', length: 32, name: 'public_key' })
+  pubkey: Buffer
+
+  @Column()
+  email: string
+
+  @Column({ name: 'first_name' })
+  firstName: string
+
+  @Column({ name: 'last_name' })
+  lastName: string
+
+  @Column()
+  username: string
+
+  @Column()
+  disabled: boolean
+}
diff --git a/backend/src/typeorm/entity/UserTransaction.ts b/database/entity/0001-init_db/UserTransaction.ts
similarity index 100%
rename from backend/src/typeorm/entity/UserTransaction.ts
rename to database/entity/0001-init_db/UserTransaction.ts