Structure changes

File read/write structure changes.