Update file layout (not finished)