Restructure
Merge branch 'develop' of https://github.com/libris/kitin into develop