diff --git a/.gitignore b/.gitignore
index 824291915..18fb67d45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,7 +166,6 @@ valgrind-*.log
 /system-settings/src
 /test/libnm-glib-test
 /test/libnm_glib_test
-/test/nm-online
 /test/nmtestdevices
 /libnm-util/nm-version.h
 /libnm-util/nm-setting-docs.xml
@@ -219,10 +218,10 @@ valgrind-*.log
 /data/org.freedesktop.NetworkManager.service
 /data/server.conf
 
-/cli/src/nmcli
-/cli/src/settings-docs.c
-
-/tui/newt/libnmt-newt.a
-/tui/nmtui
+clients/cli/nmcli
+clients/cli/settings-docs.c
+clients/tui/newt/libnmt-newt.a
+clients/tui/nmtui
+clients/nm-online
 
 /vapi/*.vapi
diff --git a/Makefile.am b/Makefile.am
index 97f094d79..ea0bab0f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,8 +8,7 @@ SUBDIRS = \
 	introspection \
 	src \
 	callouts \
-	cli \
-	tui \
+	clients \
 	tools \
 	policy \
 	data \
diff --git a/cli/Makefile.am b/cli/Makefile.am
deleted file mode 100644
index f436d46da..000000000
--- a/cli/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = src completion
-
diff --git a/cli/completion/Makefile.am b/cli/completion/Makefile.am
deleted file mode 100644
index 9a250f070..000000000
--- a/cli/completion/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-completiondir = $(datadir)/bash-completion/completions
-dist_completion_DATA = nmcli
diff --git a/clients/Makefile.am b/clients/Makefile.am
new file mode 100644
index 000000000..616887df1
--- /dev/null
+++ b/clients/Makefile.am
@@ -0,0 +1,26 @@
+SUBDIRS = cli tui
+
+AM_CPPFLAGS = \
+	-I${top_srcdir} \
+	-I${top_srcdir}/libnm-util \
+	-I${top_builddir}/libnm-util \
+	-I${top_srcdir}/libnm-glib \
+	-I${top_builddir}/libnm-glib \
+	-I${top_srcdir}/include \
+	$(DBUS_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
+	-DNMLOCALEDIR=\"$(datadir)/locale\"
+
+bin_PROGRAMS = nm-online
+
+nm_online_SOURCES = nm-online.c
+nm_online_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\""nm-online"\" \
+	$(AM_CPPFLAGS)
+
+nm_online_LDADD = \
+	$(top_builddir)/libnm-glib/libnm-glib.la \
+	$(top_builddir)/libnm-util/libnm-util.la \
+	$(DBUS_LIBS) \
+	$(GLIB_LIBS)
diff --git a/cli/src/Makefile.am b/clients/cli/Makefile.am
similarity index 77%
rename from cli/src/Makefile.am
rename to clients/cli/Makefile.am
index 70dbd9795..65df699ab 100644
--- a/cli/src/Makefile.am
+++ b/clients/cli/Makefile.am
@@ -47,3 +47,14 @@ endif
 DISTCLEANFILES = settings-docs.c
 
 EXTRA_DIST = settings-docs.c settings-docs.xsl
+
+completiondir = $(datadir)/bash-completion/completions
+
+install-data-hook:
+	$(mkinstalldirs) $(DESTDIR)$(completiondir)
+	$(INSTALL_DATA) $(srcdir)/nmcli-completion $(DESTDIR)$(completiondir)/nmcli
+
+uninstall-hook:
+	rm -f $(DESTDIR)$(completiondir)/nmcli
+
+EXTRA_DIST += nmcli-completion
diff --git a/cli/src/common.c b/clients/cli/common.c
similarity index 100%
rename from cli/src/common.c
rename to clients/cli/common.c
diff --git a/cli/src/common.h b/clients/cli/common.h
similarity index 100%
rename from cli/src/common.h
rename to clients/cli/common.h
diff --git a/cli/src/connections.c b/clients/cli/connections.c
similarity index 100%
rename from cli/src/connections.c
rename to clients/cli/connections.c
diff --git a/cli/src/connections.h b/clients/cli/connections.h
similarity index 100%
rename from cli/src/connections.h
rename to clients/cli/connections.h
diff --git a/cli/src/devices.c b/clients/cli/devices.c
similarity index 100%
rename from cli/src/devices.c
rename to clients/cli/devices.c
diff --git a/cli/src/devices.h b/clients/cli/devices.h
similarity index 100%
rename from cli/src/devices.h
rename to clients/cli/devices.h
diff --git a/cli/src/network-manager.c b/clients/cli/network-manager.c
similarity index 100%
rename from cli/src/network-manager.c
rename to clients/cli/network-manager.c
diff --git a/cli/src/network-manager.h b/clients/cli/network-manager.h
similarity index 100%
rename from cli/src/network-manager.h
rename to clients/cli/network-manager.h
diff --git a/cli/completion/nmcli b/clients/cli/nmcli-completion
similarity index 100%
rename from cli/completion/nmcli
rename to clients/cli/nmcli-completion
diff --git a/cli/src/nmcli.c b/clients/cli/nmcli.c
similarity index 100%
rename from cli/src/nmcli.c
rename to clients/cli/nmcli.c
diff --git a/cli/src/nmcli.h b/clients/cli/nmcli.h
similarity index 100%
rename from cli/src/nmcli.h
rename to clients/cli/nmcli.h
diff --git a/cli/src/settings-docs.xsl b/clients/cli/settings-docs.xsl
similarity index 100%
rename from cli/src/settings-docs.xsl
rename to clients/cli/settings-docs.xsl
diff --git a/cli/src/settings.c b/clients/cli/settings.c
similarity index 100%
rename from cli/src/settings.c
rename to clients/cli/settings.c
diff --git a/cli/src/settings.h b/clients/cli/settings.h
similarity index 100%
rename from cli/src/settings.h
rename to clients/cli/settings.h
diff --git a/cli/src/utils.c b/clients/cli/utils.c
similarity index 100%
rename from cli/src/utils.c
rename to clients/cli/utils.c
diff --git a/cli/src/utils.h b/clients/cli/utils.h
similarity index 100%
rename from cli/src/utils.h
rename to clients/cli/utils.h
diff --git a/test/nm-online.c b/clients/nm-online.c
similarity index 100%
rename from test/nm-online.c
rename to clients/nm-online.c
diff --git a/tui/Makefile.am b/clients/tui/Makefile.am
similarity index 100%
rename from tui/Makefile.am
rename to clients/tui/Makefile.am
diff --git a/tui/newt/Makefile.am b/clients/tui/newt/Makefile.am
similarity index 100%
rename from tui/newt/Makefile.am
rename to clients/tui/newt/Makefile.am
diff --git a/tui/newt/nmt-newt-button-box.c b/clients/tui/newt/nmt-newt-button-box.c
similarity index 100%
rename from tui/newt/nmt-newt-button-box.c
rename to clients/tui/newt/nmt-newt-button-box.c
diff --git a/tui/newt/nmt-newt-button-box.h b/clients/tui/newt/nmt-newt-button-box.h
similarity index 100%
rename from tui/newt/nmt-newt-button-box.h
rename to clients/tui/newt/nmt-newt-button-box.h
diff --git a/tui/newt/nmt-newt-button.c b/clients/tui/newt/nmt-newt-button.c
similarity index 100%
rename from tui/newt/nmt-newt-button.c
rename to clients/tui/newt/nmt-newt-button.c
diff --git a/tui/newt/nmt-newt-button.h b/clients/tui/newt/nmt-newt-button.h
similarity index 100%
rename from tui/newt/nmt-newt-button.h
rename to clients/tui/newt/nmt-newt-button.h
diff --git a/tui/newt/nmt-newt-checkbox.c b/clients/tui/newt/nmt-newt-checkbox.c
similarity index 100%
rename from tui/newt/nmt-newt-checkbox.c
rename to clients/tui/newt/nmt-newt-checkbox.c
diff --git a/tui/newt/nmt-newt-checkbox.h b/clients/tui/newt/nmt-newt-checkbox.h
similarity index 100%
rename from tui/newt/nmt-newt-checkbox.h
rename to clients/tui/newt/nmt-newt-checkbox.h
diff --git a/tui/newt/nmt-newt-component.c b/clients/tui/newt/nmt-newt-component.c
similarity index 100%
rename from tui/newt/nmt-newt-component.c
rename to clients/tui/newt/nmt-newt-component.c
diff --git a/tui/newt/nmt-newt-component.h b/clients/tui/newt/nmt-newt-component.h
similarity index 100%
rename from tui/newt/nmt-newt-component.h
rename to clients/tui/newt/nmt-newt-component.h
diff --git a/tui/newt/nmt-newt-container.c b/clients/tui/newt/nmt-newt-container.c
similarity index 100%
rename from tui/newt/nmt-newt-container.c
rename to clients/tui/newt/nmt-newt-container.c
diff --git a/tui/newt/nmt-newt-container.h b/clients/tui/newt/nmt-newt-container.h
similarity index 100%
rename from tui/newt/nmt-newt-container.h
rename to clients/tui/newt/nmt-newt-container.h
diff --git a/tui/newt/nmt-newt-entry-numeric.c b/clients/tui/newt/nmt-newt-entry-numeric.c
similarity index 100%
rename from tui/newt/nmt-newt-entry-numeric.c
rename to clients/tui/newt/nmt-newt-entry-numeric.c
diff --git a/tui/newt/nmt-newt-entry-numeric.h b/clients/tui/newt/nmt-newt-entry-numeric.h
similarity index 100%
rename from tui/newt/nmt-newt-entry-numeric.h
rename to clients/tui/newt/nmt-newt-entry-numeric.h
diff --git a/tui/newt/nmt-newt-entry.c b/clients/tui/newt/nmt-newt-entry.c
similarity index 100%
rename from tui/newt/nmt-newt-entry.c
rename to clients/tui/newt/nmt-newt-entry.c
diff --git a/tui/newt/nmt-newt-entry.h b/clients/tui/newt/nmt-newt-entry.h
similarity index 100%
rename from tui/newt/nmt-newt-entry.h
rename to clients/tui/newt/nmt-newt-entry.h
diff --git a/tui/newt/nmt-newt-form.c b/clients/tui/newt/nmt-newt-form.c
similarity index 100%
rename from tui/newt/nmt-newt-form.c
rename to clients/tui/newt/nmt-newt-form.c
diff --git a/tui/newt/nmt-newt-form.h b/clients/tui/newt/nmt-newt-form.h
similarity index 100%
rename from tui/newt/nmt-newt-form.h
rename to clients/tui/newt/nmt-newt-form.h
diff --git a/tui/newt/nmt-newt-grid.c b/clients/tui/newt/nmt-newt-grid.c
similarity index 100%
rename from tui/newt/nmt-newt-grid.c
rename to clients/tui/newt/nmt-newt-grid.c
diff --git a/tui/newt/nmt-newt-grid.h b/clients/tui/newt/nmt-newt-grid.h
similarity index 100%
rename from tui/newt/nmt-newt-grid.h
rename to clients/tui/newt/nmt-newt-grid.h
diff --git a/tui/newt/nmt-newt-hacks.c b/clients/tui/newt/nmt-newt-hacks.c
similarity index 100%
rename from tui/newt/nmt-newt-hacks.c
rename to clients/tui/newt/nmt-newt-hacks.c
diff --git a/tui/newt/nmt-newt-hacks.h b/clients/tui/newt/nmt-newt-hacks.h
similarity index 100%
rename from tui/newt/nmt-newt-hacks.h
rename to clients/tui/newt/nmt-newt-hacks.h
diff --git a/tui/newt/nmt-newt-label.c b/clients/tui/newt/nmt-newt-label.c
similarity index 100%
rename from tui/newt/nmt-newt-label.c
rename to clients/tui/newt/nmt-newt-label.c
diff --git a/tui/newt/nmt-newt-label.h b/clients/tui/newt/nmt-newt-label.h
similarity index 100%
rename from tui/newt/nmt-newt-label.h
rename to clients/tui/newt/nmt-newt-label.h
diff --git a/tui/newt/nmt-newt-listbox.c b/clients/tui/newt/nmt-newt-listbox.c
similarity index 100%
rename from tui/newt/nmt-newt-listbox.c
rename to clients/tui/newt/nmt-newt-listbox.c
diff --git a/tui/newt/nmt-newt-listbox.h b/clients/tui/newt/nmt-newt-listbox.h
similarity index 100%
rename from tui/newt/nmt-newt-listbox.h
rename to clients/tui/newt/nmt-newt-listbox.h
diff --git a/tui/newt/nmt-newt-popup.c b/clients/tui/newt/nmt-newt-popup.c
similarity index 100%
rename from tui/newt/nmt-newt-popup.c
rename to clients/tui/newt/nmt-newt-popup.c
diff --git a/tui/newt/nmt-newt-popup.h b/clients/tui/newt/nmt-newt-popup.h
similarity index 100%
rename from tui/newt/nmt-newt-popup.h
rename to clients/tui/newt/nmt-newt-popup.h
diff --git a/tui/newt/nmt-newt-section.c b/clients/tui/newt/nmt-newt-section.c
similarity index 100%
rename from tui/newt/nmt-newt-section.c
rename to clients/tui/newt/nmt-newt-section.c
diff --git a/tui/newt/nmt-newt-section.h b/clients/tui/newt/nmt-newt-section.h
similarity index 100%
rename from tui/newt/nmt-newt-section.h
rename to clients/tui/newt/nmt-newt-section.h
diff --git a/tui/newt/nmt-newt-separator.c b/clients/tui/newt/nmt-newt-separator.c
similarity index 100%
rename from tui/newt/nmt-newt-separator.c
rename to clients/tui/newt/nmt-newt-separator.c
diff --git a/tui/newt/nmt-newt-separator.h b/clients/tui/newt/nmt-newt-separator.h
similarity index 100%
rename from tui/newt/nmt-newt-separator.h
rename to clients/tui/newt/nmt-newt-separator.h
diff --git a/tui/newt/nmt-newt-stack.c b/clients/tui/newt/nmt-newt-stack.c
similarity index 100%
rename from tui/newt/nmt-newt-stack.c
rename to clients/tui/newt/nmt-newt-stack.c
diff --git a/tui/newt/nmt-newt-stack.h b/clients/tui/newt/nmt-newt-stack.h
similarity index 100%
rename from tui/newt/nmt-newt-stack.h
rename to clients/tui/newt/nmt-newt-stack.h
diff --git a/tui/newt/nmt-newt-textbox.c b/clients/tui/newt/nmt-newt-textbox.c
similarity index 100%
rename from tui/newt/nmt-newt-textbox.c
rename to clients/tui/newt/nmt-newt-textbox.c
diff --git a/tui/newt/nmt-newt-textbox.h b/clients/tui/newt/nmt-newt-textbox.h
similarity index 100%
rename from tui/newt/nmt-newt-textbox.h
rename to clients/tui/newt/nmt-newt-textbox.h
diff --git a/tui/newt/nmt-newt-toggle-button.c b/clients/tui/newt/nmt-newt-toggle-button.c
similarity index 100%
rename from tui/newt/nmt-newt-toggle-button.c
rename to clients/tui/newt/nmt-newt-toggle-button.c
diff --git a/tui/newt/nmt-newt-toggle-button.h b/clients/tui/newt/nmt-newt-toggle-button.h
similarity index 100%
rename from tui/newt/nmt-newt-toggle-button.h
rename to clients/tui/newt/nmt-newt-toggle-button.h
diff --git a/tui/newt/nmt-newt-types.h b/clients/tui/newt/nmt-newt-types.h
similarity index 100%
rename from tui/newt/nmt-newt-types.h
rename to clients/tui/newt/nmt-newt-types.h
diff --git a/tui/newt/nmt-newt-utils.c b/clients/tui/newt/nmt-newt-utils.c
similarity index 100%
rename from tui/newt/nmt-newt-utils.c
rename to clients/tui/newt/nmt-newt-utils.c
diff --git a/tui/newt/nmt-newt-utils.h b/clients/tui/newt/nmt-newt-utils.h
similarity index 100%
rename from tui/newt/nmt-newt-utils.h
rename to clients/tui/newt/nmt-newt-utils.h
diff --git a/tui/newt/nmt-newt-widget.c b/clients/tui/newt/nmt-newt-widget.c
similarity index 100%
rename from tui/newt/nmt-newt-widget.c
rename to clients/tui/newt/nmt-newt-widget.c
diff --git a/tui/newt/nmt-newt-widget.h b/clients/tui/newt/nmt-newt-widget.h
similarity index 100%
rename from tui/newt/nmt-newt-widget.h
rename to clients/tui/newt/nmt-newt-widget.h
diff --git a/tui/newt/nmt-newt.h b/clients/tui/newt/nmt-newt.h
similarity index 100%
rename from tui/newt/nmt-newt.h
rename to clients/tui/newt/nmt-newt.h
diff --git a/tui/nm-editor-bindings.c b/clients/tui/nm-editor-bindings.c
similarity index 100%
rename from tui/nm-editor-bindings.c
rename to clients/tui/nm-editor-bindings.c
diff --git a/tui/nm-editor-bindings.h b/clients/tui/nm-editor-bindings.h
similarity index 100%
rename from tui/nm-editor-bindings.h
rename to clients/tui/nm-editor-bindings.h
diff --git a/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c
similarity index 100%
rename from tui/nm-editor-utils.c
rename to clients/tui/nm-editor-utils.c
diff --git a/tui/nm-editor-utils.h b/clients/tui/nm-editor-utils.h
similarity index 100%
rename from tui/nm-editor-utils.h
rename to clients/tui/nm-editor-utils.h
diff --git a/tui/nmt-address-list.c b/clients/tui/nmt-address-list.c
similarity index 100%
rename from tui/nmt-address-list.c
rename to clients/tui/nmt-address-list.c
diff --git a/tui/nmt-address-list.h b/clients/tui/nmt-address-list.h
similarity index 100%
rename from tui/nmt-address-list.h
rename to clients/tui/nmt-address-list.h
diff --git a/tui/nmt-connect-connection-list.c b/clients/tui/nmt-connect-connection-list.c
similarity index 100%
rename from tui/nmt-connect-connection-list.c
rename to clients/tui/nmt-connect-connection-list.c
diff --git a/tui/nmt-connect-connection-list.h b/clients/tui/nmt-connect-connection-list.h
similarity index 100%
rename from tui/nmt-connect-connection-list.h
rename to clients/tui/nmt-connect-connection-list.h
diff --git a/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c
similarity index 100%
rename from tui/nmt-device-entry.c
rename to clients/tui/nmt-device-entry.c
diff --git a/tui/nmt-device-entry.h b/clients/tui/nmt-device-entry.h
similarity index 100%
rename from tui/nmt-device-entry.h
rename to clients/tui/nmt-device-entry.h
diff --git a/tui/nmt-edit-connection-list.c b/clients/tui/nmt-edit-connection-list.c
similarity index 100%
rename from tui/nmt-edit-connection-list.c
rename to clients/tui/nmt-edit-connection-list.c
diff --git a/tui/nmt-edit-connection-list.h b/clients/tui/nmt-edit-connection-list.h
similarity index 100%
rename from tui/nmt-edit-connection-list.h
rename to clients/tui/nmt-edit-connection-list.h
diff --git a/tui/nmt-editor-page.c b/clients/tui/nmt-editor-page.c
similarity index 100%
rename from tui/nmt-editor-page.c
rename to clients/tui/nmt-editor-page.c
diff --git a/tui/nmt-editor-page.h b/clients/tui/nmt-editor-page.h
similarity index 100%
rename from tui/nmt-editor-page.h
rename to clients/tui/nmt-editor-page.h
diff --git a/tui/nmt-editor.c b/clients/tui/nmt-editor.c
similarity index 100%
rename from tui/nmt-editor.c
rename to clients/tui/nmt-editor.c
diff --git a/tui/nmt-editor.h b/clients/tui/nmt-editor.h
similarity index 100%
rename from tui/nmt-editor.h
rename to clients/tui/nmt-editor.h
diff --git a/tui/nmt-ip-entry.c b/clients/tui/nmt-ip-entry.c
similarity index 100%
rename from tui/nmt-ip-entry.c
rename to clients/tui/nmt-ip-entry.c
diff --git a/tui/nmt-ip-entry.h b/clients/tui/nmt-ip-entry.h
similarity index 100%
rename from tui/nmt-ip-entry.h
rename to clients/tui/nmt-ip-entry.h
diff --git a/tui/nmt-mac-entry.c b/clients/tui/nmt-mac-entry.c
similarity index 100%
rename from tui/nmt-mac-entry.c
rename to clients/tui/nmt-mac-entry.c
diff --git a/tui/nmt-mac-entry.h b/clients/tui/nmt-mac-entry.h
similarity index 100%
rename from tui/nmt-mac-entry.h
rename to clients/tui/nmt-mac-entry.h
diff --git a/tui/nmt-mtu-entry.c b/clients/tui/nmt-mtu-entry.c
similarity index 100%
rename from tui/nmt-mtu-entry.c
rename to clients/tui/nmt-mtu-entry.c
diff --git a/tui/nmt-mtu-entry.h b/clients/tui/nmt-mtu-entry.h
similarity index 100%
rename from tui/nmt-mtu-entry.h
rename to clients/tui/nmt-mtu-entry.h
diff --git a/tui/nmt-page-bond.c b/clients/tui/nmt-page-bond.c
similarity index 100%
rename from tui/nmt-page-bond.c
rename to clients/tui/nmt-page-bond.c
diff --git a/tui/nmt-page-bond.h b/clients/tui/nmt-page-bond.h
similarity index 100%
rename from tui/nmt-page-bond.h
rename to clients/tui/nmt-page-bond.h
diff --git a/tui/nmt-page-bridge-port.c b/clients/tui/nmt-page-bridge-port.c
similarity index 100%
rename from tui/nmt-page-bridge-port.c
rename to clients/tui/nmt-page-bridge-port.c
diff --git a/tui/nmt-page-bridge-port.h b/clients/tui/nmt-page-bridge-port.h
similarity index 100%
rename from tui/nmt-page-bridge-port.h
rename to clients/tui/nmt-page-bridge-port.h
diff --git a/tui/nmt-page-bridge.c b/clients/tui/nmt-page-bridge.c
similarity index 100%
rename from tui/nmt-page-bridge.c
rename to clients/tui/nmt-page-bridge.c
diff --git a/tui/nmt-page-bridge.h b/clients/tui/nmt-page-bridge.h
similarity index 100%
rename from tui/nmt-page-bridge.h
rename to clients/tui/nmt-page-bridge.h
diff --git a/tui/nmt-page-device.c b/clients/tui/nmt-page-device.c
similarity index 100%
rename from tui/nmt-page-device.c
rename to clients/tui/nmt-page-device.c
diff --git a/tui/nmt-page-device.h b/clients/tui/nmt-page-device.h
similarity index 100%
rename from tui/nmt-page-device.h
rename to clients/tui/nmt-page-device.h
diff --git a/tui/nmt-page-ethernet.c b/clients/tui/nmt-page-ethernet.c
similarity index 100%
rename from tui/nmt-page-ethernet.c
rename to clients/tui/nmt-page-ethernet.c
diff --git a/tui/nmt-page-ethernet.h b/clients/tui/nmt-page-ethernet.h
similarity index 100%
rename from tui/nmt-page-ethernet.h
rename to clients/tui/nmt-page-ethernet.h
diff --git a/tui/nmt-page-grid.c b/clients/tui/nmt-page-grid.c
similarity index 100%
rename from tui/nmt-page-grid.c
rename to clients/tui/nmt-page-grid.c
diff --git a/tui/nmt-page-grid.h b/clients/tui/nmt-page-grid.h
similarity index 100%
rename from tui/nmt-page-grid.h
rename to clients/tui/nmt-page-grid.h
diff --git a/tui/nmt-page-infiniband.c b/clients/tui/nmt-page-infiniband.c
similarity index 100%
rename from tui/nmt-page-infiniband.c
rename to clients/tui/nmt-page-infiniband.c
diff --git a/tui/nmt-page-infiniband.h b/clients/tui/nmt-page-infiniband.h
similarity index 100%
rename from tui/nmt-page-infiniband.h
rename to clients/tui/nmt-page-infiniband.h
diff --git a/tui/nmt-page-ip4.c b/clients/tui/nmt-page-ip4.c
similarity index 100%
rename from tui/nmt-page-ip4.c
rename to clients/tui/nmt-page-ip4.c
diff --git a/tui/nmt-page-ip4.h b/clients/tui/nmt-page-ip4.h
similarity index 100%
rename from tui/nmt-page-ip4.h
rename to clients/tui/nmt-page-ip4.h
diff --git a/tui/nmt-page-ip6.c b/clients/tui/nmt-page-ip6.c
similarity index 100%
rename from tui/nmt-page-ip6.c
rename to clients/tui/nmt-page-ip6.c
diff --git a/tui/nmt-page-ip6.h b/clients/tui/nmt-page-ip6.h
similarity index 100%
rename from tui/nmt-page-ip6.h
rename to clients/tui/nmt-page-ip6.h
diff --git a/tui/nmt-page-main.c b/clients/tui/nmt-page-main.c
similarity index 100%
rename from tui/nmt-page-main.c
rename to clients/tui/nmt-page-main.c
diff --git a/tui/nmt-page-main.h b/clients/tui/nmt-page-main.h
similarity index 100%
rename from tui/nmt-page-main.h
rename to clients/tui/nmt-page-main.h
diff --git a/tui/nmt-page-team-port.c b/clients/tui/nmt-page-team-port.c
similarity index 100%
rename from tui/nmt-page-team-port.c
rename to clients/tui/nmt-page-team-port.c
diff --git a/tui/nmt-page-team-port.h b/clients/tui/nmt-page-team-port.h
similarity index 100%
rename from tui/nmt-page-team-port.h
rename to clients/tui/nmt-page-team-port.h
diff --git a/tui/nmt-page-team.c b/clients/tui/nmt-page-team.c
similarity index 100%
rename from tui/nmt-page-team.c
rename to clients/tui/nmt-page-team.c
diff --git a/tui/nmt-page-team.h b/clients/tui/nmt-page-team.h
similarity index 100%
rename from tui/nmt-page-team.h
rename to clients/tui/nmt-page-team.h
diff --git a/tui/nmt-page-vlan.c b/clients/tui/nmt-page-vlan.c
similarity index 100%
rename from tui/nmt-page-vlan.c
rename to clients/tui/nmt-page-vlan.c
diff --git a/tui/nmt-page-vlan.h b/clients/tui/nmt-page-vlan.h
similarity index 100%
rename from tui/nmt-page-vlan.h
rename to clients/tui/nmt-page-vlan.h
diff --git a/tui/nmt-page-wifi.c b/clients/tui/nmt-page-wifi.c
similarity index 100%
rename from tui/nmt-page-wifi.c
rename to clients/tui/nmt-page-wifi.c
diff --git a/tui/nmt-page-wifi.h b/clients/tui/nmt-page-wifi.h
similarity index 100%
rename from tui/nmt-page-wifi.h
rename to clients/tui/nmt-page-wifi.h
diff --git a/tui/nmt-password-dialog.c b/clients/tui/nmt-password-dialog.c
similarity index 100%
rename from tui/nmt-password-dialog.c
rename to clients/tui/nmt-password-dialog.c
diff --git a/tui/nmt-password-dialog.h b/clients/tui/nmt-password-dialog.h
similarity index 100%
rename from tui/nmt-password-dialog.h
rename to clients/tui/nmt-password-dialog.h
diff --git a/tui/nmt-password-fields.c b/clients/tui/nmt-password-fields.c
similarity index 100%
rename from tui/nmt-password-fields.c
rename to clients/tui/nmt-password-fields.c
diff --git a/tui/nmt-password-fields.h b/clients/tui/nmt-password-fields.h
similarity index 100%
rename from tui/nmt-password-fields.h
rename to clients/tui/nmt-password-fields.h
diff --git a/tui/nmt-route-editor.c b/clients/tui/nmt-route-editor.c
similarity index 100%
rename from tui/nmt-route-editor.c
rename to clients/tui/nmt-route-editor.c
diff --git a/tui/nmt-route-editor.h b/clients/tui/nmt-route-editor.h
similarity index 100%
rename from tui/nmt-route-editor.h
rename to clients/tui/nmt-route-editor.h
diff --git a/tui/nmt-route-entry.c b/clients/tui/nmt-route-entry.c
similarity index 100%
rename from tui/nmt-route-entry.c
rename to clients/tui/nmt-route-entry.c
diff --git a/tui/nmt-route-entry.h b/clients/tui/nmt-route-entry.h
similarity index 100%
rename from tui/nmt-route-entry.h
rename to clients/tui/nmt-route-entry.h
diff --git a/tui/nmt-route-table.c b/clients/tui/nmt-route-table.c
similarity index 100%
rename from tui/nmt-route-table.c
rename to clients/tui/nmt-route-table.c
diff --git a/tui/nmt-route-table.h b/clients/tui/nmt-route-table.h
similarity index 100%
rename from tui/nmt-route-table.h
rename to clients/tui/nmt-route-table.h
diff --git a/tui/nmt-secret-agent.c b/clients/tui/nmt-secret-agent.c
similarity index 100%
rename from tui/nmt-secret-agent.c
rename to clients/tui/nmt-secret-agent.c
diff --git a/tui/nmt-secret-agent.h b/clients/tui/nmt-secret-agent.h
similarity index 100%
rename from tui/nmt-secret-agent.h
rename to clients/tui/nmt-secret-agent.h
diff --git a/tui/nmt-slave-list.c b/clients/tui/nmt-slave-list.c
similarity index 100%
rename from tui/nmt-slave-list.c
rename to clients/tui/nmt-slave-list.c
diff --git a/tui/nmt-slave-list.h b/clients/tui/nmt-slave-list.h
similarity index 100%
rename from tui/nmt-slave-list.h
rename to clients/tui/nmt-slave-list.h
diff --git a/tui/nmt-utils.c b/clients/tui/nmt-utils.c
similarity index 100%
rename from tui/nmt-utils.c
rename to clients/tui/nmt-utils.c
diff --git a/tui/nmt-utils.h b/clients/tui/nmt-utils.h
similarity index 100%
rename from tui/nmt-utils.h
rename to clients/tui/nmt-utils.h
diff --git a/tui/nmt-widget-list.c b/clients/tui/nmt-widget-list.c
similarity index 100%
rename from tui/nmt-widget-list.c
rename to clients/tui/nmt-widget-list.c
diff --git a/tui/nmt-widget-list.h b/clients/tui/nmt-widget-list.h
similarity index 100%
rename from tui/nmt-widget-list.h
rename to clients/tui/nmt-widget-list.h
diff --git a/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c
similarity index 100%
rename from tui/nmtui-connect.c
rename to clients/tui/nmtui-connect.c
diff --git a/tui/nmtui-connect.h b/clients/tui/nmtui-connect.h
similarity index 100%
rename from tui/nmtui-connect.h
rename to clients/tui/nmtui-connect.h
diff --git a/tui/nmtui-edit.c b/clients/tui/nmtui-edit.c
similarity index 100%
rename from tui/nmtui-edit.c
rename to clients/tui/nmtui-edit.c
diff --git a/tui/nmtui-edit.h b/clients/tui/nmtui-edit.h
similarity index 100%
rename from tui/nmtui-edit.h
rename to clients/tui/nmtui-edit.h
diff --git a/tui/nmtui-hostname.c b/clients/tui/nmtui-hostname.c
similarity index 100%
rename from tui/nmtui-hostname.c
rename to clients/tui/nmtui-hostname.c
diff --git a/tui/nmtui-hostname.h b/clients/tui/nmtui-hostname.h
similarity index 100%
rename from tui/nmtui-hostname.h
rename to clients/tui/nmtui-hostname.h
diff --git a/tui/nmtui.c b/clients/tui/nmtui.c
similarity index 100%
rename from tui/nmtui.c
rename to clients/tui/nmtui.c
diff --git a/tui/nmtui.h b/clients/tui/nmtui.h
similarity index 100%
rename from tui/nmtui.h
rename to clients/tui/nmtui.h
diff --git a/tui/vpn-helpers.c b/clients/tui/vpn-helpers.c
similarity index 100%
rename from tui/vpn-helpers.c
rename to clients/tui/vpn-helpers.c
diff --git a/tui/vpn-helpers.h b/clients/tui/vpn-helpers.h
similarity index 100%
rename from tui/vpn-helpers.h
rename to clients/tui/vpn-helpers.h
diff --git a/configure.ac b/configure.ac
index 7b1c1221a..2185be596 100644
--- a/configure.ac
+++ b/configure.ac
@@ -839,11 +839,10 @@ libnm-glib/tests/Makefile
 callouts/Makefile
 callouts/tests/Makefile
 tools/Makefile
-cli/Makefile
-cli/src/Makefile
-cli/completion/Makefile
-tui/Makefile
-tui/newt/Makefile
+clients/Makefile
+clients/cli/Makefile
+clients/tui/Makefile
+clients/tui/newt/Makefile
 test/Makefile
 initscript/RedHat/NetworkManager
 initscript/Debian/NetworkManager
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index f4aee9ff6..34cce1c57 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -423,8 +423,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/pppd/%{ppp_version}/*.la
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.la
 
-install -m 0755 test/.libs/nm-online %{buildroot}/%{_bindir}
-
 %if %{regen_docs}
 # install the pristine docs
 %{__cp} ORIG-docs/libnm-glib/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-glib/
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d83560f35..c3e34f5e8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,13 +1,44 @@
 [encoding: UTF-8]
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-cli/src/common.c
-cli/src/connections.c
-cli/src/devices.c
-cli/src/network-manager.c
-cli/src/nmcli.c
-cli/src/settings.c
-cli/src/utils.c
+clients/cli/common.c
+clients/cli/connections.c
+clients/cli/devices.c
+clients/cli/network-manager.c
+clients/cli/nmcli.c
+clients/cli/settings.c
+clients/cli/utils.c
+clients/nm-online.c
+clients/tui/newt/nmt-newt-utils.c
+clients/tui/nm-editor-utils.c
+clients/tui/nmt-connect-connection-list.c
+clients/tui/nmt-device-entry.c
+clients/tui/nmt-edit-connection-list.c
+clients/tui/nmt-editor.c
+clients/tui/nmt-mtu-entry.c
+clients/tui/nmt-page-bond.c
+clients/tui/nmt-page-bridge-port.c
+clients/tui/nmt-page-bridge.c
+clients/tui/nmt-page-ethernet.c
+clients/tui/nmt-page-infiniband.c
+clients/tui/nmt-page-ip4.c
+clients/tui/nmt-page-ip6.c
+clients/tui/nmt-page-main.c
+clients/tui/nmt-page-team-port.c
+clients/tui/nmt-page-team.c
+clients/tui/nmt-page-vlan.c
+clients/tui/nmt-page-wifi.c
+clients/tui/nmt-password-dialog.c
+clients/tui/nmt-password-fields.c
+clients/tui/nmt-route-editor.c
+clients/tui/nmt-route-table.c
+clients/tui/nmt-secret-agent.c
+clients/tui/nmt-slave-list.c
+clients/tui/nmt-widget-list.c
+clients/tui/nmtui-connect.c
+clients/tui/nmtui-edit.c
+clients/tui/nmtui-hostname.c
+clients/tui/nmtui.c
 libnm-glib/nm-device.c
 libnm-glib/nm-remote-connection.c
 libnm-util/crypto.c
@@ -62,35 +93,3 @@ src/nm-manager.c
 src/nm-sleep-monitor-systemd.c
 src/settings/plugins/ifcfg-rh/reader.c
 src/settings/nm-settings-utils.c
-test/nm-online.c
-tui/newt/nmt-newt-utils.c
-tui/nm-editor-utils.c
-tui/nmt-connect-connection-list.c
-tui/nmt-device-entry.c
-tui/nmt-edit-connection-list.c
-tui/nmt-editor.c
-tui/nmt-mtu-entry.c
-tui/nmt-page-bond.c
-tui/nmt-page-bridge-port.c
-tui/nmt-page-bridge.c
-tui/nmt-page-ethernet.c
-tui/nmt-page-infiniband.c
-tui/nmt-page-ip4.c
-tui/nmt-page-ip6.c
-tui/nmt-page-main.c
-tui/nmt-page-team-port.c
-tui/nmt-page-team.c
-tui/nmt-page-vlan.c
-tui/nmt-page-wifi.c
-tui/nmt-password-dialog.c
-tui/nmt-password-fields.c
-tui/nmt-route-editor.c
-tui/nmt-route-table.c
-tui/nmt-secret-agent.c
-tui/nmt-slave-list.c
-tui/nmt-widget-list.c
-tui/nmtui-connect.c
-tui/nmtui-edit.c
-tui/nmtui-hostname.c
-tui/nmtui.c
-
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 461200fad..2a7f3518a 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,7 +1,7 @@
+clients/tui/vpn-helpers.c
 examples/python/NetworkManager.py
 examples/python/systray/eggtrayicon.c
 policy/org.freedesktop.NetworkManager.policy.in
 vpn-daemons/openvpn
 vpn-daemons/pptp
 vpn-daemons/vpnc
-tui/vpn-helpers.c
diff --git a/test/Makefile.am b/test/Makefile.am
index f577d8a7d..a03c15fa7 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -11,21 +11,8 @@ AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
 	-DNMLOCALEDIR=\"$(datadir)/locale\"
 
-bin_PROGRAMS = nm-online
-
 noinst_PROGRAMS = libnm-glib-test
 
-nm_online_SOURCES = nm-online.c
-nm_online_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\""nm-online"\" \
-	$(AM_CPPFLAGS)
-
-nm_online_LDADD = \
-	$(top_builddir)/libnm-glib/libnm-glib.la \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(DBUS_LIBS) \
-	$(GLIB_LIBS)
-
 libnm_glib_test_SOURCES = libnm-glib-test.c
 libnm_glib_test_CFLAGS = \
 	-Wno-deprecated-declarations \