Cleanup in the manifest execution package.

Removed the line and manifest modules, switched the sample manifest
to the new manifest format.