moved class to separate file