rewire package
code reorganized per submodule