Filename and extension now stored in each fileobject.