Code Reorganization

Things were getting long (and about to get longer), broke things into chunks.

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