diff --git a/cmd/cron/main.go b/cmd/cron/main.go
index 436d056..cf5f38a 100644
--- a/cmd/cron/main.go
+++ b/cmd/cron/main.go
@@ -9,9 +9,9 @@ import (
 	"syscall"
 
 	"github.com/tribalwarshelp/dataupdater/cmd/internal"
-	twhelpcron "github.com/tribalwarshelp/dataupdater/pkg/cron"
-	"github.com/tribalwarshelp/dataupdater/pkg/postgres"
-	"github.com/tribalwarshelp/dataupdater/pkg/queue"
+	twhelpcron "github.com/tribalwarshelp/dataupdater/cron"
+	"github.com/tribalwarshelp/dataupdater/postgres"
+	"github.com/tribalwarshelp/dataupdater/queue"
 )
 
 func main() {
diff --git a/cmd/dataupdater/main.go b/cmd/dataupdater/main.go
index 0db1727..2fcbbcf 100644
--- a/cmd/dataupdater/main.go
+++ b/cmd/dataupdater/main.go
@@ -10,8 +10,8 @@ import (
 	"syscall"
 
 	"github.com/tribalwarshelp/dataupdater/cmd/internal"
-	"github.com/tribalwarshelp/dataupdater/pkg/postgres"
-	"github.com/tribalwarshelp/dataupdater/pkg/queue"
+	"github.com/tribalwarshelp/dataupdater/postgres"
+	"github.com/tribalwarshelp/dataupdater/queue"
 )
 
 func main() {
diff --git a/pkg/cron/config.go b/cron/config.go
similarity index 87%
rename from pkg/cron/config.go
rename to cron/config.go
index 909f92c..9a5dca3 100644
--- a/pkg/cron/config.go
+++ b/cron/config.go
@@ -4,7 +4,7 @@ import (
 	"github.com/go-pg/pg/v10"
 	"github.com/pkg/errors"
 
-	"github.com/tribalwarshelp/dataupdater/pkg/queue"
+	"github.com/tribalwarshelp/dataupdater/queue"
 )
 
 type Config struct {
diff --git a/pkg/cron/cron.go b/cron/cron.go
similarity index 98%
rename from pkg/cron/cron.go
rename to cron/cron.go
index 1b74636..5db4671 100644
--- a/pkg/cron/cron.go
+++ b/cron/cron.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/robfig/cron/v3"
 
-	"github.com/tribalwarshelp/dataupdater/pkg/queue"
+	"github.com/tribalwarshelp/dataupdater/queue"
 )
 
 type Cron struct {
diff --git a/pkg/postgres/postgres.go b/postgres/postgres.go
similarity index 100%
rename from pkg/postgres/postgres.go
rename to postgres/postgres.go
diff --git a/pkg/postgres/sql_statements.go b/postgres/sql_statements.go
similarity index 100%
rename from pkg/postgres/sql_statements.go
rename to postgres/sql_statements.go
diff --git a/pkg/queue/config.go b/queue/config.go
similarity index 100%
rename from pkg/queue/config.go
rename to queue/config.go
diff --git a/pkg/queue/helpers.go b/queue/helpers.go
similarity index 100%
rename from pkg/queue/helpers.go
rename to queue/helpers.go
diff --git a/pkg/queue/queue.go b/queue/queue.go
similarity index 100%
rename from pkg/queue/queue.go
rename to queue/queue.go
diff --git a/pkg/queue/task.go b/queue/task.go
similarity index 100%
rename from pkg/queue/task.go
rename to queue/task.go
diff --git a/pkg/queue/task_delete_non_existent_villages.go b/queue/task_delete_non_existent_villages.go
similarity index 100%
rename from pkg/queue/task_delete_non_existent_villages.go
rename to queue/task_delete_non_existent_villages.go
diff --git a/pkg/queue/task_load_servers_and_update_data.go b/queue/task_load_servers_and_update_data.go
similarity index 98%
rename from pkg/queue/task_load_servers_and_update_data.go
rename to queue/task_load_servers_and_update_data.go
index 6dbd3ec..0bd3c88 100644
--- a/pkg/queue/task_load_servers_and_update_data.go
+++ b/queue/task_load_servers_and_update_data.go
@@ -8,7 +8,7 @@ import (
 	"github.com/tribalwarshelp/shared/tw/twdataloader"
 	"github.com/tribalwarshelp/shared/tw/twmodel"
 
-	"github.com/tribalwarshelp/dataupdater/pkg/postgres"
+	"github.com/tribalwarshelp/dataupdater/postgres"
 )
 
 type taskLoadServersAndUpdateData struct {
diff --git a/pkg/queue/task_load_versions_and_update_server_data.go b/queue/task_load_versions_and_update_server_data.go
similarity index 100%
rename from pkg/queue/task_load_versions_and_update_server_data.go
rename to queue/task_load_versions_and_update_server_data.go
diff --git a/pkg/queue/task_server_delete_non_existent_villages.go b/queue/task_server_delete_non_existent_villages.go
similarity index 100%
rename from pkg/queue/task_server_delete_non_existent_villages.go
rename to queue/task_server_delete_non_existent_villages.go
diff --git a/pkg/queue/task_update_ennoblements.go b/queue/task_update_ennoblements.go
similarity index 100%
rename from pkg/queue/task_update_ennoblements.go
rename to queue/task_update_ennoblements.go
diff --git a/pkg/queue/task_update_history.go b/queue/task_update_history.go
similarity index 100%
rename from pkg/queue/task_update_history.go
rename to queue/task_update_history.go
diff --git a/pkg/queue/task_update_server_data.go b/queue/task_update_server_data.go
similarity index 100%
rename from pkg/queue/task_update_server_data.go
rename to queue/task_update_server_data.go
diff --git a/pkg/queue/task_update_server_ennoblements.go b/queue/task_update_server_ennoblements.go
similarity index 100%
rename from pkg/queue/task_update_server_ennoblements.go
rename to queue/task_update_server_ennoblements.go
diff --git a/pkg/queue/task_update_server_history.go b/queue/task_update_server_history.go
similarity index 100%
rename from pkg/queue/task_update_server_history.go
rename to queue/task_update_server_history.go
diff --git a/pkg/queue/task_update_server_stats.go b/queue/task_update_server_stats.go
similarity index 100%
rename from pkg/queue/task_update_server_stats.go
rename to queue/task_update_server_stats.go
diff --git a/pkg/queue/task_update_stats.go b/queue/task_update_stats.go
similarity index 100%
rename from pkg/queue/task_update_stats.go
rename to queue/task_update_stats.go
diff --git a/pkg/queue/task_vacuum.go b/queue/task_vacuum.go
similarity index 100%
rename from pkg/queue/task_vacuum.go
rename to queue/task_vacuum.go
diff --git a/pkg/queue/task_vacuum_server_data.go b/queue/task_vacuum_server_data.go
similarity index 100%
rename from pkg/queue/task_vacuum_server_data.go
rename to queue/task_vacuum_server_data.go