moved class. related to #17