refactore Modules names and complete the rest services