refactoring projects and service