Switch to library management oriented structure