File re-structuring