Revert "moving files about"

This reverts commit 794babfdff61b45bd5df6501467b8ab5fefc58cc.

Most recent 2 commits don't work, keep going.