Refactor services and add basic project types