Add classes.
Finished refactoring.