Finish Reorg

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