a little cleanup and moving of some modules into the Util:: namespace