some changes. changed libs structure for eclipse