removed uneed library dulpicate classes, add search functionality