Redesign of the infrastructure module and the CRUD for the entity Service.