Finishing up cleaning

This should finish up my reorganizing and cleaning for now. Ill make
some tweaks later, but for now, im gonna be working on integrating
another mod into ours.