Move stuff around to be more organized