refactored directory layouts