diff --git a/src/calanonsync/Gopkg.lock b/src/calanonsync/Gopkg.lock
index 03745b7..2fb3c04 100644
--- a/src/calanonsync/Gopkg.lock
+++ b/src/calanonsync/Gopkg.lock
@@ -1,15 +1,6 @@
 # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
 
 
-[[projects]]
-  branch = "master"
-  name = "github.com/ThomsonReutersEikon/go-ntlm"
-  packages = [
-    "ntlm",
-    "ntlm/md4"
-  ]
-  revision = "2a7c173f9e18233a4ae29891da6a0a63637e2d8d"
-
 [[projects]]
   name = "github.com/inconshreveable/mousetrap"
   packages = ["."]
@@ -28,12 +19,6 @@
   revision = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"
   version = "v1.0.0"
 
-[[projects]]
-  branch = "master"
-  name = "github.com/vadimi/go-http-ntlm"
-  packages = ["."]
-  revision = "bc5a8d8d91a12dd386d3fa1019abb8bb681bdd41"
-
 [[projects]]
   branch = "master"
   name = "golang.org/x/crypto"
@@ -52,6 +37,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "8a1421bb063ff7faff2c4276042f954d7965c60c6a51afc95b658ac721cfcea0"
+  inputs-digest = "d2f5b5a67e95e173cd0d93a24576cdc1e5384e2bc0246f8cbed88838514b8ec0"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/src/calanonsync/Gopkg.toml b/src/calanonsync/Gopkg.toml
index 9fc2f5c..97e5415 100644
--- a/src/calanonsync/Gopkg.toml
+++ b/src/calanonsync/Gopkg.toml
@@ -24,6 +24,7 @@
 #   go-tests = true
 #   unused-packages = true
 
+ignored = ["github.com/vadimi/go-http-ntlm"]
 
 [prune]
   go-tests = true
@@ -33,14 +34,6 @@
   branch = "master"
   name = "golang.org/x/crypto"
 
-[[constraint]]
-  branch = "master"
-  name = "github.com/vadimi/go-http-ntlm"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/Azure/go-ntlmssp"
-
 [[constraint]]
   name = "github.com/spf13/cobra"
   version = "0.0.2"
diff --git a/src/calanonsync/vendor/github.com/vadimi/go-http-ntlm/LICENSE b/src/github.com/vadimi/go-http-ntlm/LICENSE
similarity index 100%
rename from src/calanonsync/vendor/github.com/vadimi/go-http-ntlm/LICENSE
rename to src/github.com/vadimi/go-http-ntlm/LICENSE
diff --git a/src/calanonsync/vendor/github.com/vadimi/go-http-ntlm/negotiator.go b/src/github.com/vadimi/go-http-ntlm/negotiator.go
similarity index 100%
rename from src/calanonsync/vendor/github.com/vadimi/go-http-ntlm/negotiator.go
rename to src/github.com/vadimi/go-http-ntlm/negotiator.go
diff --git a/src/calanonsync/vendor/github.com/vadimi/go-http-ntlm/ntlmtransport.go b/src/github.com/vadimi/go-http-ntlm/ntlmtransport.go
similarity index 100%
rename from src/calanonsync/vendor/github.com/vadimi/go-http-ntlm/ntlmtransport.go
rename to src/github.com/vadimi/go-http-ntlm/ntlmtransport.go
diff --git a/src/calanonsync/vendor/github.com/vadimi/go-http-ntlm/readme.md b/src/github.com/vadimi/go-http-ntlm/readme.md
similarity index 100%
rename from src/calanonsync/vendor/github.com/vadimi/go-http-ntlm/readme.md
rename to src/github.com/vadimi/go-http-ntlm/readme.md
diff --git a/src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/License b/src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/License
similarity index 100%
rename from src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/License
rename to src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/License
diff --git a/src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/av_pairs.go b/src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/av_pairs.go
similarity index 100%
rename from src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/av_pairs.go
rename to src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/av_pairs.go
diff --git a/src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/challenge_responses.go b/src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/challenge_responses.go
similarity index 100%
rename from src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/challenge_responses.go
rename to src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/challenge_responses.go
diff --git a/src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/crypto.go b/src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/crypto.go
similarity index 100%
rename from src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/crypto.go
rename to src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/crypto.go
diff --git a/src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/helpers.go b/src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/helpers.go
similarity index 100%
rename from src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/helpers.go
rename to src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/helpers.go
diff --git a/src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/keys.go b/src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/keys.go
similarity index 100%
rename from src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/keys.go
rename to src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/keys.go
diff --git a/src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/md4/LICENSE b/src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/md4/LICENSE
similarity index 100%
rename from src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/md4/LICENSE
rename to src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/md4/LICENSE
diff --git a/src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/md4/md4.go b/src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/md4/md4.go
similarity index 100%
rename from src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/md4/md4.go
rename to src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/md4/md4.go
diff --git a/src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/md4/md4block.go b/src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/md4/md4block.go
similarity index 100%
rename from src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/md4/md4block.go
rename to src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/md4/md4block.go
diff --git a/src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/message_authenticate.go b/src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/message_authenticate.go
similarity index 100%
rename from src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/message_authenticate.go
rename to src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/message_authenticate.go
diff --git a/src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/message_challenge.go b/src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/message_challenge.go
similarity index 100%
rename from src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/message_challenge.go
rename to src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/message_challenge.go
diff --git a/src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/message_negotiate.go b/src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/message_negotiate.go
similarity index 100%
rename from src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/message_negotiate.go
rename to src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/message_negotiate.go
diff --git a/src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/negotiate_flags.go b/src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/negotiate_flags.go
similarity index 100%
rename from src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/negotiate_flags.go
rename to src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/negotiate_flags.go
diff --git a/src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/ntlm.go b/src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/ntlm.go
similarity index 100%
rename from src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/ntlm.go
rename to src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/ntlm.go
diff --git a/src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/ntlmv1.go b/src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/ntlmv1.go
similarity index 100%
rename from src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/ntlmv1.go
rename to src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/ntlmv1.go
diff --git a/src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/ntlmv2.go b/src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/ntlmv2.go
similarity index 100%
rename from src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/ntlmv2.go
rename to src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/ntlmv2.go
diff --git a/src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/payload.go b/src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/payload.go
similarity index 100%
rename from src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/payload.go
rename to src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/payload.go
diff --git a/src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/signature.go b/src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/signature.go
similarity index 100%
rename from src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/signature.go
rename to src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/signature.go
diff --git a/src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/version.go b/src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/version.go
similarity index 100%
rename from src/calanonsync/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/version.go
rename to src/github.com/vadimi/go-http-ntlm/vendor/github.com/ThomsonReutersEikon/go-ntlm/ntlm/version.go