Moved code, doc. Renamed modes