Updating file structure to new file structure