move ClassMethods in separate file