Reorganize layout and code cleanup

2 files changed, 3 insertions, 6 deletions

diff --git a/src/main/java/com/juick/www/controllers/Help.java b/src/main/java/com/juick/www/controllers/Help.java
index d2796def..7fc84060 100644
--- a/src/main/java/com/juick/www/controllers/Help.java
+++ b/src/main/java/com/juick/www/controllers/Help.java
@@ -19,10 +19,9 @@ package com.juick.www.controllers;
 
 import com.juick.model.User;
 import com.juick.server.util.HttpNotFoundException;
-import com.juick.www.HelpService;
-import com.juick.www.WebApp;
-import com.juick.service.MessagesService;
+import com.juick.service.HelpService;
 import com.juick.service.security.annotation.Visitor;
+import com.juick.www.WebApp;
 import org.commonmark.parser.Parser;
 import org.commonmark.renderer.html.HtmlRenderer;
 import org.springframework.stereotype.Controller;
@@ -42,8 +41,6 @@ public class Help {
     @Inject
     private HelpService helpService;
     @Inject
-    private MessagesService messagesService;
-    @Inject
     private Parser cmParser;
     @Inject
     private HtmlRenderer helpRenderer;
diff --git a/src/main/java/com/juick/www/controllers/MessagesWWW.java b/src/main/java/com/juick/www/controllers/Site.java
index 4b0bb17f..61b84f71 100644
--- a/src/main/java/com/juick/www/controllers/MessagesWWW.java
+++ b/src/main/java/com/juick/www/controllers/Site.java
@@ -53,7 +53,7 @@ import java.util.stream.Collectors;
  * @author Ugnich Anton
  */
 @Controller
-public class MessagesWWW {
+public class Site {
     @Inject
     private UserService userService;
     @Inject