Moved some dependencies around