Refactored all classes.