diff --git a/.goreleaser.yml b/.goreleaser.yml
index a89558800..8c3180d5f 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -35,8 +35,8 @@ git:
 # Release will configure where the GitHub release is handled
 release:
   github:
-    owner: christopherhein
-    name: aws-operator
+    owner: awslabs
+    name: aws-service-operator
   draft: true
   prerelease: true
 
diff --git a/cmd/aws-service-operator/main.go b/cmd/aws-service-operator/main.go
index 8e9803eb8..d80a77ed4 100644
--- a/cmd/aws-service-operator/main.go
+++ b/cmd/aws-service-operator/main.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	homedir "github.com/mitchellh/go-homedir"
 
-	"github.com/christopherhein/aws-operator/pkg/config"
+	"github.com/awslabs/aws-service-operator/pkg/config"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
diff --git a/cmd/aws-service-operator/server.go b/cmd/aws-service-operator/server.go
index 6758404fd..48553b475 100644
--- a/cmd/aws-service-operator/server.go
+++ b/cmd/aws-service-operator/server.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/christopherhein/aws-operator/pkg/logger"
-	"github.com/christopherhein/aws-operator/pkg/server"
+	"github.com/awslabs/aws-service-operator/pkg/logger"
+	"github.com/awslabs/aws-service-operator/pkg/server"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"os"
diff --git a/code-generation/cmd/aws-service-operator-codegen/process.go b/code-generation/cmd/aws-service-operator-codegen/process.go
index ef0c8594c..ec2591920 100644
--- a/code-generation/cmd/aws-service-operator-codegen/process.go
+++ b/code-generation/cmd/aws-service-operator-codegen/process.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/christopherhein/aws-operator/code-generation/pkg/codegen"
+	"github.com/awslabs/aws-service-operator/code-generation/pkg/codegen"
 	"github.com/spf13/cobra"
 )
 
diff --git a/code-generation/pkg/codegen/assets/cft.go.templ b/code-generation/pkg/codegen/assets/cft.go.templ
index 92afcca2d..dee10cc70 100644
--- a/code-generation/pkg/codegen/assets/cft.go.templ
+++ b/code-generation/pkg/codegen/assets/cft.go.templ
@@ -9,9 +9,9 @@ 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/service-operator.aws/v1alpha1"
-	"github.com/christopherhein/aws-operator/pkg/config"
-	"github.com/christopherhein/aws-operator/pkg/helpers"
+	awsV1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	"github.com/awslabs/aws-service-operator/pkg/config"
+	"github.com/awslabs/aws-service-operator/pkg/helpers"
 )
 
 // New generates a new object
diff --git a/code-generation/pkg/codegen/assets/controller.go.templ b/code-generation/pkg/codegen/assets/controller.go.templ
index 991ab644b..6c991c238 100644
--- a/code-generation/pkg/codegen/assets/controller.go.templ
+++ b/code-generation/pkg/codegen/assets/controller.go.templ
@@ -8,21 +8,21 @@ package {{.Spec.Resource.Name}}
 import (
 	{{- if .Spec.IsCustomized}}
 	 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"github.com/christopherhein/aws-operator/pkg/helpers"
+	"github.com/awslabs/aws-service-operator/pkg/helpers"
 	{{- end}}
 	"reflect"
 
-	"github.com/christopherhein/aws-operator/pkg/config"
+	"github.com/awslabs/aws-service-operator/pkg/config"
 	{{- if .Spec.Queue}}
-  "github.com/christopherhein/aws-operator/pkg/queue"
+  "github.com/awslabs/aws-service-operator/pkg/queue"
 	{{- end}}
 	opkit "github.com/christopherhein/operator-kit"
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 
-	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"
+	awsapi "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws"
+	awsV1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	awsclient "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 	{{- if .Spec.Customizations.Package}}
   "{{.Spec.Customizations.Package}}"
 	{{- end}}
diff --git a/code-generation/pkg/codegen/assets/template_functions.go.templ b/code-generation/pkg/codegen/assets/template_functions.go.templ
index 2941c8a33..faf31ba20 100644
--- a/code-generation/pkg/codegen/assets/template_functions.go.templ
+++ b/code-generation/pkg/codegen/assets/template_functions.go.templ
@@ -6,8 +6,8 @@
 package helpers
 
 import (
-	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
-	"github.com/christopherhein/aws-operator/pkg/config"
+	awsclient "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
+	"github.com/awslabs/aws-service-operator/pkg/config"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
diff --git a/code-generation/pkg/codegen/templates.go b/code-generation/pkg/codegen/templates.go
index b5b1d3eb3..c2f9ba1a4 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\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")
+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\x2d\xfe\x84\x4c\x0c\x86\x66\x5e\xfb\x72\x20\xad\x23\x19\xe5\x83\xf6\x9b\x40\x8a\xbd\x37\x78\x9b\x1a\xed\x46\x0c\x59\x3a\xa5\xf1\xa1\x5c\x33\x4c\x32\x94\xfe\xf1\x5d\x19\x84\x4b\x5c\x40\x95\x06\x1c\x08\xa4\xb8\x00\x36\xf9\x8c\xa1\x70\xa7\x45\x1a\xca\xf7\x9e\x16\x04\x27\xfa\x37\x78\xa6\x7e\xfa\x5d\xc1\x80\x13\xcb\x47\x41\x45\xf4\x9a\xa6\x51\x59\xf6\x41\xb0\x8c\x86\x4f\xaf\x2f\x81\x8b\x9c\xa6\xb1\x0f\x27\xcf\x1a\x2e\x86\x95\xeb\xe4\x28\x8a\x3c\x85\xc7\xcd\x37\x2b\xd7\x71\x9a\x68\xc3\x2e\x15\xfa\xae\xe3\x68\x65\x87\x8e\xbc\xf4\x7d\xdf\x05\x80\xb5\x02\x43\xd0\x57\xf5\xdc\x77\x9d\xd2\x2d\x95\x4f\x5a\x1a\x45\x38\xa5\x29\x72\x95\xa7\x5d\x36\x87\x53\xc1\x5d\xb1\xcc\xb0\xcd\xcc\x45\x5e\x84\x42\x5a\x65\xbc\x58\x5d\x4d\x6f\xba\x2d\xd3\x76\x39\xd1\xad\x95\x36\x58\xda\x97\x46\xfb\x91\x20\xe1\x9d\x54\x0b\xb4\x1f\xb5\xe2\xa9\x5c\x60\x53\x75\xcf\x25\x05\x4c\x08\xc7\x08\x98\xde\x7f\xad\xad\xaf\x54\x52\xf1\xf7\x78\x3b\x42\x7e\x2d\xc1\xf3\x8d\x68\x2b\x6a\x26\xbf\x82\x9a\x88\x07\x95\xa9\x49\xc1\x05\xe6\x72\xb1\x0f\xbd\x0e\x57\xf6\xfa\xc0\x5b\x06\x07\x9a\x63\xeb\x32\xcf\x48\x88\xbe\x31\xfd\x25\x8a\xab\x42\x64\x85\xe0\xc6\x76\xcb\x5c\x66\x5e\x4c\x73\x36\x57\xcb\xe7\xc8\xc3\x9c\x4e\x50\x29\xca\x21\x24\x49\xd2\x6d\x72\x8d\xec\xf9\xe0\xcd\x49\x76\xa3\x0d\xbf\xd5\x3f\x7d\x50\x55\xc7\x97\x7e\xa8\x04\x0d\xcf\x60\x83\x6e\x55\xba\x0e\x47\xae\x5e\xae\xdd\xf2\xf4\xc3\x68\x84\x9c\x53\x96\xba\x0e\xbf\x0f\xe5\xbb\x66\xd9\x09\xe4\x26\x94\x6c\xbe\xeb\x3a\xca\x9a\x8b\xb4\x12\xd1\xa2\x6c\x1a\xa5\xc8\xe4\xbe\x59\x07\x43\x66\x3d\x59\xc8\xe8\x48\x75\x3c\x3b\x4c\xbe\xaf\xb6\x40\x65\x80\x32\x49\xe9\x79\x1f\xb6\x60\xbd\xc7\x96\x12\xbe\xeb\xd0\xa9\xa2\xfd\xdf\x19\xa4\x34\x91\x2e\xa8\x72\x21\xa5\x89\x82\x91\xb8\x8e\x2c\x36\x4c\x00\x2f\x72\x04\x3a\xd5\x3d\x82\x72\xc0\x7b\xd9\x64\x18\xe7\x74\x92\xa0\xc2\x4a\x30\xf5\xb4\x0e\x5a\x3b\xee\x4b\xe8\x27\xdb\x80\x59\xce\x95\x73\x7a\x29\xd3\x61\xae\x02\x8f\x11\x2c\xa8\x98\x81\x98\x11\x61\x12\x40\xee\x80\x9e\xaf\x4d\x9c\xb2\x1c\x3e\xf6\x65\x4e\x48\x0b\x73\xd5\xc3\x1a\x22\x6f\x7e\xb9\x0d\xaa\x54\x92\x72\x4d\x50\x6f\x4e\x58\x21\xcc\x8b\xd7\xb8\xbc\x85\x33\xb0\x56\xde\x93\xa4\x40\x2d\xc0\xe8\x69\xd8\xb4\x13\x4c\x71\xc9\x91\x08\xed\x48\x58\xd0\x24\x81\x50\x2d\x58\x99\x6a\x14\x47\xe0\x45\x96\x25\x14\x23\xc8\x48\x4e\xe6\xbc\x3b\x3b\x2d\x4c\x99\x9e\x5a\x2a\x9c\xb4\x72\xc3\xa2\xba\xb2\x42\x5c\x67\xee\x57\x66\x66\x38\x55\xad\x5d\x1a\x33\x3c\x5b\xd7\x81\x97\x28\x94\xba\x2f\x2a\x9e\xb1\x21\x5a\xd7\x85\xc3\x6a\x41\xf5\x38\x5e\x66\x58\x96\xc1\x76\xec\x8e\x82\xf1\x60\x5e\x53\x55\xf6\xed\x36\xcb\xa3\x87\x6f\x35\xa7\x12\xf8\xee\xfa\xcd\xd0\xa6\xac\xfd\xa8\xc8\x2e\x99\xa0\x53\x1a\x2a\x89\x4f\xaf\x2f\xf9\x10\x6e\x6e\x4f\x4c\x39\x71\x1d\xc7\x69\xc8\xa8\x1a\x83\xe2\x2c\xfb\x55\x32\x6a\xaf\xaa\xa6\x60\x85\x46\xab\xff\x56\x26\x97\xd7\xbb\xb6\x88\xba\x6a\xb0\x5f\x63\xbd\xc7\x5c\xe6\xc5\x5e\x38\x43\xb7\x0d\xb1\x45\xe2\xbb\x4e\x5a\xb9\xbe\x13\x76\x1d\x9c\x2e\x15\x4d\xe4\x9c\xb0\xee\x35\x9d\x60\x56\x3f\x52\x70\x9b\x6d\xca\x77\x57\xab\x53\x53\x1f\x1e\x09\x96\x49\x28\x2d\xf2\x77\x16\x2d\x83\x51\x38\xc3\x39\x09\xde\xe6\xb2\x75\x0a\x8a\xbc\x2c\x65\x23\x3f\x95\xf5\x6d\xcb\xaa\xc1\x49\x91\xcb\x23\xb7\x84\x6a\xd0\xd4\xac\x26\x33\xe8\x5f\x18\x69\x5e\x29\x3b\x78\x8d\xcb\xb2\x5c\xad\x0c\xbf\x7e\x94\x94\x12\xa9\x57\xaf\x57\x69\x55\x96\x3d\x8d\x88\x09\xc7\x87\xc3\xc8\x7f\x65\x19\x5c\x4d\x3e\x07\xab\xd5\xa3\xc6\x7e\x31\x00\x23\x75\xa4\x51\x7c\x2a\x02\xf5\xa3\x62\xed\xd5\x82\xd3\x7d\xea\xab\x8a\xb9\xee\x34\x55\x90\x6a\xf3\xbd\x3d\x3a\xf7\xd7\x3c\xe7\x44\x90\xd5\xd5\xe4\xf3\x50\xa5\xc5\xa3\xe6\xa1\x53\x9f\xb1\x86\x50\x57\x9c\x57\x9a\x6d\xb8\xe6\x97\x85\xcc\x2f\x77\x35\x33\xab\x2d\xca\x6d\x05\xb0\x43\xb7\xce\x94\xdb\x0c\x93\xa2\xef\xf5\xad\x73\x93\xdc\xca\x74\xba\xdc\x65\xbb\xf2\x9b\xef\xb7\xdc\x6c\x87\x5a\x25\x92\x87\x7f\xa8\xb4\x55\x01\x84\x9e\x5d\x07\x7a\x7e\x3b\x34\xbb\x74\x56\x18\x7b\x15\xde\xf0\xbc\x2e\x1a\x7e\x43\xb7\x07\x65\xb9\xc9\x47\xa7\x2d\x7b\x67\x4e\x5b\x4c\x07\x25\xf1\xfe\xac\x3d\x28\x4d\x7f\x70\x5e\x7e\xe3\x98\x6e\xb8\x61\x5b\xd6\xa9\xdb\xfa\xce\x75\xd4\x81\x05\x05\xe6\xaa\x6b\xde\xdc\xb6\x8f\x22\x6f\xab\xf7\xf2\x40\x6c\x11\x9f\x01\xc9\x32\x4c\x23\xaf\x5e\xeb\x83\x9d\xb6\xfe\xc3\xc9\xeb\xb6\xb2\x8f\x23\xb5\xfa\xc6\x3e\xda\xf0\x07\x35\x87\xbd\x8a\xed\xa8\x16\xdd\x75\xe2\x10\x50\xbf\x2b\xd8\xd6\x19\x29\x18\xa1\x58\xc7\x96\x5b\x50\x7e\xeb\x18\x32\x26\xf1\x66\x6e\x8e\x49\xfc\xa5\xe7\x90\xfd\x78\x5f\x76\x10\xe9\xc6\xfd\x92\x93\x48\x37\xda\x43\x8e\x22\xae\x23\x48\xdc\xb1\xa1\xc6\x44\xcd\x96\x8a\x60\x1d\x49\xf9\xd4\xdc\x3e\x63\x12\xfb\xbb\xa9\x6a\x7f\x76\x10\xda\xae\xe9\x20\x69\x5a\xec\x6f\xa6\xc8\x98\xc4\x5c\xd1\xfa\xae\x0b\x76\x01\x03\x3d\x6e\xda\xf3\x4c\x6b\xd6\xd4\x45\xcf\xcc\x52\xef\xb2\xa8\x39\x4b\x15\x6a\x41\x0d\x4f\xf8\x27\xe5\x82\xa6\xb1\x1e\xaa\xba\x67\x27\x0b\xc3\xd3\xec\xd1\xae\x3f\xbe\x74\x8f\x57\x16\xd0\xcf\x33\x5e\x19\x8b\x0f\x99\xaa\x0e\x66\x79\xe0\x30\x65\xf9\xef\x38\x4c\x1d\x87\xa9\xe3\x30\xf5\x6f\x18\xa6\xcc\x66\xff\x0e\x47\xd5\xe3\x04\xf5\x4f\x4c\x50\xf0\x5f\x9a\xa0\xbe\x5f\x32\x1e\xe7\xa6\xe3\xdc\x74\x9c\x9b\x8e\x73\xd3\x4f\x36\x37\xd9\xb3\xcc\xae\xb9\xe9\x1c\x13\x6c\xcc\x4d\x91\x5a\xa8\xbf\x41\x75\x8f\x4b\x16\xab\xe7\x83\xf7\x4d\x27\x9c\x7d\x9f\x36\xd7\x92\xf5\x7c\x50\x6e\xf8\xc7\xfe\xe6\x6c\x0f\x08\xd2\x5b\x1f\x6d\x47\xd9\x56\xec\x72\xd4\x07\x42\xc5\xbb\x54\xd0\x44\x91\x6a\xae\xe8\x50\x97\x6d\x05\xf9\xee\xce\xfb\xea\xef\xc2\x60\xf9\x6f\x9b\x49\xcf\xd8\x3c\x93\xbf\x9d\x0e\xfd\x3b\x00\x00\xff\xff\xdd\xfa\xa4\x1b\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: 9390, mode: os.FileMode(420), modTime: time.Unix(1538374742, 0)}
+	info := bindataFileInfo{name: "cft.go.templ", size: 9390, mode: os.FileMode(420), modTime: time.Unix(1538385198, 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\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")
+var _controllerGoTempl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5a\x6d\x73\xdb\x36\xf2\x7f\x4d\x7e\x0a\x94\xff\x36\x25\x53\x99\xfc\xe7\xdd\x8d\xe7\x7c\x1d\x57\x56\x53\x4f\x53\xdb\x67\x3b\xcd\x8b\x4c\xc6\x85\xc9\x95\x84\x98\x22\x58\x00\x92\xe2\xaa\xfa\xee\x37\x8b\x05\x28\x52\x96\x14\xa9\xcd\x65\xe6\x3a\xcd\x64\xc6\x24\xb0\x58\xec\xc3\x6f\x1f\x00\x2a\xcb\xd8\xbf\xe8\x1f\x3b\xbb\x64\x17\x97\xb7\x6c\x70\x76\x7e\xcb\x6e\x7f\x38\xbf\x61\xdf\x9f\xbf\x1a\xb0\x7f\x36\xff\xc2\x2c\x63\xb7\x63\xa1\xd9\x50\x94\xc0\x84\x66\x7c\x6a\xe4\x08\x2a\x50\xdc\x40\xc1\x66\x82\xb3\x5f\xf8\x5c\x1f\xc9\x1a\x47\xa4\x62\x7e\xee\x17\x5c\x79\x3e\x64\x8f\x72\xfa\x75\xc1\x4a\xf1\x00\xcc\x8c\x81\xe5\x63\x5e\x8d\x80\xf1\xea\xd1\x8c\x45\x35\x62\xfc\x5e\x4e\x0d\x33\xcd\x0e\x13\xfe\x00\x0c\x0a\x61\x34\x33\xd2\xae\x48\x0d\x4c\xea\x12\xb9\x91\x08\x95\x1d\xad\x1f\x46\x59\x2e\x0b\x18\x41\x95\x71\xad\xc1\x68\x56\x08\x05\xb9\x91\xea\x31\x0d\xc3\x9a\xe7\x0f\x7c\x04\x6c\xb1\x48\x6f\x6a\xc8\xd3\x6b\xd0\x72\xaa\x72\x48\x2f\xf8\x04\x96\xcb\x30\x14\x93\x5a\x2a\xc3\xe2\x30\x58\x2c\x8e\x98\x18\x32\xa2\x3b\xd7\xfd\xa9\x36\x72\x22\x7e\x83\x62\xb9\x0c\x03\x36\x01\xc3\x67\x2f\x58\xf4\xf0\x0f\x9d\x0a\x99\xf1\x5a\x4c\x78\x3e\x16\x15\xa8\xc7\x0c\x65\xe0\xb5\xd0\x19\x12\x65\xb3\x17\x51\x18\x44\x23\x61\xc6\xd3\xfb\x34\x97\x93\x8c\xcf\x75\xc9\xef\x35\xfe\x3d\xd2\xa0\x66\x22\x87\xc6\x4c\x76\xed\x18\xca\x1a\x94\x8e\x48\x06\xa8\xec\x8e\x91\x82\x61\x09\xb9\x89\xc2\x03\xb9\xe5\xb2\x1a\x8a\x51\xb4\xa6\xd0\xbf\xa7\x30\x45\x85\x19\x3b\x88\xd9\xaf\xb8\xac\x2b\x98\xac\x1f\x84\xe9\x70\xc9\xc7\x4a\x68\x23\xeb\x31\xa8\x31\x88\x2a\xf3\x1c\x8e\x1e\x84\x89\xc2\x80\xd7\x02\x3e\x18\xa8\xb4\x90\x95\x9e\xbd\xb8\x07\xc3\x3b\x86\x5c\x4d\x1e\xa1\x15\x41\xcd\x40\xad\x6c\xda\x21\xc8\xdc\x72\xb4\xb0\x63\x90\x97\x02\x2a\x73\x34\x92\x99\x91\xb2\xd4\x59\xce\xf3\x31\xa0\xd1\xf8\x5c\xf3\x5a\x1c\xa6\xae\xdd\x71\x7d\x26\xe5\x73\xf4\x0d\x9f\xeb\x9f\x5f\xf0\xb2\x1e\xa3\xf4\x9f\x84\x69\x36\x73\xfc\x88\x3b\x69\x72\x18\x6f\x5a\xe3\xfe\x68\x30\xd9\x0c\x14\x5a\x0a\x8a\xcc\x3c\xd6\x50\x7c\x74\xdf\x0e\x48\x3c\xe6\xb9\x41\x63\xa7\x57\x14\x3c\x84\x1a\x1f\x41\xdb\x68\x3a\x20\x49\x42\x8c\x53\x1f\x6c\x98\x2e\x30\x56\xe5\xfd\x7b\xc8\x0d\xd3\x46\x2a\x60\x05\x0c\x45\x25\x90\x49\x38\xe3\x6a\x45\x7b\xc2\x2c\xc0\xdc\x3e\x7e\x78\x11\x06\x18\xb1\xc7\x8c\xfe\x45\x5b\xe2\x39\xea\x85\xc1\x55\x39\x55\xbc\x3c\xde\x42\x47\xb3\x44\xf9\x52\xc9\x69\xed\x58\x12\x5a\x52\x3b\x84\xbc\x7a\x61\xf0\x33\x99\xf2\xb8\x35\xed\x86\x7a\x61\x70\x93\xcb\xda\x8b\xb3\x09\xe0\x56\x20\x5d\xf3\x1c\x2c\x65\xd1\x0b\x83\x1f\x45\x55\x78\x05\x5c\x70\xa7\xb7\x8f\x35\x5c\x0e\xe3\x16\xb6\x52\x2f\x32\x92\x2f\x97\x8b\x65\x62\x59\xc5\x09\x6e\x3a\x96\xca\x58\xc6\xc7\xec\xed\x3b\x6d\x94\xa8\x46\x8b\xb0\xe3\xc2\x46\x51\x4b\x5b\x21\x2d\x3b\xc2\xb0\x45\x2a\x65\x73\xee\x76\x42\xa4\x0b\xd0\x66\x2b\x6b\xae\x7c\xda\x4a\x01\xcb\x5e\xb8\xb4\x1e\xee\xcb\xca\x28\x59\x96\xa0\x98\x82\x5a\x81\x46\x14\x32\xce\xf2\xd5\xb8\x73\xfa\x50\xaa\xae\xff\x73\xeb\x5f\xa6\x9c\x18\x3a\x44\xbc\xb6\x19\x6a\xa3\xa6\xb9\x61\x8b\x30\xa0\x8c\xe6\x2c\xf7\x9c\xde\xd2\xbe\xfd\x63\x27\x0d\x7c\x30\x6e\xd2\x61\x87\xc6\x5a\x51\xa5\xc1\xb0\xe6\x25\xbd\xa1\xa0\xf0\x31\xe1\x4d\x7f\x5e\x19\x50\x43\x9e\x43\xc8\x98\x91\xb5\xc8\x4f\xaf\x2f\x2c\x5b\xb2\xb4\xd3\xf9\x02\xe6\x2d\x29\x73\x05\xdc\x40\x5b\x61\xd4\x74\xce\x4d\x6e\xcb\xda\x4e\x95\xdd\xe2\x22\x1c\x4e\xab\xbc\xcb\x37\x76\x3a\x77\xb5\xed\x31\xaf\x6d\x57\xd1\x1e\xfb\x83\x8a\x26\xec\x79\x4b\x97\x45\x18\x28\x30\x53\x55\xb1\x67\xab\xd1\x45\x18\x38\x07\x78\xec\xd2\x5b\x8f\xc6\x71\xfb\xe3\x66\xdc\x0a\x13\x06\x1d\xbb\x1f\x77\x84\xeb\x85\xc1\xd2\x19\xf2\xc6\x70\x65\xde\xa0\xa5\xc8\x5e\xa0\xad\xed\x44\xa5\x0d\xaf\xd0\x3c\x72\xc8\x2e\xc9\x7e\x37\x9b\xed\xc7\xab\x82\xf1\xdc\x68\x26\x6d\x33\x30\x21\x43\xc6\x79\x5b\xab\xa4\xb5\x4f\x5c\xf9\xa0\x74\x2e\xed\xa1\x67\xea\xfe\xd8\xb6\x23\x0e\x71\x8b\x65\xc2\x40\x29\xe9\xec\x41\x7b\xfd\xc0\xab\xa2\x04\xa5\xd9\xf1\x09\xb3\x15\xa6\x89\x9f\xc1\x0c\x2a\xe3\xa6\xbf\x9f\x56\xb9\x46\x83\x9d\x16\x05\x3e\x5b\xc3\xe4\xa9\xac\x4e\x0b\x4c\x00\xc1\xeb\xba\xe0\x06\x68\x06\x87\xe9\x1d\x67\xce\xa0\x84\xf6\x0c\xbd\x5b\x63\x6d\xae\xe3\x81\xad\xcc\xb9\x51\x25\x8a\x64\x5f\xd2\x0b\x98\xc7\x79\x9a\x7b\xa8\xa4\xde\x21\x2c\x4f\x3b\x2e\x60\x2f\x92\x30\xc8\x53\x0f\xf1\x1e\xbb\xa3\xff\xcc\x31\x42\xae\xe9\x35\x8c\x84\x36\xa0\xe2\xed\xb9\x96\x3d\xdb\x99\xb7\xc2\x60\x24\x5b\x0c\x5b\x6e\x20\x71\x5b\x46\x8b\xad\x5a\x64\x0e\x95\x78\xaf\x24\xed\xf4\x63\x7d\x61\xfa\x54\x23\xd1\x0b\x1d\x9d\xd2\xeb\xc1\xcd\x2d\x4d\xc6\x49\x18\x10\x9e\x14\xd2\x51\xa0\x5c\xc0\xfc\x0d\x8d\xc5\x5e\x8d\x1e\x6b\xd0\xd0\x63\xeb\x7e\xb6\x23\x6e\x37\x52\xc4\xb1\x4c\x49\x83\x9d\x9a\xaf\xe4\x6f\x02\xaa\x12\x25\xa2\x7e\xa3\x2b\xb3\x8c\xb5\xd5\x67\x73\x51\x96\xcc\x70\xd7\x28\x4f\x40\x6b\x3e\xc2\xd8\x50\x72\x62\x47\xac\xf5\x2c\xf6\x6b\x25\x73\xd0\xba\x85\xfd\x36\xa3\x6d\x39\x64\xa2\x47\xec\x39\xb9\xe0\x27\x62\xfe\x9d\x2c\x1e\x5b\xa0\x2f\xe5\x68\x44\xc6\x73\x2b\x5f\xd9\x81\x30\xc0\x42\x8d\x46\x6b\x99\xce\xe7\xc6\x40\x0c\x91\x71\x6a\xf7\xe6\xf7\x25\x20\xa3\x00\xc9\xd8\x89\x9d\xf0\x66\x47\xf0\xb8\x19\x62\x40\xd3\x4d\xb9\x0c\x83\x25\x83\x52\xd3\x7a\xf2\xef\x0d\x62\xf6\x0e\xe5\x59\x65\xb6\x0b\x98\x7f\x2f\x15\xa9\xe4\x14\x25\x0c\xd8\xc7\x24\x0c\x9a\xd0\xd5\x3d\xd4\xcc\x6a\xe3\xb9\x35\x1e\xa3\x6e\x80\xf0\x1c\x47\x51\x92\xbe\x12\xda\xc4\xd4\xeb\xdb\xe7\xcb\xda\xb6\x39\x16\xcd\xa8\x22\x72\xfa\xe2\x04\xdd\x69\xe5\x73\xa6\x4a\xdf\x08\x33\x1e\xa0\xf9\x62\x50\x2a\x49\xe9\x31\x22\x83\x8e\xc0\x18\x2c\x05\xdb\x5b\x11\xe4\xed\x81\x02\x4a\x85\x01\x46\x7d\x80\xb9\xf0\x6e\x85\x4c\x54\x80\xea\x77\xa3\x58\x7a\x6e\x60\xa2\x49\x10\x31\x6c\xc6\x31\xd2\xcc\x54\xe3\x9f\xfc\xe1\xfc\x8c\x9d\x90\x85\xaf\xb8\xd2\x50\x38\x8f\xbf\x8d\x68\xb6\x88\xde\xd1\x7a\xef\x2a\xd5\x0e\xf2\x66\xc2\x7b\xaa\x33\xeb\xdc\x45\xd2\x62\x57\x10\x5a\x14\x58\x46\x5f\x9c\xb0\x28\x62\xcf\x9e\xb5\x80\x42\x43\x0b\xb2\xe3\x06\x81\xbc\x5d\x48\xfa\xe8\x1d\xca\x1d\x5d\x5f\xbe\x7a\xf5\xdd\x69\xff\xc7\xbb\xfe\xe5\x4f\x57\xaf\x06\xb7\x03\xe2\x10\x38\x8f\x16\x36\x4d\x5a\x55\x62\x9f\xf7\xd6\x00\xda\xdb\xa9\x7c\xe2\x6c\xb7\xee\xd7\xae\x3b\x48\x43\x82\xe5\x01\xc2\x9f\x0d\x50\xe2\x2d\xa2\x4f\x6d\x90\x12\xfd\x1f\x93\x7d\xe3\xec\xba\x20\x7b\x10\x5d\x03\xd7\xb2\x3a\xc0\x16\x5e\x8b\x13\x26\xaa\x5c\xc1\x04\x2a\x73\x2d\xcb\xf2\x9e\xe7\x0f\x7d\x39\xad\xcc\x36\x75\x0e\x37\xf6\x5f\xc4\x60\x4d\x78\x74\xaa\x41\xab\xb6\x6d\xec\x5b\x6c\xdb\x10\xcb\xfb\xf7\x4c\xf8\x7e\x0d\x7b\x93\x45\x18\xd8\x36\x44\xde\xbf\x4f\xe3\xe7\xdb\xeb\x50\x92\x9e\x01\xd4\x7d\x59\x3f\xc6\x58\x88\x5c\xe9\xa9\xa4\xd9\x7c\xd8\x3b\x2d\x0a\x7b\xd0\x13\x43\xa6\x7d\x06\xe9\xaa\x6d\x31\x1d\xb1\xdf\x7f\xdf\x49\xb0\x01\xf4\xb6\x0b\x1a\xda\xaa\xdd\x6d\x51\x34\xb6\x26\xbe\x0d\x49\x2c\x9d\x9c\x9a\x7a\x6a\x56\x29\x7b\x68\xd2\xbe\xed\x92\x29\xc8\x89\x68\xdd\xe6\xae\xff\x4c\x3b\xe5\x6a\x63\x52\x1e\xfa\xac\x6c\x5b\xef\x8d\x69\x99\xaa\x01\xfb\xfa\x2b\xfd\x75\xd4\x63\xda\xbe\x27\xa1\x3f\xb6\xa1\xff\xec\xcb\x32\xdc\xb4\xe7\x79\x35\x94\xc3\x38\xe2\x45\x01\xc5\x4e\xd6\x6c\x2e\xcc\x98\x69\x97\xa2\x3b\x9b\xf5\x5c\x4d\x8d\x9f\x93\x31\x5c\x22\x2f\x92\x64\xd7\x96\x33\x01\x73\xc6\x0d\x1b\x1b\x53\xeb\xe3\x2c\xcb\x65\xa5\x65\x09\xd8\x25\xa5\x7c\xc2\x7f\x93\x15\xdd\xd5\x94\x72\x5a\x0c\xa5\x9a\x58\xb7\x67\x63\x39\x81\x6f\xff\x2f\xb3\x72\x64\x05\x18\x2e\xca\x6f\x49\xa8\xe2\xe4\x2b\x1d\xed\x10\x25\xf4\x39\xa0\x1b\x97\x2b\xdf\x7a\x5d\x56\xb5\x62\x2b\xb7\x1e\x8b\xfa\xd7\x83\xd3\xdb\xc1\xdd\xf9\xc5\xdd\xd5\xf5\xe5\xcb\xeb\xc1\xcd\x4d\xd4\x63\x51\xb4\xa5\xec\xee\xe3\x6a\xef\x69\x2b\x1f\x7a\x5a\x53\x84\x27\x36\x1c\xd1\x81\xd4\x5d\x96\x1a\xe8\x7c\xbc\x3d\x2c\xda\x6a\x75\x9a\xd2\xed\xa1\x4b\x3d\x58\x2c\xcb\xe2\xf2\xfe\x7d\x8f\x55\x30\xbf\xdc\x10\xc8\x52\xda\x48\xb6\x44\xfb\x07\x73\x50\xd9\x65\xc4\xf3\x90\x1c\x60\xe3\xff\xb0\xd8\x45\x5b\x53\x22\xaa\x64\x62\xad\xf6\xf1\x54\x42\xba\xfb\x6c\xe2\x6e\x37\xd3\x73\x6d\xdd\xdd\x97\x93\x1a\x8b\x76\x2c\xb7\x48\xd2\x63\x43\x5e\x6a\x48\xb0\x7b\xf8\xc2\xdf\x93\xa0\x1a\x83\x5f\xa7\xbc\xc4\x65\x5e\xc7\xdb\xc7\x1a\x96\xcb\x1e\xea\xd4\x1d\x4a\x76\x25\x1d\x29\xf7\xca\x3a\xaf\x3d\xac\xf3\x07\xa7\xfa\x27\xc9\x3b\x0d\x1a\x3f\x9e\x1c\x2a\x98\xb3\x9a\x2b\x3e\xd1\xec\xab\x6f\x66\xb6\xe1\x97\x65\x81\xcf\x91\xd5\x99\xe2\xab\x92\xa8\xd2\xa1\x09\x8a\x82\x76\x9f\x14\xe5\x24\x70\x19\xaa\xd9\xf6\xaf\x90\xa2\xa4\x57\xc6\x3d\x7c\x34\x49\xbd\xbe\x3a\xfb\xec\x49\x8a\xb1\x3d\xb2\x94\x8f\xb8\x35\x98\x23\x6e\xf7\xca\x56\x74\xdd\xf0\xd9\x7a\x0d\xda\x0e\xf5\xd9\xa7\x2d\x08\x5a\x51\x79\xd6\x6a\xf8\x93\x70\x83\xd5\x0f\x0a\x46\x7b\x7c\x38\xa0\x09\xf0\x9d\x1d\x35\x73\x5b\x50\x4e\x67\x92\xdd\xa1\xd5\xe6\xb9\x87\x7b\xbd\xbd\x76\xd5\xa1\x70\xd7\xf7\x2b\xeb\xf6\x9d\xcd\xfa\x93\x5b\x02\x7b\x8c\xf3\xb7\x64\xeb\xc7\xfd\x7d\x2e\x0b\xfe\xc4\xd9\x5d\x35\x57\x34\xfb\x9d\xdc\x57\x27\x8c\xf4\x25\x98\x98\x0e\x05\xee\x14\xff\x12\x3a\x87\xf8\xa7\x88\xf9\x64\x47\xf8\x76\xd7\xef\xee\xab\x2c\x15\x86\x85\x3d\xbd\xfb\x55\xed\x52\xde\x26\x72\xcc\xdb\xde\x69\x9d\xb9\xb7\x50\x7c\xf3\x22\x0c\x83\x3b\xb2\xd4\x21\x86\x72\x0d\x4a\x9b\xfb\x1f\x35\x4f\x93\xbc\x3c\xb3\x0d\xe6\x58\xbb\x08\xb3\x80\xdc\x70\xa2\x3b\x0c\x86\xbd\xa6\x81\x6e\xbd\x63\x33\xe3\x5f\x95\x3d\xa9\xfd\x0d\xda\xff\x2a\x68\x37\xb7\x93\xce\x15\xfb\x10\xd3\x79\xda\x42\x1d\x1f\x36\x2f\x69\x6e\xb3\xbc\xcf\xa9\x9f\xdd\xd6\x5d\xea\x6e\x2f\x69\x4b\x43\xab\xd6\x38\x74\xb5\x37\xf2\x95\x9c\xca\xbe\xee\x34\x83\xe8\x0f\x1a\x8e\xff\xfc\x45\xa0\xdb\xc0\xd5\xf8\x30\x68\x7d\x9a\xfb\xb2\x56\xb2\xc6\x4d\xc9\x65\x97\xae\x03\xc9\xc7\x30\xe1\xe9\x95\x92\x35\x28\x23\xfc\x87\x3a\x97\xf0\xed\x9a\xf4\x16\x26\x75\xc9\x8d\xff\xbd\x42\xb0\x58\xd0\xf8\x8f\xf0\x88\x2d\xb2\x05\xb3\xb7\xd5\x8a\x36\x8e\x3c\x9d\x1b\xa3\x7b\x7d\x4f\x78\xc6\x0d\x5f\x5c\xde\xbf\x3f\x5e\x33\x54\xdf\x7d\x0f\x22\x33\x2e\xdb\xb7\xad\xd6\x65\x4e\x6e\xcf\xfb\xc6\x7e\x57\xb1\x92\xb0\x13\xd6\x91\xcc\xa9\xe1\xeb\xdf\x01\x6c\x9c\x15\xdf\x3e\xd1\xc0\x12\x44\xef\x3c\xe7\xaa\x58\xed\xe2\xbe\x5e\xfe\x4f\x24\xcc\x43\xd1\x4d\xea\xe8\xc7\x2a\x3f\x2d\x0a\xfb\x5d\x9d\x97\x3e\xcc\xf4\x46\xc0\x1f\x84\x64\x6c\x6e\xbc\xf8\xb8\x49\x5b\x7a\x0f\xe5\x2d\x69\xfe\xe9\x25\xed\x9f\xcb\xf2\x7f\xe7\xf1\x3d\xf2\xf8\x8e\x64\xe7\x12\x9d\xc3\xff\x3e\x4d\xf5\x3a\xf3\xd5\xd2\x37\x5c\x98\xd7\x95\x11\xa5\x5d\x4d\x8c\x0a\x2a\x11\xcd\x12\x8f\x83\xdd\xd8\x7c\x82\x09\xcd\x76\x1d\x38\x18\x5a\x8a\x80\x60\xf1\xff\x19\x1d\xde\xba\xd1\x22\x97\xfb\xab\xae\x7d\x9d\xfe\xa4\x33\x6a\x7e\xfa\xb2\xa9\xda\x62\x9f\xbf\x6a\xec\x37\x18\xd0\x7f\xe5\xc7\xb2\xa0\xfd\xe3\xf1\xc9\xea\x17\x22\xcb\xc5\xc2\xa5\xbe\x56\xa5\x69\x7f\x57\xda\x8b\x75\x73\xac\x83\x5f\x57\xab\xed\x85\x0b\x8b\x06\x1f\x0c\xa8\x8a\x2c\x14\x11\xe9\x97\x6a\xed\xdc\xd3\x2a\x40\x74\xa3\xdb\x5e\xe4\xf6\x89\x5b\x47\xc0\x8d\x17\x88\x51\x9b\x71\x9b\x81\xad\x5b\x8b\x45\x2c\xaa\x02\x3e\xb4\xe4\xbb\x92\xca\x68\xf6\xff\x89\x7d\x58\xa2\x3f\x1a\x13\x9d\x30\x5e\xd7\x50\x15\xb1\x1f\x41\x06\xeb\x62\x77\x8e\x59\xdd\xc7\x7d\x7d\xd2\x70\xdc\x49\x77\xc2\xbc\x18\xde\x5b\x1f\x77\x3c\x41\xf8\x27\x5e\xe3\x36\x64\xba\x09\xbe\x7c\x22\xe7\x77\xd8\x6f\xf2\x29\xf6\x07\xc8\x62\xc2\xeb\xb7\xb4\x5d\xf3\xa3\xa4\x4e\x57\x23\x0c\x4c\x90\x6e\xb5\xde\xae\xf4\x3f\x37\xb2\xf3\xd4\x0f\x44\xc7\xac\x19\xf8\x99\x97\x53\xf7\x2b\xa4\x6e\xf9\xde\x0b\x5d\x8d\xf0\x1f\xc5\xd4\x66\xbd\x12\xff\xbb\x23\x6b\xd1\x06\x2b\xab\xb1\x7d\xd0\xb2\xbf\xf7\x76\x82\xa4\x45\xe9\x2b\x1d\x4a\xd0\x00\x65\xff\x7e\xa6\x93\xbb\xd6\x3a\x9a\x3d\x72\x95\xbf\x60\x7c\xf2\x05\xeb\x3f\x01\x00\x00\xff\xff\x0c\x47\x71\xfc\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: 11338, mode: os.FileMode(420), modTime: time.Unix(1538375832, 0)}
+	info := bindataFileInfo{name: "controller.go.templ", size: 11338, mode: os.FileMode(420), modTime: time.Unix(1538385198, 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\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")
+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\xa5\xb1\x34\x30\x45\x12\xe4\xc8\x8e\x21\xe8\xdf\x0b\x92\xb2\x03\x6c\x91\xee\x56\x17\x4a\x23\xce\x7b\xf3\x1e\x67\x28\x25\xfc\x9e\x1f\x78\xfb\x00\xf7\x0f\x5b\xb8\x7b\xbb\xd9\xc2\xf6\xc3\xe6\x11\xde\x6d\x3e\xdd\xc1\x6f\xd7\x47\x48\x09\xdb\x9e\x02\xec\x49\x23\x50\x00\x35\xb2\xed\xd0\xa0\x57\x8c\x2d\x1c\x49\xc1\x57\x75\x0a\x37\xd6\xc5\x88\xf5\x37\x8d\x6d\xb1\x43\x03\xce\xdb\x06\x43\xf8\x1a\x01\x36\x7b\x38\xdb\xf1\xe7\x16\x34\x1d\x10\xb8\x47\x68\x7a\x65\x3a\x04\x65\xce\xdc\x93\xe9\x40\xed\xec\xc8\xc0\x57\xa2\x41\x1d\x10\xb0\x25\x0e\xc0\x36\x65\xd4\x8c\x83\xd3\x11\x2d\x57\x62\x52\xd4\x1d\x3a\xb9\x30\x4a\x15\x02\x72\x80\x96\x3c\x36\x6c\xfd\xb9\x16\xc2\xa9\xe6\xa0\x3a\x84\x1e\xb5\x43\x1f\x84\xa0\xc1\x59\xcf\xb0\x12\x85\x3a\x85\x46\x13\x1a\x86\xb2\x23\xee\xc7\x5d\xdd\xd8\x41\xaa\x53\xd0\x6a\x17\xe2\x7a\x13\xd0\x1f\xa9\xc1\xab\x34\x99\xc8\x52\xce\xb2\x04\x64\x79\x44\x1f\xc8\x1a\x6c\x25\x9f\x1d\xb6\xf2\x69\x56\xad\x4e\x41\x1e\x6f\x95\x76\xbd\xba\x2d\x45\xf1\xff\xd8\xac\xd9\x53\x57\x8a\x62\x40\x56\xc7\x5b\x28\x0f\xbf\x86\x9a\xac\x54\x8e\x06\xd5\xf4\x64\xd0\x9f\xd3\x46\xe5\x28\xc8\xb8\x49\x1e\x6f\x4b\x51\x89\xe8\xd3\x3d\x9e\xe0\x0b\x69\x0d\x1e\x79\xf4\xe6\x62\x42\x34\x74\x87\xe0\xa2\x5d\x2d\x90\x59\xfc\x4d\xf6\x2a\xc6\x20\xf6\xa3\x69\x62\xf2\xaa\x82\x0f\x4b\xca\x24\x8a\x05\x64\x89\x4c\xa2\x00\xf8\x38\xee\xd0\x1b\x64\x0c\x9f\x31\xd8\xd1\x37\x78\xaf\x06\x7c\xfd\x83\xf8\x5a\x14\xc5\x34\xdd\x80\x4f\x27\xff\x8a\x4c\x8b\xdf\xd6\xf0\x0a\x35\x0e\xf1\x14\x5e\xbf\x81\x7a\xc3\x38\x04\x98\x67\x51\x14\xef\x91\xa7\xe9\xf2\xb3\x7e\x74\xd8\xd4\x1f\xc9\xb4\xf3\xfc\xc7\x39\x93\x3c\xb3\xe1\xc2\x86\x31\x24\x8a\x59\xcc\xc9\x93\x8b\xa0\x16\xf7\x64\x30\x80\xd2\x3a\xa9\xcf\x71\x88\xd2\x99\xac\x09\xc0\xbd\x62\x50\x1e\x01\xbf\x39\x1b\x8d\xfa\x97\x4d\xf1\xb8\xaf\x78\x81\xfd\xd8\x30\x4c\xe2\x47\xae\x24\xe8\x55\x60\x4f\xa6\xab\xe0\xf2\x22\x5e\xee\xc8\x33\x7a\x33\xfe\x2f\xb9\x61\xea\x3f\xd3\xb2\x86\x4c\x73\x59\x2b\x58\x91\x61\xf4\x7b\xd5\xe0\x34\xaf\x01\xbd\xb7\x7e\xa9\x21\xfb\x34\x0b\xf1\xd2\x82\xa4\x7c\xee\x08\xe0\x14\x9b\x6f\x4f\xa6\x4d\xce\xf9\xc5\x0d\xd8\x9d\xc1\xa8\x01\x73\x9f\x3d\x83\xb1\xca\x82\xe0\xa9\xb0\x08\x70\x55\x17\x3f\x82\x53\x0d\xfe\xa7\xce\xd8\xc4\xda\x76\x1d\xfa\x28\x64\xc1\xfb\x94\x02\xa2\xc8\xf3\xfc\x88\xbc\x86\xbf\xe3\xef\xeb\xed\x50\xdf\xe3\xe9\x9d\xf5\x99\x77\xa9\xa6\xfe\x7c\xf7\xb8\xcd\x91\x2a\x0e\x46\xd6\x95\x78\x12\xf4\x05\xab\x7e\xaa\xec\x2f\x3d\x7a\xa5\xa3\xae\x79\x5e\x5d\xab\xae\xea\xf7\xc8\xe9\x73\x0d\x79\xce\x63\xe0\xc1\xa5\x46\x9c\xe6\x4a\x14\xb4\x4f\xd8\x3f\xbd\x01\x43\x3a\xea\x58\x84\xd4\x5f\x88\xfb\xbb\xa8\x6e\x85\xde\x57\x75\x7e\x2d\x93\x5e\xe8\x90\x39\x5e\xad\x21\x76\xb3\x75\xd4\x94\x95\x28\x2e\x63\x5c\x96\xa9\xdc\x38\x18\xd7\xd1\xfe\x2e\xc4\x90\x16\xb3\xf8\xde\x16\xff\x04\x00\x00\xff\xff\xe5\x13\x3f\x32\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: 1584, mode: os.FileMode(420), modTime: time.Unix(1538373141, 0)}
+	info := bindataFileInfo{name: "template_functions.go.templ", size: 1584, mode: os.FileMode(420), modTime: time.Unix(1538385198, 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(1538212827, 0)}
+	info := bindataFileInfo{name: "types.go.templ", size: 3173, mode: os.FileMode(420), modTime: time.Unix(1538384745, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
diff --git a/configs/aws-service-operator.yaml b/configs/aws-service-operator.yaml
index c2e01ac95..b77cd5a9c 100644
--- a/configs/aws-service-operator.yaml
+++ b/configs/aws-service-operator.yaml
@@ -89,7 +89,7 @@ items:
         serviceAccountName: aws-service-operator
         containers:
         - name: aws-service-operator
-          image: awsserviceoperator/aws-service-operator:v0.0.1-alpha5
+          image: awsserviceoperator/aws-service-operator:v0.0.1-alpha1
           imagePullPolicy: Always
           args:
             - server
diff --git a/models/cloudformationtemplate.yaml b/models/cloudformationtemplate.yaml
index c4aa3c3f1..e069b1a2e 100644
--- a/models/cloudformationtemplate.yaml
+++ b/models/cloudformationtemplate.yaml
@@ -44,7 +44,7 @@ spec:
         templateKey: URL
 
   customizations:
-    package: github.com/christopherhein/aws-operator/pkg/customizations/cloudformationtemplate
+    package: github.com/awslabs/aws-service-operator/pkg/customizations/cloudformationtemplate
     add: cloudformationtemplate.OnAdd
     update: cloudformationtemplate.OnUpdate
     delete: cloudformationtemplate.OnDelete
diff --git a/pkg/apis/service-operator.aws/v1alpha1/register.go b/pkg/apis/service-operator.aws/v1alpha1/register.go
index 0a258ef3f..59fb884cf 100644
--- a/pkg/apis/service-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/service-operator.aws"
+	awsio "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws"
 )
 
 // SchemeBuilder definition
diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go
index 53159f2f1..a14ed3101 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 (
-	serviceoperatorv1alpha1 "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
+	serviceoperatorv1alpha1 "github.com/awslabs/aws-service-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"
diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go
index 10569f215..0f64015c8 100644
--- a/pkg/client/clientset/versioned/fake/clientset_generated.go
+++ b/pkg/client/clientset/versioned/fake/clientset_generated.go
@@ -19,9 +19,9 @@ limitations under the License.
 package fake
 
 import (
-	clientset "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned"
-	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"
+	clientset "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned"
+	serviceoperatorv1alpha1 "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
+	fakeserviceoperatorv1alpha1 "github.com/awslabs/aws-service-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"
diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go
index e0208355b..c64a6dc34 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 (
-	serviceoperatorv1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
+	serviceoperatorv1alpha1 "github.com/awslabs/aws-service-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"
diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go
index 95349b9ff..ab261a295 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 (
-	serviceoperatorv1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
+	serviceoperatorv1alpha1 "github.com/awslabs/aws-service-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"
diff --git a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/cloudformationtemplate.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/cloudformationtemplate.go
index edf04b1e1..b5ba626f4 100644
--- a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/cloudformationtemplate.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/cloudformationtemplate.go
@@ -19,8 +19,8 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
-	scheme "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/scheme"
+	v1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	scheme "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/dynamodb.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/dynamodb.go
index d594ed2c8..4f1d37dc9 100644
--- a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/dynamodb.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/dynamodb.go
@@ -19,8 +19,8 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
-	scheme "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/scheme"
+	v1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	scheme "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/ecrrepository.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/ecrrepository.go
index c0e8ba8e8..d94e9d8a8 100644
--- a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/ecrrepository.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/ecrrepository.go
@@ -19,8 +19,8 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
-	scheme "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/scheme"
+	v1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	scheme "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_cloudformationtemplate.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_cloudformationtemplate.go
index 933c94709..8aa2e4a56 100644
--- a/pkg/client/clientset/versioned/typed/service-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/service-operator.aws/v1alpha1"
+	v1alpha1 "github.com/awslabs/aws-service-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"
diff --git a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_dynamodb.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_dynamodb.go
index 6fff52457..fbee5fa28 100644
--- a/pkg/client/clientset/versioned/typed/service-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/service-operator.aws/v1alpha1"
+	v1alpha1 "github.com/awslabs/aws-service-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"
diff --git a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_ecrrepository.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_ecrrepository.go
index e667baff3..b4af60e4f 100644
--- a/pkg/client/clientset/versioned/typed/service-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/service-operator.aws/v1alpha1"
+	v1alpha1 "github.com/awslabs/aws-service-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"
diff --git a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_s3bucket.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_s3bucket.go
index d8bd77c06..c452ae320 100644
--- a/pkg/client/clientset/versioned/typed/service-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/service-operator.aws/v1alpha1"
+	v1alpha1 "github.com/awslabs/aws-service-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"
diff --git a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_service-operator.aws_client.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_service-operator.aws_client.go
index 38e596cdd..f212cf9c7 100644
--- a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_service-operator.aws_client.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_service-operator.aws_client.go
@@ -19,7 +19,7 @@ limitations under the License.
 package fake
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
+	v1alpha1 "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 	rest "k8s.io/client-go/rest"
 	testing "k8s.io/client-go/testing"
 )
diff --git a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_snssubscription.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_snssubscription.go
index dcc178fc1..797776ca2 100644
--- a/pkg/client/clientset/versioned/typed/service-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/service-operator.aws/v1alpha1"
+	v1alpha1 "github.com/awslabs/aws-service-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"
diff --git a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_snstopic.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_snstopic.go
index 2c33e94a2..9daa422b7 100644
--- a/pkg/client/clientset/versioned/typed/service-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/service-operator.aws/v1alpha1"
+	v1alpha1 "github.com/awslabs/aws-service-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"
diff --git a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_sqsqueue.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/fake/fake_sqsqueue.go
index 1e0201aaa..559300b60 100644
--- a/pkg/client/clientset/versioned/typed/service-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/service-operator.aws/v1alpha1"
+	v1alpha1 "github.com/awslabs/aws-service-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"
diff --git a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/s3bucket.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/s3bucket.go
index f5b909dfa..6f283fa88 100644
--- a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/s3bucket.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/s3bucket.go
@@ -19,8 +19,8 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
-	scheme "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/scheme"
+	v1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	scheme "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/service-operator.aws_client.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/service-operator.aws_client.go
index 8306ac2c2..af15a7941 100644
--- a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/service-operator.aws_client.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/service-operator.aws_client.go
@@ -19,8 +19,8 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
-	"github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/scheme"
+	v1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	"github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/scheme"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	rest "k8s.io/client-go/rest"
 )
diff --git a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/snssubscription.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/snssubscription.go
index 8290790ef..119fd287d 100644
--- a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/snssubscription.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/snssubscription.go
@@ -19,8 +19,8 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
-	scheme "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/scheme"
+	v1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	scheme "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/snstopic.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/snstopic.go
index 265c0f394..daa47a260 100644
--- a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/snstopic.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/snstopic.go
@@ -19,8 +19,8 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
-	scheme "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/scheme"
+	v1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	scheme "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/sqsqueue.go b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/sqsqueue.go
index c1ecd187c..cce36849d 100644
--- a/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/sqsqueue.go
+++ b/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1/sqsqueue.go
@@ -19,8 +19,8 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/apis/service-operator.aws/v1alpha1"
-	scheme "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/scheme"
+	v1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	scheme "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/informers/externalversions/factory.go b/pkg/client/informers/externalversions/factory.go
index 8c392ea0e..62593a671 100644
--- a/pkg/client/informers/externalversions/factory.go
+++ b/pkg/client/informers/externalversions/factory.go
@@ -23,9 +23,9 @@ import (
 	sync "sync"
 	time "time"
 
-	versioned "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned"
-	internalinterfaces "github.com/christopherhein/aws-operator/pkg/client/informers/externalversions/internalinterfaces"
-	service_operator_aws "github.com/christopherhein/aws-operator/pkg/client/informers/externalversions/service-operator.aws"
+	versioned "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/awslabs/aws-service-operator/pkg/client/informers/externalversions/internalinterfaces"
+	service_operator_aws "github.com/awslabs/aws-service-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"
diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go
index 20b5c020c..3b96d44c8 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/service-operator.aws/v1alpha1"
+	v1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	cache "k8s.io/client-go/tools/cache"
 )
diff --git a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go
index 7c65da333..e51e62d37 100644
--- a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go
+++ b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go
@@ -21,7 +21,7 @@ package internalinterfaces
 import (
 	time "time"
 
-	versioned "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned"
+	versioned "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	cache "k8s.io/client-go/tools/cache"
diff --git a/pkg/client/informers/externalversions/service-operator.aws/interface.go b/pkg/client/informers/externalversions/service-operator.aws/interface.go
index 98c3d9473..2c43dba38 100644
--- a/pkg/client/informers/externalversions/service-operator.aws/interface.go
+++ b/pkg/client/informers/externalversions/service-operator.aws/interface.go
@@ -19,8 +19,8 @@ limitations under the License.
 package serviceoperator
 
 import (
-	internalinterfaces "github.com/christopherhein/aws-operator/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/christopherhein/aws-operator/pkg/client/informers/externalversions/service-operator.aws/v1alpha1"
+	internalinterfaces "github.com/awslabs/aws-service-operator/pkg/client/informers/externalversions/internalinterfaces"
+	v1alpha1 "github.com/awslabs/aws-service-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/service-operator.aws/v1alpha1/cloudformationtemplate.go b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/cloudformationtemplate.go
index 6ba09c2ee..d2a1e50fa 100644
--- a/pkg/client/informers/externalversions/service-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"
 
-	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/service-operator.aws/v1alpha1"
+	service_operator_aws_v1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	versioned "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/awslabs/aws-service-operator/pkg/client/informers/externalversions/internalinterfaces"
+	v1alpha1 "github.com/awslabs/aws-service-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"
diff --git a/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/dynamodb.go b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/dynamodb.go
index 061ff7e56..3945ea1ef 100644
--- a/pkg/client/informers/externalversions/service-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"
 
-	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/service-operator.aws/v1alpha1"
+	service_operator_aws_v1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	versioned "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/awslabs/aws-service-operator/pkg/client/informers/externalversions/internalinterfaces"
+	v1alpha1 "github.com/awslabs/aws-service-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"
diff --git a/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/ecrrepository.go b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/ecrrepository.go
index d09f9b46d..2252e754e 100644
--- a/pkg/client/informers/externalversions/service-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"
 
-	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/service-operator.aws/v1alpha1"
+	service_operator_aws_v1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	versioned "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/awslabs/aws-service-operator/pkg/client/informers/externalversions/internalinterfaces"
+	v1alpha1 "github.com/awslabs/aws-service-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"
diff --git a/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/interface.go b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/interface.go
index a374b10ec..5fa123117 100644
--- a/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/interface.go
+++ b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/interface.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	internalinterfaces "github.com/christopherhein/aws-operator/pkg/client/informers/externalversions/internalinterfaces"
+	internalinterfaces "github.com/awslabs/aws-service-operator/pkg/client/informers/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
diff --git a/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/s3bucket.go b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/s3bucket.go
index bc82a25cd..66c78c990 100644
--- a/pkg/client/informers/externalversions/service-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"
 
-	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/service-operator.aws/v1alpha1"
+	service_operator_aws_v1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	versioned "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/awslabs/aws-service-operator/pkg/client/informers/externalversions/internalinterfaces"
+	v1alpha1 "github.com/awslabs/aws-service-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"
diff --git a/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/snssubscription.go b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/snssubscription.go
index 11ff4ee76..4f7c87360 100644
--- a/pkg/client/informers/externalversions/service-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"
 
-	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/service-operator.aws/v1alpha1"
+	service_operator_aws_v1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	versioned "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/awslabs/aws-service-operator/pkg/client/informers/externalversions/internalinterfaces"
+	v1alpha1 "github.com/awslabs/aws-service-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"
diff --git a/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/snstopic.go b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/snstopic.go
index c4f88ad25..f4c450ad6 100644
--- a/pkg/client/informers/externalversions/service-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"
 
-	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/service-operator.aws/v1alpha1"
+	service_operator_aws_v1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	versioned "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/awslabs/aws-service-operator/pkg/client/informers/externalversions/internalinterfaces"
+	v1alpha1 "github.com/awslabs/aws-service-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"
diff --git a/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/sqsqueue.go b/pkg/client/informers/externalversions/service-operator.aws/v1alpha1/sqsqueue.go
index a395af4b5..9cfb574f3 100644
--- a/pkg/client/informers/externalversions/service-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"
 
-	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/service-operator.aws/v1alpha1"
+	service_operator_aws_v1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	versioned "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/awslabs/aws-service-operator/pkg/client/informers/externalversions/internalinterfaces"
+	v1alpha1 "github.com/awslabs/aws-service-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"
diff --git a/pkg/client/listers/service-operator.aws/v1alpha1/cloudformationtemplate.go b/pkg/client/listers/service-operator.aws/v1alpha1/cloudformationtemplate.go
index f00dd4482..43e132c88 100644
--- a/pkg/client/listers/service-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/service-operator.aws/v1alpha1"
+	v1alpha1 "github.com/awslabs/aws-service-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/service-operator.aws/v1alpha1/dynamodb.go b/pkg/client/listers/service-operator.aws/v1alpha1/dynamodb.go
index 01e2c4c36..a5da63d8e 100644
--- a/pkg/client/listers/service-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/service-operator.aws/v1alpha1"
+	v1alpha1 "github.com/awslabs/aws-service-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/service-operator.aws/v1alpha1/ecrrepository.go b/pkg/client/listers/service-operator.aws/v1alpha1/ecrrepository.go
index 38643b0b5..e1dfa4baa 100644
--- a/pkg/client/listers/service-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/service-operator.aws/v1alpha1"
+	v1alpha1 "github.com/awslabs/aws-service-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/service-operator.aws/v1alpha1/s3bucket.go b/pkg/client/listers/service-operator.aws/v1alpha1/s3bucket.go
index 0602e3fbe..f7884b27f 100644
--- a/pkg/client/listers/service-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/service-operator.aws/v1alpha1"
+	v1alpha1 "github.com/awslabs/aws-service-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/service-operator.aws/v1alpha1/snssubscription.go b/pkg/client/listers/service-operator.aws/v1alpha1/snssubscription.go
index 448987570..657ca7cac 100644
--- a/pkg/client/listers/service-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/service-operator.aws/v1alpha1"
+	v1alpha1 "github.com/awslabs/aws-service-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/service-operator.aws/v1alpha1/snstopic.go b/pkg/client/listers/service-operator.aws/v1alpha1/snstopic.go
index 5cbc61908..a8404122b 100644
--- a/pkg/client/listers/service-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/service-operator.aws/v1alpha1"
+	v1alpha1 "github.com/awslabs/aws-service-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/service-operator.aws/v1alpha1/sqsqueue.go b/pkg/client/listers/service-operator.aws/v1alpha1/sqsqueue.go
index a5d3c4750..f9e259550 100644
--- a/pkg/client/listers/service-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/service-operator.aws/v1alpha1"
+	v1alpha1 "github.com/awslabs/aws-service-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/config/types.go b/pkg/config/types.go
index 387b7996e..03e643c94 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/service-operator.aws/v1alpha1"
+	awsclient "github.com/awslabs/aws-service-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"
diff --git a/pkg/customizations/cloudformationtemplate/cloudformationtemplate.go b/pkg/customizations/cloudformationtemplate/cloudformationtemplate.go
index 65059853f..5f1908c5e 100644
--- a/pkg/customizations/cloudformationtemplate/cloudformationtemplate.go
+++ b/pkg/customizations/cloudformationtemplate/cloudformationtemplate.go
@@ -5,9 +5,9 @@ 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/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"
+	awsV1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	awsclient "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
+	"github.com/awslabs/aws-service-operator/pkg/config"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"reflect"
 )
diff --git a/pkg/helpers/config_map.go b/pkg/helpers/config_map.go
index e5f8c9227..1bd1e50a5 100644
--- a/pkg/helpers/config_map.go
+++ b/pkg/helpers/config_map.go
@@ -1,7 +1,7 @@
 package helpers
 
 import (
-	"github.com/christopherhein/aws-operator/pkg/config"
+	"github.com/awslabs/aws-service-operator/pkg/config"
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/pkg/helpers/helpers.go b/pkg/helpers/helpers.go
index e003bca88..cb23e6748 100644
--- a/pkg/helpers/helpers.go
+++ b/pkg/helpers/helpers.go
@@ -3,8 +3,8 @@ package helpers
 import (
 	"bytes"
 	"github.com/aws/aws-sdk-go/service/cloudformation"
-	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
-	"github.com/christopherhein/aws-operator/pkg/config"
+	awsclient "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
+	"github.com/awslabs/aws-service-operator/pkg/config"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"reflect"
 	"regexp"
diff --git a/pkg/helpers/service.go b/pkg/helpers/service.go
index 1f0524b98..87a1b1240 100644
--- a/pkg/helpers/service.go
+++ b/pkg/helpers/service.go
@@ -1,7 +1,7 @@
 package helpers
 
 import (
-	"github.com/christopherhein/aws-operator/pkg/config"
+	"github.com/awslabs/aws-service-operator/pkg/config"
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/pkg/helpers/template_functions.go b/pkg/helpers/template_functions.go
index 4afc11509..faa40878a 100644
--- a/pkg/helpers/template_functions.go
+++ b/pkg/helpers/template_functions.go
@@ -6,8 +6,8 @@
 package helpers
 
 import (
-	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
-	"github.com/christopherhein/aws-operator/pkg/config"
+	awsclient "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
+	"github.com/awslabs/aws-service-operator/pkg/config"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
diff --git a/pkg/helpers/types.go b/pkg/helpers/types.go
index 5ce134bc0..c62c03d39 100644
--- a/pkg/helpers/types.go
+++ b/pkg/helpers/types.go
@@ -1,6 +1,6 @@
 package helpers
 
-import "github.com/christopherhein/aws-operator/pkg/config"
+import "github.com/awslabs/aws-service-operator/pkg/config"
 
 // Data wrapps the object that is needed for the services
 type Data struct {
diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go
index 79b1f6ee1..be177972b 100644
--- a/pkg/logger/logger.go
+++ b/pkg/logger/logger.go
@@ -2,7 +2,7 @@ package logger
 
 import (
 	"bufio"
-	"github.com/christopherhein/aws-operator/pkg/config"
+	"github.com/awslabs/aws-service-operator/pkg/config"
 	"github.com/sirupsen/logrus"
 	"os"
 	"strings"
diff --git a/pkg/operator/cloudformationtemplate/controller.go b/pkg/operator/cloudformationtemplate/controller.go
index 92885125c..1e0db72e4 100644
--- a/pkg/operator/cloudformationtemplate/controller.go
+++ b/pkg/operator/cloudformationtemplate/controller.go
@@ -8,15 +8,15 @@ package cloudformationtemplate
 import (
 	"reflect"
 
-	"github.com/christopherhein/aws-operator/pkg/config"
+	"github.com/awslabs/aws-service-operator/pkg/config"
 	opkit "github.com/christopherhein/operator-kit"
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 
-	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"
+	awsapi "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws"
+	awsV1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	awsclient "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
+	"github.com/awslabs/aws-service-operator/pkg/customizations/cloudformationtemplate"
 )
 
 // Resource is the object store definition
diff --git a/pkg/operator/dynamodb/cft.go b/pkg/operator/dynamodb/cft.go
index 465f04160..3aa6554fe 100644
--- a/pkg/operator/dynamodb/cft.go
+++ b/pkg/operator/dynamodb/cft.go
@@ -9,9 +9,9 @@ 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/service-operator.aws/v1alpha1"
-	"github.com/christopherhein/aws-operator/pkg/config"
-	"github.com/christopherhein/aws-operator/pkg/helpers"
+	awsV1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	"github.com/awslabs/aws-service-operator/pkg/config"
+	"github.com/awslabs/aws-service-operator/pkg/helpers"
 )
 
 // New generates a new object
diff --git a/pkg/operator/dynamodb/controller.go b/pkg/operator/dynamodb/controller.go
index 1f7f31958..a59eda1d0 100644
--- a/pkg/operator/dynamodb/controller.go
+++ b/pkg/operator/dynamodb/controller.go
@@ -6,19 +6,19 @@
 package dynamodb
 
 import (
-	"github.com/christopherhein/aws-operator/pkg/helpers"
+	"github.com/awslabs/aws-service-operator/pkg/helpers"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"reflect"
 
-	"github.com/christopherhein/aws-operator/pkg/config"
-	"github.com/christopherhein/aws-operator/pkg/queue"
+	"github.com/awslabs/aws-service-operator/pkg/config"
+	"github.com/awslabs/aws-service-operator/pkg/queue"
 	opkit "github.com/christopherhein/operator-kit"
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 
-	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"
+	awsapi "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws"
+	awsV1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	awsclient "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 )
 
 // Resource is the object store definition
diff --git a/pkg/operator/ecrrepository/cft.go b/pkg/operator/ecrrepository/cft.go
index f56794432..301f2b378 100644
--- a/pkg/operator/ecrrepository/cft.go
+++ b/pkg/operator/ecrrepository/cft.go
@@ -9,9 +9,9 @@ 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/service-operator.aws/v1alpha1"
-	"github.com/christopherhein/aws-operator/pkg/config"
-	"github.com/christopherhein/aws-operator/pkg/helpers"
+	awsV1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	"github.com/awslabs/aws-service-operator/pkg/config"
+	"github.com/awslabs/aws-service-operator/pkg/helpers"
 )
 
 // New generates a new object
diff --git a/pkg/operator/ecrrepository/controller.go b/pkg/operator/ecrrepository/controller.go
index 88cbcb7b1..78322ef92 100644
--- a/pkg/operator/ecrrepository/controller.go
+++ b/pkg/operator/ecrrepository/controller.go
@@ -6,19 +6,19 @@
 package ecrrepository
 
 import (
-	"github.com/christopherhein/aws-operator/pkg/helpers"
+	"github.com/awslabs/aws-service-operator/pkg/helpers"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"reflect"
 
-	"github.com/christopherhein/aws-operator/pkg/config"
-	"github.com/christopherhein/aws-operator/pkg/queue"
+	"github.com/awslabs/aws-service-operator/pkg/config"
+	"github.com/awslabs/aws-service-operator/pkg/queue"
 	opkit "github.com/christopherhein/operator-kit"
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 
-	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"
+	awsapi "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws"
+	awsV1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	awsclient "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 )
 
 // Resource is the object store definition
diff --git a/pkg/operator/s3bucket/cft.go b/pkg/operator/s3bucket/cft.go
index 3713c1c81..77035f0b7 100644
--- a/pkg/operator/s3bucket/cft.go
+++ b/pkg/operator/s3bucket/cft.go
@@ -9,9 +9,9 @@ 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/service-operator.aws/v1alpha1"
-	"github.com/christopherhein/aws-operator/pkg/config"
-	"github.com/christopherhein/aws-operator/pkg/helpers"
+	awsV1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	"github.com/awslabs/aws-service-operator/pkg/config"
+	"github.com/awslabs/aws-service-operator/pkg/helpers"
 )
 
 // New generates a new object
diff --git a/pkg/operator/s3bucket/controller.go b/pkg/operator/s3bucket/controller.go
index 5a5387675..b21274d1d 100644
--- a/pkg/operator/s3bucket/controller.go
+++ b/pkg/operator/s3bucket/controller.go
@@ -6,19 +6,19 @@
 package s3bucket
 
 import (
-	"github.com/christopherhein/aws-operator/pkg/helpers"
+	"github.com/awslabs/aws-service-operator/pkg/helpers"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"reflect"
 
-	"github.com/christopherhein/aws-operator/pkg/config"
-	"github.com/christopherhein/aws-operator/pkg/queue"
+	"github.com/awslabs/aws-service-operator/pkg/config"
+	"github.com/awslabs/aws-service-operator/pkg/queue"
 	opkit "github.com/christopherhein/operator-kit"
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 
-	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"
+	awsapi "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws"
+	awsV1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	awsclient "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 )
 
 // Resource is the object store definition
diff --git a/pkg/operator/snssubscription/cft.go b/pkg/operator/snssubscription/cft.go
index ae8efd96d..5497b9821 100644
--- a/pkg/operator/snssubscription/cft.go
+++ b/pkg/operator/snssubscription/cft.go
@@ -9,9 +9,9 @@ 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/service-operator.aws/v1alpha1"
-	"github.com/christopherhein/aws-operator/pkg/config"
-	"github.com/christopherhein/aws-operator/pkg/helpers"
+	awsV1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	"github.com/awslabs/aws-service-operator/pkg/config"
+	"github.com/awslabs/aws-service-operator/pkg/helpers"
 )
 
 // New generates a new object
diff --git a/pkg/operator/snssubscription/controller.go b/pkg/operator/snssubscription/controller.go
index 063f2f3f3..78f4757f9 100644
--- a/pkg/operator/snssubscription/controller.go
+++ b/pkg/operator/snssubscription/controller.go
@@ -6,19 +6,19 @@
 package snssubscription
 
 import (
-	"github.com/christopherhein/aws-operator/pkg/helpers"
+	"github.com/awslabs/aws-service-operator/pkg/helpers"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"reflect"
 
-	"github.com/christopherhein/aws-operator/pkg/config"
-	"github.com/christopherhein/aws-operator/pkg/queue"
+	"github.com/awslabs/aws-service-operator/pkg/config"
+	"github.com/awslabs/aws-service-operator/pkg/queue"
 	opkit "github.com/christopherhein/operator-kit"
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 
-	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"
+	awsapi "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws"
+	awsV1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	awsclient "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 )
 
 // Resource is the object store definition
diff --git a/pkg/operator/snstopic/cft.go b/pkg/operator/snstopic/cft.go
index ccaafebd1..e2fd46527 100644
--- a/pkg/operator/snstopic/cft.go
+++ b/pkg/operator/snstopic/cft.go
@@ -9,9 +9,9 @@ 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/service-operator.aws/v1alpha1"
-	"github.com/christopherhein/aws-operator/pkg/config"
-	"github.com/christopherhein/aws-operator/pkg/helpers"
+	awsV1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	"github.com/awslabs/aws-service-operator/pkg/config"
+	"github.com/awslabs/aws-service-operator/pkg/helpers"
 )
 
 // New generates a new object
diff --git a/pkg/operator/snstopic/controller.go b/pkg/operator/snstopic/controller.go
index 953d39614..a29c1bbea 100644
--- a/pkg/operator/snstopic/controller.go
+++ b/pkg/operator/snstopic/controller.go
@@ -6,19 +6,19 @@
 package snstopic
 
 import (
-	"github.com/christopherhein/aws-operator/pkg/helpers"
+	"github.com/awslabs/aws-service-operator/pkg/helpers"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"reflect"
 
-	"github.com/christopherhein/aws-operator/pkg/config"
-	"github.com/christopherhein/aws-operator/pkg/queue"
+	"github.com/awslabs/aws-service-operator/pkg/config"
+	"github.com/awslabs/aws-service-operator/pkg/queue"
 	opkit "github.com/christopherhein/operator-kit"
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 
-	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"
+	awsapi "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws"
+	awsV1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	awsclient "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 )
 
 // Resource is the object store definition
diff --git a/pkg/operator/sqsqueue/cft.go b/pkg/operator/sqsqueue/cft.go
index 6fd1193ed..9ee0580fd 100644
--- a/pkg/operator/sqsqueue/cft.go
+++ b/pkg/operator/sqsqueue/cft.go
@@ -9,9 +9,9 @@ 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/service-operator.aws/v1alpha1"
-	"github.com/christopherhein/aws-operator/pkg/config"
-	"github.com/christopherhein/aws-operator/pkg/helpers"
+	awsV1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	"github.com/awslabs/aws-service-operator/pkg/config"
+	"github.com/awslabs/aws-service-operator/pkg/helpers"
 )
 
 // New generates a new object
diff --git a/pkg/operator/sqsqueue/controller.go b/pkg/operator/sqsqueue/controller.go
index f56c4720e..395096f5c 100644
--- a/pkg/operator/sqsqueue/controller.go
+++ b/pkg/operator/sqsqueue/controller.go
@@ -6,19 +6,19 @@
 package sqsqueue
 
 import (
-	"github.com/christopherhein/aws-operator/pkg/helpers"
+	"github.com/awslabs/aws-service-operator/pkg/helpers"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"reflect"
 
-	"github.com/christopherhein/aws-operator/pkg/config"
-	"github.com/christopherhein/aws-operator/pkg/queue"
+	"github.com/awslabs/aws-service-operator/pkg/config"
+	"github.com/awslabs/aws-service-operator/pkg/queue"
 	opkit "github.com/christopherhein/operator-kit"
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 
-	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"
+	awsapi "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws"
+	awsV1alpha1 "github.com/awslabs/aws-service-operator/pkg/apis/service-operator.aws/v1alpha1"
+	awsclient "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 )
 
 // Resource is the object store definition
diff --git a/pkg/queue/queue.go b/pkg/queue/queue.go
index eb0091f4a..f42ba4b7b 100644
--- a/pkg/queue/queue.go
+++ b/pkg/queue/queue.go
@@ -6,9 +6,9 @@ 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/service-operator.aws/v1alpha1"
-	"github.com/christopherhein/aws-operator/pkg/config"
-	"github.com/christopherhein/aws-operator/pkg/helpers"
+	awsclient "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
+	"github.com/awslabs/aws-service-operator/pkg/config"
+	"github.com/awslabs/aws-service-operator/pkg/helpers"
 	opkit "github.com/christopherhein/operator-kit"
 	"os"
 	"strings"
diff --git a/pkg/queue/types.go b/pkg/queue/types.go
index ee0c5aedb..ad076b89c 100644
--- a/pkg/queue/types.go
+++ b/pkg/queue/types.go
@@ -1,8 +1,8 @@
 package queue
 
 import (
-	awsclient "github.com/christopherhein/aws-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
-	"github.com/christopherhein/aws-operator/pkg/config"
+	awsclient "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
+	"github.com/awslabs/aws-service-operator/pkg/config"
 	opkit "github.com/christopherhein/operator-kit"
 )
 
diff --git a/pkg/server/server.go b/pkg/server/server.go
index 4742d8fb1..f749291d1 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -7,15 +7,15 @@ import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"time"
 
-	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"
-	"github.com/christopherhein/aws-operator/pkg/operator/ecrrepository"
-	"github.com/christopherhein/aws-operator/pkg/operator/s3bucket"
-	"github.com/christopherhein/aws-operator/pkg/operator/snssubscription"
-	"github.com/christopherhein/aws-operator/pkg/operator/snstopic"
-	"github.com/christopherhein/aws-operator/pkg/operator/sqsqueue"
+	awsclient "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
+	"github.com/awslabs/aws-service-operator/pkg/config"
+	"github.com/awslabs/aws-service-operator/pkg/operator/cloudformationtemplate"
+	"github.com/awslabs/aws-service-operator/pkg/operator/dynamodb"
+	"github.com/awslabs/aws-service-operator/pkg/operator/ecrrepository"
+	"github.com/awslabs/aws-service-operator/pkg/operator/s3bucket"
+	"github.com/awslabs/aws-service-operator/pkg/operator/snssubscription"
+	"github.com/awslabs/aws-service-operator/pkg/operator/snstopic"
+	"github.com/awslabs/aws-service-operator/pkg/operator/sqsqueue"
 	opkit "github.com/christopherhein/operator-kit"
 	"k8s.io/api/core/v1"
 	apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
diff --git a/pkg/server/types.go b/pkg/server/types.go
index f8bfa46f3..864f915fd 100644
--- a/pkg/server/types.go
+++ b/pkg/server/types.go
@@ -1,7 +1,7 @@
 package server
 
 import (
-	"github.com/christopherhein/aws-operator/pkg/config"
+	"github.com/awslabs/aws-service-operator/pkg/config"
 )
 
 // Server defines the bas construct for the operator