Redo File Struct
again