diff --git a/cli/feast/cmd/jobs.go b/cli/feast/cmd/jobs.go
@@ -22,7 +22,8 @@ import (

	"feast/cli/feast/pkg/parse"
	"feast/cli/feast/pkg/printer"
-	"feast/go-feast-proto/feast/core"

	"github.com/spf13/cobra"
)

diff --git a/cli/feast/cmd/list.go b/cli/feast/cmd/list.go
@@ -18,12 +18,13 @@ import (
	"context"
	"errors"
	"feast/cli/feast/pkg/util"
-	"feast/go-feast-proto/feast/core"
	"fmt"
	"os"
	"strings"
	"text/tabwriter"

	"github.com/golang/protobuf/ptypes/empty"
	"github.com/spf13/cobra"
)

diff --git a/cli/feast/cmd/register.go b/cli/feast/cmd/register.go
@@ -21,7 +21,7 @@ import (
	"io/ioutil"
	"path/filepath"

-	"feast/go-feast-proto/feast/core"

	"feast/cli/feast/pkg/parse"


diff --git a/cli/feast/pkg/parse/yaml.go b/cli/feast/pkg/parse/yaml.go
@@ -23,8 +23,8 @@ import (

	"github.com/ghodss/yaml"

-	"feast/go-feast-proto/feast/specs"
-	"feast/go-feast-proto/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
@@ -19,8 +19,8 @@ import (

	"github.com/golang/protobuf/ptypes/timestamp"

-	"feast/go-feast-proto/feast/specs"
-	"feast/go-feast-proto/feast/types"

	"github.com/google/go-cmp/cmp"
)

diff --git a/cli/feast/pkg/printer/job.go b/cli/feast/pkg/printer/job.go
@@ -16,9 +16,10 @@ package printer

import (
	"feast/cli/feast/pkg/util"
-	"feast/go-feast-proto/feast/core"
	"fmt"
	"strings"
)

// PrintJobDetail pretty prints the given job detail

diff --git a/core/src/main/proto b/core/src/main/proto
@@ -0,0 +1 @@
diff --git a/core/src/main/proto/Makefile b/core/src/main/proto/Makefile
diff --git a/core/src/main/proto/feast/core/CoreService.proto b/core/src/main/proto/feast/core/CoreService.proto
diff --git a/core/src/main/proto/feast/core/JobService.proto b/core/src/main/proto/feast/core/JobService.proto