move some files around that were misplaced during the merge