diff --git a/sawtooth-daml-common/src/main/java/com/blockchaintp/sawtooth/timekeeper/package-info.java b/sawtooth-daml-common/src/main/java/com/blockchaintp/sawtooth/timekeeper/package-info.java
deleted file mode 100644
index 4490cc09..00000000
--- a/sawtooth-daml-common/src/main/java/com/blockchaintp/sawtooth/timekeeper/package-info.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Blockchain Technology Partners
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-     http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-------------------------------------------------------------------------------*/
-
-/**
- * Contains common library utility methods and classes for sawtooth-timekeeper.
- */
-package com.blockchaintp.sawtooth.timekeeper;
diff --git a/sawtooth-daml-common/src/test/com/blockchaintp/sawtooth/daml/NamespaceTest.java b/sawtooth-daml-common/src/test/com/blockchaintp/sawtooth/daml/NamespaceTest.java
index d724b60c..7ec18b38 100644
--- a/sawtooth-daml-common/src/test/com/blockchaintp/sawtooth/daml/NamespaceTest.java
+++ b/sawtooth-daml-common/src/test/com/blockchaintp/sawtooth/daml/NamespaceTest.java
@@ -15,13 +15,11 @@
 
 import org.junit.Test;
 
-import com.blockchaintp.sawtooth.timekeeper.Namespace;
-
 public class NamespaceTest {
 
   @Test
   public void testMakeAddress() {
-    String testString = Namespace.makeAddress(Namespace.getNameSpace(), "somerandomString");
+    var testString = Namespace.makeAddress(Namespace.getNameSpace(), "somerandomString");
     assertTrue(testString.length() == 70);
   }
 
diff --git a/sawtooth-daml-rpc/pom.xml b/sawtooth-daml-rpc/pom.xml
index c0ff632a..f7257782 100644
--- a/sawtooth-daml-rpc/pom.xml
+++ b/sawtooth-daml-rpc/pom.xml
@@ -219,6 +219,11 @@
       <artifactId>daml-on-sawtooth-protobufs</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
+    <dependency>
+      <groupId>daml-on-sawtooth</groupId>
+      <artifactId>timekeeper</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.hyperledger.sawtooth</groupId>
       <artifactId>sawtooth-sdk-transaction-processor</artifactId>
diff --git a/sawtooth-daml-tp/pom.xml b/sawtooth-daml-tp/pom.xml
index 6545c9ac..364656c6 100644
--- a/sawtooth-daml-tp/pom.xml
+++ b/sawtooth-daml-tp/pom.xml
@@ -121,6 +121,11 @@
       <artifactId>sawtooth-daml-common</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
+    <dependency>
+      <groupId>daml-on-sawtooth</groupId>
+      <artifactId>timekeeper</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
     <dependency>
       <groupId>daml-on-sawtooth</groupId>
       <artifactId>daml-on-sawtooth-protobufs</artifactId>
diff --git a/sawtooth-daml-common/src/main/java/com/blockchaintp/sawtooth/timekeeper/EventConstants.java b/timekeeper/src/main/java/com/blockchaintp/sawtooth/timekeeper/EventConstants.java
similarity index 100%
rename from sawtooth-daml-common/src/main/java/com/blockchaintp/sawtooth/timekeeper/EventConstants.java
rename to timekeeper/src/main/java/com/blockchaintp/sawtooth/timekeeper/EventConstants.java
diff --git a/sawtooth-daml-common/src/main/java/com/blockchaintp/sawtooth/timekeeper/Namespace.java b/timekeeper/src/main/java/com/blockchaintp/sawtooth/timekeeper/Namespace.java
similarity index 100%
rename from sawtooth-daml-common/src/main/java/com/blockchaintp/sawtooth/timekeeper/Namespace.java
rename to timekeeper/src/main/java/com/blockchaintp/sawtooth/timekeeper/Namespace.java