diff --git a/views/forgotPwd.pug b/views/forgotPwd.pug
index e2893ed90ad3ac5c299ef96d0bc5bf3afb45d234..6e186fb7301d99c4c7340c2dcbed62abce08b59d 100644
--- a/views/forgotPwd.pug
+++ b/views/forgotPwd.pug
@@ -40,7 +40,7 @@ html(lang="en")
                     for error, i in errors
                         div.alert.alert-danger.alert-dismissible.fade.show #{ error }
                             a(class="close", href="#", data-dismiss="alert", aria-label="close") ×
-                form#forgotForm(method="POST",action="/forgotPwd")
+                form#forgotForm(method="POST",action="/account/forgotPwd")
                     div(class="form-group row")
                         label(for="email") Email
                         input#inputEmail(name="inputEmail", type="email", class="form-control", placeholder="Email" required)                  
@@ -52,5 +52,5 @@ html(lang="en")
     // Bootstrap
     script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous")
     // M4_LAB
-    script(src="/js/account.js")
+    script(src="/account/js/account.js")
     script(src="https://transfer.hft-stuttgart.de/js/headfoot.js")
\ No newline at end of file
diff --git a/views/home.pug b/views/home.pug
index 2c704c1a0cb5152873ac1d62eddf25981c78874c..285666ecdca9aab4ae215997386543a92e9264d6 100644
--- a/views/home.pug
+++ b/views/home.pug
@@ -3,10 +3,10 @@ extends layout
 block content
 	if user !== null
 		h1 Hello, #{user.firstName}
-		a(href="/profile") Profile
+		a(href="/account/profile") Profile
 		br
-		a(href="/logout") Logout
+		a(href="/account/logout") Logout
 	else
 		h1 Welcome
 		br
-		a(href="/login") Login
+		a(href="/account/login") Login
diff --git a/views/profile.pug b/views/profile.pug
index e2800ded16183e4cf33491a2e92e0ca41c0675a4..3045fd42ef432019580844d3bfd8c76502c725fb 100644
--- a/views/profile.pug
+++ b/views/profile.pug
@@ -35,8 +35,8 @@ html(lang="en")
                     span#fullname
                 div(class="nav flex-column nav-pills", id="v-pills-tab", role="tablist", aria-orientation="vertical")
                     a(class="nav-link" href="#" aria-selected="true") Profile
-                    a(class="nav-link" href="/security" aria-selected="false") Security
-                    a(class="nav-link" href="/services" aria-selected="false") Services
+                    a(class="nav-link" href="/account/security" aria-selected="false") Security
+                    a(class="nav-link" href="/account/services" aria-selected="false") Services
             div(class="col-sm-9")
                 if successes
                     for success in successes
@@ -81,5 +81,5 @@ html(lang="en")
     // Bootstrap
     script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous")
     // M4_LAB
-    script(src="/js/account.js")
+    script(src="/account//js/account.js")
     script(src="https://transfer.hft-stuttgart.de/js/headfoot.js")
\ No newline at end of file
diff --git a/views/reset.pug b/views/reset.pug
index 774f921526fc022ef093c2d43f3488cc928d9414..1dcb0528c8e387878e6199b2aba8b0a09bfd9769 100644
--- a/views/reset.pug
+++ b/views/reset.pug
@@ -56,6 +56,6 @@ html(lang="en")
     // Bootstrap
     script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous")
     // M4_LAB
-    script(src="/js/account.js")
-    script(src="/js/generalFunction.js")
+    script(src="/account/js/account.js")
+    script(src="/account/js/generalFunction.js")
     script(src="https://transfer.hft-stuttgart.de/js/headfoot.js")
\ No newline at end of file
diff --git a/views/security.pug b/views/security.pug
index 8d2f9700f1726f98d3efb03262394dacccd6e2ce..42a91adc10642904c59f9ccdbeed42594f72baaf 100644
--- a/views/security.pug
+++ b/views/security.pug
@@ -34,9 +34,9 @@ html(lang="en")
                 h5
                     span#fullname
                 div(class="nav flex-column nav-pills", id="v-pills-tab", role="tablist", aria-orientation="vertical")
-                    a(class="nav-link" href="/profile" aria-selected="true") Profile
+                    a(class="nav-link" href="/account/profile" aria-selected="true") Profile
                     a(class="nav-link" href="#" aria-selected="false") Security
-                    a(class="nav-link" href="/services" aria-selected="false") Services
+                    a(class="nav-link" href="/account/services" aria-selected="false") Services
             div(class="col-sm-9")
                 if successes
                     for success in successes
@@ -46,7 +46,7 @@ html(lang="en")
                     for error, i in errors
                         div.alert.alert-danger.alert-dismissible.fade.show #{ error }
                             a(class="close", href="#", data-dismiss="alert", aria-label="close") ×
-                form(class="needs-validation", method="post", action="/changePwd" novalidate)
+                form(class="needs-validation", method="post", action="/account/changePwd" novalidate)
                     div(class="form-group row")
                         label(for="currPwd") Current Password
                         input(id="inputCurrPwd", name="inputCurrPwd", type="password", class="form-control" required)
@@ -69,8 +69,8 @@ html(lang="en")
     // Bootstrap
     script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous")
     // M4_LAB
-    script(src="/js/account.js")
-    script(src="/js/generalFunction.js")
+    script(src="/account/js/account.js")
+    script(src="/account/js/generalFunction.js")
     script(src="https://transfer.hft-stuttgart.de/js/headfoot.js")
     script.
         // check input fields
diff --git a/views/services.pug b/views/services.pug
index a751c9287d28722fac61c8441c8938bf25e28afa..fdd32a311efe2a757f563d56b4d9511bd4a7d966 100644
--- a/views/services.pug
+++ b/views/services.pug
@@ -34,8 +34,8 @@ html(lang="en")
                 h5
                     span #{user.firstName} #{user.lastName}
                 div(class="nav flex-column nav-pills", id="v-pills-tab", role="tablist", aria-orientation="vertical")
-                    a(class="nav-link" href="/profile" aria-selected="true") Profile
-                    a(class="nav-link" href="/security" aria-selected="false") Security
+                    a(class="nav-link" href="/account/profile" aria-selected="true") Profile
+                    a(class="nav-link" href="/account/security" aria-selected="false") Security
                     a(class="nav-link" href="#" aria-selected="false") Services
             div(class="col-sm-9")
                 if successes