Moved stf classes