[feat] Reorganize code

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

- Resolves: #99

1 files changed, 29 insertions, 37 deletions

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"
                 }
             ]
         }