Complete restructuring of the directory.  The historyDump has been compared with output from the master branch running 'test.xml' and they are identical