Fixed the library structure.