Refactoring of packages + add thymeleaf layout