Initial subtree merge was performed incorrectly.  Move files to correct folder