Moved types from Tools to Utilities namespace.