Some changes in the structure of library.
Merge conflict