diff --git a/corefx/src/main/java/com/core/Controller.java b/corefx/src/main/java/com/core/Controller.java
index 55ba5826..fc6e6a93 100644
--- a/corefx/src/main/java/com/core/Controller.java
+++ b/corefx/src/main/java/com/core/Controller.java
@@ -10,6 +10,7 @@ import com.core.data.CoreNode;
 import com.core.data.MobilityConfig;
 import com.core.graph.NetworkGraph;
 import com.core.ui.*;
+import com.core.ui.dialogs.*;
 import com.core.utils.ConfigUtils;
 import com.core.websocket.CoreWebSocket;
 import javafx.application.Application;
diff --git a/corefx/src/main/java/com/core/graph/NetworkGraph.java b/corefx/src/main/java/com/core/graph/NetworkGraph.java
index d8cd7ee0..a01edc3b 100644
--- a/corefx/src/main/java/com/core/graph/NetworkGraph.java
+++ b/corefx/src/main/java/com/core/graph/NetworkGraph.java
@@ -144,13 +144,12 @@ public class NetworkGraph {
 
             @Override
             public void graphReleased(CoreNode node, MouseEvent mouseEvent) {
-                logger.info("graph released mouse event: {}", mouseEvent);
                 if (SwingUtilities.isLeftMouseButton(mouseEvent)) {
-                    double newX = graphLayout.getX(node);
-                    double newY = graphLayout.getY(node);
-                    double oldX = node.getPosition().getX();
-                    double oldY = node.getPosition().getY();
-                    if (oldX == newX && oldY == newY) {
+                    Double newX = graphLayout.getX(node);
+                    Double newY = graphLayout.getY(node);
+                    Double oldX = node.getPosition().getX();
+                    Double oldY = node.getPosition().getY();
+                    if (newX.equals(oldX) && newY.equals(oldY)) {
                         return;
                     }
                     logger.debug("graph moved node({}): {},{}", node.getName(), newX, newY);
diff --git a/corefx/src/main/java/com/core/ui/BackgroundDialog.java b/corefx/src/main/java/com/core/ui/dialogs/BackgroundDialog.java
similarity index 99%
rename from corefx/src/main/java/com/core/ui/BackgroundDialog.java
rename to corefx/src/main/java/com/core/ui/dialogs/BackgroundDialog.java
index 1744f2f9..edd2d86b 100644
--- a/corefx/src/main/java/com/core/ui/BackgroundDialog.java
+++ b/corefx/src/main/java/com/core/ui/dialogs/BackgroundDialog.java
@@ -1,4 +1,4 @@
-package com.core.ui;
+package com.core.ui.dialogs;
 
 import com.core.Controller;
 import com.core.data.CoreLink;
diff --git a/corefx/src/main/java/com/core/ui/ChartDialog.java b/corefx/src/main/java/com/core/ui/dialogs/ChartDialog.java
similarity index 99%
rename from corefx/src/main/java/com/core/ui/ChartDialog.java
rename to corefx/src/main/java/com/core/ui/dialogs/ChartDialog.java
index ecc395d8..c1195df3 100644
--- a/corefx/src/main/java/com/core/ui/ChartDialog.java
+++ b/corefx/src/main/java/com/core/ui/dialogs/ChartDialog.java
@@ -1,4 +1,4 @@
-package com.core.ui;
+package com.core.ui.dialogs;
 
 import com.core.Controller;
 import com.core.datavis.*;
diff --git a/corefx/src/main/java/com/core/ui/ConfigDialog.java b/corefx/src/main/java/com/core/ui/dialogs/ConfigDialog.java
similarity index 98%
rename from corefx/src/main/java/com/core/ui/ConfigDialog.java
rename to corefx/src/main/java/com/core/ui/dialogs/ConfigDialog.java
index 9da02678..69358145 100644
--- a/corefx/src/main/java/com/core/ui/ConfigDialog.java
+++ b/corefx/src/main/java/com/core/ui/dialogs/ConfigDialog.java
@@ -1,10 +1,11 @@
-package com.core.ui;
+package com.core.ui.dialogs;
 
 import com.core.Controller;
 import com.core.client.rest.ConfigGroup;
 import com.core.client.rest.ConfigOption;
 import com.core.client.rest.GetConfig;
 import com.core.data.CoreNode;
+import com.core.ui.ConfigItem;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXScrollPane;
 import com.jfoenix.controls.JFXTabPane;
diff --git a/corefx/src/main/java/com/core/ui/CoreFoenixDialog.java b/corefx/src/main/java/com/core/ui/dialogs/CoreFoenixDialog.java
similarity index 98%
rename from corefx/src/main/java/com/core/ui/CoreFoenixDialog.java
rename to corefx/src/main/java/com/core/ui/dialogs/CoreFoenixDialog.java
index a4c6cd72..177acab1 100644
--- a/corefx/src/main/java/com/core/ui/CoreFoenixDialog.java
+++ b/corefx/src/main/java/com/core/ui/dialogs/CoreFoenixDialog.java
@@ -1,4 +1,4 @@
-package com.core.ui;
+package com.core.ui.dialogs;
 
 import com.core.Controller;
 import com.core.client.ICoreClient;
diff --git a/corefx/src/main/java/com/core/ui/GeoDialog.java b/corefx/src/main/java/com/core/ui/dialogs/GeoDialog.java
similarity index 96%
rename from corefx/src/main/java/com/core/ui/GeoDialog.java
rename to corefx/src/main/java/com/core/ui/dialogs/GeoDialog.java
index e8dd1a0d..f36f44f7 100644
--- a/corefx/src/main/java/com/core/ui/GeoDialog.java
+++ b/corefx/src/main/java/com/core/ui/dialogs/GeoDialog.java
@@ -1,4 +1,4 @@
-package com.core.ui;
+package com.core.ui.dialogs;
 
 import com.core.Controller;
 import com.jfoenix.controls.JFXButton;
diff --git a/corefx/src/main/java/com/core/ui/HookDialog.java b/corefx/src/main/java/com/core/ui/dialogs/HookDialog.java
similarity index 98%
rename from corefx/src/main/java/com/core/ui/HookDialog.java
rename to corefx/src/main/java/com/core/ui/dialogs/HookDialog.java
index f72ad1af..6aeb1315 100644
--- a/corefx/src/main/java/com/core/ui/HookDialog.java
+++ b/corefx/src/main/java/com/core/ui/dialogs/HookDialog.java
@@ -1,4 +1,4 @@
-package com.core.ui;
+package com.core.ui.dialogs;
 
 import com.core.Controller;
 import com.core.data.Hook;
diff --git a/corefx/src/main/java/com/core/ui/HooksDialog.java b/corefx/src/main/java/com/core/ui/dialogs/HooksDialog.java
similarity index 98%
rename from corefx/src/main/java/com/core/ui/HooksDialog.java
rename to corefx/src/main/java/com/core/ui/dialogs/HooksDialog.java
index dc07da94..2bcb9b85 100644
--- a/corefx/src/main/java/com/core/ui/HooksDialog.java
+++ b/corefx/src/main/java/com/core/ui/dialogs/HooksDialog.java
@@ -1,9 +1,10 @@
-package com.core.ui;
+package com.core.ui.dialogs;
 
 import com.core.Controller;
 import com.core.client.rest.GetHooks;
 import com.core.data.Hook;
 import com.core.data.SessionState;
+import com.core.ui.Toast;
 import com.jfoenix.controls.JFXButton;
 import javafx.fxml.FXML;
 import javafx.scene.control.TableColumn;
diff --git a/corefx/src/main/java/com/core/ui/LocationDialog.java b/corefx/src/main/java/com/core/ui/dialogs/LocationDialog.java
similarity index 98%
rename from corefx/src/main/java/com/core/ui/LocationDialog.java
rename to corefx/src/main/java/com/core/ui/dialogs/LocationDialog.java
index 90ece8e9..c349cdf9 100644
--- a/corefx/src/main/java/com/core/ui/LocationDialog.java
+++ b/corefx/src/main/java/com/core/ui/dialogs/LocationDialog.java
@@ -1,7 +1,8 @@
-package com.core.ui;
+package com.core.ui.dialogs;
 
 import com.core.Controller;
 import com.core.data.LocationConfig;
+import com.core.ui.Toast;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXTextField;
 import com.jfoenix.validation.DoubleValidator;
diff --git a/corefx/src/main/java/com/core/ui/MobilityDialog.java b/corefx/src/main/java/com/core/ui/dialogs/MobilityDialog.java
similarity index 98%
rename from corefx/src/main/java/com/core/ui/MobilityDialog.java
rename to corefx/src/main/java/com/core/ui/dialogs/MobilityDialog.java
index c1c99c02..c22d3306 100644
--- a/corefx/src/main/java/com/core/ui/MobilityDialog.java
+++ b/corefx/src/main/java/com/core/ui/dialogs/MobilityDialog.java
@@ -1,8 +1,9 @@
-package com.core.ui;
+package com.core.ui.dialogs;
 
 import com.core.Controller;
 import com.core.data.CoreNode;
 import com.core.data.MobilityConfig;
+import com.core.ui.Toast;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXTextField;
 import com.jfoenix.controls.JFXToggleButton;
diff --git a/corefx/src/main/java/com/core/ui/NodeEmaneDialog.java b/corefx/src/main/java/com/core/ui/dialogs/NodeEmaneDialog.java
similarity index 98%
rename from corefx/src/main/java/com/core/ui/NodeEmaneDialog.java
rename to corefx/src/main/java/com/core/ui/dialogs/NodeEmaneDialog.java
index 0f3085d0..17e44ad6 100644
--- a/corefx/src/main/java/com/core/ui/NodeEmaneDialog.java
+++ b/corefx/src/main/java/com/core/ui/dialogs/NodeEmaneDialog.java
@@ -1,9 +1,10 @@
-package com.core.ui;
+package com.core.ui.dialogs;
 
 import com.core.Controller;
 import com.core.client.rest.ConfigOption;
 import com.core.client.rest.GetConfig;
 import com.core.data.CoreNode;
+import com.core.ui.Toast;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXComboBox;
 import javafx.event.ActionEvent;
diff --git a/corefx/src/main/java/com/core/ui/NodeServicesDialog.java b/corefx/src/main/java/com/core/ui/dialogs/NodeServicesDialog.java
similarity index 99%
rename from corefx/src/main/java/com/core/ui/NodeServicesDialog.java
rename to corefx/src/main/java/com/core/ui/dialogs/NodeServicesDialog.java
index f7dd408b..121091e0 100644
--- a/corefx/src/main/java/com/core/ui/NodeServicesDialog.java
+++ b/corefx/src/main/java/com/core/ui/dialogs/NodeServicesDialog.java
@@ -1,8 +1,9 @@
-package com.core.ui;
+package com.core.ui.dialogs;
 
 import com.core.Controller;
 import com.core.client.rest.GetServices;
 import com.core.data.CoreNode;
+import com.core.ui.ServiceItem;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXListView;
 import com.jfoenix.controls.JFXScrollPane;
diff --git a/corefx/src/main/java/com/core/ui/NodeTypesDialog.java b/corefx/src/main/java/com/core/ui/dialogs/NodeTypesDialog.java
similarity index 98%
rename from corefx/src/main/java/com/core/ui/NodeTypesDialog.java
rename to corefx/src/main/java/com/core/ui/dialogs/NodeTypesDialog.java
index 2e9e526d..dda57deb 100644
--- a/corefx/src/main/java/com/core/ui/NodeTypesDialog.java
+++ b/corefx/src/main/java/com/core/ui/dialogs/NodeTypesDialog.java
@@ -1,8 +1,9 @@
-package com.core.ui;
+package com.core.ui.dialogs;
 
 import com.core.Controller;
 import com.core.data.CoreNode;
 import com.core.data.NodeType;
+import com.core.ui.Toast;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXListView;
 import com.jfoenix.controls.JFXTextField;
diff --git a/corefx/src/main/java/com/core/ui/NodeWlanDialog.java b/corefx/src/main/java/com/core/ui/dialogs/NodeWlanDialog.java
similarity index 97%
rename from corefx/src/main/java/com/core/ui/NodeWlanDialog.java
rename to corefx/src/main/java/com/core/ui/dialogs/NodeWlanDialog.java
index adc94f48..79fb202f 100644
--- a/corefx/src/main/java/com/core/ui/NodeWlanDialog.java
+++ b/corefx/src/main/java/com/core/ui/dialogs/NodeWlanDialog.java
@@ -1,8 +1,9 @@
-package com.core.ui;
+package com.core.ui.dialogs;
 
 import com.core.Controller;
 import com.core.client.rest.WlanConfig;
 import com.core.data.CoreNode;
+import com.core.ui.Toast;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXTextField;
 import javafx.fxml.FXML;
diff --git a/corefx/src/main/java/com/core/ui/ServiceDialog.java b/corefx/src/main/java/com/core/ui/dialogs/ServiceDialog.java
similarity index 99%
rename from corefx/src/main/java/com/core/ui/ServiceDialog.java
rename to corefx/src/main/java/com/core/ui/dialogs/ServiceDialog.java
index 87f7a7ab..ab526fc6 100644
--- a/corefx/src/main/java/com/core/ui/ServiceDialog.java
+++ b/corefx/src/main/java/com/core/ui/dialogs/ServiceDialog.java
@@ -1,4 +1,4 @@
-package com.core.ui;
+package com.core.ui.dialogs;
 
 import com.core.Controller;
 import com.core.client.rest.ServiceFile;
diff --git a/corefx/src/main/java/com/core/ui/SessionsDialog.java b/corefx/src/main/java/com/core/ui/dialogs/SessionsDialog.java
similarity index 97%
rename from corefx/src/main/java/com/core/ui/SessionsDialog.java
rename to corefx/src/main/java/com/core/ui/dialogs/SessionsDialog.java
index 7fd36b4f..d459d5db 100644
--- a/corefx/src/main/java/com/core/ui/SessionsDialog.java
+++ b/corefx/src/main/java/com/core/ui/dialogs/SessionsDialog.java
@@ -1,9 +1,10 @@
-package com.core.ui;
+package com.core.ui.dialogs;
 
 import com.core.Controller;
 import com.core.client.rest.GetSessions;
 import com.core.client.rest.GetSessionsData;
 import com.core.data.SessionState;
+import com.core.ui.Toast;
 import com.jfoenix.controls.JFXButton;
 import javafx.fxml.FXML;
 import javafx.scene.control.TableColumn;
diff --git a/corefx/src/main/java/com/core/ui/SessionsFoenixDialog.java b/corefx/src/main/java/com/core/ui/dialogs/SessionsFoenixDialog.java
similarity index 97%
rename from corefx/src/main/java/com/core/ui/SessionsFoenixDialog.java
rename to corefx/src/main/java/com/core/ui/dialogs/SessionsFoenixDialog.java
index 4d6ec818..12d3c1be 100644
--- a/corefx/src/main/java/com/core/ui/SessionsFoenixDialog.java
+++ b/corefx/src/main/java/com/core/ui/dialogs/SessionsFoenixDialog.java
@@ -1,9 +1,10 @@
-package com.core.ui;
+package com.core.ui.dialogs;
 
 import com.core.Controller;
 import com.core.client.rest.GetSessions;
 import com.core.client.rest.GetSessionsData;
 import com.core.data.SessionState;
+import com.core.ui.dialogs.CoreFoenixDialog;
 import com.jfoenix.controls.JFXButton;
 import javafx.fxml.FXML;
 import javafx.scene.control.TableColumn;
diff --git a/corefx/src/main/java/com/core/ui/StageDialog.java b/corefx/src/main/java/com/core/ui/dialogs/StageDialog.java
similarity index 99%
rename from corefx/src/main/java/com/core/ui/StageDialog.java
rename to corefx/src/main/java/com/core/ui/dialogs/StageDialog.java
index 07a2277d..38d1d2f1 100644
--- a/corefx/src/main/java/com/core/ui/StageDialog.java
+++ b/corefx/src/main/java/com/core/ui/dialogs/StageDialog.java
@@ -1,4 +1,4 @@
-package com.core.ui;
+package com.core.ui.dialogs;
 
 import com.core.Controller;
 import com.core.client.ICoreClient;