Project working after refactoring for services.