Restructuring all manifests.