diff --git a/src/test/kotlin/dev/silenium/libs/flows/test/BufferSink.kt b/src/main/kotlin/dev/silenium/libs/flows/buffer/BufferSink.kt
similarity index 96%
rename from src/test/kotlin/dev/silenium/libs/flows/test/BufferSink.kt
rename to src/main/kotlin/dev/silenium/libs/flows/buffer/BufferSink.kt
index fa071bf..ca98449 100644
--- a/src/test/kotlin/dev/silenium/libs/flows/test/BufferSink.kt
+++ b/src/main/kotlin/dev/silenium/libs/flows/buffer/BufferSink.kt
@@ -1,4 +1,4 @@
-package dev.silenium.libs.flows.test
+package dev.silenium.libs.flows.buffer
 
 import dev.silenium.libs.flows.api.FlowItem
 import dev.silenium.libs.flows.api.Sink
diff --git a/src/test/kotlin/dev/silenium/libs/flows/test/BufferSource.kt b/src/main/kotlin/dev/silenium/libs/flows/buffer/BufferSource.kt
similarity index 89%
rename from src/test/kotlin/dev/silenium/libs/flows/test/BufferSource.kt
rename to src/main/kotlin/dev/silenium/libs/flows/buffer/BufferSource.kt
index 725bded..82a2ae9 100644
--- a/src/test/kotlin/dev/silenium/libs/flows/test/BufferSource.kt
+++ b/src/main/kotlin/dev/silenium/libs/flows/buffer/BufferSource.kt
@@ -1,4 +1,4 @@
-package dev.silenium.libs.flows.test
+package dev.silenium.libs.flows.buffer
 
 import dev.silenium.libs.flows.api.FlowItem
 import dev.silenium.libs.flows.base.SourceBase
diff --git a/src/test/kotlin/dev/silenium/libs/flows/base/SourceBaseTest.kt b/src/test/kotlin/dev/silenium/libs/flows/base/SourceBaseTest.kt
index 534e014..5b017f5 100644
--- a/src/test/kotlin/dev/silenium/libs/flows/base/SourceBaseTest.kt
+++ b/src/test/kotlin/dev/silenium/libs/flows/base/SourceBaseTest.kt
@@ -1,8 +1,8 @@
 package dev.silenium.libs.flows.base
 
+import dev.silenium.libs.flows.buffer.BufferSource
 import dev.silenium.libs.flows.test.Base64Buffer
 import dev.silenium.libs.flows.test.Base64Decoder
-import dev.silenium.libs.flows.test.BufferSource
 import dev.silenium.libs.flows.test.DataType
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.collections.shouldBeIn
diff --git a/src/test/kotlin/dev/silenium/libs/flows/impl/FlowGraphImplTest.kt b/src/test/kotlin/dev/silenium/libs/flows/impl/FlowGraphImplTest.kt
index a267532..4d94909 100644
--- a/src/test/kotlin/dev/silenium/libs/flows/impl/FlowGraphImplTest.kt
+++ b/src/test/kotlin/dev/silenium/libs/flows/impl/FlowGraphImplTest.kt
@@ -1,6 +1,11 @@
 package dev.silenium.libs.flows.impl
 
-import dev.silenium.libs.flows.test.*
+import dev.silenium.libs.flows.buffer.BufferSink
+import dev.silenium.libs.flows.buffer.BufferSource
+import dev.silenium.libs.flows.test.Base64Buffer
+import dev.silenium.libs.flows.test.Base64Decoder
+import dev.silenium.libs.flows.test.DataType
+import dev.silenium.libs.flows.test.encodeBase64
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.collections.shouldNotBeEmpty
 import io.kotest.matchers.nulls.shouldNotBeNull
diff --git a/src/test/kotlin/dev/silenium/libs/flows/test/DataType.kt b/src/test/kotlin/dev/silenium/libs/flows/test/DataType.kt
index edf5d0e..b72eaab 100644
--- a/src/test/kotlin/dev/silenium/libs/flows/test/DataType.kt
+++ b/src/test/kotlin/dev/silenium/libs/flows/test/DataType.kt
@@ -3,5 +3,4 @@ package dev.silenium.libs.flows.test
 enum class DataType {
     PLAIN,
     BASE64,
-    JSON,
 }