diff --git a/.circleci/config.yml b/.circleci/config.yml
index 755b70f6c3dc908386c3344bdb2410c80154644f..20d9e995045297be88b099795a60fb422aa057c7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,19 +2,13 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/golang:1.9
+      - image: circleci/golang:1.12
     working_directory: /go/src/github.com/turt2live/matrix-media-repo
     steps:
       - checkout
       - run: 
-          name: get gb
-          command: 'go get github.com/constabulary/gb/...'
-      - run: 
-          name: restore vendor packages
-          command: 'gb vendor restore'
-      - run: 
-          name: gb build
-          command: 'gb build all'
+          name: build binaries
+          command: 'GOBIN=$PWD/`dirname $0`/bin go install -v ./cmd/...'
       - store_artifacts:
           path: bin/media_repo
           destination: media_repo
@@ -23,20 +17,14 @@ jobs:
           destination: import_synapse
 #  sytest:
 #    docker:
-#      - image: circleci/golang:1.9
+#      - image: circleci/golang:1.12
 #    working_directory: /go/src/github.com/turt2live/matrix-media-repo
 #    steps:
 #      # Build the project
 #      - checkout
 #      - run:
-#          name: get gb
-#          command: 'go get github.com/constabulary/gb/...'
-#      - run:
-#          name: restore vendor packages
-#          command: 'gb vendor restore'
-#      - run:
-#          name: gb build
-#          command: 'gb build all'
+#          name: build binaries
+#          command: 'GOBIN=$PWD/`dirname $0`/bin go install -v ./cmd/...'
 #      # Install sytest
 #      - run:
 #          name: go to sytest
@@ -59,4 +47,4 @@ workflows:
           filters:
             branches:
               only: [master, develop]
-      - sytest
+#     - sytest
diff --git a/.dockerignore b/.dockerignore
index 04a48f5fc85934da2693d654e1c2f771f4026ffe..2c5b44ad0c6a5f2015dc22f1189240b6e8e243fe 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -6,9 +6,6 @@
 media-repo*.yaml
 homeserver.yaml
 
-vendor/pkg
-vendor/src
-
 # Binaries for programs and plugins
 *.exe
 *.dll
diff --git a/.gitignore b/.gitignore
index 04a48f5fc85934da2693d654e1c2f771f4026ffe..2c5b44ad0c6a5f2015dc22f1189240b6e8e243fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,9 +6,6 @@
 media-repo*.yaml
 homeserver.yaml
 
-vendor/pkg
-vendor/src
-
 # Binaries for programs and plugins
 *.exe
 *.dll
diff --git a/.travis.yml b/.travis.yml
index c837f2a94164e3f7bab414949315eb68ef250896..290544409f4713d6b093440ca8a0812003080944 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,7 @@
 language: go
 go:
-  - 1.9
-before_install:
-  - go get github.com/constabulary/gb/...
-install:
-  - gb vendor restore
+  - 1.12
+env:
+  - GO111MODULE=on
 script:
-  - gb build all
+  - ./build.sh
diff --git a/Dockerfile b/Dockerfile
index 39e4d6c34eedf0a3cdc44a3c67ed0415601aec63..f972452a1b174228dc02b4f15d7be2271440590f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,30 +1,26 @@
 # ---- Stage 0 ----
 # Builds media_repo and import_synapse
-FROM golang:1.11-alpine AS builder
+FROM golang:1.12-alpine AS builder
 
 # Install build dependencies
-RUN apk add --no-cache git musl-dev \
- && go get github.com/constabulary/gb/...
+RUN apk add --no-cache git musl-dev
 
-WORKDIR /opt
+COPY . /opt
 
-COPY ./vendor /opt/vendor
-COPY ./src /opt/src
-RUN GOPATH=`pwd`/vendor gb vendor restore
+WORKDIR /opt
 
-RUN GOPATH=`pwd`:`pwd`/vendor go build -v -o /opt/bin/media_repo ./src/github.com/turt2live/matrix-media-repo/cmd/media_repo/ \
- && GOPATH=`pwd`:`pwd`/vendor go build -v -o /opt/bin/import_synapse ./src/github.com/turt2live/matrix-media-repo/cmd/import_synapse/
+RUN ./build.sh
 
 # ---- Stage 1 ----
 # Final runtime stage.
 FROM alpine
 
+COPY --from=builder /opt/bin/media_repo /opt/bin/import_synapse /usr/local/bin/
+
 RUN apk add --no-cache \
         su-exec \
         ca-certificates
 
-COPY --from=builder /opt/bin/media_repo /opt/bin/import_synapse /usr/local/bin/
-
 COPY ./config.sample.yaml /etc/media-repo.yaml.sample
 COPY ./migrations /var/lib/media-repo-migrations
 COPY ./docker/run.sh /usr/local/bin/
diff --git a/README.md b/README.md
index a510ddaed17a2c23847d9bb8dbbd3853d1e360f1..80c224d2bed6d27f056de3d1ebbc6cc9195c8284 100644
--- a/README.md
+++ b/README.md
@@ -9,21 +9,14 @@ Designed for environments with multiple homeservers, matrix-media-repo de-duplic
 
 # Installing
 
-Assuming Go 1.9 is already installed on your PATH:
+Assuming Go 1.12+ is already installed on your PATH:
 ```bash
 # Get it
 git clone https://github.com/turt2live/matrix-media-repo
 cd matrix-media-repo
 
-# Set up the build tools
-currentDir=$(pwd)
-export GOPATH="$currentDir/vendor/src:$currentDir/vendor:$currentDir:"$GOPATH
-go get github.com/constabulary/gb/...
-export PATH=$PATH":$currentDir/vendor/bin:$currentDir/vendor/src/bin"
-
 # Build it
-gb vendor restore
-gb build
+./build.sh
 
 # Configure it (edit media-repo.yaml to meet your needs)
 cp config.sample.yaml media-repo.yaml
@@ -32,14 +25,6 @@ cp config.sample.yaml media-repo.yaml
 bin/media_repo
 ```
 
-### Installing in Alpine Linux
-
-The steps are almost the same as above. The only difference is that `gb build` will not work, so instead use the following lines:
-```bash
-go build -o bin/media_repo ./src/github.com/turt2live/matrix-media-repo/cmd/media_repo/
-go build -o bin/import_synapse ./src/github.com/turt2live/matrix-media-repo/cmd/import_synapse/
-```
-
 # Deployment
 
 This is intended to run behind a load balancer and beside your homeserver deployments. A sample nginx configuration for this is:
@@ -128,7 +113,7 @@ listeners:
 
 Media is imported by connecting to your synapse database and downloading all the content from the homeserver. This is so you have a backup of the media repository still with synapse. **Do not point traffic at the media repo until after the import is complete.**
 
-1. Build the media repo
+1. Build the media repo (as stated above)
 2. Configure the `media-repo.yaml`
 3. Run `bin/import_synapse`. The usage is below. 
     ```
diff --git a/src/github.com/turt2live/matrix-media-repo/api/auth.go b/api/auth.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/api/auth.go
rename to api/auth.go
diff --git a/src/github.com/turt2live/matrix-media-repo/api/custom/datastores.go b/api/custom/datastores.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/api/custom/datastores.go
rename to api/custom/datastores.go
diff --git a/src/github.com/turt2live/matrix-media-repo/api/custom/federation.go b/api/custom/federation.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/api/custom/federation.go
rename to api/custom/federation.go
diff --git a/src/github.com/turt2live/matrix-media-repo/api/custom/health.go b/api/custom/health.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/api/custom/health.go
rename to api/custom/health.go
diff --git a/src/github.com/turt2live/matrix-media-repo/api/custom/purge.go b/api/custom/purge.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/api/custom/purge.go
rename to api/custom/purge.go
diff --git a/src/github.com/turt2live/matrix-media-repo/api/custom/quarantine.go b/api/custom/quarantine.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/api/custom/quarantine.go
rename to api/custom/quarantine.go
diff --git a/src/github.com/turt2live/matrix-media-repo/api/general_handlers.go b/api/general_handlers.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/api/general_handlers.go
rename to api/general_handlers.go
diff --git a/src/github.com/turt2live/matrix-media-repo/api/r0/download.go b/api/r0/download.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/api/r0/download.go
rename to api/r0/download.go
diff --git a/src/github.com/turt2live/matrix-media-repo/api/r0/identicon.go b/api/r0/identicon.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/api/r0/identicon.go
rename to api/r0/identicon.go
diff --git a/src/github.com/turt2live/matrix-media-repo/api/r0/preview_url.go b/api/r0/preview_url.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/api/r0/preview_url.go
rename to api/r0/preview_url.go
diff --git a/src/github.com/turt2live/matrix-media-repo/api/r0/public_config.go b/api/r0/public_config.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/api/r0/public_config.go
rename to api/r0/public_config.go
diff --git a/src/github.com/turt2live/matrix-media-repo/api/r0/thumbnail.go b/api/r0/thumbnail.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/api/r0/thumbnail.go
rename to api/r0/thumbnail.go
diff --git a/src/github.com/turt2live/matrix-media-repo/api/r0/upload.go b/api/r0/upload.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/api/r0/upload.go
rename to api/r0/upload.go
diff --git a/src/github.com/turt2live/matrix-media-repo/api/responses.go b/api/responses.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/api/responses.go
rename to api/responses.go
diff --git a/src/github.com/turt2live/matrix-media-repo/api/unstable/info.go b/api/unstable/info.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/api/unstable/info.go
rename to api/unstable/info.go
diff --git a/src/github.com/turt2live/matrix-media-repo/api/unstable/local_copy.go b/api/unstable/local_copy.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/api/unstable/local_copy.go
rename to api/unstable/local_copy.go
diff --git a/src/github.com/turt2live/matrix-media-repo/api/webserver/request_counter.go b/api/webserver/request_counter.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/api/webserver/request_counter.go
rename to api/webserver/request_counter.go
diff --git a/src/github.com/turt2live/matrix-media-repo/api/webserver/route_handler.go b/api/webserver/route_handler.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/api/webserver/route_handler.go
rename to api/webserver/route_handler.go
diff --git a/src/github.com/turt2live/matrix-media-repo/api/webserver/webserver.go b/api/webserver/webserver.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/api/webserver/webserver.go
rename to api/webserver/webserver.go
diff --git a/appveyor.yml b/appveyor.yml
index 0912a32a67d7fd387738ac8dec938e24a3135cfb..b3b2081265cbcfbc4ba10c0f98e23d56531a5ff8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,7 +4,7 @@ clone_folder: c:\gopath\src\github.com\turt2live\matrix-media-repo
 
 environment:
   GOPATH: c:\gopath
-  GOVERSION: 1.9
+  GOVERSION: 1.12
   
 branches:
   only: [master, develop]
@@ -20,11 +20,11 @@ install:
   - set PATH=c:\go\bin;c:\gopath\bin;%PATH%
   - go version
   - go env
-  - go get github.com/constabulary/gb/...
-  - gb vendor restore
 
 build_script:
-  - gb build all
+  - set GOBIN=%CD%/bin
+  - set GO111MODULE=on
+  - go install -v ./cmd/...
 
 artifacts:
   - path: bin/media_repo.exe
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000000000000000000000000000000000000..9a8050f3cec57a2fb2068dab30479078640345ec
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+GOBIN=$PWD/`dirname $0`/bin go install -v ./cmd/...
diff --git a/src/github.com/turt2live/matrix-media-repo/cmd/import_synapse/main.go b/cmd/import_synapse/main.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/cmd/import_synapse/main.go
rename to cmd/import_synapse/main.go
diff --git a/src/github.com/turt2live/matrix-media-repo/cmd/media_repo/main.go b/cmd/media_repo/main.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/cmd/media_repo/main.go
rename to cmd/media_repo/main.go
diff --git a/src/github.com/turt2live/matrix-media-repo/cmd/sytest_homeserver/main.go b/cmd/sytest_homeserver/main.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/cmd/sytest_homeserver/main.go
rename to cmd/sytest_homeserver/main.go
diff --git a/src/github.com/turt2live/matrix-media-repo/common/config/config.go b/common/config/config.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/common/config/config.go
rename to common/config/config.go
diff --git a/src/github.com/turt2live/matrix-media-repo/common/errorcodes.go b/common/errorcodes.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/common/errorcodes.go
rename to common/errorcodes.go
diff --git a/src/github.com/turt2live/matrix-media-repo/common/errors.go b/common/errors.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/common/errors.go
rename to common/errors.go
diff --git a/src/github.com/turt2live/matrix-media-repo/common/logging/logger.go b/common/logging/logger.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/common/logging/logger.go
rename to common/logging/logger.go
diff --git a/src/github.com/turt2live/matrix-media-repo/controllers/download_controller/download_controller.go b/controllers/download_controller/download_controller.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/controllers/download_controller/download_controller.go
rename to controllers/download_controller/download_controller.go
diff --git a/src/github.com/turt2live/matrix-media-repo/controllers/download_controller/download_resource_handler.go b/controllers/download_controller/download_resource_handler.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/controllers/download_controller/download_resource_handler.go
rename to controllers/download_controller/download_resource_handler.go
diff --git a/src/github.com/turt2live/matrix-media-repo/controllers/maintenance_controller/maintainance_controller.go b/controllers/maintenance_controller/maintainance_controller.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/controllers/maintenance_controller/maintainance_controller.go
rename to controllers/maintenance_controller/maintainance_controller.go
diff --git a/src/github.com/turt2live/matrix-media-repo/controllers/preview_controller/acl/acl.go b/controllers/preview_controller/acl/acl.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/controllers/preview_controller/acl/acl.go
rename to controllers/preview_controller/acl/acl.go
diff --git a/src/github.com/turt2live/matrix-media-repo/controllers/preview_controller/preview_controller.go b/controllers/preview_controller/preview_controller.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/controllers/preview_controller/preview_controller.go
rename to controllers/preview_controller/preview_controller.go
diff --git a/src/github.com/turt2live/matrix-media-repo/controllers/preview_controller/preview_resource_handler.go b/controllers/preview_controller/preview_resource_handler.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/controllers/preview_controller/preview_resource_handler.go
rename to controllers/preview_controller/preview_resource_handler.go
diff --git a/src/github.com/turt2live/matrix-media-repo/controllers/preview_controller/preview_types/types.go b/controllers/preview_controller/preview_types/types.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/controllers/preview_controller/preview_types/types.go
rename to controllers/preview_controller/preview_types/types.go
diff --git a/src/github.com/turt2live/matrix-media-repo/controllers/preview_controller/previewers/calculated_previewer.go b/controllers/preview_controller/previewers/calculated_previewer.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/controllers/preview_controller/previewers/calculated_previewer.go
rename to controllers/preview_controller/previewers/calculated_previewer.go
diff --git a/src/github.com/turt2live/matrix-media-repo/controllers/preview_controller/previewers/http.go b/controllers/preview_controller/previewers/http.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/controllers/preview_controller/previewers/http.go
rename to controllers/preview_controller/previewers/http.go
diff --git a/src/github.com/turt2live/matrix-media-repo/controllers/preview_controller/previewers/opengraph_previewer.go b/controllers/preview_controller/previewers/opengraph_previewer.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/controllers/preview_controller/previewers/opengraph_previewer.go
rename to controllers/preview_controller/previewers/opengraph_previewer.go
diff --git a/src/github.com/turt2live/matrix-media-repo/controllers/preview_controller/previewers/util.go b/controllers/preview_controller/previewers/util.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/controllers/preview_controller/previewers/util.go
rename to controllers/preview_controller/previewers/util.go
diff --git a/src/github.com/turt2live/matrix-media-repo/controllers/thumbnail_controller/thumbnail_controller.go b/controllers/thumbnail_controller/thumbnail_controller.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/controllers/thumbnail_controller/thumbnail_controller.go
rename to controllers/thumbnail_controller/thumbnail_controller.go
diff --git a/src/github.com/turt2live/matrix-media-repo/controllers/thumbnail_controller/thumbnail_resource_handler.go b/controllers/thumbnail_controller/thumbnail_resource_handler.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/controllers/thumbnail_controller/thumbnail_resource_handler.go
rename to controllers/thumbnail_controller/thumbnail_resource_handler.go
diff --git a/src/github.com/turt2live/matrix-media-repo/controllers/upload_controller/upload_controller.go b/controllers/upload_controller/upload_controller.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/controllers/upload_controller/upload_controller.go
rename to controllers/upload_controller/upload_controller.go
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000000000000000000000000000000000000..546fdb2734cc8f09b81a09272f56616058b584b7
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,55 @@
+module github.com/turt2live/matrix-media-repo
+
+go 1.12
+
+require (
+	github.com/DavidHuie/gomigrate v0.0.0-20160809001028-4004e6142040
+	github.com/PuerkitoBio/goquery v0.0.0-20171206121606-bc4e06eb0792
+	github.com/ajstarks/svgo v0.0.0-20171111115224-f9be02f22f2c
+	github.com/alioygur/is v0.0.0-20170213121024-204f48747743
+	github.com/andybalholm/cascadia v0.0.0-20161224141413-349dd0209470
+	github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973
+	github.com/cenk/backoff v2.0.0+incompatible
+	github.com/codegangsta/negroni v0.0.0-20180105164225-ff85fb036d90
+	github.com/cupcake/sigil v0.0.0-20131127230922-6bf9722f2ae8
+	github.com/didip/tollbooth v4.0.0+incompatible
+	github.com/disintegration/imaging v1.2.4
+	github.com/djherbis/stream v0.0.0-20180113022625-311bd3bbfe82
+	github.com/dyatlov/go-opengraph v0.0.0-20160203134303-41a3523719df
+	github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a
+	github.com/fogleman/gg v0.0.0-20170728225521-e611489b8685
+	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
+	github.com/golang/protobuf v1.2.0
+	github.com/gorilla/mux v0.0.0-20171109035402-2d5fef06b891
+	github.com/h2non/filetype v0.0.0-20180111114405-3af83f124ffa
+	github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c
+	github.com/jeffail/tunny v0.0.0-20180304204616-59cfa8fcb19f
+	github.com/lestrrat/go-file-rotatelogs v0.0.0-20170501063831-9df8b44f2178
+	github.com/lestrrat/go-strftime v0.0.0-20170113112000-04ef93e28531
+	github.com/lib/pq v0.0.0-20171022192043-b609790bd85e
+	github.com/matttproud/golang_protobuf_extensions v1.0.1
+	github.com/minio/minio-go v0.0.0-20190131015406-c8a261de75c1
+	github.com/mitchellh/go-homedir v1.1.0
+	github.com/olebedev/emitter v0.0.0-20171221095905-68bb25b251f6
+	github.com/patrickmn/go-cache v2.1.0+incompatible
+	github.com/pkg/errors v0.0.0-20171018195549-f15c970de5b7
+	github.com/prometheus/client_golang v0.0.0-20181116151817-3fb53dff765f
+	github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910
+	github.com/prometheus/common v0.0.0-20181116084131-1f2c4f3cd6db
+	github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d
+	github.com/rifflock/lfshook v0.0.0-20170910022531-3bcf86f879c7
+	github.com/rubyist/circuitbreaker v2.2.1+incompatible
+	github.com/rwcarlsen/goexif v0.0.0-20180110181140-17202558c8d9
+	github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735
+	github.com/sebest/xff v0.0.0-20160910043805-6c115e0ffa35
+	github.com/sirupsen/logrus v0.0.0-20170822132746-89742aefa4b2
+	golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613
+	golang.org/x/image v0.0.0-20171214225156-12117c17ca67
+	golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3
+	golang.org/x/sys v0.0.0-20190203050204-7ae0202eb74c
+	golang.org/x/text v0.3.0
+	golang.org/x/time v0.0.0-20170927054726-6dc17368e09b
+	gopkg.in/h2non/filetype.v1 v1.0.5
+	gopkg.in/ini.v1 v1.41.0
+	gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7
+)
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000000000000000000000000000000000000..4255c4939d7fa8c206b0e0648b254ded9caf828f
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,112 @@
+github.com/DavidHuie/gomigrate v0.0.0-20160809001028-4004e6142040 h1:BaIvMMd6mG0r4WNpOzGFjqBYv8zz4Zoi5dzTcrAPGpY=
+github.com/DavidHuie/gomigrate v0.0.0-20160809001028-4004e6142040/go.mod h1:F3GZLX+VN44AjFiyKD8++nq8sVE0Sw3bOhhQ3mUffnM=
+github.com/PuerkitoBio/goquery v0.0.0-20171206121606-bc4e06eb0792 h1:z1EfQR3dcEwyDXRxdy1YhVT5IqSvYoIUicxn00tSkZY=
+github.com/PuerkitoBio/goquery v0.0.0-20171206121606-bc4e06eb0792/go.mod h1:T9ezsOHcCrDCgA8aF1Cqr3sSYbO/xgdy8/R/XiIMAhA=
+github.com/ajstarks/svgo v0.0.0-20171111115224-f9be02f22f2c h1:EkbaKSiLkX5LJZp5gWk3DPP6dflpRDpqTii1fBAw/G4=
+github.com/ajstarks/svgo v0.0.0-20171111115224-f9be02f22f2c/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
+github.com/alioygur/is v0.0.0-20170213121024-204f48747743 h1:Ou8l+Rf3eEEM4mukAbO7uvy4+5qgx6HBasKKLl8rsFk=
+github.com/alioygur/is v0.0.0-20170213121024-204f48747743/go.mod h1:fmXi78K26iMaOs0fINRVLl1TIPCYcLfOopoZ5+mc8AE=
+github.com/andybalholm/cascadia v0.0.0-20161224141413-349dd0209470 h1:4jHLmof+Hba81591gfH5xYA8QXzuvgksxwPNrmjR2BA=
+github.com/andybalholm/cascadia v0.0.0-20161224141413-349dd0209470/go.mod h1:3I+3V7B6gTBYfdpYgIG2ymALS9H+5VDKUl3lHH7ToM4=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/cenk/backoff v2.0.0+incompatible h1:7vXVw3g7XE+Vnj0A9TmFGtMeP4oZQ5ZzpPvKhLFa80E=
+github.com/cenk/backoff v2.0.0+incompatible/go.mod h1:7FtoeaSnHoZnmZzz47cM35Y9nSW7tNyaidugnHTaFDE=
+github.com/codegangsta/negroni v0.0.0-20180105164225-ff85fb036d90/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0=
+github.com/cupcake/sigil v0.0.0-20131127230922-6bf9722f2ae8 h1:OPuOoDEMJx86BQOPt4rfZvOjquI3Ym3XUE1Dy+gQoVs=
+github.com/cupcake/sigil v0.0.0-20131127230922-6bf9722f2ae8/go.mod h1:paJ9TzhB9Ke4jQk99LQSyBdSILWICp01d7R0S8CSCPI=
+github.com/didip/tollbooth v4.0.0+incompatible h1:ayQZYuF5QOxx3NdYRNuRVFLv9/2b64JtSUlewb+0TMo=
+github.com/didip/tollbooth v4.0.0+incompatible/go.mod h1:A9b0665CE6l1KmzpDws2++elm/CsuWBMa5Jv4WY0PEY=
+github.com/disintegration/imaging v1.2.4 h1:eJRPGef+mQ4WZ8cED/pqElxW4+79zBjJYTjYv48GZOM=
+github.com/disintegration/imaging v1.2.4/go.mod h1:9B/deIUIrliYkyMTuXJd6OUFLcrZ2tf+3Qlwnaf/CjU=
+github.com/djherbis/stream v0.0.0-20180113022625-311bd3bbfe82 h1:RIpwzqf44uzYuaK6yfIp9m985kwVR82yvV77T7Cvkjk=
+github.com/djherbis/stream v0.0.0-20180113022625-311bd3bbfe82/go.mod h1:ZNVKPVRCmrwhCwQHZUpVHHrq2rtGLrG1t3T/TThYLP8=
+github.com/dyatlov/go-opengraph v0.0.0-20160203134303-41a3523719df h1:/XZvBjuoyXsk7DRR9vI8JSRTqRS8f163L9bRdY5Sfw0=
+github.com/dyatlov/go-opengraph v0.0.0-20160203134303-41a3523719df/go.mod h1:nYia/MIs9OyvXXYboPmNOj0gVWo97Wx0sde+ZuKkoM4=
+github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a h1:yDWHCSQ40h88yih2JAcL6Ls/kVkSE8GFACTGVnMPruw=
+github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a/go.mod h1:7Ga40egUymuWXxAe151lTNnCv97MddSOVsjpPPkityA=
+github.com/fogleman/gg v0.0.0-20170728225521-e611489b8685 h1:TF8uyHqfQIGtXljpcEtDbXU5tmPrEJxo/U+BA0fwChQ=
+github.com/fogleman/gg v0.0.0-20170728225521-e611489b8685/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
+github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
+github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
+github.com/golang/protobuf v0.0.0-20181115010534-52132540909e/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0=
+github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gorilla/mux v0.0.0-20171109035402-2d5fef06b891 h1:XPg8lWXVWI9SwoBY0YPVWZUAGgGJuPzTMDIsN3jDdmY=
+github.com/gorilla/mux v0.0.0-20171109035402-2d5fef06b891/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/h2non/filetype v0.0.0-20180111114405-3af83f124ffa h1:nLTwObQQERna5gA0odMzmbdfvJJKTVVuIBH9EWSBpQ4=
+github.com/h2non/filetype v0.0.0-20180111114405-3af83f124ffa/go.mod h1:isekKqOuhMj+s/7r3rIeTErIRy4Rub5uBWHfvMusLMU=
+github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c h1:kQWxfPIHVLbgLzphqk3QUflDy9QdksZR4ygR807bpy0=
+github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs=
+github.com/jeffail/tunny v0.0.0-20180304204616-59cfa8fcb19f h1:/g3Ah9sPxVw/5djv+hVjCkiIm5csSANpMzImtUrs0C4=
+github.com/jeffail/tunny v0.0.0-20180304204616-59cfa8fcb19f/go.mod h1:xEtIQqKezH16r1oRe/zbA9XJ3nqMCcD5POAF/VhfXns=
+github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/lestrrat/go-file-rotatelogs v0.0.0-20170501063831-9df8b44f2178 h1:a2CGbVCxDXsSBjI3pnpD8Bk4xbDQWd152QOso6AR4RQ=
+github.com/lestrrat/go-file-rotatelogs v0.0.0-20170501063831-9df8b44f2178/go.mod h1:UGmTpUd3rjbtfIpwAPrcfmGf/Z1HS95TATB+m57TPB8=
+github.com/lestrrat/go-strftime v0.0.0-20170113112000-04ef93e28531 h1:qA9RB9NobSxHKYfJrOcqHFL8uanRWCG3+rN4CibuNPc=
+github.com/lestrrat/go-strftime v0.0.0-20170113112000-04ef93e28531/go.mod h1:TPpsiPUEh0zFL1Snz4crhMlBe60PYxRHr5oFF3rRYg0=
+github.com/lib/pq v0.0.0-20171022192043-b609790bd85e h1:1qCfiDN0AcL0+q3Rooed70ztlReITlD4CBZKgmjKO20=
+github.com/lib/pq v0.0.0-20171022192043-b609790bd85e/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/minio/minio-go v0.0.0-20190131015406-c8a261de75c1 h1:jw16EimP5oAEM/2wt+SiEUov/YDyTCTDuPtIKgQIvk0=
+github.com/minio/minio-go v0.0.0-20190131015406-c8a261de75c1/go.mod h1:vuvdOZLJuf5HmJAJrKV64MmozrSsk+or0PB5dzdfspg=
+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/olebedev/emitter v0.0.0-20171221095905-68bb25b251f6 h1:m0g4dRVyieASV4C7JXRwBQbEu9hgNwaJvE3/36xqI7A=
+github.com/olebedev/emitter v0.0.0-20171221095905-68bb25b251f6/go.mod h1:eT2/Pcsim3XBjbvldGiJBvvgiqZkAFyiOJJsDKXs/ts=
+github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
+github.com/pkg/errors v0.0.0-20171018195549-f15c970de5b7 h1:rRublLXoszYPRZV8Ikd3RTmqVCW289H3FsgqRcfDZhY=
+github.com/pkg/errors v0.0.0-20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/prometheus/client_golang v0.0.0-20181116151817-3fb53dff765f h1:MKGIWwiGxr9mkCN3JgOaUd5HdN3Gx7twcm1tlzIvWiE=
+github.com/prometheus/client_golang v0.0.0-20181116151817-3fb53dff765f/go.mod h1:ndC87eMVAEcyczLB9sFt/fqYv0prse/wOIPyKBapgBk=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/common v0.0.0-20181116084131-1f2c4f3cd6db h1:ckMAAQJ96ZKwKyiGamJdsinLn3D9+daeRlvvmYo9tkI=
+github.com/prometheus/common v0.0.0-20181116084131-1f2c4f3cd6db/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d h1:GoAlyOgbOEIFdaDqxJVlbOQ1DtGmZWs/Qau0hIlk+WQ=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/rifflock/lfshook v0.0.0-20170910022531-3bcf86f879c7 h1:kFbvGhKIayIE2CjsXYHegYvsVIwFUsOViCbE0uGCEgY=
+github.com/rifflock/lfshook v0.0.0-20170910022531-3bcf86f879c7/go.mod h1:GEXHk5HgEKCvEIIrSpFI3ozzG5xOKA2DVlEX/gGnewM=
+github.com/rubyist/circuitbreaker v2.2.1+incompatible h1:KUKd/pV8Geg77+8LNDwdow6rVCAYOp8+kHUyFvL6Mhk=
+github.com/rubyist/circuitbreaker v2.2.1+incompatible/go.mod h1:Ycs3JgJADPuzJDwffe12k6BZT8hxVi6lFK+gWYJLN4A=
+github.com/rwcarlsen/goexif v0.0.0-20180110181140-17202558c8d9 h1:tvQehuHDsJun8SWPxjYVuEOCFRTq14MTUCB0FRa+vn0=
+github.com/rwcarlsen/goexif v0.0.0-20180110181140-17202558c8d9/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
+github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735 h1:7YvPJVmEeFHR1Tj9sZEYsmarJEQfMVYpd/Vyy/A8dqE=
+github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
+github.com/sebest/xff v0.0.0-20160910043805-6c115e0ffa35 h1:eajwn6K3weW5cd1ZXLu2sJ4pvwlBiCWY4uDejOr73gM=
+github.com/sebest/xff v0.0.0-20160910043805-6c115e0ffa35/go.mod h1:wozgYq9WEBQBaIJe4YZ0qTSFAMxmcwBhQH0fO0R34Z0=
+github.com/sirupsen/logrus v0.0.0-20170822132746-89742aefa4b2 h1:+8J/sCAVv2Y9Ct1BKszDFJEVWv6Aynr2O4FYGUg6+Mc=
+github.com/sirupsen/logrus v0.0.0-20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
+github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
+golang.org/x/crypto v0.0.0-20190128193316-c7b33c32a30b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613 h1:MQ/ZZiDsUapFFiMS+vzwXkCTeEKaum+Do5rINYJDmxc=
+golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/image v0.0.0-20171214225156-12117c17ca67 h1:L8S612DBEq9tpLTxczHuhrf5il+KEdSha8b5A5njQMc=
+golang.org/x/image v0.0.0-20171214225156-12117c17ca67/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3 h1:ulvT7fqt0yHWzpJwI57MezWnYDVpCAYBVuYst/L+fAY=
+golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190203050204-7ae0202eb74c h1:YeMXU0KQqExdpG959DFhAhfpY8myIsnfqj8lhNFRzzE=
+golang.org/x/sys v0.0.0-20190203050204-7ae0202eb74c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.0.0-20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/time v0.0.0-20170927054726-6dc17368e09b h1:3X+R0qq1+64izd8es+EttB6qcY+JDlVmAhpRXl7gpzU=
+golang.org/x/time v0.0.0-20170927054726-6dc17368e09b/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+gopkg.in/h2non/filetype.v1 v1.0.5 h1:CC1jjJjoEhNVbMhXYalmGBhOBK2V70Q1N850wt/98/Y=
+gopkg.in/h2non/filetype.v1 v1.0.5/go.mod h1:M0yem4rwSX5lLVrkEuRRp2/NinFMD5vgJ4DlAhZcfNo=
+gopkg.in/ini.v1 v1.41.0 h1:Ka3ViY6gNYSKiVy71zXBEqKplnV35ImDLVG+8uoIklE=
+gopkg.in/ini.v1 v1.41.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7 h1:+t9dhfO+GNOIGJof6kPOAenx7YgrZMTdRPV+EsnPabk=
+gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
diff --git a/src/github.com/turt2live/matrix-media-repo/internal_cache/media_cache.go b/internal_cache/media_cache.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/internal_cache/media_cache.go
rename to internal_cache/media_cache.go
diff --git a/src/github.com/turt2live/matrix-media-repo/matrix/admin.go b/matrix/admin.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/matrix/admin.go
rename to matrix/admin.go
diff --git a/src/github.com/turt2live/matrix-media-repo/matrix/auth.go b/matrix/auth.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/matrix/auth.go
rename to matrix/auth.go
diff --git a/src/github.com/turt2live/matrix-media-repo/matrix/client_server.go b/matrix/client_server.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/matrix/client_server.go
rename to matrix/client_server.go
diff --git a/src/github.com/turt2live/matrix-media-repo/matrix/federation.go b/matrix/federation.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/matrix/federation.go
rename to matrix/federation.go
diff --git a/src/github.com/turt2live/matrix-media-repo/matrix/matrix.go b/matrix/matrix.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/matrix/matrix.go
rename to matrix/matrix.go
diff --git a/src/github.com/turt2live/matrix-media-repo/matrix/responses.go b/matrix/responses.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/matrix/responses.go
rename to matrix/responses.go
diff --git a/src/github.com/turt2live/matrix-media-repo/metrics/metrics.go b/metrics/metrics.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/metrics/metrics.go
rename to metrics/metrics.go
diff --git a/src/github.com/turt2live/matrix-media-repo/metrics/webserver.go b/metrics/webserver.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/metrics/webserver.go
rename to metrics/webserver.go
diff --git a/src/github.com/turt2live/matrix-media-repo/storage/datastore/datastore.go b/storage/datastore/datastore.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/storage/datastore/datastore.go
rename to storage/datastore/datastore.go
diff --git a/src/github.com/turt2live/matrix-media-repo/storage/datastore/datastore_ref.go b/storage/datastore/datastore_ref.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/storage/datastore/datastore_ref.go
rename to storage/datastore/datastore_ref.go
diff --git a/src/github.com/turt2live/matrix-media-repo/storage/datastore/ds_file/file_store.go b/storage/datastore/ds_file/file_store.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/storage/datastore/ds_file/file_store.go
rename to storage/datastore/ds_file/file_store.go
diff --git a/src/github.com/turt2live/matrix-media-repo/storage/datastore/ds_s3/s3_store.go b/storage/datastore/ds_s3/s3_store.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/storage/datastore/ds_s3/s3_store.go
rename to storage/datastore/ds_s3/s3_store.go
diff --git a/src/github.com/turt2live/matrix-media-repo/storage/ds_utils.go b/storage/ds_utils.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/storage/ds_utils.go
rename to storage/ds_utils.go
diff --git a/src/github.com/turt2live/matrix-media-repo/storage/startup_migrations.go b/storage/startup_migrations.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/storage/startup_migrations.go
rename to storage/startup_migrations.go
diff --git a/src/github.com/turt2live/matrix-media-repo/storage/storage.go b/storage/storage.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/storage/storage.go
rename to storage/storage.go
diff --git a/src/github.com/turt2live/matrix-media-repo/storage/stores/media_store.go b/storage/stores/media_store.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/storage/stores/media_store.go
rename to storage/stores/media_store.go
diff --git a/src/github.com/turt2live/matrix-media-repo/storage/stores/metadata_store.go b/storage/stores/metadata_store.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/storage/stores/metadata_store.go
rename to storage/stores/metadata_store.go
diff --git a/src/github.com/turt2live/matrix-media-repo/storage/stores/thumbnail_store.go b/storage/stores/thumbnail_store.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/storage/stores/thumbnail_store.go
rename to storage/stores/thumbnail_store.go
diff --git a/src/github.com/turt2live/matrix-media-repo/storage/stores/url_store.go b/storage/stores/url_store.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/storage/stores/url_store.go
rename to storage/stores/url_store.go
diff --git a/src/github.com/turt2live/matrix-media-repo/synapse/db.go b/synapse/db.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/synapse/db.go
rename to synapse/db.go
diff --git a/src/github.com/turt2live/matrix-media-repo/synapse/local_media.go b/synapse/local_media.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/synapse/local_media.go
rename to synapse/local_media.go
diff --git a/src/github.com/turt2live/matrix-media-repo/types/datastore.go b/types/datastore.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/types/datastore.go
rename to types/datastore.go
diff --git a/src/github.com/turt2live/matrix-media-repo/types/media.go b/types/media.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/types/media.go
rename to types/media.go
diff --git a/src/github.com/turt2live/matrix-media-repo/types/object_info.go b/types/object_info.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/types/object_info.go
rename to types/object_info.go
diff --git a/src/github.com/turt2live/matrix-media-repo/types/thumbnail.go b/types/thumbnail.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/types/thumbnail.go
rename to types/thumbnail.go
diff --git a/src/github.com/turt2live/matrix-media-repo/types/url_preview.go b/types/url_preview.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/types/url_preview.go
rename to types/url_preview.go
diff --git a/src/github.com/turt2live/matrix-media-repo/util/arrays.go b/util/arrays.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/util/arrays.go
rename to util/arrays.go
diff --git a/src/github.com/turt2live/matrix-media-repo/util/config.go b/util/config.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/util/config.go
rename to util/config.go
diff --git a/src/github.com/turt2live/matrix-media-repo/util/download_tracker/tracker.go b/util/download_tracker/tracker.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/util/download_tracker/tracker.go
rename to util/download_tracker/tracker.go
diff --git a/src/github.com/turt2live/matrix-media-repo/util/files.go b/util/files.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/util/files.go
rename to util/files.go
diff --git a/src/github.com/turt2live/matrix-media-repo/util/http.go b/util/http.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/util/http.go
rename to util/http.go
diff --git a/src/github.com/turt2live/matrix-media-repo/util/math.go b/util/math.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/util/math.go
rename to util/math.go
diff --git a/src/github.com/turt2live/matrix-media-repo/util/mime.go b/util/mime.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/util/mime.go
rename to util/mime.go
diff --git a/src/github.com/turt2live/matrix-media-repo/util/mxc.go b/util/mxc.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/util/mxc.go
rename to util/mxc.go
diff --git a/src/github.com/turt2live/matrix-media-repo/util/random.go b/util/random.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/util/random.go
rename to util/random.go
diff --git a/src/github.com/turt2live/matrix-media-repo/util/resource_handler/handler.go b/util/resource_handler/handler.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/util/resource_handler/handler.go
rename to util/resource_handler/handler.go
diff --git a/src/github.com/turt2live/matrix-media-repo/util/streams.go b/util/streams.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/util/streams.go
rename to util/streams.go
diff --git a/src/github.com/turt2live/matrix-media-repo/util/time.go b/util/time.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/util/time.go
rename to util/time.go
diff --git a/src/github.com/turt2live/matrix-media-repo/util/util_exif/exif.go b/util/util_exif/exif.go
similarity index 100%
rename from src/github.com/turt2live/matrix-media-repo/util/util_exif/exif.go
rename to util/util_exif/exif.go
diff --git a/vendor/manifest b/vendor/manifest
deleted file mode 100644
index 7730ad31b1f6e64a55bc343ba50c6ec2c333ac26..0000000000000000000000000000000000000000
--- a/vendor/manifest
+++ /dev/null
@@ -1,460 +0,0 @@
-{
-	"version": 0,
-	"dependencies": [
-		{
-			"importpath": "github.com/DavidHuie/gomigrate",
-			"repository": "https://github.com/DavidHuie/gomigrate",
-			"revision": "4004e6142040f5d622e9d2be6e833a4652741571",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/PuerkitoBio/goquery",
-			"repository": "https://github.com/PuerkitoBio/goquery",
-			"revision": "bc4e06eb0792d1a14661d19dd7822163c25bb6bd",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/ajstarks/svgo",
-			"repository": "https://github.com/ajstarks/svgo",
-			"revision": "f9be02f22f2c23fbdd01ed76e5c7f5af79e13f9b",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/alioygur/is",
-			"repository": "https://github.com/alioygur/is",
-			"revision": "204f48747743cfc9b98e55f3f64b7ff483942140",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/andybalholm/cascadia",
-			"repository": "https://github.com/andybalholm/cascadia",
-			"revision": "349dd0209470eabd9514242c688c403c0926d266",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/beorn7/perks/quantile",
-			"repository": "https://github.com/beorn7/perks",
-			"revision": "3a771d992973f24aa725d07868b467d1ddfceafb",
-			"branch": "master",
-			"path": "/quantile"
-		},
-		{
-			"importpath": "github.com/cenk/backoff",
-			"repository": "https://github.com/cenk/backoff",
-			"revision": "2ea60e5f094469f9e65adb9cd103795b73ae743e",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/codegangsta/negroni",
-			"repository": "https://github.com/codegangsta/negroni",
-			"revision": "ff85fb036d90eda8518001242fcded1024e05c98",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/cupcake/sigil",
-			"repository": "https://github.com/cupcake/sigil",
-			"revision": "6bf9722f2ae82f58a0c7d48daeb40ec844b78eae",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/didip/tollbooth",
-			"repository": "https://github.com/didip/tollbooth",
-			"revision": "c95eaa3ddc98f635a91e218b48727fb2e06613ea",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/disintegration/imaging",
-			"repository": "https://github.com/disintegration/imaging",
-			"revision": "dd50a3ee9985ccd313a2f03c398fcaedc96dc707",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/djherbis/stream",
-			"repository": "https://github.com/djherbis/stream",
-			"revision": "311bd3bbfe82e47ac63c8c1bbb18f166606a602f",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/dyatlov/go-opengraph/opengraph",
-			"repository": "https://github.com/dyatlov/go-opengraph",
-			"revision": "41a3523719dfbe7e8f853fbd4061867543db5270",
-			"branch": "master",
-			"path": "/opengraph"
-		},
-		{
-			"importpath": "github.com/facebookgo/clock",
-			"repository": "https://github.com/facebookgo/clock",
-			"revision": "600d898af40aa09a7a93ecb9265d87b0504b6f03",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/fogleman/gg",
-			"repository": "https://github.com/fogleman/gg",
-			"revision": "e611489b8685808726d3f603571b763982d92f67",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/golang/freetype/raster",
-			"repository": "https://github.com/golang/freetype",
-			"revision": "e2365dfdc4a05e4b8299a783240d4a7d5a65d4e4",
-			"branch": "master",
-			"path": "/raster"
-		},
-		{
-			"importpath": "github.com/golang/freetype/truetype",
-			"repository": "https://github.com/golang/freetype",
-			"revision": "e2365dfdc4a05e4b8299a783240d4a7d5a65d4e4",
-			"branch": "master",
-			"path": "/truetype"
-		},
-		{
-			"importpath": "github.com/golang/protobuf/proto",
-			"repository": "https://github.com/golang/protobuf",
-			"revision": "52132540909e117f2b98b0694383dc0ab1e1deca",
-			"branch": "master",
-			"path": "/proto"
-		},
-		{
-			"importpath": "github.com/gorilla/mux",
-			"repository": "https://github.com/gorilla/mux",
-			"revision": "2d5fef06b891c971b14aa6f71ca5ab6c03a36e0e",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/h2non/filetype",
-			"repository": "https://github.com/h2non/filetype",
-			"revision": "3af83f124ffa7608154f68763a5d668359a20419",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/howeyc/gopass",
-			"repository": "https://github.com/howeyc/gopass",
-			"revision": "bf9dde6d0d2c004a008c27aaee91170c786f6db8",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/jeffail/tunny",
-			"repository": "https://github.com/jeffail/tunny",
-			"revision": "59cfa8fcb19f5acba8db07a0dd3cb2fa7edbc228",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/lestrrat/go-file-rotatelogs",
-			"repository": "https://github.com/lestrrat/go-file-rotatelogs",
-			"revision": "9df8b44f21785240553882138c5df2e9cc1db910",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/lestrrat/go-strftime",
-			"repository": "https://github.com/lestrrat/go-strftime",
-			"revision": "04ef93e285313c8978cbc7cad26d2aa7a9927451",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/lib/pq",
-			"repository": "https://github.com/lib/pq",
-			"revision": "b609790bd85edf8e9ab7e0f8912750a786177bcf",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/matttproud/golang_protobuf_extensions/pbutil",
-			"repository": "https://github.com/matttproud/golang_protobuf_extensions",
-			"revision": "c12348ce28de40eed0136aa2b644d0ee0650e56c",
-			"branch": "master",
-			"path": "/pbutil"
-		},
-		{
-			"importpath": "github.com/minio/minio-go",
-			"repository": "https://github.com/minio/minio-go",
-			"revision": "c8a261de75c1a9a9ece4dcc0c81ff6db525bcf27",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/mitchellh/go-homedir",
-			"repository": "https://github.com/mitchellh/go-homedir",
-			"revision": "af06845cf3004701891bf4fdb884bfe4920b3727",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/olebedev/emitter",
-			"repository": "https://github.com/olebedev/emitter",
-			"revision": "68bb25b251f61cde3824cc316f238f0da1704331",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/patrickmn/go-cache",
-			"repository": "https://github.com/patrickmn/go-cache",
-			"revision": "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/pkg/errors",
-			"repository": "https://github.com/pkg/errors",
-			"revision": "f15c970de5b76fac0b59abb32d62c17cc7bed265",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/prometheus/client_golang",
-			"repository": "https://github.com/prometheus/client_golang",
-			"revision": "3fb53dff765f8a3e0f9d8b1d5b86d4f8c4eb3a09",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/prometheus/client_model/go",
-			"repository": "https://github.com/prometheus/client_model",
-			"revision": "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f",
-			"branch": "master",
-			"path": "/go"
-		},
-		{
-			"importpath": "github.com/prometheus/common/expfmt",
-			"repository": "https://github.com/prometheus/common",
-			"revision": "1f2c4f3cd6db5fd6f68f36af6b6d5d936fd93c4e",
-			"branch": "master",
-			"path": "/expfmt"
-		},
-		{
-			"importpath": "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg",
-			"repository": "https://github.com/prometheus/common",
-			"revision": "1f2c4f3cd6db5fd6f68f36af6b6d5d936fd93c4e",
-			"branch": "master",
-			"path": "/internal/bitbucket.org/ww/goautoneg"
-		},
-		{
-			"importpath": "github.com/prometheus/common/model",
-			"repository": "https://github.com/prometheus/common",
-			"revision": "1f2c4f3cd6db5fd6f68f36af6b6d5d936fd93c4e",
-			"branch": "master",
-			"path": "/model"
-		},
-		{
-			"importpath": "github.com/prometheus/procfs",
-			"repository": "https://github.com/prometheus/procfs",
-			"revision": "185b4288413d2a0dd0806f78c90dde719829e5ae",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/rifflock/lfshook",
-			"repository": "https://github.com/rifflock/lfshook",
-			"revision": "3bcf86f879c771238f8a67832a1af71308801a47",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/rubyist/circuitbreaker",
-			"repository": "https://github.com/rubyist/circuitbreaker",
-			"revision": "2074adba5ddc7d5f7559448a9c3066573521c5bf",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/rwcarlsen/goexif",
-			"repository": "https://github.com/rwcarlsen/goexif",
-			"revision": "17202558c8d9c3fd047859f1a5e73fd9ae709187",
-			"branch": "go1"
-		},
-		{
-			"importpath": "github.com/ryanuber/go-glob",
-			"repository": "https://github.com/ryanuber/go-glob",
-			"revision": "256dc444b735e061061cf46c809487313d5b0065",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/sebest/xff",
-			"repository": "https://github.com/sebest/xff",
-			"revision": "6c115e0ffa35d6a2e3f7a9e797c9cf07f0da4b9f",
-			"branch": "master"
-		},
-		{
-			"importpath": "github.com/sirupsen/logrus",
-			"repository": "https://github.com/sirupsen/logrus",
-			"revision": "89742aefa4b206dcf400792f3bd35b542998eb3b",
-			"branch": "master"
-		},
-		{
-			"importpath": "golang.org/x/crypto/argon2",
-			"repository": "https://go.googlesource.com/crypto",
-			"revision": "b8fe1690c61389d7d2a8074a507d1d40c5d30448",
-			"branch": "master",
-			"path": "/argon2"
-		},
-		{
-			"importpath": "golang.org/x/crypto/blake2b",
-			"repository": "https://go.googlesource.com/crypto",
-			"revision": "b8fe1690c61389d7d2a8074a507d1d40c5d30448",
-			"branch": "master",
-			"path": "/blake2b"
-		},
-		{
-			"importpath": "golang.org/x/crypto/ed25519",
-			"repository": "https://go.googlesource.com/crypto",
-			"revision": "6a293f2d4b14b8e6d3f0539e383f6d0d30fce3fd",
-			"branch": "master",
-			"path": "/ed25519"
-		},
-		{
-			"importpath": "golang.org/x/crypto/ssh/terminal",
-			"repository": "https://go.googlesource.com/crypto",
-			"revision": "6a293f2d4b14b8e6d3f0539e383f6d0d30fce3fd",
-			"branch": "master",
-			"path": "/ssh/terminal"
-		},
-		{
-			"importpath": "golang.org/x/image/bmp",
-			"repository": "https://go.googlesource.com/image",
-			"revision": "f7e31b4ea2e3413ab91b4e7d2dc83e5f8d19a44c",
-			"branch": "master",
-			"path": "/bmp"
-		},
-		{
-			"importpath": "golang.org/x/image/draw",
-			"repository": "https://go.googlesource.com/image",
-			"revision": "12117c17ca67ffa1ce22e9409f3b0b0a93ac08c7",
-			"branch": "master",
-			"path": "/draw"
-		},
-		{
-			"importpath": "golang.org/x/image/font",
-			"repository": "https://go.googlesource.com/image",
-			"revision": "12117c17ca67ffa1ce22e9409f3b0b0a93ac08c7",
-			"branch": "master",
-			"path": "/font"
-		},
-		{
-			"importpath": "golang.org/x/image/math/f64",
-			"repository": "https://go.googlesource.com/image",
-			"revision": "12117c17ca67ffa1ce22e9409f3b0b0a93ac08c7",
-			"branch": "master",
-			"path": "/math/f64"
-		},
-		{
-			"importpath": "golang.org/x/image/math/fixed",
-			"repository": "https://go.googlesource.com/image",
-			"revision": "12117c17ca67ffa1ce22e9409f3b0b0a93ac08c7",
-			"branch": "master",
-			"path": "/math/fixed"
-		},
-		{
-			"importpath": "golang.org/x/image/tiff",
-			"repository": "https://go.googlesource.com/image",
-			"revision": "f7e31b4ea2e3413ab91b4e7d2dc83e5f8d19a44c",
-			"branch": "master",
-			"path": "/tiff"
-		},
-		{
-			"importpath": "golang.org/x/net/context",
-			"repository": "https://go.googlesource.com/net",
-			"revision": "42fe2e1c20de1054d3d30f82cc9fb5b41e2e3767",
-			"branch": "master",
-			"path": "/context"
-		},
-		{
-			"importpath": "golang.org/x/net/html",
-			"repository": "https://go.googlesource.com/net",
-			"revision": "fb018015d54fd2e3bfd5362a041991d350fde9d7",
-			"branch": "master",
-			"path": "/html"
-		},
-		{
-			"importpath": "golang.org/x/net/http/httpguts",
-			"repository": "https://go.googlesource.com/net",
-			"revision": "d26f9f9a57f3fab6a695bec0d84433c2c50f8bbf",
-			"branch": "master",
-			"path": "/http/httpguts"
-		},
-		{
-			"importpath": "golang.org/x/net/idna",
-			"repository": "https://go.googlesource.com/net",
-			"revision": "d26f9f9a57f3fab6a695bec0d84433c2c50f8bbf",
-			"branch": "master",
-			"path": "/idna"
-		},
-		{
-			"importpath": "golang.org/x/net/publicsuffix",
-			"repository": "https://go.googlesource.com/net",
-			"revision": "d26f9f9a57f3fab6a695bec0d84433c2c50f8bbf",
-			"branch": "master",
-			"path": "/publicsuffix"
-		},
-		{
-			"importpath": "golang.org/x/sys/cpu",
-			"repository": "https://go.googlesource.com/sys",
-			"revision": "7ae0202eb74c2b534255c71b5a15fa4115aabbcc",
-			"branch": "master",
-			"path": "/cpu"
-		},
-		{
-			"importpath": "golang.org/x/sys/unix",
-			"repository": "https://go.googlesource.com/sys",
-			"revision": "1e2299c37cc91a509f1b12369872d27be0ce98a6",
-			"branch": "master",
-			"path": "/unix"
-		},
-		{
-			"importpath": "golang.org/x/sys/windows",
-			"repository": "https://go.googlesource.com/sys",
-			"revision": "1e2299c37cc91a509f1b12369872d27be0ce98a6",
-			"branch": "master",
-			"path": "/windows"
-		},
-		{
-			"importpath": "golang.org/x/text/secure/bidirule",
-			"repository": "https://go.googlesource.com/text",
-			"revision": "e6919f6577db79269a6443b9dc46d18f2238fb5d",
-			"branch": "master",
-			"path": "/secure/bidirule"
-		},
-		{
-			"importpath": "golang.org/x/text/transform",
-			"repository": "https://go.googlesource.com/text",
-			"revision": "e6919f6577db79269a6443b9dc46d18f2238fb5d",
-			"branch": "master",
-			"path": "/transform"
-		},
-		{
-			"importpath": "golang.org/x/text/unicode/bidi",
-			"repository": "https://go.googlesource.com/text",
-			"revision": "e6919f6577db79269a6443b9dc46d18f2238fb5d",
-			"branch": "master",
-			"path": "/unicode/bidi"
-		},
-		{
-			"importpath": "golang.org/x/text/unicode/norm",
-			"repository": "https://go.googlesource.com/text",
-			"revision": "e6919f6577db79269a6443b9dc46d18f2238fb5d",
-			"branch": "master",
-			"path": "/unicode/norm"
-		},
-		{
-			"importpath": "golang.org/x/time/rate",
-			"repository": "https://go.googlesource.com/time",
-			"revision": "6dc17368e09b0e8634d71cac8168d853e869a0c7",
-			"branch": "master",
-			"path": "/rate"
-		},
-		{
-			"importpath": "gopkg.in/h2non/filetype.v1/matchers",
-			"repository": "https://gopkg.in/h2non/filetype.v1",
-			"revision": "cc14fdc9ca0e4c2bafad7458f6ff79fd3947cfbb",
-			"branch": "master",
-			"path": "/matchers"
-		},
-		{
-			"importpath": "gopkg.in/h2non/filetype.v1/types",
-			"repository": "https://gopkg.in/h2non/filetype.v1",
-			"revision": "cc14fdc9ca0e4c2bafad7458f6ff79fd3947cfbb",
-			"branch": "master",
-			"path": "/types"
-		},
-		{
-			"importpath": "gopkg.in/ini.v1",
-			"repository": "https://gopkg.in/ini.v1",
-			"revision": "6ed8d5f64cd79a498d1f3fab5880cc376ce41bbe",
-			"branch": "master"
-		},
-		{
-			"importpath": "gopkg.in/yaml.v2",
-			"repository": "https://gopkg.in/yaml.v2",
-			"revision": "eb3733d160e74a9c7e442f435eb3bea458e1d19f",
-			"branch": "v2"
-		}
-	]
-}