Major revamp of file organization: form follows function