Renamed classes and moved stuffz.
Merge remote-tracking branch 'origin/master'
Stuff Maybe?