Add thymeleaf controller and refactor naming