Refactored directory to conform to requested layout by Levin