Adding resolvers (JSP/JSON)
Refactoring module name, cleaning