diff --git a/Borepin/Borepin/App.xaml.cs b/Borepin/Borepin/App.xaml.cs
index acd86d9..cd90a6e 100644
--- a/Borepin/Borepin/App.xaml.cs
+++ b/Borepin/Borepin/App.xaml.cs
@@ -4,9 +4,11 @@ using Borepin.PageModel;
 using Borepin.Page;
 using Xamarin.Forms;
 using Borepin.Service;
-using Borepin.Service.ServerInstances;
+using Borepin.Service.Instances;
 using Borepin.View;
 using Borepin.ViewModel;
+using Borepin.Dialog;
+using Borepin.DialogModel;
 
 namespace Borepin
 {
@@ -22,7 +24,8 @@ namespace Borepin
             InitializeComponent();
 
             //var result = await NavigationService.NavigateAsync("/NavigationPage/HostSelectPage");
-            var result = await NavigationService.NavigateAsync("/ListPage");
+            var result = await NavigationService.NavigateAsync("/MainPage/NavigationPage/ServerListPage");
+            //var result = await NavigationService.NavigateAsync("/ListPage");
 
             if (!result.Success)
             {
@@ -40,14 +43,15 @@ namespace Borepin
             containerRegistry.RegisterForNavigation<LoginPasswordPage, LoginPasswordPageModel>();
             containerRegistry.RegisterForNavigation<HostSelectPage, HostSelectPageModel>();
             containerRegistry.RegisterForNavigation<LoginChoosePage, LoginChoosePageModel>();
-            containerRegistry.RegisterForNavigation<BFFHInstancesPage, BFFHInstancesPageModel>();
+            containerRegistry.RegisterForNavigation<ServerListPage, ServerListPageModel>();
 
             containerRegistry.RegisterForNavigation<ListPage, ListPageModel>();
 
+            containerRegistry.RegisterDialog<ConfirmDialog, ConfirmDialogModel>();
             
 
-            BFFHInstanceService bffhInstanceService = new BFFHInstanceService();
-            containerRegistry.RegisterInstance<IBFFHInstanceService>(bffhInstanceService);
+            InstanceService bffhInstanceService = new InstanceService();
+            containerRegistry.RegisterInstance<IInstanceService>(bffhInstanceService);
             containerRegistry.RegisterInstance<BFFHService>(new BFFHService(bffhInstanceService));
 
         }
diff --git a/Borepin/Borepin/Borepin.csproj b/Borepin/Borepin/Borepin.csproj
index 53338fd..ad86a1c 100644
--- a/Borepin/Borepin/Borepin.csproj
+++ b/Borepin/Borepin/Borepin.csproj
@@ -31,9 +31,6 @@
     <Compile Update="Page\MachinesPage.xaml.cs">
       <DependentUpon>MachinesPage.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Page\BFFHInstancesPage.xaml.cs">
-      <DependentUpon>BFFHInstancesPage.xaml</DependentUpon>
-    </Compile>
     <Compile Update="Page\SettingsPage.xaml.cs">
       <DependentUpon>SettingsPage.xaml</DependentUpon>
     </Compile>
@@ -50,21 +47,21 @@
     <Compile Update="Styles\LightTheme.xaml.cs">
       <DependentUpon>LightTheme.xaml</DependentUpon>
     </Compile>
-    <Compile Update="View\BFFHInstanceEntryView.xaml.cs">
-      <DependentUpon>BFFHInstanceEntryView.xaml</DependentUpon>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Update="Page\HostSelectPage.xaml">
+    <EmbeddedResource Update="Dialog\ConfirmDialog.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Page\AddServerDialog\HostSelectPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Update="Page\ListPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="Page\LoginChoosePage.xaml">
+    <EmbeddedResource Update="Page\AddServerDialog\LoginChoosePage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="Page\LoginPasswordPage.xaml">
+    <EmbeddedResource Update="Page\AddServerDialog\LoginPasswordPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Update="Page\MachinePage.xaml">
@@ -76,7 +73,7 @@
     <EmbeddedResource Update="Page\MainPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="Page\BFFHInstancesPage.xaml">
+    <EmbeddedResource Update="Page\ServerListPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Update="Page\SettingsPage.xaml">
@@ -93,17 +90,16 @@
     <EmbeddedResource Update="Styles\LightTheme.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="View\BFFHInstanceEntryView.xaml">
+    <EmbeddedResource Update="View\ListItemView.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="View\ListItemView.xaml">
+    <EmbeddedResource Update="View\ServerListItemView.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Base\" />
     <Folder Include="Behaviour\" />
-    <Folder Include="Page\LoginDialog\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\FabAccessAPI\FabAccessAPI.csproj" />
diff --git a/Borepin/Borepin/Dialog/ConfirmDialog.xaml b/Borepin/Borepin/Dialog/ConfirmDialog.xaml
new file mode 100644
index 0000000..116e979
--- /dev/null
+++ b/Borepin/Borepin/Dialog/ConfirmDialog.xaml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentView xmlns="http://xamarin.com/schemas/2014/forms" 
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Borepin.Dialog.ConfirmDialog"
+             BackgroundColor="White">
+    <ContentView.Content>
+        <StackLayout>
+            <Label Text="{Binding Title}"/>
+            <Label Text="{Binding Message}"/>
+            <Button Text="Confirm" Command="{Binding ConfirmCommand}"/>
+            <Button Text="Abort" Command="{Binding AbortCommand}"/>
+        </StackLayout>
+    </ContentView.Content>
+</ContentView>
\ No newline at end of file
diff --git a/Borepin/Borepin/Dialog/ConfirmDialog.xaml.cs b/Borepin/Borepin/Dialog/ConfirmDialog.xaml.cs
new file mode 100644
index 0000000..25d9481
--- /dev/null
+++ b/Borepin/Borepin/Dialog/ConfirmDialog.xaml.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace Borepin.Dialog
+{
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class ConfirmDialog : ContentView
+    {
+        public ConfirmDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Borepin/Borepin/DialogModel/ConfirmDialogModel.cs b/Borepin/Borepin/DialogModel/ConfirmDialogModel.cs
new file mode 100644
index 0000000..70500d0
--- /dev/null
+++ b/Borepin/Borepin/DialogModel/ConfirmDialogModel.cs
@@ -0,0 +1,76 @@
+using Prism.Commands;
+using Prism.Mvvm;
+using Prism.Services.Dialogs;
+using System;
+using System.Windows.Input;
+
+namespace Borepin.DialogModel
+{
+    public class ConfirmDialogModel : BindableBase, IDialogAware
+    {
+        public ConfirmDialogModel()
+        {
+            ConfirmCommand = new DelegateCommand(ConfirmCommandExecute);
+            AbortCommand = new DelegateCommand(AbortCommandExecute);
+        }
+
+        #region Properties
+        private string _Title;
+        public string Title
+        {
+            get => _Title;
+            set => SetProperty(ref _Title, value);
+        }
+
+        private string _Message;
+        public string Message
+        {
+            get => _Message;
+            set => SetProperty(ref _Message, value);
+        }
+        #endregion
+
+        #region Commands
+        private ICommand _ConfirmCommand;
+
+        public ICommand ConfirmCommand
+        {
+            get => _ConfirmCommand;
+            set => SetProperty(ref _ConfirmCommand, value);
+        }
+        private void ConfirmCommandExecute()
+        {
+            RequestClose(new DialogParameters { { "confirm", true } });
+        }
+
+        private ICommand _AbortCommand;
+        public ICommand AbortCommand
+        {
+            get => _AbortCommand;
+            set => SetProperty(ref _AbortCommand, value);
+        }
+        private void AbortCommandExecute()
+        {
+            RequestClose(new DialogParameters { { "abort", true } });
+        }
+        #endregion
+
+        public event Action<IDialogParameters> RequestClose;
+
+        public bool CanCloseDialog()
+        {
+            return true;
+        }
+
+        public void OnDialogClosed()
+        {
+            
+        }
+
+        public void OnDialogOpened(IDialogParameters parameters)
+        {
+            Title = parameters.GetValue<string>("title");
+            Message = parameters.GetValue<string>("message");
+        }
+    }
+}
diff --git a/Borepin/Borepin/Page/HostSelectPage.xaml b/Borepin/Borepin/Page/AddServerDialog/HostSelectPage.xaml
similarity index 100%
rename from Borepin/Borepin/Page/HostSelectPage.xaml
rename to Borepin/Borepin/Page/AddServerDialog/HostSelectPage.xaml
diff --git a/Borepin/Borepin/Page/HostSelectPage.xaml.cs b/Borepin/Borepin/Page/AddServerDialog/HostSelectPage.xaml.cs
similarity index 100%
rename from Borepin/Borepin/Page/HostSelectPage.xaml.cs
rename to Borepin/Borepin/Page/AddServerDialog/HostSelectPage.xaml.cs
diff --git a/Borepin/Borepin/Page/LoginChoosePage.xaml b/Borepin/Borepin/Page/AddServerDialog/LoginChoosePage.xaml
similarity index 100%
rename from Borepin/Borepin/Page/LoginChoosePage.xaml
rename to Borepin/Borepin/Page/AddServerDialog/LoginChoosePage.xaml
diff --git a/Borepin/Borepin/Page/LoginChoosePage.xaml.cs b/Borepin/Borepin/Page/AddServerDialog/LoginChoosePage.xaml.cs
similarity index 100%
rename from Borepin/Borepin/Page/LoginChoosePage.xaml.cs
rename to Borepin/Borepin/Page/AddServerDialog/LoginChoosePage.xaml.cs
diff --git a/Borepin/Borepin/Page/LoginPasswordPage.xaml b/Borepin/Borepin/Page/AddServerDialog/LoginPasswordPage.xaml
similarity index 100%
rename from Borepin/Borepin/Page/LoginPasswordPage.xaml
rename to Borepin/Borepin/Page/AddServerDialog/LoginPasswordPage.xaml
diff --git a/Borepin/Borepin/Page/LoginPasswordPage.xaml.cs b/Borepin/Borepin/Page/AddServerDialog/LoginPasswordPage.xaml.cs
similarity index 100%
rename from Borepin/Borepin/Page/LoginPasswordPage.xaml.cs
rename to Borepin/Borepin/Page/AddServerDialog/LoginPasswordPage.xaml.cs
diff --git a/Borepin/Borepin/Page/BFFHInstancesPage.xaml b/Borepin/Borepin/Page/BFFHInstancesPage.xaml
deleted file mode 100644
index aaa97e1..0000000
--- a/Borepin/Borepin/Page/BFFHInstancesPage.xaml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:views="clr-namespace:Borepin.View"
-             x:Class="Borepin.Page.BFFHInstancesPage">
-    <ContentPage.Content>
-        <StackLayout>
-            <ListView ItemsSource="{Binding ServerInstance_List}">
-                <ListView.ItemTemplate>
-                    <DataTemplate>
-                        <ViewCell>
-                            <views:BFFHInstanceEntryView />
-                        </ViewCell>
-                    </DataTemplate>
-                </ListView.ItemTemplate>
-            </ListView>
-        </StackLayout>
-    </ContentPage.Content>
-</ContentPage>
\ No newline at end of file
diff --git a/Borepin/Borepin/Page/MainPage.xaml b/Borepin/Borepin/Page/MainPage.xaml
index 84ae416..91f0149 100644
--- a/Borepin/Borepin/Page/MainPage.xaml
+++ b/Borepin/Borepin/Page/MainPage.xaml
@@ -9,7 +9,7 @@
             <StackLayout>
                 <Button Text="Machines" Command="{Binding NavigateCommand}" CommandParameter="MachinesPage" />
                 <Button Text="Settings" Command="{Binding NavigateCommand}" CommandParameter="SettingsPage" />
-                <Button Text="Servers" Command="{Binding NavigateCommand}" CommandParameter="BFFHInstancesPage" />
+                <Button Text="Servers" Command="{Binding NavigateCommand}" CommandParameter="ServerListPage" />
             </StackLayout>
         </ContentPage>
     </MasterDetailPage.Master>
diff --git a/Borepin/Borepin/Page/ServerListPage.xaml b/Borepin/Borepin/Page/ServerListPage.xaml
new file mode 100644
index 0000000..2ed3335
--- /dev/null
+++ b/Borepin/Borepin/Page/ServerListPage.xaml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
+             xmlns:views="clr-namespace:Borepin.View"
+             x:Class="Borepin.Page.ServerListPage">
+    <NavigationPage.TitleView>
+        <Label Text="Servers" HorizontalOptions="End" Margin="0, 0, 10, 0" VerticalOptions="CenterAndExpand" FontSize="Medium" TextColor="{StaticResource FirstColor}"/>
+    </NavigationPage.TitleView>
+    <ContentPage.Content>
+        <StackLayout>
+            <ListView ItemsSource="{Binding ServerListItemViewModel_List}">
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <ViewCell>
+                            <views:ServerListItemView />
+                        </ViewCell>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
+            <Button Text="Connect to new Server" Command="{Binding AddInstancesCommand}"/>
+            <Button Text="Delete All Servers" Command="{Binding DeleteAllInstancesCommand}"/>
+        </StackLayout>
+    </ContentPage.Content>
+</ContentPage>
\ No newline at end of file
diff --git a/Borepin/Borepin/Page/BFFHInstancesPage.xaml.cs b/Borepin/Borepin/Page/ServerListPage.xaml.cs
similarity index 77%
rename from Borepin/Borepin/Page/BFFHInstancesPage.xaml.cs
rename to Borepin/Borepin/Page/ServerListPage.xaml.cs
index 00533dc..44b8921 100644
--- a/Borepin/Borepin/Page/BFFHInstancesPage.xaml.cs
+++ b/Borepin/Borepin/Page/ServerListPage.xaml.cs
@@ -10,9 +10,9 @@ using Xamarin.Forms.Xaml;
 namespace Borepin.Page
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class BFFHInstancesPage : ContentPage
+    public partial class ServerListPage : ContentPage
     {
-        public BFFHInstancesPage()
+        public ServerListPage()
         {
             InitializeComponent();
         }
diff --git a/Borepin/Borepin/PageModel/HostSelectPageModel.cs b/Borepin/Borepin/PageModel/AddServerDialog/HostSelectPageModel.cs
similarity index 90%
rename from Borepin/Borepin/PageModel/HostSelectPageModel.cs
rename to Borepin/Borepin/PageModel/AddServerDialog/HostSelectPageModel.cs
index 44c7f9d..6bf5f23 100644
--- a/Borepin/Borepin/PageModel/HostSelectPageModel.cs
+++ b/Borepin/Borepin/PageModel/AddServerDialog/HostSelectPageModel.cs
@@ -1,11 +1,9 @@
 using Borepin.Service;
-using Borepin.Service.ServerInstances;
+using Borepin.Service.Instances;
 using Prism.Mvvm;
 using Prism.Navigation;
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Xamarin.Forms;
@@ -15,10 +13,10 @@ namespace Borepin.PageModel
     public class HostSelectPageModel : BindableBase
     {
         private INavigationService _NavigationService;
-        private IBFFHInstanceService _BFFHInstanceService;
+        private IInstanceService _BFFHInstanceService;
         private BFFHService _BFFHService;
 
-        public HostSelectPageModel(INavigationService navigationService, BFFHService bffhService, IBFFHInstanceService bffhInstanceService)
+        public HostSelectPageModel(INavigationService navigationService, BFFHService bffhService, IInstanceService bffhInstanceService)
         {
             _NavigationService = navigationService;
             _BFFHInstanceService = bffhInstanceService;
diff --git a/Borepin/Borepin/PageModel/LoginChoosePageModel.cs b/Borepin/Borepin/PageModel/AddServerDialog/LoginChoosePageModel.cs
similarity index 100%
rename from Borepin/Borepin/PageModel/LoginChoosePageModel.cs
rename to Borepin/Borepin/PageModel/AddServerDialog/LoginChoosePageModel.cs
diff --git a/Borepin/Borepin/PageModel/LoginPasswordPageModel.cs b/Borepin/Borepin/PageModel/AddServerDialog/LoginPasswordPageModel.cs
similarity index 100%
rename from Borepin/Borepin/PageModel/LoginPasswordPageModel.cs
rename to Borepin/Borepin/PageModel/AddServerDialog/LoginPasswordPageModel.cs
diff --git a/Borepin/Borepin/PageModel/BFFHInstancesPageModel.cs b/Borepin/Borepin/PageModel/BFFHInstancesPageModel.cs
deleted file mode 100644
index 3e20fad..0000000
--- a/Borepin/Borepin/PageModel/BFFHInstancesPageModel.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Borepin.Model;
-using Borepin.Service.ServerInstances;
-using Prism.Mvvm;
-using Prism.Navigation;
-using System.Collections.ObjectModel;
-using System.Threading.Tasks;
-
-namespace Borepin.PageModel
-{
-    public class BFFHInstancesPageModel : BindableBase
-    {
-        private INavigationService _NavigationService;
-        private IBFFHInstanceService _BFFHInstanceService;
-
-        public BFFHInstancesPageModel(INavigationService navigationService, IBFFHInstanceService bffhInstanceService)
-        {
-            _NavigationService = navigationService;
-            _BFFHInstanceService = bffhInstanceService;
-
-            LoadData();
-        }
-
-        private async Task LoadData()
-        {
-            _ServerInstance_List = new ObservableCollection<BFFHInstance>(await _BFFHInstanceService.GetBFFHInstances());
-        }
-
-        private ObservableCollection<BFFHInstance> _ServerInstance_List;
-        public ObservableCollection<BFFHInstance> ServerInstance_List
-        {
-            get => _ServerInstance_List;
-            set => SetProperty(ref _ServerInstance_List, value);
-        }
-    }
-}
diff --git a/Borepin/Borepin/PageModel/ServerListPageModel.cs b/Borepin/Borepin/PageModel/ServerListPageModel.cs
new file mode 100644
index 0000000..6e6491e
--- /dev/null
+++ b/Borepin/Borepin/PageModel/ServerListPageModel.cs
@@ -0,0 +1,92 @@
+using Borepin.Service.Instances;
+using Borepin.ViewModel;
+using Prism.Mvvm;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Linq;
+using Borepin.Model;
+using System.Windows.Input;
+using Prism.Commands;
+using Prism.Navigation;
+using Prism.Services.Dialogs;
+
+namespace Borepin.PageModel
+{
+    public class ServerListPageModel : BindableBase
+    {
+        private INavigationService _NavigationService;
+        private IDialogService _DialogService;
+        private IInstanceService _InstanceService;
+
+        public ServerListPageModel(INavigationService navigationService, IDialogService dialogService, IInstanceService instanceService)
+        {
+            _NavigationService = navigationService;
+            _DialogService = dialogService;
+            _InstanceService = instanceService;
+
+            DeleteAllInstancesCommand = new DelegateCommand(DeleteAllInstancesCommandExecuted);
+            AddInstancesCommand = new DelegateCommand(AddInstancesCommandExecuted);
+
+            LoadData();
+        }
+
+        private async Task<bool> LoadData()
+        {
+            List<BFFHInstance> list = await _InstanceService.GetBFFHInstances();
+            ServerListItemViewModel_List = list.Select(x => new ServerListItemViewModel(x)).ToList();
+
+            return await Task.FromResult(true);
+        }
+
+        #region Properties
+        private List<ServerListItemViewModel> _ServerListItemViewModel_List;
+        public List<ServerListItemViewModel> ServerListItemViewModel_List
+        {
+            get => _ServerListItemViewModel_List;
+            set => SetProperty(ref _ServerListItemViewModel_List, value);
+        }
+        #endregion
+
+        #region Commands
+        private ICommand _DeleteAllInstancesCommand;
+        public ICommand DeleteAllInstancesCommand
+        {
+            get => _DeleteAllInstancesCommand;
+            set => SetProperty(ref _DeleteAllInstancesCommand, value);
+        }
+        private void DeleteAllInstancesCommandExecuted()
+        {
+            var parameters = new DialogParameters
+            {
+                { "title", "Remove all Servers" },
+                { "message", "Do you really want to remove all known Servers?" }
+            };
+            _DialogService.ShowDialog("ConfirmDialog", parameters, DeleteAllInstancesConfirm);
+        }
+
+        private void DeleteAllInstancesConfirm(IDialogResult result)
+        {
+            if (result.Parameters.ContainsKey("confirm"))
+            {
+                _InstanceService.RemoveAllBFFHInstances();
+            }
+        }
+
+        private ICommand _AddInstancesCommand;
+        public ICommand AddInstancesCommand
+        {
+            get => _AddInstancesCommand;
+            set => SetProperty(ref _AddInstancesCommand, value);
+        }
+
+        private async void AddInstancesCommandExecuted()
+        {
+            INavigationResult result = await _NavigationService.NavigateAsync("HostSelectPage");
+            if (!result.Success)
+            {
+                System.Diagnostics.Debugger.Break();
+            }
+        }
+        #endregion
+    }
+}
diff --git a/Borepin/Borepin/Service/BFFHService.cs b/Borepin/Borepin/Service/BFFHService.cs
index 8cfe1c3..89cc2bd 100644
--- a/Borepin/Borepin/Service/BFFHService.cs
+++ b/Borepin/Borepin/Service/BFFHService.cs
@@ -5,20 +5,20 @@ using Capnp.Rpc;
 using Borepin.Service.Credentials;
 using Borepin.Model;
 using System.Threading.Tasks;
-using Borepin.Service.ServerInstances;
+using Borepin.Service.Instances;
 
 namespace Borepin.Service
 {
     public class BFFHService
     {
-        private IBFFHInstanceService _BFFHInstanceService;
+        private IInstanceService _BFFHInstanceService;
         private CredentialsService _CredentialsService;
 
         private Connection _Connection;
 
         public Uri ConnectedHost { get; private set; }
         
-        public BFFHService(IBFFHInstanceService bffhInstanceService)
+        public BFFHService(IInstanceService bffhInstanceService)
         {
             _BFFHInstanceService = bffhInstanceService;
             _CredentialsService = new CredentialsService();
diff --git a/Borepin/Borepin/Service/ServerInstances/IBFFHInstanceService.cs b/Borepin/Borepin/Service/Instances/IInstanceService.cs
similarity index 82%
rename from Borepin/Borepin/Service/ServerInstances/IBFFHInstanceService.cs
rename to Borepin/Borepin/Service/Instances/IInstanceService.cs
index f9678ff..7ca5806 100644
--- a/Borepin/Borepin/Service/ServerInstances/IBFFHInstanceService.cs
+++ b/Borepin/Borepin/Service/Instances/IInstanceService.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace Borepin.Service.ServerInstances
+namespace Borepin.Service.Instances
 {
-    public interface IBFFHInstanceService
+    public interface IInstanceService
     {
         Task<List<BFFHInstance>> GetBFFHInstances();
 
diff --git a/Borepin/Borepin/Service/ServerInstances/BFFHInstanceService.cs b/Borepin/Borepin/Service/Instances/InstanceService.cs
similarity index 96%
rename from Borepin/Borepin/Service/ServerInstances/BFFHInstanceService.cs
rename to Borepin/Borepin/Service/Instances/InstanceService.cs
index 5183d75..6dff4b9 100644
--- a/Borepin/Borepin/Service/ServerInstances/BFFHInstanceService.cs
+++ b/Borepin/Borepin/Service/Instances/InstanceService.cs
@@ -6,12 +6,12 @@ using System.Linq;
 using System.Threading.Tasks;
 using Xamarin.Essentials;
 
-namespace Borepin.Service.ServerInstances
+namespace Borepin.Service.Instances
 {
     /// <summary>
     /// Save connected BFFHInstances in Xamarin.Essentials.Preferences
     /// </summary>
-    public class BFFHInstanceService : IBFFHInstanceService
+    public class InstanceService : IInstanceService
     {
         private List<BFFHInstance> _BFFHInstance_List;
 
diff --git a/Borepin/Borepin/View/BFFHInstanceEntryView.xaml b/Borepin/Borepin/View/ServerListItemView.xaml
similarity index 80%
rename from Borepin/Borepin/View/BFFHInstanceEntryView.xaml
rename to Borepin/Borepin/View/ServerListItemView.xaml
index bc391b6..6aec04a 100644
--- a/Borepin/Borepin/View/BFFHInstanceEntryView.xaml
+++ b/Borepin/Borepin/View/ServerListItemView.xaml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ContentView xmlns="http://xamarin.com/schemas/2014/forms" 
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="Borepin.View.BFFHInstanceEntryView">
+             x:Class="Borepin.View.ServerListItemView">
   <ContentView.Content>
       <StackLayout>
           <Label Text="{Binding Address}" />
diff --git a/Borepin/Borepin/View/BFFHInstanceEntryView.xaml.cs b/Borepin/Borepin/View/ServerListItemView.xaml.cs
similarity index 75%
rename from Borepin/Borepin/View/BFFHInstanceEntryView.xaml.cs
rename to Borepin/Borepin/View/ServerListItemView.xaml.cs
index 5d30207..219209d 100644
--- a/Borepin/Borepin/View/BFFHInstanceEntryView.xaml.cs
+++ b/Borepin/Borepin/View/ServerListItemView.xaml.cs
@@ -10,9 +10,9 @@ using Xamarin.Forms.Xaml;
 namespace Borepin.View
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class BFFHInstanceEntryView : ContentView
+    public partial class ServerListItemView : ContentView
     {
-        public BFFHInstanceEntryView()
+        public ServerListItemView()
         {
             InitializeComponent();
         }
diff --git a/Borepin/Borepin/ViewModel/BFFHInstanceEntryViewModel.cs b/Borepin/Borepin/ViewModel/ServerListItemViewModel.cs
similarity index 59%
rename from Borepin/Borepin/ViewModel/BFFHInstanceEntryViewModel.cs
rename to Borepin/Borepin/ViewModel/ServerListItemViewModel.cs
index 5d77f88..7e6b8aa 100644
--- a/Borepin/Borepin/ViewModel/BFFHInstanceEntryViewModel.cs
+++ b/Borepin/Borepin/ViewModel/ServerListItemViewModel.cs
@@ -3,18 +3,18 @@ using Prism.Mvvm;
 
 namespace Borepin.ViewModel
 {
-    public class BFFHInstanceEntryViewModel : BindableBase
+    public class ServerListItemViewModel : BindableBase
     {
+        public ServerListItemViewModel(BFFHInstance server)
+        {
+            Address = server.Address.ToString();
+        }
+
         private string _Address;
         public string Address
         {
             get => _Address;
             set => SetProperty(ref _Address, value);
         }
-
-        public BFFHInstanceEntryViewModel(BFFHInstance bffhInstance)
-        {
-            Address = bffhInstance.Address.ToString();
-        }
     }
 }