moved around some deps