Refactor project and platform services