Add JSP, Thymeleaf support
Organize packages better