Moved stuff around to clean up my code base a bit