Refactored directory names