diff --git a/README.md b/README.md
index 787d3d9..6e4ca21 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Add these lines to your `pom.xml`.
 <dependency>
   <groupId>com.github.f4b6a3</groupId>
   <artifactId>ulid-creator</artifactId>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
 </dependency>
 ```
 See more options in [maven.org](https://search.maven.org/artifact/com.github.f4b6a3/ulid-creator).
diff --git a/src/main/java/com/github/f4b6a3/ulid/UlidCreator.java b/src/main/java/com/github/f4b6a3/ulid/UlidCreator.java
index 8608ee6..f5ba04c 100644
--- a/src/main/java/com/github/f4b6a3/ulid/UlidCreator.java
+++ b/src/main/java/com/github/f4b6a3/ulid/UlidCreator.java
@@ -24,9 +24,9 @@
 
 package com.github.f4b6a3.ulid;
 
-import com.github.f4b6a3.ulid.creator.MonotonicUlidFactory;
-import com.github.f4b6a3.ulid.creator.UlidFactory;
-import com.github.f4b6a3.ulid.creator.DefaultUlidFactory;
+import com.github.f4b6a3.ulid.factory.DefaultUlidFactory;
+import com.github.f4b6a3.ulid.factory.MonotonicUlidFactory;
+import com.github.f4b6a3.ulid.factory.UlidFactory;
 
 /**
  * Facade to the ULID factories.
diff --git a/src/main/java/com/github/f4b6a3/ulid/creator/DefaultUlidFactory.java b/src/main/java/com/github/f4b6a3/ulid/factory/DefaultUlidFactory.java
similarity index 97%
rename from src/main/java/com/github/f4b6a3/ulid/creator/DefaultUlidFactory.java
rename to src/main/java/com/github/f4b6a3/ulid/factory/DefaultUlidFactory.java
index 4d83c98..f3c28d9 100644
--- a/src/main/java/com/github/f4b6a3/ulid/creator/DefaultUlidFactory.java
+++ b/src/main/java/com/github/f4b6a3/ulid/factory/DefaultUlidFactory.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package com.github.f4b6a3.ulid.creator;
+package com.github.f4b6a3.ulid.factory;
 
 import com.github.f4b6a3.ulid.Ulid;
 
diff --git a/src/main/java/com/github/f4b6a3/ulid/creator/MonotonicUlidFactory.java b/src/main/java/com/github/f4b6a3/ulid/factory/MonotonicUlidFactory.java
similarity index 98%
rename from src/main/java/com/github/f4b6a3/ulid/creator/MonotonicUlidFactory.java
rename to src/main/java/com/github/f4b6a3/ulid/factory/MonotonicUlidFactory.java
index 765e42b..70fe807 100644
--- a/src/main/java/com/github/f4b6a3/ulid/creator/MonotonicUlidFactory.java
+++ b/src/main/java/com/github/f4b6a3/ulid/factory/MonotonicUlidFactory.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package com.github.f4b6a3.ulid.creator;
+package com.github.f4b6a3.ulid.factory;
 
 import com.github.f4b6a3.ulid.Ulid;
 
diff --git a/src/main/java/com/github/f4b6a3/ulid/creator/UlidFactory.java b/src/main/java/com/github/f4b6a3/ulid/factory/UlidFactory.java
similarity index 98%
rename from src/main/java/com/github/f4b6a3/ulid/creator/UlidFactory.java
rename to src/main/java/com/github/f4b6a3/ulid/factory/UlidFactory.java
index 100283b..dda581e 100644
--- a/src/main/java/com/github/f4b6a3/ulid/creator/UlidFactory.java
+++ b/src/main/java/com/github/f4b6a3/ulid/factory/UlidFactory.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package com.github.f4b6a3.ulid.creator;
+package com.github.f4b6a3.ulid.factory;
 
 import java.util.Random;
 
diff --git a/src/test/java/com/github/f4b6a3/ulid/TestSuite.java b/src/test/java/com/github/f4b6a3/ulid/TestSuite.java
index 894649e..b51f9ce 100644
--- a/src/test/java/com/github/f4b6a3/ulid/TestSuite.java
+++ b/src/test/java/com/github/f4b6a3/ulid/TestSuite.java
@@ -3,8 +3,8 @@ package com.github.f4b6a3.ulid;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
-import com.github.f4b6a3.ulid.creator.MonotonicUlidFactoryTest;
-import com.github.f4b6a3.ulid.creator.DefaultUlidFactoryTest;
+import com.github.f4b6a3.ulid.factory.DefaultUlidFactoryTest;
+import com.github.f4b6a3.ulid.factory.MonotonicUlidFactoryTest;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
diff --git a/src/test/java/com/github/f4b6a3/ulid/UniquenessTest.java b/src/test/java/com/github/f4b6a3/ulid/UniquenessTest.java
index dfd4761..41a25a5 100644
--- a/src/test/java/com/github/f4b6a3/ulid/UniquenessTest.java
+++ b/src/test/java/com/github/f4b6a3/ulid/UniquenessTest.java
@@ -2,7 +2,7 @@ package com.github.f4b6a3.ulid;
 
 import java.util.HashSet;
 import com.github.f4b6a3.ulid.UlidCreator;
-import com.github.f4b6a3.ulid.creator.UlidFactory;
+import com.github.f4b6a3.ulid.factory.UlidFactory;
 
 /**
  * 
diff --git a/src/test/java/com/github/f4b6a3/ulid/creator/DefaultUlidFactoryTest.java b/src/test/java/com/github/f4b6a3/ulid/factory/DefaultUlidFactoryTest.java
similarity index 96%
rename from src/test/java/com/github/f4b6a3/ulid/creator/DefaultUlidFactoryTest.java
rename to src/test/java/com/github/f4b6a3/ulid/factory/DefaultUlidFactoryTest.java
index ad25361..f9765f2 100644
--- a/src/test/java/com/github/f4b6a3/ulid/creator/DefaultUlidFactoryTest.java
+++ b/src/test/java/com/github/f4b6a3/ulid/factory/DefaultUlidFactoryTest.java
@@ -1,9 +1,10 @@
-package com.github.f4b6a3.ulid.creator;
+package com.github.f4b6a3.ulid.factory;
 
 import org.junit.Test;
 
 import com.github.f4b6a3.ulid.Ulid;
 import com.github.f4b6a3.ulid.UlidCreator;
+import com.github.f4b6a3.ulid.factory.UlidFactory;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/com/github/f4b6a3/ulid/creator/MonotonicUlidFactoryTest.java b/src/test/java/com/github/f4b6a3/ulid/factory/MonotonicUlidFactoryTest.java
similarity index 96%
rename from src/test/java/com/github/f4b6a3/ulid/creator/MonotonicUlidFactoryTest.java
rename to src/test/java/com/github/f4b6a3/ulid/factory/MonotonicUlidFactoryTest.java
index 0823f64..45443ae 100644
--- a/src/test/java/com/github/f4b6a3/ulid/creator/MonotonicUlidFactoryTest.java
+++ b/src/test/java/com/github/f4b6a3/ulid/factory/MonotonicUlidFactoryTest.java
@@ -1,9 +1,10 @@
-package com.github.f4b6a3.ulid.creator;
+package com.github.f4b6a3.ulid.factory;
 
 import org.junit.Test;
 
 import com.github.f4b6a3.ulid.Ulid;
 import com.github.f4b6a3.ulid.UlidCreator;
+import com.github.f4b6a3.ulid.factory.UlidFactory;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/com/github/f4b6a3/ulid/creator/UlidFactoryTest.java b/src/test/java/com/github/f4b6a3/ulid/factory/UlidFactoryTest.java
similarity index 93%
rename from src/test/java/com/github/f4b6a3/ulid/creator/UlidFactoryTest.java
rename to src/test/java/com/github/f4b6a3/ulid/factory/UlidFactoryTest.java
index 46a26db..55e049b 100644
--- a/src/test/java/com/github/f4b6a3/ulid/creator/UlidFactoryTest.java
+++ b/src/test/java/com/github/f4b6a3/ulid/factory/UlidFactoryTest.java
@@ -1,10 +1,12 @@
-package com.github.f4b6a3.ulid.creator;
+package com.github.f4b6a3.ulid.factory;
 
 import java.util.HashSet;
 import java.util.Random;
 import java.util.Set;
 import java.util.UUID;
 
+import com.github.f4b6a3.ulid.factory.UlidFactory;
+
 public abstract class UlidFactoryTest {
 
 	protected static final int DEFAULT_LOOP_MAX = 10_000;