moving class to header
renaming driver file
fixing merge