Moved the util classes to flow-commons