diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index e44313c..cf38d95 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -22,7 +22,7 @@ jobs:
         go-version: '1.21.3'
 
     - name: Build
-      run: go build -v ./...
+      run: cd go && go build -v ./...
 
     - name: Test
-      run: go test -v ./...
+      run: cd go && go test -v ./...
diff --git a/go.mod b/go.mod
deleted file mode 100644
index 40108a4..0000000
--- a/go.mod
+++ /dev/null
@@ -1,3 +0,0 @@
-module github.com/hirenchauhan2/gu2en
-
-go 1.21.3
diff --git a/.gitignore b/go/.gitignore
similarity index 100%
rename from .gitignore
rename to go/.gitignore
diff --git a/README.md b/go/README.md
similarity index 88%
rename from README.md
rename to go/README.md
index 0afe784..52fe375 100644
--- a/README.md
+++ b/go/README.md
@@ -21,7 +21,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/hirenchauhan2/gu2en"
+	gu2en "github.com/hirenchauhan2/gu2en/go"
 )
 
 func main() {
@@ -36,6 +36,7 @@ func main() {
 - [x] Use "m" instead of "n" for diacrit "ં" in certain scenarios such as "ભં" and "અં" and others
 - [ ] Identify or fix transliteration
 - [ ] Add [IPA](https://www.wikiwand.com/en/International_Phonetic_Alphabet) conversion mode
+- [ ] Add normal english characters mode for better readability conversions (Gujlish) text
 
 ### License
 GPL V3
\ No newline at end of file
diff --git a/cmd/cli/cli.go b/go/cmd/cli/cli.go
similarity index 92%
rename from cmd/cli/cli.go
rename to go/cmd/cli/cli.go
index d1d9ded..07debee 100644
--- a/cmd/cli/cli.go
+++ b/go/cmd/cli/cli.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/hirenchauhan2/gu2en"
+	gu2en "github.com/hirenchauhan2/gu2en/go"
 )
 
 func main() {
diff --git a/cmd/http-api/api.go b/go/cmd/http-api/api.go
similarity index 95%
rename from cmd/http-api/api.go
rename to go/cmd/http-api/api.go
index be84e16..3037e05 100644
--- a/cmd/http-api/api.go
+++ b/go/cmd/http-api/api.go
@@ -6,7 +6,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/hirenchauhan2/gu2en"
+	gu2en "github.com/hirenchauhan2/gu2en/go"
 )
 
 type Message struct {
diff --git a/constants.go b/go/constants.go
similarity index 100%
rename from constants.go
rename to go/constants.go
diff --git a/docs.go b/go/docs.go
similarity index 100%
rename from docs.go
rename to go/docs.go
diff --git a/go/go.mod b/go/go.mod
new file mode 100644
index 0000000..ddbc2d3
--- /dev/null
+++ b/go/go.mod
@@ -0,0 +1,3 @@
+module github.com/hirenchauhan2/gu2en/go
+
+go 1.21.3
diff --git a/gu2en.go b/go/gu2en.go
similarity index 100%
rename from gu2en.go
rename to go/gu2en.go
diff --git a/gu2en_test.go b/go/gu2en_test.go
similarity index 100%
rename from gu2en_test.go
rename to go/gu2en_test.go