diff --git a/src/main/lombok/module-info.java b/src/main/lombok/module-info.java
index bea3e58..142aea2 100644
--- a/src/main/lombok/module-info.java
+++ b/src/main/lombok/module-info.java
@@ -1,5 +1,6 @@
 module org.warp.filesponge {
 	exports org.warp.filesponge.api;
+	exports org.warp.filesponge.value;
 	requires lombok;
 	requires org.jetbrains.annotations;
 }
\ No newline at end of file
diff --git a/src/main/lombok/org/warp/filesponge/BaseMirrorFileSource.java b/src/main/lombok/org/warp/filesponge/BaseMirrorFileSource.java
index 232bb3f..8fc8db7 100644
--- a/src/main/lombok/org/warp/filesponge/BaseMirrorFileSource.java
+++ b/src/main/lombok/org/warp/filesponge/BaseMirrorFileSource.java
@@ -21,7 +21,7 @@ package org.warp.filesponge;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import org.warp.filesponge.api.FileSource;
-import org.warp.filesponge.api.MirrorURI;
+import org.warp.filesponge.value.MirrorURI;
 
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 public abstract class BaseMirrorFileSource implements FileSource {
diff --git a/src/main/lombok/org/warp/filesponge/SecureFileAccessor.java b/src/main/lombok/org/warp/filesponge/SecureFileAccessor.java
index 5ca944c..b33281d 100644
--- a/src/main/lombok/org/warp/filesponge/SecureFileAccessor.java
+++ b/src/main/lombok/org/warp/filesponge/SecureFileAccessor.java
@@ -25,9 +25,9 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.jetbrains.annotations.NotNull;
 import org.warp.filesponge.api.FileAccessor;
-import org.warp.filesponge.api.FileContent;
-import org.warp.filesponge.api.FileStatus;
-import org.warp.filesponge.api.FileURI;
+import org.warp.filesponge.value.FileContent;
+import org.warp.filesponge.value.FileStatus;
+import org.warp.filesponge.value.FileURI;
 
 /**
  * Prevent access to other methods via casting
diff --git a/src/main/lombok/org/warp/filesponge/api/FileAccessor.java b/src/main/lombok/org/warp/filesponge/api/FileAccessor.java
index b8e4589..0e52606 100644
--- a/src/main/lombok/org/warp/filesponge/api/FileAccessor.java
+++ b/src/main/lombok/org/warp/filesponge/api/FileAccessor.java
@@ -21,6 +21,9 @@ package org.warp.filesponge.api;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import org.jetbrains.annotations.NotNull;
+import org.warp.filesponge.value.FileContent;
+import org.warp.filesponge.value.FileStatus;
+import org.warp.filesponge.value.FileURI;
 
 /**
  * FileAccessor can be used to access files from the client side
diff --git a/src/main/lombok/org/warp/filesponge/api/FileActor.java b/src/main/lombok/org/warp/filesponge/api/FileActor.java
index d72ca97..9c27f7f 100644
--- a/src/main/lombok/org/warp/filesponge/api/FileActor.java
+++ b/src/main/lombok/org/warp/filesponge/api/FileActor.java
@@ -21,6 +21,7 @@ package org.warp.filesponge.api;
 import java.time.Duration;
 import java.util.Optional;
 import org.jetbrains.annotations.Nullable;
+import org.warp.filesponge.value.FileURI;
 
 /**
  * FileActor sends signals to a mirror
diff --git a/src/main/lombok/org/warp/filesponge/api/FileSource.java b/src/main/lombok/org/warp/filesponge/api/FileSource.java
index 5eabd4e..c8a31b5 100644
--- a/src/main/lombok/org/warp/filesponge/api/FileSource.java
+++ b/src/main/lombok/org/warp/filesponge/api/FileSource.java
@@ -20,6 +20,9 @@ package org.warp.filesponge.api;
 
 import java.nio.ByteBuffer;
 import org.jetbrains.annotations.NotNull;
+import org.warp.filesponge.value.FileSourceAvailability;
+import org.warp.filesponge.value.FileType;
+import org.warp.filesponge.value.FileURI;
 
 /**
  * FileSource receives responses from a mirror
diff --git a/src/main/lombok/org/warp/filesponge/api/FileAvailability.java b/src/main/lombok/org/warp/filesponge/value/FileAvailability.java
similarity index 96%
rename from src/main/lombok/org/warp/filesponge/api/FileAvailability.java
rename to src/main/lombok/org/warp/filesponge/value/FileAvailability.java
index 486b99c..bd7f062 100644
--- a/src/main/lombok/org/warp/filesponge/api/FileAvailability.java
+++ b/src/main/lombok/org/warp/filesponge/value/FileAvailability.java
@@ -16,7 +16,7 @@
  *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.warp.filesponge.api;
+package org.warp.filesponge.value;
 
 public enum FileAvailability {
 	UNKNOWN,
diff --git a/src/main/lombok/org/warp/filesponge/api/FileContent.java b/src/main/lombok/org/warp/filesponge/value/FileContent.java
similarity index 95%
rename from src/main/lombok/org/warp/filesponge/api/FileContent.java
rename to src/main/lombok/org/warp/filesponge/value/FileContent.java
index af0c871..ca6d226 100644
--- a/src/main/lombok/org/warp/filesponge/api/FileContent.java
+++ b/src/main/lombok/org/warp/filesponge/value/FileContent.java
@@ -16,6 +16,6 @@
  *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.warp.filesponge.api;
+package org.warp.filesponge.value;
 
 public interface FileContent {}
diff --git a/src/main/lombok/org/warp/filesponge/api/FileDataAvailability.java b/src/main/lombok/org/warp/filesponge/value/FileDataAvailability.java
similarity index 95%
rename from src/main/lombok/org/warp/filesponge/api/FileDataAvailability.java
rename to src/main/lombok/org/warp/filesponge/value/FileDataAvailability.java
index e92f0d5..1089ae1 100644
--- a/src/main/lombok/org/warp/filesponge/api/FileDataAvailability.java
+++ b/src/main/lombok/org/warp/filesponge/value/FileDataAvailability.java
@@ -16,7 +16,7 @@
  *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.warp.filesponge.api;
+package org.warp.filesponge.value;
 
 public enum FileDataAvailability {
 	UNAVAILABLE,
diff --git a/src/main/lombok/org/warp/filesponge/api/FileSourceAvailability.java b/src/main/lombok/org/warp/filesponge/value/FileSourceAvailability.java
similarity index 96%
rename from src/main/lombok/org/warp/filesponge/api/FileSourceAvailability.java
rename to src/main/lombok/org/warp/filesponge/value/FileSourceAvailability.java
index 310eb73..1fe338d 100644
--- a/src/main/lombok/org/warp/filesponge/api/FileSourceAvailability.java
+++ b/src/main/lombok/org/warp/filesponge/value/FileSourceAvailability.java
@@ -16,7 +16,7 @@
  *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.warp.filesponge.api;
+package org.warp.filesponge.value;
 
 public enum FileSourceAvailability {
 	DOWNLOADABLE,
diff --git a/src/main/lombok/org/warp/filesponge/api/FileStatus.java b/src/main/lombok/org/warp/filesponge/value/FileStatus.java
similarity index 97%
rename from src/main/lombok/org/warp/filesponge/api/FileStatus.java
rename to src/main/lombok/org/warp/filesponge/value/FileStatus.java
index 8d47c80..28027ef 100644
--- a/src/main/lombok/org/warp/filesponge/api/FileStatus.java
+++ b/src/main/lombok/org/warp/filesponge/value/FileStatus.java
@@ -16,7 +16,7 @@
  *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.warp.filesponge.api;
+package org.warp.filesponge.value;
 
 import java.util.Optional;
 import lombok.Value;
diff --git a/src/main/lombok/org/warp/filesponge/api/FileType.java b/src/main/lombok/org/warp/filesponge/value/FileType.java
similarity index 95%
rename from src/main/lombok/org/warp/filesponge/api/FileType.java
rename to src/main/lombok/org/warp/filesponge/value/FileType.java
index 594f96d..a43feb6 100644
--- a/src/main/lombok/org/warp/filesponge/api/FileType.java
+++ b/src/main/lombok/org/warp/filesponge/value/FileType.java
@@ -16,6 +16,6 @@
  *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.warp.filesponge.api;
+package org.warp.filesponge.value;
 
 public interface FileType {}
diff --git a/src/main/lombok/org/warp/filesponge/api/FileURI.java b/src/main/lombok/org/warp/filesponge/value/FileURI.java
similarity index 95%
rename from src/main/lombok/org/warp/filesponge/api/FileURI.java
rename to src/main/lombok/org/warp/filesponge/value/FileURI.java
index ae458bb..80ebb50 100644
--- a/src/main/lombok/org/warp/filesponge/api/FileURI.java
+++ b/src/main/lombok/org/warp/filesponge/value/FileURI.java
@@ -16,6 +16,6 @@
  *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.warp.filesponge.api;
+package org.warp.filesponge.value;
 
 public interface FileURI {}
diff --git a/src/main/lombok/org/warp/filesponge/api/MirrorURI.java b/src/main/lombok/org/warp/filesponge/value/MirrorURI.java
similarity index 95%
rename from src/main/lombok/org/warp/filesponge/api/MirrorURI.java
rename to src/main/lombok/org/warp/filesponge/value/MirrorURI.java
index e21db57..288ee5c 100644
--- a/src/main/lombok/org/warp/filesponge/api/MirrorURI.java
+++ b/src/main/lombok/org/warp/filesponge/value/MirrorURI.java
@@ -16,6 +16,6 @@
  *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.warp.filesponge.api;
+package org.warp.filesponge.value;
 
 public interface MirrorURI {}