Changes to the hypergraph for this specific project. Also, re-engineered
the package structure a bit.