Moved some dependencies around.