Moved stuff around

Signed-off-by: Nicholas Kamper <kampernj@rose-hulman.edu>