diff --git a/.gitignore b/.gitignore
index 6d978daaf..42612b487 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,9 @@ thingsboard_gateway/storage/data/
 /.mypy_cache/
 /thingsboard_gateway/storage/data_out/
 *.gz
+/logs/
+/python3-thingsboard-gateway.deb
+/python3-thingsboard-gateway.rpm
+/thingsboard_gateway.egg-info/
+/docker/python3-thingsboard-gateway.deb
+/data/
diff --git a/for_build/etc/thingsboard-gateway/config/mqtt.json b/for_build/etc/thingsboard-gateway/config/mqtt.json
index 5b05d1699..4522f1739 100644
--- a/for_build/etc/thingsboard-gateway/config/mqtt.json
+++ b/for_build/etc/thingsboard-gateway/config/mqtt.json
@@ -1,75 +1,73 @@
 {
   "broker": {
-    "name":"Default Broker",
-    "host":"demo.thingsboard.io",
+    "name":"Default Local Broker",
+    "host":"127.0.0.1",
     "port":1883,
     "security": {
       "type": "basic",
-      "username": "GIjr0vTtbOLwpouuBxL9",
-      "password": ""
+      "username": "user",
+      "password": "password"
     }
   },
   "mapping": [
     {
-      "topicFilter": "v1/devices/me/attributes",
+      "topicFilter": "/sensor/data",
       "converter": {
         "type": "json",
-        "filterExpression": "",
-        "deviceNameJsonExpression": "${SerialNumber}",
-        "deviceTypeJsonExpression": "${SensorType}",
+        "deviceNameJsonExpression": "${serialNumber}",
+        "deviceTypeJsonExpression": "${sensorType}",
         "timeout": 60000,
         "attributes": [
           {
             "type": "string",
-            "key": "test_key",
-            "value": "${SerialNumber}"
+            "key": "model",
+            "value": "${sensorModel}"
+          }
+        ],
+        "timeseries": [
+          {
+            "type": "double",
+            "key": "temperature",
+            "value": "${temp}"
+          },
+          {
+            "type": "double",
+            "key": "humidity",
+            "value": "${hum}"
           }
         ]
       }
     },
     {
-      "topicFilter": "/temperature-sensors/+",
+      "topicFilter": "/sensor/+/data",
       "converter": {
         "type": "json",
-        "filterExpression": "",
-        "deviceNameJsonExpression": "${$.serialNumber}",
-        "deviceTypeJsonExpression": "${$.sensorType}",
+        "deviceNameTopicExpression": "(?<=sensor\/)(.*?)(?=\/data)",
+        "deviceTypeTopicExpression": "Thermometer",
         "timeout": 60000,
         "attributes": [
           {
             "type": "string",
             "key": "model",
-            "value": "${$.model}"
+            "value": "${sensorModel}"
           }
         ],
         "timeseries": [
           {
             "type": "double",
             "key": "temperature",
-            "value": "${$.temperature}"
-          }
-        ]
-      }
-    },
-    {
-      "topicFilter": "/temperature-sensors/+",
-      "converter": {
-        "type": "json",
-        "filterExpression": "",
-        "deviceNameJsonExpression": "${$.sensorId}",
-        "deviceTypeJsonExpression": "${$.sensorType}",
-        "timeout": 60000,
-        "timeseries": [
+            "value": "${temp}"
+          },
           {
             "type": "double",
             "key": "humidity",
-            "value": "${$.humidity}"
+            "value": "${hum}"
           }
         ]
       }
     },
     {
-      "topicFilter": "/custom-sensors/+",
+      "topicFilter": "/custom/sensors/+",
       "converter": {
         "type": "custom",
         "extension": "CustomMqttUplinkConverter",
@@ -83,8 +81,8 @@
   ],
   "connectRequests": [
     {
-      "topicFilter": "sensors/connect",
-      "deviceNameJsonExpression": "${$.SerialNumber}"
+      "topicFilter": "sensor/connect",
+      "deviceNameJsonExpression": "${SerialNumber}"
     },
     {
       "topicFilter": "sensor/+/connect",
@@ -93,8 +91,8 @@
   ],
   "disconnectRequests": [
     {
-      "topicFilter": "sensors/disconnect",
-      "deviceNameJsonExpression": "${$.SerialNumber}"
+      "topicFilter": "sensor/disconnect",
+      "deviceNameJsonExpression": "${SerialNumber}"
     },
     {
       "topicFilter": "sensor/+/disconnect",
diff --git a/for_build/etc/thingsboard-gateway/config/tb_gateway.yaml b/for_build/etc/thingsboard-gateway/config/tb_gateway.yaml
index 8ccf00e4f..81913429c 100644
--- a/for_build/etc/thingsboard-gateway/config/tb_gateway.yaml
+++ b/for_build/etc/thingsboard-gateway/config/tb_gateway.yaml
@@ -1,12 +1,17 @@
 thingsboard:
-  host: 127.0.0.1
+  host: demo.thingsboard.io
   port: 1883
   security:
-    accessToken: FUH2Fonov6eajSHi0Zyw
+    accessToken: PUT_YOUR_GW_ACCESS_TOKEN_HERE
 storage:
   type: memory
-  read_records_count: 10
-  max_records_count: 1000
+  read_records_count: 100
+  max_records_count: 100000
+#  type: file
+#  data_folder_path: ./data/
+#  max_file_count: 10
+#  max_read_records_count: 10
+#  max_records_per_file: 10000
 connectors:
 
   -
@@ -25,15 +30,15 @@ connectors:
 #    configuration: modbus_serial.json
 #
 #  -
-#    name: BLE Connector
-#    type: ble
-#    configuration: ble.json
-#
-#  -
 #    name: OPC-UA Connector
 #    type: opcua
 #    configuration: opcua.json
 #
+#  -
+#    name: BLE Connector
+#    type: ble
+#    configuration: ble.json
+
 #  -
 #    name: Custom Serial Connector
 #    type: serial
diff --git a/gateway.iml b/gateway.iml
deleted file mode 100644
index 17c22cdff..000000000
--- a/gateway.iml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-      <excludeFolder url="file://$MODULE_DIR$/venv" />
-    </content>
-    <orderEntry type="jdk" jdkName="Python 3.6 (thingsboard-gateway)" jdkType="Python SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.4.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.4.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.4.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.4.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.4.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.22" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.22" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.4.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.6" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.2.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.5" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:1.4.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.thingsboard.common:data:1.4.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.milo:sdk-client:0.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.milo:stack-client:0.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.milo:stack-core:0.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.jooq:jool:0.9.10" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.milo:sdk-core:0.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.codepoetics:protonpack:1.8" level="project" />
-    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.2.0" level="project" />
-    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.16.18" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.4.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:1.4.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.4.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:2.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.json:json:20090211" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.5.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.3.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-integration:1.4.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.4.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-core:4.3.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-java-dsl:1.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-jmx:4.3.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-jpa:4.3.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.52" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.52" level="project" />
-    <orderEntry type="library" name="Maven: nl.jk5.netty-mqtt:netty-mqtt:2.0.0TB" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec-mqtt:4.1.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:19.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.7" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/make_packages.sh b/make_packages.sh
index 58b499a6c..14bcd3659 100644
--- a/make_packages.sh
+++ b/make_packages.sh
@@ -71,7 +71,7 @@ if [ "$1" != "only_clean" ] ; then
   tar -zcvf extensions.tar.gz extensions/*
   mv configs.tar.gz ../../../
   mv extensions.tar.gz /home/$CURRENT_USER/rpmbuild/SOURCES/extensions.tar.gz
-  cd ../
+  cd ../../../
   rm /home/$CURRENT_USER/rpmbuild/SOURCES/configs.tar.gz
   cp configs.tar.gz /home/$CURRENT_USER/rpmbuild/SOURCES/
   # Bulding RPM Package
diff --git a/setup.cfg b/setup.cfg
index 0b98e6280..3ab1736f3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = thingsboard-gateway
-version = 2.0.18
+version = 2.0
 description = Thingsboard Gateway for IoT devices.
 long_description = The Thingsboard IoT Gateway is an open-source solution that allows you to integrate devices connected to legacy and third-party systems with Thingsboard.
 license = Apache Software License (Apache Software License 2.0)
diff --git a/setup.py b/setup.py
index 0270d2606..ae8ae3eed 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@
         'simplejson',
         'pyrsistent'
     ],
-    download_url='https://github.com/thingsboard/thingsboard-gateway/archive/2.0.18rc-python.tar.gz',
+    download_url='https://github.com/thingsboard/thingsboard-gateway/archive/2.0.tar.gz',
     entry_points={
         'console_scripts': [
             'thingsboard-gateway = thingsboard_gateway.tb_gateway:daemon'
diff --git a/thingsboard-gateway.spec b/thingsboard-gateway.spec
index 2f4aa6bf1..8194ea009 100644
--- a/thingsboard-gateway.spec
+++ b/thingsboard-gateway.spec
@@ -1,6 +1,6 @@
 %define name thingsboard-gateway
-%define version 2.0.18
-%define unmangled_version 2.0.18
+%define version 2.0
+%define unmangled_version 2.0
 %define release 1
 
 Summary: Thingsboard Gateway for IoT devices.