Cleaned up structure of java code.
Cleaned up structure of thymeleaf code.