Starting to impose more structure on the library.