Major Overhaul

Major Overhaul to the architecture of the library