Move depandencies form giro (which works)