diff --git a/editor.cpp b/editor.cpp
index 141339d2..cdc20cdb 100755
--- a/editor.cpp
+++ b/editor.cpp
@@ -634,7 +634,7 @@ void Editor::createConnectionItem(MapConnection* connection, bool hide) {
     connection_edit_item->setY(y);
     connection_edit_item->setZValue(-1);
     scene->addItem(connection_edit_item);
-    connect(connection_edit_item, SIGNAL(connectionMoved(Connection*)), this, SLOT(onConnectionMoved(Connection*)));
+    connect(connection_edit_item, SIGNAL(connectionMoved(MapConnection*)), this, SLOT(onConnectionMoved(MapConnection*)));
     connect(connection_edit_item, SIGNAL(connectionItemSelected(ConnectionPixmapItem*)), this, SLOT(onConnectionItemSelected(ConnectionPixmapItem*)));
     connect(connection_edit_item, SIGNAL(connectionItemDoubleClicked(ConnectionPixmapItem*)), this, SLOT(onConnectionItemDoubleClicked(ConnectionPixmapItem*)));
     connection_edit_items.append(connection_edit_item);
diff --git a/porymap.pro b/porymap.pro
index 73c80cbe..44216411 100755
--- a/porymap.pro
+++ b/porymap.pro
@@ -24,6 +24,9 @@ SOURCES += core/block.cpp \
     core/tileset.cpp \
     ui/metatileselector.cpp \
     ui/movementpermissionsselector.cpp \
+    ui/neweventtoolbutton.cpp \
+    ui/noscrollcombobox.cpp \
+    ui/noscrollspinbox.cpp \
     ui/selectablepixmapitem.cpp \
     editor.cpp \
     event.cpp \
@@ -31,9 +34,6 @@ SOURCES += core/block.cpp \
     main.cpp \
     mainwindow.cpp \
     map.cpp \
-    neweventtoolbutton.cpp \
-    noscrollcombobox.cpp \
-    noscrollspinbox.cpp \
     objectpropertiesframe.cpp \
     parseutil.cpp \
     project.cpp
@@ -50,15 +50,15 @@ HEADERS  += core/block.h \
     core/tileset.h \
     ui/metatileselector.h \
     ui/movementpermissionsselector.h \
+    ui/neweventtoolbutton.h \
+    ui/noscrollcombobox.h \
+    ui/noscrollspinbox.h \
     ui/selectablepixmapitem.h \
     editor.h \
     event.h \
     graphicsview.h \
     mainwindow.h \
     map.h \
-    neweventtoolbutton.h \
-    noscrollcombobox.h \
-    noscrollspinbox.h \
     objectpropertiesframe.h \
     parseutil.h \
     project.h
diff --git a/neweventtoolbutton.cpp b/ui/neweventtoolbutton.cpp
similarity index 100%
rename from neweventtoolbutton.cpp
rename to ui/neweventtoolbutton.cpp
diff --git a/neweventtoolbutton.h b/ui/neweventtoolbutton.h
similarity index 100%
rename from neweventtoolbutton.h
rename to ui/neweventtoolbutton.h
diff --git a/noscrollcombobox.cpp b/ui/noscrollcombobox.cpp
similarity index 100%
rename from noscrollcombobox.cpp
rename to ui/noscrollcombobox.cpp
diff --git a/noscrollcombobox.h b/ui/noscrollcombobox.h
similarity index 100%
rename from noscrollcombobox.h
rename to ui/noscrollcombobox.h
diff --git a/noscrollspinbox.cpp b/ui/noscrollspinbox.cpp
similarity index 100%
rename from noscrollspinbox.cpp
rename to ui/noscrollspinbox.cpp
diff --git a/noscrollspinbox.h b/ui/noscrollspinbox.h
similarity index 100%
rename from noscrollspinbox.h
rename to ui/noscrollspinbox.h