remove some unused class in util
reorganized project