Make classes

Take all the functionality present and incorporate them into classes.