Major refact, moving classes around like a cowboy.

Updating the README file