some cleanup
cleaned up the package and cmake file