diff --git a/i18n/default/astrolib.active.en-GB.json b/locale/default/astrolib.active.en-GB.json
similarity index 100%
rename from i18n/default/astrolib.active.en-GB.json
rename to locale/default/astrolib.active.en-GB.json
diff --git a/i18n/deploy/astrolib.active.en-US.json b/locale/deploy/astrolib.active.en-US.json
similarity index 100%
rename from i18n/deploy/astrolib.active.en-US.json
rename to locale/deploy/astrolib.active.en-US.json
diff --git a/i18n/i18n_suite_test.go b/locale/i18n_suite_test.go
similarity index 92%
rename from i18n/i18n_suite_test.go
rename to locale/i18n_suite_test.go
index dac047d..fae3007 100644
--- a/i18n/i18n_suite_test.go
+++ b/locale/i18n_suite_test.go
@@ -1,4 +1,4 @@
-package i18n_test
+package locale_test
 
 import (
 	"testing"
diff --git a/i18n/messages-errors.go b/locale/messages-errors.go
similarity index 98%
rename from i18n/messages-errors.go
rename to locale/messages-errors.go
index ec2a8d0..bbc1718 100644
--- a/i18n/messages-errors.go
+++ b/locale/messages-errors.go
@@ -1,4 +1,4 @@
-package i18n
+package locale
 
 import (
 	"github.com/snivilised/extendio/i18n"
diff --git a/i18n/messages-general.go b/locale/messages-general.go
similarity index 96%
rename from i18n/messages-general.go
rename to locale/messages-general.go
index 96d27c0..d08071a 100644
--- a/i18n/messages-general.go
+++ b/locale/messages-general.go
@@ -1,4 +1,4 @@
-package i18n
+package locale
 
 import (
 	"github.com/snivilised/extendio/i18n"
diff --git a/i18n/out/active.en-GB.json b/locale/out/active.en-GB.json
similarity index 100%
rename from i18n/out/active.en-GB.json
rename to locale/out/active.en-GB.json
diff --git a/i18n/out/active.en-US.json b/locale/out/active.en-US.json
similarity index 100%
rename from i18n/out/active.en-US.json
rename to locale/out/active.en-US.json
diff --git a/i18n/out/en-US/astrolib.translate.en-US.json b/locale/out/en-US/astrolib.translate.en-US.json
similarity index 100%
rename from i18n/out/en-US/astrolib.translate.en-US.json
rename to locale/out/en-US/astrolib.translate.en-US.json
diff --git a/i18n/out/translate.en-US.json b/locale/out/translate.en-US.json
similarity index 100%
rename from i18n/out/translate.en-US.json
rename to locale/out/translate.en-US.json
diff --git a/i18n/test-i18n-messages_test.go b/locale/test-i18n-messages_test.go
similarity index 98%
rename from i18n/test-i18n-messages_test.go
rename to locale/test-i18n-messages_test.go
index f00a22d..acf1b3c 100644
--- a/i18n/test-i18n-messages_test.go
+++ b/locale/test-i18n-messages_test.go
@@ -1,4 +1,4 @@
-package i18n_test
+package locale_test
 
 import (
 	"github.com/snivilised/extendio/i18n"
diff --git a/i18n/translate-defs.go b/locale/translate-defs.go
similarity index 95%
rename from i18n/translate-defs.go
rename to locale/translate-defs.go
index 45aaa87..3545fe1 100644
--- a/i18n/translate-defs.go
+++ b/locale/translate-defs.go
@@ -1,4 +1,4 @@
-package i18n
+package locale
 
 // CLIENT-TODO: Should be updated to use url of the implementing project,
 // so should not be left as astrolib. (this should be set by auto-check)