Refactored directory