diff --git a/read_queue.go b/read_queue.go
index 41291b4..5d931ed 100644
--- a/read_queue.go
+++ b/read_queue.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/streadway/amqp"
-	"piper/wpqueue"
 	"sync"
 )
 
@@ -130,7 +129,7 @@ func (rq *ReadQueue) Run() error {
 		return fmt.Errorf("[Rq][%s][Run]: %s", rq.queue, err)
 	}
 	wg.Add(1)
-	pool := wpqueue.NewWorkerPool(rq.routines, rq.queue, deliveries)
+	pool := NewWorkerPool(rq.routines, rq.queue, deliveries)
 	go pool.RunWorkerPool()
 
 	go func() {
diff --git a/types.go b/types.go
index 9548ad0..a23ce54 100644
--- a/types.go
+++ b/types.go
@@ -1,5 +1,7 @@
 package piper
 
+import "github.com/streadway/amqp"
+
 type Message struct {
 	UID     string `json:"uid"`
 	Payload any    `json:"payload"`
@@ -25,3 +27,15 @@ type Report struct {
 	Reject *RejectReport `json:"reject,omitempty"`
 	Fail   *FailReport   `json:"fail,omitempty"`
 }
+
+type QueueWorkerPool struct {
+	workersCount int
+	queue        string
+	deliveries   <-chan amqp.Delivery
+	results      chan ResultDelivery
+}
+
+type ResultDelivery struct {
+	WorkerId int
+	Delivery amqp.Delivery
+}
diff --git a/wpqueue/wp.go b/wp_queue.go
similarity index 98%
rename from wpqueue/wp.go
rename to wp_queue.go
index 6d39630..60958bb 100644
--- a/wpqueue/wp.go
+++ b/wp_queue.go
@@ -1,4 +1,4 @@
-package wpqueue
+package piper
 
 import (
 	"fmt"
diff --git a/wpqueue/type.go b/wpqueue/type.go
deleted file mode 100644
index 3f1893d..0000000
--- a/wpqueue/type.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package wpqueue
-
-import "github.com/streadway/amqp"
-
-type QueueWorkerPool struct {
-	workersCount int
-	queue        string
-	deliveries   <-chan amqp.Delivery
-	results      chan ResultDelivery
-}
-
-type ResultDelivery struct {
-	WorkerId int
-	Delivery amqp.Delivery
-}