Organize the lib hierarchy