Looks nice, could you make the long corridors into some sort of gallery, say have paintings of former headmasters there?

There is a thread round here somewhere of somebody who was doing a library and there was quite a big discussion about bookshelves there, so I would hunt for that.