Finished refactoring FileIo classes