Moved dependencies to correct location