Fully refactored project