added test suite, reordered packages