add grape lib
remove some files
merge conflicts