redo file structure.