Further structuring to file layout