Tortoise: cut some inter-package dependencies

shuffling code around as necessary