Reorganized a bit more (couldn't help it) and got stuff layed out for le...

...veling.