Refactored project layout