Updated directory structure for mainline support