rearangging structures
Merge branch 'master' of https://github.com/abulovic/binner