Merge to new file structure