Move dependencies to the main tree (2/2)