Repackaging stuff and moving sentence-features around.