diff --git a/Makefile b/Makefile
index aeb07d3..979f008 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 build:
-	go build -o bin/uftp main.go
+	go build -o bin/uftp cmd/uftp/main.go
 
 server:
-	go run main.go server 
+	go run cmd/uftp/main.go server 
 
 test:
-	go run main.go client testFiles/testFile 0.0.0.0:13374
+	go run cmd/uftp/main.go client testFiles/testFile 0.0.0.0:13374
 
 win:
-	GOOS=windows GOARCH=amd64 go build -o bin/app-amd64.exe main.go
\ No newline at end of file
+	GOOS=windows GOARCH=amd64 go build -o bin/app-amd64.exe cmd/uftp/main.go
\ No newline at end of file
diff --git a/main.go b/cmd/uftp/main.go
similarity index 71%
rename from main.go
rename to cmd/uftp/main.go
index 45a6e90..5f7992f 100644
--- a/main.go
+++ b/cmd/uftp/main.go
@@ -1,9 +1,10 @@
 package main
 
 import (
-	"client"
 	"os"
-	"server"
+
+	"github.com/Pablu23/Uftp/internal/client"
+	"github.com/Pablu23/Uftp/internal/server"
 )
 
 func main() {
diff --git a/go.mod b/go.mod
index 08f73f0..8be079a 100644
--- a/go.mod
+++ b/go.mod
@@ -1,9 +1,19 @@
-module pablu/uftp
+module github.com/Pablu23/Uftp
 
 go 1.21.1
 
-replace internal/common => ./internal/common
+require (
+	github.com/google/go-cmp v0.6.0
+	golang.org/x/crypto v0.16.0
+)
 
-replace internal/client => ./internal/client
+require (
+	github.com/kelindar/simd v1.1.2 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+)
 
-replace internal/server => ./internal/server
+require (
+	github.com/kelindar/bitmap v1.5.2
+	github.com/sirupsen/logrus v1.9.3
+	golang.org/x/sys v0.15.0 // indirect
+)
diff --git a/go.sum b/go.sum
index e69de29..6832dcc 100644
--- a/go.sum
+++ b/go.sum
@@ -0,0 +1,23 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/kelindar/bitmap v1.5.2 h1:XwX7CTvJtetQZ64zrOkApoZZHBJRkjE23NfqUALA/HE=
+github.com/kelindar/bitmap v1.5.2/go.mod h1:j3qZjxH9s4OtvsnFTP2bmPkjqil9Y2xQlxPYHexasEA=
+github.com/kelindar/simd v1.1.2 h1:KduKb+M9cMY2HIH8S/cdJyD+5n5EGgq+Aeeleos55To=
+github.com/kelindar/simd v1.1.2/go.mod h1:inq4DFudC7W8L5fhxoeZflLRNpWSs0GNx6MlWFvuvr0=
+github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
+github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
+golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/go.work b/go.work
deleted file mode 100644
index 5896ff4..0000000
--- a/go.work
+++ /dev/null
@@ -1,8 +0,0 @@
-go 1.21.1
-
-use (
-	.
-	./internal/client
-	./internal/common
-	./internal/server
-)
diff --git a/internal/client/client.go b/internal/client/client.go
index 0feccd2..93477d8 100644
--- a/internal/client/client.go
+++ b/internal/client/client.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"common"
 	"crypto/rand"
 	"encoding/hex"
 	"fmt"
@@ -9,6 +8,8 @@ import (
 	"os"
 	"time"
 
+	"github.com/Pablu23/Uftp/internal/common"
+
 	"github.com/kelindar/bitmap"
 )
 
diff --git a/internal/client/go.mod b/internal/client/go.mod
deleted file mode 100644
index a91c25a..0000000
--- a/internal/client/go.mod
+++ /dev/null
@@ -1,11 +0,0 @@
-module client
-
-go 1.21.1
-
-require github.com/kelindar/bitmap v1.5.2
-
-require (
-	github.com/kelindar/simd v1.1.2 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
-	golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e // indirect
-)
diff --git a/internal/client/go.sum b/internal/client/go.sum
deleted file mode 100644
index de0a866..0000000
--- a/internal/client/go.sum
+++ /dev/null
@@ -1,8 +0,0 @@
-github.com/kelindar/bitmap v1.5.2 h1:XwX7CTvJtetQZ64zrOkApoZZHBJRkjE23NfqUALA/HE=
-github.com/kelindar/bitmap v1.5.2/go.mod h1:j3qZjxH9s4OtvsnFTP2bmPkjqil9Y2xQlxPYHexasEA=
-github.com/kelindar/simd v1.1.2 h1:KduKb+M9cMY2HIH8S/cdJyD+5n5EGgq+Aeeleos55To=
-github.com/kelindar/simd v1.1.2/go.mod h1:inq4DFudC7W8L5fhxoeZflLRNpWSs0GNx6MlWFvuvr0=
-github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
-github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
-golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e h1:CsOuNlbOuf0mzxJIefr6Q4uAUetRUwZE4qt7VfzP+xo=
-golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
diff --git a/internal/common/go.mod b/internal/common/go.mod
deleted file mode 100644
index 5e08a72..0000000
--- a/internal/common/go.mod
+++ /dev/null
@@ -1,10 +0,0 @@
-module common
-
-go 1.21.1
-
-require golang.org/x/crypto v0.15.0
-
-require (
-	github.com/google/go-cmp v0.6.0
-	golang.org/x/sys v0.14.0 // indirect
-)
diff --git a/internal/common/go.sum b/internal/common/go.sum
deleted file mode 100644
index ac74b56..0000000
--- a/internal/common/go.sum
+++ /dev/null
@@ -1,6 +0,0 @@
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
-golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
-golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
diff --git a/internal/server/go.mod b/internal/server/go.mod
deleted file mode 100644
index 536faa3..0000000
--- a/internal/server/go.mod
+++ /dev/null
@@ -1,7 +0,0 @@
-module server
-
-go 1.21.1
-
-require github.com/sirupsen/logrus v1.9.3
-
-require golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
diff --git a/internal/server/go.sum b/internal/server/go.sum
deleted file mode 100644
index 2cbdecd..0000000
--- a/internal/server/go.sum
+++ /dev/null
@@ -1,11 +0,0 @@
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
-github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/internal/server/server.go b/internal/server/server.go
index fdbd1e4..6b97ac9 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -1,7 +1,6 @@
 package server
 
 import (
-	"common"
 	"crypto/rand"
 	"crypto/rsa"
 	"encoding/hex"
@@ -13,6 +12,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/Pablu23/Uftp/internal/common"
+
 	log "github.com/sirupsen/logrus"
 )