added and removed couple if classes
added libs