another minor refactor...
lots of file moves and coding to support new locations