removed local references to m2v
reorganised dependencies