Move dependencies to proper place