0.20  add some tests
      re-organize the module