structure changes
Merge branch 'develop' of https://github.com/marsteff/BiBo into develop