diff --git a/bin/stream_logs_to_gsheets.sh b/bin/stream_logs_to_gsheets.sh
index 958bcfb129..c7aad9092e 100755
--- a/bin/stream_logs_to_gsheets.sh
+++ b/bin/stream_logs_to_gsheets.sh
@@ -1,21 +1,18 @@
 #!/bin/bash
 
 UDMI_ROOT=$(realpath $(dirname $0)/..)
-UDMIS_JAR=$UDMI_ROOT/udmis/build/libs/udmis-1.0-SNAPSHOT-all.jar
-
-
 
 source $UDMI_ROOT/etc/shell_common.sh
 
-if [[ ! -f "$UDMIS_JAR" ]]; then
-  $UDMI_ROOT/udmis/bin/build
-fi
+[[ ! -d $UDMI_ROOT/validator/src ]] ||
+    up_to_date $UDMI_JAR $UDMI_ROOT/validator/src ||
+    $UDMI_ROOT/validator/bin/build
 
 JAVA_CLASS=com.google.udmi.util.GSheetsOutputStream
 
 timestamp=$(date +%Y%m%d_%H%M%S)
 stream_to_gsheets() {
-  java -cp $UDMIS_JAR $JAVA_CLASS "registrar" \
+  java -cp $UDMI_JAR $JAVA_CLASS "registrar" \
   "12leoCVQpdXx6MdKlVCCI4O1mi35dOTw_FxDMBetuwXQ" "registrar.$timestamp.log"
 }
 
diff --git a/etc/shell_common.sh b/etc/shell_common.sh
index f184d53128..e8074e9a36 100644
--- a/etc/shell_common.sh
+++ b/etc/shell_common.sh
@@ -83,7 +83,6 @@ function pubber_bg {
 UDMI_ROOT=$(realpath $UDMI_ROOT)
 
 UDMI_JAR=$UDMI_ROOT/validator/build/libs/validator-1.0-SNAPSHOT-all.jar
-UDMIS_JAR=$UDMI_ROOT/udmis/build/libs/udmis-1.0-SNAPSHOT-all.jar
 
 VERSION_BASE='1.*'
 
diff --git a/common/src/main/java/com/google/udmi/util/DualOutputStream.java b/validator/src/main/java/com/google/udmi/util/DualOutputStream.java
similarity index 100%
rename from common/src/main/java/com/google/udmi/util/DualOutputStream.java
rename to validator/src/main/java/com/google/udmi/util/DualOutputStream.java
diff --git a/common/src/main/java/com/google/udmi/util/GSheetsOutputStream.java b/validator/src/main/java/com/google/udmi/util/GSheetsOutputStream.java
similarity index 100%
rename from common/src/main/java/com/google/udmi/util/GSheetsOutputStream.java
rename to validator/src/main/java/com/google/udmi/util/GSheetsOutputStream.java