organize and make the manifest a bit more readble