diff --git a/common/database.go b/common/database.go
index 872aa62..153f2e0 100644
--- a/common/database.go
+++ b/common/database.go
@@ -26,27 +26,27 @@ func StartDB() {
 	db.AutoMigrate(&Simulator{})
 	db.AutoMigrate(&Signal{})
 	db.AutoMigrate(&SimulationModel{})
-	//db.AutoMigrate(&File{})
+	db.AutoMigrate(&File{})
 	db.AutoMigrate(&Project{})
 	db.AutoMigrate(&Simulation{})
-	//db.AutoMigrate(&User{})
+	db.AutoMigrate(&User{})
 	db.AutoMigrate(&Visualization{})
 	db.AutoMigrate(&Signal{})
 	db.AutoMigrate(&Widget{})
 
 	// Create
 	db.Create(&Simulator{UUID: "12"})
-	db.Create(&Signal{Name:"Some", Unit:"314"})
-	fooSimMod := SimulationModel{Name:"buz", 
-		InputMapping: []Signal {
-			{Name:"foo", Unit:"42"},
-			{Name:"buz", Unit:"511"},
+	db.Create(&Signal{Name: "Some", Unit: "314"})
+	fooSimMod := SimulationModel{Name: "buz",
+		InputMapping: []Signal{
+			{Name: "foo", Unit: "42"},
+			{Name: "buz", Unit: "511"},
 		},
-	}	
-	db.Create(&fooSimMod)	
+	}
+	db.Create(&fooSimMod)
 
 	// get number of associations from SimulationModel table InputMapping column
-	fmt.Println( "Number of associations of InputMapping: ",
+	fmt.Println("Number of associations of InputMapping: ",
 		db.Model(&fooSimMod).Association("InputMapping").Count())
 
 	// get the associations from SimulationModel table InputMapping column
diff --git a/common/datastructs.go b/common/datastructs.go
index 28084d9..665943e 100644
--- a/common/datastructs.go
+++ b/common/datastructs.go
@@ -8,106 +8,106 @@ import (
 
 type Simulator struct {
 	gorm.Model
-	UUID          			string 			`gorm:"unique;not null"`
-	Host          			string 			`gorm:"default:''"`
-	Modeltype     			string 			`gorm:"default:''"`
-	Uptime        			int    			`gorm:"default:0"`
-	State         			string 			`gorm:"default:''"`
-	StateUpdateAt 			time.Time
-	Properties    			postgres.Jsonb 	// TODO: default value?
-	RawProperties 			postgres.Jsonb 	// TODO: default value?
+	UUID          string `gorm:"unique;not null"`
+	Host          string `gorm:"default:''"`
+	Modeltype     string `gorm:"default:''"`
+	Uptime        int    `gorm:"default:0"`
+	State         string `gorm:"default:''"`
+	StateUpdateAt time.Time
+	Properties    postgres.Jsonb // TODO: default value?
+	RawProperties postgres.Jsonb // TODO: default value?
 }
 
 type File struct {
 	gorm.Model
-	Name        			string			`gorm:"not null"`
-	Path        			string 			`gorm:"not null"`
-	Type        			string			`gorm:"not null"`
-	Size        			uint			`gorm:"not null"`
-	ImageHeight 			uint			//only required in case file is an image
-	ImageWidth  			uint			//only required in case file is an image
-	User    				User      		`gorm:"not null"`
-	UserID    				uint      		`gorm:"not null"`
-	Date        			time.Time 
+	Name        string `gorm:"not null"`
+	Path        string `gorm:"not null"`
+	Type        string `gorm:"not null"`
+	Size        uint   `gorm:"not null"`
+	ImageHeight uint   // only required in case file is an image
+	ImageWidth  uint   // only required in case file is an image
+	User        User   `gorm:"not null"`
+	UserID      uint   `gorm:"not null"`
+	Date        time.Time
 }
 
 type Project struct {
 	gorm.Model
-	Name              		string 			`gorm:"not null"`
-	User       				User   			`gorm:"not null"`
-	UserID					uint			`gorm:"not null"`
-	Visualizations    		[]Visualization
-	Simulation 				Simulation 		`gorm:"not null"`
-	SimulationID			uint			`gorm:"not null"`
+	Name           string     `gorm:"not null"`
+	User           User       `gorm:"not null"`
+	UserID         uint       `gorm:"not null"`
+	Simulation     Simulation `gorm:"not null"`
+	SimulationID   uint       `gorm:"not null"`
+	Visualizations []Visualization
 }
 
 type Simulation struct {
 	gorm.Model
-	Name            		string 				`gorm:"not null"`
-	Running         		bool   				`gorm:"default:false"`
-	Models          		[]SimulationModel 	`gorm:"foreignkey:BelongsToSimulationID"`
-	Projects        		[]Project
-	User  					User           		`gorm:"not null"`
-	UserID					uint				`gorm:"not null"`
-	StartParameters 		postgres.Jsonb 		// TODO default value
+	Name            string            `gorm:"not null"`
+	Running         bool              `gorm:"default:false"`
+	User            User              `gorm:"not null"`
+	UserID          uint              `gorm:"not null"`
+	StartParameters postgres.Jsonb    // TODO default value
+	Models          []SimulationModel `gorm:"foreignkey:BelongsToSimulationID"`
+	Projects        []Project
 }
 
 type SimulationModel struct {
 	gorm.Model
-	Name            		string			`gorm:"not null"`
-	OutputLength    		int				`gorm:"default:1"`
-	InputLength     		int				`gorm:"default:1"`
-	OutputMapping   		[]Signal		//order of signals is important
-	InputMapping    		[]Signal		//order of signals is important
-	StartParameters			postgres.Jsonb 	// TODO: default value?
-	BelongsToSimulation 	Simulation     	`gorm:"not null"`
-	BelongsToSimulationID 	uint			`gorm:"not null"`
-	BelongsToSimulator  	Simulator		`gorm:"not null"`
-	BelongsToSimulatorID 	uint			`gorm:"not null"`
+	Name                  string         `gorm:"not null"`
+	OutputLength          int            `gorm:"default:1"`
+	InputLength           int            `gorm:"default:1"`
+	OutputMapping         []Signal       // order of signals is important
+	InputMapping          []Signal       // order of signals is important
+	StartParameters       postgres.Jsonb // TODO: default value?
+	BelongsToSimulation   Simulation     `gorm:"not null"`
+	BelongsToSimulationID uint           `gorm:"not null"`
+	BelongsToSimulator    Simulator      `gorm:"not null"`
+	BelongsToSimulatorID  uint           `gorm:"not null"`
 }
 
 type User struct {
 	gorm.Model
-	Username    			string 			`gorm:"unique;not null"`
-	Password   				string 			`gorm:"not null"`
-	Mail        			string 			`gorm:"default:"`
-	Role        			string 			`gorm:"default:'user'"`
-	Projects    			[]Project
-	Simulations 			[]Simulation
-	Files       			[]File
+	Username    string `gorm:"unique;not null"`
+	Password    string `gorm:"not null"`
+	Mail        string `gorm:"default:''"`
+	Role        string `gorm:"default:'user'"`
+	Projects    []Project
+	Simulations []Simulation
+	Files       []File
 }
 
 type Visualization struct {
 	gorm.Model
-	Name                	string  		`gorm:"not null"`
-	Project 				Project 		`gorm:"not null"`
-	ProjectID 				uint			`gorm:"not null"` 
-	Widgets              	[]Widget
-	Grid                 	int  			`gorm:"default:15"`
-	VisualizationUser    	User 			`gorm:"not null"`
-	VisualizationUserID    	uint 			`gorm:"not null"`
+	Name                string  `gorm:"not null"`
+	Project             Project `gorm:"not null"`
+	ProjectID           uint    `gorm:"not null"`
+	Grid                int     `gorm:"default:15"`
+	VisualizationUser   User    `gorm:"not null"`
+	VisualizationUserID uint    `gorm:"not null"`
+	Widgets             []Widget
 }
 
 type Signal struct {
 	gorm.Model
-	Name 					string 			`gorm:"not null"`
-	Unit 					string 			`gorm:"not null"`
-	SimulationModelID		uint	
+	Name              string `gorm:"not null"`
+	Unit              string `gorm:"not null"`
+	SimulationModelID uint
 	//IsRecorded			bool 			`gorm:"default:false"`
 }
 
 type Widget struct {
 	gorm.Model
-	Name            		string         `gorm:"not null"`
-	Type             		string         `gorm:"not null"`
-	Width            		uint           `gorm:"not null"`
-	Height           		uint           `gorm:"not null"`
-	MinWidth         		uint           `gorm:"not null"`
-	MinHeight        		uint           `gorm:"not null"`
-	X                		int            `gorm:"not null"`
-	Y                		int            `gorm:"not null"`
-	Z                		int            `gorm:"not null"`
-	IsLocked         		bool           `gorm:"default:false"`
-	CustomProperties 		postgres.Jsonb //TODO: default value?
-	VisualizationID			uint	
+	Name             string         `gorm:"not null"`
+	Type             string         `gorm:"not null"`
+	Width            uint           `gorm:"not null"`
+	Height           uint           `gorm:"not null"`
+	MinWidth         uint           `gorm:"not null"`
+	MinHeight        uint           `gorm:"not null"`
+	X                int            `gorm:"not null"`
+	Y                int            `gorm:"not null"`
+	Z                int            `gorm:"not null"`
+	IsLocked         bool           `gorm:"default:false"`
+	CustomProperties postgres.Jsonb // TODO: default value?
+	VisualizationID  uint
 }