repackaging: some classes moved to book package (synchronization with library-service branch)
Merge branch 'master' into multidirs