another ugly set of file moves