Removing module.  Adding utilities.
Building out enum support in app.