Added all the new jars, scripts etc, updated classpath, deleted some unused imports