Add manifest, modify output directory structure