Reorganizing dependencies.