moved class into lib folder