diff --git a/Gopkg.lock b/Gopkg.lock
index 96ed4bd07..0d9e2fb59 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -1,5 +1,4 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
+memo = "d628d38d5466c7cb518c5958cac84faf570f2082027b3868f7e035b871a2fc6f"
 
 [[projects]]
   branch = "master"
@@ -32,10 +31,10 @@
   revision = "bbf7a2afc14f93e1e0a5c06df524fbd75e5031e5"
 
 [[projects]]
-  branch = "master"
   name = "github.com/Sirupsen/logrus"
   packages = [".","hooks/syslog"]
-  revision = "5e5dc898656f695e2a086b8e12559febbfc01562"
+  revision = "ba1b36c82c5e05c4f912a88eab0dcd91a171688f"
+  version = "v0.11.5"
 
 [[projects]]
   branch = "master"
@@ -52,8 +51,8 @@
 [[projects]]
   name = "github.com/aws/aws-sdk-go"
   packages = ["aws","aws/awserr","aws/awsutil","aws/client","aws/client/metadata","aws/corehandlers","aws/credentials","aws/credentials/ec2rolecreds","aws/credentials/endpointcreds","aws/credentials/stscreds","aws/defaults","aws/ec2metadata","aws/endpoints","aws/request","aws/session","aws/signer/v4","internal/shareddefaults","private/protocol","private/protocol/json/jsonutil","private/protocol/jsonrpc","private/protocol/query","private/protocol/query/queryutil","private/protocol/rest","private/protocol/restjson","private/protocol/xml/xmlutil","service/lambda","service/sts"]
-  revision = "f9a14dadf426ac17058f5ed3ec9bac9a61b5990b"
-  version = "v1.8.33"
+  revision = "328d4b6c297ec5d4f86543fca46254699d82cada"
+  version = "v1.8.35"
 
 [[projects]]
   name = "github.com/boltdb/bolt"
@@ -119,7 +118,7 @@
   branch = "master"
   name = "github.com/docker/cli"
   packages = ["cli/config/configfile"]
-  revision = "30af87981d8d464c385b247f524fcbc503207940"
+  revision = "51b00f966e1da76b4a896f0ea89151f5c0d63685"
 
 [[projects]]
   name = "github.com/docker/distribution"
@@ -163,6 +162,12 @@
   packages = ["."]
   revision = "c933ed18bef34ec2955de03de8ef9a3bb996e3df"
 
+[[projects]]
+  branch = "master"
+  name = "github.com/funcy/functions_go"
+  packages = [".","client","client/apps","client/routes","client/tasks","client/version","models"]
+  revision = "e995899e0032f175bb111c3ccd9777e16486882c"
+
 [[projects]]
   name = "github.com/garyburd/redigo"
   packages = ["internal","redis"]
@@ -176,16 +181,16 @@
   version = "1.1.1"
 
 [[projects]]
-  branch = "master"
   name = "github.com/gin-gonic/gin"
   packages = [".","binding","render"]
-  revision = "d5b353c5d5a560322e6d96121c814115562501f7"
+  revision = "e2212d40c62a98b388a5eb48ecbdcf88534688ba"
+  version = "v1.1.4"
 
 [[projects]]
   name = "github.com/go-ini/ini"
   packages = ["."]
-  revision = "36da989cdc560b989d8f195aec46214d33665d20"
-  version = "v1.27.2"
+  revision = "d3de07a94d22b4a0972deb4b96d790c2c0ce8333"
+  version = "v1.28.0"
 
 [[projects]]
   branch = "master"
@@ -239,7 +244,7 @@
   branch = "master"
   name = "github.com/go-openapi/swag"
   packages = ["."]
-  revision = "e43299b4afa7bc7f22e5e82e3d48607230e4c177"
+  revision = "f3f9494671f93fcff853e3c6e9e948b3eb71e590"
 
 [[projects]]
   branch = "master"
@@ -254,16 +259,16 @@
   version = "v0.12"
 
 [[projects]]
-  branch = "master"
   name = "github.com/go-sql-driver/mysql"
   packages = ["."]
-  revision = "e3f0fdcf52770a162d5a4540ddb8d9957ff456d1"
+  revision = "a0583e0143b1624142adab07e0e97fe106d99561"
+  version = "v1.3"
 
 [[projects]]
   branch = "master"
   name = "github.com/golang/protobuf"
   packages = ["proto"]
-  revision = "6e4cc92cc905d5f4a73041c1b8228ea08f4c6147"
+  revision = "5a0f697c9ed9d68fef0116532c6e05cfeae00e55"
 
 [[projects]]
   branch = "master"
@@ -307,12 +312,6 @@
   packages = ["registry"]
   revision = "95467b6cacee2a06f112a3cf7e47a70fad6000cf"
 
-[[projects]]
-  branch = "master"
-  name = "github.com/iron-io/functions_go"
-  packages = [".","client","client/apps","client/routes","client/tasks","client/version","models"]
-  revision = "69e4dec8454c3c710045263c2ede76139c141146"
-
 [[projects]]
   branch = "master"
   name = "github.com/iron-io/iron_go3"
@@ -341,7 +340,7 @@
   branch = "master"
   name = "github.com/lib/pq"
   packages = [".","oid"]
-  revision = "91f10e40ba0dd2d0bf9f93ec1d4077711a78df88"
+  revision = "8837942c3e09574accbc5f150e2c5e057189cace"
 
 [[projects]]
   name = "github.com/magiconair/properties"
@@ -404,16 +403,16 @@
   revision = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"
 
 [[projects]]
-  branch = "master"
   name = "github.com/pkg/errors"
   packages = ["."]
-  revision = "c605e284fe17294bda444b34710735b29d1a9d90"
+  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
+  version = "v0.8.0"
 
 [[projects]]
-  branch = "master"
   name = "github.com/satori/go.uuid"
   packages = ["."]
-  revision = "5bf94b69c6b68ee1b541973bb8e1144db23a194b"
+  revision = "879c5887cd475cd7864858769793b2ceb0d44feb"
+  version = "v1.1.0"
 
 [[projects]]
   branch = "master"
@@ -467,7 +466,7 @@
   branch = "master"
   name = "golang.org/x/net"
   packages = ["context","context/ctxhttp","idna","proxy","publicsuffix"]
-  revision = "3da985ce5951d99de868be4385f21ea6c2b22f24"
+  revision = "59a0b19b5533c7977ddeb86b017bf507ed407b12"
 
 [[projects]]
   branch = "master"
@@ -479,7 +478,7 @@
   branch = "master"
   name = "golang.org/x/text"
   packages = ["internal/gen","internal/triegen","internal/ucd","secure/bidirule","transform","unicode/bidi","unicode/cldr","unicode/norm","unicode/rangetable","width"]
-  revision = "4ee4af566555f5fbe026368b75596286a312663a"
+  revision = "ccbd3f7822129ff389f8ca4858a9b9d4d910531c"
 
 [[projects]]
   name = "gopkg.in/go-playground/validator.v8"
@@ -498,10 +497,3 @@
   name = "gopkg.in/yaml.v2"
   packages = ["."]
   revision = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "961ede3bad03a1a3f5ac22d03ac3861a800943fbae4f66de32279d5f9fc85061"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 0a6376fbd..f2332cd56 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -176,7 +176,7 @@
 
 [[constraint]]
   branch = "master"
-  name = "github.com/iron-io/functions_go"
+  name = "github.com/funcy/functions_go"
 
 [[constraint]]
   branch = "master"
diff --git a/clients/main.go b/clients/main.go
index ef2aba7c0..62e74b805 100644
--- a/clients/main.go
+++ b/clients/main.go
@@ -135,7 +135,7 @@ func main() {
 		branch := fmt.Sprintf("update-version-%s", version)
 
 		log.Printf("Cloning previous `%s` source...\n", language)
-		exec.Command("git", "clone", fmt.Sprintf("git@github.com:treeder/functions_%s.git", short), srcDir).Run()
+		exec.Command("git", "clone", fmt.Sprintf("git@gitlab-odx.oracle.com:odx/functions_%s.git", short), srcDir).Run()
 
 		// Skip language specific files
 		for _, skip := range skipFiles {
@@ -168,7 +168,7 @@ func main() {
 		os.Chdir(srcDir)
 		exec.Command("git", "checkout", "-b", branch).Run()
 		exec.Command("git", "add", ".").Run()
-		exec.Command("git", "commit", "-am", fmt.Sprintf("Updated to api version %s", version)).Run()
+		exec.Command("git", "commit", "-am", fmt.Sprintf("Updated to API version %s", version)).Run()
 
 		log.Printf("Pushing new `%s` client\n", language)
 		r := exec.Command("git", "push", "origin", branch).Run()
@@ -305,7 +305,7 @@ func genSwaggerClient(target string) error {
 		return err
 	}
 
-	cmd := exec.Command("docker", "run", "--rm", "-u", fmt.Sprintf("%s:%s", u.Uid, u.Gid), "-v", fmt.Sprintf("%s/%s:/go/src/github.com/treeder/functions_go", cwd, target), "-v", fmt.Sprintf("%s/%s:/go/swagger.spec", cwd, swaggerURL), "-w", "/go/src", "quay.io/goswagger/swagger", "generate", "client", "-f", "/go/swagger.spec", "-t", "github.com/iron-io/functions_go", "-A", "functions")
+	cmd := exec.Command("docker", "run", "--rm", "-u", fmt.Sprintf("%s:%s", u.Uid, u.Gid), "-v", fmt.Sprintf("%s/%s:/go/src/github.com/funcy/functions_go", cwd, target), "-v", fmt.Sprintf("%s/%s:/go/swagger.spec", cwd, swaggerURL), "-w", "/go/src", "quay.io/goswagger/swagger", "generate", "client", "-f", "/go/swagger.spec", "-t", "github.com/funcy/functions_go", "-A", "functions")
 	d, err := cmd.CombinedOutput()
 	if err != nil {
 		log.Printf("Error running go-swagger: %s\n", d)
diff --git a/docs/writing.md b/docs/writing.md
index 25a3ee283..49ad8d138 100644
--- a/docs/writing.md
+++ b/docs/writing.md
@@ -4,7 +4,7 @@ This will give you the basic overview of writing base level functions. You can a
 abstractions that make it easier such as [lambda](lambda/README.md).
 
 Also, for complete examples in various languages, see the [examples directory](/examples).
-We have language libraries for [Go](https://github.com/iron-io/functions_go), [Javascript](https://github.com/treeder/functions_js) and
+We have language libraries for [Go](https://github.com/funcy/functions_go), [Javascript](https://github.com/treeder/functions_js) and
 [Ruby](https://github.com/treeder/functions_ruby).
 
 ## Code
diff --git a/fn/Gopkg.lock b/fn/Gopkg.lock
index 80fa3a25f..13192f74f 100644
--- a/fn/Gopkg.lock
+++ b/fn/Gopkg.lock
@@ -1,5 +1,4 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
+memo = "f23a5e941b4b53ce3100a43c698bbc29b85f8bd3257d17e699b238db2f1ebf1e"
 
 [[projects]]
   branch = "master"
@@ -55,6 +54,12 @@
   revision = "f2d77a61e3c169b43402a0a1e84f06daf29b8190"
   version = "v0.3.1"
 
+[[projects]]
+  branch = "master"
+  name = "github.com/funcy/functions_go"
+  packages = [".","client","client/apps","client/routes","client/tasks","client/version","models"]
+  revision = "6ab40fd04a355106389f52a5a3815b1b771b18c7"
+
 [[projects]]
   name = "github.com/giantswarm/semver-bump"
   packages = ["bump","storage"]
@@ -133,12 +138,6 @@
   revision = "7a8134d8718193eb857994adee49d73a302e7718"
   version = "v0.12"
 
-[[projects]]
-  branch = "master"
-  name = "github.com/iron-io/functions_go"
-  packages = [".","client","client/apps","client/routes","client/tasks","client/version","models"]
-  revision = "69e4dec8454c3c710045263c2ede76139c141146"
-
 [[projects]]
   name = "github.com/jmespath/go-jmespath"
   packages = ["."]
@@ -210,10 +209,3 @@
   name = "gopkg.in/yaml.v2"
   packages = ["."]
   revision = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "3ea53dfb758c5e85c0dcbea6325506f905f1d5e9f7d43d57d8e500112e021bac"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/fn/Gopkg.toml b/fn/Gopkg.toml
index 4a3ad7064..448cdf645 100644
--- a/fn/Gopkg.toml
+++ b/fn/Gopkg.toml
@@ -88,7 +88,7 @@
 
 [[constraint]]
   branch = "master"
-  name = "github.com/iron-io/functions_go"
+  name = "github.com/funcy/functions_go"
 
 [[constraint]]
   branch = "master"
diff --git a/fn/api.go b/fn/api.go
index 76ba40dde..9c0f3ada1 100644
--- a/fn/api.go
+++ b/fn/api.go
@@ -5,7 +5,7 @@ import (
 
 	httptransport "github.com/go-openapi/runtime/client"
 	"github.com/go-openapi/strfmt"
-	fnclient "github.com/iron-io/functions_go/client"
+	fnclient "github.com/funcy/functions_go/client"
 	"log"
 	"net/url"
 )
diff --git a/fn/apps.go b/fn/apps.go
index 729637a2f..a3ead1246 100644
--- a/fn/apps.go
+++ b/fn/apps.go
@@ -7,10 +7,10 @@ import (
 	"os"
 
 	"context"
-	"github.com/iron-io/functions_go"
-	fnclient "github.com/iron-io/functions_go/client"
-	apiapps "github.com/iron-io/functions_go/client/apps"
-	"github.com/iron-io/functions_go/models"
+	"github.com/funcy/functions_go"
+	fnclient "github.com/funcy/functions_go/client"
+	apiapps "github.com/funcy/functions_go/client/apps"
+	"github.com/funcy/functions_go/models"
 	"github.com/jmoiron/jsonq"
 	"github.com/urfave/cli"
 	"strings"
diff --git a/fn/deploy.go b/fn/deploy.go
index 97aa2ed72..c6d3b6909 100644
--- a/fn/deploy.go
+++ b/fn/deploy.go
@@ -10,8 +10,8 @@ import (
 	"path/filepath"
 	"time"
 
-	functions "github.com/iron-io/functions_go"
-	"github.com/iron-io/functions_go/models"
+	functions "github.com/funcy/functions_go"
+	"github.com/funcy/functions_go/models"
 	"github.com/urfave/cli"
 )
 
diff --git a/fn/glide.lock b/fn/glide.lock
new file mode 100644
index 000000000..7fcb31b15
--- /dev/null
+++ b/fn/glide.lock
@@ -0,0 +1,207 @@
+hash: 6b12a9176a923d8bc91e738c26d3e6ae32ca478f1f1ddc3d169ac91a13f2c559
+updated: 2017-06-06T19:42:36.259550031+03:00
+imports:
+- name: code.cloudfoundry.org/bytefmt
+  version: b12c1522f4cbb5f35861bd5dd2c39a4fa996441a
+- name: github.com/amir/raidman
+  version: c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985
+- name: github.com/asaskevich/govalidator
+  version: 7b3beb6df3c42abd3509abfc3bcacc0fbfb7c877
+- name: github.com/aws/aws-sdk-go
+  version: 90dec2183a5f5458ee79cbaf4b8e9ab910bc81a6
+  subpackages:
+  - aws
+  - aws/awserr
+  - aws/awsutil
+  - aws/client
+  - aws/client/metadata
+  - aws/corehandlers
+  - aws/credentials
+  - aws/credentials/ec2rolecreds
+  - aws/defaults
+  - aws/ec2metadata
+  - aws/request
+  - aws/session
+  - aws/signer/v4
+  - private/endpoints
+  - private/protocol
+  - private/protocol/json/jsonutil
+  - private/protocol/jsonrpc
+  - private/protocol/rest
+  - private/protocol/restjson
+  - service/lambda
+- name: github.com/Azure/go-ansiterm
+  version: fa152c58bc15761d0200cb75fe958b89a9d4888e
+  subpackages:
+  - winterm
+- name: github.com/boltdb/bolt
+  version: 0d9f544bb94aac29c185968483459ef74d6deb5d
+- name: github.com/cactus/go-statsd-client
+  version: 91c326c3f7bd20f0226d3d1c289dd9f8ce28d33d
+  subpackages:
+  - statsd
+- name: github.com/ccirello/supervisor
+  version: 341cd52503c550c397196693601273cc290cf1b4
+- name: github.com/coreos/go-semver
+  version: 9474efc580562cce8f761659fbce31b6feb8ce88
+  subpackages:
+  - semver
+- name: github.com/dchest/siphash
+  version: 4ebf1de738443ea7f45f02dc394c4df1942a126d
+- name: github.com/dghubble/go-twitter
+  version: f310dcebe0ae1f6b73165caed281f87768c15780
+  subpackages:
+  - twitter
+- name: github.com/dghubble/oauth1
+  version: 4385816142116aade2d97d0f320f9d3666e74cd9
+- name: github.com/dgrijalva/jwt-go
+  version: 9ed569b5d1ac936e6494082958d63a6aa4fff99a
+- name: github.com/docker/cli
+  version: ed5b66308222511bd9e2e4e7e2c278d9887d0142
+  subpackages:
+  - cli/config/configfile
+- name: github.com/docker/distribution
+  version: 99cb7c0946d2f5a38015443e515dc916295064d7
+  subpackages:
+  - manifest/schema1
+- name: github.com/docker/docker
+  version: fddb5a7f2ab29be441bc797f7e79fffc5cc531d3
+  subpackages:
+  - pkg/jsonlog
+  - pkg/term
+  - pkg/term/windows
+- name: github.com/docker/go-units
+  version: e30f1e79f3cd72542f2026ceec18d3bd67ab859c
+- name: github.com/fsouza/go-dockerclient
+  version: fbeb72ccd29aa2596f364a5a85af622c651c3e16
+- name: github.com/funcy/functions_go
+  version: 6ab40fd04a355106389f52a5a3815b1b771b18c7
+  subpackages:
+  - client
+  - client/apps
+  - client/routes
+  - client/tasks
+  - client/version
+  - models
+- name: github.com/garyburd/redigo
+  version: 0708def8b0cf3a05acdf44a7f28b864c2958921d
+  subpackages:
+  - redis
+- name: github.com/giantswarm/semver-bump
+  version: 7ec6ac8985c24dd50b4942f9a908d13cdfe70f23
+  subpackages:
+  - bump
+  - storage
+- name: github.com/gin-gonic/gin
+  version: e2212d40c62a98b388a5eb48ecbdcf88534688ba
+- name: github.com/go-ini/ini
+  version: 2ba15ac2dc9cdf88c110ec2dc0ced7fa45f5678c
+- name: github.com/go-openapi/analysis
+  version: 7222828b8ce19afee3c595aef6643b9e42150120
+- name: github.com/go-openapi/errors
+  version: 49fe8b3a0e0d32a617d8d50c67f856ad6e45b28b
+- name: github.com/go-openapi/jsonpointer
+  version: 8d96a2dc61536b690bd36b2e9df0b3c0b62825b2
+- name: github.com/go-openapi/jsonreference
+  version: 36d33bfe519efae5632669801b180bf1a245da3b
+- name: github.com/go-openapi/loads
+  version: 315567415dfd74b651f7a62cabfc82a57ed7b9ad
+  subpackages:
+  - fmts
+- name: github.com/go-openapi/runtime
+  version: 14b161b40ece9dac8e244ab2fde2d209e108c6f5
+  subpackages:
+  - client
+- name: github.com/go-openapi/spec
+  version: f7ae86df5bc115a2744343016c789a89f065a4bd
+- name: github.com/go-openapi/strfmt
+  version: 34fc3ba7c0f5fb615fda47a2b4fbd4c641b215f2
+- name: github.com/go-openapi/swag
+  version: 3b6d86cd965820f968760d5d419cb4add096bdd7
+- name: github.com/go-openapi/validate
+  version: 027696d4b54399770f1cdcc6c6daa56975f9e14e
+- name: github.com/go-resty/resty
+  version: 24dc7ba4bc1ef9215048b28e7248f99c42901db5
+- name: github.com/go-sql-driver/mysql
+  version: a0583e0143b1624142adab07e0e97fe106d99561
+- name: github.com/google/btree
+  version: 0c3044bc8bada22db67b93f5760fe3f05d6a5c25
+- name: github.com/heroku/docker-registry-client
+  version: 36bd5f538a6b9e70f2d863c9a8f6bf955a98eddc
+  subpackages:
+  - registry
+- name: github.com/iron-io/iron_go3
+  version: b50ecf8ff90187fc5fabccd9d028dd461adce4ee
+  subpackages:
+  - config
+  - mq
+- name: github.com/jmespath/go-jmespath
+  version: bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d
+- name: github.com/jmoiron/jsonq
+  version: e874b168d07ecc7808bc950a17998a8aa3141d82
+- name: github.com/juju/errgo
+  version: 08cceb5d0b5331634b9826762a8fd53b29b86ad8
+  subpackages:
+  - errors
+- name: github.com/lib/pq
+  version: 4a82388ebc5138c8289fe9bc602cb0b3e32cd617
+- name: github.com/mailru/easyjson
+  version: 159cdb893c982e3d1bc6450322fedd514f9c9de3
+  subpackages:
+  - buffer
+  - jlexer
+  - jwriter
+- name: github.com/mitchellh/mapstructure
+  version: f3009df150dadf309fdee4a54ed65c124afad715
+- name: github.com/moby/moby
+  version: c8141a1fb1ff33b2bfab85a40e5da9a282f36cdc
+  subpackages:
+  - pkg/jsonmessage
+- name: github.com/Nvveen/Gotty
+  version: cd527374f1e5bff4938207604a14f2e38a9cf512
+- name: github.com/pkg/errors
+  version: 248dadf4e9068a0b3e79f02ed0a610d935de5302
+- name: github.com/PuerkitoBio/purell
+  version: 0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4
+- name: github.com/PuerkitoBio/urlesc
+  version: 5bd2802263f21d8788851d5305584c82a5c75d7e
+- name: github.com/satori/go.uuid
+  version: 879c5887cd475cd7864858769793b2ceb0d44feb
+- name: github.com/Sirupsen/logrus
+  version: 0208149b40d863d2c1a2f8fe5753096a9cf2cc8b
+  subpackages:
+  - hooks/syslog
+- name: github.com/spf13/viper
+  version: 5ed0fc31f7f453625df314d8e66b9791e8d13003
+- name: github.com/urfave/cli
+  version: 0bdeddeeb0f650497d603c4ad7b20cfe685682f6
+- name: golang.org/x/crypto
+  version: c10c31b5e94b6f7a0283272dc2bb27163dcea24b
+  subpackages:
+  - bcrypt
+- name: golang.org/x/net
+  version: f315505cf3349909cdf013ea56690da34e96a451
+  subpackages:
+  - context
+  - context/ctxhttp
+  - idna
+  - publicsuffix
+- name: golang.org/x/sys
+  version: 478fcf54317e52ab69f40bb4c7a1520288d7f7ea
+  subpackages:
+  - unix
+- name: golang.org/x/text
+  version: 5c6cf4f9a2357d38515014cea8c488ed22bdab90
+  subpackages:
+  - transform
+  - unicode/norm
+  - width
+- name: gopkg.in/mgo.v2
+  version: 3f83fa5005286a7fe593b055f0d7771a7dce4655
+  subpackages:
+  - bson
+- name: gopkg.in/yaml.v2
+  version: bef53efd0c76e49e6de55ead051f886bea7e9420
+testImports:
+- name: github.com/vrischmann/envconfig
+  version: 757beaaeac8d14bcc7ea3f71488d65cf45cf2eff
diff --git a/fn/images.go b/fn/images.go
index bd36e5562..df7618232 100644
--- a/fn/images.go
+++ b/fn/images.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/iron-io/functions_go"
+	"github.com/funcy/functions_go"
 	"github.com/urfave/cli"
 )
 
diff --git a/fn/main.go b/fn/main.go
index 121c28de4..b20440a0b 100644
--- a/fn/main.go
+++ b/fn/main.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"strings"
 
-	functions "github.com/iron-io/functions_go"
+	functions "github.com/funcy/functions_go"
 	"github.com/urfave/cli"
 )
 
diff --git a/fn/routes.go b/fn/routes.go
index 260d883df..6662b7feb 100644
--- a/fn/routes.go
+++ b/fn/routes.go
@@ -13,9 +13,9 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	fnclient "github.com/iron-io/functions_go/client"
-	apiroutes "github.com/iron-io/functions_go/client/routes"
-	fnmodels "github.com/iron-io/functions_go/models"
+	fnclient "github.com/funcy/functions_go/client"
+	apiroutes "github.com/funcy/functions_go/client/routes"
+	fnmodels "github.com/funcy/functions_go/models"
 	"github.com/jmoiron/jsonq"
 	"github.com/urfave/cli"
 )
diff --git a/fn/testfn.go b/fn/testfn.go
index 2c3c8e4b0..23f5d9340 100644
--- a/fn/testfn.go
+++ b/fn/testfn.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	functions "github.com/iron-io/functions_go"
+	functions "github.com/funcy/functions_go"
 	"github.com/urfave/cli"
 )
 
diff --git a/fn/version.go b/fn/version.go
index 734a292d5..1400de7b2 100644
--- a/fn/version.go
+++ b/fn/version.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"os"
 
-	functions "github.com/iron-io/functions_go"
+	functions "github.com/funcy/functions_go"
 	"github.com/urfave/cli"
 )
 
diff --git a/glide.lock b/glide.lock
index b3ce402fb..4deb434b2 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,16 +1,16 @@
-hash: de1178108cb7d46df774825d06f62889473b2bdd6010cbec9796510084b989e0
-updated: 2017-06-01T14:28:11.77980125-07:00
+hash: 6b12a9176a923d8bc91e738c26d3e6ae32ca478f1f1ddc3d169ac91a13f2c559
+updated: 2017-06-06T19:46:09.40888002+03:00
 imports:
 - name: code.cloudfoundry.org/bytefmt
-  version: f4415fafc5619dd75599a54a7c91fb3948ad58bd
+  version: b12c1522f4cbb5f35861bd5dd2c39a4fa996441a
 - name: github.com/amir/raidman
-  version: 1ccc43bfb9c93cb401a4025e49c64ba71e5e668b
+  version: c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985
   subpackages:
   - proto
 - name: github.com/asaskevich/govalidator
-  version: aa5cce4a76edb1a5acecab1870c17abbffb5419e
+  version: 7b3beb6df3c42abd3509abfc3bcacc0fbfb7c877
 - name: github.com/aws/aws-sdk-go
-  version: fa107560b5f3528a859a1a1511086646731bb1a8
+  version: 90dec2183a5f5458ee79cbaf4b8e9ab910bc81a6
   subpackages:
   - aws
   - aws/awserr
@@ -20,57 +20,50 @@ imports:
   - aws/corehandlers
   - aws/credentials
   - aws/credentials/ec2rolecreds
-  - aws/credentials/endpointcreds
-  - aws/credentials/stscreds
   - aws/defaults
   - aws/ec2metadata
-  - aws/endpoints
   - aws/request
   - aws/session
   - aws/signer/v4
-  - internal/shareddefaults
+  - private/endpoints
   - private/protocol
   - private/protocol/json/jsonutil
   - private/protocol/jsonrpc
-  - private/protocol/query
-  - private/protocol/query/queryutil
   - private/protocol/rest
   - private/protocol/restjson
-  - private/protocol/xml/xmlutil
   - service/lambda
-  - service/sts
 - name: github.com/Azure/go-ansiterm
   version: fa152c58bc15761d0200cb75fe958b89a9d4888e
   subpackages:
   - winterm
 - name: github.com/boltdb/bolt
-  version: e9cf4fae01b5a8ff89d0ec6b32f0d9c9f79aefdd
+  version: 0d9f544bb94aac29c185968483459ef74d6deb5d
 - name: github.com/cactus/go-statsd-client
-  version: 1139cdac1a56e404b5382e3a3503a2c587d2c0c3
+  version: 91c326c3f7bd20f0226d3d1c289dd9f8ce28d33d
   subpackages:
   - statsd
 - name: github.com/ccirello/supervisor
-  version: 230eff6403e22b43f5fba7b28466dae4718934dd
+  version: 341cd52503c550c397196693601273cc290cf1b4
 - name: github.com/cenkalti/backoff
   version: 5d150e7eec023ce7a124856b37c68e54b4050ac7
 - name: github.com/coreos/go-semver
-  version: 5e3acbb5668c4c3deb4842615c4098eb61fb6b1e
+  version: 9474efc580562cce8f761659fbce31b6feb8ce88
   subpackages:
   - semver
 - name: github.com/dchest/siphash
   version: 4ebf1de738443ea7f45f02dc394c4df1942a126d
 - name: github.com/dghubble/go-twitter
-  version: d7141a7cba567120d53d0a136fce068864b43f8c
+  version: f310dcebe0ae1f6b73165caed281f87768c15780
   subpackages:
   - twitter
 - name: github.com/dghubble/oauth1
-  version: 7d51c10e15ca32917b32ce43f6e25840d6951db4
+  version: 4385816142116aade2d97d0f320f9d3666e74cd9
 - name: github.com/dghubble/sling
   version: bbfb8293bd33a6baad33d718aacf66ef73a29f30
 - name: github.com/dgrijalva/jwt-go
-  version: 6c8dedd55f8a2e41f605de6d5d66e51ed1f299fc
+  version: 9ed569b5d1ac936e6494082958d63a6aa4fff99a
 - name: github.com/docker/cli
-  version: 30af87981d8d464c385b247f524fcbc503207940
+  version: ed5b66308222511bd9e2e4e7e2c278d9887d0142
   subpackages:
   - cli/config/configfile
 - name: github.com/docker/distribution
@@ -84,7 +77,7 @@ imports:
   - reference
   - uuid
 - name: github.com/docker/docker
-  version: 872e28bb1452c6e333549a55dcb651fcff2a6bd1
+  version: fddb5a7f2ab29be441bc797f7e79fffc5cc531d3
   subpackages:
   - api/types
   - api/types/blkiodev
@@ -105,7 +98,6 @@ imports:
   - pkg/jsonlog
   - pkg/jsonmessage
   - pkg/longpath
-  - pkg/mount
   - pkg/pools
   - pkg/promise
   - pkg/stdcopy
@@ -117,15 +109,24 @@ imports:
   subpackages:
   - nat
 - name: github.com/docker/go-units
-  version: 0dadbb0345b35ec7ef35e228dabb8de89a65bf52
+  version: e30f1e79f3cd72542f2026ceec18d3bd67ab859c
 - name: github.com/docker/libtrust
-  version: aabc10ec26b754e797f9028f4589c5b7bd90dc20
+  version: fa567046d9b14f6aa788882a950d69651d230b21
 - name: github.com/fsnotify/fsnotify
   version: 4da3e2cfbabc9f751898f250b49f2439785783a1
 - name: github.com/fsouza/go-dockerclient
-  version: c933ed18bef34ec2955de03de8ef9a3bb996e3df
+  version: fbeb72ccd29aa2596f364a5a85af622c651c3e16
+- name: github.com/funcy/functions_go
+  version: 6ab40fd04a355106389f52a5a3815b1b771b18c7
+  subpackages:
+  - client
+  - client/apps
+  - client/routes
+  - client/tasks
+  - client/version
+  - models
 - name: github.com/garyburd/redigo
-  version: 95d11dba2d44531bdb8022752b98912baafae03a
+  version: 0708def8b0cf3a05acdf44a7f28b864c2958921d
   subpackages:
   - internal
   - redis
@@ -135,54 +136,54 @@ imports:
   - bump
   - storage
 - name: github.com/gin-gonic/gin
-  version: d5b353c5d5a560322e6d96121c814115562501f7
+  version: e2212d40c62a98b388a5eb48ecbdcf88534688ba
   subpackages:
   - binding
   - render
 - name: github.com/go-ini/ini
-  version: afbc45e87f3ba324c532d12c71918ef52e0fb194
+  version: 2ba15ac2dc9cdf88c110ec2dc0ced7fa45f5678c
 - name: github.com/go-openapi/analysis
-  version: 0473cb67199f68b8b7d90e641afd9e79ad36b851
+  version: 7222828b8ce19afee3c595aef6643b9e42150120
 - name: github.com/go-openapi/errors
-  version: 03cfca65330da08a5a440053faf994a3c682b5bf
+  version: 49fe8b3a0e0d32a617d8d50c67f856ad6e45b28b
 - name: github.com/go-openapi/jsonpointer
-  version: 779f45308c19820f1a69e9a4cd965f496e0da10f
+  version: 8d96a2dc61536b690bd36b2e9df0b3c0b62825b2
 - name: github.com/go-openapi/jsonreference
   version: 36d33bfe519efae5632669801b180bf1a245da3b
 - name: github.com/go-openapi/loads
-  version: a80dea3052f00e5f032e860dd7355cd0cc67e24d
+  version: 315567415dfd74b651f7a62cabfc82a57ed7b9ad
   subpackages:
   - fmts
 - name: github.com/go-openapi/runtime
-  version: 2e9e988df6c290425033bacd425e008950c96be6
+  version: 14b161b40ece9dac8e244ab2fde2d209e108c6f5
   subpackages:
   - client
 - name: github.com/go-openapi/spec
-  version: e51c28f07047ad90caff03f6450908720d337e0c
+  version: f7ae86df5bc115a2744343016c789a89f065a4bd
 - name: github.com/go-openapi/strfmt
-  version: 93a31ef21ac23f317792fff78f9539219dd74619
+  version: 34fc3ba7c0f5fb615fda47a2b4fbd4c641b215f2
 - name: github.com/go-openapi/swag
-  version: e43299b4afa7bc7f22e5e82e3d48607230e4c177
+  version: 3b6d86cd965820f968760d5d419cb4add096bdd7
 - name: github.com/go-openapi/validate
-  version: 035dcd74f1f61e83debe1c22950dc53556e7e4b2
+  version: 027696d4b54399770f1cdcc6c6daa56975f9e14e
 - name: github.com/go-resty/resty
-  version: 7a8134d8718193eb857994adee49d73a302e7718
+  version: 24dc7ba4bc1ef9215048b28e7248f99c42901db5
 - name: github.com/go-sql-driver/mysql
-  version: e3f0fdcf52770a162d5a4540ddb8d9957ff456d1
+  version: a0583e0143b1624142adab07e0e97fe106d99561
 - name: github.com/golang/protobuf
   version: 2402d76f3d41f928c7902a765dfc872356dd3aad
   subpackages:
   - proto
 - name: github.com/google/btree
-  version: 316fb6d3f031ae8f4d457c6c5186b9e3ded70435
+  version: 0c3044bc8bada22db67b93f5760fe3f05d6a5c25
 - name: github.com/google/go-querystring
   version: 53e6ce116135b80d037921a7fdd5138cf32d7a8a
   subpackages:
   - query
 - name: github.com/gorilla/context
-  version: 08b5f424b9271eedf6f9f0ce86cb9396ed337a42
+  version: 14f550f51af52180c2eefed15e5fd18d63c0a64a
 - name: github.com/gorilla/mux
-  version: 0a192a193177452756c362c20087ddafcf6829c4
+  version: e444e69cbd2e2e3e0749a2f3c717cec491552bbf
 - name: github.com/hashicorp/go-cleanhttp
   version: 3573b8b52aa7b37b9358d966a898feb387f62437
 - name: github.com/hashicorp/hcl
@@ -197,20 +198,11 @@ imports:
   - json/scanner
   - json/token
 - name: github.com/heroku/docker-registry-client
-  version: 95467b6cacee2a06f112a3cf7e47a70fad6000cf
+  version: 36bd5f538a6b9e70f2d863c9a8f6bf955a98eddc
   subpackages:
   - registry
-- name: github.com/iron-io/functions_go
-  version: 69e4dec8454c3c710045263c2ede76139c141146
-  subpackages:
-  - client
-  - client/apps
-  - client/routes
-  - client/tasks
-  - client/version
-  - models
 - name: github.com/iron-io/iron_go3
-  version: 830335d420db87fc84cbff7f0d1348a46b499946
+  version: b50ecf8ff90187fc5fabccd9d028dd461adce4ee
   subpackages:
   - api
   - config
@@ -224,13 +216,13 @@ imports:
   subpackages:
   - errors
 - name: github.com/lib/pq
-  version: 91f10e40ba0dd2d0bf9f93ec1d4077711a78df88
+  version: 4a82388ebc5138c8289fe9bc602cb0b3e32cd617
   subpackages:
   - oid
 - name: github.com/magiconair/properties
   version: 51463bfca2576e06c62a8504b5c0f06d61312647
 - name: github.com/mailru/easyjson
-  version: 44c0351a5bc860bcb2608d54aa03ea686c4e7b25
+  version: 159cdb893c982e3d1bc6450322fedd514f9c9de3
   subpackages:
   - buffer
   - jlexer
@@ -242,20 +234,13 @@ imports:
 - name: github.com/Microsoft/go-winio
   version: f533f7a102197536779ea3a8cb881d639e21ec5a
 - name: github.com/mitchellh/mapstructure
-  version: d0303fe809921458f417bcf828397a65db30a7e4
+  version: 482a9fd5fa83e8c4e7817413b80f3eb8feec03ef
 - name: github.com/moby/moby
-  version: 872e28bb1452c6e333549a55dcb651fcff2a6bd1
+  version: c8141a1fb1ff33b2bfab85a40e5da9a282f36cdc
   subpackages:
   - pkg/jsonmessage
 - name: github.com/Nvveen/Gotty
   version: cd527374f1e5bff4938207604a14f2e38a9cf512
-- name: github.com/opencontainers/go-digest
-  version: eaa60544f31ccf3b0653b1a118b76d33418ff41b
-- name: github.com/opencontainers/image-spec
-  version: 47238a2eb1ad31c2468e25cf041ca830f5a437dd
-  subpackages:
-  - specs-go
-  - specs-go/v1
 - name: github.com/opencontainers/runc
   version: a6906d5a531abb739adcf82f95eb4c7205822562
   subpackages:
@@ -266,15 +251,15 @@ imports:
 - name: github.com/pelletier/go-toml
   version: 5ccdfb18c776b740aecaf085c4d9a2779199c279
 - name: github.com/pkg/errors
-  version: c605e284fe17294bda444b34710735b29d1a9d90
+  version: 248dadf4e9068a0b3e79f02ed0a610d935de5302
 - name: github.com/PuerkitoBio/purell
-  version: b938d81255b5473c57635324295cb0fe398c7a58
+  version: 0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4
 - name: github.com/PuerkitoBio/urlesc
-  version: bbf7a2afc14f93e1e0a5c06df524fbd75e5031e5
+  version: 5bd2802263f21d8788851d5305584c82a5c75d7e
 - name: github.com/satori/go.uuid
-  version: 5bf94b69c6b68ee1b541973bb8e1144db23a194b
+  version: 879c5887cd475cd7864858769793b2ceb0d44feb
 - name: github.com/Sirupsen/logrus
-  version: 3ec0642a7fb6488f65b06f9040adc67e3990296a
+  version: 0208149b40d863d2c1a2f8fe5753096a9cf2cc8b
   subpackages:
   - hooks/syslog
 - name: github.com/spf13/afero
@@ -286,13 +271,13 @@ imports:
 - name: github.com/spf13/jwalterweatherman
   version: 0efa5202c04663c757d84f90f5219c1250baf94f
 - name: github.com/spf13/pflag
-  version: e57e3eeb33f795204c1ca35f56c44f83227c6e66
+  version: 5644820622454e71517561946e3d94b9f9db6842
 - name: github.com/spf13/viper
-  version: 0967fc9aceab2ce9da34061253ac10fb99bba5b2
+  version: 5ed0fc31f7f453625df314d8e66b9791e8d13003
 - name: github.com/urfave/cli
-  version: d70f47eeca3afd795160003bc6e28b001d60c67c
+  version: 0bdeddeeb0f650497d603c4ad7b20cfe685682f6
 - name: golang.org/x/crypto
-  version: e1a4589e7d3ea14a3352255d04b6f1a418845e5e
+  version: c10c31b5e94b6f7a0283272dc2bb27163dcea24b
   subpackages:
   - bcrypt
   - blowfish
@@ -305,12 +290,12 @@ imports:
   - proxy
   - publicsuffix
 - name: golang.org/x/sys
-  version: b90f89a1e7a9c1f6b918820b3daa7f08488c8594
+  version: 478fcf54317e52ab69f40bb4c7a1520288d7f7ea
   subpackages:
   - unix
   - windows
 - name: golang.org/x/text
-  version: 4ee4af566555f5fbe026368b75596286a312663a
+  version: 5c6cf4f9a2357d38515014cea8c488ed22bdab90
   subpackages:
   - transform
   - unicode/norm
@@ -325,7 +310,7 @@ imports:
   - internal/sasl
   - internal/scram
 - name: gopkg.in/yaml.v2
-  version: cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b
+  version: bef53efd0c76e49e6de55ead051f886bea7e9420
 testImports:
 - name: github.com/vrischmann/envconfig
   version: 757beaaeac8d14bcc7ea3f71488d65cf45cf2eff
diff --git a/glide.yaml b/glide.yaml
index 0946576b4..43b8760d5 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -53,7 +53,7 @@ import:
 - package: github.com/heroku/docker-registry-client
   subpackages:
   - registry
-- package: github.com/iron-io/functions_go
+- package: github.com/funcy/functions_go
   subpackages:
   - client
   - client/apps