Mass Cleanup and more modular classes

In effort for more friendly, readable code, restructured many of the
existing code ether by removing, or creating new overall class for such.
This will greatly allow flexiblity and less coffee at night.