[feat] Reorganize code

Let's use a more structured folder system:
https://github.com/golang-standards/project-layout

- Resolves: #99

9 files changed, 263 insertions, 335 deletions

diff --git a/locales/bn/messages.gotext.json b/locales/bn/messages.gotext.json
index a2f063f..9bcbb29 100644
--- a/locales/bn/messages.gotext.json
+++ b/locales/bn/messages.gotext.json
@@ -3,6 +3,24 @@
     "messages": [
         {
             "id": [
+                "errorMsg",
+                "An error has ocurred initializing the VPN: {Err}"
+            ],
+            "message": "An error has ocurred initializing the VPN: {Err}",
+            "translation": "An error has ocurred initializing VPN: {Err}",
+            "placeholders": [
+                {
+                    "id": "Err",
+                    "string": "%[1]v",
+                    "type": "error",
+                    "underlyingType": "interface{Error() string}",
+                    "argNum": 1,
+                    "expr": "err"
+                }
+            ]
+        },
+        {
+            "id": [
                 "donationText",
                 "The {ApplicationName} service is expensive to run. Because we don't want to store personal information about you, there is no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.\n\t\nDo you want to donate now?"
             ],
@@ -15,7 +33,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 }
             ]
         },
@@ -38,7 +56,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "ApplicationName",
@@ -46,7 +64,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "ApplicationName_1",
@@ -54,7 +72,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "Version",
@@ -103,7 +121,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "Err",
@@ -121,32 +139,6 @@
             "translation": "ভিপিএন চালু করতে ত্রুটি হয়েছে"
         },
         {
-            "id": [
-                "errorMsg",
-                "An error has ocurred initializing {ApplicationName}: {Err}"
-            ],
-            "message": "An error has ocurred initializing {ApplicationName}: {Err}",
-            "translation": "An error has ocurred initializing {ApplicationName}: {Err}",
-            "placeholders": [
-                {
-                    "id": "ApplicationName",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "applicationName"
-                },
-                {
-                    "id": "Err",
-                    "string": "%[2]v",
-                    "type": "error",
-                    "underlyingType": "interface{Error() string}",
-                    "argNum": 2,
-                    "expr": "err"
-                }
-            ]
-        },
-        {
             "id": "Checking status...",
             "message": "Checking status...",
             "translation": "অবস্থা পরিক্ষা করা হচ্ছে ..."
@@ -197,7 +189,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 },
                 {
                     "id": "City",
@@ -220,7 +212,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -235,7 +227,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -255,7 +247,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -270,7 +262,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -290,7 +282,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         }
diff --git a/locales/en-GB/messages.gotext.json b/locales/en-GB/messages.gotext.json
index e7e4edf..b4cacaa 100644
--- a/locales/en-GB/messages.gotext.json
+++ b/locales/en-GB/messages.gotext.json
@@ -3,6 +3,24 @@
     "messages": [
         {
             "id": [
+                "errorMsg",
+                "An error has ocurred initializing the VPN: {Err}"
+            ],
+            "message": "An error has ocurred initializing the VPN: {Err}",
+	    "translation": "An error has occurred initialising VPN: {Err}",
+            "placeholders": [
+                {
+                    "id": "Err",
+                    "string": "%[1]v",
+                    "type": "error",
+                    "underlyingType": "interface{Error() string}",
+                    "argNum": 1,
+                    "expr": "err"
+                }
+            ]
+        },
+        {
+            "id": [
                 "donationText",
                 "The {ApplicationName} service is expensive to run. Because we don't want to store personal information about you, there is no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.\n\t\nDo you want to donate now?"
             ],
@@ -15,7 +33,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 }
             ]
         },
@@ -38,7 +56,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "ApplicationName",
@@ -46,7 +64,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "ApplicationName_1",
@@ -54,7 +72,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "Version",
@@ -103,7 +121,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "Err",
@@ -121,32 +139,6 @@
             "translation": "Error starting VPN"
         },
         {
-            "id": [
-                "errorMsg",
-                "An error has ocurred initializing {ApplicationName}: {Err}"
-            ],
-            "message": "An error has ocurred initializing {ApplicationName}: {Err}",
-            "translation": "An error has occurred initialising {ApplicationName}: {Err}",
-            "placeholders": [
-                {
-                    "id": "ApplicationName",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "applicationName"
-                },
-                {
-                    "id": "Err",
-                    "string": "%[2]v",
-                    "type": "error",
-                    "underlyingType": "interface{Error() string}",
-                    "argNum": 2,
-                    "expr": "err"
-                }
-            ]
-        },
-        {
             "id": "Checking status...",
             "message": "Checking status...",
             "translation": "Checking status..."
@@ -197,7 +189,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 },
                 {
                     "id": "City",
@@ -220,7 +212,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -235,7 +227,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -255,7 +247,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -270,7 +262,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -290,7 +282,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         }
diff --git a/locales/en-US/messages.gotext.json b/locales/en-US/messages.gotext.json
index f1d2084..d8e72cc 100644
--- a/locales/en-US/messages.gotext.json
+++ b/locales/en-US/messages.gotext.json
@@ -3,6 +3,26 @@
     "messages": [
         {
             "id": [
+                "errorMsg",
+                "An error has ocurred initializing the VPN: {Err}"
+            ],
+            "message": "An error has ocurred initializing the VPN: {Err}",
+            "translation": "An error has ocurred initializing VPN: {Err}",
+            "translatorComment": "Copied from source.",
+            "placeholders": [
+                {
+                    "id": "Err",
+                    "string": "%[1]v",
+                    "type": "error",
+                    "underlyingType": "interface{Error() string}",
+                    "argNum": 1,
+                    "expr": "err"
+                }
+            ],
+            "fuzzy": true
+        },
+        {
+            "id": [
                 "donationText",
                 "The {ApplicationName} service is expensive to run. Because we don't want to store personal information about you, there is no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.\n\t\nDo you want to donate now?"
             ],
@@ -16,7 +36,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 }
             ],
             "fuzzy": true
@@ -43,7 +63,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "ApplicationName",
@@ -51,7 +71,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "ApplicationName_1",
@@ -59,7 +79,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "Version",
@@ -118,7 +138,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "Err",
@@ -139,34 +159,6 @@
             "fuzzy": true
         },
         {
-            "id": [
-                "errorMsg",
-                "An error has ocurred initializing {ApplicationName}: {Err}"
-            ],
-            "message": "An error has ocurred initializing {ApplicationName}: {Err}",
-            "translation": "An error has ocurred initializing {ApplicationName}: {Err}",
-            "translatorComment": "Copied from source.",
-            "placeholders": [
-                {
-                    "id": "ApplicationName",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "applicationName"
-                },
-                {
-                    "id": "Err",
-                    "string": "%[2]v",
-                    "type": "error",
-                    "underlyingType": "interface{Error() string}",
-                    "argNum": 2,
-                    "expr": "err"
-                }
-            ],
-            "fuzzy": true
-        },
-        {
             "id": "Checking status...",
             "message": "Checking status...",
             "translation": "Checking status..."
@@ -224,7 +216,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 },
                 {
                     "id": "City",
@@ -249,7 +241,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ],
             "fuzzy": true
@@ -266,7 +258,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ],
             "fuzzy": true
@@ -288,7 +280,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ],
             "fuzzy": true
@@ -305,7 +297,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ],
             "fuzzy": true
@@ -327,7 +319,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ],
             "fuzzy": true
diff --git a/locales/es-ES/messages.gotext.json b/locales/es-ES/messages.gotext.json
index 28122b8..0cf3e1e 100644
--- a/locales/es-ES/messages.gotext.json
+++ b/locales/es-ES/messages.gotext.json
@@ -3,6 +3,24 @@
     "messages": [
         {
             "id": [
+                "errorMsg",
+                "An error has ocurred initializing the VPN: {Err}"
+            ],
+            "message": "An error has ocurred initializing the VPN: {Err}",
+            "translation": "Ha ocurrido un error inicializando VPN: {Err}",
+            "placeholders": [
+                {
+                    "id": "Err",
+                    "string": "%[1]v",
+                    "type": "error",
+                    "underlyingType": "interface{Error() string}",
+                    "argNum": 1,
+                    "expr": "err"
+                }
+            ]
+        },
+        {
+            "id": [
                 "donationText",
                 "The {ApplicationName} service is expensive to run. Because we don't want to store personal information about you, there is no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.\n\t\nDo you want to donate now?"
             ],
@@ -15,7 +33,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 }
             ]
         },
@@ -38,7 +56,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "ApplicationName",
@@ -46,7 +64,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "ApplicationName_1",
@@ -54,7 +72,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "Version",
@@ -103,7 +121,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "Err",
@@ -121,32 +139,6 @@
             "translation": "Error iniciando VPN"
         },
         {
-            "id": [
-                "errorMsg",
-                "An error has ocurred initializing {ApplicationName}: {Err}"
-            ],
-            "message": "An error has ocurred initializing {ApplicationName}: {Err}",
-            "translation": "Ha ocurrido un error inicializando {ApplicationName}: {Err}",
-            "placeholders": [
-                {
-                    "id": "ApplicationName",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "applicationName"
-                },
-                {
-                    "id": "Err",
-                    "string": "%[2]v",
-                    "type": "error",
-                    "underlyingType": "interface{Error() string}",
-                    "argNum": 2,
-                    "expr": "err"
-                }
-            ]
-        },
-        {
             "id": "Checking status...",
             "message": "Checking status...",
             "translation": "Comprobando estado..."
@@ -197,7 +189,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 },
                 {
                     "id": "City",
@@ -220,7 +212,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -235,7 +227,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -255,7 +247,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -270,7 +262,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -290,7 +282,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         }
diff --git a/locales/es/messages.gotext.json b/locales/es/messages.gotext.json
index 606134d..dc4f16f 100644
--- a/locales/es/messages.gotext.json
+++ b/locales/es/messages.gotext.json
@@ -3,6 +3,24 @@
     "messages": [
         {
             "id": [
+                "errorMsg",
+                "An error has ocurred initializing the VPN: {Err}"
+            ],
+            "message": "An error has ocurred initializing the VPN: {Err}",
+            "translation": "Un error ha ocurrido inicializando VPN: {Err}",
+            "placeholders": [
+                {
+                    "id": "Err",
+                    "string": "%[1]v",
+                    "type": "error",
+                    "underlyingType": "interface{Error() string}",
+                    "argNum": 1,
+                    "expr": "err"
+                }
+            ]
+        },
+        {
+            "id": [
                 "donationText",
                 "The {ApplicationName} service is expensive to run. Because we don't want to store personal information about you, there is no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.\n\t\nDo you want to donate now?"
             ],
@@ -15,7 +33,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 }
             ]
         },
@@ -38,7 +56,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "ApplicationName",
@@ -46,7 +64,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "ApplicationName_1",
@@ -54,7 +72,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "Version",
@@ -103,7 +121,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "Err",
@@ -121,32 +139,6 @@
             "translation": "Error arrancando la VPN"
         },
         {
-            "id": [
-                "errorMsg",
-                "An error has ocurred initializing {ApplicationName}: {Err}"
-            ],
-            "message": "An error has ocurred initializing {ApplicationName}: {Err}",
-            "translation": "Un error ha ocurrido inicializando {ApplicationName}: {Err}",
-            "placeholders": [
-                {
-                    "id": "ApplicationName",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "applicationName"
-                },
-                {
-                    "id": "Err",
-                    "string": "%[2]v",
-                    "type": "error",
-                    "underlyingType": "interface{Error() string}",
-                    "argNum": 2,
-                    "expr": "err"
-                }
-            ]
-        },
-        {
             "id": "Checking status...",
             "message": "Checking status...",
             "translation": "Comprobando el estado..."
@@ -197,7 +189,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 },
                 {
                     "id": "City",
@@ -220,7 +212,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -235,7 +227,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -255,7 +247,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -270,7 +262,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -290,7 +282,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         }
diff --git a/locales/fr/messages.gotext.json b/locales/fr/messages.gotext.json
index 7acdd75..718898d 100644
--- a/locales/fr/messages.gotext.json
+++ b/locales/fr/messages.gotext.json
@@ -3,6 +3,24 @@
     "messages": [
         {
             "id": [
+                "errorMsg",
+                "An error has ocurred initializing the VPN: {Err}"
+            ],
+            "message": "An error has ocurred initializing the VPN: {Err}",
+            "translation": "Une erreur est survenue lors de l'initialisation de VPN: {Err}",
+            "placeholders": [
+                {
+                    "id": "Err",
+                    "string": "%[1]v",
+                    "type": "error",
+                    "underlyingType": "interface{Error() string}",
+                    "argNum": 1,
+                    "expr": "err"
+                }
+            ]
+        },
+        {
+            "id": [
                 "donationText",
                 "The {ApplicationName} service is expensive to run. Because we don't want to store personal information about you, there is no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.\n\t\nDo you want to donate now?"
             ],
@@ -15,7 +33,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 }
             ]
         },
@@ -38,7 +56,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "ApplicationName",
@@ -46,7 +64,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "ApplicationName_1",
@@ -54,7 +72,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "Version",
@@ -103,7 +121,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "Err",
@@ -121,32 +139,6 @@
             "translation": "Erreur du démarrage du RPV"
         },
         {
-            "id": [
-                "errorMsg",
-                "An error has ocurred initializing {ApplicationName}: {Err}"
-            ],
-            "message": "An error has ocurred initializing {ApplicationName}: {Err}",
-            "translation": "Une erreur est survenue lors de l'initialisation de {ApplicationName} : {Err}",
-            "placeholders": [
-                {
-                    "id": "ApplicationName",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "applicationName"
-                },
-                {
-                    "id": "Err",
-                    "string": "%[2]v",
-                    "type": "error",
-                    "underlyingType": "interface{Error() string}",
-                    "argNum": 2,
-                    "expr": "err"
-                }
-            ]
-        },
-        {
             "id": "Checking status...",
             "message": "Checking status...",
             "translation": "Vérification de l’état…"
@@ -197,7 +189,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 },
                 {
                     "id": "City",
@@ -220,7 +212,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -235,7 +227,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -255,7 +247,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -270,7 +262,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -290,7 +282,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         }
diff --git a/locales/lt/messages.gotext.json b/locales/lt/messages.gotext.json
index aac9c46..601ba13 100644
--- a/locales/lt/messages.gotext.json
+++ b/locales/lt/messages.gotext.json
@@ -3,6 +3,24 @@
     "messages": [
         {
             "id": [
+                "errorMsg",
+                "An error has ocurred initializing the VPN: {Err}"
+            ],
+            "message": "An error has ocurred initializing the VPN: {Err}",
+            "translation": "Inicijuojant VPN, įvyko klaida: {Err}",
+            "placeholders": [
+                {
+                    "id": "Err",
+                    "string": "%[1]v",
+                    "type": "error",
+                    "underlyingType": "interface{Error() string}",
+                    "argNum": 1,
+                    "expr": "err"
+                }
+            ]
+        },
+        {
+            "id": [
                 "donationText",
                 "The {ApplicationName} service is expensive to run. Because we don't want to store personal information about you, there is no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.\n\t\nDo you want to donate now?"
             ],
@@ -15,7 +33,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 }
             ]
         },
@@ -38,7 +56,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "ApplicationName",
@@ -46,7 +64,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "ApplicationName_1",
@@ -54,7 +72,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "Version",
@@ -103,7 +121,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "Err",
@@ -121,32 +139,6 @@
             "translation": "Klaida paleidžiant VPN"
         },
         {
-            "id": [
-                "errorMsg",
-                "An error has ocurred initializing {ApplicationName}: {Err}"
-            ],
-            "message": "An error has ocurred initializing {ApplicationName}: {Err}",
-            "translation": "Inicijuojant {ApplicationName}, įvyko klaida: {Err}",
-            "placeholders": [
-                {
-                    "id": "ApplicationName",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "applicationName"
-                },
-                {
-                    "id": "Err",
-                    "string": "%[2]v",
-                    "type": "error",
-                    "underlyingType": "interface{Error() string}",
-                    "argNum": 2,
-                    "expr": "err"
-                }
-            ]
-        },
-        {
             "id": "Checking status...",
             "message": "Checking status...",
             "translation": "Tikrinama būsena..."
@@ -197,7 +189,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 },
                 {
                     "id": "City",
@@ -220,7 +212,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -235,7 +227,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -255,7 +247,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -270,7 +262,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -290,7 +282,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         }
diff --git a/locales/nl/messages.gotext.json b/locales/nl/messages.gotext.json
index cadc77c..296f77e 100644
--- a/locales/nl/messages.gotext.json
+++ b/locales/nl/messages.gotext.json
@@ -3,6 +3,24 @@
     "messages": [
         {
             "id": [
+                "errorMsg",
+                "An error has ocurred initializing the VPN: {Err}"
+            ],
+            "message": "An error has ocurred initializing the VPN: {Err}",
+            "translation": "Er heeft zich een fout voorgedaan bij het initialiseren van VPN: {Err}",
+            "placeholders": [
+                {
+                    "id": "Err",
+                    "string": "%[1]v",
+                    "type": "error",
+                    "underlyingType": "interface{Error() string}",
+                    "argNum": 1,
+                    "expr": "err"
+                }
+            ]
+        },
+        {
+            "id": [
                 "donationText",
                 "The {ApplicationName} service is expensive to run. Because we don't want to store personal information about you, there is no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.\n\t\nDo you want to donate now?"
             ],
@@ -15,7 +33,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 }
             ]
         },
@@ -38,7 +56,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "ApplicationName",
@@ -46,7 +64,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "ApplicationName_1",
@@ -54,7 +72,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "Version",
@@ -103,7 +121,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "Err",
@@ -121,32 +139,6 @@
             "translation": "Fout bij het opstarten van de VPN"
         },
         {
-            "id": [
-                "errorMsg",
-                "An error has ocurred initializing {ApplicationName}: {Err}"
-            ],
-            "message": "An error has ocurred initializing {ApplicationName}: {Err}",
-            "translation": "Er heeft zich een fout voorgedaan bij het initialiseren van {ApplicationName}: {Err}",
-            "placeholders": [
-                {
-                    "id": "ApplicationName",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "applicationName"
-                },
-                {
-                    "id": "Err",
-                    "string": "%[2]v",
-                    "type": "error",
-                    "underlyingType": "interface{Error() string}",
-                    "argNum": 2,
-                    "expr": "err"
-                }
-            ]
-        },
-        {
             "id": "Checking status...",
             "message": "Checking status...",
             "translation": "Status controleren..."
@@ -197,7 +189,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 },
                 {
                     "id": "City",
@@ -220,7 +212,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -235,7 +227,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -255,7 +247,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -270,7 +262,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -290,7 +282,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         }
diff --git a/locales/pt-BR/messages.gotext.json b/locales/pt-BR/messages.gotext.json
index cd879f0..b83033c 100644
--- a/locales/pt-BR/messages.gotext.json
+++ b/locales/pt-BR/messages.gotext.json
@@ -3,6 +3,24 @@
     "messages": [
         {
             "id": [
+                "errorMsg",
+                "An error has ocurred initializing the VPN: {Err}"
+            ],
+            "message": "An error has ocurred initializing the VPN: {Err}",
+            "translation": "Um erro ocorreu na inicialização de VPN: {Err}",
+            "placeholders": [
+                {
+                    "id": "Err",
+                    "string": "%[1]v",
+                    "type": "error",
+                    "underlyingType": "interface{Error() string}",
+                    "argNum": 1,
+                    "expr": "err"
+                }
+            ]
+        },
+        {
+            "id": [
                 "donationText",
                 "The {ApplicationName} service is expensive to run. Because we don't want to store personal information about you, there is no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.\n\t\nDo you want to donate now?"
             ],
@@ -15,7 +33,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 }
             ]
         },
@@ -38,7 +56,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "ApplicationName",
@@ -46,7 +64,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "ApplicationName_1",
@@ -54,7 +72,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "Version",
@@ -103,7 +121,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "n.conf.ApplicationName"
                 },
                 {
                     "id": "Err",
@@ -121,32 +139,6 @@
             "translation": "Erro ao iniciar a VPN"
         },
         {
-            "id": [
-                "errorMsg",
-                "An error has ocurred initializing {ApplicationName}: {Err}"
-            ],
-            "message": "An error has ocurred initializing {ApplicationName}: {Err}",
-            "translation": "Um erro ocorreu na inicialização de {ApplicationName}: {Err}",
-            "placeholders": [
-                {
-                    "id": "ApplicationName",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "applicationName"
-                },
-                {
-                    "id": "Err",
-                    "string": "%[2]v",
-                    "type": "error",
-                    "underlyingType": "interface{Error() string}",
-                    "argNum": 2,
-                    "expr": "err"
-                }
-            ]
-        },
-        {
             "id": "Checking status...",
             "message": "Checking status...",
             "translation": "Verificando estado..."
@@ -197,7 +189,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 },
                 {
                     "id": "City",
@@ -220,7 +212,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -235,7 +227,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -255,7 +247,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -270,7 +262,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         },
@@ -290,7 +282,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "applicationName"
+                    "expr": "bt.conf.ApplicationName"
                 }
             ]
         }