Refactored directory structure for ease of access