Big refactoring we are almost jhipster