Added and reorganised the extenral libs