diff --git a/.gitignore b/.gitignore
index bd8808a87..6559bcf3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ data/vagrant/vagrant_ansible_inventory_default
 data/tutorials/fs_evsock/freeswitch/etc/freeswitch/
 vendor
 *.test
+glide.lock
diff --git a/devel.yaml b/devel.yaml
deleted file mode 100644
index d2a7d0226..000000000
--- a/devel.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-package: github.com/cgrates/cgrates
-import:
-  - package: github.com/ugorji/go
-  - package: github.com/jinzhu/gorm
-  - package: github.com/jinzhu/inflection
-  - package: golang.org/x/net
-  - package: github.com/DisposaBoy/JsonConfigReader
-  - package: github.com/go-sql-driver/mysql
-  - package: github.com/gorhill/cronexpr
-  - package: github.com/lib/pq
-  - package: github.com/qor/inflection
-  - package: gopkg.in/mgo.v2
-  - package: github.com/kr/pty
-  - package: gopkg.in/fsnotify.v1
-  - package: github.com/peterh/liner
-  - package: github.com/cgrates/rpcclient
-  - package: github.com/cgrates/osipsdagram
-  - package: github.com/cgrates/kamevapi
-  - package: github.com/cgrates/fsock
-  - package: github.com/mediocregopher/radix.v2/...
-  - package: github.com/cenkalti/rpc2
-  - package: github.com/cenkalti/hub
-  - package: github.com/fiorix/go-diameter
diff --git a/glide.lock b/glide.lock
new file mode 100644
index 000000000..032aebf5d
--- /dev/null
+++ b/glide.lock
@@ -0,0 +1,68 @@
+hash: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+updated: 2015-12-16T09:32:54.975724404+02:00
+imports:
+- name: github.com/cenkalti/hub
+  version: 57d753b5f4856e77b3cf8ecce78c97215a7d324d
+  repo: https://github.com/cenkalti/hub
+- name: github.com/cenkalti/rpc2
+  version: 2d1be381ce47537e9e076b2b76dc70933162e4e9
+- name: github.com/cgrates/fsock
+  version: f0d40ceb94f8bd15223a05466fe221df20ff5444
+- name: github.com/cgrates/kamevapi
+  version: a376b1f937ba959857929fa3e111c0f3243278c0
+- name: github.com/cgrates/osipsdagram
+  version: 3d6beed663452471dec3ca194137a30d379d9e8f
+- name: github.com/cgrates/rpcclient
+  version: 79661b1e514823a9ac93b2b9e97e037ee190ba47
+- name: github.com/DisposaBoy/JsonConfigReader
+  version: 33a99fdf1d5ee1f79b5077e9c06f955ad356d5f4
+- name: github.com/fiorix/go-diameter
+  version: 30569fd7282321ac213d8db9f39eac9321ab6bd5
+  subpackages:
+  - /diam
+  - diam/avp
+  - diam/datatype
+  - diam/dict
+  - diam/sm
+- name: github.com/go-sql-driver/mysql
+  version: d512f204a577a4ab037a1816604c48c9c13210be
+- name: github.com/gorhill/cronexpr
+  version: a557574d6c024ed6e36acc8b610f5f211c91568a
+- name: github.com/jinzhu/gorm
+  version: c6a22c50962028255a718f22fe7e8959e8c67884
+- name: github.com/jinzhu/inflection
+  version: 3272df6c21d04180007eb3349844c89a3856bc25
+  repo: https://github.com/jinzhu/inflection
+- name: github.com/kr/pty
+  version: f7ee69f31298ecbe5d2b349c711e2547a617d398
+- name: github.com/lib/pq
+  version: 11fc39a580a008f1f39bb3d11d984fb34ed778d9
+- name: github.com/mediocregopher/radix.v2
+  version: b49c6f79790ba8a13a70b42e6a53d72f2239cf63
+  subpackages:
+  - /pool
+  - redis
+- name: github.com/peterh/liner
+  version: 4d47685ab2fd2dbb46c66b831344d558bc4be5b9
+- name: github.com/ugorji/go
+  version: cd43bdd6be4b5675a0d1e75c4af55ee1dc0d9c5e
+  subpackages:
+  - /codec
+- name: golang.org/x/crypto
+  version: f18420efc3b4f8e9f3d51f6bd2476e92c46260e9
+- name: golang.org/x/net
+  version: 548f7bf20c8aae87fecd9aa09cc89065451e6271
+  subpackages:
+  - /websocket
+- name: golang.org/x/text
+  version: 92ca7bbb695e2e9675f1d731fa85760f95d2c0df
+- name: gopkg.in/fsnotify.v1
+  version: 2cdd39bd6129c6a49c74fb07fb9d77ba1271c572
+- name: gopkg.in/mgo.v2
+  version: e30de8ac9ae3b30df7065f766c71f88bba7d4e49
+  subpackages:
+  - bson
+- name: gopkg.in/tomb.v2
+  version: 14b3d72120e8d10ea6e6b7f87f7175734b1faab8
+  repo: https://gopkg.in/tomb.v2
+devImports: []
diff --git a/glide.yaml b/glide.yaml
index 699194056..3bd347199 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -1,46 +1,35 @@
 package: github.com/cgrates/cgrates
 import:
-- package: golang.org/x/net
-  version: d5cd7348bfebdf7dbb6dbb18fa488525f9024293
 - package: github.com/DisposaBoy/JsonConfigReader
-  version: 33a99fdf1d5ee1f79b5077e9c06f955ad356d5f4
-- package: github.com/go-sql-driver/mysql
-  version: d512f204a577a4ab037a1816604c48c9c13210be
-- package: github.com/cgrates/osipsdagram
-  version: 3d6beed663452471dec3ca194137a30d379d9e8f
-- package: github.com/jinzhu/gorm
-  version: 84c6b46011b5b146782affd77dcf5ff95e255c50
-- package: github.com/kr/pty
-  version: f7ee69f31298ecbe5d2b349c711e2547a617d398
-- package: github.com/mediocregopher/radix.v2
-  version: 6f82181b77def0dbd0f12ec1096a4c113b55f321
-  subpackages:
-  - '...'
 - package: github.com/cenkalti/rpc2
-  version: 2d1be381ce47537e9e076b2b76dc70933162e4e9
-- package: github.com/cenkalti/hub
-  version: 57d753b5f4856e77b3cf8ecce78c97215a7d324d
-- package: github.com/jinzhu/inflection
-  version: 3272df6c21d04180007eb3349844c89a3856bc25
-- package: github.com/qor/inflection
-  version: 3272df6c21d04180007eb3349844c89a3856bc25
-- package: gopkg.in/fsnotify.v1
-  version: 2cdd39bd6129c6a49c74fb07fb9d77ba1271c572
-- package: github.com/cgrates/rpcclient
-  version: d17f491e1a51863b2cd66aabd2b398fc595a94d8
-- package: github.com/cgrates/kamevapi
-  version: a376b1f937ba959857929fa3e111c0f3243278c0
-- package: github.com/ugorji/go
-  version: 357a44b2b13e2711a45e30016508134101477610
-- package: github.com/gorhill/cronexpr
-  version: a557574d6c024ed6e36acc8b610f5f211c91568a
-- package: github.com/lib/pq
-  version: 11fc39a580a008f1f39bb3d11d984fb34ed778d9
-- package: gopkg.in/mgo.v2
-  version: 4d04138ffef2791c479c0c8bbffc30b34081b8d9
-- package: github.com/peterh/liner
-  version: 4d47685ab2fd2dbb46c66b831344d558bc4be5b9
 - package: github.com/cgrates/fsock
-  version: f0d40ceb94f8bd15223a05466fe221df20ff5444
+- package: github.com/cgrates/kamevapi
+- package: github.com/cgrates/osipsdagram
+- package: github.com/cgrates/rpcclient
 - package: github.com/fiorix/go-diameter
-  version: b3cc86a50b07ac4bc3f41e7250954670013d416e
+  subpackages:
+  - /diam
+  - diam/avp
+  - diam/datatype
+  - diam/dict
+  - diam/sm
+- package: github.com/go-sql-driver/mysql
+- package: github.com/gorhill/cronexpr
+- package: github.com/jinzhu/gorm
+- package: github.com/kr/pty
+- package: github.com/lib/pq
+- package: github.com/mediocregopher/radix.v2
+  subpackages:
+  - /pool
+  - redis
+- package: github.com/peterh/liner
+- package: github.com/ugorji/go
+  subpackages:
+  - /codec
+- package: golang.org/x/net
+  subpackages:
+  - /websocket
+- package: gopkg.in/fsnotify.v1
+- package: gopkg.in/mgo.v2
+  subpackages:
+  - bson