diff --git a/pkg/account/accounts.go b/pkg/account/accounts.go
index a9c997a9cc..19df2cf85c 100644
--- a/pkg/account/accounts.go
+++ b/pkg/account/accounts.go
@@ -25,9 +25,3 @@ type Manager interface {
 	// List all records
 	List() ([]*proto.Record, error)
 }
-
-// Record is an entry in the account storage
-type Record struct {
-	Key   string
-	Value []byte
-}
diff --git a/pkg/command/server.go b/pkg/command/server.go
index 0ce9fa874a..b96f9a3959 100644
--- a/pkg/command/server.go
+++ b/pkg/command/server.go
@@ -8,7 +8,7 @@ import (
 	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis-accounts/pkg/config"
-	"github.com/owncloud/ocis-accounts/pkg/micro/grpc"
+	"github.com/owncloud/ocis-accounts/pkg/server/grpc"
 	oclog "github.com/owncloud/ocis-pkg/v2/log"
 )
 
diff --git a/pkg/micro/grpc/options.go b/pkg/server/grpc/option.go
similarity index 100%
rename from pkg/micro/grpc/options.go
rename to pkg/server/grpc/option.go
diff --git a/pkg/micro/grpc/grpc.go b/pkg/server/grpc/server.go
similarity index 100%
rename from pkg/micro/grpc/grpc.go
rename to pkg/server/grpc/server.go