Refactoring of services
Working on authentication