Refactoring factorymethodsapp project structure2