File structure changes and merge