diff --git a/config.properties b/config.properties
index da819fb..faa41dc 100644
--- a/config.properties
+++ b/config.properties
@@ -1,7 +1,7 @@
 autoconnect = true
 debug = true
 port = 1225
-server = 10.5.5.49
+server = localhost
 user = michal
 volume = 75
 start_minimalized = false
diff --git a/src/jnet/client/gui/MenuPanel.java b/src/jnet/client/gui/MenuPanel.java
index 1ca6f2e..9bf06d5 100644
--- a/src/jnet/client/gui/MenuPanel.java
+++ b/src/jnet/client/gui/MenuPanel.java
@@ -1,5 +1,6 @@
 package jnet.client.gui;
 
+import jnet.client.gui.serversettings.ServerSettingsPanel;
 import jnet.client.gui.dialog.LoginDialog;
 import jnet.client.network.NettyClient;
 import java.awt.Dimension;
diff --git a/src/jnet/client/gui/Window.java b/src/jnet/client/gui/Window.java
index e408043..37919ce 100644
--- a/src/jnet/client/gui/Window.java
+++ b/src/jnet/client/gui/Window.java
@@ -1,5 +1,6 @@
 package jnet.client.gui;
 
+import jnet.client.gui.serversettings.ServerSettingsPanel;
 import jnet.client.gui.mapview.MapView;
 import jnet.client.Client;
 import java.awt.BorderLayout;
diff --git a/src/jnet/client/gui/dialog/AddDeviceTypeDialog.java b/src/jnet/client/gui/dialog/AddDeviceTypeDialog.java
index 2c10f38..de30cac 100644
--- a/src/jnet/client/gui/dialog/AddDeviceTypeDialog.java
+++ b/src/jnet/client/gui/dialog/AddDeviceTypeDialog.java
@@ -1,6 +1,6 @@
 package jnet.client.gui.dialog;
 
-import jnet.client.gui.ServerSettingsPanel;
+import jnet.client.gui.serversettings.ServerSettingsPanel;
 import jnet.client.gui.Window;
 import jnet.client.network.NettyClient;
 import java.awt.Color;
diff --git a/src/jnet/client/gui/dialog/OnlineClientsDialog.java b/src/jnet/client/gui/dialog/OnlineClientsDialog.java
index ed73e84..e9b2db2 100644
--- a/src/jnet/client/gui/dialog/OnlineClientsDialog.java
+++ b/src/jnet/client/gui/dialog/OnlineClientsDialog.java
@@ -35,10 +35,10 @@ public class OnlineClientsDialog extends JDialog {
                 JLabel line = new JLabel("      " + oc.getUsername() + "      (" + oc.getIp() + ")");
                 switch (oc.getPlatform()) {
                     case OnlineClients.PLATFORM_MOBILE:
-                        line.setIcon(new ImageIcon(ImageIO.read(new File("img/platform_android.png"))));
+                        line.setIcon(new ImageIcon(ImageIO.read(getClass().getResourceAsStream("/img/platform_android.png"))));
                         break;
                     case OnlineClients.PLATFORM_PC:
-                        line.setIcon(new ImageIcon(ImageIO.read(new File("img/platform_pc.png"))));
+                        line.setIcon(new ImageIcon(ImageIO.read(getClass().getResourceAsStream("/img/platform_pc.png"))));
                         break;
                 }
                 panel.add(line);
diff --git a/src/jnet/client/gui/dialog/UserDialog.java b/src/jnet/client/gui/dialog/UserDialog.java
index 01864ca..7f9f0ac 100644
--- a/src/jnet/client/gui/dialog/UserDialog.java
+++ b/src/jnet/client/gui/dialog/UserDialog.java
@@ -1,6 +1,6 @@
 package jnet.client.gui.dialog;
 
-import jnet.client.gui.ServerSettingsPanel;
+import jnet.client.gui.serversettings.ServerSettingsPanel;
 import jnet.client.gui.Window;
 import jnet.client.network.NettyClient;
 import java.awt.event.ActionEvent;
diff --git a/src/jnet/client/gui/ServerSettingsPanel.java b/src/jnet/client/gui/serversettings/ServerSettingsPanel.java
similarity index 99%
rename from src/jnet/client/gui/ServerSettingsPanel.java
rename to src/jnet/client/gui/serversettings/ServerSettingsPanel.java
index f1453fc..186ab53 100644
--- a/src/jnet/client/gui/ServerSettingsPanel.java
+++ b/src/jnet/client/gui/serversettings/ServerSettingsPanel.java
@@ -1,4 +1,4 @@
-package jnet.client.gui;
+package jnet.client.gui.serversettings;
 
 import jnet.client.Client;
 import jnet.client.gui.dialog.AddDeviceTypeDialog;
diff --git a/src/jnet/client/gui/TableDeviceType.java b/src/jnet/client/gui/serversettings/TableDeviceType.java
similarity index 98%
rename from src/jnet/client/gui/TableDeviceType.java
rename to src/jnet/client/gui/serversettings/TableDeviceType.java
index e85395b..3cc8930 100644
--- a/src/jnet/client/gui/TableDeviceType.java
+++ b/src/jnet/client/gui/serversettings/TableDeviceType.java
@@ -1,4 +1,4 @@
-package jnet.client.gui;
+package jnet.client.gui.serversettings;
 
 import jnet.client.Client;
 import java.io.ByteArrayInputStream;
diff --git a/src/jnet/client/gui/TableUsers.java b/src/jnet/client/gui/serversettings/TableUsers.java
similarity index 95%
rename from src/jnet/client/gui/TableUsers.java
rename to src/jnet/client/gui/serversettings/TableUsers.java
index 931b634..883b876 100644
--- a/src/jnet/client/gui/TableUsers.java
+++ b/src/jnet/client/gui/serversettings/TableUsers.java
@@ -1,5 +1,6 @@
-package jnet.client.gui;
+package jnet.client.gui.serversettings;
 
+import jnet.client.gui.serversettings.TableDeviceType;
 import jnet.client.Client;
 import jnet.client.gui.dialog.UserDialog;
 import java.awt.Component;
@@ -83,8 +84,8 @@ public class TableUsers extends JTable {
         for (User u : Client.users) {
             try {
 
-                ImageIcon ii_yes = new ImageIcon(ImageIO.read(getClass().getResourceAsStream("img/yes.png")));
-                ImageIcon ii_no = new ImageIcon(ImageIO.read(getClass().getResourceAsStream("img/no.png")));
+                ImageIcon ii_yes = new ImageIcon(ImageIO.read(getClass().getResourceAsStream("/img/yes.png")));
+                ImageIcon ii_no = new ImageIcon(ImageIO.read(getClass().getResourceAsStream("/img/no.png")));
 
                 this.setValueAt(u.getId(), row, 0);
                 this.setValueAt(u.getUsername(), row, 1);