12 files changed, 21 insertions, 10 deletions
diff --git a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Consumer1.java b/agent/src/main/java/com/code_intelligence/jazzer/api/Consumer1.java
index 6c27bfec..472c2efd 100644
--- a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Consumer1.java
+++ b/agent/src/main/java/com/code_intelligence/jazzer/api/Consumer1.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.code_intelligence.jazzer.autofuzz;
+package com.code_intelligence.jazzer.api;
 
 import java.util.function.Consumer;
 
diff --git a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Consumer2.java b/agent/src/main/java/com/code_intelligence/jazzer/api/Consumer2.java
index 31931605..d951ade7 100644
--- a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Consumer2.java
+++ b/agent/src/main/java/com/code_intelligence/jazzer/api/Consumer2.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.code_intelligence.jazzer.autofuzz;
+package com.code_intelligence.jazzer.api;
 
 import java.util.function.BiConsumer;
 
diff --git a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Consumer3.java b/agent/src/main/java/com/code_intelligence/jazzer/api/Consumer3.java
index 9e632601..c508fe53 100644
--- a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Consumer3.java
+++ b/agent/src/main/java/com/code_intelligence/jazzer/api/Consumer3.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.code_intelligence.jazzer.autofuzz;
+package com.code_intelligence.jazzer.api;
 
 @FunctionalInterface
 public interface Consumer3<T1, T2, T3> {
diff --git a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Consumer4.java b/agent/src/main/java/com/code_intelligence/jazzer/api/Consumer4.java
index 5e619efb..6ee70141 100644
--- a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Consumer4.java
+++ b/agent/src/main/java/com/code_intelligence/jazzer/api/Consumer4.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.code_intelligence.jazzer.autofuzz;
+package com.code_intelligence.jazzer.api;
 
 @FunctionalInterface
 public interface Consumer4<T1, T2, T3, T4> {
diff --git a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Consumer5.java b/agent/src/main/java/com/code_intelligence/jazzer/api/Consumer5.java
index 1e9e55c9..523df53c 100644
--- a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Consumer5.java
+++ b/agent/src/main/java/com/code_intelligence/jazzer/api/Consumer5.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.code_intelligence.jazzer.autofuzz;
+package com.code_intelligence.jazzer.api;
 
 @FunctionalInterface
 public interface Consumer5<T1, T2, T3, T4, T5> {
diff --git a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Function1.java b/agent/src/main/java/com/code_intelligence/jazzer/api/Function1.java
index e11bf085..16703af1 100644
--- a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Function1.java
+++ b/agent/src/main/java/com/code_intelligence/jazzer/api/Function1.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.code_intelligence.jazzer.autofuzz;
+package com.code_intelligence.jazzer.api;
 
 import java.util.function.Function;
 
diff --git a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Function2.java b/agent/src/main/java/com/code_intelligence/jazzer/api/Function2.java
index 26c5c54c..d07289fb 100644
--- a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Function2.java
+++ b/agent/src/main/java/com/code_intelligence/jazzer/api/Function2.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.code_intelligence.jazzer.autofuzz;
+package com.code_intelligence.jazzer.api;
 
 import java.util.function.BiFunction;
 
diff --git a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Function3.java b/agent/src/main/java/com/code_intelligence/jazzer/api/Function3.java
index a4572d5b..ef56771b 100644
--- a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Function3.java
+++ b/agent/src/main/java/com/code_intelligence/jazzer/api/Function3.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.code_intelligence.jazzer.autofuzz;
+package com.code_intelligence.jazzer.api;
 
 @FunctionalInterface
 public interface Function3<T1, T2, T3, R> {
diff --git a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Function4.java b/agent/src/main/java/com/code_intelligence/jazzer/api/Function4.java
index 3a26f516..dedf9117 100644
--- a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Function4.java
+++ b/agent/src/main/java/com/code_intelligence/jazzer/api/Function4.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.code_intelligence.jazzer.autofuzz;
+package com.code_intelligence.jazzer.api;
 
 @FunctionalInterface
 public interface Function4<T1, T2, T3, T4, R> {
diff --git a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Function5.java b/agent/src/main/java/com/code_intelligence/jazzer/api/Function5.java
index 1dc00347..1080df0d 100644
--- a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Function5.java
+++ b/agent/src/main/java/com/code_intelligence/jazzer/api/Function5.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.code_intelligence.jazzer.autofuzz;
+package com.code_intelligence.jazzer.api;
 
 @FunctionalInterface
 public interface Function5<T1, T2, T3, T4, T5, R> {
diff --git a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Meta.java b/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Meta.java
index f0ec42eb..4c4e1e32 100644
--- a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Meta.java
+++ b/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Meta.java
@@ -15,6 +15,16 @@
 package com.code_intelligence.jazzer.autofuzz;
 
 import com.code_intelligence.jazzer.api.AutofuzzConstructionException;
+import com.code_intelligence.jazzer.api.Consumer1;
+import com.code_intelligence.jazzer.api.Consumer2;
+import com.code_intelligence.jazzer.api.Consumer3;
+import com.code_intelligence.jazzer.api.Consumer4;
+import com.code_intelligence.jazzer.api.Consumer5;
+import com.code_intelligence.jazzer.api.Function1;
+import com.code_intelligence.jazzer.api.Function2;
+import com.code_intelligence.jazzer.api.Function3;
+import com.code_intelligence.jazzer.api.Function4;
+import com.code_intelligence.jazzer.api.Function5;
 import com.code_intelligence.jazzer.api.FuzzedDataProvider;
 import com.code_intelligence.jazzer.utils.Utils;
 import io.github.classgraph.ClassGraph;
diff --git a/agent/src/test/java/com/code_intelligence/jazzer/autofuzz/MetaTest.java b/agent/src/test/java/com/code_intelligence/jazzer/autofuzz/MetaTest.java
index a3c851be..25891aa5 100644
--- a/agent/src/test/java/com/code_intelligence/jazzer/autofuzz/MetaTest.java
+++ b/agent/src/test/java/com/code_intelligence/jazzer/autofuzz/MetaTest.java
@@ -18,6 +18,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import com.code_intelligence.jazzer.api.CannedFuzzedDataProvider;
+import com.code_intelligence.jazzer.api.Function1;
 import com.code_intelligence.jazzer.api.FuzzedDataProvider;
 import com.google.json.JsonSanitizer;
 import java.util.Arrays;