Restructured Manifest