Cs 3420 Cleanup

I did some miscellaneous refactoring and cleanup. The directory should be clean and a little more organized now.