Refactor project folder structure

src/KiBoards/Kibana/Models/Settings/KibanaSettingsChanges.cs → src/KiBoards/Models/Settings/KibanaSettingsChanges.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace KiBoards.Services
+namespace KiBoards.Models.Settings
 {
     class KibanaSettingsChanges
     {

src/KiBoards/Kibana/Models/Settings/KibanaSettingsRequest.cs → src/KiBoards/Models/Settings/KibanaSettingsRequest.cs

@@ -1,5 +1,5 @@
-namespace KiBoards.Services
-{ 
+namespace KiBoards.Models.Settings
+{
     class KibanaSettingsRequest
     {
         public KibanaSettingsChanges Changes { get; set; }

src/KiBoards/Kibana/Models/Status/KibanaStatus.cs → src/KiBoards/Models/Status/KibanaStatus.cs

@@ -1,4 +1,4 @@
-namespace KiBoards.Services
+namespace KiBoards.Models.Status
 {
     class KibanaStatus
     {

src/KiBoards/Kibana/Models/Status/KibanaStatusOverall.cs → src/KiBoards/Models/Status/KibanaStatusOverall.cs

@@ -1,4 +1,4 @@
-namespace KiBoards.Services
+namespace KiBoards.Models.Status
 {
     class KibanaStatusOverall
     {

src/KiBoards/Kibana/Models/Status/KibanaStatusResponse.cs → src/KiBoards/Models/Status/KibanaStatusResponse.cs

@@ -1,4 +1,4 @@
-namespace KiBoards.Services
+namespace KiBoards.Models.Status
 {
     class KibanaStatusResponse
     {

src/KiBoards/Kibana/Models/Status/KibanaVersion.cs → src/KiBoards/Models/Status/KibanaVersion.cs

@@ -1,4 +1,4 @@
-namespace KiBoards.Services
+namespace KiBoards.Models.Status
 {
     class KibanaVersion
     {

src/KiBoards/Kibana/KibanaClient.cs → src/KiBoards/Services/KiBoardsKibanaClient.cs

@@ -1,12 +1,14 @@
 using System.Net.Http.Json;
+using KiBoards.Models.Settings;
+using KiBoards.Models.Status;
 
 namespace KiBoards.Services
 {
-    internal class KibanaClient 
+    internal class KiBoardsKibanaClient 
     {
         private readonly HttpClient _httpClient;        
 
-        public KibanaClient(HttpClient httpClinet, Uri kibanaUri)
+        public KiBoardsKibanaClient(Uri kibanaUri, HttpClient httpClinet)
         {
             _httpClient = httpClinet;    
             _httpClient.BaseAddress = kibanaUri;

src/KiBoards/Startup.cs

@@ -18,10 +18,10 @@ public Startup(IMessageSink messageSink)
             var task = Task.Factory.StartNew(async () =>
             {
                 var httpClient = new HttpClient();
-                var kibanaHost = Environment.GetEnvironmentVariable("KIB_KIBANA_HOST") ?? "http://localhost:5601";
-                var kibanaClient = new KibanaClient(httpClient, new Uri(kibanaHost));
+                var kibanaUri = new Uri(Environment.GetEnvironmentVariable("KIB_KIBANA_HOST") ?? "http://localhost:5601");
+                var kibanaClient = new KiBoardsKibanaClient(kibanaUri, httpClient);
 
-                WriteMessage(messageSink, $"Waiting for Kibana {kibanaHost}");
+                WriteMessage(messageSink, $"Waiting for Kibana {kibanaUri}");
 
                 await kibanaClient.WaitForKibanaAsync(CancellationToken.None);
                 await kibanaClient.SetDarkModeAsync(true, CancellationToken.None);