Renamed and moved vector modules