Renamed and moved a class