Rearraged/added some paths for export