Organize manifest :-)