Refactored code, deleted old classes.