Refactored the namespaces of Util and Graphics