Refactor

I had way to many inner classes, they just kinda grew as I worked. Like
that fuzzy white mold you just find sitting at the back of your buddies
fridge when you go to grab a beer. Remember to always put the beer back
or clean up the mold. I cleaned up the mold.