Initial redo of file layout