refactoring of file classes, killing clones