Re-structuring file layout