diff --git a/sql/createDatabase.sql b/sql/createDatabase.sql
deleted file mode 100644
index 2904e4c..0000000
--- a/sql/createDatabase.sql
+++ /dev/null
@@ -1 +0,0 @@
-CREATE TABLE `friendsbook`.`tans` ( `id` INT NOT NULL AUTO_INCREMENT , `tan` VARCHAR(13) NOT NULL , `used` BOOLEAN NOT NULL , PRIMARY KEY (`id`)) ENGINE = InnoDB;
diff --git a/sql/entiresTable.sql b/sql/setup-database.sql
similarity index 56%
rename from sql/entiresTable.sql
rename to sql/setup-database.sql
index 15d619d..37a0e4b 100644
--- a/sql/entiresTable.sql
+++ b/sql/setup-database.sql
@@ -1,4 +1,24 @@
-CREATE TABLE `kd42696_ipr-projekt`.`entries` (
+CREATE DATABASE friendsbook;
+
+USE friendsbook;
+
+CREATE TABLE `tans` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `tan` VARCHAR(13) NOT NULL,
+  `used` BOOLEAN NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE = InnoDB;
+
+CREATE TABLE `user` (
+	`ID` INT NOT NULL AUTO_INCREMENT,
+	`user` VARCHAR(50) NOT NULL DEFAULT '0',
+	`email` VARCHAR(100) NOT NULL DEFAULT '0',
+	`password` VARCHAR(100) NOT NULL DEFAULT '0',
+	PRIMARY KEY (`ID`),
+	UNIQUE INDEX `user` (`user`)
+) ENGINE = InnoDB;
+
+CREATE TABLE `entries` (
   `id` INT NOT NULL AUTO_INCREMENT ,
   `userID` INT NOT NULL ,
   `tanID` INT NOT NULL ,
@@ -26,7 +46,7 @@ CREATE TABLE `kd42696_ipr-projekt`.`entries` (
   `absturz` LONGTEXT DEFAULT NULL ,
   `trinkspiel` LONGTEXT DEFAULT NULL ,
   PRIMARY KEY (`id`),
-  UNIQUE (`tanID`)) ENGINE = InnoDB;
-
-  ALTER TABLE `entries` ADD FOREIGN KEY (`userID`) REFERENCES `user`(`ID`) ON DELETE CASCADE ON UPDATE CASCADE;
-  ALTER TABLE `entries` ADD FOREIGN KEY (`tanID`) REFERENCES `tans`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+  UNIQUE (`tanID`),
+  FOREIGN KEY (`userID`) REFERENCES `user`(`ID`) ON DELETE CASCADE ON UPDATE CASCADE,
+  FOREIGN KEY (`tanID`) REFERENCES `tans`(`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE = InnoDB;
diff --git a/sql/userTable.sql b/sql/userTable.sql
deleted file mode 100644
index b015f21..0000000
--- a/sql/userTable.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-CREATE TABLE `user` (
-	`ID` INT NOT NULL AUTO_INCREMENT,
-	`user` VARCHAR(50) NOT NULL DEFAULT '0',
-	`email` VARCHAR(100) NOT NULL DEFAULT '0',
-	`password` VARCHAR(100) NOT NULL DEFAULT '0',
-	PRIMARY KEY (`ID`),
-	UNIQUE INDEX `user` (`user`)
-);