diff --git a/Gopkg.lock b/Gopkg.lock
deleted file mode 100644
index 47fd2cf5..00000000
--- a/Gopkg.lock
+++ /dev/null
@@ -1,854 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  digest = "1:f4f038d23c9943c7150feb47c6d44eae9eee531c4e745b27217a2ac9ae2d2794"
-  name = "cloud.google.com/go"
-  packages = [
-    "compute/metadata",
-    "iam",
-    "internal",
-    "internal/optional",
-    "internal/trace",
-    "internal/version",
-    "storage",
-  ]
-  pruneopts = "UT"
-  revision = "457ea5c15ccf3b87db582c450e80101989da35f7"
-  version = "v0.40.0"
-
-[[projects]]
-  digest = "1:90afd0cfdffcc3df7855160ee2954cbca286e23c4eb9cb3d075536c9e4e1b04f"
-  name = "github.com/agext/levenshtein"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "0ded9c86537917af2ff89bc9c78de6bd58477894"
-  version = "v1.2.2"
-
-[[projects]]
-  digest = "1:1929b21a34400d463a99336f8e2908d2a154dc525c52411a8d99bb519942dc4c"
-  name = "github.com/apparentlymart/go-cidr"
-  packages = ["cidr"]
-  pruneopts = "UT"
-  revision = "b1115bf8e14a60131a196f908223e4506b0ddc35"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:2bf7da77216264bb61bd8cb5f3380a03ab509e8a826fe359008d4a6ba0789b13"
-  name = "github.com/apparentlymart/go-textseg"
-  packages = ["textseg"]
-  pruneopts = "UT"
-  revision = "fb01f485ebef760e5ee06d55e1b07534dda2d295"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:c47f4964978e211c6e566596ec6246c329912ea92e9bb99c00798bb4564c5b09"
-  name = "github.com/armon/go-radix"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "1a2de0c21c94309923825da3df33a4381872c795"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:7931c5f29bc45a6fc7c8bc67a16babfcdf231454d093dd681aa5cd9fb0ed2a16"
-  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/processcreds",
-    "aws/credentials/stscreds",
-    "aws/csm",
-    "aws/defaults",
-    "aws/ec2metadata",
-    "aws/endpoints",
-    "aws/request",
-    "aws/session",
-    "aws/signer/v4",
-    "internal/ini",
-    "internal/s3err",
-    "internal/sdkio",
-    "internal/sdkrand",
-    "internal/sdkuri",
-    "internal/shareddefaults",
-    "private/protocol",
-    "private/protocol/eventstream",
-    "private/protocol/eventstream/eventstreamapi",
-    "private/protocol/json/jsonutil",
-    "private/protocol/query",
-    "private/protocol/query/queryutil",
-    "private/protocol/rest",
-    "private/protocol/restxml",
-    "private/protocol/xml/xmlutil",
-    "service/s3",
-    "service/sts",
-  ]
-  pruneopts = "UT"
-  revision = "dcb92372bfaa5a5e0df8b4f981ee04574970f9c6"
-  version = "v1.20.6"
-
-[[projects]]
-  branch = "master"
-  digest = "1:37011b20a70e205b93ebea5287e1afa5618db54bf3998c36ff5a8e4b146a170a"
-  name = "github.com/bgentry/go-netrc"
-  packages = ["netrc"]
-  pruneopts = "UT"
-  revision = "9fd32a8b3d3d3f9d43c341bfe098430e07609480"
-
-[[projects]]
-  digest = "1:1343a2963481a305ca4d051e84bc2abd16b601ee22ed324f8d605de1adb291b0"
-  name = "github.com/bgentry/speakeasy"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "4aabc24848ce5fd31929f7d1e4ea74d3709c14cd"
-  version = "v0.1.0"
-
-[[projects]]
-  digest = "1:b6d886569181ec96ca83d529f4d6ba0cbf92ace7bb6f633f90c5f34d9bba7aab"
-  name = "github.com/blang/semver"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "ba2c2ddd89069b46a7011d4106f6868f17ee1705"
-  version = "v3.6.1"
-
-[[projects]]
-  branch = "master"
-  digest = "1:d4f5b0ad88d5b20663fbdfe20de14bc0d2439600bbc6917e5be0505edec713ca"
-  name = "github.com/cvbarros/go-teamcity-sdk"
-  packages = ["teamcity"]
-  pruneopts = "UT"
-  revision = "9abe613e03a018eee32c22e0af53ff524afef082"
-
-[[projects]]
-  digest = "1:ffe9824d294da03b391f44e1ae8281281b4afc1bdaa9588c9097785e3af10cec"
-  name = "github.com/davecgh/go-spew"
-  packages = ["spew"]
-  pruneopts = "UT"
-  revision = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"
-  version = "v1.1.1"
-
-[[projects]]
-  digest = "1:fba61d8584058169c5bd4625196f33077ba937f7131625d4440686c5e4cff380"
-  name = "github.com/dghubble/sling"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "e2624bf29a7de45ab0802b09aea94ca0a7815c5f"
-  version = "v1.2.0"
-
-[[projects]]
-  digest = "1:865079840386857c809b72ce300be7580cb50d3d3129ce11bf9aa6ca2bc1934a"
-  name = "github.com/fatih/color"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"
-  version = "v1.7.0"
-
-[[projects]]
-  digest = "1:64c2b533ffd17023738c534548ab2455d7f519bc15ed4225145425ed2222448b"
-  name = "github.com/golang/protobuf"
-  packages = [
-    "proto",
-    "protoc-gen-go/descriptor",
-    "ptypes",
-    "ptypes/any",
-    "ptypes/duration",
-    "ptypes/timestamp",
-  ]
-  pruneopts = "UT"
-  revision = "b5d812f8a3706043e23a9cd5babf2e5423744d30"
-  version = "v1.3.1"
-
-[[projects]]
-  digest = "1:bf40199583e5143d1472fc34d10d6f4b69d97572142acf343b3e43136da40823"
-  name = "github.com/google/go-cmp"
-  packages = [
-    "cmp",
-    "cmp/internal/diff",
-    "cmp/internal/flags",
-    "cmp/internal/function",
-    "cmp/internal/value",
-  ]
-  pruneopts = "UT"
-  revision = "6f77996f0c42f7b84e5a2b252227263f93432e9b"
-  version = "v0.3.0"
-
-[[projects]]
-  digest = "1:a63cff6b5d8b95638bfe300385d93b2a6d9d687734b863da8e09dc834510a690"
-  name = "github.com/google/go-querystring"
-  packages = ["query"]
-  pruneopts = "UT"
-  revision = "44c6ddd0a2342c386950e880b658017258da92fc"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:766102087520f9d54f2acc72bd6637045900ac735b4a419b128d216f0c5c4876"
-  name = "github.com/googleapis/gax-go"
-  packages = ["v2"]
-  pruneopts = "UT"
-  revision = "bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2"
-  version = "v2.0.5"
-
-[[projects]]
-  digest = "1:0ade334594e69404d80d9d323445d2297ff8161637f9b2d347cc6973d2d6f05b"
-  name = "github.com/hashicorp/errwrap"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "8a6fb523712970c966eefc6b39ed2c5e74880354"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:af105c7c5dc0b4ae41991f122cae860b9600f7d226072c2a83127048c991660c"
-  name = "github.com/hashicorp/go-cleanhttp"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "eda1e5db218aad1db63ca4642c8906b26bcf2744"
-  version = "v0.5.1"
-
-[[projects]]
-  digest = "1:3d262ac70f6f9c970031d83c4decf4027209d58e4b3fea3a90de4461295df848"
-  name = "github.com/hashicorp/go-getter"
-  packages = [
-    ".",
-    "helper/url",
-  ]
-  pruneopts = "UT"
-  revision = "f9ec369200fd2163b8f452e5e45696d83ae3f4b6"
-  version = "v1.3.0"
-
-[[projects]]
-  digest = "1:cf6b61e1b4c26b0c7526cee4a0cee6d8302b17798af4b2a56a90eedac0aef11a"
-  name = "github.com/hashicorp/go-hclog"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "5ccdce08c75b6c7b37af61159f13f6a4f5e2e928"
-  version = "v0.9.2"
-
-[[projects]]
-  digest = "1:f668349b83f7d779567c880550534addeca7ebadfdcf44b0b9c39be61864b4b7"
-  name = "github.com/hashicorp/go-multierror"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "886a7fbe3eb1c874d46f623bfa70af45f425b3d1"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:5d8ebc1cb15676990b1cb8b969b86de8549b21a3729bd2cf11754211e1919131"
-  name = "github.com/hashicorp/go-plugin"
-  packages = [
-    ".",
-    "internal/plugin",
-  ]
-  pruneopts = "UT"
-  revision = "9e3e1c37db188a1acb66561ee0ed4bf4d5e77554"
-  version = "v1.0.1"
-
-[[projects]]
-  digest = "1:605c47454db9040e30b20dc1b29e3e9d42d6ee742545729cdef74afb1b898ad0"
-  name = "github.com/hashicorp/go-safetemp"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "c9a55de4fe06c920a71964b53cfe3dd293a3c743"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:f14364057165381ea296e49f8870a9ffce2b8a95e34d6ae06c759106aaef428c"
-  name = "github.com/hashicorp/go-uuid"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "4f571afc59f3043a65f8fe6bf46d887b10a01d43"
-  version = "v1.0.1"
-
-[[projects]]
-  digest = "1:88e0b0baeb9072f0a4afbcf12dda615fc8be001d1802357538591155998da21b"
-  name = "github.com/hashicorp/go-version"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "ac23dc3fea5d1a983c43f6a0f6e2c13f0195d8bd"
-  version = "v1.2.0"
-
-[[projects]]
-  digest = "1:67474f760e9ac3799f740db2c489e6423a4cde45520673ec123ac831ad849cb8"
-  name = "github.com/hashicorp/golang-lru"
-  packages = ["simplelru"]
-  pruneopts = "UT"
-  revision = "7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c"
-  version = "v0.5.1"
-
-[[projects]]
-  digest = "1:ea40c24cdbacd054a6ae9de03e62c5f252479b96c716375aace5c120d68647c8"
-  name = "github.com/hashicorp/hcl"
-  packages = [
-    ".",
-    "hcl/ast",
-    "hcl/parser",
-    "hcl/scanner",
-    "hcl/strconv",
-    "hcl/token",
-    "json/parser",
-    "json/scanner",
-    "json/token",
-  ]
-  pruneopts = "UT"
-  revision = "8cb6e5b959231cc1119e43259c4a608f9c51a241"
-  version = "v1.0.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:dbd24a4c40920222399aa36af6bd67cc108cac7c79e395363543906940d16384"
-  name = "github.com/hashicorp/hcl2"
-  packages = [
-    "ext/dynblock",
-    "ext/typeexpr",
-    "gohcl",
-    "hcl",
-    "hcl/hclsyntax",
-    "hcl/json",
-    "hcldec",
-    "hcled",
-    "hclparse",
-    "hclwrite",
-  ]
-  pruneopts = "UT"
-  revision = "0b64543c968c45c8227fcde1293ee2655262c45b"
-
-[[projects]]
-  branch = "master"
-  digest = "1:391639adf2951fb9fc72dbbec317f7bc95e7b379a822abe5ea3c140ffeb7a562"
-  name = "github.com/hashicorp/hil"
-  packages = [
-    ".",
-    "ast",
-    "parser",
-    "scanner",
-  ]
-  pruneopts = "UT"
-  revision = "97b3a9cdfa9349086cfad7ea2fe3165bfe3cbf63"
-
-[[projects]]
-  digest = "1:16ae35b3a854c667baaf55ff5d455c486f7c2baf040a2727f2ef0e4b096b2a95"
-  name = "github.com/hashicorp/logutils"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "a335183dfd075f638afcc820c90591ca3c97eba6"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:b882034203dcbcf192f82eebae98ca3ff08abcc4a99cde74e88fe37d69f1de2b"
-  name = "github.com/hashicorp/terraform"
-  packages = [
-    "addrs",
-    "command/format",
-    "config",
-    "config/hcl2shim",
-    "config/module",
-    "configs",
-    "configs/configload",
-    "configs/configschema",
-    "dag",
-    "flatmap",
-    "helper/config",
-    "helper/didyoumean",
-    "helper/hashcode",
-    "helper/hilmapstructure",
-    "helper/logging",
-    "helper/plugin",
-    "helper/resource",
-    "helper/schema",
-    "helper/structure",
-    "helper/validation",
-    "httpclient",
-    "internal/earlyconfig",
-    "internal/initwd",
-    "internal/modsdir",
-    "internal/tfplugin5",
-    "lang",
-    "lang/blocktoattr",
-    "lang/funcs",
-    "moduledeps",
-    "plans",
-    "plans/objchange",
-    "plugin",
-    "plugin/convert",
-    "plugin/discovery",
-    "providers",
-    "provisioners",
-    "registry",
-    "registry/regsrc",
-    "registry/response",
-    "states",
-    "states/statefile",
-    "svchost",
-    "svchost/auth",
-    "svchost/disco",
-    "terraform",
-    "tfdiags",
-    "version",
-  ]
-  pruneopts = "UT"
-  revision = "a5fb573be1e8b5564f3fd879852a6681c55d6e8f"
-  version = "v0.12.2"
-
-[[projects]]
-  branch = "master"
-  digest = "1:edadaf345cfd25b5e3284ed7e602f910e4c617e80dcb2a355e6c8cd9ece51ab9"
-  name = "github.com/hashicorp/terraform-config-inspect"
-  packages = ["tfconfig"]
-  pruneopts = "UT"
-  revision = "e2ee25ba1e5e57c8d6481aa83e1ca7ebd3bf3742"
-
-[[projects]]
-  branch = "master"
-  digest = "1:a4826c308e84f5f161b90b54a814f0be7d112b80164b9b884698a6903ea47ab3"
-  name = "github.com/hashicorp/yamux"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "2f1d1f20f75d5404f53b9edf6b53ed5505508675"
-
-[[projects]]
-  digest = "1:bb81097a5b62634f3e9fec1014657855610c82d19b9a40c17612e32651e35dca"
-  name = "github.com/jmespath/go-jmespath"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "c2b33e84"
-
-[[projects]]
-  digest = "1:c658e84ad3916da105a761660dcaeb01e63416c8ec7bc62256a9b411a05fcd67"
-  name = "github.com/mattn/go-colorable"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"
-  version = "v0.0.9"
-
-[[projects]]
-  digest = "1:9b90c7639a41697f3d4ad12d7d67dfacc9a7a4a6e0bbfae4fc72d0da57c28871"
-  name = "github.com/mattn/go-isatty"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "1311e847b0cb909da63b5fecfb5370aa66236465"
-  version = "v0.0.8"
-
-[[projects]]
-  digest = "1:dac0667a3fcdd4102a5da07abeddc89eb2f125b1e91af1ea9544c80eaff19c9a"
-  name = "github.com/mitchellh/cli"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "3d22a244be8aa6fb16ac24af0e195c08b7d973aa"
-  version = "v1.0.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:f7fe69581040ed4bb2d5444e3b53088f5c458e2e242e0ae44bd90bc3aa019462"
-  name = "github.com/mitchellh/colorstring"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "d06e56a500db4d08c33db0b79461e7c9beafca2d"
-
-[[projects]]
-  digest = "1:09ca328575f38b80969ccf857f6d7302f2ce09d53778ea7aaba526cfd2cec739"
-  name = "github.com/mitchellh/copystructure"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "9a1b6f44e8da0e0e374624fb0a825a231b00c537"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:5d231480e1c64a726869bc4142d270184c419749d34f167646baa21008eb0a79"
-  name = "github.com/mitchellh/go-homedir"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "af06845cf3004701891bf4fdb884bfe4920b3727"
-  version = "v1.1.0"
-
-[[projects]]
-  digest = "1:42eb1f52b84a06820cedc9baec2e710bfbda3ee6dac6cdb97f8b9a5066134ec6"
-  name = "github.com/mitchellh/go-testing-interface"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "6d0b8010fcc857872e42fc6c931227569016843c"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:abf08734a6527df70ed361d7c369fb580e6840d8f7a6012e5f609fdfd93b4e48"
-  name = "github.com/mitchellh/go-wordwrap"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:61332bb44d05257bbf0356d8400a8b30fe0b9fdc3b72b8b55661da8f0a4f39ae"
-  name = "github.com/mitchellh/hashstructure"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "a38c50148365edc8df43c1580c48fb2b3a1e9cd7"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:53bc4cd4914cd7cd52139990d5170d6dc99067ae31c56530621b18b35fc30318"
-  name = "github.com/mitchellh/mapstructure"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "3536a929edddb9a5b34bd6861dc4a9647cb459fe"
-  version = "v1.1.2"
-
-[[projects]]
-  digest = "1:2a7e6f8bebdca6bd8bc359c37f01ae1c4ea4f8481eaabf93b1ae4863f15b72c7"
-  name = "github.com/mitchellh/reflectwalk"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "3e2c75dfad4fbf904b58782a80fd595c760ad185"
-  version = "v1.0.1"
-
-[[projects]]
-  branch = "master"
-  digest = "1:0e92b2422f6a25d108749e1a48db22340ad0cabd2a0db6b26877a77b3f2ee9a1"
-  name = "github.com/motemen/go-loghttp"
-  packages = [
-    ".",
-    "global",
-  ]
-  pruneopts = "UT"
-  revision = "974ac5ceac271576caabe1c0bddf2b7eed471f67"
-
-[[projects]]
-  branch = "master"
-  digest = "1:f93e122deddbcccde41740ced394baf737f023a8179cb15e201d1ab5ab29204a"
-  name = "github.com/motemen/go-nuts"
-  packages = ["roundtime"]
-  pruneopts = "UT"
-  revision = "42c35bdb11c20ff50bb14ef05750e8dcdfc75ea5"
-
-[[projects]]
-  digest = "1:9ec6cf1df5ad1d55cf41a43b6b1e7e118a91bade4f68ff4303379343e40c0e25"
-  name = "github.com/oklog/run"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "4dadeb3030eda0273a12382bb2348ffc7c9d1a39"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe"
-  name = "github.com/pmezard/go-difflib"
-  packages = ["difflib"]
-  pruneopts = "UT"
-  revision = "792786c7400a136282c1664665ae0a8db921c6c2"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:57e168c6dfcc02c1c53bdf1589afbef59694d819cac65bfd3a855de2256d4950"
-  name = "github.com/posener/complete"
-  packages = [
-    ".",
-    "cmd",
-    "cmd/install",
-    "match",
-  ]
-  pruneopts = "UT"
-  revision = "3ef9b31a6a0613ae832e7ecf208374027c3b2343"
-  version = "v1.2.1"
-
-[[projects]]
-  digest = "1:274f67cb6fed9588ea2521ecdac05a6d62a8c51c074c1fccc6a49a40ba80e925"
-  name = "github.com/satori/go.uuid"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
-  version = "v1.2.0"
-
-[[projects]]
-  digest = "1:bb495ec276ab82d3dd08504bbc0594a65de8c3b22c6f2aaa92d05b73fbf3a82e"
-  name = "github.com/spf13/afero"
-  packages = [
-    ".",
-    "mem",
-  ]
-  pruneopts = "UT"
-  revision = "588a75ec4f32903aa5e39a2619ba6a4631e28424"
-  version = "v1.2.2"
-
-[[projects]]
-  digest = "1:5da8ce674952566deae4dbc23d07c85caafc6cfa815b0b3e03e41979cedb8750"
-  name = "github.com/stretchr/testify"
-  packages = [
-    "assert",
-    "require",
-  ]
-  pruneopts = "UT"
-  revision = "ffdc059bfe9ce6a4e144ba849dbedead332c6053"
-  version = "v1.3.0"
-
-[[projects]]
-  digest = "1:2643d81498e38e44bdcf480be199cac55f29e97403b0342d962824bfe9960722"
-  name = "github.com/ulikunitz/xz"
-  packages = [
-    ".",
-    "internal/hash",
-    "internal/xlog",
-    "lzma",
-  ]
-  pruneopts = "UT"
-  revision = "6f934d456d51e742b4eeab20d925a827ef22320a"
-  version = "v0.5.6"
-
-[[projects]]
-  digest = "1:01d5dc3bfb14cf8fb2c924dcf026231218604b8ed15daaa028875d49e7f09071"
-  name = "github.com/vmihailenco/msgpack"
-  packages = [
-    ".",
-    "codes",
-  ]
-  pruneopts = "UT"
-  revision = "c2fc210f30a2aca9db880cc017a92c169c999253"
-  version = "v4.0.4"
-
-[[projects]]
-  digest = "1:08d3d8652ad0bf291ac3bdc05b59595ee0ec4211364ffe88528edef01dca630f"
-  name = "github.com/zclconf/go-cty"
-  packages = [
-    "cty",
-    "cty/convert",
-    "cty/function",
-    "cty/function/stdlib",
-    "cty/gocty",
-    "cty/json",
-    "cty/msgpack",
-    "cty/set",
-  ]
-  pruneopts = "UT"
-  revision = "6fd39ad70c3a6bbdb1b4e47444e4cce72f901200"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:7922171eda409496bd43979d690c2ba5d58912d9bc5cafdc0509e7cd5a6f8314"
-  name = "github.com/zclconf/go-cty-yaml"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "fbabe99bb1c897a56ed70103a40aa94fc50a7104"
-  version = "v0.1.0"
-
-[[projects]]
-  digest = "1:74055050ea547bb04600be79cc501965cb3de8988018262f2ca430f0a0b48ec3"
-  name = "go.opencensus.io"
-  packages = [
-    ".",
-    "internal",
-    "internal/tagencoding",
-    "metric/metricdata",
-    "metric/metricproducer",
-    "plugin/ochttp",
-    "plugin/ochttp/propagation/b3",
-    "resource",
-    "stats",
-    "stats/internal",
-    "stats/view",
-    "tag",
-    "trace",
-    "trace/internal",
-    "trace/propagation",
-    "trace/tracestate",
-  ]
-  pruneopts = "UT"
-  revision = "9c377598961b706d1542bd2d84d538b5094d596e"
-  version = "v0.22.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:34d91aeebfd347c9c9175f5b4ec9790074c80042b23d1436c3a9e16cffb44c23"
-  name = "golang.org/x/crypto"
-  packages = [
-    "bcrypt",
-    "blowfish",
-    "cast5",
-    "openpgp",
-    "openpgp/armor",
-    "openpgp/elgamal",
-    "openpgp/errors",
-    "openpgp/packet",
-    "openpgp/s2k",
-  ]
-  pruneopts = "UT"
-  revision = "cc06ce4a13d484c0101a9e92913248488a75786d"
-
-[[projects]]
-  branch = "master"
-  digest = "1:2f357867bf425774d35beca5be718402a4488b8b23b1563ce8c5bb91d09285a7"
-  name = "golang.org/x/net"
-  packages = [
-    "context",
-    "context/ctxhttp",
-    "http/httpguts",
-    "http2",
-    "http2/hpack",
-    "idna",
-    "internal/timeseries",
-    "trace",
-  ]
-  pruneopts = "UT"
-  revision = "3b0461eec859c4b73bb64fdc8285971fd33e3938"
-
-[[projects]]
-  branch = "master"
-  digest = "1:31e33f76456ccf54819ab4a646cf01271d1a99d7712ab84bf1a9e7b61cd2031b"
-  name = "golang.org/x/oauth2"
-  packages = [
-    ".",
-    "google",
-    "internal",
-    "jws",
-    "jwt",
-  ]
-  pruneopts = "UT"
-  revision = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33"
-
-[[projects]]
-  branch = "master"
-  digest = "1:a2b03582f5805ebb5d96482a0ea550d48aba5347cc5089d89d2307ac55b98660"
-  name = "golang.org/x/sys"
-  packages = ["unix"]
-  pruneopts = "UT"
-  revision = "d432491b91382bba9c2a91776aa47c9430183a6f"
-
-[[projects]]
-  digest = "1:8d8faad6b12a3a4c819a3f9618cb6ee1fa1cfc33253abeeea8b55336721e3405"
-  name = "golang.org/x/text"
-  packages = [
-    "collate",
-    "collate/build",
-    "internal/colltab",
-    "internal/gen",
-    "internal/language",
-    "internal/language/compact",
-    "internal/tag",
-    "internal/triegen",
-    "internal/ucd",
-    "language",
-    "secure/bidirule",
-    "transform",
-    "unicode/bidi",
-    "unicode/cldr",
-    "unicode/norm",
-    "unicode/rangetable",
-  ]
-  pruneopts = "UT"
-  revision = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"
-  version = "v0.3.2"
-
-[[projects]]
-  digest = "1:06b06a112ad8f420557af56ad06bb8b16b77d11b0a2f11edf335095f7772e9b5"
-  name = "google.golang.org/api"
-  packages = [
-    "gensupport",
-    "googleapi",
-    "googleapi/internal/uritemplates",
-    "googleapi/transport",
-    "internal",
-    "iterator",
-    "option",
-    "storage/v1",
-    "transport/http",
-    "transport/http/internal/propagation",
-  ]
-  pruneopts = "UT"
-  revision = "aac82e61c0c8fe133c297b4b59316b9f481e1f0a"
-  version = "v0.6.0"
-
-[[projects]]
-  digest = "1:aab5961ce178ac5006b1c2d52214a0d22a49589eb986d6769e1c93e95301f0d4"
-  name = "google.golang.org/appengine"
-  packages = [
-    ".",
-    "datastore",
-    "datastore/internal/cloudkey",
-    "datastore/internal/cloudpb",
-    "internal",
-    "internal/app_identity",
-    "internal/base",
-    "internal/datastore",
-    "internal/log",
-    "internal/modules",
-    "internal/remote_api",
-    "internal/urlfetch",
-    "urlfetch",
-  ]
-  pruneopts = "UT"
-  revision = "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880"
-  version = "v1.6.1"
-
-[[projects]]
-  branch = "master"
-  digest = "1:1d7e4e8b75502678019b764e524684c25aeeb855ef93f0d5b52fd66e834a5d17"
-  name = "google.golang.org/genproto"
-  packages = [
-    "googleapis/api/annotations",
-    "googleapis/iam/v1",
-    "googleapis/rpc/code",
-    "googleapis/rpc/status",
-    "googleapis/type/expr",
-  ]
-  pruneopts = "UT"
-  revision = "6af8c5fc6601ab6b41cd32742a65ce2f5bd9db57"
-
-[[projects]]
-  digest = "1:26c145b50d0b1583286e1ede8bd1a727a7d4974c6272cfa286baad7a27e7644b"
-  name = "google.golang.org/grpc"
-  packages = [
-    ".",
-    "balancer",
-    "balancer/base",
-    "balancer/roundrobin",
-    "binarylog/grpc_binarylog_v1",
-    "codes",
-    "connectivity",
-    "credentials",
-    "credentials/internal",
-    "encoding",
-    "encoding/proto",
-    "grpclog",
-    "health",
-    "health/grpc_health_v1",
-    "internal",
-    "internal/backoff",
-    "internal/balancerload",
-    "internal/binarylog",
-    "internal/channelz",
-    "internal/envconfig",
-    "internal/grpcrand",
-    "internal/grpcsync",
-    "internal/syscall",
-    "internal/transport",
-    "keepalive",
-    "metadata",
-    "naming",
-    "peer",
-    "resolver",
-    "resolver/dns",
-    "resolver/passthrough",
-    "stats",
-    "status",
-    "tap",
-    "test/bufconn",
-  ]
-  pruneopts = "UT"
-  revision = "501c41df7f472c740d0674ff27122f3f48c80ce7"
-  version = "v1.21.1"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  input-imports = [
-    "github.com/cvbarros/go-teamcity-sdk/teamcity",
-    "github.com/hashicorp/terraform/helper/hashcode",
-    "github.com/hashicorp/terraform/helper/resource",
-    "github.com/hashicorp/terraform/helper/schema",
-    "github.com/hashicorp/terraform/helper/validation",
-    "github.com/hashicorp/terraform/plugin",
-    "github.com/hashicorp/terraform/terraform",
-  ]
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
deleted file mode 100644
index c5ab7842..00000000
--- a/Gopkg.toml
+++ /dev/null
@@ -1,38 +0,0 @@
-# Gopkg.toml example
-#
-# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
-# for detailed Gopkg.toml documentation.
-#
-# required = ["github.com/user/thing/cmd/thing"]
-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-#
-# [[constraint]]
-#   name = "github.com/user/project"
-#   version = "1.0.0"
-#
-# [[constraint]]
-#   name = "github.com/user/project2"
-#   branch = "dev"
-#   source = "github.com/myfork/project2"
-#
-# [[override]]
-#   name = "github.com/x/y"
-#   version = "2.4.0"
-#
-# [prune]
-#   non-go = false
-#   go-tests = true
-#   unused-packages = true
-
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/cvbarros/go-teamcity-sdk"
-
-[[constraint]]
-  name = "github.com/hashicorp/terraform"
-  version = "0.12.0"
-
-[prune]
-  go-tests = true
-  unused-packages = true
diff --git a/examples/build_trigger_build_finish.tf b/examples/build_trigger_build_finish.tf
index a4c9cbb4..8ceb2e61 100644
--- a/examples/build_trigger_build_finish.tf
+++ b/examples/build_trigger_build_finish.tf
@@ -6,7 +6,7 @@ resource "teamcity_vcs_root_git" "vcs" {
   name       = "Application"
   project_id = "${teamcity_project.project.id}"
 
-  url    = "https://github.com/cvbarros/go-teamcity-sdk"
+  url    = "https://github.com/cvbarros/go-teamcity"
   branch = "refs/head/master"
 }
 
diff --git a/examples/build_trigger_schedule.tf b/examples/build_trigger_schedule.tf
index 9601d72f..a3085468 100644
--- a/examples/build_trigger_schedule.tf
+++ b/examples/build_trigger_schedule.tf
@@ -6,7 +6,7 @@ resource "teamcity_vcs_root_git" "project_vcs" {
   name       = "Application"
   project_id = "${teamcity_project.project.id}"
 
-  url    = "https://github.com/cvbarros/go-teamcity-sdk"
+  url    = "https://github.com/cvbarros/go-teamcity"
   branch = "refs/head/master"
 }
 resource "teamcity_buildconfiguration" "triggered_build" {
diff --git a/go.mod b/go.mod
index f27a766c..a9cee58f 100644
--- a/go.mod
+++ b/go.mod
@@ -5,8 +5,8 @@ go 1.12
 require (
 	cloud.google.com/go v0.40.0 // indirect
 	github.com/aws/aws-sdk-go v1.20.6 // indirect
-	github.com/cvbarros/go-teamcity-sdk v0.0.0-20190131214126-9abe613e03a0
-	github.com/dghubble/sling v1.2.0 // indirect
+	github.com/cvbarros/go-teamcity v0.5.0
+	github.com/dghubble/sling v1.3.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
 	github.com/hashicorp/go-hclog v0.9.2 // indirect
 	github.com/hashicorp/go-plugin v1.0.1 // indirect
@@ -20,8 +20,7 @@ require (
 	github.com/mattn/go-isatty v0.0.8 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.1 // indirect
-	github.com/motemen/go-loghttp v0.0.0-20170804080138-974ac5ceac27 // indirect
-	github.com/motemen/go-nuts v0.0.0-20180315145558-42c35bdb11c2 // indirect
+	github.com/motemen/go-nuts v0.0.0-20190725124253-1d2432db96b0 // indirect
 	github.com/spf13/afero v1.2.2 // indirect
 	github.com/ulikunitz/xz v0.5.6 // indirect
 	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
diff --git a/go.sum b/go.sum
index 48411be4..cafc9c44 100644
--- a/go.sum
+++ b/go.sum
@@ -65,13 +65,15 @@ github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/cvbarros/go-teamcity-sdk v0.0.0-20190131214126-9abe613e03a0 h1:sTI16Gk8aX76FkoaO+exburvkEsjlTs8wBrpsTnWmp8=
-github.com/cvbarros/go-teamcity-sdk v0.0.0-20190131214126-9abe613e03a0/go.mod h1:aMM0uxPTq0IM6jd6bNycRtMGI6dlBDz60B0yn3XZfXQ=
+github.com/cvbarros/go-teamcity v0.5.0 h1:sJZrcs0i3ElhUiPw6zTEYQe1WV8h9Q+12dFWAcSBaQU=
+github.com/cvbarros/go-teamcity v0.5.0/go.mod h1:wQxn54gP1RHaDYuwwud9MRA+Y8VXfD3d5+ZjZCZLVVU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dghubble/sling v1.2.0 h1:PYGS9ofwbV9nfhB1kYjB1vtXshMxlp2oQxTMMXVJ5pE=
 github.com/dghubble/sling v1.2.0/go.mod h1:ZcPRuLm0qrcULW2gOrjXrAWgf76sahqSyxXyVOvkunE=
+github.com/dghubble/sling v1.3.0 h1:pZHjCJq4zJvc6qVQ5wN1jo5oNZlNE0+8T/h0XeXBUKU=
+github.com/dghubble/sling v1.3.0/go.mod h1:XXShWaBWKzNLhu2OxikSNFrlsvowtz4kyRuXUG7oQKY=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dimchansky/utfbom v1.0.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
 github.com/dnaeon/go-vcr v0.0.0-20180920040454-5637cf3d8a31/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
@@ -263,6 +265,8 @@ github.com/motemen/go-loghttp v0.0.0-20170804080138-974ac5ceac27 h1:uAI3rnOT1OSS
 github.com/motemen/go-loghttp v0.0.0-20170804080138-974ac5ceac27/go.mod h1:6eu9CfGt5kfrMVgeu9MfB9PRUnpc47I+udLswiTszI8=
 github.com/motemen/go-nuts v0.0.0-20180315145558-42c35bdb11c2 h1:gfo7RLzXaBdNShd7F5N3K1oM779cD777np9ljUgvf9s=
 github.com/motemen/go-nuts v0.0.0-20180315145558-42c35bdb11c2/go.mod h1:vfh/NPxHgDwggXit20W1llPsXcz39xJ7I8vo7kVrOCk=
+github.com/motemen/go-nuts v0.0.0-20190725124253-1d2432db96b0 h1:CnSVrlMNAZMWI1+uH6ldpXRv2pe7t50IQX448EJrJhw=
+github.com/motemen/go-nuts v0.0.0-20190725124253-1d2432db96b0/go.mod h1:vfh/NPxHgDwggXit20W1llPsXcz39xJ7I8vo7kVrOCk=
 github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
 github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U=
diff --git a/teamcity/config.go b/teamcity/config.go
index 4e11f2bb..bee792ad 100644
--- a/teamcity/config.go
+++ b/teamcity/config.go
@@ -3,7 +3,7 @@ package teamcity
 import (
 	"net/http"
 
-	api "github.com/cvbarros/go-teamcity-sdk/teamcity"
+	api "github.com/cvbarros/go-teamcity/teamcity"
 )
 
 // Config Used to configure an api client for TeamCity
diff --git a/teamcity/data_source_project.go b/teamcity/data_source_project.go
index baa07418..f7223eb0 100644
--- a/teamcity/data_source_project.go
+++ b/teamcity/data_source_project.go
@@ -3,7 +3,7 @@ package teamcity
 import (
 	"fmt"
 
-	api "github.com/cvbarros/go-teamcity-sdk/teamcity"
+	api "github.com/cvbarros/go-teamcity/teamcity"
 	"github.com/hashicorp/terraform/helper/schema"
 )
 
diff --git a/teamcity/resource_agent_requirement.go b/teamcity/resource_agent_requirement.go
index 06675e1a..2cf07c89 100644
--- a/teamcity/resource_agent_requirement.go
+++ b/teamcity/resource_agent_requirement.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/validation"
 
-	api "github.com/cvbarros/go-teamcity-sdk/teamcity"
+	api "github.com/cvbarros/go-teamcity/teamcity"
 	"github.com/hashicorp/terraform/helper/schema"
 )
 
diff --git a/teamcity/resource_agent_requirement_test.go b/teamcity/resource_agent_requirement_test.go
index 9ad5d8b3..83dc4163 100644
--- a/teamcity/resource_agent_requirement_test.go
+++ b/teamcity/resource_agent_requirement_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	api "github.com/cvbarros/go-teamcity-sdk/teamcity"
+	api "github.com/cvbarros/go-teamcity/teamcity"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 )
diff --git a/teamcity/resource_artifact_dependency.go b/teamcity/resource_artifact_dependency.go
index b87212e7..b33314a9 100644
--- a/teamcity/resource_artifact_dependency.go
+++ b/teamcity/resource_artifact_dependency.go
@@ -3,7 +3,7 @@ package teamcity
 import (
 	"fmt"
 
-	api "github.com/cvbarros/go-teamcity-sdk/teamcity"
+	api "github.com/cvbarros/go-teamcity/teamcity"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
 )
diff --git a/teamcity/resource_artifact_dependency_test.go b/teamcity/resource_artifact_dependency_test.go
index f4af195c..26a91c88 100644
--- a/teamcity/resource_artifact_dependency_test.go
+++ b/teamcity/resource_artifact_dependency_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	api "github.com/cvbarros/go-teamcity-sdk/teamcity"
+	api "github.com/cvbarros/go-teamcity/teamcity"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 )
diff --git a/teamcity/resource_build_config.go b/teamcity/resource_build_config.go
index e0edddd3..0c04f707 100644
--- a/teamcity/resource_build_config.go
+++ b/teamcity/resource_build_config.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"strings"
 
-	api "github.com/cvbarros/go-teamcity-sdk/teamcity"
+	api "github.com/cvbarros/go-teamcity/teamcity"
 	"github.com/hashicorp/terraform/helper/hashcode"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
diff --git a/teamcity/resource_build_config_test.go b/teamcity/resource_build_config_test.go
index bcd76f04..502b468d 100644
--- a/teamcity/resource_build_config_test.go
+++ b/teamcity/resource_build_config_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	api "github.com/cvbarros/go-teamcity-sdk/teamcity"
+	api "github.com/cvbarros/go-teamcity/teamcity"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 )
diff --git a/teamcity/resource_build_trigger_build_finish.go b/teamcity/resource_build_trigger_build_finish.go
index 06a67915..6091ed4a 100644
--- a/teamcity/resource_build_trigger_build_finish.go
+++ b/teamcity/resource_build_trigger_build_finish.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log"
 
-	api "github.com/cvbarros/go-teamcity-sdk/teamcity"
+	api "github.com/cvbarros/go-teamcity/teamcity"
 	"github.com/hashicorp/terraform/helper/schema"
 )
 
diff --git a/teamcity/resource_build_trigger_build_finish_test.go b/teamcity/resource_build_trigger_build_finish_test.go
index ebb35803..5161f92f 100644
--- a/teamcity/resource_build_trigger_build_finish_test.go
+++ b/teamcity/resource_build_trigger_build_finish_test.go
@@ -3,7 +3,7 @@ package teamcity_test
 import (
 	"testing"
 
-	api "github.com/cvbarros/go-teamcity-sdk/teamcity"
+	api "github.com/cvbarros/go-teamcity/teamcity"
 	"github.com/hashicorp/terraform/helper/resource"
 )
 
diff --git a/teamcity/resource_build_trigger_schedule.go b/teamcity/resource_build_trigger_schedule.go
index 584726e4..a1884dbd 100644
--- a/teamcity/resource_build_trigger_schedule.go
+++ b/teamcity/resource_build_trigger_schedule.go
@@ -3,7 +3,7 @@ package teamcity
 import (
 	"fmt"
 
-	api "github.com/cvbarros/go-teamcity-sdk/teamcity"
+	api "github.com/cvbarros/go-teamcity/teamcity"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
 )
diff --git a/teamcity/resource_build_trigger_schedule_test.go b/teamcity/resource_build_trigger_schedule_test.go
index 1273f3f6..c3b01707 100644
--- a/teamcity/resource_build_trigger_schedule_test.go
+++ b/teamcity/resource_build_trigger_schedule_test.go
@@ -3,7 +3,7 @@ package teamcity_test
 import (
 	"testing"
 
-	api "github.com/cvbarros/go-teamcity-sdk/teamcity"
+	api "github.com/cvbarros/go-teamcity/teamcity"
 	"github.com/hashicorp/terraform/helper/resource"
 )
 
diff --git a/teamcity/resource_build_trigger_vcs.go b/teamcity/resource_build_trigger_vcs.go
index b57d4f0c..e5773989 100644
--- a/teamcity/resource_build_trigger_vcs.go
+++ b/teamcity/resource_build_trigger_vcs.go
@@ -3,7 +3,7 @@ package teamcity
 import (
 	"fmt"
 
-	api "github.com/cvbarros/go-teamcity-sdk/teamcity"
+	api "github.com/cvbarros/go-teamcity/teamcity"
 	"github.com/hashicorp/terraform/helper/schema"
 )
 
diff --git a/teamcity/resource_build_trigger_vcs_test.go b/teamcity/resource_build_trigger_vcs_test.go
index 2da6eec5..47a8279f 100644
--- a/teamcity/resource_build_trigger_vcs_test.go
+++ b/teamcity/resource_build_trigger_vcs_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	api "github.com/cvbarros/go-teamcity-sdk/teamcity"
+	api "github.com/cvbarros/go-teamcity/teamcity"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 )
diff --git a/teamcity/resource_feature_commit_status_publisher.go b/teamcity/resource_feature_commit_status_publisher.go
index 64e0280d..08640b93 100644
--- a/teamcity/resource_feature_commit_status_publisher.go
+++ b/teamcity/resource_feature_commit_status_publisher.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	api "github.com/cvbarros/go-teamcity-sdk/teamcity"
+	api "github.com/cvbarros/go-teamcity/teamcity"
 	"github.com/hashicorp/terraform/helper/hashcode"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
diff --git a/teamcity/resource_feature_commit_status_publisher_test.go b/teamcity/resource_feature_commit_status_publisher_test.go
index f67c58f1..f8866db5 100644
--- a/teamcity/resource_feature_commit_status_publisher_test.go
+++ b/teamcity/resource_feature_commit_status_publisher_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	api "github.com/cvbarros/go-teamcity-sdk/teamcity"
+	api "github.com/cvbarros/go-teamcity/teamcity"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 )
diff --git a/teamcity/resource_project.go b/teamcity/resource_project.go
index 36cfc3e9..61038bfe 100644
--- a/teamcity/resource_project.go
+++ b/teamcity/resource_project.go
@@ -3,7 +3,7 @@ package teamcity
 import (
 	"log"
 
-	api "github.com/cvbarros/go-teamcity-sdk/teamcity"
+	api "github.com/cvbarros/go-teamcity/teamcity"
 	"github.com/hashicorp/terraform/helper/schema"
 )
 
diff --git a/teamcity/resource_project_test.go b/teamcity/resource_project_test.go
index e3ea9e3a..5d08fadc 100644
--- a/teamcity/resource_project_test.go
+++ b/teamcity/resource_project_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	api "github.com/cvbarros/go-teamcity-sdk/teamcity"
+	api "github.com/cvbarros/go-teamcity/teamcity"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 )
diff --git a/teamcity/resource_snapshot_dependency.go b/teamcity/resource_snapshot_dependency.go
index 1c356b27..2225b55b 100644
--- a/teamcity/resource_snapshot_dependency.go
+++ b/teamcity/resource_snapshot_dependency.go
@@ -3,7 +3,7 @@ package teamcity
 import (
 	"fmt"
 
-	api "github.com/cvbarros/go-teamcity-sdk/teamcity"
+	api "github.com/cvbarros/go-teamcity/teamcity"
 	"github.com/hashicorp/terraform/helper/schema"
 )
 
diff --git a/teamcity/resource_snapshot_dependency_test.go b/teamcity/resource_snapshot_dependency_test.go
index 94d6f13d..73ab457e 100644
--- a/teamcity/resource_snapshot_dependency_test.go
+++ b/teamcity/resource_snapshot_dependency_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	api "github.com/cvbarros/go-teamcity-sdk/teamcity"
+	api "github.com/cvbarros/go-teamcity/teamcity"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 )
diff --git a/teamcity/resource_vcs_root_git.go b/teamcity/resource_vcs_root_git.go
index 73b20669..ad2d5625 100644
--- a/teamcity/resource_vcs_root_git.go
+++ b/teamcity/resource_vcs_root_git.go
@@ -6,7 +6,7 @@ import (
 	"log"
 	"strings"
 
-	api "github.com/cvbarros/go-teamcity-sdk/teamcity"
+	api "github.com/cvbarros/go-teamcity/teamcity"
 	"github.com/hashicorp/terraform/helper/hashcode"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
diff --git a/teamcity/resource_vcs_root_git_test.go b/teamcity/resource_vcs_root_git_test.go
index 5ec4d2d5..359fe74a 100644
--- a/teamcity/resource_vcs_root_git_test.go
+++ b/teamcity/resource_vcs_root_git_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	api "github.com/cvbarros/go-teamcity-sdk/teamcity"
+	api "github.com/cvbarros/go-teamcity/teamcity"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 )
@@ -70,7 +70,7 @@ func TestAccVcsRootGit_UpdateBasic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckVcsRootGitExists(resName, &vcs),
 					resource.TestCheckResourceAttr(resName, "name", "application_updated"),
-					resource.TestCheckResourceAttr(resName, "fetch_url", "https://github.com/cvbarros/go-teamcity-sdk"),
+					resource.TestCheckResourceAttr(resName, "fetch_url", "https://github.com/cvbarros/go-teamcity"),
 					resource.TestCheckResourceAttr(resName, "default_branch", "refs/head/develop"),
 					resource.TestCheckResourceAttr(resName, "branches.#", "1"),
 					resource.TestCheckResourceAttr(resName, "branches.0", "+:refs/heads/master"),
@@ -296,7 +296,7 @@ resource "teamcity_project" "vcs_root_project_new" {
 resource "teamcity_vcs_root_git" "git_test" {
 	name = "application_updated"
 	project_id = "${teamcity_project.vcs_root_project_new.id}"
-	fetch_url = "https://github.com/cvbarros/go-teamcity-sdk"
+	fetch_url = "https://github.com/cvbarros/go-teamcity"
 	default_branch = "refs/head/develop"
 	branches = [
     	"+:refs/heads/master",
diff --git a/website/r/agent_requirement.html.md b/website/r/agent_requirement.html.md
index d00dc435..de6e9e16 100644
--- a/website/r/agent_requirement.html.md
+++ b/website/r/agent_requirement.html.md
@@ -38,7 +38,7 @@ The following arguments are supported:
 
 * `build_config_id`: (Required) ID of the build configuration which this requirement will be configured.
 
-* `condition`: (Required) A string operator to match the `name` variable to the `value` which will satistfy the requirement. Possible [values are documented](https://godoc.org/github.com/cvbarros/go-teamcity-sdk/pkg/teamcity#pkg-variables) in the TeamCity API.
+* `condition`: (Required) A string operator to match the `name` variable to the `value` which will satistfy the requirement. Possible [values are documented](https://godoc.org/github.com/cvbarros/go-teamcity/pkg/teamcity#pkg-variables) in the TeamCity API.
 
 * `value`: (Required) Right-side operand of the condition to be checked against the parameter.
 
diff --git a/website/r/build_trigger_build_finish.html.md b/website/r/build_trigger_build_finish.html.md
index 1bfeeeb0..ee060829 100644
--- a/website/r/build_trigger_build_finish.html.md
+++ b/website/r/build_trigger_build_finish.html.md
@@ -21,7 +21,7 @@ resource "teamcity_vcs_root_git" "vcs" {
   name       = "Application"
   project_id = "${teamcity_project.project.id}"
 
-  url    = "https://github.com/cvbarros/go-teamcity-sdk"
+  url    = "https://github.com/cvbarros/go-teamcity"
   branch = "refs/head/master"
 }
 
diff --git a/website/r/build_trigger_schedule.html.md b/website/r/build_trigger_schedule.html.md
index 55ddbf22..4bf84fea 100644
--- a/website/r/build_trigger_schedule.html.md
+++ b/website/r/build_trigger_schedule.html.md
@@ -21,7 +21,7 @@ resource "teamcity_vcs_root_git" "project_vcs" {
   name       = "Application"
   project_id = "${teamcity_project.project.id}"
 
-  url    = "https://github.com/cvbarros/go-teamcity-sdk"
+  url    = "https://github.com/cvbarros/go-teamcity"
   branch = "refs/head/master"
 }
 
diff --git a/website/r/build_trigger_vcs.html.md b/website/r/build_trigger_vcs.html.md
index 3381c750..45686c70 100644
--- a/website/r/build_trigger_vcs.html.md
+++ b/website/r/build_trigger_vcs.html.md
@@ -21,7 +21,7 @@ resource "teamcity_vcs_root_git" "vcs" {
   name       = "Application"
   project_id = "${teamcity_project.project.id}"
 
-  url    = "https://github.com/cvbarros/go-teamcity-sdk"
+  url    = "https://github.com/cvbarros/go-teamcity"
   branch = "refs/head/master"
 }