From 3a935667933eac5c1ba76101e768c86a0acbbe09 Mon Sep 17 00:00:00 2001
From: zhilingc <zhiling.c@go-jek.com>
Date: Thu, 13 Dec 2018 18:09:38 +0800
Subject: [PATCH] Directory changes

---
 Makefile                                      |   9 +-
 VERSION                                       |   1 +
 cli/Makefile                                  |  10 +-
 cli/feast/cmd/apply.go                        |   2 +-
 cli/feast/cmd/jobs.go                         |   2 +-
 cli/feast/cmd/list.go                         |   2 +-
 cli/feast/cmd/version.go                      |  10 +-
 cli/feast/main.go                             |   8 +-
 cli/feast/pkg/parse/yaml.go                   |   4 +-
 cli/feast/pkg/parse/yaml_test.go              |   4 +-
 cli/feast/pkg/printer/job.go                  |   2 +-
 core/src/main/proto                           |   1 -
 core/src/main/proto/feast                     |   1 +
 core/src/main/proto/third_party               |   1 +
 ingestion/src/main/proto                      |   1 -
 ingestion/src/main/proto/feast                |   1 +
 ingestion/src/main/proto/third_party          |   1 +
 protos/feast/core/CoreService.proto           |   2 +-
 protos/feast/core/JobService.proto            |   2 +-
 protos/feast/core/UIService.proto             |   2 +-
 protos/feast/serving/Serving.proto            |   2 +-
 protos/feast/specs/EntitySpec.proto           |   2 +-
 protos/feast/specs/FeatureGroupSpec.proto     |   2 +-
 protos/feast/specs/FeatureSpec.proto          |   2 +-
 protos/feast/specs/ImportSpec.proto           |   2 +-
 protos/feast/specs/StorageSpec.proto          |   2 +-
 protos/feast/storage/BigTable.proto           |   2 +-
 protos/feast/storage/Redis.proto              |   2 +-
 protos/feast/types/Feature.proto              |   2 +-
 protos/feast/types/FeatureRow.proto           |   2 +-
 protos/feast/types/FeatureRowExtended.proto   |   2 +-
 protos/feast/types/Granularity.proto          |   2 +-
 protos/feast/types/Value.proto                |   2 +-
 .../go}/feast/core/CoreService.pb.go          | 118 +++++++--------
 .../generated/go}/feast/core/JobService.pb.go | 110 +++++++-------
 .../generated/go}/feast/core/UIService.pb.go  | 141 +++++++++---------
 .../generated/go}/feast/serving/Serving.pb.go | 105 ++++++-------
 .../go}/feast/specs/EntitySpec.pb.go          |  33 ++--
 .../go}/feast/specs/FeatureGroupSpec.pb.go    |  36 ++---
 .../go}/feast/specs/FeatureSpec.pb.go         |  81 +++++-----
 .../go}/feast/specs/ImportSpec.pb.go          |  72 ++++-----
 .../go}/feast/specs/StorageSpec.pb.go         |  39 ++---
 .../go}/feast/storage/BigTable.pb.go          |  40 ++---
 .../generated/go}/feast/storage/Redis.pb.go   |  60 ++++----
 .../generated/go}/feast/types/Feature.pb.go   |  36 ++---
 .../go}/feast/types/FeatureRow.pb.go          |  48 +++---
 .../go}/feast/types/FeatureRowExtended.pb.go  |  54 +++----
 .../go}/feast/types/Granularity.pb.go         |  20 +--
 .../generated/go}/feast/types/Value.pb.go     | 114 +++++++-------
 serving/src/main/proto                        |   1 -
 serving/src/main/proto/feast                  |   1 +
 serving/src/main/proto/third_party            |   1 +
 52 files changed, 615 insertions(+), 587 deletions(-)
 create mode 100644 VERSION
 delete mode 120000 core/src/main/proto
 create mode 120000 core/src/main/proto/feast
 create mode 120000 core/src/main/proto/third_party
 delete mode 120000 ingestion/src/main/proto
 create mode 120000 ingestion/src/main/proto/feast
 create mode 120000 ingestion/src/main/proto/third_party
 rename {go-feast-proto => protos/generated/go}/feast/core/CoreService.pb.go (89%)
 rename {go-feast-proto => protos/generated/go}/feast/core/JobService.pb.go (84%)
 rename {go-feast-proto => protos/generated/go}/feast/core/UIService.pb.go (88%)
 rename {go-feast-proto => protos/generated/go}/feast/serving/Serving.pb.go (79%)
 rename {go-feast-proto => protos/generated/go}/feast/specs/EntitySpec.pb.go (63%)
 rename {go-feast-proto => protos/generated/go}/feast/specs/FeatureGroupSpec.pb.go (61%)
 rename {go-feast-proto => protos/generated/go}/feast/specs/FeatureSpec.pb.go (69%)
 rename {go-feast-proto => protos/generated/go}/feast/specs/ImportSpec.pb.go (75%)
 rename {go-feast-proto => protos/generated/go}/feast/specs/StorageSpec.pb.go (61%)
 rename {go-feast-proto => protos/generated/go}/feast/storage/BigTable.pb.go (61%)
 rename {go-feast-proto => protos/generated/go}/feast/storage/Redis.pb.go (72%)
 rename {go-feast-proto => protos/generated/go}/feast/types/Feature.pb.go (60%)
 rename {go-feast-proto => protos/generated/go}/feast/types/FeatureRow.pb.go (60%)
 rename {go-feast-proto => protos/generated/go}/feast/types/FeatureRowExtended.pb.go (71%)
 rename {go-feast-proto => protos/generated/go}/feast/types/Granularity.pb.go (82%)
 rename {go-feast-proto => protos/generated/go}/feast/types/Value.pb.go (86%)
 delete mode 120000 serving/src/main/proto
 create mode 120000 serving/src/main/proto/feast
 create mode 120000 serving/src/main/proto/third_party

diff --git a/Makefile b/Makefile
index 756aef407b..9ba37a8f0c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,16 @@
-.PHONY: go
+VERSION_FILE=VERSION
+FEAST_VERSION=`cat $(VERSION_FILE)`
 
 build-deps:
 	$(MAKE) -C protos gen-go
 	dep ensure
 
 build-cli:
+	$(MAKE) build-deps
 	$(MAKE) -C cli build-all
 
-install-cli:
-	@$(MAKE) build-deps
-	cd cli/feast && go install
+build-java:
+	mvn clean verify -Drevision=$(FEAST_VERSION)
 
 build-docker:
 	docker build -t $(registry)/feast-core:$(version) -f docker/core/Dockerfile .
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000000..9325c3ccda
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+0.3.0
\ No newline at end of file
diff --git a/cli/Makefile b/cli/Makefile
index fc32d2729e..91cb05a39a 100644
--- a/cli/Makefile
+++ b/cli/Makefile
@@ -1,4 +1,6 @@
 .PHONY: go
+VERSION_FILE=../VERSION
+FEAST_VERSION=`cat $(VERSION_FILE)`
 
 build-all: 
 	@$(MAKE) cli-linux cli-darwin
@@ -8,10 +10,14 @@ cli-linux:
 	mkdir -p bin
 	export GOOS=linux; \
 	export GOARCH=amd64; \
-	mkdir -p bin/$$GOOS-$$GOARCH && go build -o bin/$$GOOS-$$GOARCH/feast feast/main.go
+	mkdir -p bin/$$GOOS-$$GOARCH && go build \
+	-ldflags "-X main.Version=$(FEAST_VERSION)" \
+	-o bin/$$GOOS-$$GOARCH/feast feast/main.go
 
 .PHONY: cli-darwin
 cli-darwin:
 	export GOOS=darwin; \
 	export GOARCH=amd64; \
-	mkdir -p bin/$$GOOS-$$GOARCH && go build -o bin/$$GOOS-$$GOARCH/feast feast/main.go
\ No newline at end of file
+	mkdir -p bin/$$GOOS-$$GOARCH && go build \
+	-ldflags "-X main.Version=$(FEAST_VERSION)" \
+	-o bin/$$GOOS-$$GOARCH/feast feast/main.go
\ No newline at end of file
diff --git a/cli/feast/cmd/apply.go b/cli/feast/cmd/apply.go
index 652e047d7d..ab2e4229b8 100644
--- a/cli/feast/cmd/apply.go
+++ b/cli/feast/cmd/apply.go
@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 
 	"github.com/gojektech/feast/cli/feast/pkg/parse"
-	"github.com/gojektech/feast/go-feast-proto/feast/core"
+	"github.com/gojektech/feast/protos/generated/go/feast/core"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cli/feast/cmd/jobs.go b/cli/feast/cmd/jobs.go
index 16ec75ae32..1f1772aa3f 100644
--- a/cli/feast/cmd/jobs.go
+++ b/cli/feast/cmd/jobs.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/gojektech/feast/cli/feast/pkg/parse"
 	"github.com/gojektech/feast/cli/feast/pkg/printer"
-	"github.com/gojektech/feast/go-feast-proto/feast/core"
+	"github.com/gojektech/feast/protos/generated/go/feast/core"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cli/feast/cmd/list.go b/cli/feast/cmd/list.go
index 9918e36c77..0b790427ce 100644
--- a/cli/feast/cmd/list.go
+++ b/cli/feast/cmd/list.go
@@ -23,7 +23,7 @@ import (
 	"text/tabwriter"
 
 	"github.com/gojektech/feast/cli/feast/pkg/util"
-	"github.com/gojektech/feast/go-feast-proto/feast/core"
+	"github.com/gojektech/feast/protos/generated/go/feast/core"
 
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/spf13/cobra"
diff --git a/cli/feast/cmd/version.go b/cli/feast/cmd/version.go
index ca01d1dc59..43ac93ab90 100644
--- a/cli/feast/cmd/version.go
+++ b/cli/feast/cmd/version.go
@@ -20,16 +20,22 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var version = "0.3.0"
+// Version is the cli version, injected at compile time
+var version string
 
 var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "feast cli version",
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Printf("CLI version: %s\n", version)
+		fmt.Println(version)
 	},
 }
 
 func init() {
 	rootCmd.AddCommand(versionCmd)
 }
+
+// SetVersion sets the version to the given version.
+func SetVersion(v string) {
+	version = v
+}
diff --git a/cli/feast/main.go b/cli/feast/main.go
index ae3f14a8ed..57ae342365 100644
--- a/cli/feast/main.go
+++ b/cli/feast/main.go
@@ -14,8 +14,14 @@
 
 package main
 
-import "github.com/gojektech/feast/cli/feast/cmd"
+import (
+	"github.com/gojektech/feast/cli/feast/cmd"
+)
+
+// Version is the Feast version
+var Version string
 
 func main() {
+	cmd.SetVersion(Version)
 	cmd.Execute()
 }
diff --git a/cli/feast/pkg/parse/yaml.go b/cli/feast/pkg/parse/yaml.go
index d466a51dc4..073c708f5b 100644
--- a/cli/feast/pkg/parse/yaml.go
+++ b/cli/feast/pkg/parse/yaml.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/ghodss/yaml"
 
-	"github.com/gojektech/feast/go-feast-proto/feast/specs"
-	"github.com/gojektech/feast/go-feast-proto/feast/types"
+	"github.com/gojektech/feast/protos/generated/go/feast/specs"
+	"github.com/gojektech/feast/protos/generated/go/feast/types"
 )
 
 // YamlToFeatureSpec parses the given yaml and outputs the corresponding
diff --git a/cli/feast/pkg/parse/yaml_test.go b/cli/feast/pkg/parse/yaml_test.go
index 78e8ff28fd..fc517839c3 100644
--- a/cli/feast/pkg/parse/yaml_test.go
+++ b/cli/feast/pkg/parse/yaml_test.go
@@ -19,8 +19,8 @@ import (
 
 	"github.com/golang/protobuf/ptypes/timestamp"
 
-	"github.com/gojektech/feast/go-feast-proto/feast/specs"
-	"github.com/gojektech/feast/go-feast-proto/feast/types"
+	"github.com/gojektech/feast/protos/generated/go/feast/specs"
+	"github.com/gojektech/feast/protos/generated/go/feast/types"
 
 	"github.com/google/go-cmp/cmp"
 )
diff --git a/cli/feast/pkg/printer/job.go b/cli/feast/pkg/printer/job.go
index c128f30f89..377bbef058 100644
--- a/cli/feast/pkg/printer/job.go
+++ b/cli/feast/pkg/printer/job.go
@@ -19,7 +19,7 @@ import (
 	"strings"
 
 	"github.com/gojektech/feast/cli/feast/pkg/util"
-	"github.com/gojektech/feast/go-feast-proto/feast/core"
+	"github.com/gojektech/feast/protos/generated/go/feast/core"
 )
 
 // PrintJobDetail pretty prints the given job detail
diff --git a/core/src/main/proto b/core/src/main/proto
deleted file mode 120000
index 21f63ff310..0000000000
--- a/core/src/main/proto
+++ /dev/null
@@ -1 +0,0 @@
-../../../protos
\ No newline at end of file
diff --git a/core/src/main/proto/feast b/core/src/main/proto/feast
new file mode 120000
index 0000000000..d520da9126
--- /dev/null
+++ b/core/src/main/proto/feast
@@ -0,0 +1 @@
+../../../../protos/feast
\ No newline at end of file
diff --git a/core/src/main/proto/third_party b/core/src/main/proto/third_party
new file mode 120000
index 0000000000..363d20598e
--- /dev/null
+++ b/core/src/main/proto/third_party
@@ -0,0 +1 @@
+../../../../protos/third_party
\ No newline at end of file
diff --git a/ingestion/src/main/proto b/ingestion/src/main/proto
deleted file mode 120000
index 21f63ff310..0000000000
--- a/ingestion/src/main/proto
+++ /dev/null
@@ -1 +0,0 @@
-../../../protos
\ No newline at end of file
diff --git a/ingestion/src/main/proto/feast b/ingestion/src/main/proto/feast
new file mode 120000
index 0000000000..d520da9126
--- /dev/null
+++ b/ingestion/src/main/proto/feast
@@ -0,0 +1 @@
+../../../../protos/feast
\ No newline at end of file
diff --git a/ingestion/src/main/proto/third_party b/ingestion/src/main/proto/third_party
new file mode 120000
index 0000000000..363d20598e
--- /dev/null
+++ b/ingestion/src/main/proto/third_party
@@ -0,0 +1 @@
+../../../../protos/third_party
\ No newline at end of file
diff --git a/protos/feast/core/CoreService.proto b/protos/feast/core/CoreService.proto
index 7ea8f07ffc..b2e8530242 100644
--- a/protos/feast/core/CoreService.proto
+++ b/protos/feast/core/CoreService.proto
@@ -26,7 +26,7 @@ import "google/protobuf/empty.proto";
 
 option java_package = "feast.core";
 option java_outer_classname = "CoreServiceProto";
-option go_package = "github.com/gojektech/feast/go-feast-proto/feast/core";
+option go_package = "github.com/gojektech/feast/protos/generated/go/feast/core";
 
 service CoreService {
     /*
diff --git a/protos/feast/core/JobService.proto b/protos/feast/core/JobService.proto
index 297cbee563..24535b5950 100644
--- a/protos/feast/core/JobService.proto
+++ b/protos/feast/core/JobService.proto
@@ -24,7 +24,7 @@ import "google/protobuf/timestamp.proto";
 
 option java_package = "feast.core";
 option java_outer_classname = "JobServiceProto";
-option go_package = "github.com/gojektech/feast/go-feast-proto/feast/core";
+option go_package = "github.com/gojektech/feast/protos/generated/go/feast/core";
 
 service JobService {
     // Submit a job to feast to run. Returns the job id.
diff --git a/protos/feast/core/UIService.proto b/protos/feast/core/UIService.proto
index cd714474e3..dabed04fff 100644
--- a/protos/feast/core/UIService.proto
+++ b/protos/feast/core/UIService.proto
@@ -27,7 +27,7 @@ import "google/protobuf/timestamp.proto";
 
 option java_package = "feast.core";
 option java_outer_classname = "UIServiceProto";
-option go_package = "github.com/gojektech/feast/go-feast-proto/feast/core";
+option go_package = "github.com/gojektech/feast/protos/generated/go/feast/core";
 
 service UIService {
     /*
diff --git a/protos/feast/serving/Serving.proto b/protos/feast/serving/Serving.proto
index 9e313795f4..aab36906b8 100644
--- a/protos/feast/serving/Serving.proto
+++ b/protos/feast/serving/Serving.proto
@@ -23,7 +23,7 @@ import "feast/types/Value.proto";
 
 option java_package = "feast.serving";
 option java_outer_classname = "ServingAPIProto";
-option go_package = "github.com/gojektech/feast/go-feast-proto/feast/serving";
+option go_package = "github.com/gojektech/feast/protos/generated/go/feast/serving";
 
 service ServingAPI {
     // Query features from Feast
diff --git a/protos/feast/specs/EntitySpec.proto b/protos/feast/specs/EntitySpec.proto
index 6828d69c79..8b0a30c3b5 100644
--- a/protos/feast/specs/EntitySpec.proto
+++ b/protos/feast/specs/EntitySpec.proto
@@ -20,7 +20,7 @@ package feast.specs;
 
 option java_package = "feast.specs";
 option java_outer_classname = "EntitySpecProto";
-option go_package = "github.com/gojektech/feast/go-feast-proto/feast/specs";
+option go_package = "github.com/gojektech/feast/protos/generated/go/feast/specs";
 
 message EntitySpec {
   string name = 1;
diff --git a/protos/feast/specs/FeatureGroupSpec.proto b/protos/feast/specs/FeatureGroupSpec.proto
index e5e0efbd3d..090003782a 100644
--- a/protos/feast/specs/FeatureGroupSpec.proto
+++ b/protos/feast/specs/FeatureGroupSpec.proto
@@ -22,7 +22,7 @@ package feast.specs;
 
 option java_package = "feast.specs";
 option java_outer_classname = "FeatureGroupSpecProto";
-option go_package = "github.com/gojektech/feast/go-feast-proto/feast/specs";
+option go_package = "github.com/gojektech/feast/protos/generated/go/feast/specs";
 
 message FeatureGroupSpec {
   string id = 1;
diff --git a/protos/feast/specs/FeatureSpec.proto b/protos/feast/specs/FeatureSpec.proto
index be7f9e7d19..a33e33a1de 100644
--- a/protos/feast/specs/FeatureSpec.proto
+++ b/protos/feast/specs/FeatureSpec.proto
@@ -25,7 +25,7 @@ package feast.specs;
 
 option java_package = "feast.specs";
 option java_outer_classname = "FeatureSpecProto";
-option go_package = "github.com/gojektech/feast/go-feast-proto/feast/specs";
+option go_package = "github.com/gojektech/feast/protos/generated/go/feast/specs";
 
 message FeatureSpec {
   string id = 1;
diff --git a/protos/feast/specs/ImportSpec.proto b/protos/feast/specs/ImportSpec.proto
index b33035be41..329137f7e4 100644
--- a/protos/feast/specs/ImportSpec.proto
+++ b/protos/feast/specs/ImportSpec.proto
@@ -20,7 +20,7 @@ package feast.specs;
 
 option java_package = "feast.specs";
 option java_outer_classname = "ImportSpecProto";
-option go_package = "github.com/gojektech/feast/go-feast-proto/feast/specs";
+option go_package = "github.com/gojektech/feast/protos/generated/go/feast/specs";
 
 import "feast/types/Value.proto";
 import "google/protobuf/timestamp.proto";
diff --git a/protos/feast/specs/StorageSpec.proto b/protos/feast/specs/StorageSpec.proto
index 44129bb84e..bcc2fca9b8 100644
--- a/protos/feast/specs/StorageSpec.proto
+++ b/protos/feast/specs/StorageSpec.proto
@@ -20,7 +20,7 @@ package feast.specs;
 
 option java_package = "feast.specs";
 option java_outer_classname = "StorageSpecProto";
-option go_package = "github.com/gojektech/feast/go-feast-proto/feast/specs";
+option go_package = "github.com/gojektech/feast/protos/generated/go/feast/specs";
 
 message StorageSpec {
   // unique identifier for this instance
diff --git a/protos/feast/storage/BigTable.proto b/protos/feast/storage/BigTable.proto
index af6f8d819a..dc9cfea734 100644
--- a/protos/feast/storage/BigTable.proto
+++ b/protos/feast/storage/BigTable.proto
@@ -22,7 +22,7 @@ package feast.storage;
 
 option java_outer_classname = "BigTableProto";
 option java_package = "feast.storage";
-option go_package = "github.com/gojektech/feast/go-feast-proto/feast/storage";
+option go_package = "github.com/gojektech/feast/protos/generated/go/feast/storage";
 
 message BigTableRowKey {
   // This should be the first 7 characters of a sha1 of the entityKey proto encoded
diff --git a/protos/feast/storage/Redis.proto b/protos/feast/storage/Redis.proto
index c44507a3c3..92393d189e 100644
--- a/protos/feast/storage/Redis.proto
+++ b/protos/feast/storage/Redis.proto
@@ -23,7 +23,7 @@ package feast.storage;
 
 option java_outer_classname = "RedisProto";
 option java_package = "feast.storage";
-option go_package = "github.com/gojektech/feast/go-feast-proto/feast/storage";
+option go_package = "github.com/gojektech/feast/protos/generated/go/feast/storage";
 
 message RedisBucketKey {
   // Field number 1 is reserved for a future distributing hash if needed
diff --git a/protos/feast/types/Feature.proto b/protos/feast/types/Feature.proto
index 9790944887..8fe432317f 100644
--- a/protos/feast/types/Feature.proto
+++ b/protos/feast/types/Feature.proto
@@ -23,7 +23,7 @@ package feast.types;
 
 option java_package = "feast.types";
 option java_outer_classname = "FeatureProto";
-option go_package = "github.com/gojektech/feast/go-feast-proto/feast/types";
+option go_package = "github.com/gojektech/feast/protos/generated/go/feast/types";
 
 message Feature {
   string id = 1;
diff --git a/protos/feast/types/FeatureRow.proto b/protos/feast/types/FeatureRow.proto
index 033630dfe3..537bc1a540 100644
--- a/protos/feast/types/FeatureRow.proto
+++ b/protos/feast/types/FeatureRow.proto
@@ -25,7 +25,7 @@ package feast.types;
 
 option java_package = "feast.types";
 option java_outer_classname = "FeatureRowProto";
-option go_package = "github.com/gojektech/feast/go-feast-proto/feast/types";
+option go_package = "github.com/gojektech/feast/protos/generated/go/feast/types";
 
 
 message FeatureRow {
diff --git a/protos/feast/types/FeatureRowExtended.proto b/protos/feast/types/FeatureRowExtended.proto
index ac71ee97bf..1a5ec7ffdf 100644
--- a/protos/feast/types/FeatureRowExtended.proto
+++ b/protos/feast/types/FeatureRowExtended.proto
@@ -23,7 +23,7 @@ package feast.types;
 
 option java_package = "feast.types";
 option java_outer_classname = "FeatureRowExtendedProto";
-option go_package = "github.com/gojektech/feast/go-feast-proto/feast/types";
+option go_package = "github.com/gojektech/feast/protos/generated/go/feast/types";
 
 message Error {
   string cause = 1; // exception class name
diff --git a/protos/feast/types/Granularity.proto b/protos/feast/types/Granularity.proto
index aa5ef90207..ad14c5c938 100644
--- a/protos/feast/types/Granularity.proto
+++ b/protos/feast/types/Granularity.proto
@@ -20,7 +20,7 @@ package feast.types;
 
 option java_package = "feast.types";
 option java_outer_classname = "GranularityProto";
-option go_package = "github.com/gojektech/feast/go-feast-proto/feast/types";
+option go_package = "github.com/gojektech/feast/protos/generated/go/feast/types";
 
 message Granularity {
   enum Enum {
diff --git a/protos/feast/types/Value.proto b/protos/feast/types/Value.proto
index b7142173ff..23624c48ae 100644
--- a/protos/feast/types/Value.proto
+++ b/protos/feast/types/Value.proto
@@ -22,7 +22,7 @@ package feast.types;
 
 option java_package = "feast.types";
 option java_outer_classname = "ValueProto";
-option go_package = "github.com/gojektech/feast/go-feast-proto/feast/types";
+option go_package = "github.com/gojektech/feast/protos/generated/go/feast/types";
 
 message ValueType {
   enum Enum {
diff --git a/go-feast-proto/feast/core/CoreService.pb.go b/protos/generated/go/feast/core/CoreService.pb.go
similarity index 89%
rename from go-feast-proto/feast/core/CoreService.pb.go
rename to protos/generated/go/feast/core/CoreService.pb.go
index f5c35a8c1b..29bfeab20b 100644
--- a/go-feast-proto/feast/core/CoreService.pb.go
+++ b/protos/generated/go/feast/core/CoreService.pb.go
@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: feast/core/CoreService.proto
 
-package core // import "github.com/gojektech/feast/go-feast-proto/feast/core"
+package core // import "github.com/gojektech/feast/protos/generated/go/feast/core"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import specs "github.com/gojektech/feast/go-feast-proto/feast/specs"
+import specs "github.com/gojektech/feast/protos/generated/go/feast/specs"
 import empty "github.com/golang/protobuf/ptypes/empty"
 
 import (
@@ -35,7 +35,7 @@ func (m *CoreServiceTypes) Reset()         { *m = CoreServiceTypes{} }
 func (m *CoreServiceTypes) String() string { return proto.CompactTextString(m) }
 func (*CoreServiceTypes) ProtoMessage()    {}
 func (*CoreServiceTypes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_CoreService_ab3e56c9944743b5, []int{0}
+	return fileDescriptor_CoreService_6fef85f8dd0eabb6, []int{0}
 }
 func (m *CoreServiceTypes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CoreServiceTypes.Unmarshal(m, b)
@@ -66,7 +66,7 @@ func (m *CoreServiceTypes_GetEntitiesRequest) Reset()         { *m = CoreService
 func (m *CoreServiceTypes_GetEntitiesRequest) String() string { return proto.CompactTextString(m) }
 func (*CoreServiceTypes_GetEntitiesRequest) ProtoMessage()    {}
 func (*CoreServiceTypes_GetEntitiesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_CoreService_ab3e56c9944743b5, []int{0, 0}
+	return fileDescriptor_CoreService_6fef85f8dd0eabb6, []int{0, 0}
 }
 func (m *CoreServiceTypes_GetEntitiesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CoreServiceTypes_GetEntitiesRequest.Unmarshal(m, b)
@@ -104,7 +104,7 @@ func (m *CoreServiceTypes_GetEntitiesResponse) Reset()         { *m = CoreServic
 func (m *CoreServiceTypes_GetEntitiesResponse) String() string { return proto.CompactTextString(m) }
 func (*CoreServiceTypes_GetEntitiesResponse) ProtoMessage()    {}
 func (*CoreServiceTypes_GetEntitiesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_CoreService_ab3e56c9944743b5, []int{0, 1}
+	return fileDescriptor_CoreService_6fef85f8dd0eabb6, []int{0, 1}
 }
 func (m *CoreServiceTypes_GetEntitiesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CoreServiceTypes_GetEntitiesResponse.Unmarshal(m, b)
@@ -142,7 +142,7 @@ func (m *CoreServiceTypes_ListEntitiesResponse) Reset()         { *m = CoreServi
 func (m *CoreServiceTypes_ListEntitiesResponse) String() string { return proto.CompactTextString(m) }
 func (*CoreServiceTypes_ListEntitiesResponse) ProtoMessage()    {}
 func (*CoreServiceTypes_ListEntitiesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_CoreService_ab3e56c9944743b5, []int{0, 2}
+	return fileDescriptor_CoreService_6fef85f8dd0eabb6, []int{0, 2}
 }
 func (m *CoreServiceTypes_ListEntitiesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CoreServiceTypes_ListEntitiesResponse.Unmarshal(m, b)
@@ -181,7 +181,7 @@ func (m *CoreServiceTypes_GetFeaturesRequest) Reset()         { *m = CoreService
 func (m *CoreServiceTypes_GetFeaturesRequest) String() string { return proto.CompactTextString(m) }
 func (*CoreServiceTypes_GetFeaturesRequest) ProtoMessage()    {}
 func (*CoreServiceTypes_GetFeaturesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_CoreService_ab3e56c9944743b5, []int{0, 3}
+	return fileDescriptor_CoreService_6fef85f8dd0eabb6, []int{0, 3}
 }
 func (m *CoreServiceTypes_GetFeaturesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CoreServiceTypes_GetFeaturesRequest.Unmarshal(m, b)
@@ -219,7 +219,7 @@ func (m *CoreServiceTypes_GetFeaturesResponse) Reset()         { *m = CoreServic
 func (m *CoreServiceTypes_GetFeaturesResponse) String() string { return proto.CompactTextString(m) }
 func (*CoreServiceTypes_GetFeaturesResponse) ProtoMessage()    {}
 func (*CoreServiceTypes_GetFeaturesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_CoreService_ab3e56c9944743b5, []int{0, 4}
+	return fileDescriptor_CoreService_6fef85f8dd0eabb6, []int{0, 4}
 }
 func (m *CoreServiceTypes_GetFeaturesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CoreServiceTypes_GetFeaturesResponse.Unmarshal(m, b)
@@ -257,7 +257,7 @@ func (m *CoreServiceTypes_ListFeaturesResponse) Reset()         { *m = CoreServi
 func (m *CoreServiceTypes_ListFeaturesResponse) String() string { return proto.CompactTextString(m) }
 func (*CoreServiceTypes_ListFeaturesResponse) ProtoMessage()    {}
 func (*CoreServiceTypes_ListFeaturesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_CoreService_ab3e56c9944743b5, []int{0, 5}
+	return fileDescriptor_CoreService_6fef85f8dd0eabb6, []int{0, 5}
 }
 func (m *CoreServiceTypes_ListFeaturesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CoreServiceTypes_ListFeaturesResponse.Unmarshal(m, b)
@@ -296,7 +296,7 @@ func (m *CoreServiceTypes_GetStorageRequest) Reset()         { *m = CoreServiceT
 func (m *CoreServiceTypes_GetStorageRequest) String() string { return proto.CompactTextString(m) }
 func (*CoreServiceTypes_GetStorageRequest) ProtoMessage()    {}
 func (*CoreServiceTypes_GetStorageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_CoreService_ab3e56c9944743b5, []int{0, 6}
+	return fileDescriptor_CoreService_6fef85f8dd0eabb6, []int{0, 6}
 }
 func (m *CoreServiceTypes_GetStorageRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CoreServiceTypes_GetStorageRequest.Unmarshal(m, b)
@@ -334,7 +334,7 @@ func (m *CoreServiceTypes_GetStorageResponse) Reset()         { *m = CoreService
 func (m *CoreServiceTypes_GetStorageResponse) String() string { return proto.CompactTextString(m) }
 func (*CoreServiceTypes_GetStorageResponse) ProtoMessage()    {}
 func (*CoreServiceTypes_GetStorageResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_CoreService_ab3e56c9944743b5, []int{0, 7}
+	return fileDescriptor_CoreService_6fef85f8dd0eabb6, []int{0, 7}
 }
 func (m *CoreServiceTypes_GetStorageResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CoreServiceTypes_GetStorageResponse.Unmarshal(m, b)
@@ -372,7 +372,7 @@ func (m *CoreServiceTypes_ListStorageResponse) Reset()         { *m = CoreServic
 func (m *CoreServiceTypes_ListStorageResponse) String() string { return proto.CompactTextString(m) }
 func (*CoreServiceTypes_ListStorageResponse) ProtoMessage()    {}
 func (*CoreServiceTypes_ListStorageResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_CoreService_ab3e56c9944743b5, []int{0, 8}
+	return fileDescriptor_CoreService_6fef85f8dd0eabb6, []int{0, 8}
 }
 func (m *CoreServiceTypes_ListStorageResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CoreServiceTypes_ListStorageResponse.Unmarshal(m, b)
@@ -411,7 +411,7 @@ func (m *CoreServiceTypes_ApplyEntityResponse) Reset()         { *m = CoreServic
 func (m *CoreServiceTypes_ApplyEntityResponse) String() string { return proto.CompactTextString(m) }
 func (*CoreServiceTypes_ApplyEntityResponse) ProtoMessage()    {}
 func (*CoreServiceTypes_ApplyEntityResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_CoreService_ab3e56c9944743b5, []int{0, 9}
+	return fileDescriptor_CoreService_6fef85f8dd0eabb6, []int{0, 9}
 }
 func (m *CoreServiceTypes_ApplyEntityResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CoreServiceTypes_ApplyEntityResponse.Unmarshal(m, b)
@@ -450,7 +450,7 @@ func (m *CoreServiceTypes_ApplyFeatureResponse) Reset()         { *m = CoreServi
 func (m *CoreServiceTypes_ApplyFeatureResponse) String() string { return proto.CompactTextString(m) }
 func (*CoreServiceTypes_ApplyFeatureResponse) ProtoMessage()    {}
 func (*CoreServiceTypes_ApplyFeatureResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_CoreService_ab3e56c9944743b5, []int{0, 10}
+	return fileDescriptor_CoreService_6fef85f8dd0eabb6, []int{0, 10}
 }
 func (m *CoreServiceTypes_ApplyFeatureResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CoreServiceTypes_ApplyFeatureResponse.Unmarshal(m, b)
@@ -493,7 +493,7 @@ func (m *CoreServiceTypes_ApplyFeatureGroupResponse) String() string {
 }
 func (*CoreServiceTypes_ApplyFeatureGroupResponse) ProtoMessage() {}
 func (*CoreServiceTypes_ApplyFeatureGroupResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_CoreService_ab3e56c9944743b5, []int{0, 11}
+	return fileDescriptor_CoreService_6fef85f8dd0eabb6, []int{0, 11}
 }
 func (m *CoreServiceTypes_ApplyFeatureGroupResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CoreServiceTypes_ApplyFeatureGroupResponse.Unmarshal(m, b)
@@ -532,7 +532,7 @@ func (m *CoreServiceTypes_ApplyStorageResponse) Reset()         { *m = CoreServi
 func (m *CoreServiceTypes_ApplyStorageResponse) String() string { return proto.CompactTextString(m) }
 func (*CoreServiceTypes_ApplyStorageResponse) ProtoMessage()    {}
 func (*CoreServiceTypes_ApplyStorageResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_CoreService_ab3e56c9944743b5, []int{0, 12}
+	return fileDescriptor_CoreService_6fef85f8dd0eabb6, []int{0, 12}
 }
 func (m *CoreServiceTypes_ApplyStorageResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CoreServiceTypes_ApplyStorageResponse.Unmarshal(m, b)
@@ -1006,47 +1006,47 @@ var _CoreService_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("feast/core/CoreService.proto", fileDescriptor_CoreService_ab3e56c9944743b5)
-}
-
-var fileDescriptor_CoreService_ab3e56c9944743b5 = []byte{
-	// 601 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcf, 0x6f, 0xd3, 0x30,
-	0x14, 0x6e, 0x35, 0x69, 0x6a, 0x5f, 0x2b, 0xb4, 0xb9, 0x13, 0x14, 0xd3, 0xa1, 0x29, 0x12, 0xd3,
-	0x2e, 0x73, 0xc6, 0x56, 0x38, 0x71, 0x61, 0xd3, 0xa8, 0x60, 0x13, 0x42, 0xe9, 0x2e, 0x0c, 0x71,
-	0x68, 0xb3, 0xd7, 0x2c, 0xd0, 0xce, 0x21, 0x76, 0x91, 0x7a, 0xe6, 0xff, 0xe3, 0x6f, 0x42, 0x75,
-	0x5c, 0xc7, 0x4d, 0x93, 0xa5, 0x42, 0xbd, 0xb5, 0xef, 0xd7, 0xe7, 0xef, 0x3d, 0x7f, 0xcf, 0x81,
-	0xce, 0x08, 0x07, 0x42, 0xba, 0x3e, 0x8f, 0xd1, 0xbd, 0xe0, 0x31, 0xf6, 0x31, 0xfe, 0x1d, 0xfa,
-	0xc8, 0xa2, 0x98, 0x4b, 0x4e, 0x40, 0x79, 0xd9, 0xdc, 0x4b, 0x75, 0xa4, 0x88, 0xd0, 0x17, 0xee,
-	0xe5, 0x83, 0x0c, 0xe5, 0xac, 0x1f, 0xa1, 0x9f, 0x44, 0xd2, 0x7d, 0xdb, 0xfb, 0x01, 0x07, 0x72,
-	0x1a, 0xa3, 0xe5, 0x76, 0x72, 0xdc, 0xbd, 0x98, 0x4f, 0xa3, 0xa2, 0x12, 0x7d, 0xc9, 0xe3, 0x41,
-	0x60, 0x97, 0x78, 0x11, 0x70, 0x1e, 0x8c, 0xd1, 0x55, 0xff, 0x86, 0xd3, 0x91, 0x8b, 0x93, 0x48,
-	0xce, 0x12, 0xa7, 0xf3, 0x77, 0x1b, 0x76, 0xac, 0xe3, 0xdf, 0xcc, 0x22, 0x14, 0xf4, 0x10, 0x48,
-	0x0f, 0xa5, 0x3a, 0x6a, 0x88, 0xc2, 0xc3, 0x5f, 0x53, 0x14, 0x92, 0xec, 0xc0, 0x56, 0x78, 0x27,
-	0xda, 0xd5, 0x83, 0xad, 0xa3, 0xba, 0x37, 0xff, 0x49, 0x3f, 0x41, 0x6b, 0x29, 0x4e, 0x44, 0xfc,
-	0x41, 0x20, 0x39, 0x83, 0x1a, 0x6a, 0x9b, 0x8a, 0x6e, 0x9c, 0x3e, 0x63, 0x49, 0x3f, 0xd4, 0x11,
-	0x59, 0xda, 0x03, 0xcf, 0x04, 0xd2, 0x2b, 0xd8, 0xbb, 0x0e, 0xc5, 0x86, 0x8a, 0x25, 0x04, 0x74,
-	0xbb, 0x1e, 0x21, 0x70, 0xa5, 0x08, 0xa4, 0x71, 0x1a, 0xb3, 0x0b, 0xb5, 0x91, 0xb6, 0x69, 0xcc,
-	0xf6, 0x12, 0xa6, 0x35, 0x26, 0xcf, 0x44, 0xd2, 0xeb, 0x84, 0xc1, 0x86, 0xaa, 0xbd, 0x82, 0xdd,
-	0x1e, 0x4a, 0x3d, 0xcd, 0x62, 0x06, 0x9e, 0x62, 0x6a, 0xc2, 0x34, 0xe4, 0x3b, 0x68, 0x8a, 0xf4,
-	0x1e, 0xe4, 0xc3, 0x5a, 0x17, 0xc5, 0x5b, 0x8a, 0xa6, 0x7d, 0x68, 0xcd, 0x89, 0x6c, 0xb6, 0xe8,
-	0x1b, 0x68, 0xbd, 0x8f, 0xa2, 0xf1, 0x2c, 0x99, 0x97, 0x29, 0xfa, 0x12, 0x40, 0x4d, 0x6d, 0xf6,
-	0x79, 0x30, 0xc1, 0x76, 0xf5, 0xa0, 0x7a, 0x54, 0xf7, 0x2c, 0x0b, 0xed, 0xc2, 0x9e, 0x4a, 0xd3,
-	0x4d, 0x32, 0x79, 0x1d, 0xa8, 0xeb, 0x56, 0x7d, 0xbc, 0xd3, 0x69, 0xa9, 0x81, 0x5e, 0xc0, 0x73,
-	0x3b, 0x4b, 0x09, 0xc6, 0xa4, 0x1e, 0xc2, 0x93, 0x91, 0x65, 0x37, 0xf9, 0x19, 0xab, 0x81, 0xce,
-	0xf6, 0xa1, 0x03, 0x75, 0xcd, 0x2c, 0x85, 0x36, 0x86, 0xd3, 0x3f, 0x35, 0x68, 0x58, 0x82, 0x22,
-	0x31, 0x34, 0x2c, 0x8d, 0x10, 0x97, 0xa5, 0x9b, 0x81, 0x65, 0x85, 0xc7, 0x56, 0x55, 0x47, 0x4f,
-	0xd6, 0x4f, 0x48, 0xce, 0xe7, 0x54, 0xc8, 0x37, 0x68, 0xda, 0x5a, 0x22, 0x4f, 0x59, 0xb2, 0x02,
-	0xd8, 0x62, 0x05, 0xb0, 0xcb, 0xf9, 0x0a, 0xa0, 0xaf, 0x1f, 0xad, 0x9d, 0x27, 0x47, 0xa7, 0xa2,
-	0x09, 0x2d, 0x6e, 0x79, 0x39, 0xa1, 0x8c, 0x0a, 0xcb, 0x09, 0x65, 0x05, 0x94, 0x12, 0x32, 0xa0,
-	0xff, 0x4f, 0x28, 0xa7, 0x38, 0x07, 0x48, 0x25, 0x44, 0x58, 0xd9, 0xf1, 0x96, 0x25, 0x49, 0xdd,
-	0xb5, 0xe3, 0x0d, 0xe0, 0x57, 0x68, 0x58, 0xfa, 0x2a, 0x24, 0x73, 0x52, 0x4a, 0x66, 0xb5, 0xf4,
-	0x77, 0x68, 0xda, 0x17, 0x9f, 0x14, 0x6e, 0x9a, 0x92, 0x56, 0xe5, 0x69, 0xce, 0xa9, 0x90, 0x31,
-	0xec, 0xae, 0xe8, 0x8a, 0xec, 0xe7, 0x61, 0x98, 0x37, 0x8a, 0xbe, 0x5d, 0x1b, 0x68, 0x49, 0xa6,
-	0x4e, 0x85, 0xdc, 0x42, 0xc3, 0x5a, 0x19, 0xa4, 0x68, 0xef, 0x97, 0x34, 0x2a, 0x67, 0xeb, 0x58,
-	0x8d, 0x5a, 0x0c, 0xa1, 0x70, 0x8d, 0xad, 0xd3, 0xa8, 0x95, 0x39, 0x9c, 0xdf, 0x80, 0xf5, 0x05,
-	0x70, 0x6e, 0xbf, 0xb0, 0x5f, 0xe6, 0x43, 0xbe, 0xed, 0x06, 0xa1, 0xbc, 0x9f, 0x0e, 0x99, 0xcf,
-	0x27, 0x6e, 0xc0, 0x7f, 0xe0, 0x4f, 0x89, 0xfe, 0xbd, 0x9b, 0xbc, 0xe3, 0x01, 0x3f, 0x56, 0x3f,
-	0x8e, 0xd5, 0x7d, 0x70, 0xd3, 0xef, 0x8c, 0xe1, 0xb6, 0xb2, 0x9c, 0xfd, 0x0b, 0x00, 0x00, 0xff,
-	0xff, 0x7f, 0xa2, 0x2d, 0x17, 0x7c, 0x08, 0x00, 0x00,
+	proto.RegisterFile("feast/core/CoreService.proto", fileDescriptor_CoreService_6fef85f8dd0eabb6)
+}
+
+var fileDescriptor_CoreService_6fef85f8dd0eabb6 = []byte{
+	// 608 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x5f, 0x6f, 0x12, 0x4f,
+	0x14, 0xa5, 0x69, 0xd2, 0x94, 0x0b, 0xf9, 0xa5, 0x1d, 0x9a, 0x9f, 0x38, 0x52, 0xd3, 0x6c, 0x62,
+	0xd3, 0xa7, 0x99, 0xda, 0x56, 0x13, 0x13, 0x5f, 0x6c, 0x53, 0x89, 0xb6, 0x31, 0x66, 0xf1, 0xa5,
+	0x35, 0x3e, 0xc0, 0x72, 0xd9, 0xae, 0x02, 0xb3, 0xee, 0x0c, 0x26, 0x3c, 0xfb, 0xfd, 0xfc, 0x4c,
+	0x86, 0xd9, 0x61, 0x76, 0x80, 0xdd, 0x2e, 0x31, 0xbc, 0xc1, 0xfd, 0x77, 0xe6, 0xdc, 0x3b, 0xe7,
+	0xce, 0x42, 0x6b, 0x80, 0x5d, 0xa9, 0x78, 0x20, 0x12, 0xe4, 0x57, 0x22, 0xc1, 0x0e, 0x26, 0xbf,
+	0xa2, 0x00, 0x59, 0x9c, 0x08, 0x25, 0x08, 0x68, 0x2f, 0x9b, 0x79, 0xa9, 0x89, 0x94, 0x31, 0x06,
+	0x92, 0x5f, 0x8f, 0x55, 0xa4, 0xa6, 0x9d, 0x18, 0x83, 0x34, 0x92, 0x1e, 0xba, 0xde, 0xf7, 0xd8,
+	0x55, 0x93, 0x04, 0x1d, 0xb7, 0x97, 0xe3, 0x6e, 0x27, 0x62, 0x12, 0x17, 0x95, 0xe8, 0x28, 0x91,
+	0x74, 0x43, 0xb7, 0xc4, 0xb3, 0x50, 0x88, 0x70, 0x88, 0x5c, 0xff, 0xeb, 0x4d, 0x06, 0x1c, 0x47,
+	0xb1, 0x9a, 0xa6, 0x4e, 0xef, 0xcf, 0x0e, 0xec, 0x39, 0xc7, 0xff, 0x32, 0x8d, 0x51, 0xd2, 0x63,
+	0x20, 0x6d, 0x54, 0xfa, 0xa8, 0x11, 0x4a, 0x1f, 0x7f, 0x4e, 0x50, 0x2a, 0xb2, 0x07, 0xdb, 0x51,
+	0x5f, 0x36, 0xb7, 0x8e, 0xb6, 0x4f, 0xaa, 0xfe, 0xec, 0x27, 0xfd, 0x08, 0x8d, 0x85, 0x38, 0x19,
+	0x8b, 0xb1, 0x44, 0x72, 0x0e, 0xbb, 0x68, 0x6c, 0x3a, 0xba, 0x76, 0xf6, 0x84, 0xa5, 0xfd, 0xd0,
+	0x47, 0x64, 0x59, 0x0f, 0x7c, 0x1b, 0x48, 0x6f, 0xe0, 0xe0, 0x36, 0x92, 0x1b, 0x2a, 0x96, 0x12,
+	0x30, 0xed, 0x7a, 0x84, 0xc0, 0x8d, 0x26, 0x90, 0xc5, 0x19, 0xcc, 0x0b, 0xd8, 0x1d, 0x18, 0x9b,
+	0xc1, 0x6c, 0x2e, 0x60, 0x3a, 0x63, 0xf2, 0x6d, 0x24, 0xbd, 0x4d, 0x19, 0x6c, 0xa8, 0xda, 0x0b,
+	0xd8, 0x6f, 0xa3, 0x32, 0xd3, 0x2c, 0x66, 0xe0, 0x6b, 0xa6, 0x36, 0xcc, 0x40, 0xbe, 0x85, 0xba,
+	0xcc, 0xee, 0x41, 0x3e, 0xac, 0x73, 0x51, 0xfc, 0x85, 0x68, 0xda, 0x81, 0xc6, 0x8c, 0xc8, 0x66,
+	0x8b, 0xbe, 0x82, 0xc6, 0xbb, 0x38, 0x1e, 0x4e, 0xd3, 0x79, 0xd9, 0xa2, 0xcf, 0x01, 0xf4, 0xd4,
+	0xa6, 0x9f, 0xba, 0x23, 0x6c, 0x6e, 0x1d, 0x6d, 0x9d, 0x54, 0x7d, 0xc7, 0x42, 0x2f, 0xe0, 0x40,
+	0xa7, 0x99, 0x26, 0xd9, 0xbc, 0x16, 0x54, 0x4d, 0xab, 0x3e, 0xf4, 0x4d, 0x5a, 0x66, 0xa0, 0x57,
+	0xf0, 0xd4, 0xcd, 0xd2, 0x82, 0xb1, 0xa9, 0xc7, 0xf0, 0xdf, 0xc0, 0xb1, 0xdb, 0xfc, 0x25, 0xab,
+	0x85, 0x5e, 0xee, 0x43, 0x0b, 0xaa, 0x86, 0x59, 0x06, 0x6d, 0x0d, 0x67, 0xbf, 0x77, 0xa1, 0xe6,
+	0x08, 0x8a, 0x24, 0x50, 0x73, 0x34, 0x42, 0x38, 0xcb, 0x36, 0x03, 0x5b, 0x16, 0x1e, 0x5b, 0x55,
+	0x1d, 0x3d, 0x5d, 0x3f, 0x21, 0x3d, 0x9f, 0x57, 0x21, 0x5f, 0xa1, 0xee, 0x6a, 0x89, 0xfc, 0xcf,
+	0xd2, 0x15, 0xc0, 0xe6, 0x2b, 0x80, 0x5d, 0xcf, 0x56, 0x00, 0x7d, 0xf9, 0x68, 0xed, 0x3c, 0x39,
+	0x7a, 0x15, 0x43, 0x68, 0x7e, 0xcb, 0xcb, 0x09, 0x2d, 0xa9, 0xb0, 0x9c, 0xd0, 0xb2, 0x80, 0x32,
+	0x42, 0x16, 0xf4, 0xdf, 0x09, 0xe5, 0x14, 0x17, 0x00, 0x99, 0x84, 0x08, 0x2b, 0x3b, 0xde, 0xa2,
+	0x24, 0x29, 0x5f, 0x3b, 0xde, 0x02, 0xde, 0x41, 0xcd, 0xd1, 0x57, 0x21, 0x99, 0xd3, 0x52, 0x32,
+	0xab, 0xa5, 0xbf, 0x41, 0xdd, 0xbd, 0xf8, 0xa4, 0x70, 0xd3, 0x94, 0xb4, 0x2a, 0x4f, 0x73, 0x5e,
+	0x85, 0x0c, 0x61, 0x7f, 0x45, 0x57, 0xe4, 0x30, 0x0f, 0xc3, 0xbe, 0x51, 0xf4, 0xf5, 0xda, 0x40,
+	0x0b, 0x32, 0xf5, 0x2a, 0xe4, 0x1e, 0x6a, 0xce, 0xca, 0x20, 0x45, 0x7b, 0xbf, 0xa4, 0x51, 0x39,
+	0x5b, 0xc7, 0x69, 0xd4, 0x7c, 0x08, 0x85, 0x6b, 0x6c, 0x9d, 0x46, 0xad, 0xcc, 0xe1, 0xf2, 0x0e,
+	0x9c, 0x2f, 0x80, 0x4b, 0xf7, 0x85, 0xfd, 0x3c, 0x1b, 0xf2, 0xfd, 0x9b, 0x30, 0x52, 0x0f, 0x93,
+	0x1e, 0x0b, 0xc4, 0x88, 0x87, 0xe2, 0x3b, 0xfe, 0x50, 0x18, 0x3c, 0xf0, 0xf4, 0x1d, 0xd7, 0xd7,
+	0x40, 0xf2, 0x10, 0xc7, 0x98, 0x74, 0x15, 0xf6, 0x79, 0x28, 0x78, 0xf6, 0xb1, 0xd1, 0xdb, 0xd1,
+	0xfe, 0xf3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x92, 0xec, 0x00, 0x04, 0x81, 0x08, 0x00, 0x00,
 }
diff --git a/go-feast-proto/feast/core/JobService.pb.go b/protos/generated/go/feast/core/JobService.pb.go
similarity index 84%
rename from go-feast-proto/feast/core/JobService.pb.go
rename to protos/generated/go/feast/core/JobService.pb.go
index 8eb8f0b5f3..2ffa5ea786 100644
--- a/go-feast-proto/feast/core/JobService.pb.go
+++ b/protos/generated/go/feast/core/JobService.pb.go
@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: feast/core/JobService.proto
 
-package core // import "github.com/gojektech/feast/go-feast-proto/feast/core"
+package core // import "github.com/gojektech/feast/protos/generated/go/feast/core"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import specs "github.com/gojektech/feast/go-feast-proto/feast/specs"
+import specs "github.com/gojektech/feast/protos/generated/go/feast/specs"
 import empty "github.com/golang/protobuf/ptypes/empty"
 import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 
@@ -36,7 +36,7 @@ func (m *JobServiceTypes) Reset()         { *m = JobServiceTypes{} }
 func (m *JobServiceTypes) String() string { return proto.CompactTextString(m) }
 func (*JobServiceTypes) ProtoMessage()    {}
 func (*JobServiceTypes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_JobService_b861c257f311e6ea, []int{0}
+	return fileDescriptor_JobService_f05f671a0d4a8cf9, []int{0}
 }
 func (m *JobServiceTypes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobServiceTypes.Unmarshal(m, b)
@@ -70,7 +70,7 @@ func (m *JobServiceTypes_SubmitImportJobRequest) Reset() {
 func (m *JobServiceTypes_SubmitImportJobRequest) String() string { return proto.CompactTextString(m) }
 func (*JobServiceTypes_SubmitImportJobRequest) ProtoMessage()    {}
 func (*JobServiceTypes_SubmitImportJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_JobService_b861c257f311e6ea, []int{0, 0}
+	return fileDescriptor_JobService_f05f671a0d4a8cf9, []int{0, 0}
 }
 func (m *JobServiceTypes_SubmitImportJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobServiceTypes_SubmitImportJobRequest.Unmarshal(m, b)
@@ -117,7 +117,7 @@ func (m *JobServiceTypes_SubmitImportJobResponse) Reset() {
 func (m *JobServiceTypes_SubmitImportJobResponse) String() string { return proto.CompactTextString(m) }
 func (*JobServiceTypes_SubmitImportJobResponse) ProtoMessage()    {}
 func (*JobServiceTypes_SubmitImportJobResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_JobService_b861c257f311e6ea, []int{0, 1}
+	return fileDescriptor_JobService_f05f671a0d4a8cf9, []int{0, 1}
 }
 func (m *JobServiceTypes_SubmitImportJobResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobServiceTypes_SubmitImportJobResponse.Unmarshal(m, b)
@@ -155,7 +155,7 @@ func (m *JobServiceTypes_ListJobsResponse) Reset()         { *m = JobServiceType
 func (m *JobServiceTypes_ListJobsResponse) String() string { return proto.CompactTextString(m) }
 func (*JobServiceTypes_ListJobsResponse) ProtoMessage()    {}
 func (*JobServiceTypes_ListJobsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_JobService_b861c257f311e6ea, []int{0, 2}
+	return fileDescriptor_JobService_f05f671a0d4a8cf9, []int{0, 2}
 }
 func (m *JobServiceTypes_ListJobsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobServiceTypes_ListJobsResponse.Unmarshal(m, b)
@@ -193,7 +193,7 @@ func (m *JobServiceTypes_GetJobRequest) Reset()         { *m = JobServiceTypes_G
 func (m *JobServiceTypes_GetJobRequest) String() string { return proto.CompactTextString(m) }
 func (*JobServiceTypes_GetJobRequest) ProtoMessage()    {}
 func (*JobServiceTypes_GetJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_JobService_b861c257f311e6ea, []int{0, 3}
+	return fileDescriptor_JobService_f05f671a0d4a8cf9, []int{0, 3}
 }
 func (m *JobServiceTypes_GetJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobServiceTypes_GetJobRequest.Unmarshal(m, b)
@@ -231,7 +231,7 @@ func (m *JobServiceTypes_GetJobResponse) Reset()         { *m = JobServiceTypes_
 func (m *JobServiceTypes_GetJobResponse) String() string { return proto.CompactTextString(m) }
 func (*JobServiceTypes_GetJobResponse) ProtoMessage()    {}
 func (*JobServiceTypes_GetJobResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_JobService_b861c257f311e6ea, []int{0, 4}
+	return fileDescriptor_JobService_f05f671a0d4a8cf9, []int{0, 4}
 }
 func (m *JobServiceTypes_GetJobResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobServiceTypes_GetJobResponse.Unmarshal(m, b)
@@ -269,7 +269,7 @@ func (m *JobServiceTypes_AbortJobRequest) Reset()         { *m = JobServiceTypes
 func (m *JobServiceTypes_AbortJobRequest) String() string { return proto.CompactTextString(m) }
 func (*JobServiceTypes_AbortJobRequest) ProtoMessage()    {}
 func (*JobServiceTypes_AbortJobRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_JobService_b861c257f311e6ea, []int{0, 5}
+	return fileDescriptor_JobService_f05f671a0d4a8cf9, []int{0, 5}
 }
 func (m *JobServiceTypes_AbortJobRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobServiceTypes_AbortJobRequest.Unmarshal(m, b)
@@ -307,7 +307,7 @@ func (m *JobServiceTypes_AbortJobResponse) Reset()         { *m = JobServiceType
 func (m *JobServiceTypes_AbortJobResponse) String() string { return proto.CompactTextString(m) }
 func (*JobServiceTypes_AbortJobResponse) ProtoMessage()    {}
 func (*JobServiceTypes_AbortJobResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_JobService_b861c257f311e6ea, []int{0, 6}
+	return fileDescriptor_JobService_f05f671a0d4a8cf9, []int{0, 6}
 }
 func (m *JobServiceTypes_AbortJobResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobServiceTypes_AbortJobResponse.Unmarshal(m, b)
@@ -356,7 +356,7 @@ func (m *JobServiceTypes_JobDetail) Reset()         { *m = JobServiceTypes_JobDe
 func (m *JobServiceTypes_JobDetail) String() string { return proto.CompactTextString(m) }
 func (*JobServiceTypes_JobDetail) ProtoMessage()    {}
 func (*JobServiceTypes_JobDetail) Descriptor() ([]byte, []int) {
-	return fileDescriptor_JobService_b861c257f311e6ea, []int{0, 7}
+	return fileDescriptor_JobService_f05f671a0d4a8cf9, []int{0, 7}
 }
 func (m *JobServiceTypes_JobDetail) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JobServiceTypes_JobDetail.Unmarshal(m, b)
@@ -639,48 +639,48 @@ var _JobService_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("feast/core/JobService.proto", fileDescriptor_JobService_b861c257f311e6ea)
-}
-
-var fileDescriptor_JobService_b861c257f311e6ea = []byte{
-	// 619 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xdb, 0x4e, 0xdb, 0x40,
-	0x10, 0x55, 0x62, 0x08, 0xc9, 0xd0, 0x02, 0x5a, 0x55, 0x60, 0x2d, 0x95, 0x48, 0x91, 0x2a, 0xa5,
-	0x17, 0x6c, 0x29, 0x20, 0xd1, 0xa2, 0xbe, 0x14, 0x15, 0x55, 0x41, 0x20, 0x21, 0x87, 0xbe, 0xf4,
-	0xa5, 0xb2, 0x9d, 0x21, 0x6c, 0x88, 0xbd, 0xae, 0x77, 0x8d, 0x9a, 0x7f, 0xe9, 0x1f, 0xf4, 0x8b,
-	0xfa, 0x37, 0xd5, 0xee, 0xda, 0xb1, 0x31, 0x55, 0x9a, 0xbe, 0xed, 0xd9, 0x39, 0xe3, 0xb3, 0x73,
-	0x3c, 0x33, 0xb0, 0x7b, 0x83, 0xbe, 0x90, 0x6e, 0xc8, 0x53, 0x74, 0xcf, 0x79, 0x30, 0xc4, 0xf4,
-	0x9e, 0x85, 0xe8, 0x24, 0x29, 0x97, 0x9c, 0x80, 0x0e, 0x3a, 0x2a, 0x48, 0x9f, 0x1b, 0xa2, 0x48,
-	0x30, 0x14, 0xee, 0x20, 0x4a, 0x78, 0x2a, 0x87, 0x09, 0x86, 0x86, 0x49, 0x77, 0xc7, 0x9c, 0x8f,
-	0xa7, 0xe8, 0x6a, 0x14, 0x64, 0x37, 0x2e, 0x46, 0x89, 0x9c, 0xe5, 0xc1, 0xbd, 0x7a, 0x50, 0xb2,
-	0x08, 0x85, 0xf4, 0xa3, 0xc4, 0x10, 0xf6, 0x7f, 0xb7, 0x60, 0xb3, 0x14, 0xbf, 0x9e, 0x25, 0x28,
-	0x28, 0xc2, 0xf6, 0x30, 0x0b, 0x22, 0x26, 0x8d, 0xd6, 0x39, 0x0f, 0x3c, 0xfc, 0x9e, 0xa1, 0x90,
-	0xe4, 0x18, 0x80, 0xcd, 0xf5, 0xed, 0x46, 0xb7, 0xd1, 0x5b, 0xef, 0xef, 0x38, 0xe6, 0xa9, 0xfa,
-	0x79, 0x4e, 0xf9, 0x3c, 0xaf, 0x42, 0x25, 0x04, 0x56, 0x62, 0x3f, 0x42, 0xbb, 0xd9, 0x6d, 0xf4,
-	0x3a, 0x9e, 0x3e, 0x53, 0x17, 0x76, 0x1e, 0xc9, 0x88, 0x84, 0xc7, 0x02, 0xc9, 0x33, 0x58, 0x9d,
-	0xf0, 0x60, 0x30, 0xd2, 0x12, 0x1d, 0xcf, 0x00, 0x7a, 0x09, 0x5b, 0x17, 0x4c, 0x28, 0xa2, 0x98,
-	0x33, 0xdf, 0xc3, 0xca, 0x84, 0x07, 0xc2, 0x6e, 0x74, 0xad, 0xde, 0x7a, 0xff, 0xa5, 0x53, 0xda,
-	0xe6, 0xd4, 0xca, 0x52, 0xf8, 0x13, 0x4a, 0x9f, 0x4d, 0x3d, 0x9d, 0x42, 0xf7, 0xe0, 0xe9, 0x67,
-	0xac, 0x56, 0xb7, 0x01, 0x4d, 0x56, 0x48, 0x36, 0xd9, 0x88, 0x0e, 0x60, 0xa3, 0x20, 0xe4, 0x6a,
-	0xc7, 0x60, 0x4d, 0x78, 0x90, 0x17, 0xbe, 0xa4, 0x98, 0xca, 0xa0, 0x2f, 0x60, 0xf3, 0x63, 0xf0,
-	0xd0, 0xcb, 0xba, 0xda, 0x3e, 0x6c, 0x95, 0x94, 0x5c, 0xaf, 0xce, 0xf9, 0x65, 0x41, 0x67, 0xfe,
-	0xe5, 0x7a, 0x54, 0xb9, 0x86, 0x3f, 0xe4, 0x60, 0x94, 0xbb, 0x6c, 0x80, 0xb2, 0x5e, 0xce, 0x12,
-	0xb4, 0x2d, 0x63, 0xbd, 0x3a, 0x93, 0x6d, 0x68, 0xa5, 0x59, 0x1c, 0x63, 0x6a, 0xaf, 0xe8, 0xdb,
-	0x1c, 0xa9, 0x7b, 0x21, 0x7d, 0x99, 0x09, 0x7b, 0xd5, 0xdc, 0x1b, 0x44, 0x28, 0xb4, 0x31, 0x96,
-	0x4c, 0x32, 0x14, 0x76, 0xab, 0x6b, 0xf5, 0x3a, 0xde, 0x1c, 0xab, 0xd8, 0x0d, 0xfa, 0x32, 0x4b,
-	0x51, 0xd8, 0x6b, 0x26, 0x56, 0x60, 0x72, 0x01, 0x6b, 0x11, 0xca, 0x94, 0x85, 0xc2, 0x6e, 0xeb,
-	0x1f, 0xd4, 0x5f, 0xca, 0x33, 0xe7, 0xd2, 0x24, 0x9d, 0xc5, 0x32, 0x9d, 0x79, 0xc5, 0x27, 0xc8,
-	0x07, 0x58, 0x9f, 0xfa, 0x42, 0x7e, 0x49, 0x46, 0xbe, 0xc4, 0x91, 0xdd, 0xd1, 0x7f, 0x81, 0x3a,
-	0xa6, 0xc5, 0x9d, 0xa2, 0xc5, 0x9d, 0xeb, 0xa2, 0xc5, 0xbd, 0x2a, 0x9d, 0x1c, 0xc1, 0x5a, 0x98,
-	0xa2, 0xce, 0x84, 0x7f, 0x66, 0x16, 0x54, 0x7a, 0x02, 0x4f, 0xaa, 0x8f, 0x21, 0x5b, 0x60, 0xdd,
-	0xe1, 0x2c, 0x37, 0x5d, 0x1d, 0x95, 0xeb, 0xf7, 0xfe, 0x34, 0x33, 0xbd, 0xdd, 0xf0, 0x0c, 0x38,
-	0x69, 0xbe, 0x6b, 0xf4, 0x7f, 0x5a, 0x00, 0x65, 0x8d, 0x44, 0x42, 0xc7, 0xf4, 0xfb, 0x39, 0x0f,
-	0xc8, 0x42, 0x23, 0xfe, 0x3e, 0x7d, 0xf4, 0xf0, 0xbf, 0x72, 0xf2, 0x16, 0xba, 0x82, 0x76, 0x31,
-	0x34, 0x64, 0xfb, 0x51, 0xc5, 0x67, 0x6a, 0x57, 0xd0, 0xb7, 0x8b, 0x3e, 0xfc, 0x68, 0xe4, 0xbe,
-	0x41, 0xcb, 0x8c, 0x05, 0x79, 0xb5, 0x28, 0xef, 0xc1, 0x6c, 0xd1, 0xd7, 0xcb, 0x50, 0x73, 0x01,
-	0x84, 0x76, 0x31, 0x09, 0xe4, 0xcd, 0xa2, 0xbc, 0xda, 0x48, 0x2d, 0xae, 0xa3, 0x3e, 0x5c, 0xa7,
-	0x43, 0xa8, 0x2c, 0xd9, 0xd3, 0xca, 0x16, 0xbc, 0x52, 0xee, 0x7c, 0x3d, 0x1a, 0x33, 0x79, 0x9b,
-	0x05, 0x4e, 0xc8, 0x23, 0x77, 0xcc, 0x27, 0x78, 0x27, 0x31, 0xbc, 0x75, 0xcd, 0x2a, 0x1e, 0xf3,
-	0x03, 0x7d, 0x38, 0xd0, 0x46, 0xba, 0xe5, 0x22, 0x0f, 0x5a, 0xfa, 0xe6, 0xf0, 0x4f, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0xb8, 0xf5, 0xcd, 0x5d, 0xdd, 0x05, 0x00, 0x00,
+	proto.RegisterFile("feast/core/JobService.proto", fileDescriptor_JobService_f05f671a0d4a8cf9)
+}
+
+var fileDescriptor_JobService_f05f671a0d4a8cf9 = []byte{
+	// 624 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x6f, 0x4b, 0xdc, 0x4e,
+	0x10, 0xe6, 0x2e, 0x7a, 0xde, 0x8d, 0xbf, 0x9f, 0xca, 0x52, 0x34, 0xac, 0x05, 0xaf, 0x42, 0xe1,
+	0xfa, 0x87, 0x04, 0xce, 0x82, 0x55, 0xfa, 0xa6, 0x52, 0x29, 0x27, 0x0a, 0x12, 0x2d, 0x94, 0xbe,
+	0x29, 0x49, 0x6e, 0x8c, 0x7b, 0x5e, 0xb2, 0x69, 0x76, 0x23, 0xbd, 0xef, 0xd2, 0x6f, 0xd0, 0x4f,
+	0xd4, 0x6f, 0x53, 0x76, 0x37, 0xb9, 0xc4, 0x58, 0xae, 0xd7, 0x77, 0x79, 0x76, 0x9e, 0xd9, 0x67,
+	0xe7, 0xc9, 0xcc, 0xc0, 0xee, 0x0d, 0xfa, 0x42, 0xba, 0x21, 0xcf, 0xd0, 0x3d, 0xe3, 0xc1, 0x15,
+	0x66, 0xf7, 0x2c, 0x44, 0x27, 0xcd, 0xb8, 0xe4, 0x04, 0x74, 0xd0, 0x51, 0x41, 0xfa, 0xd4, 0x10,
+	0x45, 0x8a, 0xa1, 0x70, 0x47, 0x71, 0xca, 0x33, 0x79, 0x95, 0x62, 0x68, 0x98, 0x74, 0x37, 0xe2,
+	0x3c, 0x9a, 0xa2, 0xab, 0x51, 0x90, 0xdf, 0xb8, 0x18, 0xa7, 0x72, 0x56, 0x04, 0xf7, 0x9a, 0x41,
+	0xc9, 0x62, 0x14, 0xd2, 0x8f, 0x53, 0x43, 0xd8, 0xff, 0xd5, 0x81, 0xcd, 0x4a, 0xfc, 0x7a, 0x96,
+	0xa2, 0xa0, 0x08, 0xdb, 0x57, 0x79, 0x10, 0x33, 0x69, 0xb4, 0xce, 0x78, 0xe0, 0xe1, 0xb7, 0x1c,
+	0x85, 0x24, 0x87, 0x00, 0x6c, 0xae, 0x6f, 0xb7, 0xfa, 0xad, 0xc1, 0xfa, 0x70, 0xc7, 0x31, 0x4f,
+	0xd5, 0xcf, 0x73, 0xaa, 0xe7, 0x79, 0x35, 0x2a, 0x21, 0xb0, 0x92, 0xf8, 0x31, 0xda, 0xed, 0x7e,
+	0x6b, 0xd0, 0xf3, 0xf4, 0x37, 0x75, 0x61, 0xe7, 0x91, 0x8c, 0x48, 0x79, 0x22, 0x90, 0x3c, 0x81,
+	0xd5, 0x09, 0x0f, 0x46, 0x63, 0x2d, 0xd1, 0xf3, 0x0c, 0xa0, 0x17, 0xb0, 0x75, 0xce, 0x84, 0x22,
+	0x8a, 0x39, 0xf3, 0x08, 0x56, 0x26, 0x3c, 0x10, 0x76, 0xab, 0x6f, 0x0d, 0xd6, 0x87, 0xcf, 0x9d,
+	0xca, 0x36, 0xa7, 0x51, 0x96, 0xc2, 0x1f, 0x50, 0xfa, 0x6c, 0xea, 0xe9, 0x14, 0xba, 0x07, 0xff,
+	0x7f, 0xc4, 0x7a, 0x75, 0x1b, 0xd0, 0x66, 0xa5, 0x64, 0x9b, 0x8d, 0xe9, 0x08, 0x36, 0x4a, 0x42,
+	0xa1, 0x76, 0x08, 0xd6, 0x84, 0x07, 0x45, 0xe1, 0x4b, 0x8a, 0xa9, 0x0c, 0xfa, 0x0c, 0x36, 0xdf,
+	0x07, 0x0f, 0xbd, 0x6c, 0xaa, 0xed, 0xc3, 0x56, 0x45, 0x29, 0xf4, 0x9a, 0x9c, 0x9f, 0x16, 0xf4,
+	0xe6, 0x37, 0x37, 0xa3, 0xca, 0x35, 0xfc, 0x2e, 0x47, 0xe3, 0xc2, 0x65, 0x03, 0x94, 0xf5, 0x72,
+	0x96, 0xa2, 0x6d, 0x19, 0xeb, 0xd5, 0x37, 0xd9, 0x86, 0x4e, 0x96, 0x27, 0x09, 0x66, 0xf6, 0x8a,
+	0x3e, 0x2d, 0x90, 0x3a, 0x17, 0xd2, 0x97, 0xb9, 0xb0, 0x57, 0xcd, 0xb9, 0x41, 0x84, 0x42, 0x17,
+	0x13, 0xc9, 0x24, 0x43, 0x61, 0x77, 0xfa, 0xd6, 0xa0, 0xe7, 0xcd, 0xb1, 0x8a, 0xdd, 0xa0, 0x2f,
+	0xf3, 0x0c, 0x85, 0xbd, 0x66, 0x62, 0x25, 0x26, 0xe7, 0xb0, 0x16, 0xa3, 0xcc, 0x58, 0x28, 0xec,
+	0xae, 0xfe, 0x41, 0xc3, 0xa5, 0x3c, 0x73, 0x2e, 0x4c, 0xd2, 0x69, 0x22, 0xb3, 0x99, 0x57, 0x5e,
+	0x41, 0xde, 0xc1, 0xfa, 0xd4, 0x17, 0xf2, 0x53, 0x3a, 0xf6, 0x25, 0x8e, 0xed, 0x9e, 0xfe, 0x0b,
+	0xd4, 0x31, 0x2d, 0xee, 0x94, 0x2d, 0xee, 0x5c, 0x97, 0x2d, 0xee, 0xd5, 0xe9, 0xe4, 0x0d, 0xac,
+	0x85, 0x19, 0xea, 0x4c, 0xf8, 0x6b, 0x66, 0x49, 0xa5, 0xc7, 0xf0, 0x5f, 0xfd, 0x31, 0x64, 0x0b,
+	0xac, 0x3b, 0x9c, 0x15, 0xa6, 0xab, 0x4f, 0xe5, 0xfa, 0xbd, 0x3f, 0xcd, 0x4d, 0x6f, 0xb7, 0x3c,
+	0x03, 0x8e, 0xdb, 0x6f, 0x5b, 0xc3, 0x1f, 0x16, 0x40, 0x55, 0x23, 0x91, 0xd0, 0x33, 0xfd, 0x7e,
+	0xc6, 0x03, 0xb2, 0xd0, 0x88, 0x3f, 0x4f, 0x1f, 0x3d, 0xf8, 0xa7, 0x9c, 0xa2, 0x85, 0x2e, 0xa1,
+	0x5b, 0x0e, 0x0d, 0xd9, 0x7e, 0x54, 0xf1, 0xa9, 0xda, 0x15, 0xf4, 0xf5, 0xa2, 0x8b, 0x1f, 0x8d,
+	0xdc, 0x57, 0xe8, 0x98, 0xb1, 0x20, 0x2f, 0x16, 0xe5, 0x3d, 0x98, 0x2d, 0xfa, 0x72, 0x19, 0x6a,
+	0x21, 0x80, 0xd0, 0x2d, 0x27, 0x81, 0xbc, 0x5a, 0x94, 0xd7, 0x18, 0xa9, 0xc5, 0x75, 0x34, 0x87,
+	0xeb, 0xe4, 0x33, 0xd4, 0x96, 0xec, 0x49, 0x6d, 0x0b, 0x5e, 0x2a, 0x77, 0xbe, 0x1c, 0x45, 0x4c,
+	0xde, 0xe6, 0x81, 0x13, 0xf2, 0xd8, 0x8d, 0xf8, 0x04, 0xef, 0x24, 0x86, 0xb7, 0xae, 0x59, 0xc5,
+	0xda, 0x3f, 0xe1, 0x46, 0x98, 0x60, 0xa6, 0xda, 0xc4, 0x8d, 0xb8, 0x5b, 0x6d, 0xf3, 0xa0, 0xa3,
+	0xe3, 0x07, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x24, 0x33, 0x66, 0xd5, 0xe2, 0x05, 0x00, 0x00,
 }
diff --git a/go-feast-proto/feast/core/UIService.pb.go b/protos/generated/go/feast/core/UIService.pb.go
similarity index 88%
rename from go-feast-proto/feast/core/UIService.pb.go
rename to protos/generated/go/feast/core/UIService.pb.go
index b897601eac..46913b75b9 100644
--- a/go-feast-proto/feast/core/UIService.pb.go
+++ b/protos/generated/go/feast/core/UIService.pb.go
@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: feast/core/UIService.proto
 
-package core // import "github.com/gojektech/feast/go-feast-proto/feast/core"
+package core // import "github.com/gojektech/feast/protos/generated/go/feast/core"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import specs "github.com/gojektech/feast/go-feast-proto/feast/specs"
+import specs "github.com/gojektech/feast/protos/generated/go/feast/specs"
 import empty "github.com/golang/protobuf/ptypes/empty"
 import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 
@@ -36,7 +36,7 @@ func (m *UIServiceTypes) Reset()         { *m = UIServiceTypes{} }
 func (m *UIServiceTypes) String() string { return proto.CompactTextString(m) }
 func (*UIServiceTypes) ProtoMessage()    {}
 func (*UIServiceTypes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_UIService_758b01499c5abbc2, []int{0}
+	return fileDescriptor_UIService_b3a8d080c1c7a84d, []int{0}
 }
 func (m *UIServiceTypes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UIServiceTypes.Unmarshal(m, b)
@@ -70,7 +70,7 @@ func (m *UIServiceTypes_EntityDetail) Reset()         { *m = UIServiceTypes_Enti
 func (m *UIServiceTypes_EntityDetail) String() string { return proto.CompactTextString(m) }
 func (*UIServiceTypes_EntityDetail) ProtoMessage()    {}
 func (*UIServiceTypes_EntityDetail) Descriptor() ([]byte, []int) {
-	return fileDescriptor_UIService_758b01499c5abbc2, []int{0, 0}
+	return fileDescriptor_UIService_b3a8d080c1c7a84d, []int{0, 0}
 }
 func (m *UIServiceTypes_EntityDetail) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UIServiceTypes_EntityDetail.Unmarshal(m, b)
@@ -122,7 +122,7 @@ func (m *UIServiceTypes_GetEntityRequest) Reset()         { *m = UIServiceTypes_
 func (m *UIServiceTypes_GetEntityRequest) String() string { return proto.CompactTextString(m) }
 func (*UIServiceTypes_GetEntityRequest) ProtoMessage()    {}
 func (*UIServiceTypes_GetEntityRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_UIService_758b01499c5abbc2, []int{0, 1}
+	return fileDescriptor_UIService_b3a8d080c1c7a84d, []int{0, 1}
 }
 func (m *UIServiceTypes_GetEntityRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UIServiceTypes_GetEntityRequest.Unmarshal(m, b)
@@ -160,7 +160,7 @@ func (m *UIServiceTypes_GetEntityResponse) Reset()         { *m = UIServiceTypes
 func (m *UIServiceTypes_GetEntityResponse) String() string { return proto.CompactTextString(m) }
 func (*UIServiceTypes_GetEntityResponse) ProtoMessage()    {}
 func (*UIServiceTypes_GetEntityResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_UIService_758b01499c5abbc2, []int{0, 2}
+	return fileDescriptor_UIService_b3a8d080c1c7a84d, []int{0, 2}
 }
 func (m *UIServiceTypes_GetEntityResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UIServiceTypes_GetEntityResponse.Unmarshal(m, b)
@@ -198,7 +198,7 @@ func (m *UIServiceTypes_ListEntitiesResponse) Reset()         { *m = UIServiceTy
 func (m *UIServiceTypes_ListEntitiesResponse) String() string { return proto.CompactTextString(m) }
 func (*UIServiceTypes_ListEntitiesResponse) ProtoMessage()    {}
 func (*UIServiceTypes_ListEntitiesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_UIService_758b01499c5abbc2, []int{0, 3}
+	return fileDescriptor_UIService_b3a8d080c1c7a84d, []int{0, 3}
 }
 func (m *UIServiceTypes_ListEntitiesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UIServiceTypes_ListEntitiesResponse.Unmarshal(m, b)
@@ -242,7 +242,7 @@ func (m *UIServiceTypes_FeatureDetail) Reset()         { *m = UIServiceTypes_Fea
 func (m *UIServiceTypes_FeatureDetail) String() string { return proto.CompactTextString(m) }
 func (*UIServiceTypes_FeatureDetail) ProtoMessage()    {}
 func (*UIServiceTypes_FeatureDetail) Descriptor() ([]byte, []int) {
-	return fileDescriptor_UIService_758b01499c5abbc2, []int{0, 4}
+	return fileDescriptor_UIService_b3a8d080c1c7a84d, []int{0, 4}
 }
 func (m *UIServiceTypes_FeatureDetail) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UIServiceTypes_FeatureDetail.Unmarshal(m, b)
@@ -315,7 +315,7 @@ func (m *UIServiceTypes_GetFeatureRequest) Reset()         { *m = UIServiceTypes
 func (m *UIServiceTypes_GetFeatureRequest) String() string { return proto.CompactTextString(m) }
 func (*UIServiceTypes_GetFeatureRequest) ProtoMessage()    {}
 func (*UIServiceTypes_GetFeatureRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_UIService_758b01499c5abbc2, []int{0, 5}
+	return fileDescriptor_UIService_b3a8d080c1c7a84d, []int{0, 5}
 }
 func (m *UIServiceTypes_GetFeatureRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UIServiceTypes_GetFeatureRequest.Unmarshal(m, b)
@@ -354,7 +354,7 @@ func (m *UIServiceTypes_GetFeatureResponse) Reset()         { *m = UIServiceType
 func (m *UIServiceTypes_GetFeatureResponse) String() string { return proto.CompactTextString(m) }
 func (*UIServiceTypes_GetFeatureResponse) ProtoMessage()    {}
 func (*UIServiceTypes_GetFeatureResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_UIService_758b01499c5abbc2, []int{0, 6}
+	return fileDescriptor_UIService_b3a8d080c1c7a84d, []int{0, 6}
 }
 func (m *UIServiceTypes_GetFeatureResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UIServiceTypes_GetFeatureResponse.Unmarshal(m, b)
@@ -399,7 +399,7 @@ func (m *UIServiceTypes_ListFeaturesResponse) Reset()         { *m = UIServiceTy
 func (m *UIServiceTypes_ListFeaturesResponse) String() string { return proto.CompactTextString(m) }
 func (*UIServiceTypes_ListFeaturesResponse) ProtoMessage()    {}
 func (*UIServiceTypes_ListFeaturesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_UIService_758b01499c5abbc2, []int{0, 7}
+	return fileDescriptor_UIService_b3a8d080c1c7a84d, []int{0, 7}
 }
 func (m *UIServiceTypes_ListFeaturesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UIServiceTypes_ListFeaturesResponse.Unmarshal(m, b)
@@ -439,7 +439,7 @@ func (m *UIServiceTypes_FeatureGroupDetail) Reset()         { *m = UIServiceType
 func (m *UIServiceTypes_FeatureGroupDetail) String() string { return proto.CompactTextString(m) }
 func (*UIServiceTypes_FeatureGroupDetail) ProtoMessage()    {}
 func (*UIServiceTypes_FeatureGroupDetail) Descriptor() ([]byte, []int) {
-	return fileDescriptor_UIService_758b01499c5abbc2, []int{0, 8}
+	return fileDescriptor_UIService_b3a8d080c1c7a84d, []int{0, 8}
 }
 func (m *UIServiceTypes_FeatureGroupDetail) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UIServiceTypes_FeatureGroupDetail.Unmarshal(m, b)
@@ -484,7 +484,7 @@ func (m *UIServiceTypes_GetFeatureGroupRequest) Reset()         { *m = UIService
 func (m *UIServiceTypes_GetFeatureGroupRequest) String() string { return proto.CompactTextString(m) }
 func (*UIServiceTypes_GetFeatureGroupRequest) ProtoMessage()    {}
 func (*UIServiceTypes_GetFeatureGroupRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_UIService_758b01499c5abbc2, []int{0, 9}
+	return fileDescriptor_UIService_b3a8d080c1c7a84d, []int{0, 9}
 }
 func (m *UIServiceTypes_GetFeatureGroupRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UIServiceTypes_GetFeatureGroupRequest.Unmarshal(m, b)
@@ -524,7 +524,7 @@ func (m *UIServiceTypes_GetFeatureGroupResponse) Reset() {
 func (m *UIServiceTypes_GetFeatureGroupResponse) String() string { return proto.CompactTextString(m) }
 func (*UIServiceTypes_GetFeatureGroupResponse) ProtoMessage()    {}
 func (*UIServiceTypes_GetFeatureGroupResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_UIService_758b01499c5abbc2, []int{0, 10}
+	return fileDescriptor_UIService_b3a8d080c1c7a84d, []int{0, 10}
 }
 func (m *UIServiceTypes_GetFeatureGroupResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UIServiceTypes_GetFeatureGroupResponse.Unmarshal(m, b)
@@ -564,7 +564,7 @@ func (m *UIServiceTypes_ListFeatureGroupsResponse) Reset() {
 func (m *UIServiceTypes_ListFeatureGroupsResponse) String() string { return proto.CompactTextString(m) }
 func (*UIServiceTypes_ListFeatureGroupsResponse) ProtoMessage()    {}
 func (*UIServiceTypes_ListFeatureGroupsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_UIService_758b01499c5abbc2, []int{0, 11}
+	return fileDescriptor_UIService_b3a8d080c1c7a84d, []int{0, 11}
 }
 func (m *UIServiceTypes_ListFeatureGroupsResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UIServiceTypes_ListFeatureGroupsResponse.Unmarshal(m, b)
@@ -604,7 +604,7 @@ func (m *UIServiceTypes_StorageDetail) Reset()         { *m = UIServiceTypes_Sto
 func (m *UIServiceTypes_StorageDetail) String() string { return proto.CompactTextString(m) }
 func (*UIServiceTypes_StorageDetail) ProtoMessage()    {}
 func (*UIServiceTypes_StorageDetail) Descriptor() ([]byte, []int) {
-	return fileDescriptor_UIService_758b01499c5abbc2, []int{0, 12}
+	return fileDescriptor_UIService_b3a8d080c1c7a84d, []int{0, 12}
 }
 func (m *UIServiceTypes_StorageDetail) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UIServiceTypes_StorageDetail.Unmarshal(m, b)
@@ -649,7 +649,7 @@ func (m *UIServiceTypes_GetStorageRequest) Reset()         { *m = UIServiceTypes
 func (m *UIServiceTypes_GetStorageRequest) String() string { return proto.CompactTextString(m) }
 func (*UIServiceTypes_GetStorageRequest) ProtoMessage()    {}
 func (*UIServiceTypes_GetStorageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_UIService_758b01499c5abbc2, []int{0, 13}
+	return fileDescriptor_UIService_b3a8d080c1c7a84d, []int{0, 13}
 }
 func (m *UIServiceTypes_GetStorageRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UIServiceTypes_GetStorageRequest.Unmarshal(m, b)
@@ -687,7 +687,7 @@ func (m *UIServiceTypes_GetStorageResponse) Reset()         { *m = UIServiceType
 func (m *UIServiceTypes_GetStorageResponse) String() string { return proto.CompactTextString(m) }
 func (*UIServiceTypes_GetStorageResponse) ProtoMessage()    {}
 func (*UIServiceTypes_GetStorageResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_UIService_758b01499c5abbc2, []int{0, 14}
+	return fileDescriptor_UIService_b3a8d080c1c7a84d, []int{0, 14}
 }
 func (m *UIServiceTypes_GetStorageResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UIServiceTypes_GetStorageResponse.Unmarshal(m, b)
@@ -725,7 +725,7 @@ func (m *UIServiceTypes_ListStorageResponse) Reset()         { *m = UIServiceTyp
 func (m *UIServiceTypes_ListStorageResponse) String() string { return proto.CompactTextString(m) }
 func (*UIServiceTypes_ListStorageResponse) ProtoMessage()    {}
 func (*UIServiceTypes_ListStorageResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_UIService_758b01499c5abbc2, []int{0, 15}
+	return fileDescriptor_UIService_b3a8d080c1c7a84d, []int{0, 15}
 }
 func (m *UIServiceTypes_ListStorageResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UIServiceTypes_ListStorageResponse.Unmarshal(m, b)
@@ -1120,58 +1120,59 @@ var _UIService_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("feast/core/UIService.proto", fileDescriptor_UIService_758b01499c5abbc2)
+	proto.RegisterFile("feast/core/UIService.proto", fileDescriptor_UIService_b3a8d080c1c7a84d)
 }
 
-var fileDescriptor_UIService_758b01499c5abbc2 = []byte{
-	// 782 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_UIService_b3a8d080c1c7a84d = []byte{
+	// 789 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4d, 0x6f, 0xd3, 0x4c,
-	0x10, 0xce, 0x47, 0xdf, 0xa4, 0x99, 0xa6, 0x7d, 0xe9, 0x82, 0x5a, 0xb3, 0x50, 0x51, 0x99, 0x03,
-	0x91, 0xda, 0xd8, 0x6a, 0xe8, 0x11, 0x09, 0xa9, 0xb4, 0x54, 0x48, 0x1c, 0xc0, 0x69, 0x81, 0x02,
-	0x17, 0xc7, 0xd9, 0xb8, 0x6e, 0x93, 0xda, 0xb5, 0x37, 0x54, 0x81, 0x23, 0xe2, 0x06, 0xbf, 0x89,
-	0xbf, 0xc5, 0x11, 0x65, 0x77, 0x6d, 0xaf, 0x9d, 0x38, 0x71, 0x2a, 0x6e, 0xc9, 0x7c, 0x3c, 0x9e,
-	0x79, 0x9e, 0x99, 0xb1, 0x01, 0xf7, 0x88, 0x19, 0x50, 0xdd, 0x72, 0x7d, 0xa2, 0x9f, 0xbe, 0x6a,
-	0x13, 0xff, 0x8b, 0x63, 0x11, 0xcd, 0xf3, 0x5d, 0xea, 0x22, 0x60, 0x3e, 0x6d, 0xec, 0xc3, 0x0f,
-	0x79, 0x5c, 0xe0, 0x11, 0x2b, 0xd0, 0x8f, 0xae, 0xa8, 0x43, 0x47, 0x6d, 0x8f, 0x58, 0x3c, 0x12,
-	0x6f, 0xc9, 0xde, 0x97, 0xc4, 0xa4, 0x43, 0x9f, 0x48, 0x6e, 0x75, 0x8a, 0xfb, 0xd8, 0x77, 0x87,
-	0x5e, 0x16, 0x44, 0x9b, 0xba, 0xbe, 0x69, 0xcb, 0x10, 0x0f, 0x6c, 0xd7, 0xb5, 0xfb, 0x44, 0x67,
-	0xff, 0x3a, 0xc3, 0x9e, 0x4e, 0x06, 0x1e, 0x1d, 0x09, 0xe7, 0xa3, 0xb4, 0x93, 0x3a, 0x03, 0x12,
-	0x50, 0x73, 0xe0, 0xf1, 0x00, 0xf5, 0x4f, 0x1d, 0xd6, 0xa2, 0xee, 0x4e, 0x46, 0x1e, 0x09, 0xf0,
-	0xaf, 0x22, 0xd4, 0x79, 0x1f, 0x87, 0x84, 0x9a, 0x4e, 0x1f, 0xed, 0xc0, 0xd2, 0xf8, 0xe1, 0x4a,
-	0x71, 0xbb, 0xd8, 0x58, 0x69, 0x6d, 0x6a, 0xbc, 0x79, 0x56, 0x8f, 0x16, 0x37, 0x6c, 0xb0, 0x20,
-	0x84, 0x60, 0xe9, 0xc2, 0xed, 0x04, 0x4a, 0x69, 0xbb, 0xdc, 0xa8, 0x19, 0xec, 0x37, 0x7a, 0x06,
-	0x2b, 0x7d, 0x33, 0xa0, 0xa7, 0x5e, 0xd7, 0xa4, 0xa4, 0xab, 0x94, 0x19, 0x0e, 0xd6, 0x78, 0x6d,
-	0x5a, 0x58, 0x9b, 0x76, 0x12, 0xd6, 0x66, 0xc8, 0xe1, 0x58, 0x85, 0x3b, 0xc7, 0x84, 0xf2, 0x07,
-	0x19, 0xe4, 0x7a, 0x48, 0x02, 0x8a, 0xd6, 0xa0, 0xe4, 0x74, 0x59, 0x41, 0x35, 0xa3, 0xe4, 0x74,
-	0xf1, 0x09, 0xac, 0x4b, 0x31, 0x81, 0xe7, 0x5e, 0x05, 0x04, 0x3d, 0x87, 0x0a, 0x61, 0x16, 0x51,
-	0xf9, 0x13, 0x2d, 0x96, 0x4d, 0x4b, 0x36, 0xad, 0xc9, 0x0d, 0x1b, 0x22, 0x0d, 0x7f, 0x82, 0x7b,
-	0xaf, 0x9d, 0x80, 0xc3, 0x3a, 0x24, 0x88, 0x80, 0x5f, 0xc0, 0x32, 0x11, 0x36, 0xa5, 0xb8, 0x5d,
-	0x5e, 0x04, 0x3a, 0x4a, 0xc4, 0xdf, 0x4b, 0xb0, 0x2a, 0x14, 0x17, 0x3c, 0xef, 0x26, 0x78, 0x56,
-	0x12, 0x3c, 0x4b, 0xa3, 0x23, 0x88, 0x56, 0xa1, 0xde, 0x71, 0xec, 0xeb, 0x21, 0xf1, 0x47, 0xef,
-	0x1c, 0x72, 0xa3, 0x94, 0x18, 0x19, 0x09, 0x1b, 0x52, 0xa0, 0x4a, 0xae, 0xcc, 0x4e, 0x5f, 0x90,
-	0xbe, 0x6c, 0x84, 0x7f, 0x23, 0x99, 0x96, 0xb2, 0x65, 0xfa, 0x6f, 0x21, 0x99, 0xd0, 0x3e, 0x54,
-	0x2d, 0x9f, 0xb0, 0xcc, 0xca, 0xdc, 0xcc, 0x30, 0x14, 0x3f, 0x66, 0xc2, 0x89, 0xee, 0xb2, 0xd4,
-	0xfd, 0x59, 0x04, 0x24, 0x47, 0x09, 0x19, 0x0e, 0xa0, 0xda, 0xe3, 0x26, 0x41, 0x59, 0x63, 0x86,
-	0x0a, 0x09, 0xaa, 0x8d, 0x30, 0x11, 0xb5, 0xa0, 0xea, 0x9b, 0x37, 0x63, 0x5a, 0x19, 0x81, 0xb3,
-	0x68, 0x0f, 0x03, 0xf1, 0x67, 0x3e, 0x16, 0xc2, 0x17, 0x8f, 0xc5, 0x21, 0x2c, 0x0b, 0xd8, 0x70,
-	0x2c, 0xf2, 0x17, 0x14, 0x65, 0xe2, 0x1f, 0x45, 0x40, 0xf2, 0x25, 0x10, 0xc3, 0xb1, 0x97, 0x18,
-	0x8e, 0xad, 0x69, 0x55, 0x46, 0x87, 0x43, 0x4c, 0x48, 0x4a, 0xcf, 0xd2, 0x62, 0x6b, 0xd7, 0x80,
-	0x8d, 0x98, 0x73, 0x06, 0x9d, 0x25, 0x4f, 0x1f, 0x36, 0x27, 0x22, 0x05, 0x25, 0x6f, 0xa1, 0xde,
-	0x93, 0xec, 0xa2, 0xfa, 0xe6, 0x7c, 0x5a, 0xa4, 0xd6, 0x8d, 0x04, 0x04, 0xf6, 0xe0, 0xbe, 0xc4,
-	0x3e, 0xb3, 0xc5, 0x12, 0xb4, 0x61, 0x55, 0x0e, 0x0e, 0x75, 0x58, 0xf0, 0x81, 0x49, 0x0c, 0xfc,
-	0x0d, 0x56, 0xc5, 0xd9, 0xcd, 0xb1, 0xa8, 0xd2, 0x81, 0xfe, 0x27, 0x32, 0xf0, 0x05, 0x11, 0xa8,
-	0x59, 0x0a, 0x7c, 0x60, 0xfb, 0x11, 0x05, 0xc5, 0xfb, 0x11, 0x70, 0x53, 0x8e, 0xfd, 0x48, 0x74,
-	0x68, 0x84, 0x89, 0xf8, 0x0c, 0xee, 0x8e, 0xd9, 0x9e, 0x09, 0x5d, 0xbe, 0x15, 0x74, 0xeb, 0x77,
-	0x05, 0x6a, 0x51, 0x24, 0x3a, 0x87, 0x5a, 0x74, 0xc1, 0xd1, 0xce, 0x0c, 0xb4, 0xf4, 0xbb, 0x00,
-	0xef, 0xe6, 0x0b, 0xe6, 0x95, 0xab, 0x05, 0x74, 0x06, 0x75, 0xf9, 0xaa, 0xa3, 0x8d, 0x09, 0x29,
-	0x8e, 0xc6, 0x6f, 0x50, 0xac, 0xcf, 0xc0, 0x9d, 0xf6, 0x5a, 0x50, 0x0b, 0xe8, 0x12, 0x20, 0xde,
-	0x04, 0x34, 0xa7, 0xb0, 0xe4, 0xd1, 0xc3, 0xcd, 0x9c, 0xd1, 0xe9, 0x3e, 0xc2, 0x33, 0x74, 0xeb,
-	0x3e, 0xd2, 0x77, 0x4c, 0x2d, 0xa0, 0xaf, 0xf0, 0x7f, 0x6a, 0xa3, 0xd1, 0x5e, 0xae, 0xf2, 0xe4,
-	0x3b, 0x81, 0x5b, 0x8b, 0xa4, 0x44, 0xcf, 0xb6, 0x60, 0x7d, 0x62, 0xbf, 0x33, 0x7b, 0xdb, 0xcf,
-	0xd7, 0x5b, 0xf2, 0x4a, 0x44, 0x42, 0x89, 0xc1, 0x9c, 0x27, 0x54, 0x72, 0xf9, 0xe6, 0x09, 0x95,
-	0x5a, 0x15, 0xb5, 0x80, 0xde, 0xc3, 0x8a, 0xb4, 0x43, 0x99, 0xbd, 0x68, 0x73, 0x7a, 0x99, 0x00,
-	0x3e, 0x30, 0x40, 0xfa, 0x10, 0x3d, 0x88, 0xbf, 0xe3, 0xde, 0x8c, 0x81, 0x3f, 0xee, 0xdb, 0x0e,
-	0x3d, 0x1f, 0x76, 0x34, 0xcb, 0x1d, 0xe8, 0xb6, 0x7b, 0x41, 0x2e, 0x29, 0xb1, 0xce, 0x75, 0xfe,
-	0x31, 0x69, 0xbb, 0x4d, 0xf6, 0xa3, 0xc9, 0x6a, 0xd0, 0xe3, 0x4f, 0xdd, 0x4e, 0x85, 0x59, 0x9e,
-	0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x27, 0x48, 0xa2, 0x57, 0xff, 0x0a, 0x00, 0x00,
+	0x10, 0xce, 0x47, 0xdf, 0xa4, 0x99, 0xa6, 0x7d, 0xe9, 0x82, 0xda, 0xb0, 0x50, 0x51, 0x99, 0x03,
+	0x91, 0xda, 0xda, 0x6a, 0xe8, 0x05, 0x09, 0x09, 0xa9, 0xb4, 0x54, 0x48, 0x1c, 0xc0, 0x69, 0x29,
+	0x05, 0x2e, 0x8e, 0x33, 0x71, 0xdd, 0x26, 0xb1, 0x6b, 0x6f, 0xa8, 0x02, 0x47, 0xc4, 0x0d, 0x7e,
+	0x13, 0x7f, 0x8b, 0x23, 0xca, 0xee, 0xda, 0x5e, 0x27, 0xcd, 0x57, 0xc5, 0x2d, 0xd9, 0x99, 0x79,
+	0x76, 0xe6, 0x79, 0x66, 0xc6, 0x0b, 0xb4, 0x85, 0x56, 0xc8, 0x0c, 0xdb, 0x0b, 0xd0, 0x38, 0x79,
+	0x5d, 0xc7, 0xe0, 0x8b, 0x6b, 0xa3, 0xee, 0x07, 0x1e, 0xf3, 0x08, 0x70, 0x9b, 0x3e, 0xb0, 0xd1,
+	0x87, 0xc2, 0x2f, 0xf4, 0xd1, 0x0e, 0x8d, 0xc3, 0x2e, 0x73, 0x59, 0xbf, 0xee, 0xa3, 0x2d, 0x3c,
+	0xe9, 0x86, 0x6a, 0x7d, 0x85, 0x16, 0xeb, 0x05, 0xa8, 0x98, 0xb5, 0x1b, 0xcc, 0x47, 0x81, 0xd7,
+	0xf3, 0xc7, 0x41, 0xd4, 0x99, 0x17, 0x58, 0x8e, 0x0a, 0xf1, 0xc0, 0xf1, 0x3c, 0xa7, 0x8d, 0x06,
+	0xff, 0xd7, 0xe8, 0xb5, 0x0c, 0xec, 0xf8, 0xac, 0x2f, 0x8d, 0x8f, 0x86, 0x8d, 0xcc, 0xed, 0x60,
+	0xc8, 0xac, 0x8e, 0x2f, 0x1c, 0xb4, 0x3f, 0x65, 0x58, 0x89, 0xab, 0x3b, 0xee, 0xfb, 0x18, 0xd2,
+	0x5f, 0x59, 0x28, 0x8b, 0x3a, 0x0e, 0x90, 0x59, 0x6e, 0x9b, 0x6c, 0xc1, 0xc2, 0xe0, 0xf2, 0x4a,
+	0x76, 0x33, 0x5b, 0x5d, 0xaa, 0xad, 0xeb, 0xa2, 0x78, 0x9e, 0x8f, 0x9e, 0x14, 0x6c, 0x72, 0x27,
+	0x42, 0x60, 0xe1, 0xc2, 0x6b, 0x84, 0x95, 0xdc, 0x66, 0xbe, 0x5a, 0x32, 0xf9, 0x6f, 0xf2, 0x1c,
+	0x96, 0xda, 0x56, 0xc8, 0x4e, 0xfc, 0xa6, 0xc5, 0xb0, 0x59, 0xc9, 0x73, 0x1c, 0xaa, 0x8b, 0xdc,
+	0xf4, 0x28, 0x37, 0xfd, 0x38, 0xca, 0xcd, 0x54, 0xdd, 0xa9, 0x06, 0x77, 0x8e, 0x90, 0x89, 0x8b,
+	0x4c, 0xbc, 0xea, 0x61, 0xc8, 0xc8, 0x0a, 0xe4, 0xdc, 0x26, 0x4f, 0xa8, 0x64, 0xe6, 0xdc, 0x26,
+	0x3d, 0x86, 0x55, 0xc5, 0x27, 0xf4, 0xbd, 0x6e, 0x88, 0xe4, 0x05, 0x14, 0x90, 0x9f, 0xc8, 0xcc,
+	0x9f, 0xe8, 0x89, 0x6c, 0x7a, 0xba, 0x68, 0x5d, 0x2d, 0xd8, 0x94, 0x61, 0xf4, 0x13, 0xdc, 0x7b,
+	0xe3, 0x86, 0x02, 0xd6, 0xc5, 0x30, 0x06, 0x7e, 0x09, 0x8b, 0x28, 0xcf, 0x2a, 0xd9, 0xcd, 0xfc,
+	0x3c, 0xd0, 0x71, 0x20, 0xfd, 0x9e, 0x83, 0x65, 0xa9, 0xb8, 0xe4, 0x79, 0x3b, 0xc5, 0x73, 0x25,
+	0xc5, 0xb3, 0xd2, 0x3a, 0x92, 0x68, 0x0d, 0xca, 0x0d, 0xd7, 0xb9, 0xea, 0x61, 0xd0, 0x7f, 0xef,
+	0xe2, 0x75, 0x25, 0xc7, 0xc9, 0x48, 0x9d, 0x91, 0x0a, 0x14, 0xb1, 0x6b, 0x35, 0xda, 0x92, 0xf4,
+	0x45, 0x33, 0xfa, 0x1b, 0xcb, 0xb4, 0x30, 0x5e, 0xa6, 0xff, 0xe6, 0x92, 0x89, 0xec, 0x41, 0xd1,
+	0x0e, 0x90, 0x47, 0x16, 0xa6, 0x46, 0x46, 0xae, 0xf4, 0x31, 0x17, 0x4e, 0x56, 0x37, 0x4e, 0xdd,
+	0x9f, 0x59, 0x20, 0xaa, 0x97, 0x94, 0x61, 0x1f, 0x8a, 0x2d, 0x71, 0x24, 0x29, 0xab, 0x4e, 0x50,
+	0x21, 0x45, 0xb5, 0x19, 0x05, 0x92, 0x1a, 0x14, 0x03, 0xeb, 0x7a, 0x40, 0x2b, 0x27, 0x70, 0x12,
+	0xed, 0x91, 0x23, 0xfd, 0x2c, 0xda, 0x42, 0xda, 0x92, 0xb6, 0x38, 0x80, 0x45, 0x09, 0x1b, 0xb5,
+	0xc5, 0xec, 0x09, 0xc5, 0x91, 0xf4, 0x47, 0x16, 0x88, 0xba, 0x09, 0x64, 0x73, 0xec, 0xa6, 0x9a,
+	0x63, 0xe3, 0xa6, 0x2c, 0xe3, 0xc5, 0x21, 0x3b, 0x64, 0x48, 0xcf, 0xdc, 0x7c, 0x63, 0x57, 0x85,
+	0xb5, 0x84, 0x73, 0x0e, 0x3d, 0x4e, 0x9e, 0x36, 0xac, 0x8f, 0x78, 0x4a, 0x4a, 0xde, 0x41, 0xb9,
+	0xa5, 0x9c, 0xcb, 0xec, 0x77, 0xa6, 0xd3, 0xa2, 0x94, 0x6e, 0xa6, 0x20, 0xa8, 0x0f, 0xf7, 0x15,
+	0xf6, 0xf9, 0x59, 0x22, 0x41, 0x1d, 0x96, 0x55, 0xe7, 0x48, 0x87, 0x39, 0x2f, 0x4c, 0x63, 0xd0,
+	0x6f, 0xb0, 0x2c, 0xd7, 0xee, 0x0c, 0x83, 0xaa, 0x2c, 0xe8, 0x7f, 0x22, 0x83, 0x18, 0x10, 0x89,
+	0x3a, 0x4e, 0x81, 0x0f, 0x7c, 0x3e, 0x62, 0xa7, 0x64, 0x3e, 0x42, 0x71, 0x34, 0xc3, 0x7c, 0xa4,
+	0x2a, 0x34, 0xa3, 0x40, 0x7a, 0x06, 0x77, 0x07, 0x6c, 0x4f, 0x84, 0xce, 0xdf, 0x0a, 0xba, 0xf6,
+	0xbb, 0x00, 0xa5, 0xd8, 0x93, 0x9c, 0x43, 0x29, 0xde, 0xe0, 0x64, 0x6b, 0x02, 0xda, 0xf0, 0xb7,
+	0x80, 0x6e, 0xcf, 0xe6, 0x2c, 0x32, 0xd7, 0x32, 0xe4, 0x0c, 0xca, 0xea, 0x56, 0x27, 0x6b, 0x23,
+	0x52, 0x1c, 0x0e, 0xbe, 0xa0, 0xd4, 0x98, 0x80, 0x7b, 0xd3, 0x67, 0x41, 0xcb, 0x90, 0x4b, 0x80,
+	0x64, 0x12, 0xc8, 0x94, 0xc4, 0xd2, 0x4b, 0x8f, 0xee, 0xcc, 0xe8, 0x3d, 0x5c, 0x47, 0xb4, 0x86,
+	0x6e, 0x5d, 0xc7, 0xf0, 0x1e, 0xd3, 0x32, 0xe4, 0x2b, 0xfc, 0x3f, 0x34, 0xd1, 0x64, 0x77, 0xa6,
+	0xf4, 0xd4, 0x3d, 0x41, 0x6b, 0xf3, 0x84, 0xc4, 0x77, 0xdb, 0xb0, 0x3a, 0x32, 0xdf, 0x63, 0x6b,
+	0xdb, 0x9b, 0xad, 0xb6, 0xf4, 0x96, 0x88, 0x85, 0x92, 0x8d, 0x39, 0x4d, 0xa8, 0xf4, 0xf0, 0x4d,
+	0x13, 0x6a, 0x68, 0x54, 0xb4, 0x0c, 0x39, 0x85, 0x25, 0x65, 0x86, 0xc6, 0xd6, 0xa2, 0x4f, 0xa9,
+	0x65, 0x04, 0x78, 0xff, 0x14, 0x94, 0x87, 0xe8, 0x7e, 0xf2, 0x8e, 0x7b, 0x3b, 0x00, 0xfe, 0xf8,
+	0xcc, 0x71, 0xd9, 0x79, 0xaf, 0xa1, 0xdb, 0x5e, 0xc7, 0x70, 0xbc, 0x0b, 0xbc, 0x64, 0x68, 0x9f,
+	0x1b, 0xe2, 0x31, 0xc9, 0xaf, 0x0e, 0x0d, 0x07, 0xbb, 0x18, 0x0c, 0xd6, 0x8c, 0xe1, 0x78, 0x46,
+	0xf2, 0xde, 0x6d, 0x14, 0xb8, 0xfd, 0xe9, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x44, 0x0c, 0x23,
+	0x40, 0x04, 0x0b, 0x00, 0x00,
 }
diff --git a/go-feast-proto/feast/serving/Serving.pb.go b/protos/generated/go/feast/serving/Serving.pb.go
similarity index 79%
rename from go-feast-proto/feast/serving/Serving.pb.go
rename to protos/generated/go/feast/serving/Serving.pb.go
index 4f6d7b267b..7f9eddbd01 100644
--- a/go-feast-proto/feast/serving/Serving.pb.go
+++ b/protos/generated/go/feast/serving/Serving.pb.go
@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: feast/serving/Serving.proto
 
-package serving // import "github.com/gojektech/feast/go-feast-proto/feast/serving"
+package serving // import "github.com/gojektech/feast/protos/generated/go/feast/serving"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import types "github.com/gojektech/feast/go-feast-proto/feast/types"
+import types "github.com/gojektech/feast/protos/generated/go/feast/types"
 import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 
 import (
@@ -47,7 +47,7 @@ func (x RequestType) String() string {
 	return proto.EnumName(RequestType_name, int32(x))
 }
 func (RequestType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_Serving_fd09065a28d57eb8, []int{0}
+	return fileDescriptor_Serving_f3b5c9845e720a9a, []int{0}
 }
 
 type QueryFeatures struct {
@@ -60,7 +60,7 @@ func (m *QueryFeatures) Reset()         { *m = QueryFeatures{} }
 func (m *QueryFeatures) String() string { return proto.CompactTextString(m) }
 func (*QueryFeatures) ProtoMessage()    {}
 func (*QueryFeatures) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Serving_fd09065a28d57eb8, []int{0}
+	return fileDescriptor_Serving_f3b5c9845e720a9a, []int{0}
 }
 func (m *QueryFeatures) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryFeatures.Unmarshal(m, b)
@@ -98,7 +98,7 @@ func (m *QueryFeatures_Request) Reset()         { *m = QueryFeatures_Request{} }
 func (m *QueryFeatures_Request) String() string { return proto.CompactTextString(m) }
 func (*QueryFeatures_Request) ProtoMessage()    {}
 func (*QueryFeatures_Request) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Serving_fd09065a28d57eb8, []int{0, 0}
+	return fileDescriptor_Serving_f3b5c9845e720a9a, []int{0, 0}
 }
 func (m *QueryFeatures_Request) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryFeatures_Request.Unmarshal(m, b)
@@ -160,7 +160,7 @@ func (m *QueryFeatures_Response) Reset()         { *m = QueryFeatures_Response{}
 func (m *QueryFeatures_Response) String() string { return proto.CompactTextString(m) }
 func (*QueryFeatures_Response) ProtoMessage()    {}
 func (*QueryFeatures_Response) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Serving_fd09065a28d57eb8, []int{0, 1}
+	return fileDescriptor_Serving_f3b5c9845e720a9a, []int{0, 1}
 }
 func (m *QueryFeatures_Response) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_QueryFeatures_Response.Unmarshal(m, b)
@@ -217,7 +217,7 @@ func (m *RequestDetail) Reset()         { *m = RequestDetail{} }
 func (m *RequestDetail) String() string { return proto.CompactTextString(m) }
 func (*RequestDetail) ProtoMessage()    {}
 func (*RequestDetail) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Serving_fd09065a28d57eb8, []int{1}
+	return fileDescriptor_Serving_f3b5c9845e720a9a, []int{1}
 }
 func (m *RequestDetail) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RequestDetail.Unmarshal(m, b)
@@ -274,7 +274,7 @@ func (m *TimestampRange) Reset()         { *m = TimestampRange{} }
 func (m *TimestampRange) String() string { return proto.CompactTextString(m) }
 func (*TimestampRange) ProtoMessage()    {}
 func (*TimestampRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Serving_fd09065a28d57eb8, []int{2}
+	return fileDescriptor_Serving_f3b5c9845e720a9a, []int{2}
 }
 func (m *TimestampRange) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TimestampRange.Unmarshal(m, b)
@@ -320,7 +320,7 @@ func (m *Entity) Reset()         { *m = Entity{} }
 func (m *Entity) String() string { return proto.CompactTextString(m) }
 func (*Entity) ProtoMessage()    {}
 func (*Entity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Serving_fd09065a28d57eb8, []int{3}
+	return fileDescriptor_Serving_f3b5c9845e720a9a, []int{3}
 }
 func (m *Entity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Entity.Unmarshal(m, b)
@@ -364,7 +364,7 @@ func (m *FeatureValueList) Reset()         { *m = FeatureValueList{} }
 func (m *FeatureValueList) String() string { return proto.CompactTextString(m) }
 func (*FeatureValueList) ProtoMessage()    {}
 func (*FeatureValueList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Serving_fd09065a28d57eb8, []int{4}
+	return fileDescriptor_Serving_f3b5c9845e720a9a, []int{4}
 }
 func (m *FeatureValueList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeatureValueList.Unmarshal(m, b)
@@ -486,46 +486,47 @@ var _ServingAPI_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("feast/serving/Serving.proto", fileDescriptor_Serving_fd09065a28d57eb8)
-}
-
-var fileDescriptor_Serving_fd09065a28d57eb8 = []byte{
-	// 591 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xef, 0x6e, 0xd3, 0x3e,
-	0x14, 0x5d, 0x96, 0x75, 0xbf, 0xf6, 0x56, 0xe9, 0xaf, 0xb2, 0xf8, 0x13, 0x85, 0xc1, 0x4a, 0x01,
-	0xa9, 0x02, 0xe6, 0xa0, 0x0c, 0x04, 0xe2, 0x0b, 0x6c, 0xda, 0x90, 0x2a, 0x4d, 0x30, 0xbc, 0x0a,
-	0x09, 0x84, 0x90, 0xb2, 0xed, 0x36, 0x0b, 0x6b, 0x93, 0x10, 0x3b, 0x95, 0xf2, 0x0a, 0xbc, 0x08,
-	0x6f, 0xc0, 0x6b, 0x20, 0xf1, 0x44, 0xa8, 0xb6, 0xd3, 0x26, 0x51, 0xc5, 0xf8, 0x14, 0xdb, 0xf7,
-	0x9c, 0x73, 0x73, 0xef, 0xb1, 0x2f, 0xdc, 0x1a, 0xa3, 0xcf, 0x85, 0xcb, 0x31, 0x9d, 0x85, 0x51,
-	0xe0, 0x9e, 0xa8, 0x2f, 0x4d, 0xd2, 0x58, 0xc4, 0xc4, 0x92, 0x41, 0xaa, 0x83, 0xce, 0x76, 0x10,
-	0xc7, 0xc1, 0x04, 0x5d, 0x19, 0x3c, 0xcd, 0xc6, 0xae, 0x08, 0xa7, 0xc8, 0x85, 0x3f, 0x4d, 0x14,
-	0xde, 0xb9, 0xa9, 0xc4, 0x44, 0x9e, 0x20, 0x77, 0x3f, 0xf8, 0x93, 0x0c, 0x55, 0xa0, 0xff, 0xd3,
-	0x04, 0xeb, 0x7d, 0x86, 0x69, 0xfe, 0x06, 0x7d, 0x91, 0xa5, 0xc8, 0x9d, 0xdf, 0x06, 0xfc, 0xc7,
-	0xf0, 0x5b, 0x86, 0x5c, 0x90, 0x3b, 0x00, 0x18, 0x89, 0x50, 0xe4, 0x6f, 0xfd, 0x29, 0xda, 0x46,
-	0xcf, 0x18, 0xb4, 0x58, 0xe9, 0x84, 0x38, 0xd0, 0x54, 0xbb, 0xe1, 0xb9, 0xbd, 0xde, 0x33, 0x07,
-	0x2d, 0xb6, 0xd8, 0x93, 0x03, 0xe8, 0xa4, 0x4a, 0xe6, 0x00, 0x85, 0x1f, 0x4e, 0xb8, 0x6d, 0xf6,
-	0xcc, 0x41, 0xdb, 0xdb, 0xa2, 0x95, 0x7f, 0xa7, 0xac, 0x0c, 0x62, 0x35, 0x0e, 0x39, 0x84, 0xce,
-	0xa2, 0x16, 0xe6, 0x47, 0x01, 0xda, 0x1b, 0x3d, 0x63, 0xd0, 0xf6, 0x6e, 0xd7, 0x54, 0x46, 0x15,
-	0x10, 0xab, 0x91, 0x9c, 0x5f, 0x06, 0x34, 0x19, 0xf2, 0x24, 0x8e, 0x38, 0x5e, 0x59, 0xd5, 0x3b,
-	0x5d, 0x55, 0x88, 0x5c, 0x56, 0xd5, 0xf6, 0x76, 0x6b, 0xd9, 0x2a, 0x1d, 0xa3, 0x85, 0x30, 0x3d,
-	0xd4, 0xac, 0xc3, 0x48, 0xa4, 0x39, 0x5b, 0x88, 0x38, 0x0c, 0xac, 0x4a, 0x88, 0x74, 0xc1, 0xbc,
-	0xc4, 0x5c, 0xa7, 0x9e, 0x2f, 0xc9, 0x23, 0x68, 0xcc, 0xe6, 0xb6, 0xd8, 0xeb, 0xb2, 0xbc, 0xeb,
-	0xb5, 0x84, 0x92, 0x9e, 0x33, 0x85, 0x79, 0xb9, 0xfe, 0xc2, 0xe8, 0x73, 0xb0, 0x2a, 0x9d, 0x23,
-	0x5b, 0xd0, 0x1a, 0xab, 0x3f, 0x1a, 0x9e, 0x6b, 0xe5, 0xe5, 0x01, 0xa1, 0xb0, 0x31, 0x37, 0x5f,
-	0xca, 0x77, 0x3c, 0x67, 0xb5, 0x07, 0xa3, 0x3c, 0x41, 0x26, 0x71, 0xe4, 0x1a, 0x34, 0x26, 0xe1,
-	0x34, 0x14, 0xb6, 0xd9, 0x33, 0x06, 0x0d, 0xa6, 0x36, 0xfd, 0x04, 0x3a, 0xd5, 0x46, 0x93, 0x27,
-	0xd0, 0xe0, 0xc2, 0x4f, 0x85, 0xcc, 0xd8, 0xf6, 0x1c, 0xaa, 0x6e, 0x22, 0x2d, 0x6e, 0x62, 0xc9,
-	0x18, 0x05, 0x24, 0x8f, 0xc1, 0xc4, 0xe8, 0x5c, 0xd7, 0xf9, 0x37, 0xfc, 0x1c, 0xd6, 0xff, 0x61,
-	0xc0, 0xa6, 0x2a, 0x9e, 0xbc, 0x82, 0xa6, 0xae, 0x87, 0xdb, 0x86, 0xb4, 0xe5, 0xde, 0xca, 0x2e,
-	0xd1, 0xc2, 0x18, 0x6d, 0x43, 0x41, 0x72, 0x3e, 0x83, 0x55, 0x09, 0xad, 0xb0, 0xe1, 0x59, 0xd5,
-	0x86, 0xed, 0x5a, 0x02, 0x4d, 0x97, 0x0f, 0xe8, 0x28, 0xe4, 0xa2, 0x6c, 0xc8, 0x77, 0x03, 0xba,
-	0xf5, 0x38, 0x79, 0x0a, 0xad, 0x59, 0xb1, 0xd1, 0x2d, 0xba, 0xa1, 0x35, 0xe5, 0x5b, 0xa4, 0x4b,
-	0xa9, 0x25, 0x90, 0xbc, 0x06, 0x6b, 0x71, 0x7f, 0x25, 0xb3, 0x68, 0x56, 0x99, 0x39, 0x2a, 0x23,
-	0x58, 0x95, 0xf0, 0xf0, 0x2e, 0xb4, 0x4b, 0x9e, 0x92, 0x26, 0x6c, 0x1c, 0xed, 0x9d, 0x8c, 0xba,
-	0x6b, 0x72, 0x35, 0x3c, 0x19, 0x75, 0x0d, 0x6f, 0x02, 0xa0, 0x67, 0xca, 0xde, 0xf1, 0x90, 0x7c,
-	0xa9, 0x8d, 0x01, 0x72, 0xff, 0x8a, 0x2b, 0x2f, 0xc5, 0x9d, 0x07, 0xff, 0xf4, 0x30, 0xfa, 0x6b,
-	0xfb, 0x1f, 0xa1, 0x3a, 0xb2, 0xf6, 0xff, 0x5f, 0x26, 0x3f, 0x9e, 0x7b, 0xff, 0xe9, 0x79, 0x10,
-	0x8a, 0x8b, 0xec, 0x94, 0x9e, 0xc5, 0x53, 0x37, 0x88, 0xbf, 0xe2, 0xa5, 0xc0, 0xb3, 0x0b, 0x57,
-	0xcd, 0xad, 0x20, 0xde, 0x91, 0x8b, 0x1d, 0x79, 0x4d, 0xdc, 0xca, 0x64, 0x3c, 0xdd, 0x94, 0x87,
-	0xbb, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x47, 0x65, 0xae, 0x98, 0x31, 0x05, 0x00, 0x00,
+	proto.RegisterFile("feast/serving/Serving.proto", fileDescriptor_Serving_f3b5c9845e720a9a)
+}
+
+var fileDescriptor_Serving_f3b5c9845e720a9a = []byte{
+	// 595 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0x6f, 0x6b, 0xd3, 0x5e,
+	0x14, 0x5e, 0x96, 0x75, 0xbf, 0xf6, 0x94, 0xf4, 0x57, 0x2e, 0xfe, 0x09, 0x71, 0xba, 0x5a, 0x15,
+	0x8a, 0xca, 0x8d, 0x64, 0x0a, 0x22, 0x82, 0x6e, 0x6c, 0x42, 0x61, 0xe8, 0xbc, 0x2b, 0xbe, 0x10,
+	0x19, 0x64, 0xeb, 0x69, 0x16, 0xd7, 0x26, 0x31, 0xf7, 0xa6, 0x90, 0xaf, 0xe0, 0x17, 0xf1, 0x1b,
+	0xf8, 0x35, 0x04, 0x3f, 0x91, 0xf4, 0xde, 0x9b, 0x36, 0x09, 0xc5, 0xf9, 0x2a, 0xb9, 0x39, 0xcf,
+	0xf3, 0x9c, 0x9c, 0xf3, 0x9c, 0x7b, 0xe0, 0xce, 0x04, 0x7d, 0x2e, 0x5c, 0x8e, 0xe9, 0x3c, 0x8c,
+	0x02, 0xf7, 0x54, 0x3d, 0x69, 0x92, 0xc6, 0x22, 0x26, 0x96, 0x0c, 0x52, 0x1d, 0x74, 0x76, 0x83,
+	0x38, 0x0e, 0xa6, 0xe8, 0xca, 0xe0, 0x79, 0x36, 0x71, 0x45, 0x38, 0x43, 0x2e, 0xfc, 0x59, 0xa2,
+	0xf0, 0xce, 0x6d, 0x25, 0x26, 0xf2, 0x04, 0xb9, 0xfb, 0xc9, 0x9f, 0x66, 0xa8, 0x02, 0xfd, 0x9f,
+	0x26, 0x58, 0x1f, 0x33, 0x4c, 0xf3, 0x77, 0xe8, 0x8b, 0x2c, 0x45, 0xee, 0xfc, 0x36, 0xe0, 0x3f,
+	0x86, 0xdf, 0x32, 0xe4, 0x82, 0xdc, 0x03, 0xc0, 0x48, 0x84, 0x22, 0x7f, 0xef, 0xcf, 0xd0, 0x36,
+	0x7a, 0xc6, 0xa0, 0xc5, 0x4a, 0x5f, 0x88, 0x03, 0x4d, 0x75, 0x1a, 0x8e, 0xed, 0xcd, 0x9e, 0x39,
+	0x68, 0xb1, 0xe5, 0x99, 0x1c, 0x42, 0x27, 0x55, 0x32, 0x87, 0x28, 0xfc, 0x70, 0xca, 0x6d, 0xb3,
+	0x67, 0x0e, 0xda, 0xde, 0x0e, 0xad, 0xfc, 0x3b, 0x65, 0x65, 0x10, 0xab, 0x71, 0xc8, 0x11, 0x74,
+	0x96, 0xb5, 0x30, 0x3f, 0x0a, 0xd0, 0xde, 0xea, 0x19, 0x83, 0xb6, 0x77, 0xb7, 0xa6, 0x32, 0xaa,
+	0x80, 0x58, 0x8d, 0xe4, 0xfc, 0x32, 0xa0, 0xc9, 0x90, 0x27, 0x71, 0xc4, 0xf1, 0xda, 0xaa, 0x3e,
+	0xe8, 0xaa, 0x42, 0xe4, 0xb2, 0xaa, 0xb6, 0xb7, 0x57, 0xcb, 0x56, 0xe9, 0x18, 0x2d, 0x84, 0xe9,
+	0x91, 0x66, 0x1d, 0x45, 0x22, 0xcd, 0xd9, 0x52, 0xc4, 0x61, 0x60, 0x55, 0x42, 0xa4, 0x0b, 0xe6,
+	0x15, 0xe6, 0x3a, 0xf5, 0xe2, 0x95, 0x3c, 0x81, 0xc6, 0x7c, 0x61, 0x8b, 0xbd, 0x29, 0xcb, 0xbb,
+	0x59, 0x4b, 0x28, 0xe9, 0x39, 0x53, 0x98, 0x57, 0x9b, 0x2f, 0x8d, 0x3e, 0x07, 0xab, 0xd2, 0x39,
+	0xb2, 0x03, 0xad, 0x89, 0xfa, 0xa3, 0xe1, 0x58, 0x2b, 0xaf, 0x3e, 0x10, 0x0a, 0x5b, 0x0b, 0xf3,
+	0xa5, 0x7c, 0xc7, 0x73, 0xd6, 0x7b, 0x30, 0xca, 0x13, 0x64, 0x12, 0x47, 0x6e, 0x40, 0x63, 0x1a,
+	0xce, 0x42, 0x61, 0x9b, 0x3d, 0x63, 0xd0, 0x60, 0xea, 0xd0, 0x4f, 0xa0, 0x53, 0x6d, 0x34, 0x79,
+	0x06, 0x0d, 0x2e, 0xfc, 0x54, 0xc8, 0x8c, 0x6d, 0xcf, 0xa1, 0x6a, 0x12, 0x69, 0x31, 0x89, 0x25,
+	0x63, 0x14, 0x90, 0x3c, 0x05, 0x13, 0xa3, 0xb1, 0xae, 0xf3, 0x6f, 0xf8, 0x05, 0xac, 0xff, 0xc3,
+	0x80, 0x6d, 0x55, 0x3c, 0x79, 0x03, 0x4d, 0x5d, 0x0f, 0xb7, 0x0d, 0x69, 0xcb, 0x83, 0xb5, 0x5d,
+	0xa2, 0x85, 0x31, 0xda, 0x86, 0x82, 0xe4, 0x7c, 0x01, 0xab, 0x12, 0x5a, 0x63, 0xc3, 0x8b, 0xaa,
+	0x0d, 0xbb, 0xb5, 0x04, 0x9a, 0x2e, 0x2f, 0xd0, 0x71, 0xc8, 0x45, 0xd9, 0x90, 0xef, 0x06, 0x74,
+	0xeb, 0x71, 0xf2, 0x1c, 0x5a, 0xf3, 0xe2, 0xa0, 0x5b, 0x74, 0x4b, 0x6b, 0xca, 0xbb, 0x48, 0x57,
+	0x52, 0x2b, 0x20, 0x79, 0x0b, 0xd6, 0x72, 0x7e, 0x25, 0xb3, 0x68, 0x56, 0x99, 0x39, 0x2a, 0x23,
+	0x58, 0x95, 0xf0, 0xf8, 0x3e, 0xb4, 0x4b, 0x9e, 0x92, 0x26, 0x6c, 0x1d, 0xef, 0x9f, 0x8e, 0xba,
+	0x1b, 0xf2, 0x6d, 0x78, 0x3a, 0xea, 0x1a, 0xde, 0x14, 0x40, 0xef, 0x94, 0xfd, 0x93, 0x21, 0x39,
+	0xab, 0xad, 0x01, 0xf2, 0xf0, 0x9a, 0x91, 0x97, 0xe2, 0xce, 0xa3, 0x7f, 0xba, 0x18, 0xfd, 0x8d,
+	0x83, 0x33, 0xa8, 0xae, 0xac, 0x83, 0xff, 0x57, 0xc9, 0x4f, 0x16, 0xde, 0x7f, 0x7e, 0x1d, 0x84,
+	0xe2, 0x32, 0x3b, 0xa7, 0x17, 0xf1, 0xcc, 0x0d, 0xe2, 0xaf, 0x78, 0x25, 0xf0, 0xe2, 0xd2, 0x55,
+	0x7b, 0x4b, 0x4e, 0x07, 0x77, 0x03, 0x8c, 0x30, 0xf5, 0x05, 0x8e, 0xdd, 0x20, 0x76, 0x2b, 0xeb,
+	0xf1, 0x7c, 0x5b, 0x42, 0xf6, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0xfa, 0xb8, 0xea, 0xcb, 0x36,
+	0x05, 0x00, 0x00,
 }
diff --git a/go-feast-proto/feast/specs/EntitySpec.pb.go b/protos/generated/go/feast/specs/EntitySpec.pb.go
similarity index 63%
rename from go-feast-proto/feast/specs/EntitySpec.pb.go
rename to protos/generated/go/feast/specs/EntitySpec.pb.go
index 0bb5445f58..642d36ac2e 100644
--- a/go-feast-proto/feast/specs/EntitySpec.pb.go
+++ b/protos/generated/go/feast/specs/EntitySpec.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: feast/specs/EntitySpec.proto
 
-package specs // import "github.com/gojektech/feast/go-feast-proto/feast/specs"
+package specs // import "github.com/gojektech/feast/protos/generated/go/feast/specs"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -31,7 +31,7 @@ func (m *EntitySpec) Reset()         { *m = EntitySpec{} }
 func (m *EntitySpec) String() string { return proto.CompactTextString(m) }
 func (*EntitySpec) ProtoMessage()    {}
 func (*EntitySpec) Descriptor() ([]byte, []int) {
-	return fileDescriptor_EntitySpec_acaf20f0bc303278, []int{0}
+	return fileDescriptor_EntitySpec_5830cf373dc122f9, []int{0}
 }
 func (m *EntitySpec) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_EntitySpec.Unmarshal(m, b)
@@ -77,20 +77,21 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("feast/specs/EntitySpec.proto", fileDescriptor_EntitySpec_acaf20f0bc303278)
+	proto.RegisterFile("feast/specs/EntitySpec.proto", fileDescriptor_EntitySpec_5830cf373dc122f9)
 }
 
-var fileDescriptor_EntitySpec_acaf20f0bc303278 = []byte{
-	// 172 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x49, 0x4b, 0x4d, 0x2c,
-	0x2e, 0xd1, 0x2f, 0x2e, 0x48, 0x4d, 0x2e, 0xd6, 0x77, 0xcd, 0x2b, 0xc9, 0x2c, 0xa9, 0x0c, 0x2e,
-	0x48, 0x4d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x06, 0xcb, 0xea, 0x81, 0x65, 0x95,
-	0xc2, 0xb8, 0xb8, 0x10, 0x0a, 0x84, 0x84, 0xb8, 0x58, 0xf2, 0x12, 0x73, 0x53, 0x25, 0x18, 0x15,
-	0x18, 0x35, 0x38, 0x83, 0xc0, 0x6c, 0x21, 0x05, 0x2e, 0xee, 0x94, 0xd4, 0xe2, 0xe4, 0xa2, 0xcc,
-	0x82, 0x92, 0xcc, 0xfc, 0x3c, 0x09, 0x26, 0xb0, 0x14, 0xb2, 0x10, 0x48, 0x57, 0x49, 0x62, 0x7a,
-	0xb1, 0x04, 0xb3, 0x02, 0x33, 0x48, 0x17, 0x88, 0xed, 0x14, 0xca, 0x85, 0x6c, 0x8d, 0x13, 0x3f,
-	0xc2, 0x92, 0x00, 0x90, 0x23, 0xa2, 0x4c, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3,
-	0x73, 0xf5, 0xd3, 0xf3, 0xb3, 0x52, 0xb3, 0x4b, 0x52, 0x93, 0x33, 0xf4, 0x21, 0xee, 0x4e, 0xcf,
-	0xd7, 0x05, 0x33, 0x74, 0xc1, 0xee, 0xd5, 0x47, 0xf2, 0x4c, 0x12, 0x1b, 0x58, 0xc8, 0x18, 0x10,
-	0x00, 0x00, 0xff, 0xff, 0xb2, 0xa8, 0xdf, 0xe2, 0xe2, 0x00, 0x00, 0x00,
+var fileDescriptor_EntitySpec_5830cf373dc122f9 = []byte{
+	// 179 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x8f, 0x31, 0x0b, 0xc2, 0x30,
+	0x10, 0x85, 0xa9, 0x15, 0xc1, 0x74, 0x10, 0x32, 0x75, 0x70, 0x28, 0x4e, 0x4e, 0xbd, 0xc1, 0xcd,
+	0xb1, 0xe0, 0x2e, 0x0a, 0x0e, 0xdd, 0xd2, 0xf4, 0x4c, 0xa3, 0x34, 0x09, 0xcd, 0x39, 0xf8, 0xef,
+	0x25, 0xe7, 0xd0, 0x6e, 0x8f, 0x7b, 0xef, 0xf1, 0xbe, 0x13, 0xfb, 0x27, 0xaa, 0x48, 0x10, 0x03,
+	0xea, 0x08, 0x17, 0x47, 0x96, 0xbe, 0xf7, 0x80, 0xba, 0x0e, 0x93, 0x27, 0x2f, 0x0b, 0x76, 0x6b,
+	0x76, 0x0f, 0x0f, 0x21, 0xe6, 0x80, 0x94, 0x62, 0xed, 0xd4, 0x88, 0x65, 0x56, 0x65, 0xc7, 0xed,
+	0x8d, 0xb5, 0xac, 0x44, 0xd1, 0x63, 0xd4, 0x93, 0x0d, 0x64, 0xbd, 0x2b, 0x57, 0x6c, 0x2d, 0x4f,
+	0xa9, 0x45, 0xca, 0xc4, 0x32, 0xaf, 0xf2, 0xd4, 0x4a, 0xba, 0x69, 0xc5, 0x72, 0xa6, 0xd9, 0xcd,
+	0x23, 0xd7, 0x04, 0xd1, 0x9e, 0x8d, 0xa5, 0xe1, 0xd3, 0xd5, 0xda, 0x8f, 0x60, 0xfc, 0x0b, 0xdf,
+	0x84, 0x7a, 0x80, 0x3f, 0x37, 0x63, 0x46, 0x30, 0xe8, 0x70, 0x52, 0x84, 0x3d, 0x18, 0x0f, 0x8b,
+	0x8f, 0xba, 0x0d, 0x07, 0x4e, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2e, 0xd4, 0x89, 0xe8, 0xe7,
+	0x00, 0x00, 0x00,
 }
diff --git a/go-feast-proto/feast/specs/FeatureGroupSpec.pb.go b/protos/generated/go/feast/specs/FeatureGroupSpec.pb.go
similarity index 61%
rename from go-feast-proto/feast/specs/FeatureGroupSpec.pb.go
rename to protos/generated/go/feast/specs/FeatureGroupSpec.pb.go
index 52bbe3569e..8ceeb0cb10 100644
--- a/go-feast-proto/feast/specs/FeatureGroupSpec.pb.go
+++ b/protos/generated/go/feast/specs/FeatureGroupSpec.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: feast/specs/FeatureGroupSpec.proto
 
-package specs // import "github.com/gojektech/feast/go-feast-proto/feast/specs"
+package specs // import "github.com/gojektech/feast/protos/generated/go/feast/specs"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -31,7 +31,7 @@ func (m *FeatureGroupSpec) Reset()         { *m = FeatureGroupSpec{} }
 func (m *FeatureGroupSpec) String() string { return proto.CompactTextString(m) }
 func (*FeatureGroupSpec) ProtoMessage()    {}
 func (*FeatureGroupSpec) Descriptor() ([]byte, []int) {
-	return fileDescriptor_FeatureGroupSpec_3b2276702dd15bc5, []int{0}
+	return fileDescriptor_FeatureGroupSpec_a9bbf0c2f691fa68, []int{0}
 }
 func (m *FeatureGroupSpec) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeatureGroupSpec.Unmarshal(m, b)
@@ -77,22 +77,22 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("feast/specs/FeatureGroupSpec.proto", fileDescriptor_FeatureGroupSpec_3b2276702dd15bc5)
+	proto.RegisterFile("feast/specs/FeatureGroupSpec.proto", fileDescriptor_FeatureGroupSpec_a9bbf0c2f691fa68)
 }
 
-var fileDescriptor_FeatureGroupSpec_3b2276702dd15bc5 = []byte{
-	// 199 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4a, 0x4b, 0x4d, 0x2c,
-	0x2e, 0xd1, 0x2f, 0x2e, 0x48, 0x4d, 0x2e, 0xd6, 0x77, 0x4b, 0x4d, 0x2c, 0x29, 0x2d, 0x4a, 0x75,
-	0x2f, 0xca, 0x2f, 0x2d, 0x08, 0x2e, 0x48, 0x4d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2,
-	0x06, 0xab, 0xd1, 0x03, 0xab, 0x91, 0x92, 0xc5, 0xa2, 0x01, 0xa1, 0x56, 0x29, 0x9f, 0x4b, 0x00,
-	0xdd, 0x14, 0x21, 0x3e, 0x2e, 0xa6, 0xcc, 0x14, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xce, 0x20, 0xa6,
-	0xcc, 0x14, 0x21, 0x21, 0x2e, 0x96, 0x92, 0xc4, 0xf4, 0x62, 0x09, 0x26, 0x05, 0x66, 0x0d, 0xce,
-	0x20, 0x30, 0x5b, 0xc8, 0x9c, 0x8b, 0x2b, 0x25, 0xb1, 0x24, 0x31, 0xb8, 0x24, 0xbf, 0x28, 0xb5,
-	0x58, 0x82, 0x59, 0x81, 0x51, 0x83, 0xdb, 0x48, 0x5c, 0x0f, 0xc9, 0x62, 0x3d, 0x17, 0xb8, 0x74,
-	0x10, 0x92, 0x52, 0xa7, 0x68, 0x2e, 0x64, 0xe7, 0x39, 0x89, 0xa2, 0xdb, 0x1e, 0x00, 0x72, 0x56,
-	0x94, 0x69, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x7a, 0x7e, 0x56,
-	0x6a, 0x76, 0x49, 0x6a, 0x72, 0x86, 0x3e, 0xc4, 0x2b, 0xe9, 0xf9, 0xba, 0x60, 0x86, 0x2e, 0xd8,
-	0x07, 0xfa, 0x48, 0xfe, 0x4b, 0x62, 0x03, 0x0b, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x61,
-	0x2e, 0xdb, 0x62, 0x26, 0x01, 0x00, 0x00,
+var fileDescriptor_FeatureGroupSpec_a9bbf0c2f691fa68 = []byte{
+	// 206 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x8f, 0x41, 0x4b, 0xc4, 0x30,
+	0x10, 0x85, 0x69, 0x2b, 0x42, 0x53, 0x10, 0x09, 0x88, 0x45, 0x10, 0x4a, 0x4f, 0x3d, 0x25, 0xa0,
+	0x07, 0xc1, 0x63, 0x11, 0xbd, 0x4a, 0x7b, 0xf3, 0x64, 0x9a, 0x8c, 0x69, 0x15, 0x77, 0x42, 0x32,
+	0xfd, 0xff, 0xcb, 0x66, 0x61, 0x37, 0x94, 0xbd, 0x0d, 0xcc, 0x37, 0xf3, 0xbe, 0xc7, 0xda, 0x1f,
+	0x50, 0x81, 0x64, 0x70, 0xa0, 0x83, 0x7c, 0x07, 0x45, 0xab, 0x87, 0x0f, 0x8f, 0xab, 0x1b, 0x1d,
+	0x68, 0xe1, 0x3c, 0x12, 0xf2, 0x2a, 0x32, 0x22, 0x32, 0x0f, 0x8f, 0x17, 0x0e, 0xce, 0x6c, 0x8b,
+	0xec, 0x76, 0xfb, 0x85, 0xdf, 0xb0, 0x7c, 0x31, 0x75, 0xd6, 0x64, 0x5d, 0x39, 0xe4, 0x8b, 0xe1,
+	0x9c, 0x5d, 0x91, 0xb2, 0xa1, 0xce, 0x9b, 0xa2, 0x2b, 0x87, 0x38, 0xf3, 0x17, 0xc6, 0x8c, 0x22,
+	0x35, 0x12, 0x7a, 0x08, 0x75, 0xd1, 0x64, 0x5d, 0xf5, 0x74, 0x2f, 0x92, 0x60, 0xf1, 0x76, 0x5a,
+	0x0f, 0x09, 0xda, 0x7f, 0xb3, 0x54, 0xaf, 0xbf, 0xdb, 0xa6, 0x7f, 0x1e, 0xb4, 0xbe, 0x5e, 0xed,
+	0x42, 0xf3, 0x3a, 0x09, 0x8d, 0xff, 0xd2, 0xe2, 0x2f, 0xfc, 0x11, 0xe8, 0x59, 0x1e, 0xab, 0x44,
+	0xf1, 0x20, 0x2d, 0xec, 0xc0, 0x2b, 0x02, 0x23, 0x2d, 0xca, 0xa4, 0xe4, 0x74, 0x1d, 0x81, 0xe7,
+	0x7d, 0x00, 0x00, 0x00, 0xff, 0xff, 0x42, 0x2c, 0xdd, 0x19, 0x2b, 0x01, 0x00, 0x00,
 }
diff --git a/go-feast-proto/feast/specs/FeatureSpec.pb.go b/protos/generated/go/feast/specs/FeatureSpec.pb.go
similarity index 69%
rename from go-feast-proto/feast/specs/FeatureSpec.pb.go
rename to protos/generated/go/feast/specs/FeatureSpec.pb.go
index 49b49de040..2f91d976a6 100644
--- a/go-feast-proto/feast/specs/FeatureSpec.pb.go
+++ b/protos/generated/go/feast/specs/FeatureSpec.pb.go
@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: feast/specs/FeatureSpec.proto
 
-package specs // import "github.com/gojektech/feast/go-feast-proto/feast/specs"
+package specs // import "github.com/gojektech/feast/protos/generated/go/feast/specs"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import types "github.com/gojektech/feast/go-feast-proto/feast/types"
+import types "github.com/gojektech/feast/protos/generated/go/feast/types"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -41,7 +41,7 @@ func (m *FeatureSpec) Reset()         { *m = FeatureSpec{} }
 func (m *FeatureSpec) String() string { return proto.CompactTextString(m) }
 func (*FeatureSpec) ProtoMessage()    {}
 func (*FeatureSpec) Descriptor() ([]byte, []int) {
-	return fileDescriptor_FeatureSpec_f61b2ffac65ee0e1, []int{0}
+	return fileDescriptor_FeatureSpec_0c79e2ccc174df52, []int{0}
 }
 func (m *FeatureSpec) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeatureSpec.Unmarshal(m, b)
@@ -157,7 +157,7 @@ func (m *DataStores) Reset()         { *m = DataStores{} }
 func (m *DataStores) String() string { return proto.CompactTextString(m) }
 func (*DataStores) ProtoMessage()    {}
 func (*DataStores) Descriptor() ([]byte, []int) {
-	return fileDescriptor_FeatureSpec_f61b2ffac65ee0e1, []int{1}
+	return fileDescriptor_FeatureSpec_0c79e2ccc174df52, []int{1}
 }
 func (m *DataStores) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DataStores.Unmarshal(m, b)
@@ -203,7 +203,7 @@ func (m *DataStore) Reset()         { *m = DataStore{} }
 func (m *DataStore) String() string { return proto.CompactTextString(m) }
 func (*DataStore) ProtoMessage()    {}
 func (*DataStore) Descriptor() ([]byte, []int) {
-	return fileDescriptor_FeatureSpec_f61b2ffac65ee0e1, []int{2}
+	return fileDescriptor_FeatureSpec_0c79e2ccc174df52, []int{2}
 }
 func (m *DataStore) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DataStore.Unmarshal(m, b)
@@ -246,39 +246,40 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("feast/specs/FeatureSpec.proto", fileDescriptor_FeatureSpec_f61b2ffac65ee0e1)
-}
-
-var fileDescriptor_FeatureSpec_f61b2ffac65ee0e1 = []byte{
-	// 477 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x53, 0xc1, 0x6e, 0xd3, 0x40,
-	0x10, 0x95, 0xed, 0x36, 0xc1, 0xe3, 0xaa, 0xaa, 0x56, 0xa8, 0x5d, 0x05, 0x2a, 0x59, 0x41, 0x48,
-	0xb9, 0xd4, 0x46, 0x01, 0x04, 0x54, 0x42, 0x95, 0x2a, 0x02, 0x47, 0x90, 0x8b, 0x72, 0xe0, 0xb6,
-	0x75, 0x06, 0xc7, 0xb4, 0xf1, 0x5a, 0xbb, 0xeb, 0x56, 0xfe, 0x11, 0x7e, 0x93, 0x5f, 0x40, 0x3b,
-	0x4e, 0xea, 0x8d, 0x1a, 0x4e, 0xdc, 0x66, 0xe7, 0xcd, 0x1b, 0xcf, 0x7b, 0xe3, 0x81, 0xd3, 0x9f,
-	0x28, 0xb4, 0x49, 0x75, 0x8d, 0xb9, 0x4e, 0x3f, 0xa3, 0x30, 0x8d, 0xc2, 0xab, 0x1a, 0xf3, 0xa4,
-	0x56, 0xd2, 0x48, 0x16, 0x11, 0x9c, 0x10, 0x3c, 0x7a, 0xee, 0xd6, 0xce, 0x2a, 0x53, 0x9a, 0xb6,
-	0x2f, 0x1d, 0x6d, 0x75, 0xba, 0x32, 0x52, 0x89, 0x02, 0x1f, 0xc3, 0xa6, 0xad, 0x51, 0xa7, 0x5f,
-	0x94, 0xa8, 0x9a, 0x5b, 0xa1, 0x4a, 0xd3, 0xae, 0xe1, 0x13, 0x17, 0x9e, 0x8b, 0xdb, 0x06, 0x3b,
-	0x60, 0xfc, 0x27, 0x80, 0xc8, 0x99, 0x8b, 0x1d, 0x82, 0x5f, 0x2e, 0xb8, 0x17, 0x7b, 0x93, 0x30,
-	0xf3, 0xcb, 0x05, 0x63, 0xb0, 0x57, 0x89, 0x15, 0x72, 0x9f, 0x32, 0x14, 0xb3, 0xa7, 0xb0, 0x2f,
-	0xef, 0x2b, 0x54, 0x3c, 0xa0, 0x64, 0xf7, 0x60, 0x31, 0x44, 0x0b, 0xd4, 0xb9, 0x2a, 0x6b, 0x53,
-	0xca, 0x8a, 0xef, 0x11, 0xe6, 0xa6, 0xd8, 0x11, 0x04, 0x8d, 0x2a, 0xf9, 0x3e, 0x21, 0x36, 0x64,
-	0x17, 0x10, 0x15, 0xfd, 0xac, 0x7c, 0x10, 0x7b, 0x93, 0xc3, 0xe9, 0x69, 0xd2, 0xb9, 0x42, 0xc3,
-	0x26, 0xae, 0x96, 0x59, 0xd5, 0xac, 0x32, 0x97, 0xc1, 0x3e, 0x40, 0x78, 0x67, 0xd5, 0x7c, 0x6f,
-	0x6b, 0xe4, 0x43, 0xa2, 0x3f, 0xdb, 0xa2, 0xcf, 0x37, 0x68, 0x47, 0xee, 0xab, 0xd9, 0x31, 0x0c,
-	0x90, 0x4c, 0xe6, 0x4f, 0x68, 0xa0, 0xf5, 0xcb, 0xaa, 0x2b, 0x94, 0x6c, 0x6a, 0x1e, 0x76, 0xea,
-	0xe8, 0x61, 0x7d, 0x30, 0xa2, 0xd0, 0x1c, 0xe2, 0xc0, 0xfa, 0x60, 0x63, 0x76, 0x01, 0x43, 0x49,
-	0xca, 0x34, 0x8f, 0xe2, 0x60, 0x12, 0x4d, 0x5f, 0x26, 0xce, 0x3e, 0x13, 0x77, 0xdd, 0x5f, 0xbb,
-	0xba, 0x59, 0x65, 0x54, 0x9b, 0x6d, 0x58, 0xec, 0x1d, 0xc0, 0x42, 0x18, 0x61, 0xb7, 0x89, 0x9a,
-	0x1f, 0xc4, 0xde, 0x24, 0x9a, 0x9e, 0x6c, 0xf5, 0xf8, 0xf4, 0x00, 0x67, 0x4e, 0xe9, 0xe8, 0x1c,
-	0x0e, 0xdc, 0x8e, 0xd6, 0xd9, 0x1b, 0x6c, 0xd7, 0x6b, 0xb3, 0xa1, 0x55, 0x41, 0x52, 0xd7, 0x8b,
-	0xeb, 0x1e, 0xe7, 0xfe, 0x7b, 0x6f, 0x6c, 0x00, 0xfa, 0xae, 0xec, 0x15, 0x0c, 0x35, 0xaa, 0xbb,
-	0xb2, 0x2a, 0x88, 0x1d, 0x4d, 0x8f, 0x77, 0x7f, 0x3f, 0xdb, 0x94, 0xb1, 0x37, 0x10, 0xde, 0x0b,
-	0x85, 0x4b, 0xd9, 0xe8, 0xae, 0xfb, 0xbf, 0x39, 0x7d, 0xe1, 0xf8, 0xb7, 0x07, 0xe1, 0x03, 0xf0,
-	0xe8, 0x2f, 0xfb, 0xd8, 0x3b, 0xe9, 0x93, 0x93, 0x2f, 0x76, 0x77, 0xdc, 0xed, 0xe3, 0xff, 0xd8,
-	0x71, 0x39, 0x07, 0xf7, 0x08, 0x2f, 0x8f, 0x9c, 0xad, 0x7d, 0xb3, 0x17, 0xf2, 0xe3, 0x6d, 0x51,
-	0x9a, 0x65, 0x73, 0x9d, 0xe4, 0x72, 0x95, 0x16, 0xf2, 0x17, 0xde, 0x18, 0xcc, 0x97, 0x69, 0x77,
-	0x4f, 0x85, 0x3c, 0xa3, 0xe0, 0x8c, 0x8e, 0x29, 0x75, 0x4e, 0xf4, 0x7a, 0x40, 0xa9, 0xd7, 0x7f,
-	0x03, 0x00, 0x00, 0xff, 0xff, 0x8e, 0xe3, 0xde, 0x3d, 0x02, 0x04, 0x00, 0x00,
+	proto.RegisterFile("feast/specs/FeatureSpec.proto", fileDescriptor_FeatureSpec_0c79e2ccc174df52)
+}
+
+var fileDescriptor_FeatureSpec_0c79e2ccc174df52 = []byte{
+	// 481 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x53, 0x51, 0x6b, 0xd4, 0x40,
+	0x10, 0x26, 0x49, 0xdb, 0x33, 0x93, 0x52, 0xca, 0x22, 0xed, 0x72, 0x5a, 0x08, 0x27, 0xc2, 0x3d,
+	0x25, 0x72, 0x0a, 0xea, 0x81, 0x14, 0x8a, 0xa7, 0x8f, 0x4a, 0x2a, 0x7d, 0xd0, 0xa7, 0x6d, 0x32,
+	0xe6, 0x62, 0x7b, 0xd9, 0xb0, 0xbb, 0x69, 0xc9, 0x1f, 0xf1, 0x6f, 0xfa, 0x17, 0x64, 0x27, 0x77,
+	0xcd, 0x1e, 0x3d, 0x9f, 0x7c, 0x9b, 0xd9, 0xef, 0x9b, 0xc9, 0x7c, 0xdf, 0x64, 0xe0, 0xec, 0x27,
+	0x0a, 0x6d, 0x52, 0xdd, 0x60, 0xae, 0xd3, 0x4f, 0x28, 0x4c, 0xab, 0xf0, 0xb2, 0xc1, 0x3c, 0x69,
+	0x94, 0x34, 0x92, 0x45, 0x04, 0x27, 0x04, 0x8f, 0x9f, 0xbb, 0xdc, 0x45, 0x6d, 0x2a, 0xd3, 0x0d,
+	0xd4, 0xf1, 0x56, 0xa7, 0x4b, 0x23, 0x95, 0x28, 0xf1, 0x31, 0x6c, 0xba, 0x06, 0x75, 0xfa, 0x59,
+	0x89, 0xba, 0xbd, 0x15, 0xaa, 0x32, 0xdd, 0x1a, 0x3e, 0x75, 0xe1, 0x2b, 0x71, 0xdb, 0x62, 0x0f,
+	0x4c, 0xfe, 0x04, 0x10, 0x39, 0x73, 0xb1, 0x23, 0xf0, 0xab, 0x82, 0x7b, 0xb1, 0x37, 0x0d, 0x33,
+	0xbf, 0x2a, 0x18, 0x83, 0xbd, 0x5a, 0xac, 0x90, 0xfb, 0xf4, 0x42, 0x31, 0x7b, 0x0a, 0xfb, 0xf2,
+	0xbe, 0x46, 0xc5, 0x03, 0x7a, 0xec, 0x13, 0x16, 0x43, 0x54, 0xa0, 0xce, 0x55, 0xd5, 0x98, 0x4a,
+	0xd6, 0x7c, 0x8f, 0x30, 0xf7, 0x89, 0x1d, 0x43, 0xd0, 0xaa, 0x8a, 0xef, 0x13, 0x62, 0x43, 0x76,
+	0x0e, 0x51, 0x39, 0xcc, 0xca, 0x0f, 0x62, 0x6f, 0x7a, 0x34, 0x3b, 0x4b, 0x7a, 0x57, 0x68, 0xd8,
+	0xc4, 0xd5, 0xb2, 0xa8, 0xdb, 0x55, 0xe6, 0x56, 0xb0, 0xf7, 0x10, 0xde, 0x59, 0x35, 0xdf, 0xba,
+	0x06, 0xf9, 0x88, 0xca, 0x9f, 0x6d, 0x95, 0x5f, 0x6d, 0xd0, 0xbe, 0x78, 0x60, 0xb3, 0x13, 0x38,
+	0x40, 0x32, 0x99, 0x3f, 0xa1, 0x81, 0xd6, 0x99, 0x55, 0x57, 0x2a, 0xd9, 0x36, 0x3c, 0xec, 0xd5,
+	0x51, 0x62, 0x7d, 0x30, 0xa2, 0xd4, 0x1c, 0xe2, 0xc0, 0xfa, 0x60, 0x63, 0x76, 0x0e, 0x23, 0x49,
+	0xca, 0x34, 0x8f, 0xe2, 0x60, 0x1a, 0xcd, 0x5e, 0x26, 0xce, 0x3e, 0x13, 0x77, 0xdd, 0x5f, 0x7a,
+	0xde, 0xa2, 0x36, 0xaa, 0xcb, 0x36, 0x55, 0xec, 0x2d, 0x40, 0x21, 0x8c, 0xb0, 0xdb, 0x44, 0xcd,
+	0x0f, 0x63, 0x6f, 0x1a, 0xcd, 0x4e, 0xb7, 0x7a, 0x7c, 0x7c, 0x80, 0x33, 0x87, 0x3a, 0x9e, 0xc3,
+	0xa1, 0xdb, 0xd1, 0x3a, 0x7b, 0x83, 0xdd, 0x7a, 0x6d, 0x36, 0xb4, 0x2a, 0x48, 0xea, 0x7a, 0x71,
+	0x7d, 0x32, 0xf7, 0xdf, 0x79, 0x13, 0x03, 0x30, 0x74, 0x65, 0xaf, 0x60, 0xa4, 0x51, 0xdd, 0x55,
+	0x75, 0x49, 0xd5, 0xd1, 0xec, 0x64, 0xf7, 0xf7, 0xb3, 0x0d, 0x8d, 0xbd, 0x81, 0xf0, 0x5e, 0x28,
+	0x5c, 0xca, 0x56, 0xf7, 0xdd, 0xff, 0x5d, 0x33, 0x10, 0x27, 0xbf, 0x3d, 0x08, 0x1f, 0x80, 0x47,
+	0x7f, 0xd9, 0x87, 0xc1, 0x49, 0x9f, 0x9c, 0x7c, 0xb1, 0xbb, 0xe3, 0x6e, 0x1f, 0xff, 0xc7, 0x8e,
+	0x8b, 0x1f, 0xe0, 0x1e, 0xe1, 0xc5, 0xb1, 0xb3, 0xb5, 0xaf, 0xf6, 0x42, 0xbe, 0xcf, 0xcb, 0xca,
+	0x2c, 0xdb, 0xeb, 0x24, 0x97, 0xab, 0xb4, 0x94, 0xbf, 0xf0, 0xc6, 0x60, 0xbe, 0x4c, 0xfb, 0x7b,
+	0xa2, 0x1b, 0xd2, 0x69, 0x89, 0x35, 0x2a, 0x61, 0xb0, 0x48, 0x4b, 0x99, 0x3a, 0x77, 0x7a, 0x7d,
+	0x40, 0x84, 0xd7, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x29, 0x17, 0xe6, 0xc4, 0x07, 0x04, 0x00,
+	0x00,
 }
diff --git a/go-feast-proto/feast/specs/ImportSpec.pb.go b/protos/generated/go/feast/specs/ImportSpec.pb.go
similarity index 75%
rename from go-feast-proto/feast/specs/ImportSpec.pb.go
rename to protos/generated/go/feast/specs/ImportSpec.pb.go
index 76af084a16..2091a802a7 100644
--- a/go-feast-proto/feast/specs/ImportSpec.pb.go
+++ b/protos/generated/go/feast/specs/ImportSpec.pb.go
@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: feast/specs/ImportSpec.proto
 
-package specs // import "github.com/gojektech/feast/go-feast-proto/feast/specs"
+package specs // import "github.com/gojektech/feast/protos/generated/go/feast/specs"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "github.com/gojektech/feast/go-feast-proto/feast/types"
+import _ "github.com/gojektech/feast/protos/generated/go/feast/types"
 import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -40,7 +40,7 @@ func (m *ImportSpec) Reset()         { *m = ImportSpec{} }
 func (m *ImportSpec) String() string { return proto.CompactTextString(m) }
 func (*ImportSpec) ProtoMessage()    {}
 func (*ImportSpec) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ImportSpec_83b1ff6d7ea8bc36, []int{0}
+	return fileDescriptor_ImportSpec_fd93b2dbd3e31b2b, []int{0}
 }
 func (m *ImportSpec) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportSpec.Unmarshal(m, b)
@@ -104,7 +104,7 @@ func (m *Schema) Reset()         { *m = Schema{} }
 func (m *Schema) String() string { return proto.CompactTextString(m) }
 func (*Schema) ProtoMessage()    {}
 func (*Schema) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ImportSpec_83b1ff6d7ea8bc36, []int{1}
+	return fileDescriptor_ImportSpec_fd93b2dbd3e31b2b, []int{1}
 }
 func (m *Schema) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Schema.Unmarshal(m, b)
@@ -257,7 +257,7 @@ func (m *Field) Reset()         { *m = Field{} }
 func (m *Field) String() string { return proto.CompactTextString(m) }
 func (*Field) ProtoMessage()    {}
 func (*Field) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ImportSpec_83b1ff6d7ea8bc36, []int{2}
+	return fileDescriptor_ImportSpec_fd93b2dbd3e31b2b, []int{2}
 }
 func (m *Field) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Field.Unmarshal(m, b)
@@ -299,35 +299,35 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("feast/specs/ImportSpec.proto", fileDescriptor_ImportSpec_83b1ff6d7ea8bc36)
-}
-
-var fileDescriptor_ImportSpec_83b1ff6d7ea8bc36 = []byte{
-	// 412 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x52, 0x4b, 0x6f, 0xd3, 0x40,
-	0x10, 0xae, 0x93, 0xc6, 0x25, 0x63, 0xd4, 0xa2, 0x05, 0x89, 0x95, 0x55, 0x09, 0x2b, 0x42, 0xc8,
-	0x2a, 0xea, 0xae, 0x54, 0x84, 0x04, 0x3d, 0x70, 0x08, 0x0f, 0x35, 0x27, 0x90, 0x0b, 0x1c, 0xb8,
-	0x39, 0xce, 0xd8, 0x31, 0xb5, 0xbd, 0x96, 0x77, 0x8d, 0xe4, 0xdf, 0xca, 0x99, 0xff, 0x81, 0x76,
-	0xd7, 0x71, 0x9c, 0xdc, 0xe6, 0xf1, 0xcd, 0xe3, 0x9b, 0x6f, 0xe0, 0x32, 0xc5, 0x58, 0x2a, 0x2e,
-	0x6b, 0x4c, 0x24, 0x5f, 0x95, 0xb5, 0x68, 0xd4, 0x7d, 0x8d, 0x09, 0xab, 0x1b, 0xa1, 0x04, 0xf1,
-	0x4c, 0x96, 0x99, 0xac, 0xff, 0xdc, 0x42, 0x55, 0x57, 0xa3, 0xe4, 0x3f, 0xe3, 0xa2, 0x45, 0x8b,
-	0xf2, 0x5f, 0x64, 0x42, 0x64, 0x05, 0x72, 0xe3, 0xad, 0xdb, 0x94, 0xab, 0xbc, 0x44, 0xa9, 0xe2,
-	0xb2, 0xb6, 0x80, 0xc5, 0x3f, 0x07, 0x60, 0xdf, 0x9b, 0x10, 0x38, 0xd5, 0x4d, 0xa8, 0x13, 0x38,
-	0xe1, 0x3c, 0x32, 0x36, 0xf9, 0x00, 0x67, 0xa2, 0x56, 0xb9, 0xa8, 0x24, 0x9d, 0x04, 0xd3, 0xd0,
-	0xbb, 0x79, 0xc9, 0x46, 0xb3, 0xd9, 0x68, 0xb3, 0xaf, 0x16, 0xf6, 0xb9, 0x52, 0x4d, 0x17, 0xed,
-	0x8a, 0x88, 0x0f, 0x8f, 0xb0, 0x52, 0xb9, 0xca, 0x51, 0xd2, 0x69, 0x30, 0x0d, 0xe7, 0xd1, 0xe0,
-	0x93, 0xd7, 0xe0, 0xca, 0x64, 0x8b, 0x65, 0x4c, 0x4f, 0x03, 0x27, 0xf4, 0x6e, 0x9e, 0x1e, 0xb4,
-	0xbe, 0x37, 0xa9, 0xa8, 0x87, 0xf8, 0xb7, 0xf0, 0x78, 0x3c, 0x81, 0x3c, 0x81, 0xe9, 0x03, 0x76,
-	0xfd, 0xae, 0xda, 0x24, 0xcf, 0x60, 0xf6, 0x47, 0xb3, 0xa7, 0x13, 0x13, 0xb3, 0xce, 0xed, 0xe4,
-	0x9d, 0xb3, 0xf8, 0xeb, 0x80, 0x6b, 0xdb, 0x91, 0x2b, 0x70, 0xd3, 0x1c, 0x8b, 0x8d, 0xa4, 0x8e,
-	0xa1, 0x43, 0x0e, 0x66, 0x7e, 0xd1, 0xa9, 0xa8, 0x47, 0x90, 0x2b, 0xb8, 0x18, 0x2e, 0xf6, 0x51,
-	0x14, 0x6d, 0x59, 0xd1, 0x99, 0x6e, 0x7d, 0x77, 0x12, 0x1d, 0x27, 0xc8, 0x27, 0x38, 0x1f, 0x42,
-	0x46, 0x03, 0xea, 0x1a, 0x4e, 0x3e, 0xb3, 0x22, 0xb0, 0x9d, 0x08, 0xec, 0xfb, 0x0e, 0x76, 0x77,
-	0x12, 0x1d, 0xd5, 0x90, 0x57, 0x70, 0x6e, 0xae, 0xd3, 0xad, 0x36, 0xfd, 0xc0, 0x33, 0xc3, 0xe5,
-	0x28, 0xba, 0xf4, 0x60, 0x3e, 0x54, 0x2e, 0xde, 0xc3, 0xcc, 0xec, 0xad, 0xf5, 0xab, 0xe2, 0x72,
-	0xd0, 0x4f, 0xdb, 0xe4, 0x12, 0xe6, 0x29, 0xc6, 0xaa, 0x6d, 0x70, 0xb5, 0xe9, 0x0f, 0xb3, 0x0f,
-	0x2c, 0x7f, 0xc0, 0xf8, 0x93, 0x96, 0x17, 0x7b, 0x39, 0xbf, 0xe9, 0x75, 0x7f, 0xbd, 0xcd, 0x72,
-	0xb5, 0x6d, 0xd7, 0x2c, 0x11, 0x25, 0xcf, 0xc4, 0x6f, 0x7c, 0x50, 0x98, 0x6c, 0xb9, 0xfd, 0xb7,
-	0x4c, 0x5c, 0x1b, 0xe3, 0xda, 0x30, 0xe3, 0xa3, 0x7f, 0x5d, 0xbb, 0x26, 0xf4, 0xe6, 0x7f, 0x00,
-	0x00, 0x00, 0xff, 0xff, 0xfa, 0x32, 0xa7, 0x49, 0xc5, 0x02, 0x00, 0x00,
+	proto.RegisterFile("feast/specs/ImportSpec.proto", fileDescriptor_ImportSpec_fd93b2dbd3e31b2b)
+}
+
+var fileDescriptor_ImportSpec_fd93b2dbd3e31b2b = []byte{
+	// 415 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x52, 0x4b, 0x6b, 0xdb, 0x40,
+	0x10, 0x8e, 0xec, 0x58, 0xa9, 0xc7, 0x25, 0x29, 0xdb, 0x42, 0x17, 0x11, 0xa8, 0x30, 0xa5, 0x88,
+	0x14, 0x76, 0x21, 0xbd, 0xb4, 0x3e, 0xf4, 0xe0, 0x3e, 0x88, 0x4f, 0x2d, 0x4a, 0xe9, 0x21, 0x37,
+	0x59, 0x1a, 0xc9, 0x6a, 0x24, 0xad, 0xd0, 0xae, 0x0a, 0xfa, 0xad, 0x3d, 0xf7, 0x7f, 0x84, 0xdd,
+	0x95, 0x65, 0xd9, 0xb7, 0x79, 0x7c, 0xf3, 0xf8, 0xe6, 0x1b, 0xb8, 0x4e, 0x31, 0x92, 0x8a, 0xcb,
+	0x1a, 0x63, 0xc9, 0x37, 0x65, 0x2d, 0x1a, 0x75, 0x5f, 0x63, 0xcc, 0xea, 0x46, 0x28, 0x41, 0x16,
+	0x26, 0xcb, 0x4c, 0xd6, 0x7b, 0x6d, 0xa1, 0xaa, 0xab, 0x51, 0xf2, 0xdf, 0x51, 0xd1, 0xa2, 0x45,
+	0x79, 0x6f, 0x32, 0x21, 0xb2, 0x02, 0xb9, 0xf1, 0xb6, 0x6d, 0xca, 0x55, 0x5e, 0xa2, 0x54, 0x51,
+	0x59, 0x5b, 0xc0, 0xf2, 0xbf, 0x03, 0x70, 0xe8, 0x4d, 0x08, 0x9c, 0xeb, 0x26, 0xd4, 0xf1, 0x9d,
+	0x60, 0x1e, 0x1a, 0x9b, 0x7c, 0x86, 0x0b, 0x51, 0xab, 0x5c, 0x54, 0x92, 0x4e, 0xfc, 0x69, 0xb0,
+	0xb8, 0x7d, 0xcb, 0x46, 0xb3, 0xd9, 0x68, 0xb3, 0x1f, 0x16, 0xf6, 0xad, 0x52, 0x4d, 0x17, 0xee,
+	0x8b, 0x88, 0x07, 0xcf, 0xb0, 0x52, 0xb9, 0xca, 0x51, 0xd2, 0xa9, 0x3f, 0x0d, 0xe6, 0xe1, 0xe0,
+	0x93, 0xf7, 0xe0, 0xca, 0x78, 0x87, 0x65, 0x44, 0xcf, 0x7d, 0x27, 0x58, 0xdc, 0xbe, 0x3c, 0x6a,
+	0x7d, 0x6f, 0x52, 0x61, 0x0f, 0xf1, 0x56, 0xf0, 0x7c, 0x3c, 0x81, 0xbc, 0x80, 0xe9, 0x23, 0x76,
+	0xfd, 0xae, 0xda, 0x24, 0xaf, 0x60, 0xf6, 0x57, 0xb3, 0xa7, 0x13, 0x13, 0xb3, 0xce, 0x6a, 0xf2,
+	0xd1, 0x59, 0xfe, 0x73, 0xc0, 0xb5, 0xed, 0xc8, 0x0d, 0xb8, 0x69, 0x8e, 0x45, 0x22, 0xa9, 0x63,
+	0xe8, 0x90, 0xa3, 0x99, 0xdf, 0x75, 0x2a, 0xec, 0x11, 0xe4, 0x06, 0xae, 0x86, 0x8b, 0x7d, 0x11,
+	0x45, 0x5b, 0x56, 0x74, 0xa6, 0x5b, 0xdf, 0x9d, 0x85, 0xa7, 0x09, 0xf2, 0x15, 0x2e, 0x87, 0x90,
+	0xd1, 0x80, 0xba, 0x86, 0x93, 0xc7, 0xac, 0x08, 0x6c, 0x2f, 0x02, 0xfb, 0xb5, 0x87, 0xdd, 0x9d,
+	0x85, 0x27, 0x35, 0xe4, 0x1d, 0x5c, 0x9a, 0xeb, 0x74, 0x9b, 0xa4, 0x1f, 0x78, 0x61, 0xb8, 0x9c,
+	0x44, 0xd7, 0x0b, 0x98, 0x0f, 0x95, 0xcb, 0x4f, 0x30, 0x33, 0x7b, 0x6b, 0xfd, 0xaa, 0xa8, 0x1c,
+	0xf4, 0xd3, 0x36, 0xb9, 0x86, 0x79, 0x8a, 0x91, 0x6a, 0x1b, 0xdc, 0x24, 0xfd, 0x61, 0x0e, 0x81,
+	0xf5, 0x03, 0x8c, 0x3f, 0x69, 0x7d, 0x75, 0x90, 0xf3, 0xa7, 0x5e, 0xf7, 0x61, 0x95, 0xe5, 0x6a,
+	0xd7, 0x6e, 0x59, 0x2c, 0x4a, 0x9e, 0x89, 0x3f, 0xf8, 0xa8, 0x30, 0xde, 0x71, 0xfb, 0x6f, 0x86,
+	0x90, 0xe4, 0x19, 0x56, 0xd8, 0x44, 0x0a, 0x13, 0x9e, 0x09, 0x3e, 0x7a, 0xda, 0xad, 0x6b, 0x00,
+	0x1f, 0x9e, 0x02, 0x00, 0x00, 0xff, 0xff, 0xac, 0x9a, 0xe6, 0x45, 0xca, 0x02, 0x00, 0x00,
 }
diff --git a/go-feast-proto/feast/specs/StorageSpec.pb.go b/protos/generated/go/feast/specs/StorageSpec.pb.go
similarity index 61%
rename from go-feast-proto/feast/specs/StorageSpec.pb.go
rename to protos/generated/go/feast/specs/StorageSpec.pb.go
index 9a2bf5faa4..7a228f09e5 100644
--- a/go-feast-proto/feast/specs/StorageSpec.pb.go
+++ b/protos/generated/go/feast/specs/StorageSpec.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: feast/specs/StorageSpec.proto
 
-package specs // import "github.com/gojektech/feast/go-feast-proto/feast/specs"
+package specs // import "github.com/gojektech/feast/protos/generated/go/feast/specs"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -36,7 +36,7 @@ func (m *StorageSpec) Reset()         { *m = StorageSpec{} }
 func (m *StorageSpec) String() string { return proto.CompactTextString(m) }
 func (*StorageSpec) ProtoMessage()    {}
 func (*StorageSpec) Descriptor() ([]byte, []int) {
-	return fileDescriptor_StorageSpec_e36eea24415a551a, []int{0}
+	return fileDescriptor_StorageSpec_52d655474f49b783, []int{0}
 }
 func (m *StorageSpec) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StorageSpec.Unmarshal(m, b)
@@ -83,23 +83,24 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("feast/specs/StorageSpec.proto", fileDescriptor_StorageSpec_e36eea24415a551a)
+	proto.RegisterFile("feast/specs/StorageSpec.proto", fileDescriptor_StorageSpec_52d655474f49b783)
 }
 
-var fileDescriptor_StorageSpec_e36eea24415a551a = []byte{
-	// 223 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4d, 0x4b, 0x4d, 0x2c,
-	0x2e, 0xd1, 0x2f, 0x2e, 0x48, 0x4d, 0x2e, 0xd6, 0x0f, 0x2e, 0xc9, 0x2f, 0x4a, 0x4c, 0x4f, 0x0d,
-	0x2e, 0x48, 0x4d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x06, 0x4b, 0xeb, 0x81, 0xa5,
-	0x95, 0xd6, 0x31, 0x72, 0x71, 0x23, 0x29, 0x11, 0xe2, 0xe3, 0x62, 0xca, 0x4c, 0x91, 0x60, 0x54,
-	0x60, 0xd4, 0xe0, 0x0c, 0x62, 0xca, 0x4c, 0x11, 0x12, 0xe2, 0x62, 0x29, 0xa9, 0x2c, 0x48, 0x95,
-	0x60, 0x02, 0x8b, 0x80, 0xd9, 0x42, 0xf6, 0x5c, 0xec, 0xf9, 0x05, 0x25, 0x99, 0xf9, 0x79, 0xc5,
-	0x12, 0xcc, 0x0a, 0xcc, 0x1a, 0xdc, 0x46, 0xaa, 0x7a, 0x48, 0x46, 0xea, 0x21, 0xdb, 0xe8, 0x0f,
-	0x51, 0xe7, 0x9a, 0x57, 0x52, 0x54, 0x19, 0x04, 0xd3, 0x25, 0x65, 0xc5, 0xc5, 0x83, 0x2c, 0x21,
-	0x24, 0xc0, 0xc5, 0x9c, 0x9d, 0x5a, 0x09, 0xb5, 0x15, 0xc4, 0x14, 0x12, 0xe1, 0x62, 0x2d, 0x4b,
-	0xcc, 0x29, 0x85, 0xd9, 0x0b, 0xe1, 0x58, 0x31, 0x59, 0x30, 0x3a, 0x85, 0x71, 0x21, 0xbb, 0xdf,
-	0x49, 0x00, 0xc9, 0xb6, 0x00, 0x90, 0xf7, 0xa2, 0x4c, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4,
-	0x92, 0xf3, 0x73, 0xf5, 0xd3, 0xf3, 0xb3, 0x52, 0xb3, 0x4b, 0x52, 0x93, 0x33, 0xf4, 0x21, 0x41,
-	0x92, 0x9e, 0xaf, 0x0b, 0x66, 0xe8, 0x82, 0x43, 0x42, 0x1f, 0x29, 0x9c, 0x92, 0xd8, 0xc0, 0x42,
-	0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf0, 0x9e, 0x30, 0x12, 0x3d, 0x01, 0x00, 0x00,
+var fileDescriptor_StorageSpec_52d655474f49b783 = []byte{
+	// 231 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x90, 0x4f, 0x4b, 0x03, 0x31,
+	0x10, 0xc5, 0xd9, 0x5d, 0xff, 0xe0, 0xac, 0x48, 0x09, 0x1e, 0x16, 0x41, 0x28, 0x82, 0xd0, 0x53,
+	0x02, 0x7a, 0x91, 0xbd, 0x08, 0x05, 0xcf, 0x4a, 0x7b, 0xd3, 0x53, 0x9a, 0x1d, 0xd3, 0x58, 0xdd,
+	0x09, 0xc9, 0x54, 0xd8, 0x2f, 0xe5, 0x67, 0x94, 0x66, 0xbb, 0x90, 0xdb, 0x4b, 0xde, 0x4b, 0x7e,
+	0x33, 0x0f, 0x6e, 0x3f, 0x51, 0x47, 0x56, 0xd1, 0xa3, 0x89, 0x6a, 0xcd, 0x14, 0xb4, 0xc5, 0xb5,
+	0x47, 0x23, 0x7d, 0x20, 0x26, 0x51, 0x27, 0x5b, 0x26, 0xfb, 0xee, 0xaf, 0x80, 0x3a, 0x8b, 0x88,
+	0x2b, 0x28, 0x5d, 0xd7, 0x14, 0xf3, 0x62, 0x71, 0xb1, 0x2a, 0x5d, 0x27, 0x04, 0x9c, 0xf0, 0xe0,
+	0xb1, 0x29, 0xd3, 0x4d, 0xd2, 0xe2, 0x19, 0xce, 0xc9, 0xb3, 0xa3, 0x3e, 0x36, 0xd5, 0xbc, 0x5a,
+	0xd4, 0x0f, 0xf7, 0x32, 0xfb, 0x52, 0xe6, 0xc4, 0xd7, 0x31, 0xf7, 0xd2, 0x73, 0x18, 0x56, 0xd3,
+	0xab, 0x9b, 0x16, 0x2e, 0x73, 0x43, 0xcc, 0xa0, 0xda, 0xe1, 0x70, 0xa4, 0x1e, 0xa4, 0xb8, 0x86,
+	0xd3, 0x5f, 0xfd, 0xbd, 0x9f, 0xb8, 0xe3, 0xa1, 0x2d, 0x9f, 0x8a, 0xe5, 0x07, 0xe4, 0xf3, 0x2f,
+	0x67, 0x19, 0xed, 0xed, 0xb0, 0xde, 0x7b, 0x6b, 0x1d, 0x6f, 0xf7, 0x1b, 0x69, 0xe8, 0x47, 0x59,
+	0xfa, 0xc2, 0x1d, 0xa3, 0xd9, 0xaa, 0xb1, 0x92, 0x54, 0x40, 0x54, 0x16, 0x7b, 0x0c, 0x9a, 0xb1,
+	0x53, 0x96, 0x54, 0x56, 0xd6, 0xe6, 0x2c, 0x05, 0x1e, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x01,
+	0xf4, 0x31, 0xaa, 0x42, 0x01, 0x00, 0x00,
 }
diff --git a/go-feast-proto/feast/storage/BigTable.pb.go b/protos/generated/go/feast/storage/BigTable.pb.go
similarity index 61%
rename from go-feast-proto/feast/storage/BigTable.pb.go
rename to protos/generated/go/feast/storage/BigTable.pb.go
index 537476ea68..fca84896ab 100644
--- a/go-feast-proto/feast/storage/BigTable.pb.go
+++ b/protos/generated/go/feast/storage/BigTable.pb.go
@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: feast/storage/BigTable.proto
 
-package storage // import "github.com/gojektech/feast/go-feast-proto/feast/storage"
+package storage // import "github.com/gojektech/feast/protos/generated/go/feast/storage"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "github.com/gojektech/feast/go-feast-proto/feast/types"
+import _ "github.com/gojektech/feast/protos/generated/go/feast/types"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -34,7 +34,7 @@ func (m *BigTableRowKey) Reset()         { *m = BigTableRowKey{} }
 func (m *BigTableRowKey) String() string { return proto.CompactTextString(m) }
 func (*BigTableRowKey) ProtoMessage()    {}
 func (*BigTableRowKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_BigTable_f2b8e30e0cf0e5c3, []int{0}
+	return fileDescriptor_BigTable_567faf2225013b15, []int{0}
 }
 func (m *BigTableRowKey) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BigTableRowKey.Unmarshal(m, b)
@@ -80,23 +80,23 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("feast/storage/BigTable.proto", fileDescriptor_BigTable_f2b8e30e0cf0e5c3)
+	proto.RegisterFile("feast/storage/BigTable.proto", fileDescriptor_BigTable_567faf2225013b15)
 }
 
-var fileDescriptor_BigTable_f2b8e30e0cf0e5c3 = []byte{
-	// 209 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x49, 0x4b, 0x4d, 0x2c,
-	0x2e, 0xd1, 0x2f, 0x2e, 0xc9, 0x2f, 0x4a, 0x4c, 0x4f, 0xd5, 0x77, 0xca, 0x4c, 0x0f, 0x49, 0x4c,
-	0xca, 0x49, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x05, 0xcb, 0xea, 0x41, 0x65, 0xa5,
-	0xc4, 0x21, 0x8a, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0xf5, 0xc3, 0x12, 0x73, 0x4a, 0xa1, 0xea, 0x94,
-	0xca, 0xb8, 0xf8, 0x60, 0x3a, 0x83, 0xf2, 0xcb, 0xbd, 0x53, 0x2b, 0x85, 0xe4, 0xb8, 0xb8, 0x8a,
-	0x33, 0x12, 0x0d, 0x03, 0x8a, 0x52, 0xd3, 0x32, 0x2b, 0x24, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83,
-	0x90, 0x44, 0x84, 0x64, 0xb8, 0x38, 0x53, 0xf3, 0x4a, 0x32, 0x4b, 0x2a, 0xbd, 0x53, 0x2b, 0x25,
-	0x98, 0xc0, 0xd2, 0x08, 0x01, 0x21, 0x35, 0x2e, 0xbe, 0xa2, 0xd4, 0xb2, 0xd4, 0xa2, 0xe2, 0xd4,
-	0x14, 0xdf, 0xcc, 0x9c, 0x9c, 0xcc, 0x62, 0x09, 0x66, 0xb0, 0x12, 0x34, 0x51, 0xa7, 0x70, 0x2e,
-	0x54, 0x17, 0x3a, 0xf1, 0xc2, 0x9c, 0x11, 0x00, 0x72, 0x57, 0x94, 0x79, 0x7a, 0x66, 0x49, 0x46,
-	0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x7a, 0x7e, 0x56, 0x6a, 0x76, 0x49, 0x6a, 0x72, 0x86,
-	0x3e, 0xc4, 0x17, 0xe9, 0xf9, 0xba, 0x60, 0x86, 0x2e, 0xd8, 0x0b, 0xfa, 0x28, 0xe1, 0x90, 0xc4,
-	0x06, 0x16, 0x34, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x16, 0x21, 0xf7, 0x1f, 0x01, 0x00,
-	0x00,
+var fileDescriptor_BigTable_567faf2225013b15 = []byte{
+	// 214 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0xb1, 0x4b, 0xc4, 0x30,
+	0x14, 0x87, 0x39, 0x05, 0xe1, 0x02, 0x77, 0x43, 0x16, 0x8b, 0x1c, 0x22, 0x0e, 0xe2, 0xd4, 0x87,
+	0xb8, 0x3a, 0x75, 0x3d, 0x84, 0xe3, 0x10, 0x07, 0x71, 0x49, 0xef, 0x7e, 0x4d, 0xa3, 0xb1, 0x29,
+	0xc9, 0x6b, 0x35, 0xff, 0xbd, 0x98, 0xb6, 0x68, 0x5d, 0x7f, 0xdf, 0x17, 0xf8, 0xf2, 0xc4, 0xa6,
+	0x82, 0x0a, 0x4c, 0x81, 0x9d, 0x57, 0x1a, 0x54, 0x18, 0xfd, 0xa4, 0x4a, 0x8b, 0xbc, 0xf5, 0x8e,
+	0x9d, 0x5c, 0x25, 0x9a, 0x8f, 0xf4, 0xe2, 0x7c, 0x90, 0x39, 0xb6, 0x08, 0xf4, 0xac, 0x6c, 0x37,
+	0x7a, 0xd7, 0xbd, 0x58, 0x4f, 0x2f, 0xf7, 0xee, 0x73, 0x8b, 0x28, 0x2f, 0x85, 0x08, 0xb5, 0xba,
+	0xdb, 0x79, 0x54, 0xe6, 0x2b, 0x5b, 0x5c, 0x2d, 0x6e, 0x97, 0xfb, 0x3f, 0x8b, 0xdc, 0x88, 0x25,
+	0x1a, 0x36, 0x1c, 0xb7, 0x88, 0xd9, 0x49, 0xc2, 0xbf, 0x83, 0xbc, 0x11, 0x6b, 0x8f, 0x1e, 0x3e,
+	0xe0, 0xf8, 0x68, 0xac, 0x35, 0x21, 0x3b, 0x4d, 0xca, 0xbf, 0xb5, 0x78, 0x15, 0xf3, 0xc2, 0x62,
+	0x35, 0x65, 0xec, 0x7e, 0xba, 0x5e, 0x1e, 0xb4, 0xe1, 0xba, 0x2b, 0xf3, 0x83, 0xfb, 0x20, 0xed,
+	0xde, 0xf0, 0xce, 0x38, 0xd4, 0x34, 0xfc, 0x22, 0x95, 0x07, 0xd2, 0x68, 0xe0, 0x15, 0xe3, 0x48,
+	0xda, 0xd1, 0xec, 0x18, 0xe5, 0x59, 0x52, 0xee, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x35, 0x57,
+	0xc5, 0xb7, 0x24, 0x01, 0x00, 0x00,
 }
diff --git a/go-feast-proto/feast/storage/Redis.pb.go b/protos/generated/go/feast/storage/Redis.pb.go
similarity index 72%
rename from go-feast-proto/feast/storage/Redis.pb.go
rename to protos/generated/go/feast/storage/Redis.pb.go
index 565e2dfaf5..f9cadec282 100644
--- a/go-feast-proto/feast/storage/Redis.pb.go
+++ b/protos/generated/go/feast/storage/Redis.pb.go
@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: feast/storage/Redis.proto
 
-package storage // import "github.com/gojektech/feast/go-feast-proto/feast/storage"
+package storage // import "github.com/gojektech/feast/protos/generated/go/feast/storage"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import types "github.com/gojektech/feast/go-feast-proto/feast/types"
+import types "github.com/gojektech/feast/protos/generated/go/feast/types"
 import timestamp "github.com/golang/protobuf/ptypes/timestamp"
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -43,7 +43,7 @@ func (m *RedisBucketKey) Reset()         { *m = RedisBucketKey{} }
 func (m *RedisBucketKey) String() string { return proto.CompactTextString(m) }
 func (*RedisBucketKey) ProtoMessage()    {}
 func (*RedisBucketKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Redis_ad00784f17632936, []int{0}
+	return fileDescriptor_Redis_8688016ae81de3b8, []int{0}
 }
 func (m *RedisBucketKey) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RedisBucketKey.Unmarshal(m, b)
@@ -99,7 +99,7 @@ func (m *RedisBucketValue) Reset()         { *m = RedisBucketValue{} }
 func (m *RedisBucketValue) String() string { return proto.CompactTextString(m) }
 func (*RedisBucketValue) ProtoMessage()    {}
 func (*RedisBucketValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Redis_ad00784f17632936, []int{1}
+	return fileDescriptor_Redis_8688016ae81de3b8, []int{1}
 }
 func (m *RedisBucketValue) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RedisBucketValue.Unmarshal(m, b)
@@ -147,7 +147,7 @@ func (m *RedisBucketValueList) Reset()         { *m = RedisBucketValueList{} }
 func (m *RedisBucketValueList) String() string { return proto.CompactTextString(m) }
 func (*RedisBucketValueList) ProtoMessage()    {}
 func (*RedisBucketValueList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Redis_ad00784f17632936, []int{2}
+	return fileDescriptor_Redis_8688016ae81de3b8, []int{2}
 }
 func (m *RedisBucketValueList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RedisBucketValueList.Unmarshal(m, b)
@@ -180,29 +180,29 @@ func init() {
 	proto.RegisterType((*RedisBucketValueList)(nil), "feast.storage.RedisBucketValueList")
 }
 
-func init() { proto.RegisterFile("feast/storage/Redis.proto", fileDescriptor_Redis_ad00784f17632936) }
-
-var fileDescriptor_Redis_ad00784f17632936 = []byte{
-	// 323 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0x4f, 0x4f, 0xf2, 0x40,
-	0x10, 0xc6, 0xd3, 0x97, 0x57, 0x22, 0x43, 0x24, 0x66, 0x35, 0xb1, 0x36, 0x26, 0x34, 0x9c, 0x7a,
-	0x61, 0x57, 0xf1, 0xc0, 0xbd, 0x37, 0x82, 0x89, 0xa4, 0x12, 0x0f, 0xde, 0x5a, 0x98, 0x96, 0xca,
-	0x9f, 0x25, 0xdd, 0x29, 0xb1, 0x89, 0x07, 0x3f, 0xba, 0x61, 0x16, 0x50, 0x88, 0xb7, 0xdd, 0x79,
-	0x7e, 0x33, 0xf3, 0xcc, 0x0c, 0xdc, 0xa6, 0x18, 0x1b, 0x52, 0x86, 0x74, 0x11, 0x67, 0xa8, 0x22,
-	0x9c, 0xe6, 0x46, 0xae, 0x0b, 0x4d, 0x5a, 0x5c, 0xb0, 0x24, 0x77, 0x92, 0xd7, 0xce, 0xb4, 0xce,
-	0x16, 0xa8, 0x58, 0x4c, 0xca, 0x54, 0x51, 0xbe, 0x44, 0x43, 0xf1, 0x72, 0x6d, 0x79, 0xef, 0xc6,
-	0x96, 0xa2, 0x6a, 0x8d, 0x46, 0xbd, 0xc6, 0x8b, 0x12, 0xad, 0xd0, 0xf9, 0x84, 0x16, 0xd7, 0x0d,
-	0xcb, 0xc9, 0x1c, 0x69, 0x88, 0x95, 0xb8, 0x83, 0x06, 0xae, 0x28, 0xa7, 0x6a, 0x88, 0x95, 0xfb,
-	0xcf, 0x77, 0x82, 0x46, 0xf4, 0x13, 0x10, 0xf7, 0x70, 0x95, 0x62, 0x4c, 0x65, 0x81, 0x83, 0xe9,
-	0xcb, 0x2c, 0x7e, 0x18, 0x15, 0x98, 0xe6, 0x1f, 0x6e, 0x8d, 0xb9, 0xbf, 0x24, 0xe1, 0xc1, 0x79,
-	0xc2, 0xc5, 0x07, 0x53, 0xf7, 0xbf, 0xef, 0x04, 0xf5, 0xe8, 0xf0, 0xef, 0x7c, 0x39, 0x70, 0xf9,
-	0xab, 0x3d, 0x1b, 0x13, 0x01, 0x9c, 0x6d, 0xb6, 0x0f, 0xd7, 0xf1, 0x9d, 0xa0, 0xd9, 0x13, 0xd2,
-	0xce, 0xca, 0xde, 0x25, 0x23, 0x91, 0x05, 0x44, 0x08, 0x2d, 0xdc, 0xe0, 0x8a, 0xc6, 0xfb, 0x69,
-	0xd9, 0x6f, 0xb3, 0xe7, 0x49, 0xbb, 0x0f, 0xb9, 0xdf, 0x87, 0x3c, 0x10, 0xd1, 0x49, 0x46, 0xe7,
-	0x19, 0xae, 0x4f, 0x1d, 0x3c, 0xe5, 0x86, 0x44, 0x1f, 0xea, 0xdc, 0xc4, 0xb8, 0x8e, 0x5f, 0x0b,
-	0x9a, 0xbd, 0xb6, 0x3c, 0x5a, 0xb9, 0x3c, 0x4d, 0x8a, 0x76, 0x78, 0x38, 0x86, 0xe3, 0xe3, 0x84,
-	0xc0, 0xe8, 0x68, 0x6b, 0xe5, 0xad, 0x9f, 0xe5, 0x34, 0x2b, 0x13, 0x39, 0xd1, 0x4b, 0x95, 0xe9,
-	0x77, 0x9c, 0x13, 0x4e, 0x66, 0xca, 0x1e, 0x27, 0xd3, 0x5d, 0x7e, 0x74, 0xd9, 0xb5, 0x3a, 0x3a,
-	0x7e, 0x52, 0xe7, 0xe0, 0xe3, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfd, 0x9d, 0x61, 0xa8, 0x14,
-	0x02, 0x00, 0x00,
+func init() { proto.RegisterFile("feast/storage/Redis.proto", fileDescriptor_Redis_8688016ae81de3b8) }
+
+var fileDescriptor_Redis_8688016ae81de3b8 = []byte{
+	// 329 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0x4f, 0x4b, 0xf3, 0x40,
+	0x10, 0xc6, 0xc9, 0xdb, 0xd7, 0x62, 0xb7, 0x58, 0x64, 0x15, 0x8c, 0x41, 0x68, 0xe8, 0x29, 0xa7,
+	0x5d, 0xad, 0x07, 0x2f, 0x9e, 0x72, 0x2b, 0x15, 0x2c, 0x51, 0x04, 0xbd, 0x6d, 0x9a, 0xc9, 0x36,
+	0xf6, 0xcf, 0x96, 0xec, 0xa4, 0x18, 0xf0, 0xe0, 0x47, 0x97, 0xce, 0xb6, 0xd5, 0x16, 0x6f, 0xbb,
+	0xfb, 0xfc, 0x66, 0xe6, 0x99, 0x99, 0x65, 0x97, 0x39, 0x28, 0x8b, 0xd2, 0xa2, 0x29, 0x95, 0x06,
+	0x99, 0x40, 0x56, 0x58, 0xb1, 0x2c, 0x0d, 0x1a, 0x7e, 0x42, 0x92, 0xd8, 0x48, 0x41, 0x57, 0x1b,
+	0xa3, 0x67, 0x20, 0x49, 0x4c, 0xab, 0x5c, 0x62, 0x31, 0x07, 0x8b, 0x6a, 0xbe, 0x74, 0x7c, 0x70,
+	0xe1, 0x52, 0x61, 0xbd, 0x04, 0x2b, 0x5f, 0xd4, 0xac, 0x02, 0x27, 0xf4, 0x3e, 0x59, 0x87, 0xf2,
+	0xc6, 0xd5, 0x78, 0x0a, 0x38, 0x84, 0x9a, 0x5f, 0xb1, 0x16, 0x2c, 0xb0, 0xc0, 0x7a, 0x08, 0xb5,
+	0xff, 0x2f, 0xf4, 0xa2, 0x56, 0xf2, 0xf3, 0xc0, 0xaf, 0xd9, 0x59, 0x0e, 0x0a, 0xab, 0x12, 0x06,
+	0xd9, 0xd3, 0x44, 0xdd, 0x8c, 0x4a, 0xc8, 0x8b, 0x0f, 0xbf, 0x41, 0xdc, 0x5f, 0x12, 0x0f, 0xd8,
+	0x71, 0x4a, 0xc9, 0x07, 0x99, 0xff, 0x3f, 0xf4, 0xa2, 0x66, 0xb2, 0xbb, 0xf7, 0xbe, 0x3c, 0x76,
+	0xfa, 0xab, 0x3c, 0x19, 0xe3, 0x11, 0x3b, 0x5a, 0xad, 0x0f, 0xbe, 0x17, 0x7a, 0x51, 0xbb, 0xcf,
+	0x85, 0xeb, 0x95, 0xbc, 0x0b, 0x42, 0x12, 0x07, 0xf0, 0x98, 0x75, 0x60, 0x05, 0x0b, 0x7c, 0xde,
+	0x76, 0x4b, 0x7e, 0xdb, 0xfd, 0x40, 0xb8, 0x79, 0x88, 0xed, 0x3c, 0xc4, 0x8e, 0x48, 0x0e, 0x22,
+	0x7a, 0x8f, 0xec, 0xfc, 0xd0, 0xc1, 0x43, 0x61, 0x91, 0xdf, 0xb1, 0x26, 0x15, 0xb1, 0xbe, 0x17,
+	0x36, 0xa2, 0x76, 0xbf, 0x2b, 0xf6, 0x46, 0x2e, 0x0e, 0x83, 0x92, 0x0d, 0x1e, 0xbf, 0xb2, 0xfd,
+	0xe5, 0xc4, 0x8c, 0xd0, 0xd1, 0xda, 0xca, 0xdb, 0xbd, 0x2e, 0x70, 0x52, 0xa5, 0x62, 0x6c, 0xe6,
+	0x52, 0x9b, 0x77, 0x98, 0x22, 0x8c, 0x27, 0xd2, 0x2d, 0x87, 0xcc, 0x5a, 0xa9, 0x61, 0x01, 0xa5,
+	0x42, 0xc8, 0xa4, 0x36, 0x72, 0xef, 0x07, 0xa4, 0x4d, 0x42, 0x6e, 0xbf, 0x03, 0x00, 0x00, 0xff,
+	0xff, 0xa3, 0xb9, 0x8a, 0xba, 0x19, 0x02, 0x00, 0x00,
 }
diff --git a/go-feast-proto/feast/types/Feature.pb.go b/protos/generated/go/feast/types/Feature.pb.go
similarity index 60%
rename from go-feast-proto/feast/types/Feature.pb.go
rename to protos/generated/go/feast/types/Feature.pb.go
index 0b67134c23..64da3ef100 100644
--- a/go-feast-proto/feast/types/Feature.pb.go
+++ b/protos/generated/go/feast/types/Feature.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: feast/types/Feature.proto
 
-package types // import "github.com/gojektech/feast/go-feast-proto/feast/types"
+package types // import "github.com/gojektech/feast/protos/generated/go/feast/types"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -31,7 +31,7 @@ func (m *Feature) Reset()         { *m = Feature{} }
 func (m *Feature) String() string { return proto.CompactTextString(m) }
 func (*Feature) ProtoMessage()    {}
 func (*Feature) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Feature_274e590d653fbf23, []int{0}
+	return fileDescriptor_Feature_46f232259443b73b, []int{0}
 }
 func (m *Feature) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Feature.Unmarshal(m, b)
@@ -69,21 +69,21 @@ func init() {
 	proto.RegisterType((*Feature)(nil), "feast.types.Feature")
 }
 
-func init() { proto.RegisterFile("feast/types/Feature.proto", fileDescriptor_Feature_274e590d653fbf23) }
+func init() { proto.RegisterFile("feast/types/Feature.proto", fileDescriptor_Feature_46f232259443b73b) }
 
-var fileDescriptor_Feature_274e590d653fbf23 = []byte{
-	// 195 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x8e, 0xb1, 0xce, 0x82, 0x30,
-	0x14, 0x85, 0x03, 0xc9, 0xff, 0x1b, 0x8b, 0x71, 0xe8, 0x22, 0xb2, 0x48, 0x9c, 0x58, 0x68, 0x13,
-	0x8d, 0x2f, 0x80, 0x89, 0xb3, 0x61, 0x70, 0x70, 0x2b, 0x70, 0x29, 0x55, 0x48, 0x09, 0xdc, 0x9a,
-	0xf8, 0xf6, 0x86, 0xc2, 0xd0, 0xed, 0xe6, 0x9e, 0x93, 0xef, 0x7c, 0x64, 0x5f, 0x83, 0x18, 0x91,
-	0xe3, 0xb7, 0x87, 0x91, 0xdf, 0x40, 0xa0, 0x19, 0x80, 0xf5, 0x83, 0x46, 0x4d, 0x03, 0x1b, 0x31,
-	0x1b, 0x45, 0x07, 0xa9, 0xb5, 0x6c, 0x81, 0xdb, 0xa8, 0x30, 0x35, 0x47, 0xd5, 0xc1, 0x88, 0xa2,
-	0xeb, 0xe7, 0x76, 0xb4, 0x73, 0x41, 0x0f, 0xd1, 0x9a, 0x05, 0x73, 0xbc, 0x92, 0xd5, 0xc2, 0xa5,
-	0x5b, 0xe2, 0xab, 0x2a, 0xf4, 0x62, 0x2f, 0x59, 0xe7, 0xbe, 0xaa, 0x68, 0x42, 0xfe, 0x3e, 0x53,
-	0x33, 0xf4, 0x63, 0x2f, 0x09, 0x4e, 0x94, 0x39, 0x8b, 0xcc, 0x32, 0xf2, 0xb9, 0x90, 0xe5, 0xc4,
-	0xb5, 0xc9, 0x36, 0x0b, 0xf1, 0x3e, 0x2d, 0x3c, 0x2f, 0x52, 0x61, 0x63, 0x0a, 0x56, 0xea, 0x8e,
-	0x4b, 0xfd, 0x82, 0x37, 0x42, 0xd9, 0xf0, 0xd9, 0x47, 0xea, 0xd4, 0x1e, 0xa9, 0x95, 0xe1, 0x8e,
-	0x64, 0xf1, 0x6f, 0x5f, 0xe7, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x49, 0xdb, 0x6c, 0x03,
-	0x01, 0x00, 0x00,
+var fileDescriptor_Feature_46f232259443b73b = []byte{
+	// 199 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x8e, 0x31, 0x6f, 0x83, 0x30,
+	0x10, 0x46, 0x05, 0x52, 0x5b, 0xd5, 0x54, 0x1d, 0xbc, 0x94, 0xb2, 0x14, 0x75, 0x62, 0xf2, 0x49,
+	0xed, 0xd6, 0x91, 0x4a, 0x99, 0x23, 0x86, 0x44, 0xca, 0x66, 0xe0, 0x30, 0x4e, 0x20, 0x46, 0xf8,
+	0x1c, 0x29, 0xff, 0x3e, 0xc2, 0x30, 0x78, 0xfe, 0x9e, 0xde, 0xf7, 0xd8, 0x67, 0x87, 0xd2, 0x12,
+	0xd0, 0x7d, 0x42, 0x0b, 0x3b, 0x94, 0xe4, 0x66, 0x14, 0xd3, 0x6c, 0xc8, 0xf0, 0xc4, 0x4f, 0xc2,
+	0x4f, 0xd9, 0x97, 0x32, 0x46, 0x0d, 0x08, 0x7e, 0xaa, 0x5d, 0x07, 0xa4, 0x47, 0xb4, 0x24, 0xc7,
+	0x69, 0xa5, 0xb3, 0x8f, 0x50, 0x74, 0x90, 0x83, 0xdb, 0x34, 0xdf, 0xff, 0xec, 0x65, 0xf3, 0xf2,
+	0x77, 0x16, 0xeb, 0x36, 0x8d, 0xf2, 0xa8, 0x78, 0xad, 0x62, 0xdd, 0xf2, 0x82, 0x3d, 0xdd, 0x16,
+	0x32, 0x8d, 0xf3, 0xa8, 0x48, 0x7e, 0xb8, 0x08, 0x1e, 0x85, 0x77, 0x54, 0x2b, 0x50, 0x1e, 0x59,
+	0x58, 0x53, 0xbe, 0x6d, 0xc6, 0xfd, 0xf2, 0x70, 0xfa, 0x53, 0x9a, 0x7a, 0x57, 0x8b, 0xc6, 0x8c,
+	0xa0, 0xcc, 0x19, 0x2f, 0x84, 0x4d, 0x0f, 0x6b, 0x8f, 0x6f, 0xb0, 0xa0, 0xf0, 0x8a, 0xb3, 0x24,
+	0x6c, 0x41, 0x19, 0x08, 0x4a, 0xeb, 0x67, 0x0f, 0xfc, 0x3e, 0x02, 0x00, 0x00, 0xff, 0xff, 0x4d,
+	0x62, 0x00, 0x01, 0x08, 0x01, 0x00, 0x00,
 }
diff --git a/go-feast-proto/feast/types/FeatureRow.pb.go b/protos/generated/go/feast/types/FeatureRow.pb.go
similarity index 60%
rename from go-feast-proto/feast/types/FeatureRow.pb.go
rename to protos/generated/go/feast/types/FeatureRow.pb.go
index e77e60c6aa..14dd6201da 100644
--- a/go-feast-proto/feast/types/FeatureRow.pb.go
+++ b/protos/generated/go/feast/types/FeatureRow.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: feast/types/FeatureRow.proto
 
-package types // import "github.com/gojektech/feast/go-feast-proto/feast/types"
+package types // import "github.com/gojektech/feast/protos/generated/go/feast/types"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -34,7 +34,7 @@ func (m *FeatureRow) Reset()         { *m = FeatureRow{} }
 func (m *FeatureRow) String() string { return proto.CompactTextString(m) }
 func (*FeatureRow) ProtoMessage()    {}
 func (*FeatureRow) Descriptor() ([]byte, []int) {
-	return fileDescriptor_FeatureRow_6b06ea938f8ece4f, []int{0}
+	return fileDescriptor_FeatureRow_432cfd1f57934bfa, []int{0}
 }
 func (m *FeatureRow) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeatureRow.Unmarshal(m, b)
@@ -94,28 +94,28 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("feast/types/FeatureRow.proto", fileDescriptor_FeatureRow_6b06ea938f8ece4f)
+	proto.RegisterFile("feast/types/FeatureRow.proto", fileDescriptor_FeatureRow_432cfd1f57934bfa)
 }
 
-var fileDescriptor_FeatureRow_6b06ea938f8ece4f = []byte{
-	// 294 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0xc1, 0x4b, 0xf4, 0x30,
-	0x10, 0xc5, 0xe9, 0xee, 0xf7, 0x89, 0x9b, 0xc2, 0x0a, 0x41, 0xb0, 0x2e, 0xbb, 0x5a, 0x3c, 0xf5,
-	0xb2, 0x89, 0x54, 0x3c, 0x0b, 0x05, 0xf5, 0x20, 0x88, 0x14, 0xf5, 0xe0, 0x2d, 0x5d, 0xa6, 0xd9,
-	0x6a, 0xdb, 0x94, 0x76, 0xa2, 0xf4, 0xe8, 0x7f, 0x2e, 0xa6, 0xed, 0x36, 0x8a, 0xb7, 0x30, 0xbf,
-	0x37, 0xc3, 0x7b, 0x2f, 0x64, 0x99, 0x82, 0x68, 0x90, 0x63, 0x5b, 0x41, 0xc3, 0x6f, 0x40, 0xa0,
-	0xae, 0x21, 0x56, 0x1f, 0xac, 0xaa, 0x15, 0x2a, 0xea, 0x1a, 0xca, 0x0c, 0x5d, 0x9c, 0x4a, 0xa5,
-	0x64, 0x0e, 0xdc, 0xa0, 0x44, 0xa7, 0x1c, 0xb3, 0x02, 0x1a, 0x14, 0x45, 0xd5, 0xa9, 0x17, 0xc7,
-	0x7f, 0xdc, 0xea, 0xd1, 0xca, 0x46, 0xb7, 0xb5, 0x28, 0x75, 0x2e, 0xea, 0x0c, 0xdb, 0x1e, 0x1f,
-	0xd9, 0xf8, 0x59, 0xe4, 0xba, 0xdf, 0x3b, 0xfb, 0x9c, 0x10, 0x32, 0xba, 0xa2, 0x4b, 0x32, 0x83,
-	0x12, 0x33, 0x6c, 0xef, 0xa0, 0xf5, 0x1c, 0xdf, 0x09, 0x66, 0xf1, 0x38, 0xa0, 0xe7, 0x64, 0x3f,
-	0xed, 0xb4, 0x8d, 0x37, 0xf1, 0xa7, 0x81, 0x1b, 0x1e, 0x32, 0x2b, 0x00, 0x1b, 0x0e, 0xed, 0x54,
-	0x34, 0x22, 0x73, 0x78, 0x87, 0x12, 0x1f, 0x87, 0x24, 0xde, 0xd4, 0x77, 0x02, 0x37, 0x5c, 0xb0,
-	0x2e, 0x2b, 0x1b, 0xb2, 0xb2, 0x9d, 0x22, 0xfe, 0xb5, 0x41, 0x4f, 0x08, 0xe9, 0x2c, 0xdc, 0x8b,
-	0x02, 0xbc, 0x7f, 0xc6, 0x94, 0x35, 0xa1, 0x57, 0xc4, 0x95, 0x63, 0x60, 0xef, 0xbf, 0xef, 0x04,
-	0xf3, 0x70, 0xf5, 0xc3, 0x98, 0x5d, 0xc8, 0x75, 0xa9, 0x8b, 0xd8, 0xde, 0x88, 0x9e, 0x88, 0xfd,
-	0x0d, 0xd1, 0xc1, 0xd8, 0xc7, 0xc3, 0xb7, 0xbb, 0x97, 0x4b, 0x99, 0xe1, 0x56, 0x27, 0x6c, 0xa3,
-	0x0a, 0x2e, 0xd5, 0x2b, 0xbc, 0x21, 0x6c, 0xb6, 0xbc, 0x6b, 0x54, 0xaa, 0xb5, 0x79, 0xac, 0x4d,
-	0x10, 0x6e, 0xd5, 0x9c, 0xec, 0x99, 0xd1, 0xc5, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x18,
-	0xb6, 0xac, 0x02, 0x02, 0x00, 0x00,
+var fileDescriptor_FeatureRow_432cfd1f57934bfa = []byte{
+	// 296 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0xc1, 0x4b, 0xc3, 0x30,
+	0x18, 0xc5, 0xe9, 0xa6, 0xe2, 0x52, 0x98, 0x10, 0x04, 0xeb, 0xd8, 0xb4, 0x78, 0xea, 0x29, 0x91,
+	0x7a, 0xf3, 0x22, 0x14, 0xd4, 0x83, 0x20, 0x52, 0xc4, 0xc3, 0x6e, 0xe9, 0xfc, 0x9a, 0x55, 0xdb,
+	0xa6, 0xb4, 0x5f, 0x94, 0x1e, 0xfd, 0xcf, 0xc5, 0xb4, 0x5d, 0xa3, 0x78, 0xcd, 0xef, 0xbd, 0x8f,
+	0xf7, 0x5e, 0xc8, 0x32, 0x05, 0xd1, 0x20, 0xc7, 0xb6, 0x82, 0x86, 0xdf, 0x81, 0x40, 0x5d, 0x43,
+	0xac, 0x3e, 0x59, 0x55, 0x2b, 0x54, 0xd4, 0x35, 0x94, 0x19, 0xba, 0x38, 0x97, 0x4a, 0xc9, 0x1c,
+	0xb8, 0x41, 0x89, 0x4e, 0x39, 0x66, 0x05, 0x34, 0x28, 0x8a, 0xaa, 0x53, 0x2f, 0x4e, 0xff, 0xb9,
+	0xd5, 0xa3, 0x95, 0x8d, 0xee, 0x6b, 0x51, 0xea, 0x5c, 0xd4, 0x19, 0xb6, 0x3d, 0x3e, 0xb1, 0xf1,
+	0x8b, 0xc8, 0x75, 0xef, 0xbb, 0xf8, 0x9a, 0x10, 0x32, 0xa6, 0xa2, 0x4b, 0x32, 0x83, 0x12, 0x33,
+	0x6c, 0x1f, 0xa0, 0xf5, 0x1c, 0xdf, 0x09, 0x66, 0xf1, 0xf8, 0x40, 0x2f, 0xc9, 0x61, 0xda, 0x69,
+	0x1b, 0x6f, 0xe2, 0x4f, 0x03, 0x37, 0x3c, 0x66, 0x56, 0x01, 0x36, 0x1c, 0xda, 0xa9, 0x68, 0x44,
+	0xe6, 0xf0, 0x01, 0x25, 0x3e, 0x0f, 0x4d, 0xbc, 0xa9, 0xef, 0x04, 0x6e, 0xb8, 0x60, 0x5d, 0x57,
+	0x36, 0x74, 0x65, 0x3b, 0x45, 0xfc, 0xc7, 0x41, 0xcf, 0x08, 0xe9, 0x22, 0x3c, 0x8a, 0x02, 0xbc,
+	0x3d, 0x13, 0xca, 0x7a, 0xa1, 0x37, 0xc4, 0x95, 0x63, 0x61, 0x6f, 0xdf, 0x77, 0x82, 0x79, 0xb8,
+	0xfa, 0x15, 0xcc, 0x1e, 0xe4, 0xb6, 0xd4, 0x45, 0x6c, 0x3b, 0xa2, 0x35, 0xb1, 0xbf, 0x21, 0x3a,
+	0x1a, 0xf7, 0x78, 0xfa, 0x49, 0xb7, 0xbe, 0x96, 0x19, 0x6e, 0x75, 0xc2, 0x36, 0xaa, 0xe0, 0x52,
+	0xbd, 0xc1, 0x3b, 0xc2, 0x66, 0xcb, 0xbb, 0x45, 0x4d, 0xfe, 0x86, 0x4b, 0x28, 0xa1, 0x16, 0x08,
+	0xaf, 0x5c, 0x2a, 0x6e, 0x6d, 0x9d, 0x1c, 0x18, 0xc1, 0xd5, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0xa7, 0x9b, 0xa8, 0xde, 0x07, 0x02, 0x00, 0x00,
 }
diff --git a/go-feast-proto/feast/types/FeatureRowExtended.pb.go b/protos/generated/go/feast/types/FeatureRowExtended.pb.go
similarity index 71%
rename from go-feast-proto/feast/types/FeatureRowExtended.pb.go
rename to protos/generated/go/feast/types/FeatureRowExtended.pb.go
index 32af20bc5d..3a0b0afc76 100644
--- a/go-feast-proto/feast/types/FeatureRowExtended.pb.go
+++ b/protos/generated/go/feast/types/FeatureRowExtended.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: feast/types/FeatureRowExtended.proto
 
-package types // import "github.com/gojektech/feast/go-feast-proto/feast/types"
+package types // import "github.com/gojektech/feast/protos/generated/go/feast/types"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -33,7 +33,7 @@ func (m *Error) Reset()         { *m = Error{} }
 func (m *Error) String() string { return proto.CompactTextString(m) }
 func (*Error) ProtoMessage()    {}
 func (*Error) Descriptor() ([]byte, []int) {
-	return fileDescriptor_FeatureRowExtended_fd8617e19d07849d, []int{0}
+	return fileDescriptor_FeatureRowExtended_a05d4d4ba2df7272, []int{0}
 }
 func (m *Error) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Error.Unmarshal(m, b)
@@ -93,7 +93,7 @@ func (m *Attempt) Reset()         { *m = Attempt{} }
 func (m *Attempt) String() string { return proto.CompactTextString(m) }
 func (*Attempt) ProtoMessage()    {}
 func (*Attempt) Descriptor() ([]byte, []int) {
-	return fileDescriptor_FeatureRowExtended_fd8617e19d07849d, []int{1}
+	return fileDescriptor_FeatureRowExtended_a05d4d4ba2df7272, []int{1}
 }
 func (m *Attempt) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Attempt.Unmarshal(m, b)
@@ -140,7 +140,7 @@ func (m *FeatureRowExtended) Reset()         { *m = FeatureRowExtended{} }
 func (m *FeatureRowExtended) String() string { return proto.CompactTextString(m) }
 func (*FeatureRowExtended) ProtoMessage()    {}
 func (*FeatureRowExtended) Descriptor() ([]byte, []int) {
-	return fileDescriptor_FeatureRowExtended_fd8617e19d07849d, []int{2}
+	return fileDescriptor_FeatureRowExtended_a05d4d4ba2df7272, []int{2}
 }
 func (m *FeatureRowExtended) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FeatureRowExtended.Unmarshal(m, b)
@@ -188,31 +188,31 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("feast/types/FeatureRowExtended.proto", fileDescriptor_FeatureRowExtended_fd8617e19d07849d)
+	proto.RegisterFile("feast/types/FeatureRowExtended.proto", fileDescriptor_FeatureRowExtended_a05d4d4ba2df7272)
 }
 
-var fileDescriptor_FeatureRowExtended_fd8617e19d07849d = []byte{
+var fileDescriptor_FeatureRowExtended_a05d4d4ba2df7272 = []byte{
 	// 338 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0x41, 0x6f, 0xe2, 0x30,
-	0x10, 0x85, 0xc5, 0xb2, 0x59, 0x96, 0xc9, 0xcd, 0x42, 0x22, 0x8a, 0xd0, 0x6e, 0x85, 0x7a, 0xa0,
-	0x07, 0x1c, 0x89, 0xaa, 0x55, 0xaf, 0x45, 0xa2, 0xd7, 0x56, 0x2e, 0xa7, 0x4a, 0x3d, 0x98, 0x30,
-	0x09, 0x14, 0x82, 0x23, 0x7b, 0x22, 0xda, 0x9f, 0xd5, 0x7f, 0x58, 0x31, 0x86, 0x12, 0x44, 0x6f,
-	0x9e, 0x79, 0xdf, 0x78, 0x9e, 0xfd, 0xe0, 0x32, 0x43, 0xed, 0x28, 0xa1, 0x8f, 0x12, 0x5d, 0xf2,
-	0x80, 0x9a, 0x2a, 0x8b, 0xca, 0x6c, 0x27, 0xef, 0x84, 0x9b, 0x39, 0xce, 0x65, 0x69, 0x0d, 0x19,
-	0x11, 0x32, 0x25, 0x99, 0x8a, 0xff, 0xe7, 0xc6, 0xe4, 0x6b, 0x4c, 0x58, 0x9a, 0x55, 0x59, 0x42,
-	0xcb, 0x02, 0x1d, 0xe9, 0xa2, 0xf4, 0x74, 0xdc, 0xfb, 0xf9, 0x4e, 0xaf, 0xf6, 0x2b, 0x08, 0x26,
-	0xd6, 0x1a, 0x2b, 0x3a, 0x10, 0xa4, 0xba, 0x72, 0x18, 0x35, 0x2e, 0x1a, 0x83, 0xb6, 0xf2, 0x85,
-	0xe8, 0x41, 0x9b, 0xac, 0xde, 0xb8, 0xcc, 0xd8, 0x22, 0xfa, 0xc5, 0xca, 0xb1, 0x21, 0x22, 0x68,
-	0x15, 0xe8, 0x9c, 0xce, 0x31, 0x6a, 0xb2, 0x76, 0x28, 0xc5, 0x3f, 0x00, 0x47, 0x3a, 0x5d, 0x4d,
-	0xad, 0x4e, 0x31, 0xfa, 0xcd, 0x62, 0xad, 0xd3, 0x7f, 0x84, 0xd6, 0x3d, 0x11, 0x16, 0x25, 0x89,
-	0x18, 0xfe, 0x6a, 0x7f, 0x74, 0xbc, 0x3b, 0x50, 0xdf, 0xb5, 0x18, 0x40, 0x80, 0x3b, 0x77, 0xbc,
-	0x3a, 0x1c, 0x09, 0x59, 0x7b, 0xb9, 0x64, 0xdf, 0xca, 0x03, 0xfd, 0xcf, 0x06, 0x88, 0xf3, 0x0f,
-	0x13, 0x57, 0xd0, 0xb4, 0x66, 0xcb, 0xf7, 0x86, 0xa3, 0xee, 0xc9, 0xf8, 0x91, 0x56, 0x3b, 0x46,
-	0xdc, 0x42, 0xb8, 0xd6, 0x8e, 0xf6, 0xb6, 0xf6, 0x1b, 0x3b, 0x27, 0x23, 0x7b, 0x4d, 0xd5, 0x41,
-	0x71, 0x07, 0xed, 0x6c, 0x69, 0x1d, 0x3d, 0x23, 0x6e, 0xf8, 0x1b, 0xc2, 0x51, 0x2c, 0x7d, 0x28,
-	0xf2, 0x10, 0x8a, 0x9c, 0x1e, 0x42, 0x51, 0x47, 0x78, 0xfc, 0x0a, 0xf5, 0x24, 0xc7, 0xdd, 0x73,
-	0xff, 0x4f, 0xbb, 0xf9, 0x97, 0x9b, 0x7c, 0x49, 0x8b, 0x6a, 0x26, 0x53, 0x53, 0x24, 0xb9, 0x79,
-	0xc3, 0x15, 0x61, 0xba, 0x48, 0x7c, 0xac, 0xb9, 0x19, 0xf2, 0x61, 0xc8, 0xab, 0x92, 0x5a, 0xd6,
-	0xb3, 0x3f, 0xdc, 0xba, 0xfe, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xd4, 0x9c, 0x62, 0x4c, 0x55, 0x02,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0xc1, 0x4f, 0xc2, 0x30,
+	0x14, 0xc6, 0x83, 0x38, 0x91, 0xb7, 0x5b, 0x43, 0xc2, 0xb2, 0x10, 0x35, 0xc4, 0x03, 0x5e, 0xda,
+	0x04, 0x13, 0x63, 0xbc, 0x49, 0x82, 0x57, 0xcd, 0xe4, 0xe4, 0xad, 0x1b, 0x6f, 0x05, 0x61, 0xeb,
+	0xd2, 0xbe, 0x05, 0xfd, 0xb3, 0xfc, 0x0f, 0x0d, 0x2d, 0xc8, 0x08, 0xde, 0xf6, 0xfa, 0xfd, 0x5e,
+	0xbf, 0x6f, 0xfd, 0xe0, 0x36, 0x47, 0x69, 0x49, 0xd0, 0x77, 0x85, 0x56, 0xbc, 0xa0, 0xa4, 0xda,
+	0x60, 0xa2, 0x37, 0xd3, 0x2f, 0xc2, 0x72, 0x8e, 0x73, 0x5e, 0x19, 0x4d, 0x9a, 0x85, 0x8e, 0xe2,
+	0x8e, 0x8a, 0xaf, 0x95, 0xd6, 0x6a, 0x8d, 0xc2, 0x49, 0x69, 0x9d, 0x0b, 0x5a, 0x16, 0x68, 0x49,
+	0x16, 0x95, 0xa7, 0xe3, 0xc1, 0xff, 0x77, 0x7a, 0x75, 0x58, 0x43, 0x30, 0x35, 0x46, 0x1b, 0xd6,
+	0x83, 0x20, 0x93, 0xb5, 0xc5, 0xa8, 0x75, 0xd3, 0x1a, 0x75, 0x13, 0x3f, 0xb0, 0x01, 0x74, 0xc9,
+	0xc8, 0xd2, 0xe6, 0xda, 0x14, 0xd1, 0x99, 0x53, 0x0e, 0x07, 0x2c, 0x82, 0x4e, 0x81, 0xd6, 0x4a,
+	0x85, 0x51, 0xdb, 0x69, 0xfb, 0x91, 0x5d, 0x01, 0x58, 0x92, 0xd9, 0x6a, 0x66, 0x64, 0x86, 0xd1,
+	0xb9, 0x13, 0x1b, 0x27, 0xc3, 0x57, 0xe8, 0x3c, 0x13, 0x61, 0x51, 0x11, 0x8b, 0xe1, 0x52, 0xfa,
+	0x4f, 0xeb, 0xbc, 0x83, 0xe4, 0x6f, 0x66, 0x23, 0x08, 0x70, 0x9b, 0xce, 0x59, 0x87, 0x63, 0xc6,
+	0x1b, 0x7f, 0xce, 0x5d, 0xee, 0xc4, 0x03, 0xc3, 0x9f, 0x16, 0xb0, 0xd3, 0x07, 0x63, 0x77, 0xd0,
+	0x36, 0x7a, 0xe3, 0xee, 0x0d, 0xc7, 0xfd, 0xa3, 0xf5, 0x03, 0x9d, 0x6c, 0x19, 0xf6, 0x00, 0xe1,
+	0x5a, 0x5a, 0xda, 0xc5, 0xda, 0x39, 0xf6, 0x8e, 0x56, 0x76, 0x5a, 0xd2, 0x04, 0xd9, 0x23, 0x74,
+	0xf3, 0xa5, 0xb1, 0xf4, 0x8e, 0x58, 0xba, 0x67, 0x08, 0xc7, 0x31, 0xf7, 0xa5, 0xf0, 0x7d, 0x29,
+	0x7c, 0xb6, 0x2f, 0x25, 0x39, 0xc0, 0x93, 0x14, 0x9a, 0x4d, 0x4e, 0xfa, 0xa7, 0xf9, 0xdf, 0xb6,
+	0xfb, 0x1f, 0x4f, 0x6a, 0x49, 0x8b, 0x3a, 0xe5, 0x99, 0x2e, 0x84, 0xd2, 0x9f, 0xb8, 0x22, 0xcc,
+	0x16, 0xc2, 0xd7, 0xea, 0x1c, 0xac, 0x50, 0x58, 0xa2, 0x91, 0x84, 0x73, 0xa1, 0xb4, 0x68, 0x14,
+	0x9e, 0x5e, 0x38, 0xe0, 0xfe, 0x37, 0x00, 0x00, 0xff, 0xff, 0x93, 0xf7, 0x42, 0x51, 0x5a, 0x02,
 	0x00, 0x00,
 }
diff --git a/go-feast-proto/feast/types/Granularity.pb.go b/protos/generated/go/feast/types/Granularity.pb.go
similarity index 82%
rename from go-feast-proto/feast/types/Granularity.pb.go
rename to protos/generated/go/feast/types/Granularity.pb.go
index b7d55cb29d..6a17b2d6e9 100644
--- a/go-feast-proto/feast/types/Granularity.pb.go
+++ b/protos/generated/go/feast/types/Granularity.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: feast/types/Granularity.proto
 
-package types // import "github.com/gojektech/feast/go-feast-proto/feast/types"
+package types // import "github.com/gojektech/feast/protos/generated/go/feast/types"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -47,7 +47,7 @@ func (x Granularity_Enum) String() string {
 	return proto.EnumName(Granularity_Enum_name, int32(x))
 }
 func (Granularity_Enum) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_Granularity_068270588f5c18e3, []int{0, 0}
+	return fileDescriptor_Granularity_a07426c64a58e8de, []int{0, 0}
 }
 
 type Granularity struct {
@@ -60,7 +60,7 @@ func (m *Granularity) Reset()         { *m = Granularity{} }
 func (m *Granularity) String() string { return proto.CompactTextString(m) }
 func (*Granularity) ProtoMessage()    {}
 func (*Granularity) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Granularity_068270588f5c18e3, []int{0}
+	return fileDescriptor_Granularity_a07426c64a58e8de, []int{0}
 }
 func (m *Granularity) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Granularity.Unmarshal(m, b)
@@ -86,11 +86,11 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("feast/types/Granularity.proto", fileDescriptor_Granularity_068270588f5c18e3)
+	proto.RegisterFile("feast/types/Granularity.proto", fileDescriptor_Granularity_a07426c64a58e8de)
 }
 
-var fileDescriptor_Granularity_068270588f5c18e3 = []byte{
-	// 179 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_Granularity_a07426c64a58e8de = []byte{
+	// 187 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4d, 0x4b, 0x4d, 0x2c,
 	0x2e, 0xd1, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x77, 0x2f, 0x4a, 0xcc, 0x2b, 0xcd, 0x49, 0x2c,
 	0xca, 0x2c, 0xa9, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x06, 0x4b, 0xeb, 0x81, 0xa5,
@@ -98,9 +98,9 @@ var fileDescriptor_Granularity_068270588f5c18e3 = []byte{
 	0x70, 0xb1, 0xf8, 0xf9, 0xfb, 0xb9, 0x0a, 0x30, 0x08, 0xb1, 0x73, 0x31, 0xbb, 0x38, 0x46, 0x0a,
 	0x30, 0x82, 0x84, 0x3c, 0xfc, 0x43, 0x83, 0x04, 0x98, 0x84, 0xb8, 0xb8, 0xd8, 0x7c, 0x3d, 0xfd,
 	0x42, 0x43, 0x5c, 0x05, 0x98, 0x41, 0xec, 0x60, 0x57, 0x67, 0x7f, 0x3f, 0x17, 0x01, 0x16, 0xa7,
-	0x30, 0x2e, 0x64, 0xa3, 0x9d, 0x04, 0x90, 0x0c, 0x0e, 0x00, 0xd9, 0x1c, 0x65, 0x9a, 0x9e, 0x59,
+	0x68, 0x2e, 0x64, 0xa3, 0x9d, 0x04, 0x90, 0x0c, 0x0e, 0x00, 0xd9, 0x1c, 0x65, 0x95, 0x9e, 0x59,
 	0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x9f, 0x9e, 0x9f, 0x95, 0x9a, 0x5d, 0x92, 0x9a,
-	0x9c, 0xa1, 0x0f, 0x71, 0x6d, 0x7a, 0xbe, 0x2e, 0x98, 0xa1, 0x0b, 0x76, 0xa4, 0x3e, 0x92, 0x17,
-	0x92, 0xd8, 0xc0, 0x42, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xaf, 0xc7, 0x4c, 0x67, 0xd8,
-	0x00, 0x00, 0x00,
+	0x9c, 0xa1, 0x0f, 0x71, 0x2d, 0xd8, 0x6d, 0xc5, 0xfa, 0xe9, 0xa9, 0x79, 0xa9, 0x45, 0x89, 0x25,
+	0xa9, 0x29, 0xfa, 0xe9, 0xf9, 0xfa, 0x48, 0xfe, 0x48, 0x62, 0x03, 0x2b, 0x30, 0x06, 0x04, 0x00,
+	0x00, 0xff, 0xff, 0x70, 0x6d, 0xad, 0xa5, 0xdd, 0x00, 0x00, 0x00,
 }
diff --git a/go-feast-proto/feast/types/Value.pb.go b/protos/generated/go/feast/types/Value.pb.go
similarity index 86%
rename from go-feast-proto/feast/types/Value.pb.go
rename to protos/generated/go/feast/types/Value.pb.go
index 0a697b68a3..6df91f0f29 100644
--- a/go-feast-proto/feast/types/Value.pb.go
+++ b/protos/generated/go/feast/types/Value.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: feast/types/Value.proto
 
-package types // import "github.com/gojektech/feast/go-feast-proto/feast/types"
+package types // import "github.com/gojektech/feast/protos/generated/go/feast/types"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -60,7 +60,7 @@ func (x ValueType_Enum) String() string {
 	return proto.EnumName(ValueType_Enum_name, int32(x))
 }
 func (ValueType_Enum) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_Value_d050960009ca8e98, []int{0, 0}
+	return fileDescriptor_Value_80342a4668fe83ee, []int{0, 0}
 }
 
 type ValueType struct {
@@ -73,7 +73,7 @@ func (m *ValueType) Reset()         { *m = ValueType{} }
 func (m *ValueType) String() string { return proto.CompactTextString(m) }
 func (*ValueType) ProtoMessage()    {}
 func (*ValueType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Value_d050960009ca8e98, []int{0}
+	return fileDescriptor_Value_80342a4668fe83ee, []int{0}
 }
 func (m *ValueType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ValueType.Unmarshal(m, b)
@@ -113,7 +113,7 @@ func (m *Value) Reset()         { *m = Value{} }
 func (m *Value) String() string { return proto.CompactTextString(m) }
 func (*Value) ProtoMessage()    {}
 func (*Value) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Value_d050960009ca8e98, []int{1}
+	return fileDescriptor_Value_80342a4668fe83ee, []int{1}
 }
 func (m *Value) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Value.Unmarshal(m, b)
@@ -427,7 +427,7 @@ func (m *ValueList) Reset()         { *m = ValueList{} }
 func (m *ValueList) String() string { return proto.CompactTextString(m) }
 func (*ValueList) ProtoMessage()    {}
 func (*ValueList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Value_d050960009ca8e98, []int{2}
+	return fileDescriptor_Value_80342a4668fe83ee, []int{2}
 }
 func (m *ValueList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ValueList.Unmarshal(m, b)
@@ -761,7 +761,7 @@ func (m *BytesList) Reset()         { *m = BytesList{} }
 func (m *BytesList) String() string { return proto.CompactTextString(m) }
 func (*BytesList) ProtoMessage()    {}
 func (*BytesList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Value_d050960009ca8e98, []int{3}
+	return fileDescriptor_Value_80342a4668fe83ee, []int{3}
 }
 func (m *BytesList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BytesList.Unmarshal(m, b)
@@ -799,7 +799,7 @@ func (m *StringList) Reset()         { *m = StringList{} }
 func (m *StringList) String() string { return proto.CompactTextString(m) }
 func (*StringList) ProtoMessage()    {}
 func (*StringList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Value_d050960009ca8e98, []int{4}
+	return fileDescriptor_Value_80342a4668fe83ee, []int{4}
 }
 func (m *StringList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_StringList.Unmarshal(m, b)
@@ -837,7 +837,7 @@ func (m *Int32List) Reset()         { *m = Int32List{} }
 func (m *Int32List) String() string { return proto.CompactTextString(m) }
 func (*Int32List) ProtoMessage()    {}
 func (*Int32List) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Value_d050960009ca8e98, []int{5}
+	return fileDescriptor_Value_80342a4668fe83ee, []int{5}
 }
 func (m *Int32List) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Int32List.Unmarshal(m, b)
@@ -875,7 +875,7 @@ func (m *Int64List) Reset()         { *m = Int64List{} }
 func (m *Int64List) String() string { return proto.CompactTextString(m) }
 func (*Int64List) ProtoMessage()    {}
 func (*Int64List) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Value_d050960009ca8e98, []int{6}
+	return fileDescriptor_Value_80342a4668fe83ee, []int{6}
 }
 func (m *Int64List) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Int64List.Unmarshal(m, b)
@@ -913,7 +913,7 @@ func (m *DoubleList) Reset()         { *m = DoubleList{} }
 func (m *DoubleList) String() string { return proto.CompactTextString(m) }
 func (*DoubleList) ProtoMessage()    {}
 func (*DoubleList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Value_d050960009ca8e98, []int{7}
+	return fileDescriptor_Value_80342a4668fe83ee, []int{7}
 }
 func (m *DoubleList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DoubleList.Unmarshal(m, b)
@@ -951,7 +951,7 @@ func (m *FloatList) Reset()         { *m = FloatList{} }
 func (m *FloatList) String() string { return proto.CompactTextString(m) }
 func (*FloatList) ProtoMessage()    {}
 func (*FloatList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Value_d050960009ca8e98, []int{8}
+	return fileDescriptor_Value_80342a4668fe83ee, []int{8}
 }
 func (m *FloatList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FloatList.Unmarshal(m, b)
@@ -989,7 +989,7 @@ func (m *BoolList) Reset()         { *m = BoolList{} }
 func (m *BoolList) String() string { return proto.CompactTextString(m) }
 func (*BoolList) ProtoMessage()    {}
 func (*BoolList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Value_d050960009ca8e98, []int{9}
+	return fileDescriptor_Value_80342a4668fe83ee, []int{9}
 }
 func (m *BoolList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BoolList.Unmarshal(m, b)
@@ -1027,7 +1027,7 @@ func (m *TimestampList) Reset()         { *m = TimestampList{} }
 func (m *TimestampList) String() string { return proto.CompactTextString(m) }
 func (*TimestampList) ProtoMessage()    {}
 func (*TimestampList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Value_d050960009ca8e98, []int{10}
+	return fileDescriptor_Value_80342a4668fe83ee, []int{10}
 }
 func (m *TimestampList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TimestampList.Unmarshal(m, b)
@@ -1069,48 +1069,48 @@ func init() {
 	proto.RegisterEnum("feast.types.ValueType_Enum", ValueType_Enum_name, ValueType_Enum_value)
 }
 
-func init() { proto.RegisterFile("feast/types/Value.proto", fileDescriptor_Value_d050960009ca8e98) }
-
-var fileDescriptor_Value_d050960009ca8e98 = []byte{
-	// 626 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x94, 0xc1, 0x6e, 0xda, 0x4e,
-	0x10, 0xc6, 0xbd, 0x18, 0x83, 0x3d, 0x24, 0x92, 0xb5, 0xd2, 0xff, 0x9f, 0x28, 0x4a, 0x52, 0x8b,
-	0x93, 0x0f, 0x8d, 0x2d, 0x41, 0x8a, 0xd4, 0x43, 0xa5, 0xc6, 0x0a, 0x29, 0xa8, 0x04, 0x22, 0xe3,
-	0xa4, 0x6a, 0x6f, 0x90, 0x3a, 0x0e, 0xad, 0x89, 0x51, 0xbc, 0x44, 0xca, 0xa1, 0x6f, 0xd3, 0x77,
-	0xeb, 0x6b, 0x54, 0x33, 0xb6, 0x97, 0x45, 0x42, 0xbd, 0xad, 0xe7, 0xf7, 0x7d, 0x3b, 0xeb, 0xf9,
-	0xec, 0x85, 0x83, 0x87, 0x78, 0x96, 0x0b, 0x5f, 0xbc, 0xae, 0xe2, 0xdc, 0xbf, 0x9b, 0xa5, 0xeb,
-	0xd8, 0x5b, 0x3d, 0x67, 0x22, 0xe3, 0x2d, 0x02, 0x1e, 0x81, 0xa3, 0x37, 0x49, 0x96, 0x25, 0x69,
-	0xec, 0x13, 0x9a, 0xaf, 0x1f, 0x7c, 0xb1, 0x58, 0xc6, 0xb9, 0x98, 0x2d, 0x57, 0x85, 0xba, 0xfd,
-	0x0b, 0x2c, 0x32, 0x47, 0xaf, 0xab, 0xb8, 0xbd, 0x82, 0x7a, 0xff, 0x69, 0xbd, 0xe4, 0x2d, 0x68,
-	0xde, 0x8e, 0x3f, 0x8f, 0x27, 0x5f, 0xc6, 0xb6, 0xc6, 0x2d, 0x30, 0x82, 0xaf, 0x51, 0x7f, 0x6a,
-	0x33, 0x0e, 0xd0, 0x98, 0x46, 0xe1, 0x70, 0xfc, 0xc9, 0xae, 0x61, 0x79, 0x38, 0x8e, 0xba, 0x1d,
-	0x5b, 0x2f, 0x97, 0xbd, 0x73, 0xbb, 0x8e, 0x8a, 0xcb, 0xc9, 0x6d, 0x30, 0xea, 0xdb, 0x06, 0x96,
-	0xaf, 0x46, 0x93, 0x8b, 0xc8, 0x6e, 0x70, 0x13, 0xea, 0xc1, 0x64, 0x32, 0xb2, 0x9b, 0x7c, 0x1f,
-	0xac, 0x68, 0x78, 0xdd, 0x9f, 0x46, 0x17, 0xd7, 0x37, 0xb6, 0xd9, 0xfe, 0x5d, 0x03, 0x83, 0xfa,
-	0xf3, 0x63, 0x30, 0xe7, 0xaf, 0x22, 0xce, 0xef, 0x66, 0xe9, 0x21, 0x73, 0x98, 0xbb, 0x37, 0xd0,
-	0x42, 0x59, 0xe1, 0xa7, 0x60, 0xe5, 0xe2, 0x79, 0xf1, 0x94, 0x20, 0xae, 0x39, 0xcc, 0xb5, 0x06,
-	0x5a, 0xb8, 0x29, 0xa1, 0x7b, 0xf1, 0x24, 0xba, 0x1d, 0xc4, 0xba, 0xc3, 0x5c, 0x03, 0xdd, 0x55,
-	0xa5, 0xa4, 0xbd, 0x73, 0xa4, 0x75, 0x87, 0xb9, 0x7a, 0x49, 0xa9, 0x82, 0x7b, 0x7f, 0xcf, 0xd6,
-	0xf3, 0x34, 0x46, 0x6c, 0x38, 0xcc, 0x65, 0xb8, 0xb7, 0x2c, 0xa1, 0xfb, 0x21, 0xcd, 0x66, 0x02,
-	0x71, 0xc3, 0x61, 0x6e, 0x0d, 0xdd, 0x55, 0x85, 0x1f, 0x41, 0x73, 0x9e, 0x65, 0x29, 0xc2, 0xa6,
-	0xc3, 0x5c, 0x73, 0xa0, 0x85, 0x55, 0x81, 0x7f, 0x84, 0x3d, 0x39, 0x6f, 0x14, 0x98, 0x0e, 0x73,
-	0x5b, 0x9d, 0x23, 0xaf, 0x08, 0xc5, 0xab, 0x42, 0xf1, 0xa2, 0x4a, 0x34, 0xd0, 0xc2, 0x2d, 0x47,
-	0x60, 0x80, 0xfe, 0x32, 0x4b, 0xdb, 0x7f, 0xf4, 0x32, 0xa6, 0xd1, 0x22, 0x17, 0xbc, 0x07, 0x16,
-	0x0d, 0x06, 0x1f, 0x68, 0x56, 0xad, 0xce, 0xff, 0x9e, 0x92, 0xba, 0x17, 0x54, 0x14, 0x5f, 0x44,
-	0x4a, 0xf9, 0x7b, 0x80, 0x62, 0x62, 0x64, 0xac, 0x91, 0xf1, 0x60, 0xcb, 0x38, 0x95, 0x78, 0xa0,
-	0x85, 0x8a, 0x18, 0x5b, 0xd2, 0x34, 0xc9, 0xa9, 0xef, 0x68, 0x39, 0xac, 0x28, 0xb6, 0x94, 0xd2,
-	0xd2, 0xd7, 0x3b, 0x27, 0x5f, 0x7d, 0xb7, 0xaf, 0xa0, 0xa5, 0xaf, 0x78, 0xc0, 0xa3, 0x16, 0x01,
-	0x90, 0xd1, 0xd8, 0x71, 0xd4, 0x4b, 0x89, 0xf1, 0xa8, 0x1b, 0x31, 0xb6, 0xa4, 0x70, 0xc8, 0xd9,
-	0xd8, 0xd1, 0xf2, 0xaa, 0xa2, 0xd8, 0x52, 0x4a, 0x79, 0x17, 0x4c, 0xcc, 0x8d, 0x6c, 0x4d, 0xb2,
-	0xfd, 0xb7, 0x3d, 0xd4, 0x12, 0xd2, 0x77, 0x59, 0xae, 0x79, 0x00, 0xfb, 0x32, 0x2f, 0x72, 0x56,
-	0x11, 0xab, 0xce, 0x48, 0x55, 0x0c, 0xb4, 0x70, 0xdb, 0x12, 0xb4, 0xc0, 0x7a, 0xa9, 0xb2, 0x6d,
-	0x9f, 0x80, 0x25, 0xd3, 0xe3, 0x36, 0xa5, 0x7f, 0xc8, 0x1c, 0xdd, 0xdd, 0x0b, 0xe9, 0x43, 0x38,
-	0x05, 0xd8, 0x64, 0xa4, 0x72, 0xab, 0xe0, 0x27, 0x60, 0xc9, 0x24, 0x54, 0x6c, 0xa8, 0xb8, 0x9c,
-	0xb1, 0x82, 0x75, 0xb9, 0xfb, 0x66, 0xac, 0x2a, 0x67, 0xd2, 0x2e, 0x87, 0xa7, 0xe2, 0x5a, 0x81,
-	0x8f, 0xc1, 0xac, 0x86, 0xa4, 0x52, 0xb3, 0xa0, 0x1f, 0x60, 0x7f, 0x6b, 0x10, 0xfc, 0xed, 0x46,
-	0xf2, 0xcf, 0x9f, 0x82, 0xec, 0xc1, 0x0d, 0xa8, 0x17, 0x5b, 0x00, 0xf4, 0x3b, 0xdc, 0xa0, 0xf8,
-	0xdb, 0xbb, 0x64, 0x21, 0x1e, 0xd7, 0x73, 0xef, 0x3e, 0x5b, 0xfa, 0x49, 0xf6, 0x23, 0xfe, 0x29,
-	0xe2, 0xfb, 0x47, 0xbf, 0xb8, 0x1f, 0x93, 0xec, 0x8c, 0x16, 0x67, 0xb4, 0xaf, 0xaf, 0x5c, 0x9a,
-	0xf3, 0x06, 0x95, 0xba, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x66, 0xda, 0x0e, 0x5f, 0x4a, 0x05,
-	0x00, 0x00,
+func init() { proto.RegisterFile("feast/types/Value.proto", fileDescriptor_Value_80342a4668fe83ee) }
+
+var fileDescriptor_Value_80342a4668fe83ee = []byte{
+	// 629 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x94, 0xd1, 0x6b, 0xda, 0x50,
+	0x14, 0xc6, 0x13, 0x63, 0x34, 0x39, 0xb6, 0x10, 0x2e, 0x6c, 0x2d, 0xa5, 0xed, 0x82, 0x4f, 0x79,
+	0x18, 0x09, 0x68, 0x11, 0x36, 0x18, 0xac, 0xa1, 0x76, 0xca, 0xac, 0x96, 0x98, 0x76, 0x6c, 0x6f,
+	0xb1, 0x4d, 0x53, 0xb7, 0x68, 0xa4, 0xb9, 0x16, 0x7c, 0xd8, 0x7f, 0xb3, 0xff, 0x6d, 0xff, 0xc6,
+	0x38, 0x27, 0xc9, 0xf5, 0x0a, 0xb2, 0x37, 0x73, 0x7e, 0xdf, 0x77, 0x4f, 0xfc, 0xbe, 0x24, 0x70,
+	0xf4, 0x14, 0x47, 0x39, 0xf7, 0xf8, 0x66, 0x15, 0xe7, 0xde, 0x7d, 0x94, 0xae, 0x63, 0x77, 0xf5,
+	0x92, 0xf1, 0x8c, 0xb5, 0x08, 0xb8, 0x04, 0x4e, 0xde, 0x25, 0x59, 0x96, 0xa4, 0xb1, 0x47, 0x68,
+	0xb6, 0x7e, 0xf2, 0xf8, 0x7c, 0x11, 0xe7, 0x3c, 0x5a, 0xac, 0x0a, 0x75, 0xfb, 0x37, 0x98, 0x64,
+	0x0e, 0x37, 0xab, 0xb8, 0xbd, 0x82, 0x7a, 0x7f, 0xb9, 0x5e, 0xb0, 0x16, 0x34, 0xef, 0xc6, 0x5f,
+	0xc7, 0x93, 0x6f, 0x63, 0x4b, 0x61, 0x26, 0xe8, 0xfe, 0xf7, 0xb0, 0x3f, 0xb5, 0x54, 0x06, 0xd0,
+	0x98, 0x86, 0xc1, 0x70, 0xfc, 0xc5, 0xaa, 0xe1, 0x78, 0x38, 0x0e, 0xbb, 0x1d, 0x4b, 0x2b, 0x7f,
+	0xf6, 0x2e, 0xac, 0x3a, 0x2a, 0xae, 0x26, 0x77, 0xfe, 0xa8, 0x6f, 0xe9, 0x38, 0xbe, 0x1e, 0x4d,
+	0x2e, 0x43, 0xab, 0xc1, 0x0c, 0xa8, 0xfb, 0x93, 0xc9, 0xc8, 0x6a, 0xb2, 0x43, 0x30, 0xc3, 0xe1,
+	0x4d, 0x7f, 0x1a, 0x5e, 0xde, 0xdc, 0x5a, 0x46, 0xfb, 0x4f, 0x0d, 0x74, 0xda, 0xcf, 0x4e, 0xc1,
+	0x98, 0x6d, 0x78, 0x9c, 0xdf, 0x47, 0xe9, 0xb1, 0x6a, 0xab, 0xce, 0xc1, 0x40, 0x09, 0xc4, 0x84,
+	0x9d, 0x83, 0x99, 0xf3, 0x97, 0xf9, 0x32, 0x41, 0x5c, 0xb3, 0x55, 0xc7, 0x1c, 0x28, 0xc1, 0x76,
+	0x84, 0xee, 0xf9, 0x92, 0x77, 0x3b, 0x88, 0x35, 0x5b, 0x75, 0x74, 0x74, 0x57, 0x93, 0x92, 0xf6,
+	0x2e, 0x90, 0xd6, 0x6d, 0xd5, 0xd1, 0x4a, 0x4a, 0x13, 0x3c, 0xfb, 0x31, 0x5b, 0xcf, 0xd2, 0x18,
+	0xb1, 0x6e, 0xab, 0x8e, 0x8a, 0x67, 0x8b, 0x11, 0xba, 0x9f, 0xd2, 0x2c, 0xe2, 0x88, 0x1b, 0xb6,
+	0xea, 0xd4, 0xd0, 0x5d, 0x4d, 0xd8, 0x09, 0x34, 0x67, 0x59, 0x96, 0x22, 0x6c, 0xda, 0xaa, 0x63,
+	0x0c, 0x94, 0xa0, 0x1a, 0xb0, 0xcf, 0x70, 0x20, 0xf2, 0x46, 0x81, 0x61, 0xab, 0x4e, 0xab, 0x73,
+	0xe2, 0x16, 0xa5, 0xb8, 0x55, 0x29, 0x6e, 0x58, 0x89, 0x06, 0x4a, 0xb0, 0xe3, 0xf0, 0x75, 0xd0,
+	0x5e, 0xa3, 0xb4, 0xfd, 0x57, 0x2b, 0x6b, 0x1a, 0xcd, 0x73, 0xce, 0x7a, 0x60, 0x52, 0x30, 0x78,
+	0x41, 0x59, 0xb5, 0x3a, 0x6f, 0x5d, 0xa9, 0x75, 0xd7, 0xaf, 0x28, 0xfe, 0x11, 0x21, 0x65, 0x1f,
+	0x00, 0x8a, 0xc4, 0xc8, 0x58, 0x23, 0xe3, 0xd1, 0x8e, 0x71, 0x2a, 0xf0, 0x40, 0x09, 0x24, 0x31,
+	0xae, 0xa4, 0x34, 0xc9, 0xa9, 0xed, 0x59, 0x39, 0xac, 0x28, 0xae, 0x14, 0xd2, 0xd2, 0xd7, 0xbb,
+	0x20, 0x5f, 0x7d, 0xbf, 0xaf, 0xa0, 0xa5, 0xaf, 0xb8, 0xc0, 0x5b, 0x2d, 0x0a, 0x20, 0xa3, 0xbe,
+	0xe7, 0x56, 0xaf, 0x04, 0xc6, 0x5b, 0xdd, 0x8a, 0x71, 0x25, 0x95, 0x43, 0xce, 0xc6, 0x9e, 0x95,
+	0xd7, 0x15, 0xc5, 0x95, 0x42, 0xca, 0xba, 0x60, 0x60, 0x6f, 0x64, 0x6b, 0x92, 0xed, 0xcd, 0x6e,
+	0xa8, 0x25, 0xa4, 0xe7, 0xb2, 0xfc, 0xcd, 0x7c, 0x38, 0x14, 0x7d, 0x91, 0xb3, 0xaa, 0x58, 0x76,
+	0x86, 0xb2, 0x62, 0xa0, 0x04, 0xbb, 0x16, 0xbf, 0x05, 0xe6, 0x6b, 0xd5, 0x6d, 0xfb, 0x0c, 0x4c,
+	0xd1, 0x1e, 0xb3, 0xa8, 0xfd, 0x63, 0xd5, 0xd6, 0x9c, 0x83, 0x80, 0x1e, 0x84, 0x73, 0x80, 0x6d,
+	0x47, 0x32, 0x37, 0x0b, 0x7e, 0x06, 0xa6, 0x68, 0x42, 0xc6, 0xba, 0x8c, 0xcb, 0x8c, 0x25, 0xac,
+	0x89, 0xd3, 0xb7, 0xb1, 0xca, 0x5c, 0x15, 0x76, 0x11, 0x9e, 0x8c, 0x6b, 0x05, 0x3e, 0x05, 0xa3,
+	0x0a, 0x49, 0xa6, 0x46, 0x41, 0x3f, 0xc1, 0xe1, 0x4e, 0x10, 0xec, 0xfd, 0x56, 0xf2, 0xdf, 0x97,
+	0x82, 0xec, 0xfe, 0x1d, 0xc8, 0x1f, 0x36, 0x1f, 0xe8, 0x75, 0xb8, 0x45, 0xf1, 0x8f, 0x8f, 0xc9,
+	0x9c, 0x3f, 0xaf, 0x67, 0xee, 0x43, 0xb6, 0xf0, 0x92, 0xec, 0x67, 0xfc, 0x8b, 0xc7, 0x0f, 0xcf,
+	0x5e, 0xf1, 0x7d, 0xa4, 0xe3, 0x72, 0x2f, 0x89, 0x97, 0xf1, 0x4b, 0xc4, 0xe3, 0x47, 0x2f, 0xc9,
+	0x3c, 0xe9, 0xcb, 0x39, 0x6b, 0x90, 0xa0, 0xfb, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xfc, 0x94, 0x75,
+	0xca, 0x4f, 0x05, 0x00, 0x00,
 }
diff --git a/serving/src/main/proto b/serving/src/main/proto
deleted file mode 120000
index 21f63ff310..0000000000
--- a/serving/src/main/proto
+++ /dev/null
@@ -1 +0,0 @@
-../../../protos
\ No newline at end of file
diff --git a/serving/src/main/proto/feast b/serving/src/main/proto/feast
new file mode 120000
index 0000000000..d520da9126
--- /dev/null
+++ b/serving/src/main/proto/feast
@@ -0,0 +1 @@
+../../../../protos/feast
\ No newline at end of file
diff --git a/serving/src/main/proto/third_party b/serving/src/main/proto/third_party
new file mode 120000
index 0000000000..363d20598e
--- /dev/null
+++ b/serving/src/main/proto/third_party
@@ -0,0 +1 @@
+../../../../protos/third_party
\ No newline at end of file