Deprecated classes
Renamed and moved variators around