Create cm manifest and move cm stuff over