redo file structure