Re-arranged the classes

Also some small tweaks
Revert "Re-arranged the classes"

This reverts commit 6761776529e9da80bb46822753b52bd082588ceb.
Re-arranged the classes

Tweaked some things
Re-arranged Things

having some problems with github