Updated libs and structure.