diff --git a/.gitignore b/.gitignore
index 71fd0a1..adc3463 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,3 @@
-# Binary Output
-tcping
-tcping-cli
-
 # Script
 *.sh
 
diff --git a/flag.go b/cmd/tcping/flag.go
similarity index 100%
rename from flag.go
rename to cmd/tcping/flag.go
diff --git a/log.go b/cmd/tcping/log.go
similarity index 98%
rename from log.go
rename to cmd/tcping/log.go
index 74adce2..7816de9 100644
--- a/log.go
+++ b/cmd/tcping/log.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/i3h/tcping/httping"
+	"github.com/i3h/tcping/pkg/httping"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/main.go b/cmd/tcping/main.go
similarity index 89%
rename from main.go
rename to cmd/tcping/main.go
index d390680..9bc3290 100644
--- a/main.go
+++ b/cmd/tcping/main.go
@@ -6,14 +6,14 @@ import (
 	"net"
 	"strings"
 
-	"github.com/i3h/tcping/httping"
-	"github.com/i3h/tcping/mtr"
-	"github.com/i3h/tcping/ping"
-	"github.com/i3h/tcping/tcping"
+	"github.com/i3h/tcping/pkg/httping"
+	"github.com/i3h/tcping/pkg/mtr"
+	"github.com/i3h/tcping/pkg/ping"
+	"github.com/i3h/tcping/pkg/tcping"
 )
 
 var (
-	VersionString string
+	VersionString string = "v1.1.0"
 )
 
 func init() {
diff --git a/query.go b/cmd/tcping/query.go
similarity index 100%
rename from query.go
rename to cmd/tcping/query.go
diff --git a/util.go b/cmd/tcping/util.go
similarity index 100%
rename from util.go
rename to cmd/tcping/util.go
diff --git a/httping/httping.go b/pkg/httping/httping.go
similarity index 100%
rename from httping/httping.go
rename to pkg/httping/httping.go
diff --git a/mtr/mtr.go b/pkg/mtr/mtr.go
similarity index 100%
rename from mtr/mtr.go
rename to pkg/mtr/mtr.go
diff --git a/ping/ping.go b/pkg/ping/ping.go
similarity index 100%
rename from ping/ping.go
rename to pkg/ping/ping.go
diff --git a/tcping/tcping.go b/pkg/tcping/tcping.go
similarity index 100%
rename from tcping/tcping.go
rename to pkg/tcping/tcping.go