restructure proxy code

netclient/functions/daemon.go

@@ -19,8 +19,8 @@ import (
 	"github.com/gravitl/netmaker/netclient/global_settings"
 	"github.com/gravitl/netmaker/netclient/local"
 	"github.com/gravitl/netmaker/netclient/ncutils"
-	netclientproxy "github.com/gravitl/netmaker/netclient/netclient-proxy"
 	"github.com/gravitl/netmaker/netclient/wireguard"
+	nmproxy "github.com/gravitl/netmaker/nm-proxy"
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
@@ -115,7 +115,7 @@ func startGoRoutines(wg *sync.WaitGroup) context.CancelFunc {
 	}
 	wg.Add(1)
 	go Checkin(ctx, wg)
-	go netclientproxy.Start()
+	go nmproxy.Start()
 	return cancel
 }
 

nm-proxy/common/common.go

@@ -18,7 +18,7 @@ import (
 	"github.com/gravitl/netmaker/netclient/config"
 	"github.com/gravitl/netmaker/netclient/ncutils"
 
-	"github.com/gravitl/netmaker/netclient/netclient-proxy/wg"
+	"github.com/gravitl/netmaker/nm-proxy/wg"
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 

nm-proxy/nm-proxy.go

@@ -1,4 +1,4 @@
-package netclientproxy
+package nmproxy
 
 import (
 	"fmt"
@@ -9,12 +9,12 @@ import (
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/netclient/config"
 	"github.com/gravitl/netmaker/netclient/ncutils"
-	"github.com/gravitl/netmaker/netclient/netclient-proxy/common"
-	peerpkg "github.com/gravitl/netmaker/netclient/netclient-proxy/peer"
-	"github.com/gravitl/netmaker/netclient/netclient-proxy/server"
-	"github.com/gravitl/netmaker/netclient/netclient-proxy/stun"
-	"github.com/gravitl/netmaker/netclient/netclient-proxy/wg"
 	"github.com/gravitl/netmaker/netclient/wireguard"
+	"github.com/gravitl/netmaker/nm-proxy/common"
+	peerpkg "github.com/gravitl/netmaker/nm-proxy/peer"
+	"github.com/gravitl/netmaker/nm-proxy/server"
+	"github.com/gravitl/netmaker/nm-proxy/stun"
+	"github.com/gravitl/netmaker/nm-proxy/wg"
 )
 
 func Start() {

nm-proxy/peer/peer.go

@@ -10,10 +10,10 @@ import (
 
 	"github.com/gravitl/netmaker/models"
 	"github.com/gravitl/netmaker/netclient/config"
-	"github.com/gravitl/netmaker/netclient/netclient-proxy/common"
-	"github.com/gravitl/netmaker/netclient/netclient-proxy/proxy"
-	"github.com/gravitl/netmaker/netclient/netclient-proxy/server"
-	"github.com/gravitl/netmaker/netclient/netclient-proxy/wg"
+	"github.com/gravitl/netmaker/nm-proxy/common"
+	"github.com/gravitl/netmaker/nm-proxy/proxy"
+	"github.com/gravitl/netmaker/nm-proxy/server"
+	"github.com/gravitl/netmaker/nm-proxy/wg"
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 

nm-proxy/proxy/proxy.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"net"
 
-	"github.com/gravitl/netmaker/netclient/netclient-proxy/server"
-	"github.com/gravitl/netmaker/netclient/netclient-proxy/wg"
+	"github.com/gravitl/netmaker/nm-proxy/server"
+	"github.com/gravitl/netmaker/nm-proxy/wg"
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 

nm-proxy/proxy/wireguard.go

@@ -11,9 +11,9 @@ import (
 	"strconv"
 
 	"github.com/c-robinson/iplib"
-	"github.com/gravitl/netmaker/netclient/netclient-proxy/common"
-	"github.com/gravitl/netmaker/netclient/netclient-proxy/packet"
-	"github.com/gravitl/netmaker/netclient/netclient-proxy/wg"
+	"github.com/gravitl/netmaker/nm-proxy/common"
+	"github.com/gravitl/netmaker/nm-proxy/packet"
+	"github.com/gravitl/netmaker/nm-proxy/wg"
 )
 
 func NewProxy(config Config) *Proxy {

nm-proxy/server/server.go

@@ -6,8 +6,8 @@ import (
 	"net"
 	"time"
 
-	"github.com/gravitl/netmaker/netclient/netclient-proxy/common"
-	"github.com/gravitl/netmaker/netclient/netclient-proxy/packet"
+	"github.com/gravitl/netmaker/nm-proxy/common"
+	"github.com/gravitl/netmaker/nm-proxy/packet"
 )
 
 const (