adjust imports

graph/cmd/graph/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"github.com/owncloud/ocis-graph/pkg/command"
+	"github.com/owncloud/ocis/graph/pkg/command"
 )
 
 func main() {

graph/go.mod

@@ -1,4 +1,4 @@
-module github.com/owncloud/ocis-graph
+module github.com/owncloud/ocis/graph
 
 go 1.13
 

graph/pkg/command/health.go

@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis-graph/pkg/config"
-	"github.com/owncloud/ocis-graph/pkg/flagset"
+	"github.com/owncloud/ocis/graph/pkg/config"
+	"github.com/owncloud/ocis/graph/pkg/flagset"
 )
 
 // Health is the entrypoint for the health command.

graph/pkg/command/root.go

@@ -5,10 +5,10 @@ import (
 	"strings"
 
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis-graph/pkg/config"
-	"github.com/owncloud/ocis-graph/pkg/flagset"
-	"github.com/owncloud/ocis-graph/pkg/version"
 	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/graph/pkg/config"
+	"github.com/owncloud/ocis/graph/pkg/flagset"
+	"github.com/owncloud/ocis/graph/pkg/version"
 	"github.com/spf13/viper"
 )
 
@@ -17,7 +17,7 @@ func Execute() error {
 	cfg := config.New()
 
 	app := &cli.App{
-		Name:     "ocis-graph",
+		Name:     "graph",
 		Version:  version.String,
 		Usage:    "Serve Graph API for oCIS",
 		Compiled: version.Compiled(),

graph/pkg/command/server.go

@@ -14,11 +14,11 @@ import (
 	"github.com/oklog/run"
 	openzipkin "github.com/openzipkin/zipkin-go"
 	zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http"
-	"github.com/owncloud/ocis-graph/pkg/config"
-	"github.com/owncloud/ocis-graph/pkg/flagset"
-	"github.com/owncloud/ocis-graph/pkg/metrics"
-	"github.com/owncloud/ocis-graph/pkg/server/debug"
-	"github.com/owncloud/ocis-graph/pkg/server/http"
+	"github.com/owncloud/ocis/graph/pkg/config"
+	"github.com/owncloud/ocis/graph/pkg/flagset"
+	"github.com/owncloud/ocis/graph/pkg/metrics"
+	"github.com/owncloud/ocis/graph/pkg/server/debug"
+	"github.com/owncloud/ocis/graph/pkg/server/http"
 	"go.opencensus.io/stats/view"
 	"go.opencensus.io/trace"
 )

graph/pkg/flagset/flagset.go

@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis-graph/pkg/config"
+	"github.com/owncloud/ocis/graph/pkg/config"
 )
 
 // RootWithConfig applies cfg to the root flagset

graph/pkg/server/debug/option.go

@@ -3,8 +3,8 @@ package debug
 import (
 	"context"
 
-	"github.com/owncloud/ocis-graph/pkg/config"
 	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/graph/pkg/config"
 )
 
 // Option defines a single option function.

graph/pkg/server/debug/server.go

@@ -4,9 +4,9 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/owncloud/ocis-graph/pkg/config"
-	"github.com/owncloud/ocis-graph/pkg/version"
 	"github.com/owncloud/ocis-pkg/v2/service/debug"
+	"github.com/owncloud/ocis/graph/pkg/config"
+	"github.com/owncloud/ocis/graph/pkg/version"
 )
 
 // Server initializes the debug service and server.

graph/pkg/server/http/option.go

@@ -4,9 +4,9 @@ import (
 	"context"
 
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis-graph/pkg/config"
-	"github.com/owncloud/ocis-graph/pkg/metrics"
 	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/graph/pkg/config"
+	"github.com/owncloud/ocis/graph/pkg/metrics"
 )
 
 // Option defines a single option function.

graph/pkg/server/http/server.go

@@ -1,11 +1,11 @@
 package http
 
 import (
-	svc "github.com/owncloud/ocis-graph/pkg/service/v0"
-	"github.com/owncloud/ocis-graph/pkg/version"
 	"github.com/owncloud/ocis-pkg/v2/middleware"
 	"github.com/owncloud/ocis-pkg/v2/oidc"
 	"github.com/owncloud/ocis-pkg/v2/service/http"
+	svc "github.com/owncloud/ocis/graph/pkg/service/v0"
+	"github.com/owncloud/ocis/graph/pkg/version"
 )
 
 // Server initializes the http service and server.

graph/pkg/service/v0/graph.go

@@ -5,9 +5,9 @@ import (
 
 	gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
 	"github.com/go-chi/chi"
-	"github.com/owncloud/ocis-graph/pkg/config"
-	"github.com/owncloud/ocis-graph/pkg/cs3"
 	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/graph/pkg/config"
+	"github.com/owncloud/ocis/graph/pkg/cs3"
 )
 
 // Graph defines implements the business logic for Service.

graph/pkg/service/v0/groups.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/owncloud/ocis-graph/pkg/service/v0/errorcode"
+	"github.com/owncloud/ocis/graph/pkg/service/v0/errorcode"
 
 	"github.com/go-chi/chi"
 	"github.com/go-chi/render"

graph/pkg/service/v0/instrument.go

@@ -3,7 +3,7 @@ package svc
 import (
 	"net/http"
 
-	"github.com/owncloud/ocis-graph/pkg/metrics"
+	"github.com/owncloud/ocis/graph/pkg/metrics"
 )
 
 // NewInstrument returns a service that instruments metrics.

graph/pkg/service/v0/option.go

@@ -3,8 +3,8 @@ package svc
 import (
 	"net/http"
 
-	"github.com/owncloud/ocis-graph/pkg/config"
 	"github.com/owncloud/ocis-pkg/v2/log"
+	"github.com/owncloud/ocis/graph/pkg/config"
 )
 
 // Option defines a single option function.

graph/pkg/service/v0/users.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/owncloud/ocis-graph/pkg/service/v0/errorcode"
+	"github.com/owncloud/ocis/graph/pkg/service/v0/errorcode"
 
 	"github.com/go-chi/chi"
 	"github.com/go-chi/render"