Tidy Up

More clean-up of the repository to make it more manageable and clear for people outside Seth's head.

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>