Services refactoring, and user service added