diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..e9ea7c9
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,106 @@
+name: CI
+
+on:
+  push:
+    branches:
+    - new-dev
+
+jobs:
+  build:
+    name: Build the IPK
+    runs-on: ubuntu-18.04
+    steps:
+    - name: Checkout
+      uses: actions/checkout@master
+    - name: Docker Build
+      run: |
+        mkdir bin
+        cp -rf ./luci-app-wrtbwmon ./bin/
+        docker pull openwrtorg/sdk:x86-64-19.07-SNAPSHOT
+        docker run --rm --name=test -u root -v "$(pwd)"/bin/:/home/build/openwrt/bin --privileged=true -d openwrtorg/sdk:x86-64-19.07-SNAPSHOT sleep 1d
+        docker exec -i test sed -i 's/git\.openwrt\.org\/project\/luci/github\.com\/openwrt\/luci/g' ./feeds.conf.default
+        docker exec -i test ./scripts/feeds update luci
+        docker exec -i test ./scripts/feeds install luci
+        docker exec -i test mv ./bin/luci-app-wrtbwmon ./package/
+        docker exec -i test make defconfig
+        docker exec -i test make package/luci-app-wrtbwmon/compile V=s -j$(nproc) | tee >./bin/build.log
+        docker stop test
+    - name: Pack Files
+      run: |
+        cd bin && tar -cJvf ../build.log.tar.xz build.log && cd ..
+        mkdir release
+        cp -f ./bin/packages/x86_64/base/*wrtbwmon* ./release/
+        echo "::set-env name=app_path::$(ls ./release/*app-wrtbwmon*)"
+        echo "::set-env name=i18n_path::$(ls ./release/*i18n-wrtbwmon*)"
+    - name: Upload app
+      uses: actions/upload-artifact@v1
+      with:
+        name: app
+        path: ${{ env.app_path }}
+    - name: Upload i18n
+      uses: actions/upload-artifact@v1
+      with:
+        name: i18n
+        path: ${{ env.i18n_path }}
+    - name: Upload Log
+      uses: actions/upload-artifact@v1
+      with:
+        name: buildlog
+        path: ./build.log.tar.xz
+  Release:
+    name: Release the Binary Files
+    needs: build
+    runs-on: ubuntu-18.04
+    steps:
+    - name: Download App Artifact
+      uses: actions/download-artifact@v1
+      with:
+        name: app
+    - name: Set app Env
+      run: |
+        echo "::set-env name=app_path::$(ls ./app/*.ipk)"
+        echo "::set-env name=app_name::$(basename `ls ./app/*.ipk`)"
+    - name: Download i18n Artifact
+      uses: actions/download-artifact@v1
+      with:
+        name: i18n
+    - name: Set i18n Env
+      run: |
+        echo "::set-env name=i18n_path::$(ls ./i18n/*.ipk)"
+        echo "::set-env name=i18n_name::$(basename `ls ./i18n/*.ipk`)"
+    - name: Create Release
+      id: create_release
+      uses: actions/create-release@v1.0.0
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ github.ref }}
+        release_name: Release ${{ github.ref }}
+        target_commitish: master
+        body: |
+            Changes in this Release
+            - First Change
+            - Second Change
+        draft: true
+        prerelease: true
+    - name: Upload App Release
+      id:  upload-app-asset
+      uses: actions/upload-release-asset@v1.0.1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ${{ env.app_path }}
+        asset_name: ${{ env.app_name }}
+        asset_content_type: application/gzip
+    - name: Upload i18n Release
+      id:  upload-i18n-asset
+      uses: actions/upload-release-asset@v1.0.1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ${{ env.i18n_path }}
+        asset_name: ${{ env.i18n_name }}
+        asset_content_type: application/gzip
+
diff --git a/Makefile b/luci-app-wrtbwmon/Makefile
similarity index 71%
rename from Makefile
rename to luci-app-wrtbwmon/Makefile
index 4cf86ee..0010652 100755
--- a/Makefile
+++ b/luci-app-wrtbwmon/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2017 Georgios Tzourmpakis <kiougar@gmail.com>
+# Copyright (C) 2019 Openwrt.org
 #
 # This is free software, licensed under the Apache License, Version 2.0 .
 #
@@ -11,12 +11,12 @@ PKG_VERSION:=1.6.3
 PKG_RELEASE:=1
 
 PKG_LICENSE:=Apache-2.0
-PKG_MAINTAINER:=Georgios Tzourmpakis <kiougar@gmail.com>
+PKG_MAINTAINER:=
 
 LUCI_TITLE:=A Luci module that uses wrtbwmon to track bandwidth usage
 LUCI_DEPENDS:=+wrtbwmon
 LUCI_PKGARCH:=all
 
-include ../../luci.mk
+include $(TOPDIR)/feeds/luci/luci.mk
 
 # call BuildPackage - OpenWrt buildroot signature
diff --git a/luasrc/controller/wrtbwmon.lua b/luci-app-wrtbwmon/luasrc/controller/wrtbwmon.lua
similarity index 100%
rename from luasrc/controller/wrtbwmon.lua
rename to luci-app-wrtbwmon/luasrc/controller/wrtbwmon.lua
diff --git a/luasrc/model/cbi/wrtbwmon/config.lua b/luci-app-wrtbwmon/luasrc/model/cbi/wrtbwmon/config.lua
similarity index 100%
rename from luasrc/model/cbi/wrtbwmon/config.lua
rename to luci-app-wrtbwmon/luasrc/model/cbi/wrtbwmon/config.lua
diff --git a/luasrc/model/cbi/wrtbwmon/custom.lua b/luci-app-wrtbwmon/luasrc/model/cbi/wrtbwmon/custom.lua
similarity index 100%
rename from luasrc/model/cbi/wrtbwmon/custom.lua
rename to luci-app-wrtbwmon/luasrc/model/cbi/wrtbwmon/custom.lua
diff --git a/luasrc/view/wrtbwmon.htm b/luci-app-wrtbwmon/luasrc/view/wrtbwmon.htm
similarity index 100%
rename from luasrc/view/wrtbwmon.htm
rename to luci-app-wrtbwmon/luasrc/view/wrtbwmon.htm
diff --git a/po/zh-cn/wrtbwmon.po b/luci-app-wrtbwmon/po/zh-cn/wrtbwmon.po
similarity index 100%
rename from po/zh-cn/wrtbwmon.po
rename to luci-app-wrtbwmon/po/zh-cn/wrtbwmon.po
diff --git a/root/etc/uci-defaults/luci-wrtbwmon b/luci-app-wrtbwmon/root/etc/uci-defaults/luci-wrtbwmon
similarity index 100%
rename from root/etc/uci-defaults/luci-wrtbwmon
rename to luci-app-wrtbwmon/root/etc/uci-defaults/luci-wrtbwmon