Refactor files and classes.