This is a complete restructuring of the package to bring it to a state
from which we can move forward.