Integrate scythe and sickle, and remove files as they're no longer needed.