Refactored directory structure.