File re-organisation