Updated file structure and copy.