some restructuring
Merge branch 'master' of github.com:/libris/librisxl