Package reorganization

[meling]

Too much depends on the consensus package. This makes it very difficult to refactor anything; it is too easy to get import cycles with the current design. We need to rethink the package structure.