Added Library superclass
Changes to class structure mostly complete
Functionality mostly restored