Reorganization to pure library.