Project Factory & refactoring