Some Major Cleanup. This is mostly all org.codehaus.groovy.* packages