moved class to file