fix up borked dependency files.

and add some more scaffolding.