Refactored directory structure