Refactored project and solution