Restructured file layout