Better organization of the library