Change manifest format
New Layout