Refactoring, Changing IO Structure