diff --git a/HyperMake b/HyperMake
index b966419..03531b2 100644
--- a/HyperMake
+++ b/HyperMake
@@ -86,8 +86,8 @@ targets:
     after:
       - toolchain
     watches:
-      - src/vendor/manifest
-    workdir: src
+      - vendor/manifest
+    workdir: .
     cmds:
       - gvt restore
 
@@ -95,5 +95,5 @@ settings:
   default-targets:
     - ci
   docker:
-    image: 'vmware/cascade-kcl-toolchain:latest'
-    src-volume: /home/cascade-kinesis-client
+    image: 'vmware/cascade-toolchain:0.0.9'
+    src-volume: /go/src/vmware.com/cascade-kinesis-client
diff --git a/src/vmware.com/cascade-kinesis-client/clientlibrary/common/errors.go b/clientlibrary/common/errors.go
similarity index 100%
rename from src/vmware.com/cascade-kinesis-client/clientlibrary/common/errors.go
rename to clientlibrary/common/errors.go
diff --git a/src/vmware.com/cascade-kinesis-client/clientlibrary/config/config.go b/clientlibrary/config/config.go
similarity index 100%
rename from src/vmware.com/cascade-kinesis-client/clientlibrary/config/config.go
rename to clientlibrary/config/config.go
diff --git a/src/vmware.com/cascade-kinesis-client/clientlibrary/config/config_test.go b/clientlibrary/config/config_test.go
similarity index 100%
rename from src/vmware.com/cascade-kinesis-client/clientlibrary/config/config_test.go
rename to clientlibrary/config/config_test.go
diff --git a/src/vmware.com/cascade-kinesis-client/clientlibrary/config/initial-stream-pos.go b/clientlibrary/config/initial-stream-pos.go
similarity index 100%
rename from src/vmware.com/cascade-kinesis-client/clientlibrary/config/initial-stream-pos.go
rename to clientlibrary/config/initial-stream-pos.go
diff --git a/src/vmware.com/cascade-kinesis-client/clientlibrary/config/kcl-config.go b/clientlibrary/config/kcl-config.go
similarity index 100%
rename from src/vmware.com/cascade-kinesis-client/clientlibrary/config/kcl-config.go
rename to clientlibrary/config/kcl-config.go
diff --git a/src/vmware.com/cascade-kinesis-client/clientlibrary/interfaces/inputs.go b/clientlibrary/interfaces/inputs.go
similarity index 100%
rename from src/vmware.com/cascade-kinesis-client/clientlibrary/interfaces/inputs.go
rename to clientlibrary/interfaces/inputs.go
diff --git a/src/vmware.com/cascade-kinesis-client/clientlibrary/interfaces/record-processor-checkpointer.go b/clientlibrary/interfaces/record-processor-checkpointer.go
similarity index 100%
rename from src/vmware.com/cascade-kinesis-client/clientlibrary/interfaces/record-processor-checkpointer.go
rename to clientlibrary/interfaces/record-processor-checkpointer.go
diff --git a/src/vmware.com/cascade-kinesis-client/clientlibrary/interfaces/record-processor.go b/clientlibrary/interfaces/record-processor.go
similarity index 100%
rename from src/vmware.com/cascade-kinesis-client/clientlibrary/interfaces/record-processor.go
rename to clientlibrary/interfaces/record-processor.go
diff --git a/src/vmware.com/cascade-kinesis-client/clientlibrary/interfaces/sequence-number.go b/clientlibrary/interfaces/sequence-number.go
similarity index 100%
rename from src/vmware.com/cascade-kinesis-client/clientlibrary/interfaces/sequence-number.go
rename to clientlibrary/interfaces/sequence-number.go
diff --git a/src/vmware.com/cascade-kinesis-client/clientlibrary/metrics/cloudwatch.go b/clientlibrary/metrics/cloudwatch.go
similarity index 100%
rename from src/vmware.com/cascade-kinesis-client/clientlibrary/metrics/cloudwatch.go
rename to clientlibrary/metrics/cloudwatch.go
diff --git a/src/vmware.com/cascade-kinesis-client/clientlibrary/metrics/interfaces.go b/clientlibrary/metrics/interfaces.go
similarity index 100%
rename from src/vmware.com/cascade-kinesis-client/clientlibrary/metrics/interfaces.go
rename to clientlibrary/metrics/interfaces.go
diff --git a/src/vmware.com/cascade-kinesis-client/clientlibrary/metrics/prometheus.go b/clientlibrary/metrics/prometheus.go
similarity index 100%
rename from src/vmware.com/cascade-kinesis-client/clientlibrary/metrics/prometheus.go
rename to clientlibrary/metrics/prometheus.go
diff --git a/src/vmware.com/cascade-kinesis-client/clientlibrary/utils/random.go b/clientlibrary/utils/random.go
similarity index 100%
rename from src/vmware.com/cascade-kinesis-client/clientlibrary/utils/random.go
rename to clientlibrary/utils/random.go
diff --git a/src/vmware.com/cascade-kinesis-client/clientlibrary/utils/uuid.go b/clientlibrary/utils/uuid.go
similarity index 100%
rename from src/vmware.com/cascade-kinesis-client/clientlibrary/utils/uuid.go
rename to clientlibrary/utils/uuid.go
diff --git a/src/vmware.com/cascade-kinesis-client/clientlibrary/worker/checkpointer.go b/clientlibrary/worker/checkpointer.go
similarity index 100%
rename from src/vmware.com/cascade-kinesis-client/clientlibrary/worker/checkpointer.go
rename to clientlibrary/worker/checkpointer.go
diff --git a/src/vmware.com/cascade-kinesis-client/clientlibrary/worker/record-processor-checkpointer.go b/clientlibrary/worker/record-processor-checkpointer.go
similarity index 100%
rename from src/vmware.com/cascade-kinesis-client/clientlibrary/worker/record-processor-checkpointer.go
rename to clientlibrary/worker/record-processor-checkpointer.go
diff --git a/src/vmware.com/cascade-kinesis-client/clientlibrary/worker/shard-consumer.go b/clientlibrary/worker/shard-consumer.go
similarity index 100%
rename from src/vmware.com/cascade-kinesis-client/clientlibrary/worker/shard-consumer.go
rename to clientlibrary/worker/shard-consumer.go
diff --git a/src/vmware.com/cascade-kinesis-client/clientlibrary/worker/worker.go b/clientlibrary/worker/worker.go
similarity index 100%
rename from src/vmware.com/cascade-kinesis-client/clientlibrary/worker/worker.go
rename to clientlibrary/worker/worker.go
diff --git a/src/vmware.com/cascade-kinesis-client/clientlibrary/worker/worker_test.go b/clientlibrary/worker/worker_test.go
similarity index 100%
rename from src/vmware.com/cascade-kinesis-client/clientlibrary/worker/worker_test.go
rename to clientlibrary/worker/worker_test.go
diff --git a/src/vendor/manifest b/vendor/manifest
similarity index 100%
rename from src/vendor/manifest
rename to vendor/manifest