Refactored project directory structure