diff --git a/cmd/slackdump/internal/dump/dump.go b/cmd/slackdump/internal/dump/dump.go
index 17141b96..2be26f6e 100644
--- a/cmd/slackdump/internal/dump/dump.go
+++ b/cmd/slackdump/internal/dump/dump.go
@@ -22,7 +22,7 @@ import (
 	"github.com/rusq/slackdump/v2/cmd/slackdump/internal/golang/base"
 	"github.com/rusq/slackdump/v2/downloader"
 	"github.com/rusq/slackdump/v2/internal/chunk"
-	"github.com/rusq/slackdump/v2/internal/chunk/processor/dirproc"
+	"github.com/rusq/slackdump/v2/internal/chunk/dirproc"
 	"github.com/rusq/slackdump/v2/internal/chunk/transform"
 	"github.com/rusq/slackdump/v2/internal/chunk/transform/fileproc"
 	"github.com/rusq/slackdump/v2/internal/nametmpl"
diff --git a/internal/chunk/control/control.go b/internal/chunk/control/control.go
index 6b59918d..b2db7ad2 100644
--- a/internal/chunk/control/control.go
+++ b/internal/chunk/control/control.go
@@ -11,10 +11,10 @@ import (
 
 	"github.com/rusq/slackdump/v2"
 	"github.com/rusq/slackdump/v2/internal/chunk"
-	"github.com/rusq/slackdump/v2/internal/chunk/processor"
-	"github.com/rusq/slackdump/v2/internal/chunk/processor/dirproc"
+	"github.com/rusq/slackdump/v2/internal/chunk/dirproc"
 	"github.com/rusq/slackdump/v2/internal/structures"
 	"github.com/rusq/slackdump/v2/logger"
+	"github.com/rusq/slackdump/v2/processor"
 	"github.com/slack-go/slack"
 )
 
diff --git a/internal/chunk/control/interfaces.go b/internal/chunk/control/interfaces.go
index 417118d5..af8c6220 100644
--- a/internal/chunk/control/interfaces.go
+++ b/internal/chunk/control/interfaces.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/rusq/slackdump/v2"
-	"github.com/rusq/slackdump/v2/internal/chunk/processor"
-	"github.com/rusq/slackdump/v2/internal/chunk/processor/dirproc"
+	"github.com/rusq/slackdump/v2/internal/chunk/dirproc"
+	"github.com/rusq/slackdump/v2/processor"
 	"github.com/slack-go/slack"
 )
 
diff --git a/internal/chunk/control/workers.go b/internal/chunk/control/workers.go
index 16254e52..73146606 100644
--- a/internal/chunk/control/workers.go
+++ b/internal/chunk/control/workers.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/rusq/slackdump/v2"
 	"github.com/rusq/slackdump/v2/internal/chunk"
-	"github.com/rusq/slackdump/v2/internal/chunk/processor"
-	"github.com/rusq/slackdump/v2/internal/chunk/processor/dirproc"
+	"github.com/rusq/slackdump/v2/internal/chunk/dirproc"
 	"github.com/rusq/slackdump/v2/internal/chunk/transform"
 	"github.com/rusq/slackdump/v2/logger"
+	"github.com/rusq/slackdump/v2/processor"
 	"github.com/slack-go/slack"
 )
 
diff --git a/internal/chunk/processor/dirproc/base.go b/internal/chunk/dirproc/base.go
similarity index 100%
rename from internal/chunk/processor/dirproc/base.go
rename to internal/chunk/dirproc/base.go
diff --git a/internal/chunk/processor/dirproc/channels.go b/internal/chunk/dirproc/channels.go
similarity index 100%
rename from internal/chunk/processor/dirproc/channels.go
rename to internal/chunk/dirproc/channels.go
diff --git a/internal/chunk/processor/dirproc/conversations.go b/internal/chunk/dirproc/conversations.go
similarity index 99%
rename from internal/chunk/processor/dirproc/conversations.go
rename to internal/chunk/dirproc/conversations.go
index c6df6733..55a500a5 100644
--- a/internal/chunk/processor/dirproc/conversations.go
+++ b/internal/chunk/dirproc/conversations.go
@@ -7,8 +7,8 @@ import (
 	"sync"
 
 	"github.com/rusq/slackdump/v2/internal/chunk"
-	"github.com/rusq/slackdump/v2/internal/chunk/processor"
 	"github.com/rusq/slackdump/v2/logger"
+	"github.com/rusq/slackdump/v2/processor"
 	"github.com/slack-go/slack"
 )
 
diff --git a/internal/chunk/processor/dirproc/expproc.go b/internal/chunk/dirproc/expproc.go
similarity index 100%
rename from internal/chunk/processor/dirproc/expproc.go
rename to internal/chunk/dirproc/expproc.go
diff --git a/internal/chunk/processor/dirproc/users.go b/internal/chunk/dirproc/users.go
similarity index 94%
rename from internal/chunk/processor/dirproc/users.go
rename to internal/chunk/dirproc/users.go
index b31ee9ee..96410665 100644
--- a/internal/chunk/processor/dirproc/users.go
+++ b/internal/chunk/dirproc/users.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/rusq/slackdump/v2/internal/chunk"
-	"github.com/rusq/slackdump/v2/internal/chunk/processor"
+	"github.com/rusq/slackdump/v2/processor"
 	"github.com/slack-go/slack"
 )
 
diff --git a/internal/chunk/processor/dirproc/wsp.go b/internal/chunk/dirproc/wsp.go
similarity index 100%
rename from internal/chunk/processor/dirproc/wsp.go
rename to internal/chunk/dirproc/wsp.go
diff --git a/internal/chunk/transform/fileproc/sp_export.go b/internal/chunk/transform/fileproc/sp_export.go
index d795fa02..599820b6 100644
--- a/internal/chunk/transform/fileproc/sp_export.go
+++ b/internal/chunk/transform/fileproc/sp_export.go
@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 
 	"github.com/rusq/slackdump/v2/export"
-	"github.com/rusq/slackdump/v2/internal/chunk/processor"
 	"github.com/rusq/slackdump/v2/internal/chunk/transform"
+	"github.com/rusq/slackdump/v2/processor"
 	"github.com/slack-go/slack"
 )
 
diff --git a/internal/mocks/mock_processor/mock_processor.go b/internal/mocks/mock_processor/mock_processor.go
index e4e32b58..3bddbae1 100644
--- a/internal/mocks/mock_processor/mock_processor.go
+++ b/internal/mocks/mock_processor/mock_processor.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/rusq/slackdump/v2/internal/chunk/processor (interfaces: Conversations,Users,Channels)
+// Source: github.com/rusq/slackdump/v2/processor (interfaces: Conversations,Users,Channels)
 
 // Package mock_processor is a generated GoMock package.
 package mock_processor
diff --git a/internal/chunk/processor/discarder.go b/processor/discarder.go
similarity index 100%
rename from internal/chunk/processor/discarder.go
rename to processor/discarder.go
diff --git a/internal/chunk/processor/processor.go b/processor/processor.go
similarity index 94%
rename from internal/chunk/processor/processor.go
rename to processor/processor.go
index 840c012e..0fe88201 100644
--- a/internal/chunk/processor/processor.go
+++ b/processor/processor.go
@@ -9,7 +9,7 @@ import (
 
 // Conversations is the interface for conversation fetching with files.
 //
-//go:generate mockgen -destination ../../mocks/mock_processor/mock_processor.go github.com/rusq/slackdump/v2/internal/chunk/processor Conversations,Users,Channels
+//go:generate mockgen -destination ../../mocks/mock_processor/mock_processor.go github.com/rusq/slackdump/v2/processor Conversations,Users,Channels
 type Conversations interface {
 	Messenger
 	Filer
diff --git a/stream.go b/stream.go
index 76da5452..d1a3beef 100644
--- a/stream.go
+++ b/stream.go
@@ -11,10 +11,10 @@ import (
 	"github.com/slack-go/slack"
 	"golang.org/x/time/rate"
 
-	"github.com/rusq/slackdump/v2/internal/chunk/processor"
 	"github.com/rusq/slackdump/v2/internal/network"
 	"github.com/rusq/slackdump/v2/internal/structures"
 	"github.com/rusq/slackdump/v2/logger"
+	"github.com/rusq/slackdump/v2/processor"
 )
 
 const (