Moved lots of files from the merge into place in the new file hierarchy.