moved dependencies to single files