Move dependencies to a single place
Merge