Re-structured file layout