Changes to assign 8 file structure.