update libraries. reorganizing of source files