From 3408965103344cd51b740df452e54ff8b5ae9def Mon Sep 17 00:00:00 2001
From: Christopher Hein <me@christopherhein.com>
Date: Sun, 30 Sep 2018 23:56:16 -0700
Subject: [PATCH 1/4] Removing original cmd/ws-operator

Signed-off-by: Christopher Hein <me@christopherhein.com>
---
 cmd/aws-operator/main.go    | 103 ------------------------------------
 cmd/aws-operator/server.go  |  49 -----------------
 cmd/aws-operator/version.go |  36 -------------
 3 files changed, 188 deletions(-)
 delete mode 100644 cmd/aws-operator/main.go
 delete mode 100644 cmd/aws-operator/server.go
 delete mode 100644 cmd/aws-operator/version.go

diff --git a/cmd/aws-operator/main.go b/cmd/aws-operator/main.go
deleted file mode 100644
index 8e9803eb8..000000000
--- a/cmd/aws-operator/main.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package main
-
-import (
-	"fmt"
-	homedir "github.com/mitchellh/go-homedir"
-
-	"github.com/christopherhein/aws-operator/pkg/config"
-
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"os"
-	"strings"
-)
-
-var (
-	// cfgFile, kubeConfig, awsRegion all help support passed in flags into the server
-	cfgFile, kubeconfig, awsRegion, logLevel, logFile, resources, clusterName, bucket, accountID string
-
-	// rootCmd represents the base command when called without any subcommands
-	rootCmd = &cobra.Command{
-		Use:   "aws-operator",
-		Short: "AWS Operator manages your AWS Infrastructure using CRDs and Operators",
-		Long:  `TODO WRITE THIS`,
-		Run: func(c *cobra.Command, _ []string) {
-			c.Help()
-		},
-	}
-)
-
-func main() {
-	cobra.OnInitialize(initConfig)
-
-	if err := rootCmd.Execute(); err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-}
-
-func init() {
-	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "f", "Config file (default is $HOME/.aws-operator.yaml)")
-	rootCmd.PersistentFlags().StringVarP(&kubeconfig, "kubeconfig", "k", "", "Path to local kubeconfig file (mainly used for development)")
-	rootCmd.PersistentFlags().StringVarP(&awsRegion, "region", "r", "us-west-2", "AWS Region for resources to be created in")
-	rootCmd.PersistentFlags().StringVarP(&logLevel, "loglevel", "l", "Info", "Log level for the CLI")
-	rootCmd.PersistentFlags().StringVarP(&logFile, "logfile", "", "", "Log level for the CLI")
-	rootCmd.PersistentFlags().StringVarP(&resources, "resources", "", "s3bucket,dynamodb", "Comma delimited list of CRDs to deploy")
-	rootCmd.PersistentFlags().StringVarP(&clusterName, "cluster-name", "i", "aws-operator", "Cluster name for the Application to run as, used to label the Cloudformation templated to avoid conflict")
-	rootCmd.PersistentFlags().StringVarP(&bucket, "bucket", "b", "aws-operator", "To configure the operator you need a base bucket to contain the resources")
-	rootCmd.PersistentFlags().StringVarP(&accountID, "account-id", "a", "", "AWS Account ID, this is used to configure outputs and operate on the proper account.")
-
-	viper.BindPFlag("config", rootCmd.PersistentFlags().Lookup("config"))
-	viper.BindPFlag("kubeconfig", rootCmd.PersistentFlags().Lookup("kubeconfig"))
-	viper.BindPFlag("region", rootCmd.PersistentFlags().Lookup("region"))
-	viper.BindPFlag("loglevel", rootCmd.PersistentFlags().Lookup("loglevel"))
-	viper.BindPFlag("logfile", rootCmd.PersistentFlags().Lookup("logfile"))
-	viper.BindPFlag("resources", rootCmd.PersistentFlags().Lookup("resources"))
-	viper.BindPFlag("clustername", rootCmd.PersistentFlags().Lookup("cluster-name"))
-	viper.BindPFlag("bucket", rootCmd.PersistentFlags().Lookup("bucket"))
-	viper.BindPFlag("accountid", rootCmd.PersistentFlags().Lookup("account-id"))
-}
-
-// initConfig reads in config file and ENV variables if set.
-func initConfig() {
-	if cfgFile != "" {
-		viper.SetConfigFile(cfgFile)
-	} else {
-		home, err := homedir.Dir()
-		if err != nil {
-			fmt.Println(err)
-			os.Exit(1)
-		}
-
-		viper.AddConfigPath(home)
-		viper.SetConfigName(".aws-operator")
-	}
-
-	replacer := strings.NewReplacer(".", "_")
-	viper.SetEnvKeyReplacer(replacer)
-	viper.AutomaticEnv()
-
-	if err := viper.ReadInConfig(); err == nil {
-		fmt.Println("Using config file:", viper.ConfigFileUsed())
-	}
-}
-
-func getConfig() (*config.Config, error) {
-	resourcesList := strings.Split(resources, ",")
-	config := &config.Config{
-		Region:     awsRegion,
-		Kubeconfig: kubeconfig,
-		LoggingConfig: &config.LoggingConfig{
-			File:              logFile,
-			Level:             logLevel,
-			FullTimestamps:    true,
-			DisableTimestamps: false,
-		},
-		Resources:   resourcesList,
-		ClusterName: clusterName,
-		Bucket:      bucket,
-		AccountID:   accountID,
-	}
-
-	return config, nil
-}
diff --git a/cmd/aws-operator/server.go b/cmd/aws-operator/server.go
deleted file mode 100644
index 6758404fd..000000000
--- a/cmd/aws-operator/server.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package main
-
-import (
-	"github.com/christopherhein/aws-operator/pkg/logger"
-	"github.com/christopherhein/aws-operator/pkg/server"
-	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-	"os"
-	"os/signal"
-	"syscall"
-)
-
-var serverCmd = &cobra.Command{
-	Use:   "server",
-	Short: "Run the operator",
-	Long:  ``,
-	Run: func(cmd *cobra.Command, args []string) {
-		config, err := getConfig()
-		if err != nil {
-			logrus.Fatalf("%s", err)
-		}
-
-		logger, err := logger.Configure(config.LoggingConfig)
-		if err != nil {
-			logrus.Fatalf("Failed to configure logging: '%s'" + err.Error())
-		}
-		config.Logger = logger
-
-		signalChan := make(chan os.Signal, 1)
-		stopChan := make(chan struct{})
-		signal.Notify(signalChan, syscall.SIGINT, syscall.SIGTERM)
-
-		server.New(config).Run(stopChan)
-
-		for {
-			select {
-			case <-signalChan:
-				logger.Info("shutdown signal received, exiting...")
-				close(stopChan)
-				return
-			}
-		}
-
-	},
-}
-
-func init() {
-	rootCmd.AddCommand(serverCmd)
-}
diff --git a/cmd/aws-operator/version.go b/cmd/aws-operator/version.go
deleted file mode 100644
index b413e44b0..000000000
--- a/cmd/aws-operator/version.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package main
-
-import (
-	"fmt"
-	goVersion "github.com/christopherhein/go-version"
-	"github.com/spf13/cobra"
-)
-
-var (
-	shortened  = false
-	version    = "dev"
-	commit     = "none"
-	date       = "unknown"
-	versionCmd = &cobra.Command{
-		Use:   "version",
-		Short: "Version will output the current aws-operator build information",
-		Long:  ``,
-		Run: func(_ *cobra.Command, _ []string) {
-			var response string
-			versionOutput := goVersion.New(version, commit, date)
-
-			if shortened {
-				response = versionOutput.ToShortened()
-			} else {
-				response = versionOutput.ToJSON()
-			}
-			fmt.Printf("%+v", response)
-			return
-		},
-	}
-)
-
-func init() {
-	versionCmd.Flags().BoolVarP(&shortened, "short", "s", false, "Use shortened output for version information.")
-	rootCmd.AddCommand(versionCmd)
-}

From 32b543ed8fe244decba76a18f61fa377882620c3 Mon Sep 17 00:00:00 2001
From: Christopher Hein <me@christopherhein.com>
Date: Sun, 30 Sep 2018 23:46:05 -0700
Subject: [PATCH 2/4] Adding Code Generation Source Changes

**Why:**

* modifies the groupName for the generated files.

Signed-off-by: Christopher Hein <me@christopherhein.com>
---
 code-generation/pkg/codegen/assets/cft.go.templ    |  2 +-
 .../pkg/codegen/assets/controller.go.templ         | 10 +++++-----
 .../pkg/codegen/assets/template_functions.go.templ |  2 +-
 code-generation/pkg/codegen/codegen.go             |  2 +-
 code-generation/pkg/codegen/templates.go           | 14 +++++++-------
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/code-generation/pkg/codegen/assets/cft.go.templ b/code-generation/pkg/codegen/assets/cft.go.templ
index c7a87f062..92afcca2d 100644
--- a/code-generation/pkg/codegen/assets/cft.go.templ
+++ b/code-generation/pkg/codegen/assets/cft.go.templ
@@ -9,7 +9,7 @@ import (
 	"errors"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudformation"
-	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	"github.com/christopherhein/aws-operator/pkg/config"
 	"github.com/christopherhein/aws-operator/pkg/helpers"
 )
diff --git a/code-generation/pkg/codegen/assets/controller.go.templ b/code-generation/pkg/codegen/assets/controller.go.templ
index 45d51cb39..991ab644b 100644
--- a/code-generation/pkg/codegen/assets/controller.go.templ
+++ b/code-generation/pkg/codegen/assets/controller.go.templ
@@ -20,9 +20,9 @@ import (
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 
-	awsapi "github.com/christopherhein/aws-operator/pkg/apis/operator.aws"
-	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
-	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1"
+	awsapi "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws"
+	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
+	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 	{{- if .Spec.Customizations.Package}}
   "{{.Spec.Customizations.Package}}"
 	{{- end}}
@@ -49,12 +49,12 @@ var Resource = opkit.CustomResource{
 type Controller struct {
 	config       *config.Config
 	context      *opkit.Context
-	awsclientset awsclient.OperatorV1alpha1Interface
+	awsclientset awsclient.ServiceoperatorV1alpha1Interface
   topicARN     string
 }
 
 // NewController create controller for watching object store custom resources created
-func NewController(config *config.Config, context *opkit.Context, awsclientset awsclient.OperatorV1alpha1Interface) *Controller {
+func NewController(config *config.Config, context *opkit.Context, awsclientset awsclient.ServiceoperatorV1alpha1Interface) *Controller {
 	return &Controller{
 		config:       config,
 		context:      context,
diff --git a/code-generation/pkg/codegen/assets/template_functions.go.templ b/code-generation/pkg/codegen/assets/template_functions.go.templ
index dafb2cb94..2941c8a33 100644
--- a/code-generation/pkg/codegen/assets/template_functions.go.templ
+++ b/code-generation/pkg/codegen/assets/template_functions.go.templ
@@ -6,7 +6,7 @@
 package helpers
 
 import (
-	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1"
+	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 	"github.com/christopherhein/aws-operator/pkg/config"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/code-generation/pkg/codegen/codegen.go b/code-generation/pkg/codegen/codegen.go
index 470c2ac60..b88b91d82 100644
--- a/code-generation/pkg/codegen/codegen.go
+++ b/code-generation/pkg/codegen/codegen.go
@@ -111,7 +111,7 @@ func (c *Codegen) Run() error {
 			models.Items = append(models.Items, parsedModel)
 
 			operatorPath := rootPath + "pkg/operator/" + parsedModel.Spec.Resource.Name
-			apiPath := rootPath + "pkg/apis/operator.aws/v1alpha1"
+			apiPath := rootPath + "pkg/apis/service-operator.aws/v1alpha1"
 
 			createDirIfNotExist(operatorPath)
 
diff --git a/code-generation/pkg/codegen/templates.go b/code-generation/pkg/codegen/templates.go
index f3f648616..b5b1d3eb3 100644
--- a/code-generation/pkg/codegen/templates.go
+++ b/code-generation/pkg/codegen/templates.go
@@ -71,7 +71,7 @@ func (fi bindataFileInfo) Sys() interface{} {
 	return nil
 }
 
-var _cftGoTempl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x59\x6d\x6f\xda\xc8\x13\x7f\x6d\x7f\x8a\xf9\xa3\xaa\x7f\x3b\x22\xe6\xfa\x16\x5d\x4e\xea\x35\x7d\x88\x5a\x25\x55\xa0\xed\x8b\x28\x6a\x17\x7b\x30\xdb\x18\xaf\xcf\xbb\x0e\xc7\x21\x7f\xf7\xd3\x3e\x18\xaf\x0d\x86\xd0\xf6\xda\xeb\x09\xd4\x0a\x58\xcf\xfc\x66\xe6\x37\xb3\xb3\x3b\x61\x30\x80\xdf\xf4\x0b\xce\xaf\xe0\xf2\x6a\x0c\xcf\xcf\x2f\xc6\x30\x7e\x75\x31\x82\x17\x17\x6f\x9e\xc3\xaf\xeb\x97\x3b\x18\xc0\x78\x46\x39\x4c\x69\x82\x40\x39\x90\x42\xb0\x18\x53\xcc\x89\xc0\x08\xee\x29\x81\x4f\x64\xc1\x4f\x59\x26\x57\x58\x7e\x1a\xb2\x08\x63\x4c\x21\xcb\x59\x88\x9c\x7f\x92\x00\x17\x53\x58\xb2\xe2\xff\x11\x24\xf4\x0e\x41\xcc\x10\xc2\x19\x49\x63\x04\x92\x2e\xc5\x8c\xa6\x31\x90\x09\x2b\x04\x88\xb5\xa1\x39\xb9\x43\xc0\x88\x0a\x0e\x82\x29\x8d\x40\xe0\x3c\x4b\x24\x9a\xf6\x24\x55\xab\xd9\x5d\x3c\x30\x16\x07\x84\x73\x14\x1c\x22\x9a\x63\x28\x58\xbe\x0c\x5c\x37\x23\xe1\x1d\x89\x11\x56\xab\x60\x94\x61\x18\x5c\x23\x67\x45\x1e\x62\x70\x49\xe6\x58\x96\xae\x4b\xe7\x19\xcb\x05\x78\xae\xd3\xc3\x3c\x67\x39\xef\xb9\x4e\x2f\xa6\x62\x56\x4c\x82\x90\xcd\x07\x64\xc1\xe5\xff\x53\x1e\xdd\x9d\xc6\x4c\x7e\xdc\x2d\xc0\x31\xbf\xa7\x21\x0e\xc2\x84\x15\xd1\x94\xe5\x73\x22\x28\x4b\x7b\xae\x43\x16\xfc\xfd\x13\x92\x64\x33\xf2\x04\x6c\xfd\x70\x96\x53\x2e\x58\x36\xc3\x7c\x86\x34\x1d\xd8\x5c\x0e\x64\x74\x24\xa3\x7c\x50\xad\x04\xd2\xdc\xbd\xc1\x69\x79\xb2\x17\x29\x64\xe9\x94\xc6\x87\x6a\xcd\x30\xc9\x50\xf2\xe2\xbb\x92\xfc\x4b\x5c\x40\x95\x7e\x0e\x04\x52\x5c\x00\x9b\x7c\xc6\x50\xb8\xd3\x22\x0d\xe5\x73\x4f\x1b\x82\x13\xfd\x1e\x3c\x53\x6f\xfd\xae\x24\xc0\x89\xc5\x4d\x50\x09\xbd\xa6\x69\x54\x96\x7d\x10\x2c\xa3\xe1\xd3\xeb\x4b\xe0\x22\xa7\x69\xec\xc3\xc9\xb3\x06\xb5\xb0\x72\x9d\x1c\x45\x91\xa7\xf0\xb8\xf9\x64\xe5\x3a\x4e\x13\x6d\xd8\xe5\x42\xdf\x75\x1c\xed\xec\xd0\x91\x2f\xfd\xb9\xef\x02\xc0\xda\x81\x21\xe8\x57\xf5\xbd\xef\x3a\xa5\x5b\x2a\x4e\x5a\x1e\x45\x38\xa5\x29\x72\x55\x9f\x5d\x31\x87\x53\xc1\x5d\xb1\xcc\xb0\xad\xcc\x45\x5e\x84\x42\x46\x65\x58\xac\x5e\x4d\x36\xdd\x56\x68\xbb\x48\x74\x6b\xa7\x0d\x96\xe6\xd2\x78\x3f\x12\x24\xbc\x93\x6e\x81\xe6\x51\x3b\x9e\xca\x05\x36\x55\x9f\xb9\x94\x80\x09\xe1\x18\x01\xd3\xfb\xae\xb5\xe5\x95\x4b\x2a\xff\x1e\x6f\x67\xc8\xaf\x2d\x78\xbe\x31\x6d\x65\xcd\xd4\x57\x50\x0b\xf1\xa0\x0a\x35\x29\xb8\xc0\x5c\x2e\xf6\xa1\xd7\x41\x65\xaf\x0f\xbc\x15\x70\xa0\x35\xb6\x2e\xf3\x8c\x84\xe8\x9b\xd0\x5f\xa2\xb8\x2a\x44\x56\x08\x6e\x62\xb7\xc2\x65\xe6\xc1\x34\x67\x73\xb5\x7c\x8e\x3c\xcc\xe9\x04\x95\xa3\x1c\x42\x92\x24\xdd\x21\xd7\xc8\x9e\x0f\xde\x9c\x64\x37\x3a\xf0\x5b\xfd\xd6\x07\xd5\x6d\x7c\xc9\x43\x65\x68\x78\x06\x1b\x72\xab\xd2\x75\x38\x72\xf5\x70\x4d\xcb\xd3\x0f\xa3\x11\x72\x4e\x59\xea\x3a\xfc\x3e\x94\xcf\x9a\xed\x26\x90\x9b\x50\xaa\xf9\xae\xeb\xa8\x68\x2e\xd2\xca\x44\x4b\xb2\x19\x94\x12\x93\xfb\x66\x9d\x0c\x59\xf5\x64\x21\xb3\x23\xdd\xf1\xec\x34\xf9\xbe\xda\x02\x55\x00\x2a\x24\xe5\xe7\x7d\xd8\x82\xf5\x1e\x5b\x4e\xf8\xae\x43\xa7\x4a\xf6\x7f\x67\x90\xd2\x44\x52\x50\xd5\x42\x4a\x13\x05\x23\x71\x1d\xd9\x6c\x98\x00\x5e\xe4\x08\x74\xaa\xcf\x06\xca\x01\xef\xe5\xe1\xc2\x38\xa7\x93\x04\x15\x56\x82\xa9\xa7\x7d\xd0\xde\x71\x5f\x42\x3f\xd9\x06\xcc\x72\xae\xc8\xe9\xa5\x4c\xa7\xb9\x4a\x3c\x46\xb0\xa0\x62\x06\x62\x46\x84\x29\x00\xb9\x03\x7a\xbe\x0e\x71\xca\x72\xf8\xd8\x97\x35\x21\x23\xcc\xd5\xd9\xd5\x30\x79\xf3\xcb\x6d\x50\x95\x92\xb4\x6b\x92\x7a\x73\xc2\x0a\x61\x1e\xbc\xc6\xe5\x2d\x9c\x81\xb5\xf2\x9e\x24\x05\x6a\x03\xc6\x4f\xa3\xa6\x49\x30\xcd\x25\x47\x22\x34\x91\xb0\xa0\x49\x02\xa1\x5a\xb0\x2a\xd5\x38\x8e\xc0\x8b\x2c\x4b\x28\x46\x90\x91\x9c\xcc\x79\x77\x75\x5a\x98\xb2\x3c\xb5\x55\x38\x69\xd5\x86\x25\x75\x65\xa5\xb8\xae\xdc\xaf\xac\xcc\x70\xaa\x8e\x74\x19\xcc\xf0\x6c\xdd\x07\x5e\xa2\x50\xee\xbe\xa8\x74\xc6\x46\x68\xdd\x17\x0e\xeb\x05\xd5\xd7\xf1\x32\xc3\xb2\x0c\xb6\x63\x77\x34\x8c\x07\xeb\x9a\xae\xb2\x6f\xb7\x59\x8c\x1e\xbe\xd5\x9c\xca\xe0\xbb\xeb\x37\x43\x5b\xb2\xe6\x51\x89\x5d\x32\x41\xa7\x34\x54\x16\x9f\x5e\x5f\xf2\x21\xdc\xdc\x9e\x98\x76\xe2\x3a\x8e\xd3\xb0\x51\x1d\x0c\x4a\xb3\xec\x57\xc5\xa8\x59\x55\x87\x82\x95\x1a\xed\xfe\x5b\x59\x5c\x5e\xef\xda\x12\xea\xea\xc1\x7e\x8d\xf5\x1e\x73\x59\x17\x7b\xe1\x8c\xdc\x36\xc4\x96\x88\xef\x3a\x69\x45\x7d\x27\xec\x3a\x39\x5d\x2e\x9a\xcc\x39\x61\x7d\xd6\x74\x82\x59\xe7\x91\x82\xdb\x3c\xa6\x7c\x77\xb5\x3a\x35\xfd\xe1\x91\x60\x99\x84\xd2\x26\x7f\x67\xd1\x32\x18\x85\x33\x9c\x93\xe0\x6d\x2e\x8f\x4e\x41\x91\x97\xa5\x3c\xc8\x4f\x65\x7f\xdb\xb2\x6a\x70\x52\xe4\xf2\xaa\x2d\xa1\x1a\x32\xb5\xaa\xa9\x0c\xfa\x17\x46\x5a\x57\xda\x0e\x5e\xe3\xb2\x2c\x57\x2b\xa3\xaf\xbf\x4a\x49\x89\xd4\xab\xd7\xab\xb2\x2a\xcb\x9e\x46\xc4\x84\xe3\xc3\x61\xe4\xbf\xb2\x0c\xae\x26\x9f\x83\xd5\xea\x51\x63\xbf\x18\x80\x91\xba\xd2\x28\x3d\x95\x81\xfa\xab\x52\xed\xd5\x86\xd3\x7d\xee\xab\x8e\xb9\x3e\x69\xaa\x24\xd5\xe1\x7b\x7b\x7c\xee\xaf\x75\xce\x89\x20\xab\xab\xc9\xe7\xa1\x2a\x8b\x47\xcd\x4b\xa7\xbe\x63\x0d\xa1\xee\x38\xaf\xb4\xda\x70\xad\x2f\x1b\x99\x5f\xee\x3a\xcc\xac\x63\x51\x6e\x2b\x80\x1d\xbe\x75\x96\xdc\x66\x9a\x94\x7c\xaf\x6f\xdd\x9b\xe4\x56\xa6\xd3\xe5\xae\xd8\x15\x6f\xbe\xdf\xa2\xd9\x4e\xb5\x2a\x24\x0f\xff\x50\x65\xab\x12\x08\x3d\xbb\x0f\xf4\xfc\x76\x6a\x76\xf9\xac\x30\xf6\x3a\xbc\xc1\xbc\x6e\x1a\x7e\xc3\xb7\x07\x55\xb9\xa9\x47\xa7\x6d\x7b\x67\x4d\x5b\x4a\x07\x15\xf1\xfe\xaa\x3d\xa8\x4c\x7f\x70\x5d\x7e\xe3\x9c\x6e\xd0\xb0\xad\xea\xd4\xc7\xfa\x93\xeb\xa8\x0b\x0b\x0a\xcc\xd5\xa9\x79\x73\xdb\xbe\x8a\xbc\xad\x9e\xcb\x0b\xb1\x25\x7c\x06\x24\xcb\x30\x8d\xbc\x7a\xad\x0f\x76\xd9\xfa\x0f\x17\xaf\x8f\x95\x7d\x1a\xa9\x75\x6e\xec\x93\x0d\x7f\xd0\xe1\xb0\xd7\xb1\x1d\xdd\xa2\xbb\x4f\x1c\x02\xea\x77\x25\xdb\xba\x23\x05\x23\x14\xeb\xdc\x72\x0b\xca\x6f\x5d\x43\xc6\x24\xde\xac\xcd\x31\x89\xbf\xf4\x1e\xb2\x1f\xef\xcb\x2e\x22\xdd\xb8\x5f\x72\x13\xe9\x46\x7b\xc8\x55\xc4\x75\x04\x89\x3b\x36\xd4\x98\xa8\xd9\x52\x09\xac\x33\x29\xbf\x35\xb7\xcf\x98\xc4\xfe\x6e\xa9\x9a\xcf\x0e\x41\x9b\x9a\x0e\x91\x66\xc4\xfe\x66\x89\x8c\x49\xcc\x95\xac\xef\xba\x60\x37\x30\xd0\xe3\xa6\x3d\xcf\xb4\x66\x4d\xdd\xf4\xcc\x2c\xf5\x2e\x8b\x9a\xb3\x54\xa1\x16\xd4\xf0\x84\x7f\x52\x2e\x68\x1a\xeb\xa1\xaa\x7b\x76\xb2\x30\x3c\xad\x1e\xed\xfa\xe3\x4b\xf7\x78\x65\x01\xfd\x3c\xe3\x95\x89\xf8\x90\xa9\xea\x60\x95\x07\x0e\x53\x16\x7f\xc7\x61\xea\x38\x4c\x1d\x87\xa9\x7f\xc3\x30\x65\x36\xfb\x77\xb8\xaa\x1e\x27\xa8\x7f\x62\x82\x82\xff\xd2\x04\xf5\xfd\x8a\xf1\x38\x37\x1d\xe7\xa6\xe3\xdc\x74\x9c\x9b\x7e\xb2\xb9\xc9\x9e\x65\x76\xcd\x4d\xe7\x98\x60\x63\x6e\x8a\xd4\x42\xfd\x1b\x54\xf7\xb8\x64\xa9\x7a\x3e\x78\xdf\x74\xc2\xd9\xf7\xd3\xe6\xda\xb2\x9e\x0f\xca\x0d\x7e\xec\xdf\x9c\xed\x01\x41\xb2\xf5\xd1\x26\xca\x8e\x62\x17\x51\x1f\x08\x15\xef\x52\x41\x13\x25\xaa\xb5\xa2\x43\x29\xdb\x0a\xf2\xdd\xc9\xfb\xea\xdf\x85\xc1\xe2\x6f\x5b\x48\xcf\xd8\x3c\x93\xef\x9d\x84\xfe\x1d\x00\x00\xff\xff\xe5\xc6\x19\xcc\xa6\x24\x00\x00")
+var _cftGoTempl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x59\x6d\x6f\x9b\xc8\x13\x7f\x0d\x9f\x62\xfe\x56\xd5\x3f\x44\x0e\xbe\xbe\xb5\x2e\x27\xf5\x9a\x3e\x44\xad\x92\x2a\x76\xdb\x17\x51\xd4\xae\x61\x8c\xb7\xc1\x2c\xc7\x2e\xf1\xf9\x2c\xbe\xfb\x69\x1f\x30\x0b\x36\x76\xdc\xf6\xda\xeb\xc9\xa8\x95\x61\x99\xf9\xcd\xe3\xce\xec\x84\xc1\x00\x7e\xd3\x17\x9c\x5f\xc1\xe5\xd5\x18\x9e\x9f\x5f\x8c\x61\xfc\xea\x62\x04\x2f\x2e\xde\x3c\x87\x5f\xd7\x97\x3b\x18\xc0\x78\x46\x39\x4c\x69\x82\x40\x39\x90\x42\xb0\x18\x53\xcc\x89\xc0\x08\xee\x29\x81\x4f\x64\xc1\x4f\x59\x26\x57\x58\x7e\x1a\xb2\x08\x63\x4c\x21\xcb\x59\x88\x9c\x7f\x92\x00\x17\x53\x58\xb2\xe2\xff\x11\x24\xf4\x0e\x41\xcc\x10\xc2\x19\x49\x63\x04\x92\x2e\xc5\x8c\xa6\x31\x90\x09\x2b\x04\x88\xb5\xa0\x39\xb9\x43\xc0\x88\x0a\x0e\x82\x29\x8e\x40\xe0\x3c\x4b\x24\x9a\xd6\x24\x55\xab\xd9\x5d\x3c\x30\x12\x07\x84\x73\x14\x1c\x22\x9a\x63\x28\x58\xbe\x0c\x5c\x37\x23\xe1\x1d\x89\x11\x56\xab\x60\x94\x61\x18\x5c\x23\x67\x45\x1e\x62\x70\x49\xe6\x58\x96\xae\x4b\xe7\x19\xcb\x05\x78\xae\xd3\xc3\x3c\x67\x39\xef\xb9\x4e\x2f\xa6\x62\x56\x4c\x82\x90\xcd\x07\x64\xc1\xe5\xff\x53\x1e\xdd\x9d\xc6\x4c\xde\xee\x26\xe0\x98\xdf\xd3\x10\x07\x61\xc2\x8a\x68\xca\xf2\x39\x11\x94\xa5\x3d\xd7\x21\x0b\xfe\xfe\x09\x49\xb2\x19\x79\x02\x36\x7f\x38\xcb\x29\x17\x2c\x9b\x61\x3e\x43\x9a\x0e\x6c\x5f\x0e\xa4\x75\x24\xa3\xbc\x82\x5d\xbf\x09\xa4\xd8\x7b\x83\xd7\xd2\x68\x2f\x62\xc8\xd2\x29\x8d\x0f\xe5\x9a\x61\x92\xa1\xf4\x8f\xef\xca\x20\x5c\xe2\x02\xaa\x34\xe0\x40\x20\xc5\x05\xb0\xc9\x67\x0c\x85\x3b\x2d\xd2\x50\xbe\xf7\xb4\x20\x38\xd1\xbf\xc1\x33\xf5\xd3\xef\x0a\x06\x9c\x58\x3e\x0a\x2a\xa2\xd7\x34\x8d\xca\xb2\x0f\x82\x65\x34\x7c\x7a\x7d\x09\x5c\xe4\x34\x8d\x7d\x38\x79\xd6\x70\x31\xac\x5c\x27\x47\x51\xe4\x29\x3c\x6e\xbe\x59\xb9\x8e\xd3\x44\x1b\x76\xa9\xd0\x77\x1d\x47\x2b\x3b\x74\xe4\xa5\xef\xfb\x2e\x00\xac\x15\x18\x82\xbe\xaa\xe7\xbe\xeb\x94\x6e\xa9\x7c\xd2\xd2\x28\xc2\x29\x4d\x91\xab\x3c\xed\xb2\x39\x9c\x0a\xee\x8a\x65\x86\x6d\x66\x2e\xf2\x22\x14\xd2\x2a\xe3\xc5\xea\x6a\x7a\xd3\x6d\x99\xb6\xcb\x89\x6e\xad\xb4\xc1\xd2\xbe\x34\xda\x8f\x04\x09\xef\xa4\x5a\xa0\xfd\xa8\x15\x4f\xe5\x02\x9b\xaa\x7b\x2e\x29\x60\x42\x38\x46\xc0\xf4\xfe\x6b\x6d\x7d\xa5\x92\x8a\xbf\xc7\xdb\x11\xf2\x6b\x09\x9e\x6f\x44\x5b\x51\x33\xf9\x15\xd4\x44\x3c\xa8\x4c\x4d\x0a\x2e\x30\x97\x8b\x7d\xe8\x75\xb8\xb2\xd7\x07\xde\x32\x38\xd0\x1c\x5b\x97\x79\x46\x42\xf4\x8d\xe9\x2f\x51\x5c\x15\x22\x2b\x04\x37\xb6\x5b\xe6\x32\xf3\x62\x9a\xb3\xb9\x5a\x3e\x47\x1e\xe6\x74\x82\x4a\x51\x0e\x21\x49\x92\x6e\x93\x6b\x64\xcf\x07\x6f\x4e\xb2\x1b\x6d\xf8\xad\xfe\xe9\x83\xaa\x3a\xbe\xf4\x43\x25\x68\x78\x06\x1b\x74\xab\xd2\x75\x38\x72\xf5\x72\xed\x96\xa7\x1f\x46\x23\xe4\x9c\xb2\xd4\x75\xf8\x7d\x28\xdf\x35\xcb\x4e\x20\x37\xa1\x64\xf3\x5d\xd7\x51\xd6\x5c\xa4\x95\x88\x16\x65\xd3\x28\x45\x26\xf7\xcd\x3a\x18\x32\xeb\xc9\x42\x46\x47\xaa\xe3\xd9\x61\xf2\x7d\xb5\x05\x2a\x03\x94\x49\x4a\xcf\xfb\xb0\x05\xeb\x3d\xb6\x94\xf0\x5d\x87\x4e\x15\xed\xff\xce\x20\xa5\x89\x74\x41\x95\x0b\x29\x4d\x14\x8c\xc4\x75\x64\xb1\x61\x02\x78\x91\x23\xd0\xa9\xee\x11\x94\x03\xde\xcb\x26\xc3\x38\xa7\x93\x04\x15\x56\x82\xa9\xa7\x75\xd0\xda\x71\x5f\x42\x3f\xd9\x06\xcc\x72\xae\x9c\xd3\x4b\x99\x0e\x73\x15\x78\x8c\x60\x41\xc5\x0c\xc4\x8c\x08\x93\x00\x72\x07\xf4\x7c\x6d\xe2\x94\xe5\xf0\xb1\x2f\x73\x42\x5a\x98\xab\x1e\xd6\x10\x79\xf3\xcb\x6d\x50\xa5\x92\x94\x6b\x82\x7a\x73\xc2\x0a\x61\x5e\xbc\xc6\xe5\x2d\x9c\x81\xb5\xf2\x9e\x24\x05\x6a\x01\x46\x4f\xc3\xa6\x9d\x60\x8a\x4b\x8e\x44\x68\x47\xc2\x82\x26\x09\x84\x6a\xc1\xca\x54\xa3\x38\x02\x2f\xb2\x2c\xa1\x18\x41\x46\x72\x32\xe7\xdd\xd9\x69\x61\xca\xf4\xd4\x52\xe1\xa4\x95\x1b\x16\xd5\x95\x15\xe2\x3a\x73\xbf\x32\x33\xc3\xa9\x6a\xed\xd2\x98\xe1\xd9\xba\x0e\xbc\x44\xa1\xd4\x7d\x51\xf1\x8c\x0d\xd1\xba\x2e\x1c\x56\x0b\xaa\xc7\xf1\x32\xc3\xb2\x0c\xb6\x63\x77\x14\x8c\x07\xf3\x9a\xaa\xb2\x6f\xb7\x59\x1e\x3d\x7c\xab\x39\x95\xc0\x77\xd7\x6f\x86\x36\x65\xed\x47\x45\x76\xc9\x04\x9d\xd2\x50\x49\x7c\x7a\x7d\xc9\x87\x70\x73\x7b\x62\xca\x89\xeb\x38\x4e\x43\x46\xd5\x18\x14\x67\xd9\xaf\x92\x51\x7b\x55\x35\x05\x2b\x34\x5a\xfd\xb7\x32\xb9\xbc\xde\xb5\x45\xd4\x55\x83\xfd\x1a\xeb\x3d\xe6\x32\x2f\xf6\xc2\x19\xba\x6d\x88\x2d\x12\xdf\x75\xd2\xca\xf5\x9d\xb0\xeb\xe0\x74\xa9\x68\x22\xe7\x84\x75\xaf\xe9\x04\xb3\xfa\x91\x82\xdb\x6c\x53\xbe\xbb\x5a\x9d\x9a\xfa\xf0\x48\xb0\x4c\x42\x69\x91\xbf\xb3\x68\x19\x8c\xc2\x19\xce\x49\xf0\x36\x97\xad\x53\x50\xe4\x65\x29\x1b\xf9\xa9\xac\x6f\x5b\x56\x0d\x4e\x8a\x5c\x1e\xb9\x25\x54\x83\xa6\x66\x35\x99\x41\xff\xc2\x48\xf3\x4a\xd9\xc1\x6b\x5c\x96\xe5\x6a\x65\xf8\xf5\xa3\xa4\x94\x48\xbd\x7a\xbd\x4a\xab\xb2\xec\x69\x44\x4c\x38\x3e\x1c\x46\xfe\x2b\xcb\xe0\x6a\xf2\x39\x58\xad\x1e\x35\xf6\x8b\x01\x18\xa9\x23\x8d\xe2\x53\x11\xa8\x1f\x15\x6b\xaf\x16\x9c\xee\x53\x5f\x55\xcc\x75\xa7\xa9\x82\x54\x9b\xef\xed\xd1\xb9\xbf\xe6\x39\x27\x82\xac\xae\x26\x9f\x87\x2a\x2d\x1e\x35\x0f\x9d\xfa\x8c\x35\x84\xba\xe2\xbc\xd2\x6c\xc3\x35\xbf\x2c\x64\x7e\xb9\xab\x99\x59\x6d\x51\x6e\x2b\x80\x1d\xba\x75\xa6\xdc\x66\x98\x14\x7d\xaf\x6f\x9d\x9b\xe4\x56\xa6\xd3\xe5\x2e\xdb\x95\xdf\x7c\xbf\xe5\x66\x3b\xd4\x2a\x91\x3c\xfc\x43\xa5\xad\x0a\x20\xf4\xec\x3a\xd0\xf3\xdb\xa1\xd9\xa5\xb3\xc2\xd8\xab\xf0\x86\xe7\x75\xd1\xf0\x1b\xba\x3d\x28\xcb\x4d\x3e\x3a\x6d\xd9\x3b\x73\xda\x62\x3a\x28\x89\xf7\x67\xed\x41\x69\xfa\x83\xf3\xf2\x1b\xc7\x74\xc3\x0d\xdb\xb2\x4e\xdd\xd6\x77\xae\xa3\x0e\x2c\x28\x30\x57\x5d\xf3\xe6\xb6\x7d\x14\x79\x5b\xbd\x97\x07\x62\x8b\xf8\x0c\x48\x96\x61\x1a\x79\xf5\x5a\x1f\xec\xb4\xf5\x1f\x4e\x5e\xb7\x95\x7d\x1c\xa9\xd5\x37\xf6\xd1\x86\x3f\xa8\x39\xec\x55\x6c\x47\xb5\xe8\xae\x13\x87\x80\xfa\x5d\xc1\xb6\xce\x48\xc1\x08\xc5\x3a\xb6\xdc\x82\xf2\x5b\xc7\x90\x31\x89\x37\x73\x73\x4c\xe2\x2f\x3d\x87\xec\xc7\xfb\xb2\x83\x48\x37\xee\x97\x9c\x44\xba\xd1\x1e\x72\x14\x71\x1d\x41\xe2\x8e\x0d\x35\x26\x6a\xb6\x54\x04\xeb\x48\xca\xa7\xe6\xf6\x19\x93\xd8\xdf\x4d\x55\xfb\xb3\x83\xd0\x76\x4d\x07\x49\xd3\x62\x7f\x33\x45\xc6\x24\xe6\x8a\xd6\x77\x5d\xb0\x0b\x18\xe8\x71\xd3\x9e\x67\x5a\xb3\xa6\x2e\x7a\x66\x96\x7a\x97\x45\xcd\x59\xaa\x50\x0b\x6a\x78\xc2\x3f\x29\x17\x34\x8d\xf5\x50\xd5\x3d\x3b\x59\x18\x9e\x66\x8f\x76\xfd\xf1\xa5\x7b\xbc\xb2\x80\x7e\x9e\xf1\xca\x58\x7c\xc8\x54\x75\x30\xcb\x03\x87\x29\xcb\x7f\xc7\x61\xea\x38\x4c\x1d\x87\xa9\x7f\xc3\x30\x65\x36\xfb\x77\x38\xaa\x1e\x27\xa8\x7f\x62\x82\x82\xff\xd2\x04\xf5\xfd\x92\xf1\x38\x37\x1d\xe7\xa6\xe3\xdc\x74\x9c\x9b\x7e\xb2\xb9\xc9\x9e\x65\x76\xcd\x4d\xe7\x98\x60\x63\x6e\x8a\xd4\x42\xfd\x0d\xaa\x7b\x5c\xb2\x58\x3d\x1f\xbc\x6f\x3a\xe1\xec\xfb\xb4\xb9\x96\xac\xe7\x83\x72\xc3\x3f\xf6\x37\x67\x7b\x40\x90\xde\xfa\x68\x3b\xca\xb6\x62\x97\xa3\x3e\x10\x2a\xde\xa5\x82\x26\x8a\x54\x73\x45\x87\xba\x6c\x2b\xc8\x77\x77\xde\x57\x7f\x17\x06\xcb\x7f\xdb\x4c\x7a\xc6\xe6\x99\xfc\xed\x74\xe8\xdf\x01\x00\x00\xff\xff\xd2\xd9\xc6\x1d\xae\x24\x00\x00")
 
 func cftGoTemplBytes() ([]byte, error) {
 	return bindataRead(
@@ -86,12 +86,12 @@ func cftGoTempl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "cft.go.templ", size: 9382, mode: os.FileMode(420), modTime: time.Unix(1536301391, 0)}
+	info := bindataFileInfo{name: "cft.go.templ", size: 9390, mode: os.FileMode(420), modTime: time.Unix(1538374742, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
 
-var _controllerGoTempl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5a\x6f\x73\xdb\x36\xd2\x7f\x4d\x7e\x0a\x94\x4f\x9b\x92\xa9\x42\x3e\x79\x77\xe3\x39\x5f\xc7\x95\xd5\xd4\x53\xd7\xf2\xd9\x4e\xf3\x22\x93\x71\x61\x72\x25\x31\xa6\x08\x16\x80\xac\xb8\xaa\xbe\xfb\xcd\x62\x01\x0a\x94\x25\x45\x6a\x7a\x99\xb9\x4e\x33\x99\x31\x09\x2c\x16\xbb\xbf\xfd\x0b\x50\x59\xc6\xfe\x45\xff\xd8\xe9\x90\x5d\x0c\x6f\xd8\xe0\xf4\xec\x86\xdd\xfc\x70\x76\xcd\xbe\x3f\x3b\x1f\xb0\x7f\xb6\xff\xc2\x2c\x63\x37\x93\x52\xb1\x51\x59\x01\x2b\x15\xe3\x33\x2d\xc6\x50\x83\xe4\x1a\x0a\xf6\x50\x72\xf6\x0b\x9f\xab\x17\xa2\xc1\x11\x21\x99\x9b\xfb\x05\x57\x9e\x8d\xd8\xa3\x98\x7d\x5d\xb0\xaa\xbc\x07\xa6\x27\xc0\xf2\x09\xaf\xc7\xc0\x78\xfd\xa8\x27\x65\x3d\x66\xfc\x4e\xcc\x34\xd3\xed\x0e\x53\x7e\x0f\x0c\x8a\x52\x2b\xa6\x85\x59\x91\x6a\x98\x36\x15\x72\x23\x11\x6a\x33\xda\xdc\x8f\xb3\x5c\x14\x30\x86\x3a\xe3\x4a\x81\x56\xac\x28\x25\xe4\x5a\xc8\xc7\x34\x0c\x1b\x9e\xdf\xf3\x31\xb0\xc5\x22\xbd\x6e\x20\x4f\xaf\x40\x89\x99\xcc\x21\xbd\xe0\x53\x58\x2e\xc3\xb0\x9c\x36\x42\x6a\x16\x87\xc1\x62\xf1\x82\x95\x23\x46\x74\x67\xaa\x3f\x53\x5a\x4c\xcb\xdf\xa0\x58\x2e\xc3\x80\x4d\x41\xf3\x87\x97\x2c\xba\xff\x87\x4a\x4b\x91\xf1\xa6\x9c\xf2\x7c\x52\xd6\x20\x1f\x33\x94\x81\x37\xa5\xca\x90\x28\x7b\x78\x19\x85\x41\x34\x2e\xf5\x64\x76\x97\xe6\x62\x9a\xe5\x13\x59\x2a\x2d\x9a\x09\xc8\x09\x94\x75\xe6\xc3\x64\xd6\x4e\xa0\x6a\x40\xaa\x88\x64\x80\xda\xec\x18\x49\x18\x55\x90\xeb\x28\x3c\x90\x5b\x2e\xea\x51\x39\x8e\xd6\x14\xfa\xf7\x0c\x66\xa8\x30\x63\x07\x31\xfb\x15\x97\x75\x05\x13\xcd\x7d\xa9\x77\x72\x71\x1c\x5e\xdc\x97\x3a\x0a\x03\xde\x94\xf0\x41\x43\xad\x4a\x51\xab\x87\x97\x77\xa0\x79\x07\xc8\xd5\xe4\x0b\x44\x11\xe4\x03\xc8\x15\xa6\x1d\x82\xcc\x2e\x47\x84\x2d\x83\xbc\x2a\xa1\xd6\x2f\xc6\x22\xd3\x42\x54\x2a\xcb\x79\x3e\x01\x04\x8d\xcf\x15\x6f\xca\xc3\xd4\x35\x3b\xba\x91\x94\xcf\xd1\x26\x7c\xae\x7e\x7e\xc9\xab\x66\x82\x52\x7f\x12\xb3\xec\xc1\xf2\x21\xae\x24\xf9\x61\x3c\x69\x8d\xfd\xa3\x40\x67\x0f\x20\x11\x19\x28\x32\xfd\xd8\x40\xb1\x75\xbf\x8e\x33\x38\xdf\xe6\x1a\x41\x4d\x2f\x29\x48\xc8\x3b\x5c\xa4\x6c\xa3\xe9\x38\x43\x12\x62\x3c\xba\xa0\xc2\xb4\x80\x31\x29\xee\xde\x43\xae\x99\xd2\x42\x02\x2b\x60\x54\xd6\x25\x32\x09\x1f\xb8\x5c\xd1\x1e\x33\xe3\x48\x76\x1f\x37\xbc\x08\x03\x8c\xcc\x23\x46\xff\xa2\x2d\x71\x1b\xf5\xc2\xe0\xb2\x9a\x49\x5e\x1d\x6d\xa1\xa3\x59\xa2\x7c\x25\xc5\xac\xb1\x2c\xc9\x2b\x52\x33\x84\xbc\x7a\x61\xf0\x33\x41\x78\xe4\x4d\xdb\xa1\x5e\x18\x5c\xe7\xa2\x71\xe2\x6c\x72\x64\x23\x90\x6a\x78\x0e\x86\xb2\xe8\x85\xc1\x8f\x65\x5d\x38\x05\x6c\x10\xa7\x37\x8f\x0d\x0c\x47\xb1\xe7\x4b\xa9\x13\x19\xc9\x97\xcb\xc5\x32\x31\xac\xe2\x04\x37\x9d\x08\xa9\x0d\xe3\x23\xf6\xf6\x9d\xd2\xb2\xac\xc7\x8b\xb0\x63\xc2\x56\x51\x43\x5b\x23\x2d\x7b\x81\xe1\x89\x54\xd2\xe4\xd6\xed\x84\x48\x17\x20\x66\x2b\x34\x57\x36\xf5\x42\x7d\xd9\x0b\x97\xc6\xc2\x7d\x51\x6b\x29\xaa\x0a\x24\x93\xd0\x48\x50\xe8\x7d\x8c\xb3\x7c\x35\x6e\x8d\x3e\x12\xb2\x6b\xff\xdc\xd8\x97\x49\x2b\x86\x0a\xd1\x4f\x7d\x86\x4a\xcb\x59\xae\xd9\x22\x0c\x28\x73\x59\xe4\x9e\xd3\x5b\xda\x37\x7f\xcc\xa4\x86\x0f\xda\x4e\x5a\xdf\xa1\x31\x2f\x9a\x14\x68\xd6\xbe\xa4\x43\x1b\x0c\x0e\xf3\xb3\x5a\x83\x1c\xf1\x1c\x42\xc6\xb4\x68\xca\xfc\xe4\xea\xc2\xf0\x23\x88\xad\xb2\x17\x30\xf7\xc4\xcb\x25\x70\x0d\xbe\xa6\xa8\xe2\x9c\xeb\xdc\xd4\xad\x9d\xba\xda\xc5\x45\x38\x9a\xd5\x79\x97\x6f\x6c\x95\xed\xaa\xd9\x63\x4e\xcd\xae\x86\x3d\x76\xa8\x86\x09\x7b\xee\x29\xb1\x08\x03\x09\x7a\x26\x6b\xf6\x6c\x35\xba\x08\x03\x0b\xb9\xf3\x56\x7a\xeb\xd1\x38\xee\x7b\xd4\x8e\x1b\x29\xc2\xa0\x83\xf4\x51\x47\xaa\x5e\x18\x2c\x2d\x82\xd7\x9a\x4b\xfd\x06\x21\x22\xa0\x40\x19\xd0\xca\x5a\x69\x5e\x23\x2e\x62\xc4\x86\x04\xdc\xf5\x66\xe0\x78\x5d\x30\x9e\x6b\xc5\x84\x29\xf3\x53\x42\x30\xce\x7d\xad\x12\x6f\x9f\xb8\x76\x61\x68\x6d\xd9\x43\x93\x34\xfd\x89\x69\x34\xac\x8f\x2d\x96\x09\x03\x29\x85\xc5\x83\xf6\xfa\x81\xd7\x45\x05\x52\xb1\xa3\x63\x66\x6a\x47\x1b\x31\x83\x07\xa8\xb5\x9d\xfe\x7e\x56\xe7\x0a\x01\x3b\x29\x0a\x7c\x36\xc0\xe4\xa9\xa8\x4f\x0a\x0c\xf9\xe0\x75\x53\x70\x0d\x34\x83\xc3\xf4\x8e\x33\xa7\x50\x81\x3f\x43\xef\x06\xac\xcd\x15\x3a\x30\x35\x37\xd7\xb2\x42\x91\xcc\x4b\x7a\x01\xf3\x38\x4f\x73\xe7\x23\xa9\x33\x08\xcb\xd3\x8e\x09\xd8\xcb\x24\x0c\xf2\xd4\xf9\x76\x8f\xdd\xd2\x7f\x66\x19\x21\xd7\xf4\x0a\xc6\xa5\xd2\x20\xe3\xed\xd9\x95\x3d\xdb\x99\xa9\xc2\x60\x2c\x3c\x86\x9e\x19\x48\x5c\x0f\xb4\xd8\xa8\x45\x70\xc8\xc4\x59\x25\xf1\x13\x8e\xb1\x85\xee\x53\x35\x44\x2b\x74\x74\x4a\xaf\x06\xd7\x37\x34\x19\x27\x61\x40\xfe\x24\x91\x8e\x22\xe4\x02\xe6\x6f\x68\x2c\x76\x6a\xf4\x58\xeb\x0d\x3d\xb6\x6e\x67\x33\x62\x77\x23\x45\x2c\xcb\x94\x34\xd8\xa9\xf9\x4a\xfe\x36\xa0\xea\xb2\x42\xaf\xdf\x68\xca\x2c\x63\xbe\xfa\x6c\x5e\x56\x15\xd3\xdc\xb6\xc0\x53\x50\x8a\x8f\x31\x36\xa4\x98\x9a\x11\x83\x9e\xf1\xfd\x46\x8a\x1c\x94\xf2\x7c\xdf\x67\xb4\x2d\x79\x4c\xd5\x98\x3d\x27\x13\xfc\x44\xcc\xbf\x13\xc5\xa3\xe7\xf4\x95\x18\x8f\x09\x3c\xbb\xf2\xdc\x0c\x84\x01\x96\x66\x04\xcd\x83\xce\x25\xc5\xa0\x1c\x21\xe3\xd4\xec\xcd\xef\x2a\x40\x46\x01\x92\xb1\x63\x33\xe1\x60\x47\xe7\xb1\x33\xc4\x80\xa6\xdb\x02\x19\x06\x4b\x06\x95\xa2\xf5\x64\xdf\x6b\xf4\xd9\x5b\x94\x67\x95\xd2\x2e\x60\xfe\xbd\x90\xa4\x92\x55\x94\x7c\xc0\x3c\x26\x61\xd0\x86\xae\xea\xa1\x66\x46\x1b\xc7\xad\xb5\x18\xd5\x7f\xf2\xe7\x38\x8a\x92\xf4\xbc\x54\x3a\xa6\x2e\xde\x3c\x0f\x1b\xd3\xd8\x18\x6f\x46\x15\x91\xd3\x17\xc7\x68\x4e\x23\x9f\x85\x2a\x7d\x53\xea\xc9\x00\xe1\x8b\x41\xca\x24\xa5\xc7\x88\x00\x1d\x83\xd6\x58\x03\xb6\x37\x1f\xc8\xdb\x39\x0a\x48\x19\x06\x18\xf5\x01\xe6\xc2\xdb\x95\x67\xa2\x02\x54\xb1\x5b\xc5\xd2\x33\x0d\x53\x45\x82\x94\xa3\x76\x1c\x23\x4d\xcf\x14\xfe\xc9\xef\xcf\x4e\xd9\x31\x21\x7c\xc9\xa5\x82\xc2\x5a\xfc\x6d\x44\xb3\x45\xf4\x8e\xd6\x3b\x53\x49\x3f\xc8\xdb\x09\x67\xa9\xce\xac\x35\x17\x49\x8b\x7d\x40\x68\xbc\xc0\x30\xfa\xe2\x98\x45\x11\x7b\xf6\xcc\x73\x14\x1a\x5a\x10\x8e\x1b\x04\x72\xb8\x90\xf4\xd1\x3b\x94\x3b\xba\x1a\x9e\x9f\x7f\x77\xd2\xff\xf1\xb6\x3f\xfc\xe9\xf2\x7c\x70\x33\x20\x0e\x81\xb5\x68\x61\xd2\xa4\x51\x25\x76\x79\x6f\xcd\x41\x7b\x3b\x95\x4f\x2c\x76\xeb\x76\xed\x9a\x83\x34\x24\xb7\x3c\x40\xf8\xd3\x01\x4a\xbc\x45\xf4\x99\x09\x52\xa2\xff\x63\xb2\x6f\x9c\x5d\x17\x64\x0f\xa2\x2b\xe0\x4a\xd4\x07\x60\xe1\xb4\x38\x66\x65\x9d\x4b\x98\x42\xad\xaf\x44\x55\xdd\xf1\xfc\xbe\x2f\x66\xb5\xde\xa6\xce\xe1\x60\xff\x45\x00\x6b\xc3\xa3\x53\x0d\xbc\xda\xb6\xb1\x6f\x31\x6d\x43\x2c\xee\xde\xb3\xd2\xf5\x6b\xd8\x9b\x2c\xc2\xc0\xb4\x21\xe2\xee\x7d\x1a\x3f\xdf\x5e\x87\x92\xf4\x14\xa0\xe9\x8b\xe6\x31\xc6\x42\x64\x4b\x4f\x2d\xf4\xe6\xe3\xdd\x49\x51\x98\xa3\x5d\x39\x62\xca\x65\x90\xae\xda\xc6\xa7\x23\xf6\xfb\xef\x3b\x09\x36\x38\xbd\xe9\x82\x46\xa6\x6a\x77\x5b\x14\x85\xad\x89\x6b\x43\x12\x43\x27\x66\xba\x99\xe9\x55\xca\x1e\xe9\xb4\x6f\xda\x63\x0a\x72\x22\x5a\xc7\xdc\xf6\x9f\x69\xa7\x5c\x6d\x4c\xca\x23\x97\x95\x4d\xcf\xbd\x31\x2d\x53\x35\x60\x5f\x7f\xa5\xbe\x8e\x7a\x4c\x99\xf7\x24\x74\x07\x35\xb4\x9f\x79\x59\x86\x9b\xf6\x3c\xab\x47\x62\x14\x47\xbc\x28\xa0\xd8\xc9\x9a\xcd\x4b\x3d\x61\xca\xa6\xe8\xce\x66\x3d\x5b\x53\xe3\xe7\x04\x86\x4d\xe4\x45\x92\xec\xda\xf2\xa1\x84\x39\xe3\x9a\x4d\xb4\x6e\xd4\x51\x96\xe5\xa2\x56\xa2\x02\xec\x92\x52\x3e\xe5\xbf\x89\x9a\xee\x0e\x2a\x31\x2b\x46\x42\x4e\x8d\xd9\xb3\x89\x98\xc2\xb7\xff\x97\x19\x39\xb2\x02\x34\x2f\xab\x6f\x49\xa8\xe2\xf8\x2b\x15\xed\x10\x25\x74\x39\xa0\x1b\x97\x2b\xdb\x3a\x5d\x56\xb5\x62\x2b\xb7\x1e\x8b\xfa\x57\x83\x93\x9b\xc1\xed\xd9\xc5\xed\xe5\xd5\xf0\xd5\xd5\xe0\xfa\x3a\xea\xb1\x28\xda\x52\x76\xf7\x31\xb5\xb3\xb4\x91\x0f\x2d\xad\x28\xc2\x13\x13\x8e\x68\x40\xea\x2e\x2b\x05\x74\x22\xde\x1e\x16\xbe\x5a\x9d\xa6\x74\x7b\xe8\x52\x0f\x16\x8b\xaa\x18\xde\xbd\xef\xb1\x1a\xe6\xc3\x0d\x81\x2c\x84\x89\x64\x43\xb4\x7f\x30\x07\xb5\x59\x46\x3c\x0f\xc9\x01\x26\xfe\x0f\x8b\x5d\xc4\x9a\x12\x51\x2d\x12\x83\xda\xc7\x53\x09\xe9\xee\xb2\x89\xbd\xb7\x4c\xcf\x94\x31\x77\x5f\x4c\x1b\x2c\xda\xb1\xd8\x22\x49\x8f\x8d\x78\xa5\x20\xc1\xee\xe1\x0b\x77\x33\x82\x6a\x0c\x7e\x9d\xf1\x0a\x97\x39\x1d\x6f\x1e\x1b\x58\x2e\x7b\xa8\x53\x77\x28\xd9\x95\x74\x84\xd8\x2b\xeb\xbc\x76\x6e\x9d\xdf\x5b\xd5\xff\x94\xbc\xd3\x7a\xe3\xc7\x93\x43\x0d\x73\xd6\x70\xc9\xa7\x8a\x7d\xf5\xcd\x83\x69\xf8\x45\x55\xe0\x73\x64\x74\xa6\xf8\xaa\x05\xaa\x74\x68\x82\xa2\xa0\xdd\x27\x45\x59\x09\x6c\x86\x6a\xb7\xfd\x2b\xa4\x28\xe1\x94\xb1\x0f\x1f\x4d\x52\xaf\x2f\x4f\x3f\x7b\x92\x62\x6c\x8f\x2c\xe5\x22\x6e\xcd\xcd\xd1\x6f\xf7\xca\x56\x74\xdd\xf0\xd9\x7a\x0d\xda\x0e\xf5\xd9\xa7\x2d\x08\xbc\xa8\x3c\xf5\x1a\xfe\x24\xdc\x80\xfa\x41\xc1\x68\x8e\x0f\x07\x34\x01\xae\xb3\xa3\x66\x6e\x8b\x97\xd3\x99\x64\x77\x68\xf9\x3c\xf7\x30\xaf\xc3\x6b\x57\x1d\x0a\x77\x7d\x99\x32\x66\xdf\xd9\xac\x3f\xb9\x25\x30\xc7\x38\x77\x4b\xb6\x7e\xdc\xdf\xe7\xb2\xe0\x13\xce\xee\xb2\xbd\xa2\xd9\xef\xe4\xbe\x3a\x61\xa4\xaf\x40\xc7\x74\x28\xb0\xa7\xf8\x57\xd0\x39\xc4\x3f\xf5\x98\x3f\xed\x08\xef\x77\xfd\xf6\xbe\xca\x50\x61\x58\x98\xd3\xbb\x5b\xe5\x97\x72\x9f\xc8\x32\xf7\xad\xe3\x9d\xb9\xb7\x50\x7c\xf3\x32\x0c\x83\x5b\x42\xea\x10\xa0\x6c\x83\xe2\x73\xff\xa3\xf0\xb4\xc9\xcb\x31\xdb\x00\xc7\xda\x45\x98\x71\xc8\x0d\x27\xba\xc3\xdc\xb0\xd7\x36\xd0\xde\x3b\x36\x33\xee\x55\x9a\x93\xda\xdf\x4e\xfb\x5f\x75\xda\xcd\xed\xa4\x35\xc5\x3e\xc4\x74\x9e\x36\xae\x8e\x0f\x9b\x97\xb4\xb7\x59\xce\xe6\xd4\xcf\x6e\xeb\x2e\x55\xb7\x97\x34\xa5\xc1\xab\x35\xd6\xbb\xfc\x8d\x5c\x25\xa7\xb2\xaf\x3a\xcd\x20\xda\x83\x86\xe3\x4f\xbf\x08\xb4\x1b\xd8\x1a\x1f\x06\xde\xc7\xb8\x2f\x1b\x29\x1a\xdc\x94\x4c\x36\xb4\x1d\x48\x3e\x81\x29\x4f\x2f\xa5\x68\x40\xea\xd2\x7d\x9a\xb3\x09\xdf\xac\x49\x6f\x60\xda\x54\x5c\xbb\x5f\x22\x04\x8b\x05\x8d\xff\x08\x8f\xd8\x22\x1b\x67\x76\x58\xad\x68\xe3\xc8\xd1\xd9\x31\xba\xd7\x77\x84\xa7\x5c\xf3\xc5\xf0\xee\xfd\xd1\x1a\x50\x7d\xfb\x3d\x88\x60\x5c\xfa\xb7\xad\xc6\x64\x56\x6e\xc7\xfb\xda\x7c\x57\x31\x92\xb0\x63\xd6\x91\xcc\xaa\xe1\xea\xdf\x01\x6c\x2c\x8a\x6f\x9f\x68\x60\x08\xa2\x77\x8e\x73\x5d\xac\x76\xb1\xdf\x2b\xff\x27\x12\xe6\xa1\xde\x4d\xea\xa8\xc7\x3a\x3f\x29\x0a\xf3\x25\x9d\x57\x2e\xcc\xd4\x46\x87\x3f\xc8\x93\xb1\xb9\x71\xe2\xe3\x26\xbe\xf4\xce\x95\xb7\xa4\xf9\xa7\x97\xb4\x9f\x96\xe5\xff\xce\xe3\x7b\xe4\xf1\x1d\xc9\xce\x26\x3a\xeb\xff\xfb\x34\xd5\xeb\xcc\x57\x4b\xdf\xf0\x52\xbf\xae\x75\x59\x99\xd5\xc4\xa8\xa0\x12\xd1\x2e\x71\x7e\xb0\xdb\x37\x9f\xf8\x84\x62\xbb\x0e\x1c\x0c\x91\x22\x47\x30\xfe\xff\x19\x0d\xee\xdd\x68\x91\xc9\xdd\x55\xd7\xbe\x46\x7f\xd2\x19\xb5\x3f\x76\xd9\x54\x6d\xb1\xcf\x5f\x35\xf6\x1b\x00\x4c\xaf\x41\x3e\x94\xb9\x29\x0b\xca\x3d\x1e\x1d\xaf\x7e\x13\xb2\x5c\x2c\x6c\xea\xf3\x2a\x8d\xff\x5d\x69\x2f\xd6\xed\xb1\x0e\x7e\x5d\xad\x36\x17\x2e\x2c\x1a\x7c\xd0\x20\x6b\x42\x28\x22\xd2\x2f\xe5\xda\xb9\xc7\x2b\x40\x74\xa3\xeb\x2f\xb2\xfb\xc4\xde\x11\x70\xe3\x05\x62\xe4\x33\xf6\x19\x98\xba\xb5\x58\xc4\x65\x5d\xc0\x07\x4f\xbe\x4b\x21\xb5\x62\xff\x9f\x98\x87\x25\xda\xa3\x85\xe8\x98\xf1\xa6\x81\xba\x88\xdd\x08\x32\x58\x17\xbb\x73\xcc\xea\x3e\xee\x6b\x93\x96\xe3\x4e\xba\x63\xe6\xc4\x70\xd6\xfa\xb8\xe1\xc9\x85\x7f\xe2\x0d\x6e\x43\xd0\x4d\xf1\xe5\x4f\x32\x7e\x87\xfd\x26\x9b\x62\x7f\x80\x2c\xa6\xbc\x79\x4b\xdb\xb5\x3f\x43\xea\x74\x35\xa5\x86\x29\xd2\xad\xd6\x9b\x95\xee\x07\x46\x66\x9e\xfa\x81\xe8\x88\xb5\x03\x3f\xf3\x6a\x66\x7f\x77\xd4\x2d\xdf\x7b\x79\x57\x2b\xfc\x47\x7d\x6a\xb3\x5e\x89\xfb\xa5\x91\x41\xb4\xf5\x95\xd5\xd8\x3e\xde\xb2\xbf\xf5\x76\x3a\x89\x47\xe9\x2a\x1d\x4a\xd0\x3a\xca\xfe\xfd\x4c\x27\x77\xad\x75\x34\x7b\xe4\x2a\x77\xc1\xf8\xe4\x0b\xd6\x7f\x02\x00\x00\xff\xff\x61\xa8\x7a\x00\x24\x2c\x00\x00")
+var _controllerGoTempl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5a\x6f\x6f\xdb\x36\xb7\x7f\x2d\x7d\x0a\x4e\x77\xeb\xa4\xce\x95\x6f\xdf\x5d\x04\x37\x77\xc8\x1c\xaf\x0b\xd6\x25\xb9\x49\xba\xbe\x28\x8a\x8c\x91\x8e\x6d\x36\xb2\xa8\x91\x74\xdc\xcc\xf3\x77\x7f\x70\x78\x48\x99\x72\x6c\xd7\xde\xfa\x0c\x78\x86\x15\x05\x22\x91\x87\x87\xe7\xcf\xef\xfc\x21\xe5\x7e\x9f\xfd\x1f\xfd\x63\xa7\x17\xec\xfc\xe2\x86\x0d\x4f\xcf\x6e\xd8\xcd\x0f\x67\xd7\xec\xfb\xb3\xd7\x43\xf6\xbf\xed\xbf\xb8\xdf\x67\x37\x13\xa1\xd9\x48\x54\xc0\x84\x66\x7c\x66\xe4\x18\x6a\x50\xdc\x40\xc9\x1e\x04\x67\xbf\xf0\xb9\x7e\x21\x1b\x1c\x91\x8a\xf9\xb9\x5f\x70\xe5\xd9\x88\x3d\xca\xd9\xd7\x25\xab\xc4\x3d\x30\x33\x01\x56\x4c\x78\x3d\x06\xc6\xeb\x47\x33\x11\xf5\x98\xf1\x3b\x39\x33\xcc\xb4\x3b\x4c\xf9\x3d\x30\x28\x85\xd1\xcc\x48\xbb\x22\x37\x30\x6d\x2a\xe4\x46\x22\xd4\x76\xb4\xb9\x1f\xf7\x0b\x59\xc2\x18\xea\x3e\xd7\x1a\x8c\x66\xa5\x50\x50\x18\xa9\x1e\xf3\x38\x6e\x78\x71\xcf\xc7\xc0\x16\x8b\xfc\xba\x81\x22\xbf\x02\x2d\x67\xaa\x80\xfc\x9c\x4f\x61\xb9\x8c\x63\x31\x6d\xa4\x32\x2c\x8d\xa3\xc5\xe2\x05\x13\x23\x46\x74\x67\x7a\x30\xd3\x46\x4e\xc5\x6f\x50\x2e\x97\x71\xc4\xa6\x60\xf8\xc3\x4b\x96\xdc\xff\x8f\xce\x85\xec\xf3\x46\x4c\x79\x31\x11\x35\xa8\xc7\x3e\xca\xc0\x1b\xa1\xfb\x48\xd4\x7f\x78\x99\xc4\x51\x32\x16\x66\x32\xbb\xcb\x0b\x39\xed\x17\x13\x25\xb4\x91\xcd\x04\xd4\x04\x44\xdd\x0f\xcd\x64\xd7\x4e\xa0\x6a\x40\xe9\x84\x64\x80\xda\xee\x98\x28\x18\x55\x50\x98\x24\x3e\x90\x5b\x21\xeb\x91\x18\x27\x6b\x0a\xfd\xff\x0c\x66\xa8\x30\x63\x07\x31\xfb\x15\x97\x75\x05\x93\xcd\xbd\x30\x3b\xb9\x78\x0e\x2f\xee\x85\x49\xe2\x88\x37\x02\x3e\x1a\xa8\xb5\x90\xb5\x7e\x78\x79\x07\x86\x77\x0c\xb9\x9a\x7c\x81\x56\x04\xf5\x00\x6a\x65\xd3\x0e\x41\xdf\x2d\x47\x0b\x3b\x06\x45\x25\xa0\x36\x2f\xc6\xb2\x6f\xa4\xac\x74\xbf\xe0\xc5\x04\xd0\x68\x7c\xae\x79\x23\x0e\x53\xd7\xee\x88\x12\x88\x02\xda\x99\x9c\xcf\xd1\x37\x7c\xae\x7f\x7e\xc9\xab\x66\x82\xd2\x7f\x16\xa6\xfd\x07\xc7\x8f\xb8\x93\x26\x87\xf1\xa6\x35\xee\x8f\x06\xd3\x7f\x00\x85\x96\x82\xb2\x6f\x1e\x1b\x28\x3f\xb9\x6f\x07\x24\x1e\xf3\xdc\xa0\xb1\xf3\x4b\x0a\x1e\x42\x8d\x8f\xa0\x6d\x34\x1d\x90\x64\x31\xc6\xa9\x0f\x36\x4c\x17\x18\xab\xf2\xee\x03\x14\x86\x69\x23\x15\xb0\x12\x46\xa2\x16\xc8\x24\x7e\xe0\x6a\x45\x7b\xcc\x2c\xc0\xdc\x3e\x7e\x78\x11\x47\x18\xb1\x47\x8c\xfe\x25\x5b\xe2\x39\xe9\xc5\xd1\x65\x35\x53\xbc\x3a\xda\x42\x47\xb3\x44\xf9\x4a\xc9\x59\xe3\x58\x12\x5a\x72\x3b\x84\xbc\x7a\x71\xf4\x33\x99\xf2\x28\x98\x76\x43\xbd\x38\xba\x2e\x64\xe3\xc5\xd9\x04\x70\x2b\x90\x6e\x78\x01\x96\xb2\xec\xc5\xd1\x8f\xa2\x2e\xbd\x02\x2e\xb8\xf3\x9b\xc7\x06\x2e\x46\x69\x80\xad\xdc\x8b\x8c\xe4\xcb\xe5\x62\x99\x59\x56\x69\x86\x9b\x4e\xa4\x32\x96\xf1\x11\x7b\xf7\x5e\x1b\x25\xea\xf1\x22\xee\xb8\xb0\x55\xd4\xd2\xd6\x48\xcb\x5e\x60\xd8\x22\x95\xb2\x39\x77\x3b\x21\xd2\x45\x68\xb3\x95\x35\x57\x3e\x0d\x52\xc0\xb2\x17\x2f\xad\x87\x07\xb2\x36\x4a\x56\x15\x28\xa6\xa0\x51\xa0\x11\x85\x8c\xb3\x62\x35\xee\x9c\x3e\x92\xaa\xeb\xff\xc2\xfa\x97\x29\x27\x86\x8e\x11\xaf\x21\x43\x6d\xd4\xac\x30\x6c\x11\x47\x94\xd1\x9c\xe5\x9e\xd3\x5b\x3e\xb0\x7f\xec\xa4\x81\x8f\xc6\x4d\x3a\xec\xd0\x58\x10\x55\x1a\x0c\x6b\x5f\xf2\x6b\x0a\x0a\x1f\x13\xde\xf4\x67\xb5\x01\x35\xe2\x05\xc4\x8c\x19\xd9\x88\xe2\xe4\xea\xdc\xb2\x25\x4b\x3b\x9d\xcf\x61\x1e\x48\x59\x28\xe0\x06\x42\x85\x51\xd3\x39\x37\x85\x2d\x6b\x3b\x55\x76\x8b\xcb\x78\x34\xab\x8b\x2e\xdf\xd4\xe9\xdc\xd5\xb6\xc7\xbc\xb6\x5d\x45\x7b\xec\x0f\x2a\x9a\xb1\xe7\x81\x2e\x8b\x38\x52\x60\x66\xaa\x66\xcf\x56\xa3\x8b\x38\x72\x0e\xf0\xd8\xa5\xb7\x1e\x8d\xe3\xf6\x47\xed\xb8\x15\x26\x8e\x3a\x76\x3f\xea\x08\xd7\x8b\xa3\xa5\x33\xe4\xb5\xe1\xca\xbc\x45\x4b\x91\xbd\x40\x5b\xdb\x89\x5a\x1b\x5e\xa3\x79\xe4\x88\x5d\x90\xfd\xae\x37\xdb\x8f\xd7\x25\xe3\x85\xd1\x4c\xda\x66\x60\x4a\x86\x4c\x8b\x50\xab\x2c\xd8\x27\xad\x7d\x50\x3a\x97\xf6\xd0\x33\xcd\x60\x62\xdb\x11\x87\xb8\xc5\x32\x63\xa0\x94\x74\xf6\xa0\xbd\x7e\xe0\x75\x59\x81\xd2\xec\xe8\x98\xd9\x0a\xd3\xc6\xcf\xf0\x01\x6a\xe3\xa6\xbf\x9f\xd5\x85\x46\x83\x9d\x94\x25\x3e\x5b\xc3\x14\xb9\xac\x4f\x4a\x4c\x00\xd1\x9b\xa6\xe4\x06\x68\x06\x87\xe9\x1d\x67\x4e\xa1\x82\x70\x86\xde\xad\xb1\x36\xd7\xf1\xc8\x56\xe6\xc2\xa8\x0a\x45\xb2\x2f\xf9\x39\xcc\xd3\x22\x2f\x3c\x54\x72\xef\x10\x56\xe4\x1d\x17\xb0\x97\x59\x1c\x15\xb9\x87\x78\x8f\xdd\xd2\x7f\xe6\x18\x21\xd7\xfc\x0a\xc6\x42\x1b\x50\xe9\xf6\x5c\xcb\x9e\xed\xcc\x5b\x71\x34\x96\x01\xc3\xc0\x0d\x24\x6e\x60\xb4\xd4\xaa\x45\xe6\x50\x99\xf7\x4a\x16\xa6\x1f\xeb\x0b\x33\xa0\x1a\x89\x5e\xe8\xe8\x94\x5f\x0d\xaf\x6f\x68\x32\xcd\xe2\x88\xf0\xa4\x90\x8e\x02\xe5\x1c\xe6\x6f\x69\x2c\xf5\x6a\xf4\x58\x8b\x86\x1e\x5b\xf7\xb3\x1d\x71\xbb\x91\x22\x8e\x65\x4e\x1a\xec\xd4\x7c\x25\x7f\x1b\x50\xb5\xa8\x10\xf5\x1b\x5d\xd9\xef\xb3\x50\x7d\x36\x17\x55\xc5\x0c\x77\x8d\xf2\x14\xb4\xe6\x63\x8c\x0d\x25\xa7\x76\xc4\x5a\xcf\x62\xbf\x51\xb2\x00\xad\x03\xec\x87\x8c\xb6\xe5\x90\xa9\x1e\xb3\xe7\xe4\x82\x9f\x88\xf9\x77\xb2\x7c\x0c\x40\x5f\xc9\xf1\x98\x8c\xe7\x56\xbe\xb6\x03\x71\x84\x85\x1a\x8d\x16\x98\xce\xe7\xc6\x48\x8c\x90\x71\x6e\xf7\xe6\x77\x15\x20\xa3\x08\xc9\xd8\xb1\x9d\xf0\x66\x47\xf0\xb8\x19\x62\x40\xd3\x6d\xb9\x8c\xa3\x25\x83\x4a\xd3\x7a\xf2\xef\x35\x62\xf6\x16\xe5\x59\x65\xb6\x73\x98\x7f\x2f\x15\xa9\xe4\x14\x25\x0c\xd8\xc7\x2c\x8e\xda\xd0\xd5\x3d\xd4\xcc\x6a\xe3\xb9\xb5\x1e\xa3\x6e\x80\xf0\x9c\x26\x49\x96\xbf\x16\xda\xa4\xd4\xeb\xdb\xe7\x8b\xc6\xb6\x39\x16\xcd\xa8\x22\x72\xfa\xe2\x18\xdd\x69\xe5\x73\xa6\xca\xdf\x0a\x33\x19\xa2\xf9\x52\x50\x2a\xcb\xe9\x31\x21\x83\x8e\xc1\x18\x2c\x05\xdb\x5b\x11\xe4\xed\x81\x02\x4a\xc5\x11\x46\x7d\x84\xb9\xf0\x76\x85\x4c\x54\x80\xea\x77\xab\x58\x7e\x66\x60\xaa\x49\x10\x31\x6a\xc7\x31\xd2\xcc\x4c\xe3\x9f\xe2\xfe\xec\x94\x1d\x93\x85\x2f\xb9\xd2\x50\x3a\x8f\xbf\x4b\x68\xb6\x4c\xde\xd3\x7a\xef\x2a\x15\x06\x79\x3b\xe1\x3d\xd5\x99\x75\xee\x22\x69\xb1\x2b\x88\x2d\x0a\x2c\xa3\x2f\x8e\x59\x92\xb0\x67\xcf\x02\xa0\xd0\xd0\x82\xec\xb8\x41\x20\x6f\x17\x92\x3e\x79\x8f\x72\x27\x57\x17\xaf\x5f\x7f\x77\x32\xf8\xf1\x76\x70\xf1\xd3\xe5\xeb\xe1\xcd\x90\x38\x44\xce\xa3\xa5\x4d\x93\x56\x95\xd4\xe7\xbd\x35\x80\xf6\x76\x2a\x9f\x39\xdb\xad\xfb\xb5\xeb\x0e\xd2\x90\x60\x79\x80\xf0\xa7\x43\x94\x78\x8b\xe8\x33\x1b\xa4\x44\xff\xc7\x64\xdf\x38\xbb\x2e\xc8\x1e\x44\x57\xc0\xb5\xac\x0f\xb0\x85\xd7\xe2\x98\x89\xba\x50\x30\x85\xda\x5c\xc9\xaa\xba\xe3\xc5\xfd\x40\xce\x6a\xb3\x4d\x9d\xc3\x8d\xfd\x37\x31\x58\x1b\x1e\x9d\x6a\x10\xd4\xb6\x8d\x7d\x8b\x6d\x1b\x52\x79\xf7\x81\x09\xdf\xaf\x61\x6f\xb2\x88\x23\xdb\x86\xc8\xbb\x0f\x79\xfa\x7c\x7b\x1d\xca\xf2\x53\x80\x66\x20\x9b\xc7\x14\x0b\x91\x2b\x3d\xb5\x34\x9b\x0f\x7b\x27\x65\x69\x0f\x7a\x62\xc4\xb4\xcf\x20\x5d\xb5\x2d\xa6\x13\xf6\xfb\xef\x3b\x09\x36\x80\xde\x76\x41\x23\x5b\xb5\xbb\x2d\x8a\xc6\xd6\xc4\xb7\x21\x99\xa5\x93\x33\xd3\xcc\xcc\x2a\x65\x8f\x4c\x3e\xb0\x5d\x32\x05\x39\x11\xad\xdb\xdc\xf5\x9f\x79\xa7\x5c\x6d\x4c\xca\x23\x9f\x95\x6d\xeb\xbd\x31\x2d\x53\x35\x60\x5f\x7f\xa5\xbf\x4e\x7a\x4c\xdb\xf7\x2c\xf6\xc7\x36\xf4\x9f\x7d\x59\xc6\x9b\xf6\x3c\xab\x47\x72\x94\x26\xbc\x2c\xa1\xdc\xc9\x9a\xcd\x85\x99\x30\xed\x52\x74\x67\xb3\x9e\xab\xa9\xe9\x73\x32\x86\x4b\xe4\x65\x96\xed\xda\xf2\x41\xc0\x9c\x71\xc3\x26\xc6\x34\xfa\xa8\xdf\x2f\x64\xad\x65\x05\xd8\x25\xe5\x7c\xca\x7f\x93\x35\xdd\x28\x54\x72\x56\x8e\xa4\x9a\x5a\xb7\xf7\x27\x72\x0a\xdf\xfe\x57\xdf\xca\xd1\x2f\xc1\x70\x51\x7d\x4b\x42\x95\xc7\x5f\xe9\x64\x87\x28\xb1\xcf\x01\xdd\xb8\x5c\xf9\xd6\xeb\xb2\xaa\x15\x5b\xb9\xf5\x58\x32\xb8\x1a\x9e\xdc\x0c\x6f\xcf\xce\x6f\x2f\xaf\x2e\x5e\x5d\x0d\xaf\xaf\x93\x1e\x4b\x92\x2d\x65\x77\x1f\x57\x7b\x4f\x5b\xf9\xd0\xd3\x9a\x22\x3c\xb3\xe1\x88\x0e\xa4\xee\xb2\xd2\x40\xe7\xe3\xed\x61\x11\xaa\xd5\x69\x4a\xb7\x87\x2e\xf5\x60\xa9\xac\xca\x8b\xbb\x0f\x3d\x56\xc3\xfc\x62\x43\x20\x4b\x69\x23\xd9\x12\xed\x1f\xcc\x51\x6d\x97\x11\xcf\x43\x72\x80\x8d\xff\xc3\x62\x17\x6d\x4d\x89\xa8\x96\x99\xb5\xda\xa7\x53\x09\xe9\xee\xb3\x89\xbb\xdd\xcc\xcf\xb4\x75\xf7\x40\x4e\x1b\x2c\xda\xa9\xdc\x22\x49\x8f\x8d\x78\xa5\x21\xc3\xee\xe1\x0b\x7f\x4f\x82\x6a\x0c\x7f\x9d\xf1\x0a\x97\x79\x1d\x6f\x1e\x1b\x58\x2e\x7b\xa8\x53\x77\x28\xdb\x95\x74\xa4\xdc\x2b\xeb\xbc\xf1\xb0\x2e\xee\x9d\xea\x9f\x25\xef\xb4\x68\xfc\x74\x72\xa8\x61\xce\x1a\xae\xf8\x54\xb3\xaf\xbe\x79\xb0\x0d\xbf\xac\x4a\x7c\x4e\xac\xce\x14\x5f\xb5\x44\x95\x0e\x4d\x50\x14\xb4\xfb\xa4\x28\x27\x81\xcb\x50\xed\xb6\x7f\x87\x14\x25\xbd\x32\xee\xe1\x93\x49\xea\xcd\xe5\xe9\x5f\x9e\xa4\x18\xdb\x23\x4b\xf9\x88\x5b\x83\x39\xe2\x76\xaf\x6c\x45\xd7\x0d\x7f\x59\xaf\x41\xdb\xa1\x3e\xfb\xb4\x05\x51\x10\x95\xa7\x41\xc3\x9f\xc5\x1b\xac\x7e\x50\x30\xda\xe3\xc3\x01\x4d\x80\xef\xec\xa8\x99\xdb\x82\x72\x3a\x93\xec\x0e\xad\x90\xe7\x1e\xee\xf5\xf6\xda\x55\x87\xe2\x5d\xdf\xaf\xac\xdb\x77\x36\xeb\x4f\x6e\x09\xec\x31\xce\xdf\x92\xad\x1f\xf7\xf7\xb9\x2c\xf8\x13\x67\x77\xd5\x5e\xd1\xec\x77\x72\x5f\x9d\x30\xf2\x57\x60\x52\x3a\x14\xb8\x53\xfc\x2b\xe8\x1c\xe2\x9f\x22\xe6\xb3\x1d\xe1\xc3\xae\xdf\xdd\x57\x59\x2a\x0c\x0b\x7b\x7a\xf7\xab\xc2\x52\x1e\x12\x39\xe6\xa1\x77\x82\x33\xf7\x16\x8a\x6f\x5e\xc6\x71\x74\x4b\x96\x3a\xc4\x50\xae\x41\x09\xb9\xff\x51\xf3\xb4\xc9\xcb\x33\xdb\x60\x8e\xb5\x8b\x30\x0b\xc8\x0d\x27\xba\xc3\x60\xd8\x6b\x1b\xe8\xe0\x1d\x9b\x19\xff\xaa\xec\x49\xed\x1f\xd0\xfe\x5b\x41\xbb\xb9\x9d\x74\xae\xd8\x87\x98\xce\xd3\x16\xea\xf8\xb0\x79\x49\x7b\x9b\xe5\x7d\x4e\xfd\xec\xb6\xee\x52\x77\x7b\x49\x5b\x1a\x82\x5a\xe3\xd0\x15\x6e\xe4\x2b\x39\x95\x7d\xdd\x69\x06\xd1\x1f\x34\x9c\xfe\xf9\x8b\x40\xb7\x81\xab\xf1\x71\x14\x7c\x9a\xfb\xb2\x51\xb2\xc1\x4d\xc9\x65\x17\xae\x03\x29\x26\x30\xe5\xf9\xa5\x92\x0d\x28\x23\xfc\x87\x3a\x97\xf0\xed\x9a\xfc\x06\xa6\x4d\xc5\x8d\xff\xbd\x42\xb4\x58\xd0\xf8\x8f\xf0\x88\x2d\xb2\x05\xb3\xb7\xd5\x8a\x36\x4d\x3c\x9d\x1b\xa3\x7b\x7d\x4f\x78\xca\x0d\x5f\x5c\xdc\x7d\x38\x5a\x33\xd4\xc0\x7d\x0f\x22\x33\x2e\xc3\xdb\x56\xeb\x32\x27\xb7\xe7\x7d\x6d\xbf\xab\x58\x49\xd8\x31\xeb\x48\xe6\xd4\xf0\xf5\xef\x00\x36\xce\x8a\xef\x9e\x68\x60\x09\x92\xf7\x9e\x73\x5d\xae\x76\x71\x5f\x2f\xff\x23\x12\xe6\xa1\xe8\x26\x75\xf4\x63\x5d\x9c\x94\xa5\xfd\xae\xce\x2b\x1f\x66\x7a\x23\xe0\x0f\x42\x32\x36\x37\x5e\x7c\xdc\x24\x94\xde\x43\x79\x4b\x9a\x7f\x7a\x49\xfb\xe7\xb2\xfc\x3f\x79\x7c\x8f\x3c\xbe\x23\xd9\xb9\x44\xe7\xf0\xbf\x4f\x53\xbd\xce\x7c\xb5\xf4\x2d\x17\xe6\x4d\x6d\x44\x65\x57\x13\xa3\x92\x4a\x44\xbb\xc4\xe3\x60\x37\x36\x9f\x60\x42\xb3\x5d\x07\x0e\x86\x96\x22\x20\x58\xfc\xff\x85\x0e\x0f\x6e\xb4\xc8\xe5\xfe\xaa\x6b\x5f\xa7\x3f\xe9\x8c\xda\x9f\xbe\x6c\xaa\xb6\xd8\xe7\xaf\x1a\xfb\x0d\x06\xf4\x5f\xf9\xb1\x2c\x68\xff\x78\x74\xbc\xfa\x85\xc8\x72\xb1\x70\xa9\x2f\xa8\x34\xe1\x77\xa5\xbd\x58\xb7\xc7\x3a\xf8\x75\xb5\xda\x5e\xb8\xb0\x64\xf8\xd1\x80\xaa\xc9\x42\x09\x91\x7e\xa9\xd6\xce\x3d\x41\x01\xa2\x1b\xdd\x70\x91\xdb\x27\x0d\x8e\x80\x1b\x2f\x10\x93\x90\x71\xc8\xc0\xd6\xad\xc5\x22\x15\x75\x09\x1f\x03\xf9\x2e\xa5\x32\x9a\xfd\x77\x66\x1f\x96\xe8\x8f\xd6\x44\xc7\x8c\x37\x0d\xd4\x65\xea\x47\x90\xc1\xba\xd8\x9d\x63\x56\xf7\x71\x5f\x9f\xb4\x1c\x77\xd2\x1d\x33\x2f\x86\xf7\xd6\xa7\x1d\x4f\x10\xfe\x89\x37\xb8\x0d\x99\x6e\x8a\x2f\x9f\xc9\xf9\x1d\xf6\x9b\x7c\x8a\xfd\x01\xb2\x98\xf2\xe6\x1d\x6d\xd7\xfe\x28\xa9\xd3\xd5\x08\x03\x53\xa4\x5b\xad\xb7\x2b\xfd\xcf\x8d\xec\x3c\xf5\x03\xc9\x11\x6b\x07\x7e\xe6\xd5\xcc\xfd\x0a\xa9\x5b\xbe\xf7\x42\x57\x2b\xfc\x27\x31\xb5\x59\xaf\xcc\xff\xee\xc8\x5a\xb4\xc5\xca\x6a\x6c\x1f\xb4\xec\xef\xbd\x9d\x20\x09\x28\x7d\xa5\x43\x09\x5a\xa0\xec\xdf\xcf\x74\x72\xd7\x5a\x47\xb3\x47\xae\xf2\x17\x8c\x4f\xbe\x60\xfd\x2b\x00\x00\xff\xff\x6b\x55\xf6\xeb\x4a\x2c\x00\x00")
 
 func controllerGoTemplBytes() ([]byte, error) {
 	return bindataRead(
@@ -106,12 +106,12 @@ func controllerGoTempl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "controller.go.templ", size: 11300, mode: os.FileMode(420), modTime: time.Unix(1536310344, 0)}
+	info := bindataFileInfo{name: "controller.go.templ", size: 11338, mode: os.FileMode(420), modTime: time.Unix(1538375832, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
 
-var _template_functionsGoTempl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x94\x94\x51\x8f\x9c\x36\x10\xc7\x9f\xf1\xa7\x98\xa2\x48\x5d\xaa\x3d\xac\x7b\xab\xa2\xa6\x0f\x6d\x2e\xc9\x2a\xd1\x5d\x95\x5b\x29\x8f\x8d\x17\x06\x18\x2d\xd8\x96\x3d\xec\x66\x85\xf8\xee\x95\x6d\xd8\x54\xa9\xd2\xbb\xf0\x02\x0c\xf6\x7f\xe6\xf7\xf7\x0c\x52\xc2\xef\xe9\x82\xd7\x0f\x70\xff\xb0\x87\xbb\xd7\xbb\x3d\xec\xdf\xed\x1e\xe1\xcd\xee\xc3\x1d\xfc\x76\xbd\x84\x94\xb0\xef\xc8\x43\x43\x3d\x02\x79\x50\x23\x9b\x16\x35\x3a\xc5\x58\xc3\x89\x14\x7c\x56\x67\x7f\x63\x6c\x88\x18\x77\x53\x99\x1a\x5b\xd4\x60\x9d\xa9\xd0\xfb\xcf\x41\x60\xd7\xc0\xc5\x8c\x3f\xd7\xd0\xd3\x11\x81\x3b\x84\xaa\x53\xba\x45\x50\xfa\xc2\x1d\xe9\x16\xd4\xc1\x8c\x0c\x7c\x4d\x34\xa8\x23\x02\xd6\xc4\x1e\xd8\xc4\x1d\x25\xe3\x60\xfb\xa0\x96\x2a\xd1\x31\x6a\x8f\xad\x5c\x32\x4a\xe5\x3d\xb2\x87\x9a\x1c\x56\x6c\xdc\xa5\x14\xc2\xaa\xea\xa8\x5a\x84\x0e\x7b\x8b\xce\x0b\x41\x83\x35\x8e\x61\x23\x32\x75\xf6\x55\x4f\xa8\x19\xf2\x96\xb8\x1b\x0f\x65\x65\x06\x59\x75\x8e\x3c\x1b\xdb\xa1\xeb\x90\xb4\xfc\x37\x9a\x8c\xc9\xe2\x9e\xe5\xe6\x91\xe5\x09\x9d\x27\xa3\xb1\x96\x7c\xb1\x58\xcb\x75\x75\xa9\xce\x5e\x9e\x6e\x55\x6f\x3b\x75\x9b\x8b\xec\xc7\xb2\x18\xdd\x50\x9b\x8b\x6c\x40\x56\xa7\x5b\xc8\x8f\xbf\xfa\x92\x8c\x54\x96\x06\x55\x75\xa4\xd1\x5d\xe2\x42\x65\xc9\xcb\xb0\x48\x9e\x6e\x73\x51\x88\xe0\xcf\x3d\x9e\xe1\x13\xf5\x3d\x38\xe4\xd1\xe9\x15\x3e\x18\x79\x40\xb0\xc1\xa6\x1a\x48\x2f\xbe\x46\x5b\x15\xa3\x17\xcd\xa8\xab\xb0\x79\x53\xc0\xbb\x65\xcb\x24\xb2\x45\x64\x89\x4c\x22\x03\x78\x3f\x1e\xd0\x69\x64\xf4\x1f\xd1\x9b\xd1\x55\x78\xaf\x06\x7c\xf9\x9d\xf8\x56\x64\xd9\x34\xdd\x80\x8b\x27\xfe\x82\x74\x8d\x5f\xb6\xf0\x02\x7b\x1c\x82\xfb\x2f\x5f\x41\xb9\x63\x1c\x3c\xcc\xb3\xc8\xb2\xb7\xc8\xd3\xb4\x7e\x2c\x1f\x2d\x56\xe5\x7b\xd2\xf5\x3c\xff\x71\x49\x49\x9e\x58\xb0\x66\xc3\x10\x12\xd9\x2c\xe6\xe8\xc9\x0a\x54\x63\x43\x1a\x3d\xa8\xbe\x8f\xf4\x29\x0e\x01\x9d\xc9\x68\x0f\xdc\x29\x06\xe5\x10\xf0\x8b\x35\xc1\xa8\xff\xd8\x14\x8e\xf9\xaa\xe7\xd9\x8d\x15\xc3\x24\xbe\xe7\x4a\x94\xde\x78\x76\xa4\xdb\x02\xd6\x07\xf1\x7c\x47\x9e\xe0\x4d\xfa\xbf\xa4\x86\x29\xff\x8c\xb7\x2d\xa4\x34\xeb\xbd\x80\x0d\x69\x46\xd7\xa8\x0a\xa7\x79\x0b\xe8\x9c\x71\x4b\x0d\xc9\xa7\x59\x88\xe7\x16\x24\xe5\x53\x47\x00\xe7\xd0\x7c\x0d\xe9\x3a\x3a\xe7\x16\x37\xe0\x70\x01\xad\x06\x4c\x7d\xf6\x84\xc6\x26\x01\xc1\xb7\x60\x41\xe0\x4a\x17\x5e\xbc\x55\x15\xfe\x2f\x67\x68\xe2\xde\xb4\x2d\xba\x00\xb2\xe8\x7d\x88\x01\x91\xa5\x39\x7e\x44\xde\xc2\xdf\xe1\xf3\xf5\xaf\x50\xde\xe3\xf9\x8d\x71\x29\xef\x52\x4d\xf9\xf1\xee\x71\x9f\x22\x45\x18\x8c\xc4\x15\xf3\x44\xe9\x55\xab\xfc\x96\xec\xaf\x7e\x74\xaa\x0f\x5c\xf3\xbc\xb9\x56\x5d\x94\x6f\x91\xe3\xeb\x16\xd2\x9c\x87\xc0\x83\x8d\x8d\x38\xcd\x85\xc8\xa8\x89\xda\x3f\xbd\x02\x4d\x7d\xe0\x58\x40\xca\x4f\xc4\xdd\x5d\xa0\xdb\xa0\x73\x45\x99\x1e\xf3\xc8\x0b\x2d\x32\x87\x5f\xaa\x0f\xdd\x6c\x2c\x55\x79\x21\xb2\x75\x8c\xf3\x3c\x96\x1b\x06\xe3\x3a\xda\x5f\x41\x34\xf5\x62\x16\x5f\xdb\xe2\x9f\x00\x00\x00\xff\xff\x17\x2c\xbb\xaa\x28\x06\x00\x00")
+var _template_functionsGoTempl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x94\x54\xc1\x8e\xdb\x36\x10\x3d\x8b\x5f\x31\x15\x02\xd4\x2a\xbc\x22\xf6\x56\x04\x4d\x0f\x6d\x36\x89\x91\x60\xb7\xc8\x1a\xc8\xb1\xa1\xa9\xb1\x34\xb0\x44\x12\xe4\xc8\x8e\x21\xe8\xdf\x0b\x92\xb2\x53\xa4\x48\x77\xa3\x0b\xa5\x11\xe7\xbd\x79\x8f\x33\x94\x12\x7e\xcf\x0f\xbc\x7e\x80\xfb\x87\x2d\xdc\xbd\xde\x6c\x61\xfb\x6e\xf3\x08\x6f\x36\x1f\xee\xe0\xb7\xeb\x23\xa4\x84\x6d\x47\x01\xf6\xd4\x23\x50\x00\x35\xb2\x6d\xd1\xa0\x57\x8c\x0d\x1c\x49\xc1\x67\x75\x0a\x37\xd6\xc5\x88\xf5\x37\xda\x36\xd8\xa2\x01\xe7\xad\xc6\x10\x3e\x47\x80\xcd\x1e\xce\x76\xfc\xb9\x81\x9e\x0e\x08\xdc\x21\xe8\x4e\x99\x16\x41\x99\x33\x77\x64\x5a\x50\x3b\x3b\x32\xf0\x95\x68\x50\x07\x04\x6c\x88\x03\xb0\x4d\x19\x35\xe3\xe0\xfa\x88\x96\x2b\x31\x29\xea\x0e\xad\x5c\x18\xa5\x0a\x01\x39\x40\x43\x1e\x35\x5b\x7f\xae\x85\x70\x4a\x1f\x54\x8b\xd0\x61\xef\xd0\x07\x21\x68\x70\xd6\x33\xac\x44\xa1\x4e\x41\xf7\x84\x86\xa1\x6c\x89\xbb\x71\x57\x6b\x3b\x48\xdd\x79\x0a\x6c\x5d\x87\xbe\x43\x32\xf2\xdf\xd2\x64\x22\x4b\x39\xcb\x12\x90\xe5\x11\x7d\x20\x6b\xb0\x91\x7c\x76\xd8\xc8\x80\xfe\x48\x1a\xaf\x59\xb5\x3a\x05\x79\xbc\x55\xbd\xeb\xd4\x6d\x29\x8a\x1f\x63\xb3\x66\x4f\x6d\x29\x8a\x01\x59\x1d\x6f\xa1\x3c\xfc\x1a\x6a\xb2\x52\x39\x1a\x94\xee\xc8\xa0\x3f\xa7\x8d\xca\x51\x90\x71\x93\x3c\xde\x96\xa2\x12\xd1\xa7\x7b\x3c\xc1\x27\xea\x7b\xf0\xc8\xa3\x37\x17\x13\xa2\xa1\x3b\x04\x17\xed\x6a\x80\xcc\xe2\x6f\xb2\x57\x31\x06\xb1\x1f\x8d\x8e\xc9\xab\x0a\xde\x2d\x29\x93\x28\x16\x90\x25\x32\x89\x02\xe0\xfd\xb8\x43\x6f\x90\x31\x7c\xc4\x60\x47\xaf\xf1\x5e\x0d\xf8\xf2\x3b\xf1\xb5\x28\x8a\x69\xba\x01\x9f\x4e\xfe\x05\x99\x06\xbf\xac\xe1\x05\xf6\x38\xc4\x53\x78\xf9\x0a\xea\x0d\xe3\x10\x60\x9e\x45\x51\xbc\x45\x9e\xa6\xcb\xcf\xfa\xd1\xa1\xae\xdf\x93\x69\xe6\xf9\x8f\x73\x26\x79\x62\xc3\x85\x0d\x63\x48\x14\xb3\x98\x93\x27\x17\x41\x0d\xee\xc9\x60\x00\xd5\xf7\x49\x7d\x8e\x43\x94\xce\x64\x4d\x00\xee\x14\x83\xf2\x08\xf8\xc5\xd9\x68\xd4\x7f\x6c\x8a\xc7\x7d\xc5\x0b\xec\x47\xcd\x30\x89\xef\xb9\x92\xa0\x57\x81\x3d\x99\xb6\x82\xcb\x8b\x78\xbe\x23\x4f\xe8\xcd\xf8\xbf\xe4\x86\xa9\xff\x4c\xcb\x1a\x32\xcd\x65\xad\x60\x45\x86\xd1\xef\x95\xc6\x69\x5e\x03\x7a\x6f\xfd\x52\x43\xf6\x69\x16\xe2\xb9\x05\x49\xf9\xd4\x11\xc0\x29\x36\xdf\x9e\x4c\x93\x9c\xf3\x8b\x1b\xb0\x3b\x83\x51\x03\xe6\x3e\x7b\x02\x63\x95\x05\xc1\xb7\xc2\x22\xc0\x55\x5d\xfc\x08\x4e\x69\xfc\x5f\x9d\xb1\x89\x7b\xdb\xb6\xe8\xa3\x90\x05\xef\x43\x0a\x88\x22\xcf\xf3\x23\xf2\x1a\xfe\x8e\xbf\xaf\xb7\x43\x7d\x8f\xa7\x37\xd6\x67\xde\xa5\x9a\xfa\xe3\xdd\xe3\x36\x47\xaa\x38\x18\x59\x57\xe2\x49\xd0\x17\xac\xfa\x5b\x65\x7f\xf5\xa3\x57\x7d\xd4\x35\xcf\xab\x6b\xd5\x55\xfd\x16\x39\x7d\xae\x21\xcf\x79\x0c\x3c\xb8\xd4\x88\xd3\x5c\x89\x82\xf6\x09\xfb\xa7\x57\x60\xa8\x8f\x3a\x16\x21\xf5\x27\xe2\xee\x2e\xaa\x5b\xa1\xf7\x55\x9d\x5f\xcb\xa4\x17\x5a\x64\x8e\x57\x6b\x88\xdd\x6c\x1d\xe9\xb2\x12\xc5\x65\x8c\xcb\x32\x95\x1b\x07\xe3\x3a\xda\x5f\x85\x18\xea\xc5\x2c\xbe\xb6\xc5\x3f\x01\x00\x00\xff\xff\xb3\xe2\x11\x01\x30\x06\x00\x00")
 
 func template_functionsGoTemplBytes() ([]byte, error) {
 	return bindataRead(
@@ -126,7 +126,7 @@ func template_functionsGoTempl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template_functions.go.templ", size: 1576, mode: os.FileMode(420), modTime: time.Unix(1536310344, 0)}
+	info := bindataFileInfo{name: "template_functions.go.templ", size: 1584, mode: os.FileMode(420), modTime: time.Unix(1538373141, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -146,7 +146,7 @@ func typesGoTempl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "types.go.templ", size: 3173, mode: os.FileMode(420), modTime: time.Unix(1536301391, 0)}
+	info := bindataFileInfo{name: "types.go.templ", size: 3173, mode: os.FileMode(420), modTime: time.Unix(1538212827, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }

From 119c6cc7fc2efef76a469af1f72991b65ba44096 Mon Sep 17 00:00:00 2001
From: Christopher Hein <me@christopherhein.com>
Date: Sun, 30 Sep 2018 23:50:35 -0700
Subject: [PATCH 3/4] Adding generated files for updates groupName

Signed-off-by: Christopher Hein <me@christopherhein.com>
---
 .../register.go                               |  2 +-
 .../v1alpha1/cloudformationtemplate.go        |  0
 .../v1alpha1/doc.go                           |  2 +-
 .../v1alpha1/dynamodb.go                      |  0
 .../v1alpha1/ecrrepository.go                 |  0
 .../v1alpha1/register.go                      |  2 +-
 .../v1alpha1/s3bucket.go                      |  0
 .../v1alpha1/snssubscription.go               |  0
 .../v1alpha1/snstopic.go                      |  0
 .../v1alpha1/sqsqueue.go                      |  0
 .../v1alpha1/zz_generated.deepcopy.go         |  0
 pkg/client/clientset/versioned/clientset.go   | 26 ++++++------
 .../versioned/fake/clientset_generated.go     | 16 ++++----
 .../clientset/versioned/fake/register.go      |  4 +-
 .../clientset/versioned/scheme/register.go    |  4 +-
 .../v1alpha1/cloudformationtemplate.go        |  4 +-
 .../v1alpha1/doc.go                           |  0
 .../v1alpha1/dynamodb.go                      |  4 +-
 .../v1alpha1/ecrrepository.go                 |  4 +-
 .../v1alpha1/fake/doc.go                      |  0
 .../fake/fake_cloudformationtemplate.go       |  8 ++--
 .../v1alpha1/fake/fake_dynamodb.go            |  8 ++--
 .../v1alpha1/fake/fake_ecrrepository.go       |  8 ++--
 .../v1alpha1/fake/fake_s3bucket.go            |  8 ++--
 .../fake/fake_service-operator.aws_client.go} | 20 +++++-----
 .../v1alpha1/fake/fake_snssubscription.go     |  8 ++--
 .../v1alpha1/fake/fake_snstopic.go            |  8 ++--
 .../v1alpha1/fake/fake_sqsqueue.go            |  8 ++--
 .../v1alpha1/generated_expansion.go           |  0
 .../v1alpha1/s3bucket.go                      |  4 +-
 .../v1alpha1/service-operator.aws_client.go}  | 40 +++++++++----------
 .../v1alpha1/snssubscription.go               |  4 +-
 .../v1alpha1/snstopic.go                      |  4 +-
 .../v1alpha1/sqsqueue.go                      |  4 +-
 .../informers/externalversions/factory.go     |  8 ++--
 .../informers/externalversions/generic.go     | 18 ++++-----
 .../interface.go                              |  4 +-
 .../v1alpha1/cloudformationtemplate.go        | 12 +++---
 .../v1alpha1/dynamodb.go                      | 12 +++---
 .../v1alpha1/ecrrepository.go                 | 12 +++---
 .../v1alpha1/interface.go                     |  0
 .../v1alpha1/s3bucket.go                      | 12 +++---
 .../v1alpha1/snssubscription.go               | 12 +++---
 .../v1alpha1/snstopic.go                      | 12 +++---
 .../v1alpha1/sqsqueue.go                      | 12 +++---
 .../v1alpha1/cloudformationtemplate.go        |  2 +-
 .../v1alpha1/dynamodb.go                      |  2 +-
 .../v1alpha1/ecrrepository.go                 |  2 +-
 .../v1alpha1/expansion_generated.go           |  0
 .../v1alpha1/s3bucket.go                      |  2 +-
 .../v1alpha1/snssubscription.go               |  2 +-
 .../v1alpha1/snstopic.go                      |  2 +-
 .../v1alpha1/sqsqueue.go                      |  2 +-
 pkg/helpers/template_functions.go             |  2 +-
 .../cloudformationtemplate/controller.go      | 10 ++---
 pkg/operator/dynamodb/cft.go                  |  2 +-
 pkg/operator/dynamodb/controller.go           | 10 ++---
 pkg/operator/ecrrepository/cft.go             |  2 +-
 pkg/operator/ecrrepository/controller.go      | 10 ++---
 pkg/operator/s3bucket/cft.go                  |  2 +-
 pkg/operator/s3bucket/controller.go           | 10 ++---
 pkg/operator/snssubscription/cft.go           |  2 +-
 pkg/operator/snssubscription/controller.go    | 10 ++---
 pkg/operator/snstopic/cft.go                  |  2 +-
 pkg/operator/snstopic/controller.go           | 10 ++---
 pkg/operator/sqsqueue/cft.go                  |  2 +-
 pkg/operator/sqsqueue/controller.go           | 10 ++---
 67 files changed, 206 insertions(+), 206 deletions(-)
 rename pkg/apis/{operator.aws => service-operator.aws}/register.go (80%)
 rename pkg/apis/{operator.aws => service-operator.aws}/v1alpha1/cloudformationtemplate.go (100%)
 rename pkg/apis/{operator.aws => service-operator.aws}/v1alpha1/doc.go (76%)
 rename pkg/apis/{operator.aws => service-operator.aws}/v1alpha1/dynamodb.go (100%)
 rename pkg/apis/{operator.aws => service-operator.aws}/v1alpha1/ecrrepository.go (100%)
 rename pkg/apis/{operator.aws => service-operator.aws}/v1alpha1/register.go (93%)
 rename pkg/apis/{operator.aws => service-operator.aws}/v1alpha1/s3bucket.go (100%)
 rename pkg/apis/{operator.aws => service-operator.aws}/v1alpha1/snssubscription.go (100%)
 rename pkg/apis/{operator.aws => service-operator.aws}/v1alpha1/snstopic.go (100%)
 rename pkg/apis/{operator.aws => service-operator.aws}/v1alpha1/sqsqueue.go (100%)
 rename pkg/apis/{operator.aws => service-operator.aws}/v1alpha1/zz_generated.deepcopy.go (100%)
 rename pkg/client/clientset/versioned/typed/{operator.aws => service-operator.aws}/v1alpha1/cloudformationtemplate.go (96%)
 rename pkg/client/clientset/versioned/typed/{operator.aws => service-operator.aws}/v1alpha1/doc.go (100%)
 rename pkg/client/clientset/versioned/typed/{operator.aws => service-operator.aws}/v1alpha1/dynamodb.go (96%)
 rename pkg/client/clientset/versioned/typed/{operator.aws => service-operator.aws}/v1alpha1/ecrrepository.go (96%)
 rename pkg/client/clientset/versioned/typed/{operator.aws => service-operator.aws}/v1alpha1/fake/doc.go (100%)
 rename pkg/client/clientset/versioned/typed/{operator.aws => service-operator.aws}/v1alpha1/fake/fake_cloudformationtemplate.go (94%)
 rename pkg/client/clientset/versioned/typed/{operator.aws => service-operator.aws}/v1alpha1/fake/fake_dynamodb.go (92%)
 rename pkg/client/clientset/versioned/typed/{operator.aws => service-operator.aws}/v1alpha1/fake/fake_ecrrepository.go (93%)
 rename pkg/client/clientset/versioned/typed/{operator.aws => service-operator.aws}/v1alpha1/fake/fake_s3bucket.go (92%)
 rename pkg/client/clientset/versioned/typed/{operator.aws/v1alpha1/fake/fake_operator.aws_client.go => service-operator.aws/v1alpha1/fake/fake_service-operator.aws_client.go} (58%)
 rename pkg/client/clientset/versioned/typed/{operator.aws => service-operator.aws}/v1alpha1/fake/fake_snssubscription.go (93%)
 rename pkg/client/clientset/versioned/typed/{operator.aws => service-operator.aws}/v1alpha1/fake/fake_snstopic.go (92%)
 rename pkg/client/clientset/versioned/typed/{operator.aws => service-operator.aws}/v1alpha1/fake/fake_sqsqueue.go (92%)
 rename pkg/client/clientset/versioned/typed/{operator.aws => service-operator.aws}/v1alpha1/generated_expansion.go (100%)
 rename pkg/client/clientset/versioned/typed/{operator.aws => service-operator.aws}/v1alpha1/s3bucket.go (96%)
 rename pkg/client/clientset/versioned/typed/{operator.aws/v1alpha1/operator.aws_client.go => service-operator.aws/v1alpha1/service-operator.aws_client.go} (57%)
 rename pkg/client/clientset/versioned/typed/{operator.aws => service-operator.aws}/v1alpha1/snssubscription.go (96%)
 rename pkg/client/clientset/versioned/typed/{operator.aws => service-operator.aws}/v1alpha1/snstopic.go (96%)
 rename pkg/client/clientset/versioned/typed/{operator.aws => service-operator.aws}/v1alpha1/sqsqueue.go (96%)
 rename pkg/client/informers/externalversions/{operator.aws => service-operator.aws}/interface.go (95%)
 rename pkg/client/informers/externalversions/{operator.aws => service-operator.aws}/v1alpha1/cloudformationtemplate.go (87%)
 rename pkg/client/informers/externalversions/{operator.aws => service-operator.aws}/v1alpha1/dynamodb.go (88%)
 rename pkg/client/informers/externalversions/{operator.aws => service-operator.aws}/v1alpha1/ecrrepository.go (87%)
 rename pkg/client/informers/externalversions/{operator.aws => service-operator.aws}/v1alpha1/interface.go (100%)
 rename pkg/client/informers/externalversions/{operator.aws => service-operator.aws}/v1alpha1/s3bucket.go (88%)
 rename pkg/client/informers/externalversions/{operator.aws => service-operator.aws}/v1alpha1/snssubscription.go (87%)
 rename pkg/client/informers/externalversions/{operator.aws => service-operator.aws}/v1alpha1/snstopic.go (88%)
 rename pkg/client/informers/externalversions/{operator.aws => service-operator.aws}/v1alpha1/sqsqueue.go (88%)
 rename pkg/client/listers/{operator.aws => service-operator.aws}/v1alpha1/cloudformationtemplate.go (97%)
 rename pkg/client/listers/{operator.aws => service-operator.aws}/v1alpha1/dynamodb.go (97%)
 rename pkg/client/listers/{operator.aws => service-operator.aws}/v1alpha1/ecrrepository.go (97%)
 rename pkg/client/listers/{operator.aws => service-operator.aws}/v1alpha1/expansion_generated.go (100%)
 rename pkg/client/listers/{operator.aws => service-operator.aws}/v1alpha1/s3bucket.go (97%)
 rename pkg/client/listers/{operator.aws => service-operator.aws}/v1alpha1/snssubscription.go (97%)
 rename pkg/client/listers/{operator.aws => service-operator.aws}/v1alpha1/snstopic.go (97%)
 rename pkg/client/listers/{operator.aws => service-operator.aws}/v1alpha1/sqsqueue.go (97%)

diff --git a/pkg/apis/operator.aws/register.go b/pkg/apis/service-operator.aws/register.go
similarity index 80%
rename from pkg/apis/operator.aws/register.go
rename to pkg/apis/service-operator.aws/register.go
index a02c096f8..4ee8ae862 100644
--- a/pkg/apis/operator.aws/register.go
+++ b/pkg/apis/service-operator.aws/register.go
@@ -2,7 +2,7 @@ package awsio
 
 const (
 	// GroupName represents the base of this package
-	GroupName = "operator.aws"
+	GroupName = "service-operator.aws"
 	// Version defines the latest version published
 	Version = "v1alpha1"
 )
diff --git a/pkg/apis/operator.aws/v1alpha1/cloudformationtemplate.go b/pkg/apis/service-operator.aws/v1alpha1/cloudformationtemplate.go
similarity index 100%
rename from pkg/apis/operator.aws/v1alpha1/cloudformationtemplate.go
rename to pkg/apis/service-operator.aws/v1alpha1/cloudformationtemplate.go
diff --git a/pkg/apis/operator.aws/v1alpha1/doc.go b/pkg/apis/service-operator.aws/v1alpha1/doc.go
similarity index 76%
rename from pkg/apis/operator.aws/v1alpha1/doc.go
rename to pkg/apis/service-operator.aws/v1alpha1/doc.go
index cbe0ccb0e..8ddd2aef7 100644
--- a/pkg/apis/operator.aws/v1alpha1/doc.go
+++ b/pkg/apis/service-operator.aws/v1alpha1/doc.go
@@ -1,5 +1,5 @@
 // +k8s:deepcopy-gen=package,register
 
 // Package v1alpha1 is the v1alpha1 version of the API.
-// +groupName=operator.aws
+// +groupName=serviceoperator.aws
 package v1alpha1
diff --git a/pkg/apis/operator.aws/v1alpha1/dynamodb.go b/pkg/apis/service-operator.aws/v1alpha1/dynamodb.go
similarity index 100%
rename from pkg/apis/operator.aws/v1alpha1/dynamodb.go
rename to pkg/apis/service-operator.aws/v1alpha1/dynamodb.go
diff --git a/pkg/apis/operator.aws/v1alpha1/ecrrepository.go b/pkg/apis/service-operator.aws/v1alpha1/ecrrepository.go
similarity index 100%
rename from pkg/apis/operator.aws/v1alpha1/ecrrepository.go
rename to pkg/apis/service-operator.aws/v1alpha1/ecrrepository.go
diff --git a/pkg/apis/operator.aws/v1alpha1/register.go b/pkg/apis/service-operator.aws/v1alpha1/register.go
similarity index 93%
rename from pkg/apis/operator.aws/v1alpha1/register.go
rename to pkg/apis/service-operator.aws/v1alpha1/register.go
index 1f1715dfd..0a258ef3f 100644
--- a/pkg/apis/operator.aws/v1alpha1/register.go
+++ b/pkg/apis/service-operator.aws/v1alpha1/register.go
@@ -5,7 +5,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
-	awsio "github.com/christopherhein/aws-operator/pkg/apis/operator.aws"
+	awsio "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws"
 )
 
 // SchemeBuilder definition
diff --git a/pkg/apis/operator.aws/v1alpha1/s3bucket.go b/pkg/apis/service-operator.aws/v1alpha1/s3bucket.go
similarity index 100%
rename from pkg/apis/operator.aws/v1alpha1/s3bucket.go
rename to pkg/apis/service-operator.aws/v1alpha1/s3bucket.go
diff --git a/pkg/apis/operator.aws/v1alpha1/snssubscription.go b/pkg/apis/service-operator.aws/v1alpha1/snssubscription.go
similarity index 100%
rename from pkg/apis/operator.aws/v1alpha1/snssubscription.go
rename to pkg/apis/service-operator.aws/v1alpha1/snssubscription.go
diff --git a/pkg/apis/operator.aws/v1alpha1/snstopic.go b/pkg/apis/service-operator.aws/v1alpha1/snstopic.go
similarity index 100%
rename from pkg/apis/operator.aws/v1alpha1/snstopic.go
rename to pkg/apis/service-operator.aws/v1alpha1/snstopic.go
diff --git a/pkg/apis/operator.aws/v1alpha1/sqsqueue.go b/pkg/apis/service-operator.aws/v1alpha1/sqsqueue.go
similarity index 100%
rename from pkg/apis/operator.aws/v1alpha1/sqsqueue.go
rename to pkg/apis/service-operator.aws/v1alpha1/sqsqueue.go
diff --git a/pkg/apis/operator.aws/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/service-operator.aws/v1alpha1/zz_generated.deepcopy.go
similarity index 100%
rename from pkg/apis/operator.aws/v1alpha1/zz_generated.deepcopy.go
rename to pkg/apis/service-operator.aws/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go
index 0b09acca8..53159f2f1 100644
--- a/pkg/client/clientset/versioned/clientset.go
+++ b/pkg/client/clientset/versioned/clientset.go
@@ -19,7 +19,7 @@ limitations under the License.
 package versioned
 
 import (
-	operatorv1alpha1 "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1"
+	serviceoperatorv1alpha1 "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 	glog "github.com/golang/glog"
 	discovery "k8s.io/client-go/discovery"
 	rest "k8s.io/client-go/rest"
@@ -28,27 +28,27 @@ import (
 
 type Interface interface {
 	Discovery() discovery.DiscoveryInterface
-	OperatorV1alpha1() operatorv1alpha1.OperatorV1alpha1Interface
+	ServiceoperatorV1alpha1() serviceoperatorv1alpha1.ServiceoperatorV1alpha1Interface
 	// Deprecated: please explicitly pick a version if possible.
-	Operator() operatorv1alpha1.OperatorV1alpha1Interface
+	Serviceoperator() serviceoperatorv1alpha1.ServiceoperatorV1alpha1Interface
 }
 
 // Clientset contains the clients for groups. Each group has exactly one
 // version included in a Clientset.
 type Clientset struct {
 	*discovery.DiscoveryClient
-	operatorV1alpha1 *operatorv1alpha1.OperatorV1alpha1Client
+	serviceoperatorV1alpha1 *serviceoperatorv1alpha1.ServiceoperatorV1alpha1Client
 }
 
-// OperatorV1alpha1 retrieves the OperatorV1alpha1Client
-func (c *Clientset) OperatorV1alpha1() operatorv1alpha1.OperatorV1alpha1Interface {
-	return c.operatorV1alpha1
+// ServiceoperatorV1alpha1 retrieves the ServiceoperatorV1alpha1Client
+func (c *Clientset) ServiceoperatorV1alpha1() serviceoperatorv1alpha1.ServiceoperatorV1alpha1Interface {
+	return c.serviceoperatorV1alpha1
 }
 
-// Deprecated: Operator retrieves the default version of OperatorClient.
+// Deprecated: Serviceoperator retrieves the default version of ServiceoperatorClient.
 // Please explicitly pick a version.
-func (c *Clientset) Operator() operatorv1alpha1.OperatorV1alpha1Interface {
-	return c.operatorV1alpha1
+func (c *Clientset) Serviceoperator() serviceoperatorv1alpha1.ServiceoperatorV1alpha1Interface {
+	return c.serviceoperatorV1alpha1
 }
 
 // Discovery retrieves the DiscoveryClient
@@ -67,7 +67,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
 	}
 	var cs Clientset
 	var err error
-	cs.operatorV1alpha1, err = operatorv1alpha1.NewForConfig(&configShallowCopy)
+	cs.serviceoperatorV1alpha1, err = serviceoperatorv1alpha1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
@@ -84,7 +84,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
 // panics if there is an error in the config.
 func NewForConfigOrDie(c *rest.Config) *Clientset {
 	var cs Clientset
-	cs.operatorV1alpha1 = operatorv1alpha1.NewForConfigOrDie(c)
+	cs.serviceoperatorV1alpha1 = serviceoperatorv1alpha1.NewForConfigOrDie(c)
 
 	cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c)
 	return &cs
@@ -93,7 +93,7 @@ func NewForConfigOrDie(c *rest.Config) *Clientset {
 // New creates a new Clientset for the given RESTClient.
 func New(c rest.Interface) *Clientset {
 	var cs Clientset
-	cs.operatorV1alpha1 = operatorv1alpha1.New(c)
+	cs.serviceoperatorV1alpha1 = serviceoperatorv1alpha1.New(c)
 
 	cs.DiscoveryClient = discovery.NewDiscoveryClient(c)
 	return &cs
diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go
index b50d833d8..10569f215 100644
--- a/pkg/client/clientset/versioned/fake/clientset_generated.go
+++ b/pkg/client/clientset/versioned/fake/clientset_generated.go
@@ -20,8 +20,8 @@ package fake
 
 import (
 	clientset "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned"
-	operatorv1alpha1 "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1"
-	fakeoperatorv1alpha1 "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake"
+	serviceoperatorv1alpha1 "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
+	fakeserviceoperatorv1alpha1 "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/discovery"
@@ -70,12 +70,12 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface {
 
 var _ clientset.Interface = &Clientset{}
 
-// OperatorV1alpha1 retrieves the OperatorV1alpha1Client
-func (c *Clientset) OperatorV1alpha1() operatorv1alpha1.OperatorV1alpha1Interface {
-	return &fakeoperatorv1alpha1.FakeOperatorV1alpha1{Fake: &c.Fake}
+// ServiceoperatorV1alpha1 retrieves the ServiceoperatorV1alpha1Client
+func (c *Clientset) ServiceoperatorV1alpha1() serviceoperatorv1alpha1.ServiceoperatorV1alpha1Interface {
+	return &fakeserviceoperatorv1alpha1.FakeServiceoperatorV1alpha1{Fake: &c.Fake}
 }
 
-// Operator retrieves the OperatorV1alpha1Client
-func (c *Clientset) Operator() operatorv1alpha1.OperatorV1alpha1Interface {
-	return &fakeoperatorv1alpha1.FakeOperatorV1alpha1{Fake: &c.Fake}
+// Serviceoperator retrieves the ServiceoperatorV1alpha1Client
+func (c *Clientset) Serviceoperator() serviceoperatorv1alpha1.ServiceoperatorV1alpha1Interface {
+	return &fakeserviceoperatorv1alpha1.FakeServiceoperatorV1alpha1{Fake: &c.Fake}
 }
diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go
index 8dbbd59aa..e0208355b 100644
--- a/pkg/client/clientset/versioned/fake/register.go
+++ b/pkg/client/clientset/versioned/fake/register.go
@@ -19,7 +19,7 @@ limitations under the License.
 package fake
 
 import (
-	operatorv1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	serviceoperatorv1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -50,5 +50,5 @@ func init() {
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.
 func AddToScheme(scheme *runtime.Scheme) {
-	operatorv1alpha1.AddToScheme(scheme)
+	serviceoperatorv1alpha1.AddToScheme(scheme)
 }
diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go
index d1b720695..95349b9ff 100644
--- a/pkg/client/clientset/versioned/scheme/register.go
+++ b/pkg/client/clientset/versioned/scheme/register.go
@@ -19,7 +19,7 @@ limitations under the License.
 package scheme
 
 import (
-	operatorv1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	serviceoperatorv1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -50,5 +50,5 @@ func init() {
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.
 func AddToScheme(scheme *runtime.Scheme) {
-	operatorv1alpha1.AddToScheme(scheme)
+	serviceoperatorv1alpha1.AddToScheme(scheme)
 }
diff --git a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/cloudformationtemplate.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/cloudformationtemplate.go
similarity index 96%
rename from pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/cloudformationtemplate.go
rename to pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/cloudformationtemplate.go
index c836b7898..edf04b1e1 100644
--- a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/cloudformationtemplate.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/cloudformationtemplate.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	scheme "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
@@ -53,7 +53,7 @@ type cloudFormationTemplates struct {
 }
 
 // newCloudFormationTemplates returns a CloudFormationTemplates
-func newCloudFormationTemplates(c *OperatorV1alpha1Client, namespace string) *cloudFormationTemplates {
+func newCloudFormationTemplates(c *ServiceoperatorV1alpha1Client, namespace string) *cloudFormationTemplates {
 	return &cloudFormationTemplates{
 		client: c.RESTClient(),
 		ns:     namespace,
diff --git a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/doc.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/doc.go
similarity index 100%
rename from pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/doc.go
rename to pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/doc.go
diff --git a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/dynamodb.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/dynamodb.go
similarity index 96%
rename from pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/dynamodb.go
rename to pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/dynamodb.go
index c8e54fa1c..d594ed2c8 100644
--- a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/dynamodb.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/dynamodb.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	scheme "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
@@ -53,7 +53,7 @@ type dynamoDBs struct {
 }
 
 // newDynamoDBs returns a DynamoDBs
-func newDynamoDBs(c *OperatorV1alpha1Client, namespace string) *dynamoDBs {
+func newDynamoDBs(c *ServiceoperatorV1alpha1Client, namespace string) *dynamoDBs {
 	return &dynamoDBs{
 		client: c.RESTClient(),
 		ns:     namespace,
diff --git a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/ecrrepository.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/ecrrepository.go
similarity index 96%
rename from pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/ecrrepository.go
rename to pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/ecrrepository.go
index ab473b24c..c0e8ba8e8 100644
--- a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/ecrrepository.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/ecrrepository.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	scheme "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
@@ -53,7 +53,7 @@ type eCRRepositories struct {
 }
 
 // newECRRepositories returns a ECRRepositories
-func newECRRepositories(c *OperatorV1alpha1Client, namespace string) *eCRRepositories {
+func newECRRepositories(c *ServiceoperatorV1alpha1Client, namespace string) *eCRRepositories {
 	return &eCRRepositories{
 		client: c.RESTClient(),
 		ns:     namespace,
diff --git a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/doc.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/doc.go
similarity index 100%
rename from pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/doc.go
rename to pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/doc.go
diff --git a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_cloudformationtemplate.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_cloudformationtemplate.go
similarity index 94%
rename from pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_cloudformationtemplate.go
rename to pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_cloudformationtemplate.go
index 7eb94d6de..933c94709 100644
--- a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_cloudformationtemplate.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_cloudformationtemplate.go
@@ -19,7 +19,7 @@ limitations under the License.
 package fake
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -30,13 +30,13 @@ import (
 
 // FakeCloudFormationTemplates implements CloudFormationTemplateInterface
 type FakeCloudFormationTemplates struct {
-	Fake *FakeOperatorV1alpha1
+	Fake *FakeServiceoperatorV1alpha1
 	ns   string
 }
 
-var cloudformationtemplatesResource = schema.GroupVersionResource{Group: "operator.aws", Version: "v1alpha1", Resource: "cloudformationtemplates"}
+var cloudformationtemplatesResource = schema.GroupVersionResource{Group: "serviceoperator.aws", Version: "v1alpha1", Resource: "cloudformationtemplates"}
 
-var cloudformationtemplatesKind = schema.GroupVersionKind{Group: "operator.aws", Version: "v1alpha1", Kind: "CloudFormationTemplate"}
+var cloudformationtemplatesKind = schema.GroupVersionKind{Group: "serviceoperator.aws", Version: "v1alpha1", Kind: "CloudFormationTemplate"}
 
 // Get takes name of the cloudFormationTemplate, and returns the corresponding cloudFormationTemplate object, and an error if there is any.
 func (c *FakeCloudFormationTemplates) Get(name string, options v1.GetOptions) (result *v1alpha1.CloudFormationTemplate, err error) {
diff --git a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_dynamodb.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_dynamodb.go
similarity index 92%
rename from pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_dynamodb.go
rename to pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_dynamodb.go
index 3d58ff9fe..6fff52457 100644
--- a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_dynamodb.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_dynamodb.go
@@ -19,7 +19,7 @@ limitations under the License.
 package fake
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -30,13 +30,13 @@ import (
 
 // FakeDynamoDBs implements DynamoDBInterface
 type FakeDynamoDBs struct {
-	Fake *FakeOperatorV1alpha1
+	Fake *FakeServiceoperatorV1alpha1
 	ns   string
 }
 
-var dynamodbsResource = schema.GroupVersionResource{Group: "operator.aws", Version: "v1alpha1", Resource: "dynamodbs"}
+var dynamodbsResource = schema.GroupVersionResource{Group: "serviceoperator.aws", Version: "v1alpha1", Resource: "dynamodbs"}
 
-var dynamodbsKind = schema.GroupVersionKind{Group: "operator.aws", Version: "v1alpha1", Kind: "DynamoDB"}
+var dynamodbsKind = schema.GroupVersionKind{Group: "serviceoperator.aws", Version: "v1alpha1", Kind: "DynamoDB"}
 
 // Get takes name of the dynamoDB, and returns the corresponding dynamoDB object, and an error if there is any.
 func (c *FakeDynamoDBs) Get(name string, options v1.GetOptions) (result *v1alpha1.DynamoDB, err error) {
diff --git a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_ecrrepository.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_ecrrepository.go
similarity index 93%
rename from pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_ecrrepository.go
rename to pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_ecrrepository.go
index 2501de5b3..e667baff3 100644
--- a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_ecrrepository.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_ecrrepository.go
@@ -19,7 +19,7 @@ limitations under the License.
 package fake
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -30,13 +30,13 @@ import (
 
 // FakeECRRepositories implements ECRRepositoryInterface
 type FakeECRRepositories struct {
-	Fake *FakeOperatorV1alpha1
+	Fake *FakeServiceoperatorV1alpha1
 	ns   string
 }
 
-var ecrrepositoriesResource = schema.GroupVersionResource{Group: "operator.aws", Version: "v1alpha1", Resource: "ecrrepositories"}
+var ecrrepositoriesResource = schema.GroupVersionResource{Group: "serviceoperator.aws", Version: "v1alpha1", Resource: "ecrrepositories"}
 
-var ecrrepositoriesKind = schema.GroupVersionKind{Group: "operator.aws", Version: "v1alpha1", Kind: "ECRRepository"}
+var ecrrepositoriesKind = schema.GroupVersionKind{Group: "serviceoperator.aws", Version: "v1alpha1", Kind: "ECRRepository"}
 
 // Get takes name of the eCRRepository, and returns the corresponding eCRRepository object, and an error if there is any.
 func (c *FakeECRRepositories) Get(name string, options v1.GetOptions) (result *v1alpha1.ECRRepository, err error) {
diff --git a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_s3bucket.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_s3bucket.go
similarity index 92%
rename from pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_s3bucket.go
rename to pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_s3bucket.go
index 46e469946..d8bd77c06 100644
--- a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_s3bucket.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_s3bucket.go
@@ -19,7 +19,7 @@ limitations under the License.
 package fake
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -30,13 +30,13 @@ import (
 
 // FakeS3Buckets implements S3BucketInterface
 type FakeS3Buckets struct {
-	Fake *FakeOperatorV1alpha1
+	Fake *FakeServiceoperatorV1alpha1
 	ns   string
 }
 
-var s3bucketsResource = schema.GroupVersionResource{Group: "operator.aws", Version: "v1alpha1", Resource: "s3buckets"}
+var s3bucketsResource = schema.GroupVersionResource{Group: "serviceoperator.aws", Version: "v1alpha1", Resource: "s3buckets"}
 
-var s3bucketsKind = schema.GroupVersionKind{Group: "operator.aws", Version: "v1alpha1", Kind: "S3Bucket"}
+var s3bucketsKind = schema.GroupVersionKind{Group: "serviceoperator.aws", Version: "v1alpha1", Kind: "S3Bucket"}
 
 // Get takes name of the s3Bucket, and returns the corresponding s3Bucket object, and an error if there is any.
 func (c *FakeS3Buckets) Get(name string, options v1.GetOptions) (result *v1alpha1.S3Bucket, err error) {
diff --git a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_operator.aws_client.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_service-operator.aws_client.go
similarity index 58%
rename from pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_operator.aws_client.go
rename to pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_service-operator.aws_client.go
index e6f968041..38e596cdd 100644
--- a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_operator.aws_client.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_service-operator.aws_client.go
@@ -19,46 +19,46 @@ limitations under the License.
 package fake
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 	rest "k8s.io/client-go/rest"
 	testing "k8s.io/client-go/testing"
 )
 
-type FakeOperatorV1alpha1 struct {
+type FakeServiceoperatorV1alpha1 struct {
 	*testing.Fake
 }
 
-func (c *FakeOperatorV1alpha1) CloudFormationTemplates(namespace string) v1alpha1.CloudFormationTemplateInterface {
+func (c *FakeServiceoperatorV1alpha1) CloudFormationTemplates(namespace string) v1alpha1.CloudFormationTemplateInterface {
 	return &FakeCloudFormationTemplates{c, namespace}
 }
 
-func (c *FakeOperatorV1alpha1) DynamoDBs(namespace string) v1alpha1.DynamoDBInterface {
+func (c *FakeServiceoperatorV1alpha1) DynamoDBs(namespace string) v1alpha1.DynamoDBInterface {
 	return &FakeDynamoDBs{c, namespace}
 }
 
-func (c *FakeOperatorV1alpha1) ECRRepositories(namespace string) v1alpha1.ECRRepositoryInterface {
+func (c *FakeServiceoperatorV1alpha1) ECRRepositories(namespace string) v1alpha1.ECRRepositoryInterface {
 	return &FakeECRRepositories{c, namespace}
 }
 
-func (c *FakeOperatorV1alpha1) S3Buckets(namespace string) v1alpha1.S3BucketInterface {
+func (c *FakeServiceoperatorV1alpha1) S3Buckets(namespace string) v1alpha1.S3BucketInterface {
 	return &FakeS3Buckets{c, namespace}
 }
 
-func (c *FakeOperatorV1alpha1) SNSSubscriptions(namespace string) v1alpha1.SNSSubscriptionInterface {
+func (c *FakeServiceoperatorV1alpha1) SNSSubscriptions(namespace string) v1alpha1.SNSSubscriptionInterface {
 	return &FakeSNSSubscriptions{c, namespace}
 }
 
-func (c *FakeOperatorV1alpha1) SNSTopics(namespace string) v1alpha1.SNSTopicInterface {
+func (c *FakeServiceoperatorV1alpha1) SNSTopics(namespace string) v1alpha1.SNSTopicInterface {
 	return &FakeSNSTopics{c, namespace}
 }
 
-func (c *FakeOperatorV1alpha1) SQSQueues(namespace string) v1alpha1.SQSQueueInterface {
+func (c *FakeServiceoperatorV1alpha1) SQSQueues(namespace string) v1alpha1.SQSQueueInterface {
 	return &FakeSQSQueues{c, namespace}
 }
 
 // RESTClient returns a RESTClient that is used to communicate
 // with API server by this client implementation.
-func (c *FakeOperatorV1alpha1) RESTClient() rest.Interface {
+func (c *FakeServiceoperatorV1alpha1) RESTClient() rest.Interface {
 	var ret *rest.RESTClient
 	return ret
 }
diff --git a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_snssubscription.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_snssubscription.go
similarity index 93%
rename from pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_snssubscription.go
rename to pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_snssubscription.go
index 2d6a10f8c..dcc178fc1 100644
--- a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_snssubscription.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_snssubscription.go
@@ -19,7 +19,7 @@ limitations under the License.
 package fake
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -30,13 +30,13 @@ import (
 
 // FakeSNSSubscriptions implements SNSSubscriptionInterface
 type FakeSNSSubscriptions struct {
-	Fake *FakeOperatorV1alpha1
+	Fake *FakeServiceoperatorV1alpha1
 	ns   string
 }
 
-var snssubscriptionsResource = schema.GroupVersionResource{Group: "operator.aws", Version: "v1alpha1", Resource: "snssubscriptions"}
+var snssubscriptionsResource = schema.GroupVersionResource{Group: "serviceoperator.aws", Version: "v1alpha1", Resource: "snssubscriptions"}
 
-var snssubscriptionsKind = schema.GroupVersionKind{Group: "operator.aws", Version: "v1alpha1", Kind: "SNSSubscription"}
+var snssubscriptionsKind = schema.GroupVersionKind{Group: "serviceoperator.aws", Version: "v1alpha1", Kind: "SNSSubscription"}
 
 // Get takes name of the sNSSubscription, and returns the corresponding sNSSubscription object, and an error if there is any.
 func (c *FakeSNSSubscriptions) Get(name string, options v1.GetOptions) (result *v1alpha1.SNSSubscription, err error) {
diff --git a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_snstopic.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_snstopic.go
similarity index 92%
rename from pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_snstopic.go
rename to pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_snstopic.go
index a83a8a1a5..2c33e94a2 100644
--- a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_snstopic.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_snstopic.go
@@ -19,7 +19,7 @@ limitations under the License.
 package fake
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -30,13 +30,13 @@ import (
 
 // FakeSNSTopics implements SNSTopicInterface
 type FakeSNSTopics struct {
-	Fake *FakeOperatorV1alpha1
+	Fake *FakeServiceoperatorV1alpha1
 	ns   string
 }
 
-var snstopicsResource = schema.GroupVersionResource{Group: "operator.aws", Version: "v1alpha1", Resource: "snstopics"}
+var snstopicsResource = schema.GroupVersionResource{Group: "serviceoperator.aws", Version: "v1alpha1", Resource: "snstopics"}
 
-var snstopicsKind = schema.GroupVersionKind{Group: "operator.aws", Version: "v1alpha1", Kind: "SNSTopic"}
+var snstopicsKind = schema.GroupVersionKind{Group: "serviceoperator.aws", Version: "v1alpha1", Kind: "SNSTopic"}
 
 // Get takes name of the sNSTopic, and returns the corresponding sNSTopic object, and an error if there is any.
 func (c *FakeSNSTopics) Get(name string, options v1.GetOptions) (result *v1alpha1.SNSTopic, err error) {
diff --git a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_sqsqueue.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_sqsqueue.go
similarity index 92%
rename from pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_sqsqueue.go
rename to pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_sqsqueue.go
index 17ebc295b..1e0201aaa 100644
--- a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/fake/fake_sqsqueue.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_sqsqueue.go
@@ -19,7 +19,7 @@ limitations under the License.
 package fake
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -30,13 +30,13 @@ import (
 
 // FakeSQSQueues implements SQSQueueInterface
 type FakeSQSQueues struct {
-	Fake *FakeOperatorV1alpha1
+	Fake *FakeServiceoperatorV1alpha1
 	ns   string
 }
 
-var sqsqueuesResource = schema.GroupVersionResource{Group: "operator.aws", Version: "v1alpha1", Resource: "sqsqueues"}
+var sqsqueuesResource = schema.GroupVersionResource{Group: "serviceoperator.aws", Version: "v1alpha1", Resource: "sqsqueues"}
 
-var sqsqueuesKind = schema.GroupVersionKind{Group: "operator.aws", Version: "v1alpha1", Kind: "SQSQueue"}
+var sqsqueuesKind = schema.GroupVersionKind{Group: "serviceoperator.aws", Version: "v1alpha1", Kind: "SQSQueue"}
 
 // Get takes name of the sQSQueue, and returns the corresponding sQSQueue object, and an error if there is any.
 func (c *FakeSQSQueues) Get(name string, options v1.GetOptions) (result *v1alpha1.SQSQueue, err error) {
diff --git a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/generated_expansion.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/generated_expansion.go
similarity index 100%
rename from pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/generated_expansion.go
rename to pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/generated_expansion.go
diff --git a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/s3bucket.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/s3bucket.go
similarity index 96%
rename from pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/s3bucket.go
rename to pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/s3bucket.go
index 0b031239a..f5b909dfa 100644
--- a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/s3bucket.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/s3bucket.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	scheme "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
@@ -53,7 +53,7 @@ type s3Buckets struct {
 }
 
 // newS3Buckets returns a S3Buckets
-func newS3Buckets(c *OperatorV1alpha1Client, namespace string) *s3Buckets {
+func newS3Buckets(c *ServiceoperatorV1alpha1Client, namespace string) *s3Buckets {
 	return &s3Buckets{
 		client: c.RESTClient(),
 		ns:     namespace,
diff --git a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/operator.aws_client.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/service-operator.aws_client.go
similarity index 57%
rename from pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/operator.aws_client.go
rename to pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/service-operator.aws_client.go
index 6d8dd515e..8306ac2c2 100644
--- a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/operator.aws_client.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/service-operator.aws_client.go
@@ -19,13 +19,13 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	"github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/scheme"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	rest "k8s.io/client-go/rest"
 )
 
-type OperatorV1alpha1Interface interface {
+type ServiceoperatorV1alpha1Interface interface {
 	RESTClient() rest.Interface
 	CloudFormationTemplatesGetter
 	DynamoDBsGetter
@@ -36,41 +36,41 @@ type OperatorV1alpha1Interface interface {
 	SQSQueuesGetter
 }
 
-// OperatorV1alpha1Client is used to interact with features provided by the operator.aws group.
-type OperatorV1alpha1Client struct {
+// ServiceoperatorV1alpha1Client is used to interact with features provided by the serviceoperator.aws group.
+type ServiceoperatorV1alpha1Client struct {
 	restClient rest.Interface
 }
 
-func (c *OperatorV1alpha1Client) CloudFormationTemplates(namespace string) CloudFormationTemplateInterface {
+func (c *ServiceoperatorV1alpha1Client) CloudFormationTemplates(namespace string) CloudFormationTemplateInterface {
 	return newCloudFormationTemplates(c, namespace)
 }
 
-func (c *OperatorV1alpha1Client) DynamoDBs(namespace string) DynamoDBInterface {
+func (c *ServiceoperatorV1alpha1Client) DynamoDBs(namespace string) DynamoDBInterface {
 	return newDynamoDBs(c, namespace)
 }
 
-func (c *OperatorV1alpha1Client) ECRRepositories(namespace string) ECRRepositoryInterface {
+func (c *ServiceoperatorV1alpha1Client) ECRRepositories(namespace string) ECRRepositoryInterface {
 	return newECRRepositories(c, namespace)
 }
 
-func (c *OperatorV1alpha1Client) S3Buckets(namespace string) S3BucketInterface {
+func (c *ServiceoperatorV1alpha1Client) S3Buckets(namespace string) S3BucketInterface {
 	return newS3Buckets(c, namespace)
 }
 
-func (c *OperatorV1alpha1Client) SNSSubscriptions(namespace string) SNSSubscriptionInterface {
+func (c *ServiceoperatorV1alpha1Client) SNSSubscriptions(namespace string) SNSSubscriptionInterface {
 	return newSNSSubscriptions(c, namespace)
 }
 
-func (c *OperatorV1alpha1Client) SNSTopics(namespace string) SNSTopicInterface {
+func (c *ServiceoperatorV1alpha1Client) SNSTopics(namespace string) SNSTopicInterface {
 	return newSNSTopics(c, namespace)
 }
 
-func (c *OperatorV1alpha1Client) SQSQueues(namespace string) SQSQueueInterface {
+func (c *ServiceoperatorV1alpha1Client) SQSQueues(namespace string) SQSQueueInterface {
 	return newSQSQueues(c, namespace)
 }
 
-// NewForConfig creates a new OperatorV1alpha1Client for the given config.
-func NewForConfig(c *rest.Config) (*OperatorV1alpha1Client, error) {
+// NewForConfig creates a new ServiceoperatorV1alpha1Client for the given config.
+func NewForConfig(c *rest.Config) (*ServiceoperatorV1alpha1Client, error) {
 	config := *c
 	if err := setConfigDefaults(&config); err != nil {
 		return nil, err
@@ -79,12 +79,12 @@ func NewForConfig(c *rest.Config) (*OperatorV1alpha1Client, error) {
 	if err != nil {
 		return nil, err
 	}
-	return &OperatorV1alpha1Client{client}, nil
+	return &ServiceoperatorV1alpha1Client{client}, nil
 }
 
-// NewForConfigOrDie creates a new OperatorV1alpha1Client for the given config and
+// NewForConfigOrDie creates a new ServiceoperatorV1alpha1Client for the given config and
 // panics if there is an error in the config.
-func NewForConfigOrDie(c *rest.Config) *OperatorV1alpha1Client {
+func NewForConfigOrDie(c *rest.Config) *ServiceoperatorV1alpha1Client {
 	client, err := NewForConfig(c)
 	if err != nil {
 		panic(err)
@@ -92,9 +92,9 @@ func NewForConfigOrDie(c *rest.Config) *OperatorV1alpha1Client {
 	return client
 }
 
-// New creates a new OperatorV1alpha1Client for the given RESTClient.
-func New(c rest.Interface) *OperatorV1alpha1Client {
-	return &OperatorV1alpha1Client{c}
+// New creates a new ServiceoperatorV1alpha1Client for the given RESTClient.
+func New(c rest.Interface) *ServiceoperatorV1alpha1Client {
+	return &ServiceoperatorV1alpha1Client{c}
 }
 
 func setConfigDefaults(config *rest.Config) error {
@@ -112,7 +112,7 @@ func setConfigDefaults(config *rest.Config) error {
 
 // RESTClient returns a RESTClient that is used to communicate
 // with API server by this client implementation.
-func (c *OperatorV1alpha1Client) RESTClient() rest.Interface {
+func (c *ServiceoperatorV1alpha1Client) RESTClient() rest.Interface {
 	if c == nil {
 		return nil
 	}
diff --git a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/snssubscription.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/snssubscription.go
similarity index 96%
rename from pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/snssubscription.go
rename to pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/snssubscription.go
index 038c6cb26..8290790ef 100644
--- a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/snssubscription.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/snssubscription.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	scheme "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
@@ -53,7 +53,7 @@ type sNSSubscriptions struct {
 }
 
 // newSNSSubscriptions returns a SNSSubscriptions
-func newSNSSubscriptions(c *OperatorV1alpha1Client, namespace string) *sNSSubscriptions {
+func newSNSSubscriptions(c *ServiceoperatorV1alpha1Client, namespace string) *sNSSubscriptions {
 	return &sNSSubscriptions{
 		client: c.RESTClient(),
 		ns:     namespace,
diff --git a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/snstopic.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/snstopic.go
similarity index 96%
rename from pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/snstopic.go
rename to pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/snstopic.go
index 6bd152c48..265c0f394 100644
--- a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/snstopic.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/snstopic.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	scheme "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
@@ -53,7 +53,7 @@ type sNSTopics struct {
 }
 
 // newSNSTopics returns a SNSTopics
-func newSNSTopics(c *OperatorV1alpha1Client, namespace string) *sNSTopics {
+func newSNSTopics(c *ServiceoperatorV1alpha1Client, namespace string) *sNSTopics {
 	return &sNSTopics{
 		client: c.RESTClient(),
 		ns:     namespace,
diff --git a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/sqsqueue.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/sqsqueue.go
similarity index 96%
rename from pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/sqsqueue.go
rename to pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/sqsqueue.go
index d833d70f4..c1ecd187c 100644
--- a/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1/sqsqueue.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/sqsqueue.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	scheme "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
@@ -53,7 +53,7 @@ type sQSQueues struct {
 }
 
 // newSQSQueues returns a SQSQueues
-func newSQSQueues(c *OperatorV1alpha1Client, namespace string) *sQSQueues {
+func newSQSQueues(c *ServiceoperatorV1alpha1Client, namespace string) *sQSQueues {
 	return &sQSQueues{
 		client: c.RESTClient(),
 		ns:     namespace,
diff --git a/pkg/client/informers/externalversions/factory.go b/pkg/client/informers/externalversions/factory.go
index 9f3b44a66..8c392ea0e 100644
--- a/pkg/client/informers/externalversions/factory.go
+++ b/pkg/client/informers/externalversions/factory.go
@@ -25,7 +25,7 @@ import (
 
 	versioned "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned"
 	internalinterfaces "github.com/christopherhein/aws-operator/pkg/client/informers/externalversions/internalinterfaces"
-	operator_aws "github.com/christopherhein/aws-operator/pkg/client/informers/externalversions/operator.aws"
+	service_operator_aws "github.com/christopherhein/aws-operator/pkg/client/informers/externalversions/service-operator.aws"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -123,9 +123,9 @@ type SharedInformerFactory interface {
 	ForResource(resource schema.GroupVersionResource) (GenericInformer, error)
 	WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool
 
-	Operator() operator_aws.Interface
+	Serviceoperator() service_operator_aws.Interface
 }
 
-func (f *sharedInformerFactory) Operator() operator_aws.Interface {
-	return operator_aws.New(f, f.namespace, f.tweakListOptions)
+func (f *sharedInformerFactory) Serviceoperator() service_operator_aws.Interface {
+	return service_operator_aws.New(f, f.namespace, f.tweakListOptions)
 }
diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go
index ff4ef2160..20b5c020c 100644
--- a/pkg/client/informers/externalversions/generic.go
+++ b/pkg/client/informers/externalversions/generic.go
@@ -21,7 +21,7 @@ package externalversions
 import (
 	"fmt"
 
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	cache "k8s.io/client-go/tools/cache"
 )
@@ -52,21 +52,21 @@ func (f *genericInformer) Lister() cache.GenericLister {
 // TODO extend this to unknown resources with a client pool
 func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) {
 	switch resource {
-	// Group=operator.aws, Version=v1alpha1
+	// Group=serviceoperator.aws, Version=v1alpha1
 	case v1alpha1.SchemeGroupVersion.WithResource("cloudformationtemplates"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Operator().V1alpha1().CloudFormationTemplates().Informer()}, nil
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Serviceoperator().V1alpha1().CloudFormationTemplates().Informer()}, nil
 	case v1alpha1.SchemeGroupVersion.WithResource("dynamodbs"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Operator().V1alpha1().DynamoDBs().Informer()}, nil
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Serviceoperator().V1alpha1().DynamoDBs().Informer()}, nil
 	case v1alpha1.SchemeGroupVersion.WithResource("ecrrepositories"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Operator().V1alpha1().ECRRepositories().Informer()}, nil
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Serviceoperator().V1alpha1().ECRRepositories().Informer()}, nil
 	case v1alpha1.SchemeGroupVersion.WithResource("s3buckets"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Operator().V1alpha1().S3Buckets().Informer()}, nil
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Serviceoperator().V1alpha1().S3Buckets().Informer()}, nil
 	case v1alpha1.SchemeGroupVersion.WithResource("snssubscriptions"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Operator().V1alpha1().SNSSubscriptions().Informer()}, nil
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Serviceoperator().V1alpha1().SNSSubscriptions().Informer()}, nil
 	case v1alpha1.SchemeGroupVersion.WithResource("snstopics"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Operator().V1alpha1().SNSTopics().Informer()}, nil
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Serviceoperator().V1alpha1().SNSTopics().Informer()}, nil
 	case v1alpha1.SchemeGroupVersion.WithResource("sqsqueues"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Operator().V1alpha1().SQSQueues().Informer()}, nil
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Serviceoperator().V1alpha1().SQSQueues().Informer()}, nil
 
 	}
 
diff --git a/pkg/client/informers/externalversions/operator.aws/interface.go b/pkg/client/informers/externalversions/service-operator.aws/interface.go
similarity index 95%
rename from pkg/client/informers/externalversions/operator.aws/interface.go
rename to pkg/client/informers/externalversions/service-operator.aws/interface.go
index 416ca07ba..98c3d9473 100644
--- a/pkg/client/informers/externalversions/operator.aws/interface.go
+++ b/pkg/client/informers/externalversions/service-operator.aws/interface.go
@@ -16,11 +16,11 @@ limitations under the License.
 
 // Code generated by informer-gen. DO NOT EDIT.
 
-package operator
+package serviceoperator
 
 import (
 	internalinterfaces "github.com/christopherhein/aws-operator/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/client/informers/externalversions/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/client/informers/externalversions/service-operator.aws/v1alpha1"
 )
 
 // Interface provides access to each of this group's versions.
diff --git a/pkg/client/informers/externalversions/operator.aws/v1alpha1/cloudformationtemplate.go b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/cloudformationtemplate.go
similarity index 87%
rename from pkg/client/informers/externalversions/operator.aws/v1alpha1/cloudformationtemplate.go
rename to pkg/client/informers/externalversions/service-operator.aws/v1alpha1/cloudformationtemplate.go
index d6906a474..6ba09c2ee 100644
--- a/pkg/client/informers/externalversions/operator.aws/v1alpha1/cloudformationtemplate.go
+++ b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/cloudformationtemplate.go
@@ -21,10 +21,10 @@ package v1alpha1
 import (
 	time "time"
 
-	operator_aws_v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	service_operator_aws_v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	versioned "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned"
 	internalinterfaces "github.com/christopherhein/aws-operator/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/client/listers/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/client/listers/service-operator.aws/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -61,16 +61,16 @@ func NewFilteredCloudFormationTemplateInformer(client versioned.Interface, names
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.OperatorV1alpha1().CloudFormationTemplates(namespace).List(options)
+				return client.ServiceoperatorV1alpha1().CloudFormationTemplates(namespace).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.OperatorV1alpha1().CloudFormationTemplates(namespace).Watch(options)
+				return client.ServiceoperatorV1alpha1().CloudFormationTemplates(namespace).Watch(options)
 			},
 		},
-		&operator_aws_v1alpha1.CloudFormationTemplate{},
+		&service_operator_aws_v1alpha1.CloudFormationTemplate{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,7 +81,7 @@ func (f *cloudFormationTemplateInformer) defaultInformer(client versioned.Interf
 }
 
 func (f *cloudFormationTemplateInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&operator_aws_v1alpha1.CloudFormationTemplate{}, f.defaultInformer)
+	return f.factory.InformerFor(&service_operator_aws_v1alpha1.CloudFormationTemplate{}, f.defaultInformer)
 }
 
 func (f *cloudFormationTemplateInformer) Lister() v1alpha1.CloudFormationTemplateLister {
diff --git a/pkg/client/informers/externalversions/operator.aws/v1alpha1/dynamodb.go b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/dynamodb.go
similarity index 88%
rename from pkg/client/informers/externalversions/operator.aws/v1alpha1/dynamodb.go
rename to pkg/client/informers/externalversions/service-operator.aws/v1alpha1/dynamodb.go
index 686357687..061ff7e56 100644
--- a/pkg/client/informers/externalversions/operator.aws/v1alpha1/dynamodb.go
+++ b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/dynamodb.go
@@ -21,10 +21,10 @@ package v1alpha1
 import (
 	time "time"
 
-	operator_aws_v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	service_operator_aws_v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	versioned "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned"
 	internalinterfaces "github.com/christopherhein/aws-operator/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/client/listers/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/client/listers/service-operator.aws/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -61,16 +61,16 @@ func NewFilteredDynamoDBInformer(client versioned.Interface, namespace string, r
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.OperatorV1alpha1().DynamoDBs(namespace).List(options)
+				return client.ServiceoperatorV1alpha1().DynamoDBs(namespace).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.OperatorV1alpha1().DynamoDBs(namespace).Watch(options)
+				return client.ServiceoperatorV1alpha1().DynamoDBs(namespace).Watch(options)
 			},
 		},
-		&operator_aws_v1alpha1.DynamoDB{},
+		&service_operator_aws_v1alpha1.DynamoDB{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,7 +81,7 @@ func (f *dynamoDBInformer) defaultInformer(client versioned.Interface, resyncPer
 }
 
 func (f *dynamoDBInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&operator_aws_v1alpha1.DynamoDB{}, f.defaultInformer)
+	return f.factory.InformerFor(&service_operator_aws_v1alpha1.DynamoDB{}, f.defaultInformer)
 }
 
 func (f *dynamoDBInformer) Lister() v1alpha1.DynamoDBLister {
diff --git a/pkg/client/informers/externalversions/operator.aws/v1alpha1/ecrrepository.go b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/ecrrepository.go
similarity index 87%
rename from pkg/client/informers/externalversions/operator.aws/v1alpha1/ecrrepository.go
rename to pkg/client/informers/externalversions/service-operator.aws/v1alpha1/ecrrepository.go
index 805dd1a16..d09f9b46d 100644
--- a/pkg/client/informers/externalversions/operator.aws/v1alpha1/ecrrepository.go
+++ b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/ecrrepository.go
@@ -21,10 +21,10 @@ package v1alpha1
 import (
 	time "time"
 
-	operator_aws_v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	service_operator_aws_v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	versioned "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned"
 	internalinterfaces "github.com/christopherhein/aws-operator/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/client/listers/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/client/listers/service-operator.aws/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -61,16 +61,16 @@ func NewFilteredECRRepositoryInformer(client versioned.Interface, namespace stri
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.OperatorV1alpha1().ECRRepositories(namespace).List(options)
+				return client.ServiceoperatorV1alpha1().ECRRepositories(namespace).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.OperatorV1alpha1().ECRRepositories(namespace).Watch(options)
+				return client.ServiceoperatorV1alpha1().ECRRepositories(namespace).Watch(options)
 			},
 		},
-		&operator_aws_v1alpha1.ECRRepository{},
+		&service_operator_aws_v1alpha1.ECRRepository{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,7 +81,7 @@ func (f *eCRRepositoryInformer) defaultInformer(client versioned.Interface, resy
 }
 
 func (f *eCRRepositoryInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&operator_aws_v1alpha1.ECRRepository{}, f.defaultInformer)
+	return f.factory.InformerFor(&service_operator_aws_v1alpha1.ECRRepository{}, f.defaultInformer)
 }
 
 func (f *eCRRepositoryInformer) Lister() v1alpha1.ECRRepositoryLister {
diff --git a/pkg/client/informers/externalversions/operator.aws/v1alpha1/interface.go b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/interface.go
similarity index 100%
rename from pkg/client/informers/externalversions/operator.aws/v1alpha1/interface.go
rename to pkg/client/informers/externalversions/service-operator.aws/v1alpha1/interface.go
diff --git a/pkg/client/informers/externalversions/operator.aws/v1alpha1/s3bucket.go b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/s3bucket.go
similarity index 88%
rename from pkg/client/informers/externalversions/operator.aws/v1alpha1/s3bucket.go
rename to pkg/client/informers/externalversions/service-operator.aws/v1alpha1/s3bucket.go
index 77bb8b478..bc82a25cd 100644
--- a/pkg/client/informers/externalversions/operator.aws/v1alpha1/s3bucket.go
+++ b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/s3bucket.go
@@ -21,10 +21,10 @@ package v1alpha1
 import (
 	time "time"
 
-	operator_aws_v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	service_operator_aws_v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	versioned "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned"
 	internalinterfaces "github.com/christopherhein/aws-operator/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/client/listers/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/client/listers/service-operator.aws/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -61,16 +61,16 @@ func NewFilteredS3BucketInformer(client versioned.Interface, namespace string, r
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.OperatorV1alpha1().S3Buckets(namespace).List(options)
+				return client.ServiceoperatorV1alpha1().S3Buckets(namespace).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.OperatorV1alpha1().S3Buckets(namespace).Watch(options)
+				return client.ServiceoperatorV1alpha1().S3Buckets(namespace).Watch(options)
 			},
 		},
-		&operator_aws_v1alpha1.S3Bucket{},
+		&service_operator_aws_v1alpha1.S3Bucket{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,7 +81,7 @@ func (f *s3BucketInformer) defaultInformer(client versioned.Interface, resyncPer
 }
 
 func (f *s3BucketInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&operator_aws_v1alpha1.S3Bucket{}, f.defaultInformer)
+	return f.factory.InformerFor(&service_operator_aws_v1alpha1.S3Bucket{}, f.defaultInformer)
 }
 
 func (f *s3BucketInformer) Lister() v1alpha1.S3BucketLister {
diff --git a/pkg/client/informers/externalversions/operator.aws/v1alpha1/snssubscription.go b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/snssubscription.go
similarity index 87%
rename from pkg/client/informers/externalversions/operator.aws/v1alpha1/snssubscription.go
rename to pkg/client/informers/externalversions/service-operator.aws/v1alpha1/snssubscription.go
index b472af663..11ff4ee76 100644
--- a/pkg/client/informers/externalversions/operator.aws/v1alpha1/snssubscription.go
+++ b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/snssubscription.go
@@ -21,10 +21,10 @@ package v1alpha1
 import (
 	time "time"
 
-	operator_aws_v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	service_operator_aws_v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	versioned "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned"
 	internalinterfaces "github.com/christopherhein/aws-operator/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/client/listers/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/client/listers/service-operator.aws/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -61,16 +61,16 @@ func NewFilteredSNSSubscriptionInformer(client versioned.Interface, namespace st
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.OperatorV1alpha1().SNSSubscriptions(namespace).List(options)
+				return client.ServiceoperatorV1alpha1().SNSSubscriptions(namespace).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.OperatorV1alpha1().SNSSubscriptions(namespace).Watch(options)
+				return client.ServiceoperatorV1alpha1().SNSSubscriptions(namespace).Watch(options)
 			},
 		},
-		&operator_aws_v1alpha1.SNSSubscription{},
+		&service_operator_aws_v1alpha1.SNSSubscription{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,7 +81,7 @@ func (f *sNSSubscriptionInformer) defaultInformer(client versioned.Interface, re
 }
 
 func (f *sNSSubscriptionInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&operator_aws_v1alpha1.SNSSubscription{}, f.defaultInformer)
+	return f.factory.InformerFor(&service_operator_aws_v1alpha1.SNSSubscription{}, f.defaultInformer)
 }
 
 func (f *sNSSubscriptionInformer) Lister() v1alpha1.SNSSubscriptionLister {
diff --git a/pkg/client/informers/externalversions/operator.aws/v1alpha1/snstopic.go b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/snstopic.go
similarity index 88%
rename from pkg/client/informers/externalversions/operator.aws/v1alpha1/snstopic.go
rename to pkg/client/informers/externalversions/service-operator.aws/v1alpha1/snstopic.go
index 9ff20e4d6..c4f88ad25 100644
--- a/pkg/client/informers/externalversions/operator.aws/v1alpha1/snstopic.go
+++ b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/snstopic.go
@@ -21,10 +21,10 @@ package v1alpha1
 import (
 	time "time"
 
-	operator_aws_v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	service_operator_aws_v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	versioned "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned"
 	internalinterfaces "github.com/christopherhein/aws-operator/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/client/listers/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/client/listers/service-operator.aws/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -61,16 +61,16 @@ func NewFilteredSNSTopicInformer(client versioned.Interface, namespace string, r
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.OperatorV1alpha1().SNSTopics(namespace).List(options)
+				return client.ServiceoperatorV1alpha1().SNSTopics(namespace).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.OperatorV1alpha1().SNSTopics(namespace).Watch(options)
+				return client.ServiceoperatorV1alpha1().SNSTopics(namespace).Watch(options)
 			},
 		},
-		&operator_aws_v1alpha1.SNSTopic{},
+		&service_operator_aws_v1alpha1.SNSTopic{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,7 +81,7 @@ func (f *sNSTopicInformer) defaultInformer(client versioned.Interface, resyncPer
 }
 
 func (f *sNSTopicInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&operator_aws_v1alpha1.SNSTopic{}, f.defaultInformer)
+	return f.factory.InformerFor(&service_operator_aws_v1alpha1.SNSTopic{}, f.defaultInformer)
 }
 
 func (f *sNSTopicInformer) Lister() v1alpha1.SNSTopicLister {
diff --git a/pkg/client/informers/externalversions/operator.aws/v1alpha1/sqsqueue.go b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/sqsqueue.go
similarity index 88%
rename from pkg/client/informers/externalversions/operator.aws/v1alpha1/sqsqueue.go
rename to pkg/client/informers/externalversions/service-operator.aws/v1alpha1/sqsqueue.go
index 3641f7269..a395af4b5 100644
--- a/pkg/client/informers/externalversions/operator.aws/v1alpha1/sqsqueue.go
+++ b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/sqsqueue.go
@@ -21,10 +21,10 @@ package v1alpha1
 import (
 	time "time"
 
-	operator_aws_v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	service_operator_aws_v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	versioned "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned"
 	internalinterfaces "github.com/christopherhein/aws-operator/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/client/listers/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/client/listers/service-operator.aws/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -61,16 +61,16 @@ func NewFilteredSQSQueueInformer(client versioned.Interface, namespace string, r
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.OperatorV1alpha1().SQSQueues(namespace).List(options)
+				return client.ServiceoperatorV1alpha1().SQSQueues(namespace).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.OperatorV1alpha1().SQSQueues(namespace).Watch(options)
+				return client.ServiceoperatorV1alpha1().SQSQueues(namespace).Watch(options)
 			},
 		},
-		&operator_aws_v1alpha1.SQSQueue{},
+		&service_operator_aws_v1alpha1.SQSQueue{},
 		resyncPeriod,
 		indexers,
 	)
@@ -81,7 +81,7 @@ func (f *sQSQueueInformer) defaultInformer(client versioned.Interface, resyncPer
 }
 
 func (f *sQSQueueInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&operator_aws_v1alpha1.SQSQueue{}, f.defaultInformer)
+	return f.factory.InformerFor(&service_operator_aws_v1alpha1.SQSQueue{}, f.defaultInformer)
 }
 
 func (f *sQSQueueInformer) Lister() v1alpha1.SQSQueueLister {
diff --git a/pkg/client/listers/operator.aws/v1alpha1/cloudformationtemplate.go b/pkg/client/listers/service-operator.aws/v1alpha1/cloudformationtemplate.go
similarity index 97%
rename from pkg/client/listers/operator.aws/v1alpha1/cloudformationtemplate.go
rename to pkg/client/listers/service-operator.aws/v1alpha1/cloudformationtemplate.go
index 0364efd7d..f00dd4482 100644
--- a/pkg/client/listers/operator.aws/v1alpha1/cloudformationtemplate.go
+++ b/pkg/client/listers/service-operator.aws/v1alpha1/cloudformationtemplate.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
diff --git a/pkg/client/listers/operator.aws/v1alpha1/dynamodb.go b/pkg/client/listers/service-operator.aws/v1alpha1/dynamodb.go
similarity index 97%
rename from pkg/client/listers/operator.aws/v1alpha1/dynamodb.go
rename to pkg/client/listers/service-operator.aws/v1alpha1/dynamodb.go
index faa2a4359..01e2c4c36 100644
--- a/pkg/client/listers/operator.aws/v1alpha1/dynamodb.go
+++ b/pkg/client/listers/service-operator.aws/v1alpha1/dynamodb.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
diff --git a/pkg/client/listers/operator.aws/v1alpha1/ecrrepository.go b/pkg/client/listers/service-operator.aws/v1alpha1/ecrrepository.go
similarity index 97%
rename from pkg/client/listers/operator.aws/v1alpha1/ecrrepository.go
rename to pkg/client/listers/service-operator.aws/v1alpha1/ecrrepository.go
index 463aeff25..38643b0b5 100644
--- a/pkg/client/listers/operator.aws/v1alpha1/ecrrepository.go
+++ b/pkg/client/listers/service-operator.aws/v1alpha1/ecrrepository.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
diff --git a/pkg/client/listers/operator.aws/v1alpha1/expansion_generated.go b/pkg/client/listers/service-operator.aws/v1alpha1/expansion_generated.go
similarity index 100%
rename from pkg/client/listers/operator.aws/v1alpha1/expansion_generated.go
rename to pkg/client/listers/service-operator.aws/v1alpha1/expansion_generated.go
diff --git a/pkg/client/listers/operator.aws/v1alpha1/s3bucket.go b/pkg/client/listers/service-operator.aws/v1alpha1/s3bucket.go
similarity index 97%
rename from pkg/client/listers/operator.aws/v1alpha1/s3bucket.go
rename to pkg/client/listers/service-operator.aws/v1alpha1/s3bucket.go
index 6fe381f93..0602e3fbe 100644
--- a/pkg/client/listers/operator.aws/v1alpha1/s3bucket.go
+++ b/pkg/client/listers/service-operator.aws/v1alpha1/s3bucket.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
diff --git a/pkg/client/listers/operator.aws/v1alpha1/snssubscription.go b/pkg/client/listers/service-operator.aws/v1alpha1/snssubscription.go
similarity index 97%
rename from pkg/client/listers/operator.aws/v1alpha1/snssubscription.go
rename to pkg/client/listers/service-operator.aws/v1alpha1/snssubscription.go
index 124be8030..448987570 100644
--- a/pkg/client/listers/operator.aws/v1alpha1/snssubscription.go
+++ b/pkg/client/listers/service-operator.aws/v1alpha1/snssubscription.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
diff --git a/pkg/client/listers/operator.aws/v1alpha1/snstopic.go b/pkg/client/listers/service-operator.aws/v1alpha1/snstopic.go
similarity index 97%
rename from pkg/client/listers/operator.aws/v1alpha1/snstopic.go
rename to pkg/client/listers/service-operator.aws/v1alpha1/snstopic.go
index 136646b9c..5cbc61908 100644
--- a/pkg/client/listers/operator.aws/v1alpha1/snstopic.go
+++ b/pkg/client/listers/service-operator.aws/v1alpha1/snstopic.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
diff --git a/pkg/client/listers/operator.aws/v1alpha1/sqsqueue.go b/pkg/client/listers/service-operator.aws/v1alpha1/sqsqueue.go
similarity index 97%
rename from pkg/client/listers/operator.aws/v1alpha1/sqsqueue.go
rename to pkg/client/listers/service-operator.aws/v1alpha1/sqsqueue.go
index 0bb5f8130..a5d3c4750 100644
--- a/pkg/client/listers/operator.aws/v1alpha1/sqsqueue.go
+++ b/pkg/client/listers/service-operator.aws/v1alpha1/sqsqueue.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
diff --git a/pkg/helpers/template_functions.go b/pkg/helpers/template_functions.go
index 2225ef5f9..4afc11509 100644
--- a/pkg/helpers/template_functions.go
+++ b/pkg/helpers/template_functions.go
@@ -6,7 +6,7 @@
 package helpers
 
 import (
-	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1"
+	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 	"github.com/christopherhein/aws-operator/pkg/config"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/pkg/operator/cloudformationtemplate/controller.go b/pkg/operator/cloudformationtemplate/controller.go
index b255218a3..92885125c 100644
--- a/pkg/operator/cloudformationtemplate/controller.go
+++ b/pkg/operator/cloudformationtemplate/controller.go
@@ -13,9 +13,9 @@ import (
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 
-	awsapi "github.com/christopherhein/aws-operator/pkg/apis/operator.aws"
-	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
-	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1"
+	awsapi "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws"
+	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
+	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 	"github.com/christopherhein/aws-operator/pkg/customizations/cloudformationtemplate"
 )
 
@@ -40,12 +40,12 @@ var Resource = opkit.CustomResource{
 type Controller struct {
 	config       *config.Config
 	context      *opkit.Context
-	awsclientset awsclient.OperatorV1alpha1Interface
+	awsclientset awsclient.ServiceoperatorV1alpha1Interface
 	topicARN     string
 }
 
 // NewController create controller for watching object store custom resources created
-func NewController(config *config.Config, context *opkit.Context, awsclientset awsclient.OperatorV1alpha1Interface) *Controller {
+func NewController(config *config.Config, context *opkit.Context, awsclientset awsclient.ServiceoperatorV1alpha1Interface) *Controller {
 	return &Controller{
 		config:       config,
 		context:      context,
diff --git a/pkg/operator/dynamodb/cft.go b/pkg/operator/dynamodb/cft.go
index c5272a213..465f04160 100644
--- a/pkg/operator/dynamodb/cft.go
+++ b/pkg/operator/dynamodb/cft.go
@@ -9,7 +9,7 @@ import (
 	"errors"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudformation"
-	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	"github.com/christopherhein/aws-operator/pkg/config"
 	"github.com/christopherhein/aws-operator/pkg/helpers"
 )
diff --git a/pkg/operator/dynamodb/controller.go b/pkg/operator/dynamodb/controller.go
index 37ca6ed18..1f7f31958 100644
--- a/pkg/operator/dynamodb/controller.go
+++ b/pkg/operator/dynamodb/controller.go
@@ -16,9 +16,9 @@ import (
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 
-	awsapi "github.com/christopherhein/aws-operator/pkg/apis/operator.aws"
-	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
-	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1"
+	awsapi "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws"
+	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
+	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 )
 
 // Resource is the object store definition
@@ -42,12 +42,12 @@ var Resource = opkit.CustomResource{
 type Controller struct {
 	config       *config.Config
 	context      *opkit.Context
-	awsclientset awsclient.OperatorV1alpha1Interface
+	awsclientset awsclient.ServiceoperatorV1alpha1Interface
 	topicARN     string
 }
 
 // NewController create controller for watching object store custom resources created
-func NewController(config *config.Config, context *opkit.Context, awsclientset awsclient.OperatorV1alpha1Interface) *Controller {
+func NewController(config *config.Config, context *opkit.Context, awsclientset awsclient.ServiceoperatorV1alpha1Interface) *Controller {
 	return &Controller{
 		config:       config,
 		context:      context,
diff --git a/pkg/operator/ecrrepository/cft.go b/pkg/operator/ecrrepository/cft.go
index 3336b593a..f56794432 100644
--- a/pkg/operator/ecrrepository/cft.go
+++ b/pkg/operator/ecrrepository/cft.go
@@ -9,7 +9,7 @@ import (
 	"errors"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudformation"
-	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	"github.com/christopherhein/aws-operator/pkg/config"
 	"github.com/christopherhein/aws-operator/pkg/helpers"
 )
diff --git a/pkg/operator/ecrrepository/controller.go b/pkg/operator/ecrrepository/controller.go
index c436b1a01..88cbcb7b1 100644
--- a/pkg/operator/ecrrepository/controller.go
+++ b/pkg/operator/ecrrepository/controller.go
@@ -16,9 +16,9 @@ import (
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 
-	awsapi "github.com/christopherhein/aws-operator/pkg/apis/operator.aws"
-	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
-	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1"
+	awsapi "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws"
+	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
+	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 )
 
 // Resource is the object store definition
@@ -39,12 +39,12 @@ var Resource = opkit.CustomResource{
 type Controller struct {
 	config       *config.Config
 	context      *opkit.Context
-	awsclientset awsclient.OperatorV1alpha1Interface
+	awsclientset awsclient.ServiceoperatorV1alpha1Interface
 	topicARN     string
 }
 
 // NewController create controller for watching object store custom resources created
-func NewController(config *config.Config, context *opkit.Context, awsclientset awsclient.OperatorV1alpha1Interface) *Controller {
+func NewController(config *config.Config, context *opkit.Context, awsclientset awsclient.ServiceoperatorV1alpha1Interface) *Controller {
 	return &Controller{
 		config:       config,
 		context:      context,
diff --git a/pkg/operator/s3bucket/cft.go b/pkg/operator/s3bucket/cft.go
index 0016d7220..3713c1c81 100644
--- a/pkg/operator/s3bucket/cft.go
+++ b/pkg/operator/s3bucket/cft.go
@@ -9,7 +9,7 @@ import (
 	"errors"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudformation"
-	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	"github.com/christopherhein/aws-operator/pkg/config"
 	"github.com/christopherhein/aws-operator/pkg/helpers"
 )
diff --git a/pkg/operator/s3bucket/controller.go b/pkg/operator/s3bucket/controller.go
index ee2d66689..5a5387675 100644
--- a/pkg/operator/s3bucket/controller.go
+++ b/pkg/operator/s3bucket/controller.go
@@ -16,9 +16,9 @@ import (
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 
-	awsapi "github.com/christopherhein/aws-operator/pkg/apis/operator.aws"
-	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
-	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1"
+	awsapi "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws"
+	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
+	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 )
 
 // Resource is the object store definition
@@ -40,12 +40,12 @@ var Resource = opkit.CustomResource{
 type Controller struct {
 	config       *config.Config
 	context      *opkit.Context
-	awsclientset awsclient.OperatorV1alpha1Interface
+	awsclientset awsclient.ServiceoperatorV1alpha1Interface
 	topicARN     string
 }
 
 // NewController create controller for watching object store custom resources created
-func NewController(config *config.Config, context *opkit.Context, awsclientset awsclient.OperatorV1alpha1Interface) *Controller {
+func NewController(config *config.Config, context *opkit.Context, awsclientset awsclient.ServiceoperatorV1alpha1Interface) *Controller {
 	return &Controller{
 		config:       config,
 		context:      context,
diff --git a/pkg/operator/snssubscription/cft.go b/pkg/operator/snssubscription/cft.go
index f52f41f40..ae8efd96d 100644
--- a/pkg/operator/snssubscription/cft.go
+++ b/pkg/operator/snssubscription/cft.go
@@ -9,7 +9,7 @@ import (
 	"errors"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudformation"
-	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	"github.com/christopherhein/aws-operator/pkg/config"
 	"github.com/christopherhein/aws-operator/pkg/helpers"
 )
diff --git a/pkg/operator/snssubscription/controller.go b/pkg/operator/snssubscription/controller.go
index b2c340ceb..063f2f3f3 100644
--- a/pkg/operator/snssubscription/controller.go
+++ b/pkg/operator/snssubscription/controller.go
@@ -16,9 +16,9 @@ import (
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 
-	awsapi "github.com/christopherhein/aws-operator/pkg/apis/operator.aws"
-	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
-	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1"
+	awsapi "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws"
+	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
+	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 )
 
 // Resource is the object store definition
@@ -38,12 +38,12 @@ var Resource = opkit.CustomResource{
 type Controller struct {
 	config       *config.Config
 	context      *opkit.Context
-	awsclientset awsclient.OperatorV1alpha1Interface
+	awsclientset awsclient.ServiceoperatorV1alpha1Interface
 	topicARN     string
 }
 
 // NewController create controller for watching object store custom resources created
-func NewController(config *config.Config, context *opkit.Context, awsclientset awsclient.OperatorV1alpha1Interface) *Controller {
+func NewController(config *config.Config, context *opkit.Context, awsclientset awsclient.ServiceoperatorV1alpha1Interface) *Controller {
 	return &Controller{
 		config:       config,
 		context:      context,
diff --git a/pkg/operator/snstopic/cft.go b/pkg/operator/snstopic/cft.go
index 76ae79ba0..ccaafebd1 100644
--- a/pkg/operator/snstopic/cft.go
+++ b/pkg/operator/snstopic/cft.go
@@ -9,7 +9,7 @@ import (
 	"errors"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudformation"
-	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	"github.com/christopherhein/aws-operator/pkg/config"
 	"github.com/christopherhein/aws-operator/pkg/helpers"
 )
diff --git a/pkg/operator/snstopic/controller.go b/pkg/operator/snstopic/controller.go
index 53dd034b2..953d39614 100644
--- a/pkg/operator/snstopic/controller.go
+++ b/pkg/operator/snstopic/controller.go
@@ -16,9 +16,9 @@ import (
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 
-	awsapi "github.com/christopherhein/aws-operator/pkg/apis/operator.aws"
-	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
-	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1"
+	awsapi "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws"
+	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
+	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 )
 
 // Resource is the object store definition
@@ -40,12 +40,12 @@ var Resource = opkit.CustomResource{
 type Controller struct {
 	config       *config.Config
 	context      *opkit.Context
-	awsclientset awsclient.OperatorV1alpha1Interface
+	awsclientset awsclient.ServiceoperatorV1alpha1Interface
 	topicARN     string
 }
 
 // NewController create controller for watching object store custom resources created
-func NewController(config *config.Config, context *opkit.Context, awsclientset awsclient.OperatorV1alpha1Interface) *Controller {
+func NewController(config *config.Config, context *opkit.Context, awsclientset awsclient.ServiceoperatorV1alpha1Interface) *Controller {
 	return &Controller{
 		config:       config,
 		context:      context,
diff --git a/pkg/operator/sqsqueue/cft.go b/pkg/operator/sqsqueue/cft.go
index 0029a2d11..6fd1193ed 100644
--- a/pkg/operator/sqsqueue/cft.go
+++ b/pkg/operator/sqsqueue/cft.go
@@ -9,7 +9,7 @@ import (
 	"errors"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudformation"
-	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
+	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
 	"github.com/christopherhein/aws-operator/pkg/config"
 	"github.com/christopherhein/aws-operator/pkg/helpers"
 )
diff --git a/pkg/operator/sqsqueue/controller.go b/pkg/operator/sqsqueue/controller.go
index 993a1b8f5..f56c4720e 100644
--- a/pkg/operator/sqsqueue/controller.go
+++ b/pkg/operator/sqsqueue/controller.go
@@ -16,9 +16,9 @@ import (
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 
-	awsapi "github.com/christopherhein/aws-operator/pkg/apis/operator.aws"
-	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
-	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1"
+	awsapi "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws"
+	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
+	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 )
 
 // Resource is the object store definition
@@ -40,12 +40,12 @@ var Resource = opkit.CustomResource{
 type Controller struct {
 	config       *config.Config
 	context      *opkit.Context
-	awsclientset awsclient.OperatorV1alpha1Interface
+	awsclientset awsclient.ServiceoperatorV1alpha1Interface
 	topicARN     string
 }
 
 // NewController create controller for watching object store custom resources created
-func NewController(config *config.Config, context *opkit.Context, awsclientset awsclient.OperatorV1alpha1Interface) *Controller {
+func NewController(config *config.Config, context *opkit.Context, awsclientset awsclient.ServiceoperatorV1alpha1Interface) *Controller {
 	return &Controller{
 		config:       config,
 		context:      context,

From 1d119ee477ba9be64d4b91d260d017bb9d4443b9 Mon Sep 17 00:00:00 2001
From: Christopher Hein <me@christopherhein.com>
Date: Sun, 30 Sep 2018 23:57:54 -0700
Subject: [PATCH 4/4] Adding updated references to pkg/client and pkg/api

**Why:**

* Updated references to new package name

**This change addresses the need by:**

* closes #93

Signed-off-by: Christopher Hein <me@christopherhein.com>
---
 codegen.sh                                                  | 2 +-
 configs/aws-service-operator.yaml                           | 2 +-
 examples/cloudformationtemplates/dynamodb.yaml              | 2 +-
 examples/cloudformationtemplates/ecrrepository.yaml         | 2 +-
 examples/cloudformationtemplates/s3bucket.yaml              | 2 +-
 examples/cloudformationtemplates/snssubscription.yaml       | 2 +-
 examples/cloudformationtemplates/snstopic.yaml              | 2 +-
 examples/cloudformationtemplates/sqsqueue.yaml              | 2 +-
 examples/dynamodb.yaml                                      | 2 +-
 examples/ecrrepository.yaml                                 | 2 +-
 examples/s3bucket.yaml                                      | 2 +-
 examples/snssqssub.yaml                                     | 6 +++---
 examples/snssubscription.yaml                               | 2 +-
 examples/snstopic.yaml                                      | 2 +-
 examples/sqsqueue.yaml                                      | 2 +-
 pkg/config/types.go                                         | 4 ++--
 .../cloudformationtemplate/cloudformationtemplate.go        | 4 ++--
 pkg/helpers/helpers.go                                      | 2 +-
 pkg/queue/queue.go                                          | 4 ++--
 pkg/queue/types.go                                          | 4 ++--
 pkg/server/server.go                                        | 4 ++--
 21 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/codegen.sh b/codegen.sh
index 41c28b2f7..53fadbcb9 100755
--- a/codegen.sh
+++ b/codegen.sh
@@ -18,4 +18,4 @@ cd ${scriptdir}/vendor/k8s.io/code-generator && ./generate-groups.sh \
   all \
   ${projectdir}/pkg/client \
   ${projectdir}/pkg/apis \
-  "operator.aws:v1alpha1" \
+  "service-operator.aws:v1alpha1" \
diff --git a/configs/aws-service-operator.yaml b/configs/aws-service-operator.yaml
index aa80546c4..c2e01ac95 100644
--- a/configs/aws-service-operator.yaml
+++ b/configs/aws-service-operator.yaml
@@ -47,7 +47,7 @@ items:
     - create
     - delete
   - apiGroups:
-    - operator.aws
+    - service-operator.aws
     resources:
     - "*"
     verbs:
diff --git a/examples/cloudformationtemplates/dynamodb.yaml b/examples/cloudformationtemplates/dynamodb.yaml
index 9f0eded54..e70bf5024 100644
--- a/examples/cloudformationtemplates/dynamodb.yaml
+++ b/examples/cloudformationtemplates/dynamodb.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: CloudFormationTemplate
 metadata:
   name: dynamodb
diff --git a/examples/cloudformationtemplates/ecrrepository.yaml b/examples/cloudformationtemplates/ecrrepository.yaml
index 71f17182a..50d5ba6e0 100644
--- a/examples/cloudformationtemplates/ecrrepository.yaml
+++ b/examples/cloudformationtemplates/ecrrepository.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: CloudFormationTemplate
 metadata:
   name: ecrrepository
diff --git a/examples/cloudformationtemplates/s3bucket.yaml b/examples/cloudformationtemplates/s3bucket.yaml
index dce11231e..248dc3b5c 100644
--- a/examples/cloudformationtemplates/s3bucket.yaml
+++ b/examples/cloudformationtemplates/s3bucket.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: CloudFormationTemplate
 metadata:
   name: s3bucket
diff --git a/examples/cloudformationtemplates/snssubscription.yaml b/examples/cloudformationtemplates/snssubscription.yaml
index fb6fe71e6..8c4627149 100644
--- a/examples/cloudformationtemplates/snssubscription.yaml
+++ b/examples/cloudformationtemplates/snssubscription.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: CloudFormationTemplate
 metadata:
   name: snssubscription
diff --git a/examples/cloudformationtemplates/snstopic.yaml b/examples/cloudformationtemplates/snstopic.yaml
index 42f099617..c4dc3218a 100644
--- a/examples/cloudformationtemplates/snstopic.yaml
+++ b/examples/cloudformationtemplates/snstopic.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: CloudFormationTemplate
 metadata:
   name: snstopic
diff --git a/examples/cloudformationtemplates/sqsqueue.yaml b/examples/cloudformationtemplates/sqsqueue.yaml
index 9018d45fa..fa32de79e 100644
--- a/examples/cloudformationtemplates/sqsqueue.yaml
+++ b/examples/cloudformationtemplates/sqsqueue.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: CloudFormationTemplate
 metadata:
   name: sqsqueue
diff --git a/examples/dynamodb.yaml b/examples/dynamodb.yaml
index 953b40f33..62536d39a 100644
--- a/examples/dynamodb.yaml
+++ b/examples/dynamodb.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: DynamoDB
 metadata:
   name: example-table-name
diff --git a/examples/ecrrepository.yaml b/examples/ecrrepository.yaml
index d4890c9aa..3babf2d41 100644
--- a/examples/ecrrepository.yaml
+++ b/examples/ecrrepository.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: ECRRepository
 metadata:
   name: example-repository-name
diff --git a/examples/s3bucket.yaml b/examples/s3bucket.yaml
index c2f786c2f..86e09bd26 100644
--- a/examples/s3bucket.yaml
+++ b/examples/s3bucket.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: S3Bucket
 metadata:
   name: Private
diff --git a/examples/snssqssub.yaml b/examples/snssqssub.yaml
index 655b3b7fd..7c20b0e39 100644
--- a/examples/snssqssub.yaml
+++ b/examples/snssqssub.yaml
@@ -1,11 +1,11 @@
 ---
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: SNSTopic
 metadata:
   name: example-sns-topic
 
 ---
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: SQSQueue
 metadata:
   name: example-sqs-queue-name
@@ -18,7 +18,7 @@ spec:
   visibilityTimeout: 30
 
 ---
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: SNSSubscription
 metadata:
   name: example-subscription-name
diff --git a/examples/snssubscription.yaml b/examples/snssubscription.yaml
index 8d81b884a..9678e0f86 100644
--- a/examples/snssubscription.yaml
+++ b/examples/snssubscription.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: SNSSubscription
 metadata:
   name: example-sns-subscription-name
diff --git a/examples/snstopic.yaml b/examples/snstopic.yaml
index 64f6dab85..ab23a668c 100644
--- a/examples/snstopic.yaml
+++ b/examples/snstopic.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: SNSTopic
 metadata:
   name: example-sns-topic-name
diff --git a/examples/sqsqueue.yaml b/examples/sqsqueue.yaml
index 42ac0f919..635ed603a 100644
--- a/examples/sqsqueue.yaml
+++ b/examples/sqsqueue.yaml
@@ -1,4 +1,4 @@
-apiVersion: operator.aws/v1alpha1
+apiVersion: service-operator.aws/v1alpha1
 kind: SQSQueue
 metadata:
   name: example-sqs-queue-name
diff --git a/pkg/config/types.go b/pkg/config/types.go
index 4a3cb147b..387b7996e 100644
--- a/pkg/config/types.go
+++ b/pkg/config/types.go
@@ -2,7 +2,7 @@ package config
 
 import (
 	"github.com/aws/aws-sdk-go/aws/session"
-	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1"
+	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 	opkit "github.com/christopherhein/operator-kit"
 	"github.com/sirupsen/logrus"
 	"k8s.io/client-go/rest"
@@ -13,7 +13,7 @@ type Config struct {
 	Region        string
 	Kubeconfig    string
 	AWSSession    *session.Session
-	AWSClientset  awsclient.OperatorV1alpha1Interface
+	AWSClientset  awsclient.ServiceoperatorV1alpha1Interface
 	RESTConfig    *rest.Config
 	Context       *opkit.Context
 	LoggingConfig *LoggingConfig
diff --git a/pkg/customizations/cloudformationtemplate/cloudformationtemplate.go b/pkg/customizations/cloudformationtemplate/cloudformationtemplate.go
index 1c30bb90b..65059853f 100644
--- a/pkg/customizations/cloudformationtemplate/cloudformationtemplate.go
+++ b/pkg/customizations/cloudformationtemplate/cloudformationtemplate.go
@@ -5,8 +5,8 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
-	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/operator.aws/v1alpha1"
-	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1"
+	awsV1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
+	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 	"github.com/christopherhein/aws-operator/pkg/config"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"reflect"
diff --git a/pkg/helpers/helpers.go b/pkg/helpers/helpers.go
index 3f474e469..e003bca88 100644
--- a/pkg/helpers/helpers.go
+++ b/pkg/helpers/helpers.go
@@ -3,7 +3,7 @@ package helpers
 import (
 	"bytes"
 	"github.com/aws/aws-sdk-go/service/cloudformation"
-	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1"
+	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 	"github.com/christopherhein/aws-operator/pkg/config"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"reflect"
diff --git a/pkg/queue/queue.go b/pkg/queue/queue.go
index b621e7378..eb0091f4a 100644
--- a/pkg/queue/queue.go
+++ b/pkg/queue/queue.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/sns"
 	"github.com/aws/aws-sdk-go/service/sqs"
-	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1"
+	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 	"github.com/christopherhein/aws-operator/pkg/config"
 	"github.com/christopherhein/aws-operator/pkg/helpers"
 	opkit "github.com/christopherhein/operator-kit"
@@ -71,7 +71,7 @@ func (m *MessageBody) IsComplete() bool {
 }
 
 // New will initialize the Queue object for watching
-func New(config *config.Config, context *opkit.Context, awsclientset awsclient.OperatorV1alpha1Interface, timeout int) *Queue {
+func New(config *config.Config, context *opkit.Context, awsclientset awsclient.ServiceoperatorV1alpha1Interface, timeout int) *Queue {
 	return &Queue{
 		config:       config,
 		context:      context,
diff --git a/pkg/queue/types.go b/pkg/queue/types.go
index 27ad6acbc..ee0c5aedb 100644
--- a/pkg/queue/types.go
+++ b/pkg/queue/types.go
@@ -1,7 +1,7 @@
 package queue
 
 import (
-	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1"
+	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 	"github.com/christopherhein/aws-operator/pkg/config"
 	opkit "github.com/christopherhein/operator-kit"
 )
@@ -11,7 +11,7 @@ type Queue struct {
 	config       *config.Config
 	queueURL     string
 	context      *opkit.Context
-	awsclientset awsclient.OperatorV1alpha1Interface
+	awsclientset awsclient.ServiceoperatorV1alpha1Interface
 	timeout      int64
 }
 
diff --git a/pkg/server/server.go b/pkg/server/server.go
index 16d9f9e08..4742d8fb1 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -7,7 +7,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"time"
 
-	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/operator.aws/v1alpha1"
+	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 	"github.com/christopherhein/aws-operator/pkg/config"
 	"github.com/christopherhein/aws-operator/pkg/operator/cloudformationtemplate"
 	"github.com/christopherhein/aws-operator/pkg/operator/dynamodb"
@@ -115,7 +115,7 @@ func getClientConfig(kubeconfig string) (*rest.Config, error) {
 	return rest.InClusterConfig()
 }
 
-func createContext(kubeconfig string) (*opkit.Context, *rest.Config, awsclient.OperatorV1alpha1Interface, error) {
+func createContext(kubeconfig string) (*opkit.Context, *rest.Config, awsclient.ServiceoperatorV1alpha1Interface, error) {
 	config, err := getClientConfig(kubeconfig)
 	if err != nil {
 		return nil, nil, nil, fmt.Errorf("failed to get k8s config. %+v", err)