diff --git a/src/test/java/com/casper/sdk/service/impl/event/AbstractEvent.java b/src/main/java/com/casper/sdk/service/impl/event/AbstractEvent.java
similarity index 100%
rename from src/test/java/com/casper/sdk/service/impl/event/AbstractEvent.java
rename to src/main/java/com/casper/sdk/service/impl/event/AbstractEvent.java
diff --git a/src/test/java/com/casper/sdk/service/impl/event/CLTypeErrorsTest.java b/src/main/java/com/casper/sdk/service/impl/event/CLTypeErrorsTest.java
similarity index 100%
rename from src/test/java/com/casper/sdk/service/impl/event/CLTypeErrorsTest.java
rename to src/main/java/com/casper/sdk/service/impl/event/CLTypeErrorsTest.java
diff --git a/src/test/java/com/casper/sdk/service/impl/event/EventBuilder.java b/src/main/java/com/casper/sdk/service/impl/event/EventBuilder.java
similarity index 100%
rename from src/test/java/com/casper/sdk/service/impl/event/EventBuilder.java
rename to src/main/java/com/casper/sdk/service/impl/event/EventBuilder.java
diff --git a/src/test/java/com/casper/sdk/service/impl/event/EventRoot.java b/src/main/java/com/casper/sdk/service/impl/event/EventRoot.java
similarity index 100%
rename from src/test/java/com/casper/sdk/service/impl/event/EventRoot.java
rename to src/main/java/com/casper/sdk/service/impl/event/EventRoot.java
diff --git a/src/test/java/com/casper/sdk/service/impl/event/EventServiceImpl.java b/src/main/java/com/casper/sdk/service/impl/event/EventServiceImpl.java
similarity index 100%
rename from src/test/java/com/casper/sdk/service/impl/event/EventServiceImpl.java
rename to src/main/java/com/casper/sdk/service/impl/event/EventServiceImpl.java
diff --git a/src/test/java/com/casper/sdk/service/impl/event/EventUrlBuilder.java b/src/main/java/com/casper/sdk/service/impl/event/EventUrlBuilder.java
similarity index 99%
rename from src/test/java/com/casper/sdk/service/impl/event/EventUrlBuilder.java
rename to src/main/java/com/casper/sdk/service/impl/event/EventUrlBuilder.java
index 2468b6e79..693981b27 100644
--- a/src/test/java/com/casper/sdk/service/impl/event/EventUrlBuilder.java
+++ b/src/main/java/com/casper/sdk/service/impl/event/EventUrlBuilder.java
@@ -45,6 +45,4 @@ private String buildParams(final Long startFrom) {
             return "";
         }
     }
-
-
 }
diff --git a/src/test/java/com/casper/sdk/service/impl/event/PojoEvent.java b/src/main/java/com/casper/sdk/service/impl/event/PojoEvent.java
similarity index 94%
rename from src/test/java/com/casper/sdk/service/impl/event/PojoEvent.java
rename to src/main/java/com/casper/sdk/service/impl/event/PojoEvent.java
index e234c32ad..44692dece 100644
--- a/src/test/java/com/casper/sdk/service/impl/event/PojoEvent.java
+++ b/src/main/java/com/casper/sdk/service/impl/event/PojoEvent.java
@@ -3,7 +3,6 @@
 import com.casper.sdk.model.event.EventType;
 import com.casper.sdk.model.event.EventData;
 import com.casper.sdk.model.event.EventTarget;
-import lombok.AllArgsConstructor;
 
 /**
  * An event that contains the event data as Pojo model returned from the event service when
diff --git a/src/test/java/com/casper/sdk/service/impl/event/RawEvent.java b/src/main/java/com/casper/sdk/service/impl/event/RawEvent.java
similarity index 100%
rename from src/test/java/com/casper/sdk/service/impl/event/RawEvent.java
rename to src/main/java/com/casper/sdk/service/impl/event/RawEvent.java
diff --git a/src/test/java/com/casper/sdk/service/impl/event/EventBuilderTest.java b/src/test/java/com/casper/sdk/service/impl/event/EventBuilderTest.java
index c8329e449..a9d6eef75 100644
--- a/src/test/java/com/casper/sdk/service/impl/event/EventBuilderTest.java
+++ b/src/test/java/com/casper/sdk/service/impl/event/EventBuilderTest.java
@@ -16,6 +16,7 @@
 import com.casper.sdk.model.event.step.Step;
 import com.casper.sdk.model.event.version.ApiVersion;
 import com.casper.sdk.model.key.PublicKey;
+
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/com/casper/sdk/service/impl/event/EventUrlBuilderTest.java b/src/test/java/com/casper/sdk/service/impl/event/EventUrlBuilderTest.java
index b918ded78..4b28490f5 100644
--- a/src/test/java/com/casper/sdk/service/impl/event/EventUrlBuilderTest.java
+++ b/src/test/java/com/casper/sdk/service/impl/event/EventUrlBuilderTest.java
@@ -11,8 +11,8 @@
 
 /**
  * Unit tests for the EventUrlBuilder
- * 
- * @author ian@meywood.com 
+ *
+ * @author ian@meywood.com
  */
 class EventUrlBuilderTest {