Re-organise the file