refactoring factories / services folders