diff --git a/pkg/captcha/captcha.go b/captcha.go
similarity index 100%
rename from pkg/captcha/captcha.go
rename to captcha.go
diff --git a/pkg/captcha/db.go b/db.go
similarity index 100%
rename from pkg/captcha/db.go
rename to db.go
diff --git a/pkg/dwcaptcha/dwcaptcha_test.go b/dwcaptcha/dwcaptcha_test.go
similarity index 93%
rename from pkg/dwcaptcha/dwcaptcha_test.go
rename to dwcaptcha/dwcaptcha_test.go
index 0fe3296..e5df504 100644
--- a/pkg/dwcaptcha/dwcaptcha_test.go
+++ b/dwcaptcha/dwcaptcha_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"git.arav.su/Arav/justcaptcha/pkg/dwcaptcha"
+	"git.arav.su/Arav/justcaptcha/dwcaptcha"
 )
 
 const expiry = 10 * time.Minute
diff --git a/pkg/dwcaptcha/dwelling_captcha.go b/dwcaptcha/dwelling_captcha.go
similarity index 96%
rename from pkg/dwcaptcha/dwelling_captcha.go
rename to dwcaptcha/dwelling_captcha.go
index e631cf3..d1a974f 100644
--- a/pkg/dwcaptcha/dwelling_captcha.go
+++ b/dwcaptcha/dwelling_captcha.go
@@ -5,7 +5,7 @@ import (
 	"math/rand"
 	"time"
 
-	"git.arav.su/Arav/justcaptcha/pkg/captcha"
+	captcha "git.arav.su/Arav/justcaptcha"
 
 	"github.com/fogleman/gg"
 )
diff --git a/pkg/captcha/inmemdb/inmemdb.go b/inmemdb/inmemdb.go
similarity index 98%
rename from pkg/captcha/inmemdb/inmemdb.go
rename to inmemdb/inmemdb.go
index 24bbe88..0c3868b 100644
--- a/pkg/captcha/inmemdb/inmemdb.go
+++ b/inmemdb/inmemdb.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	"git.arav.su/Arav/justcaptcha/pkg/captcha"
+	captcha "git.arav.su/Arav/justcaptcha"
 )
 
 // InMemoryDB implementation that lives in a memory (map).
diff --git a/pkg/captcha/inmemdb/inmemdb_test.go b/inmemdb/inmemdb_test.go
similarity index 88%
rename from pkg/captcha/inmemdb/inmemdb_test.go
rename to inmemdb/inmemdb_test.go
index 646ffae..cedeb11 100644
--- a/pkg/captcha/inmemdb/inmemdb_test.go
+++ b/inmemdb/inmemdb_test.go
@@ -4,9 +4,9 @@ import (
 	"testing"
 	"time"
 
-	"git.arav.su/Arav/justcaptcha/pkg/captcha"
-	"git.arav.su/Arav/justcaptcha/pkg/captcha/inmemdb"
-	"git.arav.su/Arav/justcaptcha/pkg/dwcaptcha"
+	captcha "git.arav.su/Arav/justcaptcha"
+	"git.arav.su/Arav/justcaptcha/dwcaptcha"
+	"git.arav.su/Arav/justcaptcha/inmemdb"
 )
 
 const expiry = 10 * time.Minute