Removed duplicate assertion
Moved some classes out of org.gradle.util.