Restructure packages a little to tame my OCD...
Attempting to clean up the code some... really thinking about switching
to scala for its multiple-inheritance