Minor reorganization of manifest structure