Major updates according to the change in the package structure of the library.