Re-ordering of file structure