Updated a few things.

More object oriented divided some classes