diff --git a/public/js/rueckmeldung_client.js b/public/js/client_rmld.js
similarity index 100%
rename from public/js/rueckmeldung_client.js
rename to public/js/client_rmld.js
diff --git a/public/js/waip_client.js b/public/js/client_waip.js
similarity index 100%
rename from public/js/waip_client.js
rename to public/js/client_waip.js
diff --git a/views/edit_users.pug b/views/admin/edit_users.pug
similarity index 100%
rename from views/edit_users.pug
rename to views/admin/edit_users.pug
diff --git a/views/show_active_user.pug b/views/admin/show_active_user.pug
similarity index 100%
rename from views/show_active_user.pug
rename to views/admin/show_active_user.pug
diff --git a/views/show_active_waip.pug b/views/admin/show_active_waip.pug
similarity index 100%
rename from views/show_active_waip.pug
rename to views/admin/show_active_waip.pug
diff --git a/views/show_log.pug b/views/admin/show_log.pug
similarity index 100%
rename from views/show_log.pug
rename to views/admin/show_log.pug
diff --git a/views/test_alert.pug b/views/admin/test_alert.pug
similarity index 100%
rename from views/test_alert.pug
rename to views/admin/test_alert.pug
diff --git a/views/error.pug b/views/error.pug
index 04414a3..4f241c6 100644
--- a/views/error.pug
+++ b/views/error.pug
@@ -4,20 +4,11 @@ block content
   main(role='main')
     .container
       .row
-        .col-12
-          .card.border-warning
-            .card-header
-              h1= error.status
-            .card-body    
-              .card-title
-                h5.ion-md-bug= " Fehler - " +message
-              pre.text-monospace
-                |
-                | __/\\\\\\\\\\\\\\\____/\\\\\\\\\________/\\\\\\\\\___________/\\\\\_________/\\\\\\\\\_____        
-                |  _\/\\\///////////___/\\\///////\\\____/\\\///////\\\_______/\\\///\\\_____/\\\///////\\\___       
-                |   _\/\\\_____________\/\\\_____\/\\\___\/\\\_____\/\\\_____/\\\/__\///\\\__\/\\\_____\/\\\___      
-                |    _\/\\\\\\\\\\\_____\/\\\\\\\\\\\/____\/\\\\\\\\\\\/_____/\\\______\//\\\_\/\\\\\\\\\\\/____     
-                |     _\/\\\///////______\/\\\//////\\\____\/\\\//////\\\____\/\\\_______\/\\\_\/\\\//////\\\____    
-                |      _\/\\\_____________\/\\\____\//\\\___\/\\\____\//\\\___\//\\\______/\\\__\/\\\____\//\\\___   
-                |       _\/\\\_____________\/\\\_____\//\\\__\/\\\_____\//\\\___\///\\\__/\\\____\/\\\_____\//\\\__  
-                |        _\/\\\\\\\\\\\\\\\_\/\\\______\//\\\_\/\\\______\//\\\____\///\\\\\/_____\/\\\______\//\\\_ 
+        .col
+          .jumbotron.text-center
+            h1.display-1.font-weight-bold= error.status
+            hr.my-4
+            .lead
+              h3 Es ist ein Fehler aufgetreten
+              p.text-muted= message
+            .display-1.ion-ios-bug-outline
diff --git a/views/includes/modal_response.pug b/views/includes/modal_rmld.pug
similarity index 100%
rename from views/includes/modal_response.pug
rename to views/includes/modal_rmld.pug
diff --git a/views/response.pug b/views/rmld.pug
similarity index 100%
rename from views/response.pug
rename to views/rmld.pug
diff --git a/views/test_clock.pug b/views/tests/test_clock.pug
similarity index 100%
rename from views/test_clock.pug
rename to views/tests/test_clock.pug
diff --git a/views/test_rueckmeldung.pug b/views/tests/test_rueckmeldung.pug
similarity index 100%
rename from views/test_rueckmeldung.pug
rename to views/tests/test_rueckmeldung.pug
diff --git a/views/test_wachalarm.pug b/views/tests/test_wachalarm.pug
similarity index 100%
rename from views/test_wachalarm.pug
rename to views/tests/test_wachalarm.pug
diff --git a/views/config.pug b/views/user/config.pug
similarity index 100%
rename from views/config.pug
rename to views/user/config.pug