diff --git a/handlers.go b/handlers.go
index 5d4a14d..18ffe26 100644
--- a/handlers.go
+++ b/handlers.go
@@ -1,3 +1,7 @@
+//
+// Created by vfs on 02.05.2024.
+//
+
 package main
 
 import "fmt"
@@ -7,14 +11,13 @@ import "html/template"
 //import "strconv"
 import "strings"
 import "unicode/utf8"
-import "alfheimgame/models"
 import "errors"
 import "runtime/debug"
 
 type templatedata struct {
 	AuthenticatedUser int32
 	FormErrors map[string]string
-	Account models.Account
+	Account Account
 }
 
 func favicon(w http.ResponseWriter, r *http.Request) {
@@ -45,7 +48,7 @@ func home(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	text, err := template.ParseFiles("base.html", "index.html")
+	text, err := template.ParseFiles("ui/base.html", "ui/index.html")
 	if err != nil {
 		http.Error(w, "Internal Server Error", 500)
 		log.Fatal(err)
@@ -70,7 +73,7 @@ func home(w http.ResponseWriter, r *http.Request) {
 }
 
 func login(w http.ResponseWriter, r *http.Request) {
-	text, err := template.ParseFiles("base.html", "login/index.html")
+	text, err := template.ParseFiles("ui/base.html", "ui/login.html")
 	if err != nil {
 		http.Error(w, "Internal Server Error", 500)
 		log.Fatal(err)
@@ -123,7 +126,7 @@ func login(w http.ResponseWriter, r *http.Request) {
 }
 
 func logout(w http.ResponseWriter, r *http.Request) {
-	text, err := template.ParseFiles("base.html", "logout/index.html")
+	text, err := template.ParseFiles("ui/base.html", "ui/logout.html")
 	if err != nil {
 		http.Error(w, "Internal Server Error", 500)
 		log.Fatal(err)
@@ -148,7 +151,7 @@ func logout(w http.ResponseWriter, r *http.Request) {
 }
 
 func register(w http.ResponseWriter, r *http.Request) {
-	text, err := template.ParseFiles("base.html", "register/index.html")
+	text, err := template.ParseFiles("ui/base.html", "ui/register.html")
 	if err != nil {
 		http.Error(w, "Internal Server Error", 500)
 		log.Fatal(err)
@@ -164,7 +167,7 @@ func register(w http.ResponseWriter, r *http.Request) {
 			}
 
 		case http.MethodPost:
-			account := models.Account{Username: r.FormValue("username"), Password: []byte(r.FormValue("password")), Firstname: r.FormValue("firstname"), Lastname: r.FormValue("lastname"), Email: r.FormValue("email")}
+			account := Account{Username: r.FormValue("username"), Password: []byte(r.FormValue("password")), Firstname: r.FormValue("firstname"), Lastname: r.FormValue("lastname"), Email: r.FormValue("email")}
 
 			errors := make(map[string]string)
 
@@ -208,7 +211,7 @@ func account(w http.ResponseWriter, r *http.Request) {
 	id := authenticated_user(r)
 	account, err := users.Get_account(id)
 
-	text, err := template.ParseFiles("base.html", "account/index.html")
+	text, err := template.ParseFiles("ui/base.html", "ui/account.html")
 
 	if err != nil {
 		http.Error(w, "Internal Server Error", 500)
diff --git a/main.go b/main.go
index 16e9a55..a3ee32f 100644
--- a/main.go
+++ b/main.go
@@ -1,3 +1,7 @@
+//
+// Created by vfs on 02.05.2024.
+//
+
 package main
 
 import "fmt"
@@ -8,10 +12,9 @@ import _ "github.com/lib/pq"
 import "database/sql"
 import "github.com/gorilla/sessions"
 import "regexp"
-import "alfheimgame/models"
 //import "golang.org/x/crypto/bcrypt"
 
-var users *models.Usermodel
+var users *Usermodel
 
 var key = []byte("super-secret-key")
 var store = sessions.NewCookieStore(key)
@@ -55,7 +58,7 @@ func main() {
 	}
 	defer db.Close()
 
-	users = &models.Usermodel{db}
+	users = &Usermodel{db}
 
 	mux := http.NewServeMux()