Reorganizing and updating dependencies