Re-organisation. Updating manifest.