moved dependencies a little bit