Refactored project directory