Moving stuff around (I know its not a good commit message but I'm tired)