Merging new file structure