diff --git a/routes/endpoints_test.go b/routes/endpoints_test.go
index 06903b2..4dd9461 100644
--- a/routes/endpoints_test.go
+++ b/routes/endpoints_test.go
@@ -84,12 +84,10 @@ func TestSimulationEndpoints(t *testing.T) {
 	router := gin.Default()
 	api := router.Group("/api")
 	simulation.RegisterSimulationEndpoints(api.Group("/simulations"))
-	file.RegisterFileEndpoints(api.Group("/simulations"))
-	model.RegisterModelEndpoints(api.Group("/simulations"))
-	visualization.RegisterVisualizationEndpoints(api.Group("/simulations"))
-	widget.RegisterWidgetEndpoints(api.Group("/simulations"))
-	user.RegisterUserEndpointsForSimulation(api.Group("/simulations")) // TODO ugly structure
-
+	model.RegisterModelEndpoints(api.Group("/models"))
+	visualization.RegisterVisualizationEndpoints(api.Group("/visualizations"))
+	widget.RegisterWidgetEndpoints(api.Group("/widgets"))
+	file.RegisterFileEndpoints(api.Group("/files"))
 	user.RegisterUserEndpoints(api.Group("/users"))
 	simulator.RegisterSimulatorEndpoints(api.Group("/simulators"))
 
diff --git a/start.go b/start.go
index 17ea234..6dab422 100644
--- a/start.go
+++ b/start.go
@@ -43,13 +43,11 @@ func main() {
 
 	api := r.Group("/api")
 
-	// use ginSwagger middleware to
 	simulation.RegisterSimulationEndpoints(api.Group("/simulations"))
 	model.RegisterModelEndpoints(api.Group("/models"))
 	visualization.RegisterVisualizationEndpoints(api.Group("/visualizations"))
 	widget.RegisterWidgetEndpoints(api.Group("/widgets"))
 	file.RegisterFileEndpoints(api.Group("/files"))
-
 	user.RegisterUserEndpoints(api.Group("/users"))
 	simulator.RegisterSimulatorEndpoints(api.Group("/simulators"))