diff --git a/Gopkg.lock b/Gopkg.lock
new file mode 100644
index 0000000..a0f76d6
--- /dev/null
+++ b/Gopkg.lock
@@ -0,0 +1,247 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  branch = "master"
+  name = "git.loafle.net/commons/configuration-go"
+  packages = ["."]
+  revision = "29e01e1ff2d2e5651b0e66cbc11a7e0d1e790a53"
+
+[[projects]]
+  branch = "master"
+  name = "git.loafle.net/commons/di-go"
+  packages = [
+    ".",
+    "annotation",
+    "injection/annotation",
+    "registry"
+  ]
+  revision = "eca6c94b5f51e714e36721d69a22a7b1bad65a57"
+
+[[projects]]
+  branch = "master"
+  name = "git.loafle.net/commons/logging-go"
+  packages = ["."]
+  revision = "ded250cfe021f307efff8d1f5cdb8a11a5d9297f"
+
+[[projects]]
+  branch = "master"
+  name = "git.loafle.net/commons/rpc-go"
+  packages = [
+    ".",
+    "client",
+    "protocol",
+    "protocol/json",
+    "registry"
+  ]
+  revision = "1092f7a7ae44ef2f907579af217f1a594e48959c"
+
+[[projects]]
+  branch = "master"
+  name = "git.loafle.net/commons/server-go"
+  packages = [
+    ".",
+    "client",
+    "socket",
+    "socket/web",
+    "socket/web/client"
+  ]
+  revision = "1cae23cf7819d56fd399346a1dc30af6a82d1a93"
+
+[[projects]]
+  branch = "master"
+  name = "git.loafle.net/commons/service_matcher-go"
+  packages = [
+    ".",
+    "activedirectory",
+    "cassandra",
+    "dns",
+    "ftp",
+    "http",
+    "imap",
+    "ldap",
+    "mongodb",
+    "mysql",
+    "netbios",
+    "oracle",
+    "pop",
+    "postgresql",
+    "redis",
+    "rmi",
+    "smb",
+    "smtp",
+    "snmp",
+    "snmp/v2",
+    "snmp/v3",
+    "sqlserver",
+    "ssh",
+    "telnet",
+    "wmi"
+  ]
+  revision = "f5a697e4d15125f4fcae754a56b71e5b1d00e57c"
+
+[[projects]]
+  branch = "master"
+  name = "git.loafle.net/commons/util-go"
+  packages = [
+    "context",
+    "encoding/json",
+    "reflect",
+    "service",
+    "time/scheduler",
+    "time/scheduler/storage",
+    "time/scheduler/task"
+  ]
+  revision = "1966a985759721fd451171a78a0b8f4524afc644"
+
+[[projects]]
+  branch = "master"
+  name = "git.loafle.net/overflow/commons-go"
+  packages = [
+    "config/container",
+    "config/probe",
+    "core/annotation",
+    "core/config",
+    "core/constants",
+    "core/interfaces",
+    "core/util",
+    "model/data",
+    "model/discovery",
+    "model/sensorconfig",
+    "service/probe"
+  ]
+  revision = "078a39712d33c131303cf2705cca185da18cc196"
+
+[[projects]]
+  branch = "master"
+  name = "git.loafle.net/overflow/container-go"
+  packages = [
+    ".",
+    "client",
+    "service"
+  ]
+  revision = "61644fd5e4218ec577aa2a9b61c1e5f12bda5fab"
+
+[[projects]]
+  branch = "master"
+  name = "git.loafle.net/overflow/crawler-go"
+  packages = ["."]
+  revision = "377582c76e19dcd275b6746ac519340c4625d32b"
+
+[[projects]]
+  name = "github.com/BurntSushi/toml"
+  packages = ["."]
+  revision = "b26d9c308763d68093482582cea63d69be07a0f0"
+  version = "v0.3.0"
+
+[[projects]]
+  name = "github.com/davecgh/go-spew"
+  packages = ["spew"]
+  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
+  version = "v1.1.0"
+
+[[projects]]
+  name = "github.com/google/gopacket"
+  packages = ["."]
+  revision = "11c65f1ca9081dfea43b4f9643f5c155583b73ba"
+  version = "v1.1.14"
+
+[[projects]]
+  name = "github.com/klauspost/compress"
+  packages = [
+    "flate",
+    "gzip",
+    "zlib"
+  ]
+  revision = "6c8db69c4b49dd4df1fff66996cf556176d0b9bf"
+  version = "v1.2.1"
+
+[[projects]]
+  name = "github.com/klauspost/cpuid"
+  packages = ["."]
+  revision = "ae7887de9fa5d2db4eaa8174a7eff2c1ac00f2da"
+  version = "v1.1"
+
+[[projects]]
+  name = "github.com/klauspost/crc32"
+  packages = ["."]
+  revision = "cb6bfca970f6908083f26f39a79009d608efd5cd"
+  version = "v1.1"
+
+[[projects]]
+  name = "github.com/pmezard/go-difflib"
+  packages = ["difflib"]
+  revision = "792786c7400a136282c1664665ae0a8db921c6c2"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/satori/go.uuid"
+  packages = ["."]
+  revision = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
+  version = "v1.2.0"
+
+[[projects]]
+  name = "github.com/stretchr/testify"
+  packages = ["assert"]
+  revision = "12b6f73e6084dad08a7c6e575284b177ecafbc71"
+  version = "v1.2.1"
+
+[[projects]]
+  name = "github.com/valyala/fasthttp"
+  packages = [
+    ".",
+    "fasthttputil"
+  ]
+  revision = "d42167fd04f636e20b005e9934159e95454233c7"
+  version = "v20160617"
+
+[[projects]]
+  name = "go.uber.org/atomic"
+  packages = ["."]
+  revision = "1ea20fb1cbb1cc08cbd0d913a96dead89aa18289"
+  version = "v1.3.2"
+
+[[projects]]
+  name = "go.uber.org/multierr"
+  packages = ["."]
+  revision = "3c4937480c32f4c13a875a1829af76c98ca3d40a"
+  version = "v1.1.0"
+
+[[projects]]
+  name = "go.uber.org/zap"
+  packages = [
+    ".",
+    "buffer",
+    "internal/bufferpool",
+    "internal/color",
+    "internal/exit",
+    "zapcore"
+  ]
+  revision = "eeedf312bc6c57391d84767a4cd413f02a917974"
+  version = "v1.8.0"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/crypto"
+  packages = [
+    "curve25519",
+    "ed25519",
+    "ed25519/internal/edwards25519",
+    "internal/chacha20",
+    "poly1305",
+    "ssh"
+  ]
+  revision = "94e3fad7f1b4eed4ec147751ad6b4c4d33f00611"
+
+[[projects]]
+  name = "gopkg.in/yaml.v2"
+  packages = ["."]
+  revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
+  version = "v2.2.1"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "4347c825e10ed37c42eb74f4e8e696611fbfffe2174e443b452c5bb0086d04fe"
+  solver-name = "gps-cdcl"
+  solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
new file mode 100644
index 0000000..89b958d
--- /dev/null
+++ b/Gopkg.toml
@@ -0,0 +1,78 @@
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#   name = "github.com/x/y"
+#   version = "2.4.0"
+#
+# [prune]
+#   non-go = false
+#   go-tests = true
+#   unused-packages = true
+
+
+[[constraint]]
+  branch = "master"
+  name = "git.loafle.net/commons/di-go"
+
+[[constraint]]
+  branch = "master"
+  name = "git.loafle.net/commons/logging-go"
+
+[[constraint]]
+  branch = "master"
+  name = "git.loafle.net/commons/rpc-go"
+
+[[constraint]]
+  branch = "master"
+  name = "git.loafle.net/commons/server-go"
+
+[[constraint]]
+  branch = "master"
+  name = "git.loafle.net/commons/service_matcher-go"
+
+[[constraint]]
+  branch = "master"
+  name = "git.loafle.net/commons/util-go"
+
+[[constraint]]
+  branch = "master"
+  name = "git.loafle.net/overflow/commons-go"
+
+[[constraint]]
+  branch = "master"
+  name = "git.loafle.net/overflow/container-go"
+
+[[constraint]]
+  branch = "master"
+  name = "git.loafle.net/overflow/crawler-go"
+
+[[constraint]]
+  name = "github.com/satori/go.uuid"
+  version = "1.2.0"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "1.2.1"
+
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/crypto"
+
+[prune]
+  go-tests = true
+  unused-packages = true
diff --git a/glide.yaml b/glide.yaml
deleted file mode 100644
index ec004a4..0000000
--- a/glide.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-package: git.loafle.net/overflow/container_network
-import:
-- package: git.loafle.net/commons/di-go
-  subpackages:
-  - registry
-- package: git.loafle.net/commons/logging-go
-- package: git.loafle.net/commons/rpc-go
-  subpackages:
-  - protocol/json
-  - registry
-- package: git.loafle.net/commons/server-go
-  subpackages:
-  - socket
-  - socket/net
-- package: git.loafle.net/overflow/commons-go
-  subpackages:
-  - core/annotation
-  - probe/constants
-- package: git.loafle.net/overflow/container-go
-  subpackages:
-  - server
-  - service
-  - servlet
-- package: git.loafle.net/overflow/crawler-go