Move everything around
Merge pull request #31 from phadej/gen-arb

Move everything around