diff --git a/arista-proxy/README.md b/go/svc/arista-proxy/README.md
similarity index 100%
rename from arista-proxy/README.md
rename to go/svc/arista-proxy/README.md
diff --git a/arista-proxy/arista.proto b/go/svc/arista-proxy/arista.proto
similarity index 100%
rename from arista-proxy/arista.proto
rename to go/svc/arista-proxy/arista.proto
diff --git a/arista-proxy/main.go b/go/svc/arista-proxy/main.go
similarity index 100%
rename from arista-proxy/main.go
rename to go/svc/arista-proxy/main.go
diff --git a/arista-proxy/proto/.gitignore b/go/svc/arista-proxy/proto/.gitignore
similarity index 100%
rename from arista-proxy/proto/.gitignore
rename to go/svc/arista-proxy/proto/.gitignore
diff --git a/arista-proxy/proto/generate.go b/go/svc/arista-proxy/proto/generate.go
similarity index 100%
rename from arista-proxy/proto/generate.go
rename to go/svc/arista-proxy/proto/generate.go
diff --git a/arista-proxy/service.go b/go/svc/arista-proxy/service.go
similarity index 100%
rename from arista-proxy/service.go
rename to go/svc/arista-proxy/service.go