diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfc9a0e..f11bfa9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,8 @@
 project(n2n C)
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.7)
 
 # N2n information
-set(N2N_VERSION 2.1.0)
+set(N2N_VERSION 2.2.0)
 set(N2N_OSNAME ${CMAKE_SYSTEM_NAME})
 
 # N2n specific params
diff --git a/debian/README.Debian b/contrib/debian/README.Debian
similarity index 100%
rename from debian/README.Debian
rename to contrib/debian/README.Debian
diff --git a/debian/changelog b/contrib/debian/changelog
similarity index 100%
rename from debian/changelog
rename to contrib/debian/changelog
diff --git a/debian/compat b/contrib/debian/compat
similarity index 100%
rename from debian/compat
rename to contrib/debian/compat
diff --git a/debian/control b/contrib/debian/control
similarity index 100%
rename from debian/control
rename to contrib/debian/control
diff --git a/debian/copyright b/contrib/debian/copyright
similarity index 100%
rename from debian/copyright
rename to contrib/debian/copyright
diff --git a/debian/n2n-edge.default b/contrib/debian/n2n-edge.default
similarity index 100%
rename from debian/n2n-edge.default
rename to contrib/debian/n2n-edge.default
diff --git a/debian/n2n-edge.docs b/contrib/debian/n2n-edge.docs
similarity index 100%
rename from debian/n2n-edge.docs
rename to contrib/debian/n2n-edge.docs
diff --git a/debian/n2n-edge.init b/contrib/debian/n2n-edge.init
old mode 100755
new mode 100644
similarity index 100%
rename from debian/n2n-edge.init
rename to contrib/debian/n2n-edge.init
diff --git a/debian/n2n-edge.install b/contrib/debian/n2n-edge.install
similarity index 100%
rename from debian/n2n-edge.install
rename to contrib/debian/n2n-edge.install
diff --git a/debian/n2n-edge.manpages b/contrib/debian/n2n-edge.manpages
similarity index 100%
rename from debian/n2n-edge.manpages
rename to contrib/debian/n2n-edge.manpages
diff --git a/debian/n2n-supernode.init b/contrib/debian/n2n-supernode.init
old mode 100755
new mode 100644
similarity index 100%
rename from debian/n2n-supernode.init
rename to contrib/debian/n2n-supernode.init
diff --git a/debian/n2n-supernode.install b/contrib/debian/n2n-supernode.install
similarity index 100%
rename from debian/n2n-supernode.install
rename to contrib/debian/n2n-supernode.install
diff --git a/debian/n2n-supernode.manpages b/contrib/debian/n2n-supernode.manpages
similarity index 100%
rename from debian/n2n-supernode.manpages
rename to contrib/debian/n2n-supernode.manpages
diff --git a/debian/rules b/contrib/debian/rules
old mode 100755
new mode 100644
similarity index 100%
rename from debian/rules
rename to contrib/debian/rules
diff --git a/gen_keyfile.py b/contrib/gen_keyfile.py
old mode 100755
new mode 100644
similarity index 100%
rename from gen_keyfile.py
rename to contrib/gen_keyfile.py
diff --git a/n2n.spec b/contrib/n2n.spec
similarity index 100%
rename from n2n.spec
rename to contrib/n2n.spec
diff --git a/openwrt/kamikaze/Makefile b/contrib/openwrt/kamikaze/Makefile
similarity index 100%
rename from openwrt/kamikaze/Makefile
rename to contrib/openwrt/kamikaze/Makefile
diff --git a/scripts/mk_SRPM.sh b/contrib/scripts/mk_SRPM.sh
old mode 100755
new mode 100644
similarity index 100%
rename from scripts/mk_SRPM.sh
rename to contrib/scripts/mk_SRPM.sh
diff --git a/scripts/mk_deb.sh b/contrib/scripts/mk_deb.sh
old mode 100755
new mode 100644
similarity index 100%
rename from scripts/mk_deb.sh
rename to contrib/scripts/mk_deb.sh
diff --git a/scripts/mk_tar.sh b/contrib/scripts/mk_tar.sh
old mode 100755
new mode 100644
similarity index 100%
rename from scripts/mk_tar.sh
rename to contrib/scripts/mk_tar.sh
diff --git a/edge.troff b/edge.troff
index bd62fe2..f09bf8c 100644
--- a/edge.troff
+++ b/edge.troff
@@ -1,4 +1,4 @@
-.TH edge 8  "May 19 2018" "n2n-2.1" "SUPERUSER COMMANDS"
+.TH edge 8  "May 19 2018" "n2n-2.2" "SUPERUSER COMMANDS"
 .SH NAME
 edge \- n2n edge node daemon
 .SH SYNOPSIS
diff --git a/supernode.troff b/supernode.troff
index 980f85a..a84e8fc 100644
--- a/supernode.troff
+++ b/supernode.troff
@@ -1,4 +1,4 @@
-.TH supernode 1  "May 19 2018" "n2n-2.1" "USER COMMANDS"
+.TH supernode 1  "May 19 2018" "n2n-2.2" "USER COMMANDS"
 .SH NAME
 supernode \- n2n supernode daemon
 .SH SYNOPSIS
diff --git a/win32/edge.rc b/win32/edge.rc
index 8efa7da..456abde 100644
--- a/win32/edge.rc
+++ b/win32/edge.rc
@@ -3,8 +3,8 @@
 #pragma code_page(65001)
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,0,0
- PRODUCTVERSION 2,1,0,0
+ FILEVERSION 2,2,0,0
+ PRODUCTVERSION 2,2,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -17,7 +17,7 @@ VS_VERSION_INFO VERSIONINFO
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "040904b0"
+        BLOCK "000904b0"
         BEGIN
             VALUE "FileDescription", "n2n edge"
             VALUE "FileVersion", N2N_VERSION
@@ -28,6 +28,6 @@ BEGIN
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x409, 1200
+        VALUE "Translation", 0x009, 1200
     END
 END
diff --git a/win32/sn.rc b/win32/sn.rc
index 5f0036c..d149a1c 100644
--- a/win32/sn.rc
+++ b/win32/sn.rc
@@ -3,8 +3,8 @@
 #pragma code_page(65001)
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,0,0
- PRODUCTVERSION 2,1,0,0
+ FILEVERSION 2,2,0,0
+ PRODUCTVERSION 2,2,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -17,7 +17,7 @@ VS_VERSION_INFO VERSIONINFO
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "040904b0"
+        BLOCK "000904b0"
         BEGIN
             VALUE "FileDescription", "n2n supernode"
             VALUE "FileVersion", N2N_VERSION
@@ -28,6 +28,6 @@ BEGIN
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x409, 1200
+        VALUE "Translation", 0x009, 1200
     END
 END