diff --git a/libs/finagger/src/main/java/io/cactacea/finagger/SwaggerTypeRegister.java b/libs/finagger/src/main/java/io/github/cactacea/finagger/SwaggerTypeRegister.java
similarity index 96%
rename from libs/finagger/src/main/java/io/cactacea/finagger/SwaggerTypeRegister.java
rename to libs/finagger/src/main/java/io/github/cactacea/finagger/SwaggerTypeRegister.java
index d6f4ff8b..cec7b262 100644
--- a/libs/finagger/src/main/java/io/cactacea/finagger/SwaggerTypeRegister.java
+++ b/libs/finagger/src/main/java/io/github/cactacea/finagger/SwaggerTypeRegister.java
@@ -1,4 +1,4 @@
-package io.cactacea.finagger;
+package io.github.cactacea.finagger;
 
 import io.swagger.util.PrimitiveType;
 
diff --git a/libs/finagger/src/main/java/io/cactacea/finagger/interfaces/CorrelationIdGetter.java b/libs/finagger/src/main/java/io/github/cactacea/finagger/interfaces/CorrelationIdGetter.java
similarity index 66%
rename from libs/finagger/src/main/java/io/cactacea/finagger/interfaces/CorrelationIdGetter.java
rename to libs/finagger/src/main/java/io/github/cactacea/finagger/interfaces/CorrelationIdGetter.java
index 32019411..203a73f8 100644
--- a/libs/finagger/src/main/java/io/cactacea/finagger/interfaces/CorrelationIdGetter.java
+++ b/libs/finagger/src/main/java/io/github/cactacea/finagger/interfaces/CorrelationIdGetter.java
@@ -1,4 +1,4 @@
-package io.cactacea.finagger.interfaces;
+package io.github.cactacea.finagger.interfaces;
 
 import java.util.UUID;
 
diff --git a/libs/finagger/src/main/java/io/cactacea/finagger/interfaces/CorrelationIdSetter.java b/libs/finagger/src/main/java/io/github/cactacea/finagger/interfaces/CorrelationIdSetter.java
similarity index 70%
rename from libs/finagger/src/main/java/io/cactacea/finagger/interfaces/CorrelationIdSetter.java
rename to libs/finagger/src/main/java/io/github/cactacea/finagger/interfaces/CorrelationIdSetter.java
index ac5ba619..1441790f 100644
--- a/libs/finagger/src/main/java/io/cactacea/finagger/interfaces/CorrelationIdSetter.java
+++ b/libs/finagger/src/main/java/io/github/cactacea/finagger/interfaces/CorrelationIdSetter.java
@@ -1,4 +1,4 @@
-package io.cactacea.finagger.interfaces;
+package io.github.cactacea.finagger.interfaces;
 
 import java.util.UUID;
 
diff --git a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/DoubleValue.java b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/DoubleValue.java
similarity index 81%
rename from libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/DoubleValue.java
rename to libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/DoubleValue.java
index 4aeeb177..4a7bd416 100644
--- a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/DoubleValue.java
+++ b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/DoubleValue.java
@@ -1,6 +1,6 @@
-package io.cactacea.finagger.valuetypes;
+package io.github.cactacea.finagger.valuetypes;
 
-import io.cactacea.finagger.valuetypes.annotations.WrapsValueType;
+import io.github.cactacea.finagger.valuetypes.annotations.WrapsValueType;
 import lombok.NonNull;
 
 import javax.annotation.Nonnull;
diff --git a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/HasValue.java b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/HasValue.java
similarity index 87%
rename from libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/HasValue.java
rename to libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/HasValue.java
index 04062e20..19704462 100644
--- a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/HasValue.java
+++ b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/HasValue.java
@@ -1,4 +1,4 @@
-package io.cactacea.finagger.valuetypes;
+package io.github.cactacea.finagger.valuetypes;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
diff --git a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/IntegerValue.java b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/IntegerValue.java
similarity index 81%
rename from libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/IntegerValue.java
rename to libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/IntegerValue.java
index 11953c17..676f2e8a 100644
--- a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/IntegerValue.java
+++ b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/IntegerValue.java
@@ -1,6 +1,6 @@
-package io.cactacea.finagger.valuetypes;
+package io.github.cactacea.finagger.valuetypes;
 
-import io.cactacea.finagger.valuetypes.annotations.WrapsValueType;
+import io.github.cactacea.finagger.valuetypes.annotations.WrapsValueType;
 import lombok.NonNull;
 
 import javax.annotation.Nonnull;
diff --git a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/LongValue.java b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/LongValue.java
similarity index 80%
rename from libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/LongValue.java
rename to libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/LongValue.java
index 64ca40eb..c407d59f 100644
--- a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/LongValue.java
+++ b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/LongValue.java
@@ -1,6 +1,6 @@
-package io.cactacea.finagger.valuetypes;
+package io.github.cactacea.finagger.valuetypes;
 
-import io.cactacea.finagger.valuetypes.annotations.WrapsValueType;
+import io.github.cactacea.finagger.valuetypes.annotations.WrapsValueType;
 import lombok.NonNull;
 
 import javax.annotation.Nonnull;
diff --git a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/StringValue.java b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/StringValue.java
similarity index 90%
rename from libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/StringValue.java
rename to libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/StringValue.java
index 6ceab944..71f33d09 100644
--- a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/StringValue.java
+++ b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/StringValue.java
@@ -1,7 +1,7 @@
-package io.cactacea.finagger.valuetypes;
+package io.github.cactacea.finagger.valuetypes;
 
 import com.google.common.base.CharMatcher;
-import io.cactacea.finagger.valuetypes.annotations.WrapsValueType;
+import io.github.cactacea.finagger.valuetypes.annotations.WrapsValueType;
 import lombok.NonNull;
 
 import javax.annotation.Nonnull;
diff --git a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/UuidValue.java b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/UuidValue.java
similarity index 81%
rename from libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/UuidValue.java
rename to libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/UuidValue.java
index bce6fb24..ce4bc485 100644
--- a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/UuidValue.java
+++ b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/UuidValue.java
@@ -1,6 +1,6 @@
-package io.cactacea.finagger.valuetypes;
+package io.github.cactacea.finagger.valuetypes;
 
-import io.cactacea.finagger.valuetypes.annotations.WrapsValueType;
+import io.github.cactacea.finagger.valuetypes.annotations.WrapsValueType;
 import lombok.NonNull;
 
 import javax.annotation.Nonnull;
diff --git a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/Value.java b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/Value.java
similarity index 89%
rename from libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/Value.java
rename to libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/Value.java
index e668cb56..9c454bf5 100644
--- a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/Value.java
+++ b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/Value.java
@@ -1,7 +1,7 @@
-package io.cactacea.finagger.valuetypes;
+package io.github.cactacea.finagger.valuetypes;
 
 import com.fasterxml.jackson.annotation.JsonValue;
-import io.cactacea.finagger.valuetypes.adapters.xml.JaxbValueAdapter;
+import io.github.cactacea.finagger.valuetypes.adapters.xml.JaxbValueAdapter;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
 
diff --git a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/ValueTypeWrapper.java b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/ValueTypeWrapper.java
similarity index 75%
rename from libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/ValueTypeWrapper.java
rename to libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/ValueTypeWrapper.java
index 24a51565..9bc46742 100644
--- a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/ValueTypeWrapper.java
+++ b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/ValueTypeWrapper.java
@@ -1,4 +1,4 @@
-package io.cactacea.finagger.valuetypes;
+package io.github.cactacea.finagger.valuetypes;
 
 import java.io.Serializable;
 
diff --git a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/adapters/xml/JaxbDoubleValueAdapter.java b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/adapters/xml/JaxbDoubleValueAdapter.java
similarity index 51%
rename from libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/adapters/xml/JaxbDoubleValueAdapter.java
rename to libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/adapters/xml/JaxbDoubleValueAdapter.java
index 069eaab3..22566dbd 100644
--- a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/adapters/xml/JaxbDoubleValueAdapter.java
+++ b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/adapters/xml/JaxbDoubleValueAdapter.java
@@ -1,6 +1,6 @@
-package io.cactacea.finagger.valuetypes.adapters.xml;
+package io.github.cactacea.finagger.valuetypes.adapters.xml;
 
-import io.cactacea.finagger.valuetypes.DoubleValue;
+import io.github.cactacea.finagger.valuetypes.DoubleValue;
 
 public abstract class JaxbDoubleValueAdapter<ValueClass extends DoubleValue> extends JaxbValueAdapter<Double, ValueClass> { }
 
diff --git a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/adapters/xml/JaxbIntegerValueAdapter.java b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/adapters/xml/JaxbIntegerValueAdapter.java
similarity index 51%
rename from libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/adapters/xml/JaxbIntegerValueAdapter.java
rename to libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/adapters/xml/JaxbIntegerValueAdapter.java
index 6aeec380..4db40570 100644
--- a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/adapters/xml/JaxbIntegerValueAdapter.java
+++ b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/adapters/xml/JaxbIntegerValueAdapter.java
@@ -1,5 +1,5 @@
-package io.cactacea.finagger.valuetypes.adapters.xml;
+package io.github.cactacea.finagger.valuetypes.adapters.xml;
 
-import io.cactacea.finagger.valuetypes.IntegerValue;
+import io.github.cactacea.finagger.valuetypes.IntegerValue;
 
 public abstract class JaxbIntegerValueAdapter<ValueClass extends IntegerValue> extends JaxbValueAdapter<Integer, ValueClass> { }
\ No newline at end of file
diff --git a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/adapters/xml/JaxbLongValueAdapter.java b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/adapters/xml/JaxbLongValueAdapter.java
similarity index 50%
rename from libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/adapters/xml/JaxbLongValueAdapter.java
rename to libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/adapters/xml/JaxbLongValueAdapter.java
index 89fc0f5c..4e29272d 100644
--- a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/adapters/xml/JaxbLongValueAdapter.java
+++ b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/adapters/xml/JaxbLongValueAdapter.java
@@ -1,5 +1,5 @@
-package io.cactacea.finagger.valuetypes.adapters.xml;
+package io.github.cactacea.finagger.valuetypes.adapters.xml;
 
-import io.cactacea.finagger.valuetypes.LongValue;
+import io.github.cactacea.finagger.valuetypes.LongValue;
 
 public abstract class JaxbLongValueAdapter<ValueClass extends LongValue> extends JaxbValueAdapter<Long, ValueClass> { }
\ No newline at end of file
diff --git a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/adapters/xml/JaxbStringValueAdapter.java b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/adapters/xml/JaxbStringValueAdapter.java
similarity index 53%
rename from libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/adapters/xml/JaxbStringValueAdapter.java
rename to libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/adapters/xml/JaxbStringValueAdapter.java
index fbd5fe44..e733a062 100644
--- a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/adapters/xml/JaxbStringValueAdapter.java
+++ b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/adapters/xml/JaxbStringValueAdapter.java
@@ -1,6 +1,6 @@
-package io.cactacea.finagger.valuetypes.adapters.xml;
+package io.github.cactacea.finagger.valuetypes.adapters.xml;
 
-import io.cactacea.finagger.valuetypes.StringValue;
+import io.github.cactacea.finagger.valuetypes.StringValue;
 
 public abstract class JaxbStringValueAdapter<ValueClass extends StringValue>
         extends JaxbValueAdapter<String, ValueClass> {
diff --git a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/adapters/xml/JaxbUuidValueAdapter.java b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/adapters/xml/JaxbUuidValueAdapter.java
similarity index 55%
rename from libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/adapters/xml/JaxbUuidValueAdapter.java
rename to libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/adapters/xml/JaxbUuidValueAdapter.java
index b60668d5..a1b5b1a4 100644
--- a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/adapters/xml/JaxbUuidValueAdapter.java
+++ b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/adapters/xml/JaxbUuidValueAdapter.java
@@ -1,6 +1,6 @@
-package io.cactacea.finagger.valuetypes.adapters.xml;
+package io.github.cactacea.finagger.valuetypes.adapters.xml;
 
-import io.cactacea.finagger.valuetypes.UuidValue;
+import io.github.cactacea.finagger.valuetypes.UuidValue;
 
 import java.util.UUID;
 
diff --git a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/adapters/xml/JaxbValueAdapter.java b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/adapters/xml/JaxbValueAdapter.java
similarity index 92%
rename from libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/adapters/xml/JaxbValueAdapter.java
rename to libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/adapters/xml/JaxbValueAdapter.java
index 87e74697..c06a3e61 100644
--- a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/adapters/xml/JaxbValueAdapter.java
+++ b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/adapters/xml/JaxbValueAdapter.java
@@ -1,6 +1,6 @@
-package io.cactacea.finagger.valuetypes.adapters.xml;
+package io.github.cactacea.finagger.valuetypes.adapters.xml;
 
-import io.cactacea.finagger.valuetypes.Value;
+import io.github.cactacea.finagger.valuetypes.Value;
 
 import javax.annotation.Nullable;
 import javax.xml.bind.annotation.adapters.XmlAdapter;
diff --git a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/annotations/WrapsValueType.java b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/annotations/WrapsValueType.java
similarity index 75%
rename from libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/annotations/WrapsValueType.java
rename to libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/annotations/WrapsValueType.java
index a5c08474..a61c88d7 100644
--- a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/annotations/WrapsValueType.java
+++ b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/annotations/WrapsValueType.java
@@ -1,4 +1,4 @@
-package io.cactacea.finagger.valuetypes.annotations;
+package io.github.cactacea.finagger.valuetypes.annotations;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/locator/ValueTypeLocator.java b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/locator/ValueTypeLocator.java
similarity index 91%
rename from libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/locator/ValueTypeLocator.java
rename to libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/locator/ValueTypeLocator.java
index bcce1d2a..8884fee4 100644
--- a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/locator/ValueTypeLocator.java
+++ b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/locator/ValueTypeLocator.java
@@ -1,10 +1,10 @@
-package io.cactacea.finagger.valuetypes.locator;
+package io.github.cactacea.finagger.valuetypes.locator;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
-import io.cactacea.finagger.valuetypes.StringValue;
-import io.cactacea.finagger.valuetypes.Value;
-import io.cactacea.finagger.valuetypes.annotations.WrapsValueType;
+import io.github.cactacea.finagger.valuetypes.Value;
+import io.github.cactacea.finagger.valuetypes.annotations.WrapsValueType;
+import io.github.cactacea.finagger.valuetypes.StringValue;
 import org.reflections.Reflections;
 import org.reflections.util.ClasspathHelper;
 import org.reflections.util.ConfigurationBuilder;
diff --git a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/locator/ValueTypeLocatorResult.java b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/locator/ValueTypeLocatorResult.java
similarity index 71%
rename from libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/locator/ValueTypeLocatorResult.java
rename to libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/locator/ValueTypeLocatorResult.java
index 14daaf66..59c024e3 100644
--- a/libs/finagger/src/main/java/io/cactacea/finagger/valuetypes/locator/ValueTypeLocatorResult.java
+++ b/libs/finagger/src/main/java/io/github/cactacea/finagger/valuetypes/locator/ValueTypeLocatorResult.java
@@ -1,4 +1,4 @@
-package io.cactacea.finagger.valuetypes.locator;
+package io.github.cactacea.finagger.valuetypes.locator;
 
 import lombok.Data;