Oops, major bug.
Move to util sub-package
Better support for snapshotting and other refactorings.