Refactor: put all services in one package