Refactoring test.
Close #8.
Consolidate packages. Util swallows data which does not grow hereafter.
Close #10.