Moving some dependencies around