Move dependencies to more natural place