diff --git a/backend/src/main/java/de/srsoftware/umbrella/backend/Application.java b/backend/src/main/java/de/srsoftware/umbrella/backend/Application.java
index 5ac4a1d..60b01cb 100644
--- a/backend/src/main/java/de/srsoftware/umbrella/backend/Application.java
+++ b/backend/src/main/java/de/srsoftware/umbrella/backend/Application.java
@@ -63,43 +63,24 @@ public class Application {
 		var server            = HttpServer.create(new InetSocketAddress(port), 0);
 
 		var registry          = new ModuleRegistry();
-		var translationModule = new Translations(registry);
-		var postBox           = new MessageSystem(registry,config);
-
-		var userModule        = new UserModule(registry,config);
-		var tagModule         = new TagModule(registry,config);
-		var bookmarkApi       = new BookmarkApi(registry,config);
-		var companyModule     = new CompanyModule(registry, config);
-		var companyLegacy     = new CompanyLegacy(registry, config);
-		var documentApi       = new DocumentApi(registry, config);
-		var itemApi           = new ItemApi(registry, config);
-		var userLegacy        = new UserLegacy(registry,config);
-		var notesLegacy       = new NotesLegacy(registry,config);
-		var markdownApi       = new MarkdownApi(registry);
-		var notesModule       = new NoteModule(registry,config);
-		var projectModule     = new ProjectModule(registry, config);
-		var projectLegacy     = new ProjectLegacy(registry,config);
-		var taskModule        = new TaskModule(registry, config);
-		var timeModule	      = new TimeModule(registry, config);
-		var webHandler        = new WebHandler();
-
-		bookmarkApi      .bindPath("/api/bookmark")    .on(server);
-		documentApi      .bindPath("/api/document")    .on(server);
-		companyModule    .bindPath("/api/company")     .on(server);
-		companyLegacy    .bindPath("/legacy/company")  .on(server);
-		itemApi			 .bindPath("/api/items")       .on(server);
-		markdownApi		 .bindPath("/api/markdown")    .on(server);
-		notesModule      .bindPath("/api/notes")       .on(server);
-		projectModule    .bindPath("/api/project")     .on(server);
-		tagModule        .bindPath("/api/tags")        .on(server);
-		taskModule       .bindPath("/api/task")        .on(server);
-		timeModule       .bindPath("/api/times")       .on(server);
-		translationModule.bindPath("/api/translations").on(server);
-		userModule       .bindPath("/api/user")        .on(server);
-		notesLegacy      .bindPath("/legacy/notes")    .on(server);
-		projectLegacy    .bindPath("/legacy/project")  .on(server);
-		userLegacy       .bindPath("/legacy/user")     .on(server);
-		webHandler       .bindPath("/")                .on(server);
+		new Translations(registry).bindPath("/api/translations").on(server);
+		new MessageSystem(registry,config);
+		new UserModule(registry,config).bindPath("/api/user").on(server);
+		new TagModule(registry,config).bindPath("/api/tags").on(server);
+		new BookmarkApi(registry,config).bindPath("/api/bookmark").on(server);
+		new CompanyModule(registry, config).bindPath("/api/company").on(server);
+		new CompanyLegacy(registry, config).bindPath("/legacy/company").on(server);
+		new DocumentApi(registry, config).bindPath("/api/document").on(server);
+		new ItemApi(registry, config).bindPath("/api/items").on(server);
+		new UserLegacy(registry,config).bindPath("/legacy/user").on(server);
+		new NotesLegacy(registry,config).bindPath("/legacy/notes").on(server);
+		new MarkdownApi(registry).bindPath("/api/markdown").on(server);
+		new NoteModule(registry,config).bindPath("/api/notes").on(server);
+		new ProjectModule(registry, config).bindPath("/api/project").on(server);
+		new ProjectLegacy(registry,config).bindPath("/legacy/project").on(server);
+		new TaskModule(registry, config).bindPath("/api/task").on(server);
+		new TimeModule(registry, config).bindPath("/api/times").on(server);
+		new WebHandler().bindPath("/").on(server);
 
 		server.setExecutor(Executors.newFixedThreadPool(threads));
 		server.start();
diff --git a/legacy/src/main/java/de/srsoftware/umbrella/legacy/CompanyLegacy.java b/legacy/src/main/java/de/srsoftware/umbrella/legacy/CompanyLegacy.java
index 5dd09f0..1bd6384 100644
--- a/legacy/src/main/java/de/srsoftware/umbrella/legacy/CompanyLegacy.java
+++ b/legacy/src/main/java/de/srsoftware/umbrella/legacy/CompanyLegacy.java
@@ -37,7 +37,7 @@ public class CompanyLegacy extends BaseHandler {
 
 	@Override
 	public boolean doGet(Path path, HttpExchange ex) throws IOException {
-		if (path.empty()) return sendRedirect(ex, url(ex).replaceAll("/legacy/.*",""));
+		if (path.empty()) return sendRedirect(ex, url(ex).replaceAll("/legacy/","/"));
 		return super.doGet(path, ex);
 	}
 
diff --git a/legacy/src/main/java/de/srsoftware/umbrella/legacy/NotesLegacy.java b/legacy/src/main/java/de/srsoftware/umbrella/legacy/NotesLegacy.java
index e5dcd27..9ce044c 100644
--- a/legacy/src/main/java/de/srsoftware/umbrella/legacy/NotesLegacy.java
+++ b/legacy/src/main/java/de/srsoftware/umbrella/legacy/NotesLegacy.java
@@ -39,6 +39,7 @@ public class NotesLegacy extends BaseHandler {
 
 	@Override
 	public boolean doGet(Path path, HttpExchange ex) throws IOException {
+		if (path.empty()) return sendRedirect(ex, url(ex).replaceAll("/legacy/","/"));
 		return super.doGet(path, ex);
 	}
 
diff --git a/legacy/src/main/java/de/srsoftware/umbrella/legacy/ProjectLegacy.java b/legacy/src/main/java/de/srsoftware/umbrella/legacy/ProjectLegacy.java
index 1b123c3..11e1fae 100644
--- a/legacy/src/main/java/de/srsoftware/umbrella/legacy/ProjectLegacy.java
+++ b/legacy/src/main/java/de/srsoftware/umbrella/legacy/ProjectLegacy.java
@@ -38,7 +38,7 @@ public class ProjectLegacy extends BaseHandler {
 
 	@Override
 	public boolean doGet(Path path, HttpExchange ex) throws IOException {
-		if (path.empty()) return sendRedirect(ex, url(ex).replaceAll("/legacy/.*",""));
+		if (path.empty()) return sendRedirect(ex, url(ex).replaceAll("/legacy/","/"));
 		return super.doGet(path, ex);
 	}