updated version
moved dependencies