Cleaning up a few things

Creating the classes on a need basis.