diff --git a/Server/App.xaml b/Server/App.xaml
index 4bfff38..8ef660c 100644
--- a/Server/App.xaml
+++ b/Server/App.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:Server"
-             StartupUri="MainWindow.xaml">
+             StartupUri="Views/MainWindow.xaml">
     <Application.Resources>
          
     </Application.Resources>
diff --git a/Server/MainWindow.xaml b/Server/Views/MainWindow.xaml
similarity index 53%
rename from Server/MainWindow.xaml
rename to Server/Views/MainWindow.xaml
index c42cb70..45eec7f 100644
--- a/Server/MainWindow.xaml
+++ b/Server/Views/MainWindow.xaml
@@ -7,6 +7,9 @@
         mc:Ignorable="d"
         Title="MainWindow" Height="450" Width="800">
     <Grid>
+        <TextBox HorizontalAlignment="center" Margin="0,0,0,0" Text="{Binding ipAddress, Mode=OneWay}" TextWrapping="Wrap" VerticalAlignment="Center" Width="120"/>
+        <Label Content="IP address:" HorizontalAlignment="Center" Margin="0,176,0,0" VerticalAlignment="Top" Width="120"/>
+        <Button Content="Connect" HorizontalAlignment="Left" Margin="465,0,0,0" VerticalAlignment="Center" Click="ConnectServer"/>
 
     </Grid>
 </Window>
diff --git a/Server/MainWindow.xaml.cs b/Server/Views/MainWindow.xaml.cs
similarity index 82%
rename from Server/MainWindow.xaml.cs
rename to Server/Views/MainWindow.xaml.cs
index 58bc2c8..cdeac3e 100644
--- a/Server/MainWindow.xaml.cs
+++ b/Server/Views/MainWindow.xaml.cs
@@ -20,9 +20,15 @@ namespace Server
     /// </summary>
     public partial class MainWindow : Window
     {
+        private string ipAddress = "test";
         public MainWindow()
         {
             InitializeComponent();
         }
+
+        private void ConnectServer(object sender, RoutedEventArgs e)
+        {
+
+        }
     }
 }