moved some dependencies around