diff --git a/.gitignore b/.gitignore
index afc8b2285..0310bdf7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,4 @@
-/.gopath
+/pkg
+/bin
 /restic
-/restic.debug
-/dirdiff
-cmd/dirdiff/dirdiff
-cmd/gentestdata/gentestdata
-cmd/restic/restic
 /.vagrant
diff --git a/.travis.yml b/.travis.yml
index 5e19e09e6..ad9e9bdd7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ go:
   - 1.3.3
   - 1.4.3
   - 1.5.3
-  - 1.6rc2
+  - 1.6
 
 os:
   - linux
@@ -18,7 +18,7 @@ matrix:
     - os: osx
       go: 1.4.3
     - os: osx
-      go: 1.6rc2
+      go: 1.5.3
 
 notifications:
   irc:
@@ -32,7 +32,6 @@ install:
   - go version
   - export GOBIN="$GOPATH/bin"
   - export PATH="$PATH:$GOBIN"
-  - export GOPATH="$GOPATH:${TRAVIS_BUILD_DIR}/Godeps/_workspace"
   - go env
 
 script:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0fdbc84b7..328cdae1a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -57,39 +57,32 @@ uploading it somewhere or post only the parts that are really relevant.
 Development Environment
 =======================
 
-For development, it is recommended to check out the restic repository within a
-`GOPATH`, an introductory text is
-["How to Write Go Code"](https://golang.org/doc/code.html). It is recommended
-to have a working directory, we're using `~/work/restic` in the following. This
-directory mainly contains the directory `src`, where the source code is stored.
+For development you need the build tool [`gb`](https://getgb.io), it can be
+installed by running the following command:
 
-First, create the necessary directory structure and clone the restic repository
-to the correct location:
+    $ go get github.com/constabulary/...
+
+The repository contains two directories with code: `src/` contains the code
+written for restic, whereas `vendor/` contains copies of libraries restic
+depends on. The libraries are managed with the `gb vendor` command.
+
+Just clone the repository, `cd` to it and run `gb build` to build the binary:
 
-    $ mkdir --parents ~/work/restic/src/github.com/restic
-    $ cd ~/work/restic/src/github.com/restic
     $ git clone https://github.com/restic/restic
     $ cd restic
-
-Now we're in the main directory of the restic repository. The last step is to
-set the environment variable `$GOPATH` to the correct value:
-
-    $ export GOPATH=~/work/restic:~/work/restic/src/github.com/restic/restic/Godeps/_workspace
+    $ gb build
+    [...]
+    $ bin/restic version
+    restic compiled manually
+    compiled at unknown time with go1.6
 
 The following commands can be used to run all the tests:
 
-    $ go test ./...
+    $ gb test
     ok          github.com/restic/restic        8.174s
     [...]
 
-The restic binary can be built from the directory `cmd/restic` this way:
-
-    $ cd cmd/restic
-    $ go build
-    $ ./restic version
-    restic compiled manually on go1.4.2
-
-if you want to run your tests on Linux, OpenBSD or FreeBSD, you can use
+If you want to run your tests on Linux, OpenBSD or FreeBSD, you can use
 [vagrant](https://www.vagrantup.com/) with the proveded `Vagrantfile` to
 quickly set up VMs and run the tests, e.g.:
 
@@ -107,23 +100,32 @@ get it into the project! The workflow we're using is also described on the
 [GitHub Flow](https://guides.github.com/introduction/flow/) website, it boils
 down to the following steps:
 
+ 0. If you want to work on something, please add a comment to the issue on
+    GitHub. For a new feature, please add an issue before starting to work on
+    it, so that duplicate work is prevented.
+
  1. First we would kindly ask you to fork our project on GitHub if you haven't
     done so already.
+
  2. Clone the repository locally and create a new branch. If you are working on
     the code itself, please set up the development environment as described in
-    the previous section and instead of cloning add your fork on GitHub as a
-    remote to the clone of the restic repository.
+    the previous section.
+
  3. Then commit your changes as fine grained as possible, as smaller patches,
     that handle one and only one issue are easier to discuss and merge.
+
  4. Push the new branch with your changes to your fork of the repository.
+
  5. Create a pull request by visiting the GitHub website, it will guide you
     through the process.
+
  6. You will receive comments on your code and the feature or bug that they
     address. Maybe you need to rework some minor things, in this case push new
     commits to the branch you created for the pull request, they will be
     automatically added to the pull request.
- 7. Once your code looks good, we'll merge it. Thanks a low for your
-    contribution!
+
+ 7. Once your code looks good and passes all the tests, we'll merge it. Thanks
+    a low for your contribution!
 
 Please provide the patches for each bug or feature in a separate branch and
 open up a pull request for each.
diff --git a/Dockerfile b/Dockerfile
index 5e6f91638..c3f40bcbf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,18 +4,21 @@
 # build the image:
 #   docker build -t restic/test .
 #
-# run tests:
-#   docker run --rm -v $PWD:/home/travis/gopath/src/github.com/restic/restic restic/test go run run_integration_tests.go
+# run all tests and cross-compile restic:
+#   docker run --rm -v $PWD:/home/travis/restic restic/test go run run_integration_tests.go -minio minio
 #
-# run interactively with:
-#   docker run --interactive --tty --rm -v $PWD:/home/travis/gopath/src/github.com/restic/restic restic/test /bin/bash
+# run interactively:
+#   docker run --interactive --tty --rm -v $PWD:/home/travis/restic restic/test /bin/bash
 #
-# run a tests:
-#   docker run --rm -v $PWD:/home/travis/gopath/src/github.com/restic/restic restic/test go test -v ./backend
+# run a subset of tests:
+#   docker run --rm -v $PWD:/home/travis/restic restic/test gb test -v ./backend
+#
+# build the image for an older version of Go:
+#   docker build --build-arg GOVERSION=1.3.3 -t restic/test:go1.3.3 .
 
 FROM ubuntu:14.04
 
-ARG GOVERSION=1.5.3
+ARG GOVERSION=1.6
 ARG GOARCH=amd64
 
 # install dependencies
@@ -34,15 +37,13 @@ WORKDIR $HOME
 RUN wget -q -O /tmp/go.tar.gz https://storage.googleapis.com/golang/go${GOVERSION}.linux-${GOARCH}.tar.gz
 RUN tar xf /tmp/go.tar.gz && rm -f /tmp/go.tar.gz
 ENV GOROOT $HOME/go
-ENV PATH $PATH:$GOROOT/bin
-
 ENV GOPATH $HOME/gopath
-ENV PATH $PATH:$GOPATH/bin
+ENV PATH $PATH:$GOROOT/bin:$GOPATH/bin:$HOME/bin
 
-RUN mkdir -p $GOPATH/src/github.com/restic/restic
+RUN mkdir -p $HOME/restic
 
 # pre-install tools, this speeds up running the tests itself
-RUN go get github.com/tools/godep
+RUN go get github.com/constabulary/gb/...
 RUN go get golang.org/x/tools/cmd/cover
 RUN go get github.com/mattn/goveralls
 RUN go get github.com/mitchellh/gox
@@ -52,7 +53,6 @@ RUN mkdir $HOME/bin \
     && chmod +x $HOME/bin/minio
 
 # set TRAVIS_BUILD_DIR for integration script
-ENV TRAVIS_BUILD_DIR $GOPATH/src/github.com/restic/restic
-ENV GOPATH $GOPATH:${TRAVIS_BUILD_DIR}/Godeps/_workspace
+ENV TRAVIS_BUILD_DIR $HOME/restic
 
-WORKDIR $TRAVIS_BUILD_DIR
+WORKDIR $HOME/restic
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
deleted file mode 100644
index 9b36036ab..000000000
--- a/Godeps/Godeps.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-	"ImportPath": "github.com/restic/restic",
-	"GoVersion": "go1.5",
-	"Packages": [
-		"./..."
-	],
-	"Deps": [
-		{
-			"ImportPath": "bazil.org/fuse",
-			"Rev": "18419ee53958df28fcfc9490fe6123bd59e237bb"
-		},
-		{
-			"ImportPath": "github.com/jessevdk/go-flags",
-			"Comment": "v1-297-g1b89bf7",
-			"Rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539"
-		},
-		{
-			"ImportPath": "github.com/juju/errors",
-			"Rev": "4567a5e69fd3130ca0d89f69478e7ac025b67452"
-		},
-		{
-			"ImportPath": "github.com/kr/fs",
-			"Rev": "2788f0dbd16903de03cb8186e5c7d97b69ad387b"
-		},
-		{
-			"ImportPath": "github.com/minio/minio-go",
-			"Comment": "v0.2.5-251-ga4cd3ca",
-			"Rev": "a4cd3caabd5f9c35ac100110eb60c2b80798f1af"
-		},
-		{
-			"ImportPath": "github.com/pkg/sftp",
-			"Rev": "e84cc8c755ca39b7b64f510fe1fffc1b51f210a5"
-		},
-		{
-			"ImportPath": "github.com/restic/chunker",
-			"Rev": "fc45043175c38d59374024a38fb7123c40a64f20"
-		},
-		{
-			"ImportPath": "golang.org/x/crypto/pbkdf2",
-			"Rev": "cc04154d65fb9296747569b107cfd05380b1ea3e"
-		},
-		{
-			"ImportPath": "golang.org/x/crypto/poly1305",
-			"Rev": "cc04154d65fb9296747569b107cfd05380b1ea3e"
-		},
-		{
-			"ImportPath": "golang.org/x/crypto/scrypt",
-			"Rev": "cc04154d65fb9296747569b107cfd05380b1ea3e"
-		},
-		{
-			"ImportPath": "golang.org/x/crypto/ssh",
-			"Rev": "cc04154d65fb9296747569b107cfd05380b1ea3e"
-		},
-		{
-			"ImportPath": "golang.org/x/net/context",
-			"Rev": "7654728e381988afd88e58cabfd6363a5ea91810"
-		}
-	]
-}
diff --git a/Godeps/Readme b/Godeps/Readme
deleted file mode 100644
index 4cdaa53d5..000000000
--- a/Godeps/Readme
+++ /dev/null
@@ -1,5 +0,0 @@
-This directory tree is generated automatically by godep.
-
-Please do not edit.
-
-See https://github.com/tools/godep for more information.
diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore
deleted file mode 100644
index f037d684e..000000000
--- a/Godeps/_workspace/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/pkg
-/bin
diff --git a/Vagrantfile b/Vagrantfile
index b12f1a737..bac6e5a7c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,7 +1,7 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-GO_VERSION = '1.4.2'
+GO_VERSION = '1.6'
 
 def packages_freebsd
   return <<-EOF
@@ -57,24 +57,23 @@ def prepare_user(boxname)
 
     gimme #{GO_VERSION} >> ~/.profile
     echo export 'GOPATH=/vagrant/go' >> ~/.profile
-    echo export 'CDPATH=.:$GOPATH/src/github.com' >> ~/.profile
     echo export 'PATH=$GOPATH/bin:/usr/local/bin:$PATH' >> ~/.profile
 
     . ~/.profile
 
     go get golang.org/x/tools/cmd/cover
-    go get github.com/tools/godep
+    go get github.com/constabulary/gb/...
 
     echo
     echo "Run:"
     echo "  vagrant rsync #{boxname}"
-    echo "  vagrant ssh #{boxname} -c 'cd project/path; godep go test ./...'"
+    echo "  vagrant ssh #{boxname} -c 'cd /vagrant; gb build && gb test'"
   EOF
 end
 
 def fix_perms
   return <<-EOF
-    chown -R vagrant /vagrant/go
+    chown -R vagrant /vagrant
   EOF
 end
 
@@ -84,12 +83,16 @@ end
 # you're doing.
 Vagrant.configure(2) do |config|
   # use rsync to copy content to the folder
-  config.vm.synced_folder ".", "/vagrant/go/src/github.com/restic/restic", :type => "rsync"
-  config.vm.synced_folder ".", "/vagrant", disabled: true
+  config.vm.synced_folder ".", "/vagrant", :type => "rsync"
 
   # fix permissions on synced folder
   config.vm.provision "fix perms", :type => :shell, :inline => fix_perms
 
+  # fix network card
+  config.vm.provider "virtualbox" do |v|
+    v.customize ["modifyvm", :id, "--nictype1", "virtio"]
+  end
+
   config.vm.define "linux" do |b|
     b.vm.box = "ubuntu/trusty64"
     b.vm.provision "packages linux", :type => :shell, :inline => packages_linux
diff --git a/appveyor.yml b/appveyor.yml
index cfd0033ad..10933757e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,7 @@
-clone_folder: c:\gopath\src\github.com\restic\restic
+clone_folder: c:\restic
 
 environment:
-  GOPATH: c:\gopath;c:\gopath\src\github.com\restic\restic\Godeps\_workspace
+  GOPATH: c:\gopath
 
 init:
   - ps: >-
@@ -13,8 +13,8 @@ init:
 
 install:
   - rmdir c:\go /s /q
-  - appveyor DownloadFile https://storage.googleapis.com/golang/go1.5.3.windows-amd64.msi
-  - msiexec /i go1.5.3.windows-amd64.msi /q
+  - appveyor DownloadFile https://storage.googleapis.com/golang/go1.6.windows-amd64.msi
+  - msiexec /i go1.6.windows-amd64.msi /q
   - go version
   - go env
   - appveyor DownloadFile http://sourceforge.netcologne.de/project/gnuwin32/tar/1.13-1/tar-1.13-1-bin.zip -FileName tar.zip
diff --git a/build.go b/build.go
index f77e396d6..2f3f3e5f0 100644
--- a/build.go
+++ b/build.go
@@ -30,7 +30,11 @@ func specialDir(name string) bool {
 	}
 
 	base := filepath.Base(name)
-	return base[0] == '_' || base[0] == '.'
+	if base == "vendor" || base[0] == '_' || base[0] == '.' {
+		return true
+	}
+
+	return false
 }
 
 // excludePath returns true if the file should not be copied to the new GOPATH.
@@ -177,10 +181,11 @@ func cleanEnv() (env []string) {
 }
 
 // build runs "go build args..." with GOPATH set to gopath.
-func build(gopath string, args ...string) error {
+func build(cwd, gopath string, args ...string) error {
 	args = append([]string{"build"}, args...)
 	cmd := exec.Command("go", args...)
 	cmd.Env = append(cleanEnv(), "GOPATH="+gopath)
+	cmd.Dir = cwd
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	verbosePrintf("go %s\n", args)
@@ -189,10 +194,11 @@ func build(gopath string, args ...string) error {
 }
 
 // test runs "go test args..." with GOPATH set to gopath.
-func test(gopath string, args ...string) error {
+func test(cwd, gopath string, args ...string) error {
 	args = append([]string{"test"}, args...)
 	cmd := exec.Command("go", args...)
 	cmd.Env = append(cleanEnv(), "GOPATH="+gopath)
+	cmd.Dir = cwd
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	verbosePrintf("go %s\n", args)
@@ -293,6 +299,7 @@ func main() {
 			runTests = true
 		case "-h":
 			showUsage(os.Stdout)
+			return
 		default:
 			fmt.Fprintf(os.Stderr, "Error: unknown option %q\n\n", arg)
 			showUsage(os.Stderr)
@@ -322,11 +329,11 @@ func main() {
 	}
 
 	verbosePrintf("create GOPATH at %v\n", gopath)
-	if err = updateGopath(gopath, root, "github.com/restic/restic"); err != nil {
+	if err = updateGopath(gopath, filepath.Join(root, "src"), ""); err != nil {
 		die("copying files from %v to %v failed: %v\n", root, gopath, err)
 	}
 
-	vendor := filepath.Join(root, "Godeps", "_workspace", "src")
+	vendor := filepath.Join(root, "vendor", "src")
 	if err = updateGopath(gopath, vendor, ""); err != nil {
 		die("copying files from %v to %v failed: %v\n", root, gopath, err)
 	}
@@ -342,10 +349,17 @@ func main() {
 		}
 	}()
 
-	output := "restic"
+	outputFilename := "restic"
 	if runtime.GOOS == "windows" {
-		output = "restic.exe"
+		outputFilename = "restic.exe"
 	}
+
+	cwd, err := os.Getwd()
+	if err != nil {
+		die("Getwd() returned %v\n", err)
+	}
+	output := filepath.Join(cwd, outputFilename)
+
 	version := getVersion()
 	compileTime := time.Now().Format(timeFormat)
 	constants := Constants{`main.compiledAt`: compileTime}
@@ -358,10 +372,10 @@ func main() {
 	args := []string{
 		"-tags", strings.Join(buildTags, " "),
 		"-ldflags", ldflags,
-		"-o", output, "github.com/restic/restic/cmd/restic",
+		"-o", output, "restic/cmd/restic",
 	}
 
-	err = build(gopath, args...)
+	err = build(filepath.Join(gopath, "src"), gopath, args...)
 	if err != nil {
 		die("build failed: %v\n", err)
 	}
@@ -369,7 +383,7 @@ func main() {
 	if runTests {
 		verbosePrintf("running tests\n")
 
-		err = test(gopath, "github.com/restic/restic/...")
+		err = test(filepath.Join(gopath, "src"), gopath, "restic/...")
 		if err != nil {
 			die("running tests failed: %v\n", err)
 		}
diff --git a/run_integration_tests.go b/run_integration_tests.go
index a771e274a..e9ab7cda2 100644
--- a/run_integration_tests.go
+++ b/run_integration_tests.go
@@ -154,27 +154,31 @@ func (env *TravisEnvironment) RunTests() {
 		os.Setenv("RESTIC_TEST_FUSE", "0")
 	}
 
+	cwd, err := os.Getwd()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Getwd() returned error: %v", err)
+		os.Exit(9)
+	}
+
+	envWithGOPATH := make(map[string]string)
+	envWithGOPATH["GOPATH"] = cwd + ":" + filepath.Join(cwd, "vendor")
+
 	if *runCrossCompile {
 		// compile for all target architectures with tags
 		for _, tags := range []string{"release", "debug"} {
-			run("gox", "-verbose",
+			runWithEnv(envWithGOPATH, "gox", "-verbose",
 				"-os", strings.Join(env.goxOS, " "),
 				"-arch", strings.Join(env.goxArch, " "),
 				"-tags", tags,
 				"-output", "/tmp/{{.Dir}}_{{.OS}}_{{.Arch}}",
-				"./cmd/restic")
+				"restic/cmd/restic")
 		}
 	}
 
 	// run the build script
 	run("go", "run", "build.go")
 
-	var (
-		testEnv map[string]string
-		srv     *MinioServer
-		err     error
-	)
-
+	var srv *MinioServer
 	if env.minio != "" {
 		srv, err = NewMinioServer(env.minio)
 		if err != nil {
@@ -182,11 +186,13 @@ func (env *TravisEnvironment) RunTests() {
 			os.Exit(8)
 		}
 
-		testEnv = minioEnv
+		for k, v := range minioEnv {
+			envWithGOPATH[k] = v
+		}
 	}
 
 	// run the tests and gather coverage information
-	runWithEnv(testEnv, "gotestcover", "-coverprofile", "all.cov", "./...")
+	runWithEnv(envWithGOPATH, "gotestcover", "-coverprofile", "all.cov", "restic/...")
 
 	runGofmt()
 
@@ -206,7 +212,7 @@ func (env *AppveyorEnvironment) RunTests() {
 // findGoFiles returns a list of go source code file names below dir.
 func findGoFiles(dir string) (list []string, err error) {
 	err = filepath.Walk(dir, func(name string, fi os.FileInfo, err error) error {
-		if filepath.Base(name) == "Godeps" {
+		if filepath.Base(name) == "vendor" {
 			return filepath.SkipDir
 		}
 
diff --git a/archiver.go b/src/restic/archiver.go
similarity index 99%
rename from archiver.go
rename to src/restic/archiver.go
index a8e94e516..d005bb8f4 100644
--- a/archiver.go
+++ b/src/restic/archiver.go
@@ -12,11 +12,11 @@ import (
 	"time"
 
 	"github.com/restic/chunker"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/debug"
-	"github.com/restic/restic/pack"
-	"github.com/restic/restic/pipe"
-	"github.com/restic/restic/repository"
+	"restic/backend"
+	"restic/debug"
+	"restic/pack"
+	"restic/pipe"
+	"restic/repository"
 
 	"github.com/juju/errors"
 )
diff --git a/archiver_duplication_test.go b/src/restic/archiver_duplication_test.go
similarity index 94%
rename from archiver_duplication_test.go
rename to src/restic/archiver_duplication_test.go
index f3e4c5475..3edc70cb3 100644
--- a/archiver_duplication_test.go
+++ b/src/restic/archiver_duplication_test.go
@@ -10,10 +10,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/restic/restic"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/pack"
-	"github.com/restic/restic/repository"
+	"restic"
+	"restic/backend"
+	"restic/pack"
+	"restic/repository"
 )
 
 const parallelSaves = 50
diff --git a/archiver_int_test.go b/src/restic/archiver_int_test.go
similarity index 98%
rename from archiver_int_test.go
rename to src/restic/archiver_int_test.go
index d26a9ce53..9e4426889 100644
--- a/archiver_int_test.go
+++ b/src/restic/archiver_int_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/restic/restic/pipe"
+	"restic/pipe"
 )
 
 var treeJobs = []string{
diff --git a/archiver_test.go b/src/restic/archiver_test.go
similarity index 96%
rename from archiver_test.go
rename to src/restic/archiver_test.go
index 75b1176cb..d38a73b80 100644
--- a/archiver_test.go
+++ b/src/restic/archiver_test.go
@@ -8,13 +8,13 @@ import (
 	"time"
 
 	"github.com/restic/chunker"
-	"github.com/restic/restic"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/checker"
-	"github.com/restic/restic/crypto"
-	"github.com/restic/restic/pack"
-	"github.com/restic/restic/repository"
-	. "github.com/restic/restic/test"
+	"restic"
+	"restic/backend"
+	"restic/checker"
+	"restic/crypto"
+	"restic/pack"
+	"restic/repository"
+	. "restic/test"
 )
 
 var testPol = chunker.Pol(0x3DA3358B4DC173)
diff --git a/backend/doc.go b/src/restic/backend/doc.go
similarity index 100%
rename from backend/doc.go
rename to src/restic/backend/doc.go
diff --git a/backend/generic.go b/src/restic/backend/generic.go
similarity index 100%
rename from backend/generic.go
rename to src/restic/backend/generic.go
diff --git a/backend/generic_test.go b/src/restic/backend/generic_test.go
similarity index 95%
rename from backend/generic_test.go
rename to src/restic/backend/generic_test.go
index ca5b78982..7c42e2859 100644
--- a/backend/generic_test.go
+++ b/src/restic/backend/generic_test.go
@@ -3,8 +3,8 @@ package backend_test
 import (
 	"testing"
 
-	"github.com/restic/restic/backend"
-	. "github.com/restic/restic/test"
+	"restic/backend"
+	. "restic/test"
 )
 
 type mockBackend struct {
diff --git a/backend/handle.go b/src/restic/backend/handle.go
similarity index 100%
rename from backend/handle.go
rename to src/restic/backend/handle.go
diff --git a/backend/handle_test.go b/src/restic/backend/handle_test.go
similarity index 100%
rename from backend/handle_test.go
rename to src/restic/backend/handle_test.go
diff --git a/backend/id.go b/src/restic/backend/id.go
similarity index 100%
rename from backend/id.go
rename to src/restic/backend/id.go
diff --git a/backend/id_int_test.go b/src/restic/backend/id_int_test.go
similarity index 100%
rename from backend/id_int_test.go
rename to src/restic/backend/id_int_test.go
diff --git a/backend/id_test.go b/src/restic/backend/id_test.go
similarity index 93%
rename from backend/id_test.go
rename to src/restic/backend/id_test.go
index 727cb5be2..47d12d319 100644
--- a/backend/id_test.go
+++ b/src/restic/backend/id_test.go
@@ -3,8 +3,8 @@ package backend_test
 import (
 	"testing"
 
-	"github.com/restic/restic/backend"
-	. "github.com/restic/restic/test"
+	"restic/backend"
+	. "restic/test"
 )
 
 var TestStrings = []struct {
diff --git a/backend/ids.go b/src/restic/backend/ids.go
similarity index 100%
rename from backend/ids.go
rename to src/restic/backend/ids.go
diff --git a/backend/ids_test.go b/src/restic/backend/ids_test.go
similarity index 96%
rename from backend/ids_test.go
rename to src/restic/backend/ids_test.go
index eac56d30c..f4e3162ca 100644
--- a/backend/ids_test.go
+++ b/src/restic/backend/ids_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/restic/restic/backend"
-	. "github.com/restic/restic/test"
+	"restic/backend"
+	. "restic/test"
 )
 
 var uniqTests = []struct {
diff --git a/backend/idset.go b/src/restic/backend/idset.go
similarity index 100%
rename from backend/idset.go
rename to src/restic/backend/idset.go
diff --git a/backend/idset_test.go b/src/restic/backend/idset_test.go
similarity index 94%
rename from backend/idset_test.go
rename to src/restic/backend/idset_test.go
index 6659c2229..32dce0e0d 100644
--- a/backend/idset_test.go
+++ b/src/restic/backend/idset_test.go
@@ -3,8 +3,8 @@ package backend_test
 import (
 	"testing"
 
-	"github.com/restic/restic/backend"
-	. "github.com/restic/restic/test"
+	"restic/backend"
+	. "restic/test"
 )
 
 var idsetTests = []struct {
diff --git a/backend/interface.go b/src/restic/backend/interface.go
similarity index 100%
rename from backend/interface.go
rename to src/restic/backend/interface.go
diff --git a/backend/local/backend_test.go b/src/restic/backend/local/backend_test.go
similarity index 97%
rename from backend/local/backend_test.go
rename to src/restic/backend/local/backend_test.go
index b2d5e7b0f..8607f01b7 100644
--- a/backend/local/backend_test.go
+++ b/src/restic/backend/local/backend_test.go
@@ -4,7 +4,7 @@ package local_test
 import (
 	"testing"
 
-	"github.com/restic/restic/backend/test"
+	"restic/backend/test"
 )
 
 var SkipMessage string
diff --git a/backend/local/config.go b/src/restic/backend/local/config.go
similarity index 100%
rename from backend/local/config.go
rename to src/restic/backend/local/config.go
diff --git a/backend/local/doc.go b/src/restic/backend/local/doc.go
similarity index 100%
rename from backend/local/doc.go
rename to src/restic/backend/local/doc.go
diff --git a/backend/local/local.go b/src/restic/backend/local/local.go
similarity index 98%
rename from backend/local/local.go
rename to src/restic/backend/local/local.go
index 521ffde79..8bf4f1803 100644
--- a/backend/local/local.go
+++ b/src/restic/backend/local/local.go
@@ -8,8 +8,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/debug"
+	"restic/backend"
+	"restic/debug"
 )
 
 // Local is a backend in a local directory.
diff --git a/backend/local/local_test.go b/src/restic/backend/local/local_test.go
similarity index 88%
rename from backend/local/local_test.go
rename to src/restic/backend/local/local_test.go
index 3335cbfa8..b139b0aca 100644
--- a/backend/local/local_test.go
+++ b/src/restic/backend/local/local_test.go
@@ -5,9 +5,9 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/backend/local"
-	"github.com/restic/restic/backend/test"
+	"restic/backend"
+	"restic/backend/local"
+	"restic/backend/test"
 )
 
 var tempBackendDir string
diff --git a/backend/local/local_unix.go b/src/restic/backend/local/local_unix.go
similarity index 100%
rename from backend/local/local_unix.go
rename to src/restic/backend/local/local_unix.go
diff --git a/backend/local/local_windows.go b/src/restic/backend/local/local_windows.go
similarity index 100%
rename from backend/local/local_windows.go
rename to src/restic/backend/local/local_windows.go
diff --git a/backend/mem/backend_test.go b/src/restic/backend/mem/backend_test.go
similarity index 97%
rename from backend/mem/backend_test.go
rename to src/restic/backend/mem/backend_test.go
index 31f86e4fc..13e95f115 100644
--- a/backend/mem/backend_test.go
+++ b/src/restic/backend/mem/backend_test.go
@@ -4,7 +4,7 @@ package mem_test
 import (
 	"testing"
 
-	"github.com/restic/restic/backend/test"
+	"restic/backend/test"
 )
 
 var SkipMessage string
diff --git a/backend/mem/mem_backend.go b/src/restic/backend/mem/mem_backend.go
similarity index 98%
rename from backend/mem/mem_backend.go
rename to src/restic/backend/mem/mem_backend.go
index adac5b332..2dde7e320 100644
--- a/backend/mem/mem_backend.go
+++ b/src/restic/backend/mem/mem_backend.go
@@ -5,8 +5,8 @@ import (
 	"io"
 	"sync"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/debug"
+	"restic/backend"
+	"restic/debug"
 )
 
 type entry struct {
diff --git a/backend/mem/mem_backend_test.go b/src/restic/backend/mem/mem_backend_test.go
similarity index 81%
rename from backend/mem/mem_backend_test.go
rename to src/restic/backend/mem/mem_backend_test.go
index 8c3745aa2..a65cdc246 100644
--- a/backend/mem/mem_backend_test.go
+++ b/src/restic/backend/mem/mem_backend_test.go
@@ -3,9 +3,9 @@ package mem_test
 import (
 	"errors"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/backend/mem"
-	"github.com/restic/restic/backend/test"
+	"restic/backend"
+	"restic/backend/mem"
+	"restic/backend/test"
 )
 
 var be backend.Backend
diff --git a/backend/mock_backend.go b/src/restic/backend/mock_backend.go
similarity index 100%
rename from backend/mock_backend.go
rename to src/restic/backend/mock_backend.go
diff --git a/backend/paths.go b/src/restic/backend/paths.go
similarity index 100%
rename from backend/paths.go
rename to src/restic/backend/paths.go
diff --git a/backend/s3/backend_test.go b/src/restic/backend/s3/backend_test.go
similarity index 97%
rename from backend/s3/backend_test.go
rename to src/restic/backend/s3/backend_test.go
index 8db0a31f9..82eca2631 100644
--- a/backend/s3/backend_test.go
+++ b/src/restic/backend/s3/backend_test.go
@@ -4,7 +4,7 @@ package s3_test
 import (
 	"testing"
 
-	"github.com/restic/restic/backend/test"
+	"restic/backend/test"
 )
 
 var SkipMessage string
diff --git a/backend/s3/config.go b/src/restic/backend/s3/config.go
similarity index 100%
rename from backend/s3/config.go
rename to src/restic/backend/s3/config.go
diff --git a/backend/s3/config_test.go b/src/restic/backend/s3/config_test.go
similarity index 100%
rename from backend/s3/config_test.go
rename to src/restic/backend/s3/config_test.go
diff --git a/backend/s3/s3.go b/src/restic/backend/s3/s3.go
similarity index 98%
rename from backend/s3/s3.go
rename to src/restic/backend/s3/s3.go
index a6657fd2b..609a07064 100644
--- a/backend/s3/s3.go
+++ b/src/restic/backend/s3/s3.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/minio/minio-go"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/debug"
+	"restic/backend"
+	"restic/debug"
 )
 
 const connLimit = 10
diff --git a/backend/s3/s3_test.go b/src/restic/backend/s3/s3_test.go
similarity index 88%
rename from backend/s3/s3_test.go
rename to src/restic/backend/s3/s3_test.go
index 050e4300a..586398de9 100644
--- a/backend/s3/s3_test.go
+++ b/src/restic/backend/s3/s3_test.go
@@ -6,10 +6,10 @@ import (
 	"net/url"
 	"os"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/backend/s3"
-	"github.com/restic/restic/backend/test"
-	. "github.com/restic/restic/test"
+	"restic/backend"
+	"restic/backend/s3"
+	"restic/backend/test"
+	. "restic/test"
 )
 
 //go:generate go run ../test/generate_backend_tests.go
diff --git a/backend/sftp/backend_test.go b/src/restic/backend/sftp/backend_test.go
similarity index 97%
rename from backend/sftp/backend_test.go
rename to src/restic/backend/sftp/backend_test.go
index afab17e60..a812f8cd0 100644
--- a/backend/sftp/backend_test.go
+++ b/src/restic/backend/sftp/backend_test.go
@@ -4,7 +4,7 @@ package sftp_test
 import (
 	"testing"
 
-	"github.com/restic/restic/backend/test"
+	"restic/backend/test"
 )
 
 var SkipMessage string
diff --git a/backend/sftp/config.go b/src/restic/backend/sftp/config.go
similarity index 100%
rename from backend/sftp/config.go
rename to src/restic/backend/sftp/config.go
diff --git a/backend/sftp/config_test.go b/src/restic/backend/sftp/config_test.go
similarity index 100%
rename from backend/sftp/config_test.go
rename to src/restic/backend/sftp/config_test.go
diff --git a/backend/sftp/doc.go b/src/restic/backend/sftp/doc.go
similarity index 100%
rename from backend/sftp/doc.go
rename to src/restic/backend/sftp/doc.go
diff --git a/backend/sftp/sftp.go b/src/restic/backend/sftp/sftp.go
similarity index 99%
rename from backend/sftp/sftp.go
rename to src/restic/backend/sftp/sftp.go
index ddd35a56f..4279b8d5a 100644
--- a/backend/sftp/sftp.go
+++ b/src/restic/backend/sftp/sftp.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/juju/errors"
 	"github.com/pkg/sftp"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/debug"
+	"restic/backend"
+	"restic/debug"
 )
 
 const (
diff --git a/backend/sftp/sftp_backend_test.go b/src/restic/backend/sftp/sftp_backend_test.go
similarity index 89%
rename from backend/sftp/sftp_backend_test.go
rename to src/restic/backend/sftp/sftp_backend_test.go
index bfb8e4e75..1d7199a88 100644
--- a/backend/sftp/sftp_backend_test.go
+++ b/src/restic/backend/sftp/sftp_backend_test.go
@@ -7,11 +7,11 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/backend/sftp"
-	"github.com/restic/restic/backend/test"
+	"restic/backend"
+	"restic/backend/sftp"
+	"restic/backend/test"
 
-	. "github.com/restic/restic/test"
+	. "restic/test"
 )
 
 var tempBackendDir string
diff --git a/backend/sftp/sftp_unix.go b/src/restic/backend/sftp/sftp_unix.go
similarity index 100%
rename from backend/sftp/sftp_unix.go
rename to src/restic/backend/sftp/sftp_unix.go
diff --git a/backend/sftp/sftp_windows.go b/src/restic/backend/sftp/sftp_windows.go
similarity index 100%
rename from backend/sftp/sftp_windows.go
rename to src/restic/backend/sftp/sftp_windows.go
diff --git a/backend/test/backend_test.go b/src/restic/backend/test/backend_test.go
similarity index 97%
rename from backend/test/backend_test.go
rename to src/restic/backend/test/backend_test.go
index c1bee84c7..b495ce663 100644
--- a/backend/test/backend_test.go
+++ b/src/restic/backend/test/backend_test.go
@@ -4,7 +4,7 @@ package test_test
 import (
 	"testing"
 
-	"github.com/restic/restic/backend/test"
+	"restic/backend/test"
 )
 
 var SkipMessage string
diff --git a/backend/test/generate_backend_tests.go b/src/restic/backend/test/generate_backend_tests.go
similarity index 98%
rename from backend/test/generate_backend_tests.go
rename to src/restic/backend/test/generate_backend_tests.go
index 0631f72c8..4d1e9b478 100644
--- a/backend/test/generate_backend_tests.go
+++ b/src/restic/backend/test/generate_backend_tests.go
@@ -30,7 +30,7 @@ package {{ .Package }}
 import (
 	"testing"
 
-	"github.com/restic/restic/backend/test"
+	"restic/backend/test"
 )
 
 var SkipMessage string
diff --git a/backend/test/tests.go b/src/restic/backend/test/tests.go
similarity index 99%
rename from backend/test/tests.go
rename to src/restic/backend/test/tests.go
index e178d39d8..6313f39f6 100644
--- a/backend/test/tests.go
+++ b/src/restic/backend/test/tests.go
@@ -10,8 +10,8 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/restic/restic/backend"
-	. "github.com/restic/restic/test"
+	"restic/backend"
+	. "restic/test"
 )
 
 // CreateFn is a function that creates a temporary repository for the tests.
diff --git a/backend/test/tests_test.go b/src/restic/backend/test/tests_test.go
similarity index 81%
rename from backend/test/tests_test.go
rename to src/restic/backend/test/tests_test.go
index 22e769745..1674f1f5e 100644
--- a/backend/test/tests_test.go
+++ b/src/restic/backend/test/tests_test.go
@@ -3,9 +3,9 @@ package test_test
 import (
 	"errors"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/backend/mem"
-	"github.com/restic/restic/backend/test"
+	"restic/backend"
+	"restic/backend/mem"
+	"restic/backend/test"
 )
 
 var be backend.Backend
diff --git a/backend/utils.go b/src/restic/backend/utils.go
similarity index 100%
rename from backend/utils.go
rename to src/restic/backend/utils.go
diff --git a/backend/utils_test.go b/src/restic/backend/utils_test.go
similarity index 94%
rename from backend/utils_test.go
rename to src/restic/backend/utils_test.go
index 00d7f5cab..ad39c3b1d 100644
--- a/backend/utils_test.go
+++ b/src/restic/backend/utils_test.go
@@ -5,9 +5,9 @@ import (
 	"math/rand"
 	"testing"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/backend/mem"
-	. "github.com/restic/restic/test"
+	"restic/backend"
+	"restic/backend/mem"
+	. "restic/test"
 )
 
 const KiB = 1 << 10
diff --git a/cache.go b/src/restic/cache.go
similarity index 98%
rename from cache.go
rename to src/restic/cache.go
index bf3fc2d05..1b00e2f95 100644
--- a/cache.go
+++ b/src/restic/cache.go
@@ -9,9 +9,9 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/debug"
-	"github.com/restic/restic/repository"
+	"restic/backend"
+	"restic/debug"
+	"restic/repository"
 )
 
 // Cache is used to locally cache items from a repository.
diff --git a/cache_test.go b/src/restic/cache_test.go
similarity index 86%
rename from cache_test.go
rename to src/restic/cache_test.go
index b480b5869..d4157b1b5 100644
--- a/cache_test.go
+++ b/src/restic/cache_test.go
@@ -3,8 +3,8 @@ package restic_test
 import (
 	"testing"
 
-	"github.com/restic/restic"
-	. "github.com/restic/restic/test"
+	"restic"
+	. "restic/test"
 )
 
 func TestCache(t *testing.T) {
diff --git a/checker/checker.go b/src/restic/checker/checker.go
similarity index 98%
rename from checker/checker.go
rename to src/restic/checker/checker.go
index 11becdeb7..68a8147dd 100644
--- a/checker/checker.go
+++ b/src/restic/checker/checker.go
@@ -6,12 +6,12 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/restic/restic"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/crypto"
-	"github.com/restic/restic/debug"
-	"github.com/restic/restic/pack"
-	"github.com/restic/restic/repository"
+	"restic"
+	"restic/backend"
+	"restic/crypto"
+	"restic/debug"
+	"restic/pack"
+	"restic/repository"
 )
 
 // Checker runs various checks on a repository. It is advisable to create an
diff --git a/checker/checker_test.go b/src/restic/checker/checker_test.go
similarity index 96%
rename from checker/checker_test.go
rename to src/restic/checker/checker_test.go
index 10b37e219..85135a98c 100644
--- a/checker/checker_test.go
+++ b/src/restic/checker/checker_test.go
@@ -7,12 +7,12 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/restic/restic"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/backend/mem"
-	"github.com/restic/restic/checker"
-	"github.com/restic/restic/repository"
-	. "github.com/restic/restic/test"
+	"restic"
+	"restic/backend"
+	"restic/backend/mem"
+	"restic/checker"
+	"restic/repository"
+	. "restic/test"
 )
 
 var checkerTestData = filepath.Join("testdata", "checker-test-repo.tar.gz")
diff --git a/checker/repacker.go b/src/restic/checker/repacker.go
similarity index 97%
rename from checker/repacker.go
rename to src/restic/checker/repacker.go
index f3b158d0c..8aedfc089 100644
--- a/checker/repacker.go
+++ b/src/restic/checker/repacker.go
@@ -3,9 +3,9 @@ package checker
 import (
 	"errors"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/debug"
-	"github.com/restic/restic/repository"
+	"restic/backend"
+	"restic/debug"
+	"restic/repository"
 )
 
 // Repacker extracts still used blobs from packs with unused blobs and creates
diff --git a/checker/repacker_test.go b/src/restic/checker/repacker_test.go
similarity index 97%
rename from checker/repacker_test.go
rename to src/restic/checker/repacker_test.go
index dcf7b2040..821828c8b 100644
--- a/checker/repacker_test.go
+++ b/src/restic/checker/repacker_test.go
@@ -3,10 +3,10 @@ package checker_test
 import (
 	"testing"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/checker"
+	"restic/backend"
+	"restic/checker"
 
-	. "github.com/restic/restic/test"
+	. "restic/test"
 )
 
 var findPackTests = []struct {
diff --git a/checker/testdata/checker-test-repo.tar.gz b/src/restic/checker/testdata/checker-test-repo.tar.gz
similarity index 100%
rename from checker/testdata/checker-test-repo.tar.gz
rename to src/restic/checker/testdata/checker-test-repo.tar.gz
diff --git a/checker/testdata/duplicate-packs-in-index-test-repo.tar.gz b/src/restic/checker/testdata/duplicate-packs-in-index-test-repo.tar.gz
similarity index 100%
rename from checker/testdata/duplicate-packs-in-index-test-repo.tar.gz
rename to src/restic/checker/testdata/duplicate-packs-in-index-test-repo.tar.gz
diff --git a/cmd/restic/.gitignore b/src/restic/cmd/restic/.gitignore
similarity index 100%
rename from cmd/restic/.gitignore
rename to src/restic/cmd/restic/.gitignore
diff --git a/cmd/restic/cleanup.go b/src/restic/cmd/restic/cleanup.go
similarity index 97%
rename from cmd/restic/cleanup.go
rename to src/restic/cmd/restic/cleanup.go
index b4d4771d5..32caef7b8 100644
--- a/cmd/restic/cleanup.go
+++ b/src/restic/cmd/restic/cleanup.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/restic/restic/debug"
+	"restic/debug"
 )
 
 var cleanupHandlers struct {
diff --git a/cmd/restic/cmd_backup.go b/src/restic/cmd/restic/cmd_backup.go
similarity index 97%
rename from cmd/restic/cmd_backup.go
rename to src/restic/cmd/restic/cmd_backup.go
index 4524001c2..3d241ef52 100644
--- a/cmd/restic/cmd_backup.go
+++ b/src/restic/cmd/restic/cmd_backup.go
@@ -8,12 +8,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/restic/restic"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/debug"
-	"github.com/restic/restic/filter"
-	"github.com/restic/restic/repository"
 	"golang.org/x/crypto/ssh/terminal"
+	"restic"
+	"restic/backend"
+	"restic/debug"
+	"restic/filter"
+	"restic/repository"
 )
 
 type CmdBackup struct {
diff --git a/cmd/restic/cmd_cache.go b/src/restic/cmd/restic/cmd_cache.go
similarity index 97%
rename from cmd/restic/cmd_cache.go
rename to src/restic/cmd/restic/cmd_cache.go
index 39733b997..0a7e0c5e9 100644
--- a/cmd/restic/cmd_cache.go
+++ b/src/restic/cmd/restic/cmd_cache.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/restic/restic"
+	"restic"
 )
 
 type CmdCache struct {
diff --git a/cmd/restic/cmd_cat.go b/src/restic/cmd/restic/cmd_cat.go
similarity index 95%
rename from cmd/restic/cmd_cat.go
rename to src/restic/cmd/restic/cmd_cat.go
index 1a7423d18..e3fdebe4c 100644
--- a/cmd/restic/cmd_cat.go
+++ b/src/restic/cmd/restic/cmd_cat.go
@@ -6,11 +6,11 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/restic/restic"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/debug"
-	"github.com/restic/restic/pack"
-	"github.com/restic/restic/repository"
+	"restic"
+	"restic/backend"
+	"restic/debug"
+	"restic/pack"
+	"restic/repository"
 )
 
 type CmdCat struct {
diff --git a/cmd/restic/cmd_check.go b/src/restic/cmd/restic/cmd_check.go
similarity index 98%
rename from cmd/restic/cmd_check.go
rename to src/restic/cmd/restic/cmd_check.go
index 8c59c2ffe..25e3ff325 100644
--- a/cmd/restic/cmd_check.go
+++ b/src/restic/cmd/restic/cmd_check.go
@@ -8,8 +8,8 @@ import (
 
 	"golang.org/x/crypto/ssh/terminal"
 
-	"github.com/restic/restic"
-	"github.com/restic/restic/checker"
+	"restic"
+	"restic/checker"
 )
 
 type CmdCheck struct {
diff --git a/cmd/restic/cmd_dump.go b/src/restic/cmd/restic/cmd_dump.go
similarity index 95%
rename from cmd/restic/cmd_dump.go
rename to src/restic/cmd/restic/cmd_dump.go
index b7d456e4e..b75d85a6e 100644
--- a/cmd/restic/cmd_dump.go
+++ b/src/restic/cmd/restic/cmd_dump.go
@@ -9,10 +9,10 @@ import (
 	"os"
 
 	"github.com/juju/errors"
-	"github.com/restic/restic"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/pack"
-	"github.com/restic/restic/repository"
+	"restic"
+	"restic/backend"
+	"restic/pack"
+	"restic/repository"
 )
 
 type CmdDump struct {
diff --git a/cmd/restic/cmd_find.go b/src/restic/cmd/restic/cmd_find.go
similarity index 96%
rename from cmd/restic/cmd_find.go
rename to src/restic/cmd/restic/cmd_find.go
index fa2d7859e..9f96187e1 100644
--- a/cmd/restic/cmd_find.go
+++ b/src/restic/cmd/restic/cmd_find.go
@@ -5,10 +5,10 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/restic/restic"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/debug"
-	"github.com/restic/restic/repository"
+	"restic"
+	"restic/backend"
+	"restic/debug"
+	"restic/repository"
 )
 
 type findResult struct {
diff --git a/cmd/restic/cmd_init.go b/src/restic/cmd/restic/cmd_init.go
similarity index 96%
rename from cmd/restic/cmd_init.go
rename to src/restic/cmd/restic/cmd_init.go
index 827684b3e..ec790fe90 100644
--- a/cmd/restic/cmd_init.go
+++ b/src/restic/cmd/restic/cmd_init.go
@@ -3,7 +3,7 @@ package main
 import (
 	"errors"
 
-	"github.com/restic/restic/repository"
+	"restic/repository"
 )
 
 type CmdInit struct {
diff --git a/cmd/restic/cmd_key.go b/src/restic/cmd/restic/cmd_key.go
similarity index 97%
rename from cmd/restic/cmd_key.go
rename to src/restic/cmd/restic/cmd_key.go
index c585ae4cd..46e5b6bfd 100644
--- a/cmd/restic/cmd_key.go
+++ b/src/restic/cmd/restic/cmd_key.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/repository"
+	"restic/backend"
+	"restic/repository"
 )
 
 type CmdKey struct {
diff --git a/cmd/restic/cmd_list.go b/src/restic/cmd/restic/cmd_list.go
similarity index 97%
rename from cmd/restic/cmd_list.go
rename to src/restic/cmd/restic/cmd_list.go
index fc13ff5a1..3bfb5af9f 100644
--- a/cmd/restic/cmd_list.go
+++ b/src/restic/cmd/restic/cmd_list.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/restic/restic/backend"
+	"restic/backend"
 )
 
 type CmdList struct {
diff --git a/cmd/restic/cmd_ls.go b/src/restic/cmd/restic/cmd_ls.go
similarity index 95%
rename from cmd/restic/cmd_ls.go
rename to src/restic/cmd/restic/cmd_ls.go
index e3bf0242b..2f1cccf4d 100644
--- a/cmd/restic/cmd_ls.go
+++ b/src/restic/cmd/restic/cmd_ls.go
@@ -5,9 +5,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/restic/restic"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/repository"
+	"restic"
+	"restic/backend"
+	"restic/repository"
 )
 
 type CmdLs struct {
diff --git a/cmd/restic/cmd_mount.go b/src/restic/cmd/restic/cmd_mount.go
similarity index 98%
rename from cmd/restic/cmd_mount.go
rename to src/restic/cmd/restic/cmd_mount.go
index b8d8cb277..5baf1419a 100644
--- a/cmd/restic/cmd_mount.go
+++ b/src/restic/cmd/restic/cmd_mount.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/restic/restic/fuse"
+	"restic/fuse"
 
 	systemFuse "bazil.org/fuse"
 	"bazil.org/fuse/fs"
diff --git a/cmd/restic/cmd_optimize.go b/src/restic/cmd/restic/cmd_optimize.go
similarity index 95%
rename from cmd/restic/cmd_optimize.go
rename to src/restic/cmd/restic/cmd_optimize.go
index 1e29ce1d7..bd6f26ddf 100644
--- a/cmd/restic/cmd_optimize.go
+++ b/src/restic/cmd/restic/cmd_optimize.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/checker"
+	"restic/backend"
+	"restic/checker"
 )
 
 type CmdOptimize struct {
diff --git a/cmd/restic/cmd_rebuild_index.go b/src/restic/cmd/restic/cmd_rebuild_index.go
similarity index 97%
rename from cmd/restic/cmd_rebuild_index.go
rename to src/restic/cmd/restic/cmd_rebuild_index.go
index 27dae2392..e9d803e51 100644
--- a/cmd/restic/cmd_rebuild_index.go
+++ b/src/restic/cmd/restic/cmd_rebuild_index.go
@@ -4,10 +4,10 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/debug"
-	"github.com/restic/restic/pack"
-	"github.com/restic/restic/repository"
+	"restic/backend"
+	"restic/debug"
+	"restic/pack"
+	"restic/repository"
 )
 
 type CmdRebuildIndex struct {
diff --git a/cmd/restic/cmd_restore.go b/src/restic/cmd/restic/cmd_restore.go
similarity index 96%
rename from cmd/restic/cmd_restore.go
rename to src/restic/cmd/restic/cmd_restore.go
index 0daf74966..64626e1c2 100644
--- a/cmd/restic/cmd_restore.go
+++ b/src/restic/cmd/restic/cmd_restore.go
@@ -4,9 +4,9 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/restic/restic"
-	"github.com/restic/restic/debug"
-	"github.com/restic/restic/filter"
+	"restic"
+	"restic/debug"
+	"restic/filter"
 )
 
 type CmdRestore struct {
diff --git a/cmd/restic/cmd_snapshots.go b/src/restic/cmd/restic/cmd_snapshots.go
similarity index 97%
rename from cmd/restic/cmd_snapshots.go
rename to src/restic/cmd/restic/cmd_snapshots.go
index f1dcf72bd..95bd598a8 100644
--- a/cmd/restic/cmd_snapshots.go
+++ b/src/restic/cmd/restic/cmd_snapshots.go
@@ -8,8 +8,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/restic/restic"
-	"github.com/restic/restic/backend"
+	"restic"
+	"restic/backend"
 )
 
 type Table struct {
diff --git a/cmd/restic/cmd_unlock.go b/src/restic/cmd/restic/cmd_unlock.go
similarity index 95%
rename from cmd/restic/cmd_unlock.go
rename to src/restic/cmd/restic/cmd_unlock.go
index 47345350c..fa9a4c2a3 100644
--- a/cmd/restic/cmd_unlock.go
+++ b/src/restic/cmd/restic/cmd_unlock.go
@@ -1,6 +1,6 @@
 package main
 
-import "github.com/restic/restic"
+import "restic"
 
 type CmdUnlock struct {
 	RemoveAll bool `long:"remove-all" description:"Remove all locks, even stale ones"`
diff --git a/cmd/restic/cmd_version.go b/src/restic/cmd/restic/cmd_version.go
similarity index 100%
rename from cmd/restic/cmd_version.go
rename to src/restic/cmd/restic/cmd_version.go
diff --git a/cmd/restic/doc.go b/src/restic/cmd/restic/doc.go
similarity index 100%
rename from cmd/restic/doc.go
rename to src/restic/cmd/restic/doc.go
diff --git a/cmd/restic/global.go b/src/restic/cmd/restic/global.go
similarity index 96%
rename from cmd/restic/global.go
rename to src/restic/cmd/restic/global.go
index 09ce319ab..b86138f29 100644
--- a/cmd/restic/global.go
+++ b/src/restic/cmd/restic/global.go
@@ -9,14 +9,14 @@ import (
 	"syscall"
 
 	"github.com/jessevdk/go-flags"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/backend/local"
-	"github.com/restic/restic/backend/s3"
-	"github.com/restic/restic/backend/sftp"
-	"github.com/restic/restic/debug"
-	"github.com/restic/restic/location"
-	"github.com/restic/restic/repository"
 	"golang.org/x/crypto/ssh/terminal"
+	"restic/backend"
+	"restic/backend/local"
+	"restic/backend/s3"
+	"restic/backend/sftp"
+	"restic/debug"
+	"restic/location"
+	"restic/repository"
 )
 
 var version = "compiled manually"
diff --git a/cmd/restic/integration_fuse_test.go b/src/restic/cmd/restic/integration_fuse_test.go
similarity index 96%
rename from cmd/restic/integration_fuse_test.go
rename to src/restic/cmd/restic/integration_fuse_test.go
index 1e696706b..6688770e4 100644
--- a/cmd/restic/integration_fuse_test.go
+++ b/src/restic/cmd/restic/integration_fuse_test.go
@@ -11,10 +11,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/restic/restic"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/repository"
-	. "github.com/restic/restic/test"
+	"restic"
+	"restic/backend"
+	"restic/repository"
+	. "restic/test"
 )
 
 const (
diff --git a/cmd/restic/integration_helpers_test.go b/src/restic/cmd/restic/integration_helpers_test.go
similarity index 99%
rename from cmd/restic/integration_helpers_test.go
rename to src/restic/cmd/restic/integration_helpers_test.go
index b3bada889..d6615f6b0 100644
--- a/cmd/restic/integration_helpers_test.go
+++ b/src/restic/cmd/restic/integration_helpers_test.go
@@ -8,7 +8,7 @@ import (
 	"runtime"
 	"testing"
 
-	. "github.com/restic/restic/test"
+	. "restic/test"
 )
 
 type dirEntry struct {
diff --git a/cmd/restic/integration_helpers_unix_test.go b/src/restic/cmd/restic/integration_helpers_unix_test.go
similarity index 100%
rename from cmd/restic/integration_helpers_unix_test.go
rename to src/restic/cmd/restic/integration_helpers_unix_test.go
diff --git a/cmd/restic/integration_helpers_windows_test.go b/src/restic/cmd/restic/integration_helpers_windows_test.go
similarity index 100%
rename from cmd/restic/integration_helpers_windows_test.go
rename to src/restic/cmd/restic/integration_helpers_windows_test.go
diff --git a/cmd/restic/integration_test.go b/src/restic/cmd/restic/integration_test.go
similarity index 99%
rename from cmd/restic/integration_test.go
rename to src/restic/cmd/restic/integration_test.go
index bc734bf0a..aa0408c20 100644
--- a/cmd/restic/integration_test.go
+++ b/src/restic/cmd/restic/integration_test.go
@@ -15,11 +15,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/debug"
-	"github.com/restic/restic/filter"
-	"github.com/restic/restic/repository"
-	. "github.com/restic/restic/test"
+	"restic/backend"
+	"restic/debug"
+	"restic/filter"
+	"restic/repository"
+	. "restic/test"
 )
 
 func parseIDsFromReader(t testing.TB, rd io.Reader) backend.IDs {
diff --git a/cmd/restic/lock.go b/src/restic/cmd/restic/lock.go
similarity index 96%
rename from cmd/restic/lock.go
rename to src/restic/cmd/restic/lock.go
index ec4368003..283545e6e 100644
--- a/cmd/restic/lock.go
+++ b/src/restic/cmd/restic/lock.go
@@ -6,9 +6,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/restic/restic"
-	"github.com/restic/restic/debug"
-	"github.com/restic/restic/repository"
+	"restic"
+	"restic/debug"
+	"restic/repository"
 )
 
 var globalLocks struct {
diff --git a/cmd/restic/main.go b/src/restic/cmd/restic/main.go
similarity index 93%
rename from cmd/restic/main.go
rename to src/restic/cmd/restic/main.go
index 32598fe23..3fcce230f 100644
--- a/cmd/restic/main.go
+++ b/src/restic/cmd/restic/main.go
@@ -6,8 +6,8 @@ import (
 	"runtime"
 
 	"github.com/jessevdk/go-flags"
-	"github.com/restic/restic"
-	"github.com/restic/restic/debug"
+	"restic"
+	"restic/debug"
 )
 
 func init() {
diff --git a/cmd/restic/testdata/backup-data.tar.gz b/src/restic/cmd/restic/testdata/backup-data.tar.gz
similarity index 100%
rename from cmd/restic/testdata/backup-data.tar.gz
rename to src/restic/cmd/restic/testdata/backup-data.tar.gz
diff --git a/cmd/restic/testdata/old-index-repo.tar.gz b/src/restic/cmd/restic/testdata/old-index-repo.tar.gz
similarity index 100%
rename from cmd/restic/testdata/old-index-repo.tar.gz
rename to src/restic/cmd/restic/testdata/old-index-repo.tar.gz
diff --git a/cmd/restic/testdata/repo-restore-permissions-test.tar.gz b/src/restic/cmd/restic/testdata/repo-restore-permissions-test.tar.gz
similarity index 100%
rename from cmd/restic/testdata/repo-restore-permissions-test.tar.gz
rename to src/restic/cmd/restic/testdata/repo-restore-permissions-test.tar.gz
diff --git a/cmd/restic/testdata/small-repo.tar.gz b/src/restic/cmd/restic/testdata/small-repo.tar.gz
similarity index 100%
rename from cmd/restic/testdata/small-repo.tar.gz
rename to src/restic/cmd/restic/testdata/small-repo.tar.gz
diff --git a/crypto/buffer_pool.go b/src/restic/crypto/buffer_pool.go
similarity index 100%
rename from crypto/buffer_pool.go
rename to src/restic/crypto/buffer_pool.go
diff --git a/crypto/crypto.go b/src/restic/crypto/crypto.go
similarity index 100%
rename from crypto/crypto.go
rename to src/restic/crypto/crypto.go
diff --git a/crypto/crypto_int_test.go b/src/restic/crypto/crypto_int_test.go
similarity index 100%
rename from crypto/crypto_int_test.go
rename to src/restic/crypto/crypto_int_test.go
diff --git a/crypto/crypto_test.go b/src/restic/crypto/crypto_test.go
similarity index 99%
rename from crypto/crypto_test.go
rename to src/restic/crypto/crypto_test.go
index 311eb1835..f5e175f33 100644
--- a/crypto/crypto_test.go
+++ b/src/restic/crypto/crypto_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/restic/chunker"
-	"github.com/restic/restic/crypto"
-	. "github.com/restic/restic/test"
+	"restic/crypto"
+	. "restic/test"
 )
 
 const testLargeCrypto = false
diff --git a/crypto/doc.go b/src/restic/crypto/doc.go
similarity index 100%
rename from crypto/doc.go
rename to src/restic/crypto/doc.go
diff --git a/crypto/reader.go b/src/restic/crypto/reader.go
similarity index 100%
rename from crypto/reader.go
rename to src/restic/crypto/reader.go
diff --git a/crypto/writer.go b/src/restic/crypto/writer.go
similarity index 100%
rename from crypto/writer.go
rename to src/restic/crypto/writer.go
diff --git a/debug/debug.go b/src/restic/debug/debug.go
similarity index 100%
rename from debug/debug.go
rename to src/restic/debug/debug.go
diff --git a/debug/debug_release.go b/src/restic/debug/debug_release.go
similarity index 100%
rename from debug/debug_release.go
rename to src/restic/debug/debug_release.go
diff --git a/debug/doc.go b/src/restic/debug/doc.go
similarity index 100%
rename from debug/doc.go
rename to src/restic/debug/doc.go
diff --git a/debug/hooks.go b/src/restic/debug/hooks.go
similarity index 100%
rename from debug/hooks.go
rename to src/restic/debug/hooks.go
diff --git a/debug/hooks_release.go b/src/restic/debug/hooks_release.go
similarity index 100%
rename from debug/hooks_release.go
rename to src/restic/debug/hooks_release.go
diff --git a/doc.go b/src/restic/doc.go
similarity index 100%
rename from doc.go
rename to src/restic/doc.go
diff --git a/filter/doc.go b/src/restic/filter/doc.go
similarity index 100%
rename from filter/doc.go
rename to src/restic/filter/doc.go
diff --git a/filter/filter.go b/src/restic/filter/filter.go
similarity index 100%
rename from filter/filter.go
rename to src/restic/filter/filter.go
diff --git a/filter/filter_test.go b/src/restic/filter/filter_test.go
similarity index 99%
rename from filter/filter_test.go
rename to src/restic/filter/filter_test.go
index 15892e910..d44dc14e8 100644
--- a/filter/filter_test.go
+++ b/src/restic/filter/filter_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/restic/restic/filter"
+	"restic/filter"
 )
 
 var matchTests = []struct {
diff --git a/filter/testdata/libreoffice.txt.bz2 b/src/restic/filter/testdata/libreoffice.txt.bz2
similarity index 100%
rename from filter/testdata/libreoffice.txt.bz2
rename to src/restic/filter/testdata/libreoffice.txt.bz2
diff --git a/fuse/dir.go b/src/restic/fuse/dir.go
similarity index 97%
rename from fuse/dir.go
rename to src/restic/fuse/dir.go
index a8bfeba07..0289a982f 100644
--- a/fuse/dir.go
+++ b/src/restic/fuse/dir.go
@@ -10,8 +10,8 @@ import (
 	"bazil.org/fuse/fs"
 	"golang.org/x/net/context"
 
-	"github.com/restic/restic"
-	"github.com/restic/restic/repository"
+	"restic"
+	"restic/repository"
 )
 
 // Statically ensure that *dir implement those interface
diff --git a/fuse/file.go b/src/restic/fuse/file.go
similarity index 96%
rename from fuse/file.go
rename to src/restic/fuse/file.go
index 60e206fd5..ce7204249 100644
--- a/fuse/file.go
+++ b/src/restic/fuse/file.go
@@ -6,9 +6,9 @@ package fuse
 import (
 	"sync"
 
-	"github.com/restic/restic"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/pack"
+	"restic"
+	"restic/backend"
+	"restic/pack"
 
 	"bazil.org/fuse"
 	"bazil.org/fuse/fs"
diff --git a/fuse/file_test.go b/src/restic/fuse/file_test.go
similarity index 96%
rename from fuse/file_test.go
rename to src/restic/fuse/file_test.go
index 7abeac7c2..b334f0bc6 100644
--- a/fuse/file_test.go
+++ b/src/restic/fuse/file_test.go
@@ -12,10 +12,10 @@ import (
 
 	"bazil.org/fuse"
 
-	"github.com/restic/restic"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/pack"
-	. "github.com/restic/restic/test"
+	"restic"
+	"restic/backend"
+	"restic/pack"
+	. "restic/test"
 )
 
 type MockRepo struct {
diff --git a/fuse/fuse.go b/src/restic/fuse/fuse.go
similarity index 90%
rename from fuse/fuse.go
rename to src/restic/fuse/fuse.go
index da64f3938..6ef3e48cc 100644
--- a/fuse/fuse.go
+++ b/src/restic/fuse/fuse.go
@@ -6,7 +6,7 @@ package fuse
 import (
 	"encoding/binary"
 
-	"github.com/restic/restic/backend"
+	"restic/backend"
 )
 
 // inodeFromBackendId returns a unique uint64 from a backend id.
diff --git a/fuse/link.go b/src/restic/fuse/link.go
similarity index 92%
rename from fuse/link.go
rename to src/restic/fuse/link.go
index f963b5832..1cf02df0f 100644
--- a/fuse/link.go
+++ b/src/restic/fuse/link.go
@@ -6,9 +6,9 @@ package fuse
 import (
 	"bazil.org/fuse"
 	"bazil.org/fuse/fs"
-	"github.com/restic/restic"
-	"github.com/restic/restic/repository"
 	"golang.org/x/net/context"
+	"restic"
+	"restic/repository"
 )
 
 // Statically ensure that *file implements the given interface
diff --git a/fuse/snapshot.go b/src/restic/fuse/snapshot.go
similarity index 96%
rename from fuse/snapshot.go
rename to src/restic/fuse/snapshot.go
index 80476cc78..162873d84 100644
--- a/fuse/snapshot.go
+++ b/src/restic/fuse/snapshot.go
@@ -11,9 +11,9 @@ import (
 	"bazil.org/fuse"
 	"bazil.org/fuse/fs"
 
-	"github.com/restic/restic"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/repository"
+	"restic"
+	"restic/backend"
+	"restic/repository"
 
 	"golang.org/x/net/context"
 )
diff --git a/location/location.go b/src/restic/location/location.go
similarity index 92%
rename from location/location.go
rename to src/restic/location/location.go
index 1f3aba1a4..8e4a8f1e2 100644
--- a/location/location.go
+++ b/src/restic/location/location.go
@@ -4,9 +4,9 @@ package location
 import (
 	"strings"
 
-	"github.com/restic/restic/backend/local"
-	"github.com/restic/restic/backend/s3"
-	"github.com/restic/restic/backend/sftp"
+	"restic/backend/local"
+	"restic/backend/s3"
+	"restic/backend/sftp"
 )
 
 // Location specifies the location of a repository, including the method of
diff --git a/location/location_test.go b/src/restic/location/location_test.go
similarity index 97%
rename from location/location_test.go
rename to src/restic/location/location_test.go
index ef827dcdd..8d9046348 100644
--- a/location/location_test.go
+++ b/src/restic/location/location_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/restic/restic/backend/s3"
-	"github.com/restic/restic/backend/sftp"
+	"restic/backend/s3"
+	"restic/backend/sftp"
 )
 
 var parseTests = []struct {
diff --git a/lock.go b/src/restic/lock.go
similarity index 98%
rename from lock.go
rename to src/restic/lock.go
index c305e19e2..ed1593444 100644
--- a/lock.go
+++ b/src/restic/lock.go
@@ -9,9 +9,9 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/debug"
-	"github.com/restic/restic/repository"
+	"restic/backend"
+	"restic/debug"
+	"restic/repository"
 )
 
 // Lock represents a process locking the repository for an operation.
diff --git a/lock_test.go b/src/restic/lock_test.go
similarity index 97%
rename from lock_test.go
rename to src/restic/lock_test.go
index 6890c44da..da8fb7a40 100644
--- a/lock_test.go
+++ b/src/restic/lock_test.go
@@ -5,10 +5,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/restic/restic"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/repository"
-	. "github.com/restic/restic/test"
+	"restic"
+	"restic/backend"
+	"restic/repository"
+	. "restic/test"
 )
 
 func TestLock(t *testing.T) {
diff --git a/lock_unix.go b/src/restic/lock_unix.go
similarity index 96%
rename from lock_unix.go
rename to src/restic/lock_unix.go
index aaf0cfdd5..04395c9a6 100644
--- a/lock_unix.go
+++ b/src/restic/lock_unix.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"syscall"
 
-	"github.com/restic/restic/debug"
+	"restic/debug"
 )
 
 // uidGidInt returns uid, gid of the user as a number.
diff --git a/lock_windows.go b/src/restic/lock_windows.go
similarity index 93%
rename from lock_windows.go
rename to src/restic/lock_windows.go
index fc700a9b5..4db91e09f 100644
--- a/lock_windows.go
+++ b/src/restic/lock_windows.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"os/user"
 
-	"github.com/restic/restic/debug"
+	"restic/debug"
 )
 
 // uidGidInt always returns 0 on Windows, since uid isn't numbers
diff --git a/node.go b/src/restic/node.go
similarity index 98%
rename from node.go
rename to src/restic/node.go
index 579027b87..38c21b204 100644
--- a/node.go
+++ b/src/restic/node.go
@@ -13,10 +13,10 @@ import (
 	"runtime"
 
 	"github.com/juju/errors"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/debug"
-	"github.com/restic/restic/pack"
-	"github.com/restic/restic/repository"
+	"restic/backend"
+	"restic/debug"
+	"restic/pack"
+	"restic/repository"
 )
 
 // Node is a file, directory or other item in a backup.
diff --git a/node_darwin.go b/src/restic/node_darwin.go
similarity index 100%
rename from node_darwin.go
rename to src/restic/node_darwin.go
diff --git a/node_freebsd.go b/src/restic/node_freebsd.go
similarity index 100%
rename from node_freebsd.go
rename to src/restic/node_freebsd.go
diff --git a/node_linux.go b/src/restic/node_linux.go
similarity index 100%
rename from node_linux.go
rename to src/restic/node_linux.go
diff --git a/node_openbsd.go b/src/restic/node_openbsd.go
similarity index 100%
rename from node_openbsd.go
rename to src/restic/node_openbsd.go
diff --git a/node_test.go b/src/restic/node_test.go
similarity index 98%
rename from node_test.go
rename to src/restic/node_test.go
index 57bd6f550..e3b458c47 100644
--- a/node_test.go
+++ b/src/restic/node_test.go
@@ -8,9 +8,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/restic/restic"
-	"github.com/restic/restic/backend"
-	. "github.com/restic/restic/test"
+	"restic"
+	"restic/backend"
+	. "restic/test"
 )
 
 func BenchmarkNodeFillUser(t *testing.B) {
diff --git a/node_unix.go b/src/restic/node_unix.go
similarity index 100%
rename from node_unix.go
rename to src/restic/node_unix.go
diff --git a/node_windows.go b/src/restic/node_windows.go
similarity index 100%
rename from node_windows.go
rename to src/restic/node_windows.go
diff --git a/pack/doc.go b/src/restic/pack/doc.go
similarity index 100%
rename from pack/doc.go
rename to src/restic/pack/doc.go
diff --git a/pack/pack.go b/src/restic/pack/pack.go
similarity index 98%
rename from pack/pack.go
rename to src/restic/pack/pack.go
index 8a96a942d..7aa8360be 100644
--- a/pack/pack.go
+++ b/src/restic/pack/pack.go
@@ -8,8 +8,8 @@ import (
 	"io"
 	"sync"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/crypto"
+	"restic/backend"
+	"restic/crypto"
 )
 
 // BlobType specifies what a blob stored in a pack is.
diff --git a/pack/pack_test.go b/src/restic/pack/pack_test.go
similarity index 93%
rename from pack/pack_test.go
rename to src/restic/pack/pack_test.go
index 0d5c1f155..97075d52d 100644
--- a/pack/pack_test.go
+++ b/src/restic/pack/pack_test.go
@@ -10,10 +10,10 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/crypto"
-	"github.com/restic/restic/pack"
-	. "github.com/restic/restic/test"
+	"restic/backend"
+	"restic/crypto"
+	"restic/pack"
+	. "restic/test"
 )
 
 var lengths = []int{23, 31650, 25860, 10928, 13769, 19862, 5211, 127, 13690, 30231}
diff --git a/pipe/doc.go b/src/restic/pipe/doc.go
similarity index 100%
rename from pipe/doc.go
rename to src/restic/pipe/doc.go
diff --git a/pipe/pipe.go b/src/restic/pipe/pipe.go
similarity index 99%
rename from pipe/pipe.go
rename to src/restic/pipe/pipe.go
index 45bb8a905..e46adc8a4 100644
--- a/pipe/pipe.go
+++ b/src/restic/pipe/pipe.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"sort"
 
-	"github.com/restic/restic/debug"
+	"restic/debug"
 )
 
 type Result interface{}
diff --git a/pipe/pipe_test.go b/src/restic/pipe/pipe_test.go
similarity index 99%
rename from pipe/pipe_test.go
rename to src/restic/pipe/pipe_test.go
index 2f43fac81..719670aaa 100644
--- a/pipe/pipe_test.go
+++ b/src/restic/pipe/pipe_test.go
@@ -9,9 +9,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/restic/restic/debug"
-	"github.com/restic/restic/pipe"
-	. "github.com/restic/restic/test"
+	"restic/debug"
+	"restic/pipe"
+	. "restic/test"
 )
 
 func isFile(fi os.FileInfo) bool {
diff --git a/progress.go b/src/restic/progress.go
similarity index 100%
rename from progress.go
rename to src/restic/progress.go
diff --git a/repository/blob.go b/src/restic/repository/blob.go
similarity index 95%
rename from repository/blob.go
rename to src/restic/repository/blob.go
index 232cb613c..13cb022d1 100644
--- a/repository/blob.go
+++ b/src/restic/repository/blob.go
@@ -3,7 +3,7 @@ package repository
 import (
 	"fmt"
 
-	"github.com/restic/restic/backend"
+	"restic/backend"
 )
 
 type Blob struct {
diff --git a/repository/config.go b/src/restic/repository/config.go
similarity index 96%
rename from repository/config.go
rename to src/restic/repository/config.go
index 91163359d..a41517f3c 100644
--- a/repository/config.go
+++ b/src/restic/repository/config.go
@@ -8,8 +8,8 @@ import (
 	"io"
 
 	"github.com/restic/chunker"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/debug"
+	"restic/backend"
+	"restic/debug"
 )
 
 // Config contains the configuration for a repository.
diff --git a/repository/config_test.go b/src/restic/repository/config_test.go
similarity index 91%
rename from repository/config_test.go
rename to src/restic/repository/config_test.go
index 3b5dc381d..10fc61d94 100644
--- a/repository/config_test.go
+++ b/src/restic/repository/config_test.go
@@ -3,9 +3,9 @@ package repository_test
 import (
 	"testing"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/repository"
-	. "github.com/restic/restic/test"
+	"restic/backend"
+	"restic/repository"
+	. "restic/test"
 )
 
 type saver func(backend.Type, interface{}) (backend.ID, error)
diff --git a/repository/doc.go b/src/restic/repository/doc.go
similarity index 100%
rename from repository/doc.go
rename to src/restic/repository/doc.go
diff --git a/repository/index.go b/src/restic/repository/index.go
similarity index 99%
rename from repository/index.go
rename to src/restic/repository/index.go
index 87a53c8ac..c5c75a403 100644
--- a/repository/index.go
+++ b/src/restic/repository/index.go
@@ -9,10 +9,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/crypto"
-	"github.com/restic/restic/debug"
-	"github.com/restic/restic/pack"
+	"restic/backend"
+	"restic/crypto"
+	"restic/debug"
+	"restic/pack"
 )
 
 // Index holds a lookup table for id -> pack.
diff --git a/repository/index_test.go b/src/restic/repository/index_test.go
similarity index 98%
rename from repository/index_test.go
rename to src/restic/repository/index_test.go
index 2e8a51e84..0fafc409c 100644
--- a/repository/index_test.go
+++ b/src/restic/repository/index_test.go
@@ -6,10 +6,10 @@ import (
 	"io"
 	"testing"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/pack"
-	"github.com/restic/restic/repository"
-	. "github.com/restic/restic/test"
+	"restic/backend"
+	"restic/pack"
+	"restic/repository"
+	. "restic/test"
 )
 
 func randomID() backend.ID {
diff --git a/repository/key.go b/src/restic/repository/key.go
similarity index 97%
rename from repository/key.go
rename to src/restic/repository/key.go
index c44b43710..42c5a591a 100644
--- a/repository/key.go
+++ b/src/restic/repository/key.go
@@ -9,9 +9,9 @@ import (
 	"os/user"
 	"time"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/crypto"
-	"github.com/restic/restic/debug"
+	"restic/backend"
+	"restic/crypto"
+	"restic/debug"
 )
 
 var (
diff --git a/repository/master_index.go b/src/restic/repository/master_index.go
similarity index 98%
rename from repository/master_index.go
rename to src/restic/repository/master_index.go
index 432754c53..5fcf63378 100644
--- a/repository/master_index.go
+++ b/src/restic/repository/master_index.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/debug"
-	"github.com/restic/restic/pack"
+	"restic/backend"
+	"restic/debug"
+	"restic/pack"
 )
 
 // MasterIndex is a collection of indexes and IDs of chunks that are in the process of being saved.
diff --git a/repository/packer_manager.go b/src/restic/repository/packer_manager.go
similarity index 94%
rename from repository/packer_manager.go
rename to src/restic/repository/packer_manager.go
index 4e9ea4bc0..51a8ae888 100644
--- a/repository/packer_manager.go
+++ b/src/restic/repository/packer_manager.go
@@ -4,10 +4,10 @@ import (
 	"sync"
 
 	"github.com/restic/chunker"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/crypto"
-	"github.com/restic/restic/debug"
-	"github.com/restic/restic/pack"
+	"restic/backend"
+	"restic/crypto"
+	"restic/debug"
+	"restic/pack"
 )
 
 // packerManager keeps a list of open packs and creates new on demand.
diff --git a/repository/parallel.go b/src/restic/repository/parallel.go
similarity index 98%
rename from repository/parallel.go
rename to src/restic/repository/parallel.go
index 19ba567c5..ff659f1fe 100644
--- a/repository/parallel.go
+++ b/src/restic/repository/parallel.go
@@ -3,7 +3,7 @@ package repository
 import (
 	"sync"
 
-	"github.com/restic/restic/backend"
+	"restic/backend"
 )
 
 func closeIfOpen(ch chan struct{}) {
diff --git a/repository/parallel_test.go b/src/restic/repository/parallel_test.go
similarity index 97%
rename from repository/parallel_test.go
rename to src/restic/repository/parallel_test.go
index fb33e8677..dfcce0a15 100644
--- a/repository/parallel_test.go
+++ b/src/restic/repository/parallel_test.go
@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/repository"
-	. "github.com/restic/restic/test"
+	"restic/backend"
+	"restic/repository"
+	. "restic/test"
 )
 
 type testIDs []string
diff --git a/repository/pool.go b/src/restic/repository/pool.go
similarity index 100%
rename from repository/pool.go
rename to src/restic/repository/pool.go
diff --git a/repository/repository.go b/src/restic/repository/repository.go
similarity index 99%
rename from repository/repository.go
rename to src/restic/repository/repository.go
index 27fe5d9c6..cc34682e8 100644
--- a/repository/repository.go
+++ b/src/restic/repository/repository.go
@@ -9,10 +9,10 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/crypto"
-	"github.com/restic/restic/debug"
-	"github.com/restic/restic/pack"
+	"restic/backend"
+	"restic/crypto"
+	"restic/debug"
+	"restic/pack"
 )
 
 // Repository is used to access a repository in a backend.
diff --git a/repository/repository_test.go b/src/restic/repository/repository_test.go
similarity index 97%
rename from repository/repository_test.go
rename to src/restic/repository/repository_test.go
index 81378742b..3ca9582df 100644
--- a/repository/repository_test.go
+++ b/src/restic/repository/repository_test.go
@@ -10,11 +10,11 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/restic/restic"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/pack"
-	"github.com/restic/restic/repository"
-	. "github.com/restic/restic/test"
+	"restic"
+	"restic/backend"
+	"restic/pack"
+	"restic/repository"
+	. "restic/test"
 )
 
 type testJSONStruct struct {
diff --git a/repository/testdata/test-repo.tar.gz b/src/restic/repository/testdata/test-repo.tar.gz
similarity index 100%
rename from repository/testdata/test-repo.tar.gz
rename to src/restic/repository/testdata/test-repo.tar.gz
diff --git a/restorer.go b/src/restic/restorer.go
similarity index 96%
rename from restorer.go
rename to src/restic/restorer.go
index d9c6ba0e3..a093b5e40 100644
--- a/restorer.go
+++ b/src/restic/restorer.go
@@ -5,9 +5,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/debug"
-	"github.com/restic/restic/repository"
+	"restic/backend"
+	"restic/debug"
+	"restic/repository"
 
 	"github.com/juju/errors"
 )
diff --git a/snapshot.go b/src/restic/snapshot.go
similarity index 96%
rename from snapshot.go
rename to src/restic/snapshot.go
index 91c40a62d..6b4e87298 100644
--- a/snapshot.go
+++ b/src/restic/snapshot.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/repository"
+	"restic/backend"
+	"restic/repository"
 )
 
 type Snapshot struct {
diff --git a/snapshot_test.go b/src/restic/snapshot_test.go
similarity index 72%
rename from snapshot_test.go
rename to src/restic/snapshot_test.go
index 649e9a1f4..35474eb2b 100644
--- a/snapshot_test.go
+++ b/src/restic/snapshot_test.go
@@ -3,8 +3,8 @@ package restic_test
 import (
 	"testing"
 
-	"github.com/restic/restic"
-	. "github.com/restic/restic/test"
+	"restic"
+	. "restic/test"
 )
 
 func TestNewSnapshot(t *testing.T) {
diff --git a/test/backend.go b/src/restic/test/backend.go
similarity index 93%
rename from test/backend.go
rename to src/restic/test/backend.go
index 4da1f24f9..ca9ee45b0 100644
--- a/test/backend.go
+++ b/src/restic/test/backend.go
@@ -7,10 +7,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/restic/restic"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/backend/local"
-	"github.com/restic/restic/repository"
+	"restic"
+	"restic/backend"
+	"restic/backend/local"
+	"restic/repository"
 )
 
 var (
diff --git a/test/doc.go b/src/restic/test/doc.go
similarity index 100%
rename from test/doc.go
rename to src/restic/test/doc.go
diff --git a/test/helpers.go b/src/restic/test/helpers.go
similarity index 97%
rename from test/helpers.go
rename to src/restic/test/helpers.go
index 636dddd8f..4c3280fba 100644
--- a/test/helpers.go
+++ b/src/restic/test/helpers.go
@@ -16,9 +16,9 @@ import (
 
 	mrand "math/rand"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/backend/local"
-	"github.com/restic/restic/repository"
+	"restic/backend"
+	"restic/backend/local"
+	"restic/repository"
 )
 
 // Assert fails the test if the condition is false.
diff --git a/testdata/walktree-test-repo.tar.gz b/src/restic/testdata/walktree-test-repo.tar.gz
similarity index 100%
rename from testdata/walktree-test-repo.tar.gz
rename to src/restic/testdata/walktree-test-repo.tar.gz
diff --git a/tree.go b/src/restic/tree.go
similarity index 95%
rename from tree.go
rename to src/restic/tree.go
index b4d340ee2..067dc6b7e 100644
--- a/tree.go
+++ b/src/restic/tree.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/debug"
-	"github.com/restic/restic/pack"
+	"restic/backend"
+	"restic/debug"
+	"restic/pack"
 )
 
 type Tree struct {
diff --git a/tree_test.go b/src/restic/tree_test.go
similarity index 95%
rename from tree_test.go
rename to src/restic/tree_test.go
index ad8f7f5fa..2f85819fb 100644
--- a/tree_test.go
+++ b/src/restic/tree_test.go
@@ -7,9 +7,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/restic/restic"
-	"github.com/restic/restic/pack"
-	. "github.com/restic/restic/test"
+	"restic"
+	"restic/pack"
+	. "restic/test"
 )
 
 var testFiles = []struct {
diff --git a/walk.go b/src/restic/walk.go
similarity index 97%
rename from walk.go
rename to src/restic/walk.go
index 699a60071..2978e8500 100644
--- a/walk.go
+++ b/src/restic/walk.go
@@ -6,9 +6,9 @@ import (
 	"path/filepath"
 	"sync"
 
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/debug"
-	"github.com/restic/restic/pack"
+	"restic/backend"
+	"restic/debug"
+	"restic/pack"
 )
 
 // WalkTreeJob is a job sent from the tree walker.
diff --git a/walk_test.go b/src/restic/walk_test.go
similarity index 99%
rename from walk_test.go
rename to src/restic/walk_test.go
index 43cb9c24d..cce0e2300 100644
--- a/walk_test.go
+++ b/src/restic/walk_test.go
@@ -7,12 +7,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/restic/restic"
-	"github.com/restic/restic/backend"
-	"github.com/restic/restic/pack"
-	"github.com/restic/restic/pipe"
-	"github.com/restic/restic/repository"
-	. "github.com/restic/restic/test"
+	"restic"
+	"restic/backend"
+	"restic/pack"
+	"restic/pipe"
+	"restic/repository"
+	. "restic/test"
 )
 
 func TestWalkTree(t *testing.T) {
diff --git a/Godeps/_workspace/src/bazil.org/fuse/.gitattributes b/vendor/src/bazil.org/fuse/.gitattributes
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/.gitattributes
rename to vendor/src/bazil.org/fuse/.gitattributes
diff --git a/Godeps/_workspace/src/bazil.org/fuse/.gitignore b/vendor/src/bazil.org/fuse/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/.gitignore
rename to vendor/src/bazil.org/fuse/.gitignore
diff --git a/Godeps/_workspace/src/bazil.org/fuse/LICENSE b/vendor/src/bazil.org/fuse/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/LICENSE
rename to vendor/src/bazil.org/fuse/LICENSE
diff --git a/Godeps/_workspace/src/bazil.org/fuse/README.md b/vendor/src/bazil.org/fuse/README.md
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/README.md
rename to vendor/src/bazil.org/fuse/README.md
diff --git a/Godeps/_workspace/src/bazil.org/fuse/buffer.go b/vendor/src/bazil.org/fuse/buffer.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/buffer.go
rename to vendor/src/bazil.org/fuse/buffer.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/debug.go b/vendor/src/bazil.org/fuse/debug.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/debug.go
rename to vendor/src/bazil.org/fuse/debug.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/doc/.gitignore b/vendor/src/bazil.org/fuse/doc/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/doc/.gitignore
rename to vendor/src/bazil.org/fuse/doc/.gitignore
diff --git a/Godeps/_workspace/src/bazil.org/fuse/doc/README.md b/vendor/src/bazil.org/fuse/doc/README.md
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/doc/README.md
rename to vendor/src/bazil.org/fuse/doc/README.md
diff --git a/Godeps/_workspace/src/bazil.org/fuse/doc/mount-linux-error-init.seq b/vendor/src/bazil.org/fuse/doc/mount-linux-error-init.seq
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/doc/mount-linux-error-init.seq
rename to vendor/src/bazil.org/fuse/doc/mount-linux-error-init.seq
diff --git a/Godeps/_workspace/src/bazil.org/fuse/doc/mount-linux-error-init.seq.png b/vendor/src/bazil.org/fuse/doc/mount-linux-error-init.seq.png
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/doc/mount-linux-error-init.seq.png
rename to vendor/src/bazil.org/fuse/doc/mount-linux-error-init.seq.png
diff --git a/Godeps/_workspace/src/bazil.org/fuse/doc/mount-linux.seq b/vendor/src/bazil.org/fuse/doc/mount-linux.seq
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/doc/mount-linux.seq
rename to vendor/src/bazil.org/fuse/doc/mount-linux.seq
diff --git a/Godeps/_workspace/src/bazil.org/fuse/doc/mount-linux.seq.png b/vendor/src/bazil.org/fuse/doc/mount-linux.seq.png
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/doc/mount-linux.seq.png
rename to vendor/src/bazil.org/fuse/doc/mount-linux.seq.png
diff --git a/Godeps/_workspace/src/bazil.org/fuse/doc/mount-osx-error-init.seq b/vendor/src/bazil.org/fuse/doc/mount-osx-error-init.seq
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/doc/mount-osx-error-init.seq
rename to vendor/src/bazil.org/fuse/doc/mount-osx-error-init.seq
diff --git a/Godeps/_workspace/src/bazil.org/fuse/doc/mount-osx-error-init.seq.png b/vendor/src/bazil.org/fuse/doc/mount-osx-error-init.seq.png
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/doc/mount-osx-error-init.seq.png
rename to vendor/src/bazil.org/fuse/doc/mount-osx-error-init.seq.png
diff --git a/Godeps/_workspace/src/bazil.org/fuse/doc/mount-osx.seq b/vendor/src/bazil.org/fuse/doc/mount-osx.seq
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/doc/mount-osx.seq
rename to vendor/src/bazil.org/fuse/doc/mount-osx.seq
diff --git a/Godeps/_workspace/src/bazil.org/fuse/doc/mount-osx.seq.png b/vendor/src/bazil.org/fuse/doc/mount-osx.seq.png
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/doc/mount-osx.seq.png
rename to vendor/src/bazil.org/fuse/doc/mount-osx.seq.png
diff --git a/Godeps/_workspace/src/bazil.org/fuse/doc/mount-sequence.md b/vendor/src/bazil.org/fuse/doc/mount-sequence.md
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/doc/mount-sequence.md
rename to vendor/src/bazil.org/fuse/doc/mount-sequence.md
diff --git a/Godeps/_workspace/src/bazil.org/fuse/doc/writing-docs.md b/vendor/src/bazil.org/fuse/doc/writing-docs.md
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/doc/writing-docs.md
rename to vendor/src/bazil.org/fuse/doc/writing-docs.md
diff --git a/Godeps/_workspace/src/bazil.org/fuse/error_darwin.go b/vendor/src/bazil.org/fuse/error_darwin.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/error_darwin.go
rename to vendor/src/bazil.org/fuse/error_darwin.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/error_freebsd.go b/vendor/src/bazil.org/fuse/error_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/error_freebsd.go
rename to vendor/src/bazil.org/fuse/error_freebsd.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/error_linux.go b/vendor/src/bazil.org/fuse/error_linux.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/error_linux.go
rename to vendor/src/bazil.org/fuse/error_linux.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/error_std.go b/vendor/src/bazil.org/fuse/error_std.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/error_std.go
rename to vendor/src/bazil.org/fuse/error_std.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/examples/clockfs/clockfs.go b/vendor/src/bazil.org/fuse/examples/clockfs/clockfs.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/examples/clockfs/clockfs.go
rename to vendor/src/bazil.org/fuse/examples/clockfs/clockfs.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/examples/hellofs/hello.go b/vendor/src/bazil.org/fuse/examples/hellofs/hello.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/examples/hellofs/hello.go
rename to vendor/src/bazil.org/fuse/examples/hellofs/hello.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fs/bench/bench_test.go b/vendor/src/bazil.org/fuse/fs/bench/bench_test.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fs/bench/bench_test.go
rename to vendor/src/bazil.org/fuse/fs/bench/bench_test.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fs/bench/doc.go b/vendor/src/bazil.org/fuse/fs/bench/doc.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fs/bench/doc.go
rename to vendor/src/bazil.org/fuse/fs/bench/doc.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/debug.go b/vendor/src/bazil.org/fuse/fs/fstestutil/debug.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/debug.go
rename to vendor/src/bazil.org/fuse/fs/fstestutil/debug.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/doc.go b/vendor/src/bazil.org/fuse/fs/fstestutil/doc.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/doc.go
rename to vendor/src/bazil.org/fuse/fs/fstestutil/doc.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/mounted.go b/vendor/src/bazil.org/fuse/fs/fstestutil/mounted.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/mounted.go
rename to vendor/src/bazil.org/fuse/fs/fstestutil/mounted.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/mountinfo.go b/vendor/src/bazil.org/fuse/fs/fstestutil/mountinfo.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/mountinfo.go
rename to vendor/src/bazil.org/fuse/fs/fstestutil/mountinfo.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/mountinfo_darwin.go b/vendor/src/bazil.org/fuse/fs/fstestutil/mountinfo_darwin.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/mountinfo_darwin.go
rename to vendor/src/bazil.org/fuse/fs/fstestutil/mountinfo_darwin.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/mountinfo_freebsd.go b/vendor/src/bazil.org/fuse/fs/fstestutil/mountinfo_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/mountinfo_freebsd.go
rename to vendor/src/bazil.org/fuse/fs/fstestutil/mountinfo_freebsd.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/mountinfo_linux.go b/vendor/src/bazil.org/fuse/fs/fstestutil/mountinfo_linux.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/mountinfo_linux.go
rename to vendor/src/bazil.org/fuse/fs/fstestutil/mountinfo_linux.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/buffer.go b/vendor/src/bazil.org/fuse/fs/fstestutil/record/buffer.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/buffer.go
rename to vendor/src/bazil.org/fuse/fs/fstestutil/record/buffer.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/record.go b/vendor/src/bazil.org/fuse/fs/fstestutil/record/record.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/record.go
rename to vendor/src/bazil.org/fuse/fs/fstestutil/record/record.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/wait.go b/vendor/src/bazil.org/fuse/fs/fstestutil/record/wait.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/wait.go
rename to vendor/src/bazil.org/fuse/fs/fstestutil/record/wait.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/testfs.go b/vendor/src/bazil.org/fuse/fs/fstestutil/testfs.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/testfs.go
rename to vendor/src/bazil.org/fuse/fs/fstestutil/testfs.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fs/helpers_test.go b/vendor/src/bazil.org/fuse/fs/helpers_test.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fs/helpers_test.go
rename to vendor/src/bazil.org/fuse/fs/helpers_test.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fs/serve.go b/vendor/src/bazil.org/fuse/fs/serve.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fs/serve.go
rename to vendor/src/bazil.org/fuse/fs/serve.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fs/serve_test.go b/vendor/src/bazil.org/fuse/fs/serve_test.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fs/serve_test.go
rename to vendor/src/bazil.org/fuse/fs/serve_test.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fs/tree.go b/vendor/src/bazil.org/fuse/fs/tree.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fs/tree.go
rename to vendor/src/bazil.org/fuse/fs/tree.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fuse.go b/vendor/src/bazil.org/fuse/fuse.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fuse.go
rename to vendor/src/bazil.org/fuse/fuse.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fuse_kernel.go b/vendor/src/bazil.org/fuse/fuse_kernel.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fuse_kernel.go
rename to vendor/src/bazil.org/fuse/fuse_kernel.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fuse_kernel_darwin.go b/vendor/src/bazil.org/fuse/fuse_kernel_darwin.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fuse_kernel_darwin.go
rename to vendor/src/bazil.org/fuse/fuse_kernel_darwin.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fuse_kernel_freebsd.go b/vendor/src/bazil.org/fuse/fuse_kernel_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fuse_kernel_freebsd.go
rename to vendor/src/bazil.org/fuse/fuse_kernel_freebsd.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fuse_kernel_linux.go b/vendor/src/bazil.org/fuse/fuse_kernel_linux.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fuse_kernel_linux.go
rename to vendor/src/bazil.org/fuse/fuse_kernel_linux.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fuse_kernel_std.go b/vendor/src/bazil.org/fuse/fuse_kernel_std.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fuse_kernel_std.go
rename to vendor/src/bazil.org/fuse/fuse_kernel_std.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fuse_kernel_test.go b/vendor/src/bazil.org/fuse/fuse_kernel_test.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fuse_kernel_test.go
rename to vendor/src/bazil.org/fuse/fuse_kernel_test.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fuseutil/fuseutil.go b/vendor/src/bazil.org/fuse/fuseutil/fuseutil.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/fuseutil/fuseutil.go
rename to vendor/src/bazil.org/fuse/fuseutil/fuseutil.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/mount_darwin.go b/vendor/src/bazil.org/fuse/mount_darwin.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/mount_darwin.go
rename to vendor/src/bazil.org/fuse/mount_darwin.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/mount_freebsd.go b/vendor/src/bazil.org/fuse/mount_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/mount_freebsd.go
rename to vendor/src/bazil.org/fuse/mount_freebsd.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/mount_linux.go b/vendor/src/bazil.org/fuse/mount_linux.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/mount_linux.go
rename to vendor/src/bazil.org/fuse/mount_linux.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/options.go b/vendor/src/bazil.org/fuse/options.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/options.go
rename to vendor/src/bazil.org/fuse/options.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/options_darwin.go b/vendor/src/bazil.org/fuse/options_darwin.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/options_darwin.go
rename to vendor/src/bazil.org/fuse/options_darwin.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/options_freebsd.go b/vendor/src/bazil.org/fuse/options_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/options_freebsd.go
rename to vendor/src/bazil.org/fuse/options_freebsd.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/options_helper_test.go b/vendor/src/bazil.org/fuse/options_helper_test.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/options_helper_test.go
rename to vendor/src/bazil.org/fuse/options_helper_test.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/options_linux.go b/vendor/src/bazil.org/fuse/options_linux.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/options_linux.go
rename to vendor/src/bazil.org/fuse/options_linux.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/options_nocomma_test.go b/vendor/src/bazil.org/fuse/options_nocomma_test.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/options_nocomma_test.go
rename to vendor/src/bazil.org/fuse/options_nocomma_test.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/options_test.go b/vendor/src/bazil.org/fuse/options_test.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/options_test.go
rename to vendor/src/bazil.org/fuse/options_test.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/protocol.go b/vendor/src/bazil.org/fuse/protocol.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/protocol.go
rename to vendor/src/bazil.org/fuse/protocol.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/syscallx/doc.go b/vendor/src/bazil.org/fuse/syscallx/doc.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/syscallx/doc.go
rename to vendor/src/bazil.org/fuse/syscallx/doc.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/syscallx/generate b/vendor/src/bazil.org/fuse/syscallx/generate
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/syscallx/generate
rename to vendor/src/bazil.org/fuse/syscallx/generate
diff --git a/Godeps/_workspace/src/bazil.org/fuse/syscallx/msync.go b/vendor/src/bazil.org/fuse/syscallx/msync.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/syscallx/msync.go
rename to vendor/src/bazil.org/fuse/syscallx/msync.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/syscallx/msync_386.go b/vendor/src/bazil.org/fuse/syscallx/msync_386.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/syscallx/msync_386.go
rename to vendor/src/bazil.org/fuse/syscallx/msync_386.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/syscallx/msync_amd64.go b/vendor/src/bazil.org/fuse/syscallx/msync_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/syscallx/msync_amd64.go
rename to vendor/src/bazil.org/fuse/syscallx/msync_amd64.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/syscallx/syscallx.go b/vendor/src/bazil.org/fuse/syscallx/syscallx.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/syscallx/syscallx.go
rename to vendor/src/bazil.org/fuse/syscallx/syscallx.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/syscallx/syscallx_std.go b/vendor/src/bazil.org/fuse/syscallx/syscallx_std.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/syscallx/syscallx_std.go
rename to vendor/src/bazil.org/fuse/syscallx/syscallx_std.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/syscallx/xattr_darwin.go b/vendor/src/bazil.org/fuse/syscallx/xattr_darwin.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/syscallx/xattr_darwin.go
rename to vendor/src/bazil.org/fuse/syscallx/xattr_darwin.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/syscallx/xattr_darwin_386.go b/vendor/src/bazil.org/fuse/syscallx/xattr_darwin_386.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/syscallx/xattr_darwin_386.go
rename to vendor/src/bazil.org/fuse/syscallx/xattr_darwin_386.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/syscallx/xattr_darwin_amd64.go b/vendor/src/bazil.org/fuse/syscallx/xattr_darwin_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/syscallx/xattr_darwin_amd64.go
rename to vendor/src/bazil.org/fuse/syscallx/xattr_darwin_amd64.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/unmount.go b/vendor/src/bazil.org/fuse/unmount.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/unmount.go
rename to vendor/src/bazil.org/fuse/unmount.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/unmount_linux.go b/vendor/src/bazil.org/fuse/unmount_linux.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/unmount_linux.go
rename to vendor/src/bazil.org/fuse/unmount_linux.go
diff --git a/Godeps/_workspace/src/bazil.org/fuse/unmount_std.go b/vendor/src/bazil.org/fuse/unmount_std.go
similarity index 100%
rename from Godeps/_workspace/src/bazil.org/fuse/unmount_std.go
rename to vendor/src/bazil.org/fuse/unmount_std.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/.travis.yml b/vendor/src/github.com/jessevdk/go-flags/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/.travis.yml
rename to vendor/src/github.com/jessevdk/go-flags/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/LICENSE b/vendor/src/github.com/jessevdk/go-flags/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/LICENSE
rename to vendor/src/github.com/jessevdk/go-flags/LICENSE
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/README.md b/vendor/src/github.com/jessevdk/go-flags/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/README.md
rename to vendor/src/github.com/jessevdk/go-flags/README.md
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/arg.go b/vendor/src/github.com/jessevdk/go-flags/arg.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/arg.go
rename to vendor/src/github.com/jessevdk/go-flags/arg.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/arg_test.go b/vendor/src/github.com/jessevdk/go-flags/arg_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/arg_test.go
rename to vendor/src/github.com/jessevdk/go-flags/arg_test.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/assert_test.go b/vendor/src/github.com/jessevdk/go-flags/assert_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/assert_test.go
rename to vendor/src/github.com/jessevdk/go-flags/assert_test.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/check_crosscompile.sh b/vendor/src/github.com/jessevdk/go-flags/check_crosscompile.sh
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/check_crosscompile.sh
rename to vendor/src/github.com/jessevdk/go-flags/check_crosscompile.sh
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/closest.go b/vendor/src/github.com/jessevdk/go-flags/closest.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/closest.go
rename to vendor/src/github.com/jessevdk/go-flags/closest.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/command.go b/vendor/src/github.com/jessevdk/go-flags/command.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/command.go
rename to vendor/src/github.com/jessevdk/go-flags/command.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/command_private.go b/vendor/src/github.com/jessevdk/go-flags/command_private.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/command_private.go
rename to vendor/src/github.com/jessevdk/go-flags/command_private.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/command_test.go b/vendor/src/github.com/jessevdk/go-flags/command_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/command_test.go
rename to vendor/src/github.com/jessevdk/go-flags/command_test.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/completion.go b/vendor/src/github.com/jessevdk/go-flags/completion.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/completion.go
rename to vendor/src/github.com/jessevdk/go-flags/completion.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/completion_test.go b/vendor/src/github.com/jessevdk/go-flags/completion_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/completion_test.go
rename to vendor/src/github.com/jessevdk/go-flags/completion_test.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/convert.go b/vendor/src/github.com/jessevdk/go-flags/convert.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/convert.go
rename to vendor/src/github.com/jessevdk/go-flags/convert.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/convert_test.go b/vendor/src/github.com/jessevdk/go-flags/convert_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/convert_test.go
rename to vendor/src/github.com/jessevdk/go-flags/convert_test.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/error.go b/vendor/src/github.com/jessevdk/go-flags/error.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/error.go
rename to vendor/src/github.com/jessevdk/go-flags/error.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/example_test.go b/vendor/src/github.com/jessevdk/go-flags/example_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/example_test.go
rename to vendor/src/github.com/jessevdk/go-flags/example_test.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/examples/add.go b/vendor/src/github.com/jessevdk/go-flags/examples/add.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/examples/add.go
rename to vendor/src/github.com/jessevdk/go-flags/examples/add.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/examples/bash-completion b/vendor/src/github.com/jessevdk/go-flags/examples/bash-completion
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/examples/bash-completion
rename to vendor/src/github.com/jessevdk/go-flags/examples/bash-completion
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/examples/main.go b/vendor/src/github.com/jessevdk/go-flags/examples/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/examples/main.go
rename to vendor/src/github.com/jessevdk/go-flags/examples/main.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/examples/rm.go b/vendor/src/github.com/jessevdk/go-flags/examples/rm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/examples/rm.go
rename to vendor/src/github.com/jessevdk/go-flags/examples/rm.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/flags.go b/vendor/src/github.com/jessevdk/go-flags/flags.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/flags.go
rename to vendor/src/github.com/jessevdk/go-flags/flags.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/group.go b/vendor/src/github.com/jessevdk/go-flags/group.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/group.go
rename to vendor/src/github.com/jessevdk/go-flags/group.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/group_private.go b/vendor/src/github.com/jessevdk/go-flags/group_private.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/group_private.go
rename to vendor/src/github.com/jessevdk/go-flags/group_private.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/group_test.go b/vendor/src/github.com/jessevdk/go-flags/group_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/group_test.go
rename to vendor/src/github.com/jessevdk/go-flags/group_test.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/help.go b/vendor/src/github.com/jessevdk/go-flags/help.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/help.go
rename to vendor/src/github.com/jessevdk/go-flags/help.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/help_test.go b/vendor/src/github.com/jessevdk/go-flags/help_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/help_test.go
rename to vendor/src/github.com/jessevdk/go-flags/help_test.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/ini.go b/vendor/src/github.com/jessevdk/go-flags/ini.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/ini.go
rename to vendor/src/github.com/jessevdk/go-flags/ini.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/ini_private.go b/vendor/src/github.com/jessevdk/go-flags/ini_private.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/ini_private.go
rename to vendor/src/github.com/jessevdk/go-flags/ini_private.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/ini_test.go b/vendor/src/github.com/jessevdk/go-flags/ini_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/ini_test.go
rename to vendor/src/github.com/jessevdk/go-flags/ini_test.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/long_test.go b/vendor/src/github.com/jessevdk/go-flags/long_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/long_test.go
rename to vendor/src/github.com/jessevdk/go-flags/long_test.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/man.go b/vendor/src/github.com/jessevdk/go-flags/man.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/man.go
rename to vendor/src/github.com/jessevdk/go-flags/man.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/marshal_test.go b/vendor/src/github.com/jessevdk/go-flags/marshal_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/marshal_test.go
rename to vendor/src/github.com/jessevdk/go-flags/marshal_test.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/multitag.go b/vendor/src/github.com/jessevdk/go-flags/multitag.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/multitag.go
rename to vendor/src/github.com/jessevdk/go-flags/multitag.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/option.go b/vendor/src/github.com/jessevdk/go-flags/option.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/option.go
rename to vendor/src/github.com/jessevdk/go-flags/option.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/option_private.go b/vendor/src/github.com/jessevdk/go-flags/option_private.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/option_private.go
rename to vendor/src/github.com/jessevdk/go-flags/option_private.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/options_test.go b/vendor/src/github.com/jessevdk/go-flags/options_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/options_test.go
rename to vendor/src/github.com/jessevdk/go-flags/options_test.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/optstyle_other.go b/vendor/src/github.com/jessevdk/go-flags/optstyle_other.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/optstyle_other.go
rename to vendor/src/github.com/jessevdk/go-flags/optstyle_other.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/optstyle_windows.go b/vendor/src/github.com/jessevdk/go-flags/optstyle_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/optstyle_windows.go
rename to vendor/src/github.com/jessevdk/go-flags/optstyle_windows.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/parser.go b/vendor/src/github.com/jessevdk/go-flags/parser.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/parser.go
rename to vendor/src/github.com/jessevdk/go-flags/parser.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/parser_private.go b/vendor/src/github.com/jessevdk/go-flags/parser_private.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/parser_private.go
rename to vendor/src/github.com/jessevdk/go-flags/parser_private.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/parser_test.go b/vendor/src/github.com/jessevdk/go-flags/parser_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/parser_test.go
rename to vendor/src/github.com/jessevdk/go-flags/parser_test.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/pointer_test.go b/vendor/src/github.com/jessevdk/go-flags/pointer_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/pointer_test.go
rename to vendor/src/github.com/jessevdk/go-flags/pointer_test.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/short_test.go b/vendor/src/github.com/jessevdk/go-flags/short_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/short_test.go
rename to vendor/src/github.com/jessevdk/go-flags/short_test.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/tag_test.go b/vendor/src/github.com/jessevdk/go-flags/tag_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/tag_test.go
rename to vendor/src/github.com/jessevdk/go-flags/tag_test.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/termsize.go b/vendor/src/github.com/jessevdk/go-flags/termsize.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/termsize.go
rename to vendor/src/github.com/jessevdk/go-flags/termsize.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/termsize_linux.go b/vendor/src/github.com/jessevdk/go-flags/termsize_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/termsize_linux.go
rename to vendor/src/github.com/jessevdk/go-flags/termsize_linux.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/termsize_nosysioctl.go b/vendor/src/github.com/jessevdk/go-flags/termsize_nosysioctl.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/termsize_nosysioctl.go
rename to vendor/src/github.com/jessevdk/go-flags/termsize_nosysioctl.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/termsize_other.go b/vendor/src/github.com/jessevdk/go-flags/termsize_other.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/termsize_other.go
rename to vendor/src/github.com/jessevdk/go-flags/termsize_other.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/termsize_unix.go b/vendor/src/github.com/jessevdk/go-flags/termsize_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/termsize_unix.go
rename to vendor/src/github.com/jessevdk/go-flags/termsize_unix.go
diff --git a/Godeps/_workspace/src/github.com/jessevdk/go-flags/unknown_test.go b/vendor/src/github.com/jessevdk/go-flags/unknown_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jessevdk/go-flags/unknown_test.go
rename to vendor/src/github.com/jessevdk/go-flags/unknown_test.go
diff --git a/Godeps/_workspace/src/github.com/juju/errors/.gitignore b/vendor/src/github.com/juju/errors/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/juju/errors/.gitignore
rename to vendor/src/github.com/juju/errors/.gitignore
diff --git a/Godeps/_workspace/src/github.com/juju/errors/LICENSE b/vendor/src/github.com/juju/errors/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/juju/errors/LICENSE
rename to vendor/src/github.com/juju/errors/LICENSE
diff --git a/Godeps/_workspace/src/github.com/juju/errors/Makefile b/vendor/src/github.com/juju/errors/Makefile
similarity index 100%
rename from Godeps/_workspace/src/github.com/juju/errors/Makefile
rename to vendor/src/github.com/juju/errors/Makefile
diff --git a/Godeps/_workspace/src/github.com/juju/errors/README.md b/vendor/src/github.com/juju/errors/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/juju/errors/README.md
rename to vendor/src/github.com/juju/errors/README.md
diff --git a/Godeps/_workspace/src/github.com/juju/errors/doc.go b/vendor/src/github.com/juju/errors/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/juju/errors/doc.go
rename to vendor/src/github.com/juju/errors/doc.go
diff --git a/Godeps/_workspace/src/github.com/juju/errors/error.go b/vendor/src/github.com/juju/errors/error.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/juju/errors/error.go
rename to vendor/src/github.com/juju/errors/error.go
diff --git a/Godeps/_workspace/src/github.com/juju/errors/error_test.go b/vendor/src/github.com/juju/errors/error_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/juju/errors/error_test.go
rename to vendor/src/github.com/juju/errors/error_test.go
diff --git a/Godeps/_workspace/src/github.com/juju/errors/errortypes.go b/vendor/src/github.com/juju/errors/errortypes.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/juju/errors/errortypes.go
rename to vendor/src/github.com/juju/errors/errortypes.go
diff --git a/Godeps/_workspace/src/github.com/juju/errors/errortypes_test.go b/vendor/src/github.com/juju/errors/errortypes_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/juju/errors/errortypes_test.go
rename to vendor/src/github.com/juju/errors/errortypes_test.go
diff --git a/Godeps/_workspace/src/github.com/juju/errors/example_test.go b/vendor/src/github.com/juju/errors/example_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/juju/errors/example_test.go
rename to vendor/src/github.com/juju/errors/example_test.go
diff --git a/Godeps/_workspace/src/github.com/juju/errors/export_test.go b/vendor/src/github.com/juju/errors/export_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/juju/errors/export_test.go
rename to vendor/src/github.com/juju/errors/export_test.go
diff --git a/Godeps/_workspace/src/github.com/juju/errors/functions.go b/vendor/src/github.com/juju/errors/functions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/juju/errors/functions.go
rename to vendor/src/github.com/juju/errors/functions.go
diff --git a/Godeps/_workspace/src/github.com/juju/errors/functions_test.go b/vendor/src/github.com/juju/errors/functions_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/juju/errors/functions_test.go
rename to vendor/src/github.com/juju/errors/functions_test.go
diff --git a/Godeps/_workspace/src/github.com/juju/errors/package_test.go b/vendor/src/github.com/juju/errors/package_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/juju/errors/package_test.go
rename to vendor/src/github.com/juju/errors/package_test.go
diff --git a/Godeps/_workspace/src/github.com/juju/errors/path.go b/vendor/src/github.com/juju/errors/path.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/juju/errors/path.go
rename to vendor/src/github.com/juju/errors/path.go
diff --git a/Godeps/_workspace/src/github.com/juju/errors/path_test.go b/vendor/src/github.com/juju/errors/path_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/juju/errors/path_test.go
rename to vendor/src/github.com/juju/errors/path_test.go
diff --git a/Godeps/_workspace/src/github.com/kr/fs/LICENSE b/vendor/src/github.com/kr/fs/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/fs/LICENSE
rename to vendor/src/github.com/kr/fs/LICENSE
diff --git a/Godeps/_workspace/src/github.com/kr/fs/Readme b/vendor/src/github.com/kr/fs/Readme
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/fs/Readme
rename to vendor/src/github.com/kr/fs/Readme
diff --git a/Godeps/_workspace/src/github.com/kr/fs/example_test.go b/vendor/src/github.com/kr/fs/example_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/fs/example_test.go
rename to vendor/src/github.com/kr/fs/example_test.go
diff --git a/Godeps/_workspace/src/github.com/kr/fs/filesystem.go b/vendor/src/github.com/kr/fs/filesystem.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/fs/filesystem.go
rename to vendor/src/github.com/kr/fs/filesystem.go
diff --git a/Godeps/_workspace/src/github.com/kr/fs/walk.go b/vendor/src/github.com/kr/fs/walk.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/fs/walk.go
rename to vendor/src/github.com/kr/fs/walk.go
diff --git a/Godeps/_workspace/src/github.com/kr/fs/walk_test.go b/vendor/src/github.com/kr/fs/walk_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/fs/walk_test.go
rename to vendor/src/github.com/kr/fs/walk_test.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/.gitignore b/vendor/src/github.com/minio/minio-go/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/.gitignore
rename to vendor/src/github.com/minio/minio-go/.gitignore
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/.travis.yml b/vendor/src/github.com/minio/minio-go/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/.travis.yml
rename to vendor/src/github.com/minio/minio-go/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/CONTRIBUTING.md b/vendor/src/github.com/minio/minio-go/CONTRIBUTING.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/CONTRIBUTING.md
rename to vendor/src/github.com/minio/minio-go/CONTRIBUTING.md
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/INSTALLGO.md b/vendor/src/github.com/minio/minio-go/INSTALLGO.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/INSTALLGO.md
rename to vendor/src/github.com/minio/minio-go/INSTALLGO.md
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/LICENSE b/vendor/src/github.com/minio/minio-go/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/LICENSE
rename to vendor/src/github.com/minio/minio-go/LICENSE
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/MAINTAINERS.md b/vendor/src/github.com/minio/minio-go/MAINTAINERS.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/MAINTAINERS.md
rename to vendor/src/github.com/minio/minio-go/MAINTAINERS.md
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/README.md b/vendor/src/github.com/minio/minio-go/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/README.md
rename to vendor/src/github.com/minio/minio-go/README.md
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-definitions.go b/vendor/src/github.com/minio/minio-go/api-definitions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-definitions.go
rename to vendor/src/github.com/minio/minio-go/api-definitions.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-error-response.go b/vendor/src/github.com/minio/minio-go/api-error-response.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-error-response.go
rename to vendor/src/github.com/minio/minio-go/api-error-response.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-get-object-file.go b/vendor/src/github.com/minio/minio-go/api-get-object-file.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-get-object-file.go
rename to vendor/src/github.com/minio/minio-go/api-get-object-file.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-get.go b/vendor/src/github.com/minio/minio-go/api-get.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-get.go
rename to vendor/src/github.com/minio/minio-go/api-get.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-list.go b/vendor/src/github.com/minio/minio-go/api-list.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-list.go
rename to vendor/src/github.com/minio/minio-go/api-list.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-presigned.go b/vendor/src/github.com/minio/minio-go/api-presigned.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-presigned.go
rename to vendor/src/github.com/minio/minio-go/api-presigned.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-put-bucket.go b/vendor/src/github.com/minio/minio-go/api-put-bucket.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-put-bucket.go
rename to vendor/src/github.com/minio/minio-go/api-put-bucket.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-put-object-common.go b/vendor/src/github.com/minio/minio-go/api-put-object-common.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-put-object-common.go
rename to vendor/src/github.com/minio/minio-go/api-put-object-common.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-put-object-file.go b/vendor/src/github.com/minio/minio-go/api-put-object-file.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-put-object-file.go
rename to vendor/src/github.com/minio/minio-go/api-put-object-file.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-put-object-multipart.go b/vendor/src/github.com/minio/minio-go/api-put-object-multipart.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-put-object-multipart.go
rename to vendor/src/github.com/minio/minio-go/api-put-object-multipart.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-put-object-progress.go b/vendor/src/github.com/minio/minio-go/api-put-object-progress.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-put-object-progress.go
rename to vendor/src/github.com/minio/minio-go/api-put-object-progress.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-put-object-readat.go b/vendor/src/github.com/minio/minio-go/api-put-object-readat.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-put-object-readat.go
rename to vendor/src/github.com/minio/minio-go/api-put-object-readat.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-put-object.go b/vendor/src/github.com/minio/minio-go/api-put-object.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-put-object.go
rename to vendor/src/github.com/minio/minio-go/api-put-object.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-remove.go b/vendor/src/github.com/minio/minio-go/api-remove.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-remove.go
rename to vendor/src/github.com/minio/minio-go/api-remove.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-s3-definitions.go b/vendor/src/github.com/minio/minio-go/api-s3-definitions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-s3-definitions.go
rename to vendor/src/github.com/minio/minio-go/api-s3-definitions.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-stat.go b/vendor/src/github.com/minio/minio-go/api-stat.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-stat.go
rename to vendor/src/github.com/minio/minio-go/api-stat.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api.go b/vendor/src/github.com/minio/minio-go/api.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api.go
rename to vendor/src/github.com/minio/minio-go/api.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/appveyor.yml b/vendor/src/github.com/minio/minio-go/appveyor.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/appveyor.yml
rename to vendor/src/github.com/minio/minio-go/appveyor.yml
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/bucket-acl.go b/vendor/src/github.com/minio/minio-go/bucket-acl.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/bucket-acl.go
rename to vendor/src/github.com/minio/minio-go/bucket-acl.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/bucket-cache.go b/vendor/src/github.com/minio/minio-go/bucket-cache.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/bucket-cache.go
rename to vendor/src/github.com/minio/minio-go/bucket-cache.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/constants.go b/vendor/src/github.com/minio/minio-go/constants.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/constants.go
rename to vendor/src/github.com/minio/minio-go/constants.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/play/bucketexists.go b/vendor/src/github.com/minio/minio-go/examples/play/bucketexists.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/play/bucketexists.go
rename to vendor/src/github.com/minio/minio-go/examples/play/bucketexists.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/play/fgetobject.go b/vendor/src/github.com/minio/minio-go/examples/play/fgetobject.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/play/fgetobject.go
rename to vendor/src/github.com/minio/minio-go/examples/play/fgetobject.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/play/fputobject.go b/vendor/src/github.com/minio/minio-go/examples/play/fputobject.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/play/fputobject.go
rename to vendor/src/github.com/minio/minio-go/examples/play/fputobject.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/play/getbucketacl.go b/vendor/src/github.com/minio/minio-go/examples/play/getbucketacl.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/play/getbucketacl.go
rename to vendor/src/github.com/minio/minio-go/examples/play/getbucketacl.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/play/getobject.go b/vendor/src/github.com/minio/minio-go/examples/play/getobject.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/play/getobject.go
rename to vendor/src/github.com/minio/minio-go/examples/play/getobject.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/play/listbuckets.go b/vendor/src/github.com/minio/minio-go/examples/play/listbuckets.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/play/listbuckets.go
rename to vendor/src/github.com/minio/minio-go/examples/play/listbuckets.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/play/listincompleteuploads.go b/vendor/src/github.com/minio/minio-go/examples/play/listincompleteuploads.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/play/listincompleteuploads.go
rename to vendor/src/github.com/minio/minio-go/examples/play/listincompleteuploads.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/play/listobjects.go b/vendor/src/github.com/minio/minio-go/examples/play/listobjects.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/play/listobjects.go
rename to vendor/src/github.com/minio/minio-go/examples/play/listobjects.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/play/makebucket.go b/vendor/src/github.com/minio/minio-go/examples/play/makebucket.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/play/makebucket.go
rename to vendor/src/github.com/minio/minio-go/examples/play/makebucket.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/play/presignedgetobject.go b/vendor/src/github.com/minio/minio-go/examples/play/presignedgetobject.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/play/presignedgetobject.go
rename to vendor/src/github.com/minio/minio-go/examples/play/presignedgetobject.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/play/presignedpostpolicy.go b/vendor/src/github.com/minio/minio-go/examples/play/presignedpostpolicy.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/play/presignedpostpolicy.go
rename to vendor/src/github.com/minio/minio-go/examples/play/presignedpostpolicy.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/play/presignedputobject.go b/vendor/src/github.com/minio/minio-go/examples/play/presignedputobject.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/play/presignedputobject.go
rename to vendor/src/github.com/minio/minio-go/examples/play/presignedputobject.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/play/putobject.go b/vendor/src/github.com/minio/minio-go/examples/play/putobject.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/play/putobject.go
rename to vendor/src/github.com/minio/minio-go/examples/play/putobject.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/play/removebucket.go b/vendor/src/github.com/minio/minio-go/examples/play/removebucket.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/play/removebucket.go
rename to vendor/src/github.com/minio/minio-go/examples/play/removebucket.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/play/removeincompleteupload.go b/vendor/src/github.com/minio/minio-go/examples/play/removeincompleteupload.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/play/removeincompleteupload.go
rename to vendor/src/github.com/minio/minio-go/examples/play/removeincompleteupload.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/play/removeobject.go b/vendor/src/github.com/minio/minio-go/examples/play/removeobject.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/play/removeobject.go
rename to vendor/src/github.com/minio/minio-go/examples/play/removeobject.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/play/setbucketacl.go b/vendor/src/github.com/minio/minio-go/examples/play/setbucketacl.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/play/setbucketacl.go
rename to vendor/src/github.com/minio/minio-go/examples/play/setbucketacl.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/play/statobject.go b/vendor/src/github.com/minio/minio-go/examples/play/statobject.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/play/statobject.go
rename to vendor/src/github.com/minio/minio-go/examples/play/statobject.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/bucketexists.go b/vendor/src/github.com/minio/minio-go/examples/s3/bucketexists.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/bucketexists.go
rename to vendor/src/github.com/minio/minio-go/examples/s3/bucketexists.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/fgetobject.go b/vendor/src/github.com/minio/minio-go/examples/s3/fgetobject.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/fgetobject.go
rename to vendor/src/github.com/minio/minio-go/examples/s3/fgetobject.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/fputobject.go b/vendor/src/github.com/minio/minio-go/examples/s3/fputobject.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/fputobject.go
rename to vendor/src/github.com/minio/minio-go/examples/s3/fputobject.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/getbucketacl.go b/vendor/src/github.com/minio/minio-go/examples/s3/getbucketacl.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/getbucketacl.go
rename to vendor/src/github.com/minio/minio-go/examples/s3/getbucketacl.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/getobject.go b/vendor/src/github.com/minio/minio-go/examples/s3/getobject.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/getobject.go
rename to vendor/src/github.com/minio/minio-go/examples/s3/getobject.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/listbuckets.go b/vendor/src/github.com/minio/minio-go/examples/s3/listbuckets.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/listbuckets.go
rename to vendor/src/github.com/minio/minio-go/examples/s3/listbuckets.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/listincompleteuploads.go b/vendor/src/github.com/minio/minio-go/examples/s3/listincompleteuploads.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/listincompleteuploads.go
rename to vendor/src/github.com/minio/minio-go/examples/s3/listincompleteuploads.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/listobjects.go b/vendor/src/github.com/minio/minio-go/examples/s3/listobjects.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/listobjects.go
rename to vendor/src/github.com/minio/minio-go/examples/s3/listobjects.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/makebucket.go b/vendor/src/github.com/minio/minio-go/examples/s3/makebucket.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/makebucket.go
rename to vendor/src/github.com/minio/minio-go/examples/s3/makebucket.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/presignedgetobject.go b/vendor/src/github.com/minio/minio-go/examples/s3/presignedgetobject.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/presignedgetobject.go
rename to vendor/src/github.com/minio/minio-go/examples/s3/presignedgetobject.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/presignedpostpolicy.go b/vendor/src/github.com/minio/minio-go/examples/s3/presignedpostpolicy.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/presignedpostpolicy.go
rename to vendor/src/github.com/minio/minio-go/examples/s3/presignedpostpolicy.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/presignedputobject.go b/vendor/src/github.com/minio/minio-go/examples/s3/presignedputobject.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/presignedputobject.go
rename to vendor/src/github.com/minio/minio-go/examples/s3/presignedputobject.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/putobject-progress.go b/vendor/src/github.com/minio/minio-go/examples/s3/putobject-progress.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/putobject-progress.go
rename to vendor/src/github.com/minio/minio-go/examples/s3/putobject-progress.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/putobject.go b/vendor/src/github.com/minio/minio-go/examples/s3/putobject.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/putobject.go
rename to vendor/src/github.com/minio/minio-go/examples/s3/putobject.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/removebucket.go b/vendor/src/github.com/minio/minio-go/examples/s3/removebucket.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/removebucket.go
rename to vendor/src/github.com/minio/minio-go/examples/s3/removebucket.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/removeincompleteupload.go b/vendor/src/github.com/minio/minio-go/examples/s3/removeincompleteupload.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/removeincompleteupload.go
rename to vendor/src/github.com/minio/minio-go/examples/s3/removeincompleteupload.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/removeobject.go b/vendor/src/github.com/minio/minio-go/examples/s3/removeobject.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/removeobject.go
rename to vendor/src/github.com/minio/minio-go/examples/s3/removeobject.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/setbucketacl.go b/vendor/src/github.com/minio/minio-go/examples/s3/setbucketacl.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/setbucketacl.go
rename to vendor/src/github.com/minio/minio-go/examples/s3/setbucketacl.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/statobject.go b/vendor/src/github.com/minio/minio-go/examples/s3/statobject.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/statobject.go
rename to vendor/src/github.com/minio/minio-go/examples/s3/statobject.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/hook-reader.go b/vendor/src/github.com/minio/minio-go/hook-reader.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/hook-reader.go
rename to vendor/src/github.com/minio/minio-go/hook-reader.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/post-policy.go b/vendor/src/github.com/minio/minio-go/post-policy.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/post-policy.go
rename to vendor/src/github.com/minio/minio-go/post-policy.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/request-signature-v2.go b/vendor/src/github.com/minio/minio-go/request-signature-v2.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/request-signature-v2.go
rename to vendor/src/github.com/minio/minio-go/request-signature-v2.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/request-signature-v4.go b/vendor/src/github.com/minio/minio-go/request-signature-v4.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/request-signature-v4.go
rename to vendor/src/github.com/minio/minio-go/request-signature-v4.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/s3-endpoints.go b/vendor/src/github.com/minio/minio-go/s3-endpoints.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/s3-endpoints.go
rename to vendor/src/github.com/minio/minio-go/s3-endpoints.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/signature-type.go b/vendor/src/github.com/minio/minio-go/signature-type.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/signature-type.go
rename to vendor/src/github.com/minio/minio-go/signature-type.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/tempfile.go b/vendor/src/github.com/minio/minio-go/tempfile.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/tempfile.go
rename to vendor/src/github.com/minio/minio-go/tempfile.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/utils.go b/vendor/src/github.com/minio/minio-go/utils.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/utils.go
rename to vendor/src/github.com/minio/minio-go/utils.go
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/.gitignore b/vendor/src/github.com/pkg/sftp/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/.gitignore
rename to vendor/src/github.com/pkg/sftp/.gitignore
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/.travis.yml b/vendor/src/github.com/pkg/sftp/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/.travis.yml
rename to vendor/src/github.com/pkg/sftp/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/CONTRIBUTORS b/vendor/src/github.com/pkg/sftp/CONTRIBUTORS
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/CONTRIBUTORS
rename to vendor/src/github.com/pkg/sftp/CONTRIBUTORS
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/LICENSE b/vendor/src/github.com/pkg/sftp/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/LICENSE
rename to vendor/src/github.com/pkg/sftp/LICENSE
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/README.md b/vendor/src/github.com/pkg/sftp/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/README.md
rename to vendor/src/github.com/pkg/sftp/README.md
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/attrs.go b/vendor/src/github.com/pkg/sftp/attrs.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/attrs.go
rename to vendor/src/github.com/pkg/sftp/attrs.go
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/attrs_stubs.go b/vendor/src/github.com/pkg/sftp/attrs_stubs.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/attrs_stubs.go
rename to vendor/src/github.com/pkg/sftp/attrs_stubs.go
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/attrs_unix.go b/vendor/src/github.com/pkg/sftp/attrs_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/attrs_unix.go
rename to vendor/src/github.com/pkg/sftp/attrs_unix.go
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/client.go b/vendor/src/github.com/pkg/sftp/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/client.go
rename to vendor/src/github.com/pkg/sftp/client.go
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/debug.go b/vendor/src/github.com/pkg/sftp/debug.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/debug.go
rename to vendor/src/github.com/pkg/sftp/debug.go
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/examples/buffered-read-benchmark/main.go b/vendor/src/github.com/pkg/sftp/examples/buffered-read-benchmark/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/examples/buffered-read-benchmark/main.go
rename to vendor/src/github.com/pkg/sftp/examples/buffered-read-benchmark/main.go
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/examples/buffered-write-benchmark/main.go b/vendor/src/github.com/pkg/sftp/examples/buffered-write-benchmark/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/examples/buffered-write-benchmark/main.go
rename to vendor/src/github.com/pkg/sftp/examples/buffered-write-benchmark/main.go
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/examples/sftp-server/README.md b/vendor/src/github.com/pkg/sftp/examples/sftp-server/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/examples/sftp-server/README.md
rename to vendor/src/github.com/pkg/sftp/examples/sftp-server/README.md
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/examples/sftp-server/main.go b/vendor/src/github.com/pkg/sftp/examples/sftp-server/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/examples/sftp-server/main.go
rename to vendor/src/github.com/pkg/sftp/examples/sftp-server/main.go
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/examples/streaming-read-benchmark/main.go b/vendor/src/github.com/pkg/sftp/examples/streaming-read-benchmark/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/examples/streaming-read-benchmark/main.go
rename to vendor/src/github.com/pkg/sftp/examples/streaming-read-benchmark/main.go
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/examples/streaming-write-benchmark/main.go b/vendor/src/github.com/pkg/sftp/examples/streaming-write-benchmark/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/examples/streaming-write-benchmark/main.go
rename to vendor/src/github.com/pkg/sftp/examples/streaming-write-benchmark/main.go
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/packet.go b/vendor/src/github.com/pkg/sftp/packet.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/packet.go
rename to vendor/src/github.com/pkg/sftp/packet.go
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/release.go b/vendor/src/github.com/pkg/sftp/release.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/release.go
rename to vendor/src/github.com/pkg/sftp/release.go
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/server.go b/vendor/src/github.com/pkg/sftp/server.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/server.go
rename to vendor/src/github.com/pkg/sftp/server.go
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/server_standalone/main.go b/vendor/src/github.com/pkg/sftp/server_standalone/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/server_standalone/main.go
rename to vendor/src/github.com/pkg/sftp/server_standalone/main.go
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/server_stubs.go b/vendor/src/github.com/pkg/sftp/server_stubs.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/server_stubs.go
rename to vendor/src/github.com/pkg/sftp/server_stubs.go
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/server_unix.go b/vendor/src/github.com/pkg/sftp/server_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/server_unix.go
rename to vendor/src/github.com/pkg/sftp/server_unix.go
diff --git a/Godeps/_workspace/src/github.com/pkg/sftp/sftp.go b/vendor/src/github.com/pkg/sftp/sftp.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/pkg/sftp/sftp.go
rename to vendor/src/github.com/pkg/sftp/sftp.go
diff --git a/Godeps/_workspace/src/github.com/restic/chunker/.travis.yml b/vendor/src/github.com/restic/chunker/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/restic/chunker/.travis.yml
rename to vendor/src/github.com/restic/chunker/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/restic/chunker/LICENSE b/vendor/src/github.com/restic/chunker/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/restic/chunker/LICENSE
rename to vendor/src/github.com/restic/chunker/LICENSE
diff --git a/Godeps/_workspace/src/github.com/restic/chunker/README.md b/vendor/src/github.com/restic/chunker/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/restic/chunker/README.md
rename to vendor/src/github.com/restic/chunker/README.md
diff --git a/Godeps/_workspace/src/github.com/restic/chunker/chunker.go b/vendor/src/github.com/restic/chunker/chunker.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/restic/chunker/chunker.go
rename to vendor/src/github.com/restic/chunker/chunker.go
diff --git a/Godeps/_workspace/src/github.com/restic/chunker/chunker_test.go b/vendor/src/github.com/restic/chunker/chunker_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/restic/chunker/chunker_test.go
rename to vendor/src/github.com/restic/chunker/chunker_test.go
diff --git a/Godeps/_workspace/src/github.com/restic/chunker/doc.go b/vendor/src/github.com/restic/chunker/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/restic/chunker/doc.go
rename to vendor/src/github.com/restic/chunker/doc.go
diff --git a/Godeps/_workspace/src/github.com/restic/chunker/polynomials.go b/vendor/src/github.com/restic/chunker/polynomials.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/restic/chunker/polynomials.go
rename to vendor/src/github.com/restic/chunker/polynomials.go
diff --git a/Godeps/_workspace/src/github.com/restic/chunker/polynomials_test.go b/vendor/src/github.com/restic/chunker/polynomials_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/restic/chunker/polynomials_test.go
rename to vendor/src/github.com/restic/chunker/polynomials_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/pbkdf2/pbkdf2.go b/vendor/src/golang.org/x/crypto/pbkdf2/pbkdf2.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/pbkdf2/pbkdf2.go
rename to vendor/src/golang.org/x/crypto/pbkdf2/pbkdf2.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/pbkdf2/pbkdf2_test.go b/vendor/src/golang.org/x/crypto/pbkdf2/pbkdf2_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/pbkdf2/pbkdf2_test.go
rename to vendor/src/golang.org/x/crypto/pbkdf2/pbkdf2_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/poly1305/const_amd64.s b/vendor/src/golang.org/x/crypto/poly1305/const_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/poly1305/const_amd64.s
rename to vendor/src/golang.org/x/crypto/poly1305/const_amd64.s
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/poly1305/poly1305.go b/vendor/src/golang.org/x/crypto/poly1305/poly1305.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/poly1305/poly1305.go
rename to vendor/src/golang.org/x/crypto/poly1305/poly1305.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/poly1305/poly1305_amd64.s b/vendor/src/golang.org/x/crypto/poly1305/poly1305_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/poly1305/poly1305_amd64.s
rename to vendor/src/golang.org/x/crypto/poly1305/poly1305_amd64.s
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/poly1305/poly1305_arm.s b/vendor/src/golang.org/x/crypto/poly1305/poly1305_arm.s
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/poly1305/poly1305_arm.s
rename to vendor/src/golang.org/x/crypto/poly1305/poly1305_arm.s
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/poly1305/poly1305_test.go b/vendor/src/golang.org/x/crypto/poly1305/poly1305_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/poly1305/poly1305_test.go
rename to vendor/src/golang.org/x/crypto/poly1305/poly1305_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/poly1305/sum_amd64.go b/vendor/src/golang.org/x/crypto/poly1305/sum_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/poly1305/sum_amd64.go
rename to vendor/src/golang.org/x/crypto/poly1305/sum_amd64.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/poly1305/sum_arm.go b/vendor/src/golang.org/x/crypto/poly1305/sum_arm.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/poly1305/sum_arm.go
rename to vendor/src/golang.org/x/crypto/poly1305/sum_arm.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/poly1305/sum_ref.go b/vendor/src/golang.org/x/crypto/poly1305/sum_ref.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/poly1305/sum_ref.go
rename to vendor/src/golang.org/x/crypto/poly1305/sum_ref.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/scrypt/scrypt.go b/vendor/src/golang.org/x/crypto/scrypt/scrypt.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/scrypt/scrypt.go
rename to vendor/src/golang.org/x/crypto/scrypt/scrypt.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/scrypt/scrypt_test.go b/vendor/src/golang.org/x/crypto/scrypt/scrypt_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/scrypt/scrypt_test.go
rename to vendor/src/golang.org/x/crypto/scrypt/scrypt_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/client.go b/vendor/src/golang.org/x/crypto/ssh/agent/client.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/client.go
rename to vendor/src/golang.org/x/crypto/ssh/agent/client.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/client_test.go b/vendor/src/golang.org/x/crypto/ssh/agent/client_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/client_test.go
rename to vendor/src/golang.org/x/crypto/ssh/agent/client_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/forward.go b/vendor/src/golang.org/x/crypto/ssh/agent/forward.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/forward.go
rename to vendor/src/golang.org/x/crypto/ssh/agent/forward.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/keyring.go b/vendor/src/golang.org/x/crypto/ssh/agent/keyring.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/keyring.go
rename to vendor/src/golang.org/x/crypto/ssh/agent/keyring.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/server.go b/vendor/src/golang.org/x/crypto/ssh/agent/server.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/server.go
rename to vendor/src/golang.org/x/crypto/ssh/agent/server.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/server_test.go b/vendor/src/golang.org/x/crypto/ssh/agent/server_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/server_test.go
rename to vendor/src/golang.org/x/crypto/ssh/agent/server_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/testdata_test.go b/vendor/src/golang.org/x/crypto/ssh/agent/testdata_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/testdata_test.go
rename to vendor/src/golang.org/x/crypto/ssh/agent/testdata_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/benchmark_test.go b/vendor/src/golang.org/x/crypto/ssh/benchmark_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/benchmark_test.go
rename to vendor/src/golang.org/x/crypto/ssh/benchmark_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/buffer.go b/vendor/src/golang.org/x/crypto/ssh/buffer.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/buffer.go
rename to vendor/src/golang.org/x/crypto/ssh/buffer.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/buffer_test.go b/vendor/src/golang.org/x/crypto/ssh/buffer_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/buffer_test.go
rename to vendor/src/golang.org/x/crypto/ssh/buffer_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/certs.go b/vendor/src/golang.org/x/crypto/ssh/certs.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/certs.go
rename to vendor/src/golang.org/x/crypto/ssh/certs.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/certs_test.go b/vendor/src/golang.org/x/crypto/ssh/certs_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/certs_test.go
rename to vendor/src/golang.org/x/crypto/ssh/certs_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/channel.go b/vendor/src/golang.org/x/crypto/ssh/channel.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/channel.go
rename to vendor/src/golang.org/x/crypto/ssh/channel.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/cipher.go b/vendor/src/golang.org/x/crypto/ssh/cipher.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/cipher.go
rename to vendor/src/golang.org/x/crypto/ssh/cipher.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/cipher_test.go b/vendor/src/golang.org/x/crypto/ssh/cipher_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/cipher_test.go
rename to vendor/src/golang.org/x/crypto/ssh/cipher_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/client.go b/vendor/src/golang.org/x/crypto/ssh/client.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/client.go
rename to vendor/src/golang.org/x/crypto/ssh/client.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/client_auth.go b/vendor/src/golang.org/x/crypto/ssh/client_auth.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/client_auth.go
rename to vendor/src/golang.org/x/crypto/ssh/client_auth.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/client_auth_test.go b/vendor/src/golang.org/x/crypto/ssh/client_auth_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/client_auth_test.go
rename to vendor/src/golang.org/x/crypto/ssh/client_auth_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/client_test.go b/vendor/src/golang.org/x/crypto/ssh/client_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/client_test.go
rename to vendor/src/golang.org/x/crypto/ssh/client_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/common.go b/vendor/src/golang.org/x/crypto/ssh/common.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/common.go
rename to vendor/src/golang.org/x/crypto/ssh/common.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/connection.go b/vendor/src/golang.org/x/crypto/ssh/connection.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/connection.go
rename to vendor/src/golang.org/x/crypto/ssh/connection.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/doc.go b/vendor/src/golang.org/x/crypto/ssh/doc.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/doc.go
rename to vendor/src/golang.org/x/crypto/ssh/doc.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/example_test.go b/vendor/src/golang.org/x/crypto/ssh/example_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/example_test.go
rename to vendor/src/golang.org/x/crypto/ssh/example_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/handshake.go b/vendor/src/golang.org/x/crypto/ssh/handshake.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/handshake.go
rename to vendor/src/golang.org/x/crypto/ssh/handshake.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/handshake_test.go b/vendor/src/golang.org/x/crypto/ssh/handshake_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/handshake_test.go
rename to vendor/src/golang.org/x/crypto/ssh/handshake_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/kex.go b/vendor/src/golang.org/x/crypto/ssh/kex.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/kex.go
rename to vendor/src/golang.org/x/crypto/ssh/kex.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/kex_test.go b/vendor/src/golang.org/x/crypto/ssh/kex_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/kex_test.go
rename to vendor/src/golang.org/x/crypto/ssh/kex_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/keys.go b/vendor/src/golang.org/x/crypto/ssh/keys.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/keys.go
rename to vendor/src/golang.org/x/crypto/ssh/keys.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/keys_test.go b/vendor/src/golang.org/x/crypto/ssh/keys_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/keys_test.go
rename to vendor/src/golang.org/x/crypto/ssh/keys_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/mac.go b/vendor/src/golang.org/x/crypto/ssh/mac.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/mac.go
rename to vendor/src/golang.org/x/crypto/ssh/mac.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/mempipe_test.go b/vendor/src/golang.org/x/crypto/ssh/mempipe_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/mempipe_test.go
rename to vendor/src/golang.org/x/crypto/ssh/mempipe_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/messages.go b/vendor/src/golang.org/x/crypto/ssh/messages.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/messages.go
rename to vendor/src/golang.org/x/crypto/ssh/messages.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/messages_test.go b/vendor/src/golang.org/x/crypto/ssh/messages_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/messages_test.go
rename to vendor/src/golang.org/x/crypto/ssh/messages_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/mux.go b/vendor/src/golang.org/x/crypto/ssh/mux.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/mux.go
rename to vendor/src/golang.org/x/crypto/ssh/mux.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/mux_test.go b/vendor/src/golang.org/x/crypto/ssh/mux_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/mux_test.go
rename to vendor/src/golang.org/x/crypto/ssh/mux_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/server.go b/vendor/src/golang.org/x/crypto/ssh/server.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/server.go
rename to vendor/src/golang.org/x/crypto/ssh/server.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/session.go b/vendor/src/golang.org/x/crypto/ssh/session.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/session.go
rename to vendor/src/golang.org/x/crypto/ssh/session.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/session_test.go b/vendor/src/golang.org/x/crypto/ssh/session_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/session_test.go
rename to vendor/src/golang.org/x/crypto/ssh/session_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/tcpip.go b/vendor/src/golang.org/x/crypto/ssh/tcpip.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/tcpip.go
rename to vendor/src/golang.org/x/crypto/ssh/tcpip.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/tcpip_test.go b/vendor/src/golang.org/x/crypto/ssh/tcpip_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/tcpip_test.go
rename to vendor/src/golang.org/x/crypto/ssh/tcpip_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/terminal.go b/vendor/src/golang.org/x/crypto/ssh/terminal/terminal.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/terminal.go
rename to vendor/src/golang.org/x/crypto/ssh/terminal/terminal.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/terminal_test.go b/vendor/src/golang.org/x/crypto/ssh/terminal/terminal_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/terminal_test.go
rename to vendor/src/golang.org/x/crypto/ssh/terminal/terminal_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util.go b/vendor/src/golang.org/x/crypto/ssh/terminal/util.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util.go
rename to vendor/src/golang.org/x/crypto/ssh/terminal/util.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_bsd.go b/vendor/src/golang.org/x/crypto/ssh/terminal/util_bsd.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_bsd.go
rename to vendor/src/golang.org/x/crypto/ssh/terminal/util_bsd.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_linux.go b/vendor/src/golang.org/x/crypto/ssh/terminal/util_linux.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_linux.go
rename to vendor/src/golang.org/x/crypto/ssh/terminal/util_linux.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_windows.go b/vendor/src/golang.org/x/crypto/ssh/terminal/util_windows.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_windows.go
rename to vendor/src/golang.org/x/crypto/ssh/terminal/util_windows.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/test/agent_unix_test.go b/vendor/src/golang.org/x/crypto/ssh/test/agent_unix_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/test/agent_unix_test.go
rename to vendor/src/golang.org/x/crypto/ssh/test/agent_unix_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/test/cert_test.go b/vendor/src/golang.org/x/crypto/ssh/test/cert_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/test/cert_test.go
rename to vendor/src/golang.org/x/crypto/ssh/test/cert_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/test/doc.go b/vendor/src/golang.org/x/crypto/ssh/test/doc.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/test/doc.go
rename to vendor/src/golang.org/x/crypto/ssh/test/doc.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/test/forward_unix_test.go b/vendor/src/golang.org/x/crypto/ssh/test/forward_unix_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/test/forward_unix_test.go
rename to vendor/src/golang.org/x/crypto/ssh/test/forward_unix_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/test/session_test.go b/vendor/src/golang.org/x/crypto/ssh/test/session_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/test/session_test.go
rename to vendor/src/golang.org/x/crypto/ssh/test/session_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/test/tcpip_test.go b/vendor/src/golang.org/x/crypto/ssh/test/tcpip_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/test/tcpip_test.go
rename to vendor/src/golang.org/x/crypto/ssh/test/tcpip_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/test/test_unix_test.go b/vendor/src/golang.org/x/crypto/ssh/test/test_unix_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/test/test_unix_test.go
rename to vendor/src/golang.org/x/crypto/ssh/test/test_unix_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/test/testdata_test.go b/vendor/src/golang.org/x/crypto/ssh/test/testdata_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/test/testdata_test.go
rename to vendor/src/golang.org/x/crypto/ssh/test/testdata_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/testdata/doc.go b/vendor/src/golang.org/x/crypto/ssh/testdata/doc.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/testdata/doc.go
rename to vendor/src/golang.org/x/crypto/ssh/testdata/doc.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/testdata/keys.go b/vendor/src/golang.org/x/crypto/ssh/testdata/keys.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/testdata/keys.go
rename to vendor/src/golang.org/x/crypto/ssh/testdata/keys.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/testdata_test.go b/vendor/src/golang.org/x/crypto/ssh/testdata_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/testdata_test.go
rename to vendor/src/golang.org/x/crypto/ssh/testdata_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/transport.go b/vendor/src/golang.org/x/crypto/ssh/transport.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/transport.go
rename to vendor/src/golang.org/x/crypto/ssh/transport.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/transport_test.go b/vendor/src/golang.org/x/crypto/ssh/transport_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/transport_test.go
rename to vendor/src/golang.org/x/crypto/ssh/transport_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/context/context.go b/vendor/src/golang.org/x/net/context/context.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/context/context.go
rename to vendor/src/golang.org/x/net/context/context.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/context/context_test.go b/vendor/src/golang.org/x/net/context/context_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/context/context_test.go
rename to vendor/src/golang.org/x/net/context/context_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/cancelreq.go b/vendor/src/golang.org/x/net/context/ctxhttp/cancelreq.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/cancelreq.go
rename to vendor/src/golang.org/x/net/context/ctxhttp/cancelreq.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/cancelreq_go14.go b/vendor/src/golang.org/x/net/context/ctxhttp/cancelreq_go14.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/cancelreq_go14.go
rename to vendor/src/golang.org/x/net/context/ctxhttp/cancelreq_go14.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/ctxhttp.go b/vendor/src/golang.org/x/net/context/ctxhttp/ctxhttp.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/ctxhttp.go
rename to vendor/src/golang.org/x/net/context/ctxhttp/ctxhttp.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/ctxhttp_test.go b/vendor/src/golang.org/x/net/context/ctxhttp/ctxhttp_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/ctxhttp_test.go
rename to vendor/src/golang.org/x/net/context/ctxhttp/ctxhttp_test.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/context/withtimeout_test.go b/vendor/src/golang.org/x/net/context/withtimeout_test.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/context/withtimeout_test.go
rename to vendor/src/golang.org/x/net/context/withtimeout_test.go