More tweaking of file organization. Added the Utilities module back into the Navigation module.