diff --git a/call.go b/implementation/call.go
similarity index 96%
rename from call.go
rename to implementation/call.go
index f601ccc..fbaba21 100644
--- a/call.go
+++ b/implementation/call.go
@@ -1,4 +1,4 @@
-package main
+package api
 
 import (
 	"fmt"
@@ -10,7 +10,7 @@ import (
 
 /*
 #cgo LDFLAGS: ./ffi/librust_impl.a -ldl -lm
-#include "cdata/arrow/c/abi.h"
+#include "../cdata/arrow/c/abi.h"
 int from_chunks_ffi(const struct ArrowArray *arrptr, const struct  ArrowSchema *schptr, uintptr_t l);
 int from_chunks_ffi_voidptr(void* schema, void* array, uintptr_t l) {
     return from_chunks_ffi(array, schema, l);
diff --git a/main.go b/main.go
index 879d04d..9000c55 100644
--- a/main.go
+++ b/main.go
@@ -5,6 +5,7 @@ import (
 	"github.com/apache/arrow/go/v9/arrow"
 	"github.com/apache/arrow/go/v9/arrow/array"
 	"github.com/apache/arrow/go/v9/arrow/memory"
+	"github.com/ignalina/alloy/implementation"
 )
 
 func main() {
@@ -26,7 +27,7 @@ func main() {
 
 	fmt.Printf("[Go]\tCalling the goBridge with:\n\tarr: %v\n", listOfarrays)
 
-	goBridge := GoBridge{GoAllocator: mem}
+	goBridge := api.GoBridge{GoAllocator: mem}
 	i, err := goBridge.From_chunks(listOfarrays)
 
 	if nil != err {