clients: reorganize source tree, put all the installed clients together

Create a new clients/ subdirectory at the top level, and move cli/ and
tui/ into it, as well as nm-online.c (which was previously in test/,
which made no sense).

cli/ was split into two subdirectories, src/ and completion/. While
this does simplify things (given that the completion file and the
binary both need to be named "nmcli"), it bloats the source tree, and
we can work around it by just renaming the completion file at install
time. Then we can combine the two directories into one and just have
it all under clients/cli/.

150 files changed, 86 insertions, 72 deletions

diff --git a/.gitignore b/.gitignore
index 824291915d..18fb67d45d 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 97f094d791..ea0bab0f9f 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 f436d46da7..0000000000
--- 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 9a250f070b..0000000000
--- 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 0000000000..616887df15
--- /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
index 70dbd9795f..65df699abd 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
index 1ee5c09976..1ee5c09976 100644
--- a/cli/src/common.c
+++ b/clients/cli/common.c
diff --git a/cli/src/common.h b/clients/cli/common.h
index ec347500aa..ec347500aa 100644
--- a/cli/src/common.h
+++ b/clients/cli/common.h
diff --git a/cli/src/connections.c b/clients/cli/connections.c
index c93e3351ab..c93e3351ab 100644
--- a/cli/src/connections.c
+++ b/clients/cli/connections.c
diff --git a/cli/src/connections.h b/clients/cli/connections.h
index c736859799..c736859799 100644
--- a/cli/src/connections.h
+++ b/clients/cli/connections.h
diff --git a/cli/src/devices.c b/clients/cli/devices.c
index 36aab74fc1..36aab74fc1 100644
--- a/cli/src/devices.c
+++ b/clients/cli/devices.c
diff --git a/cli/src/devices.h b/clients/cli/devices.h
index 152dd20776..152dd20776 100644
--- a/cli/src/devices.h
+++ b/clients/cli/devices.h
diff --git a/cli/src/network-manager.c b/clients/cli/network-manager.c
index ed074c6dee..ed074c6dee 100644
--- a/cli/src/network-manager.c
+++ b/clients/cli/network-manager.c
diff --git a/cli/src/network-manager.h b/clients/cli/network-manager.h
index bccba7cee3..bccba7cee3 100644
--- a/cli/src/network-manager.h
+++ b/clients/cli/network-manager.h
diff --git a/cli/completion/nmcli b/clients/cli/nmcli-completion
index e6dc5b5d2d..e6dc5b5d2d 100644
--- a/cli/completion/nmcli
+++ b/clients/cli/nmcli-completion
diff --git a/cli/src/nmcli.c b/clients/cli/nmcli.c
index ffd2cdbbc5..ffd2cdbbc5 100644
--- a/cli/src/nmcli.c
+++ b/clients/cli/nmcli.c
diff --git a/cli/src/nmcli.h b/clients/cli/nmcli.h
index fd211b107c..fd211b107c 100644
--- a/cli/src/nmcli.h
+++ b/clients/cli/nmcli.h
diff --git a/cli/src/settings-docs.xsl b/clients/cli/settings-docs.xsl
index 996644bd9e..996644bd9e 100644
--- a/cli/src/settings-docs.xsl
+++ b/clients/cli/settings-docs.xsl
diff --git a/cli/src/settings.c b/clients/cli/settings.c
index ea78c74504..ea78c74504 100644
--- a/cli/src/settings.c
+++ b/clients/cli/settings.c
diff --git a/cli/src/settings.h b/clients/cli/settings.h
index 709c8977fa..709c8977fa 100644
--- a/cli/src/settings.h
+++ b/clients/cli/settings.h
diff --git a/cli/src/utils.c b/clients/cli/utils.c
index 9b513f5a08..9b513f5a08 100644
--- a/cli/src/utils.c
+++ b/clients/cli/utils.c
diff --git a/cli/src/utils.h b/clients/cli/utils.h
index e92952f331..e92952f331 100644
--- a/cli/src/utils.h
+++ b/clients/cli/utils.h
diff --git a/test/nm-online.c b/clients/nm-online.c
index 3fcb9601b7..3fcb9601b7 100644
--- a/test/nm-online.c
+++ b/clients/nm-online.c
diff --git a/tui/Makefile.am b/clients/tui/Makefile.am
index 7ca1b9196c..7ca1b9196c 100644
--- a/tui/Makefile.am
+++ b/clients/tui/Makefile.am
diff --git a/tui/newt/Makefile.am b/clients/tui/newt/Makefile.am
index e572238b2a..e572238b2a 100644
--- a/tui/newt/Makefile.am
+++ b/clients/tui/newt/Makefile.am
diff --git a/tui/newt/nmt-newt-button-box.c b/clients/tui/newt/nmt-newt-button-box.c
index 4fba1daf92..4fba1daf92 100644
--- a/tui/newt/nmt-newt-button-box.c
+++ b/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
index 970588a4d0..970588a4d0 100644
--- a/tui/newt/nmt-newt-button-box.h
+++ b/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
index 00dbcd79a4..00dbcd79a4 100644
--- a/tui/newt/nmt-newt-button.c
+++ b/clients/tui/newt/nmt-newt-button.c
diff --git a/tui/newt/nmt-newt-button.h b/clients/tui/newt/nmt-newt-button.h
index 52e95c5d13..52e95c5d13 100644
--- a/tui/newt/nmt-newt-button.h
+++ b/clients/tui/newt/nmt-newt-button.h
diff --git a/tui/newt/nmt-newt-checkbox.c b/clients/tui/newt/nmt-newt-checkbox.c
index 69d9920a46..69d9920a46 100644
--- a/tui/newt/nmt-newt-checkbox.c
+++ b/clients/tui/newt/nmt-newt-checkbox.c
diff --git a/tui/newt/nmt-newt-checkbox.h b/clients/tui/newt/nmt-newt-checkbox.h
index c277386b18..c277386b18 100644
--- a/tui/newt/nmt-newt-checkbox.h
+++ b/clients/tui/newt/nmt-newt-checkbox.h
diff --git a/tui/newt/nmt-newt-component.c b/clients/tui/newt/nmt-newt-component.c
index 98f6df63f0..98f6df63f0 100644
--- a/tui/newt/nmt-newt-component.c
+++ b/clients/tui/newt/nmt-newt-component.c
diff --git a/tui/newt/nmt-newt-component.h b/clients/tui/newt/nmt-newt-component.h
index 2ffa018e1a..2ffa018e1a 100644
--- a/tui/newt/nmt-newt-component.h
+++ b/clients/tui/newt/nmt-newt-component.h
diff --git a/tui/newt/nmt-newt-container.c b/clients/tui/newt/nmt-newt-container.c
index 03f677fbdc..03f677fbdc 100644
--- a/tui/newt/nmt-newt-container.c
+++ b/clients/tui/newt/nmt-newt-container.c
diff --git a/tui/newt/nmt-newt-container.h b/clients/tui/newt/nmt-newt-container.h
index 6f182925d5..6f182925d5 100644
--- a/tui/newt/nmt-newt-container.h
+++ b/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
index 416b4b79bb..416b4b79bb 100644
--- a/tui/newt/nmt-newt-entry-numeric.c
+++ b/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
index 43ac34490a..43ac34490a 100644
--- a/tui/newt/nmt-newt-entry-numeric.h
+++ b/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
index 7c92d00ada..7c92d00ada 100644
--- a/tui/newt/nmt-newt-entry.c
+++ b/clients/tui/newt/nmt-newt-entry.c
diff --git a/tui/newt/nmt-newt-entry.h b/clients/tui/newt/nmt-newt-entry.h
index 8df0b13701..8df0b13701 100644
--- a/tui/newt/nmt-newt-entry.h
+++ b/clients/tui/newt/nmt-newt-entry.h
diff --git a/tui/newt/nmt-newt-form.c b/clients/tui/newt/nmt-newt-form.c
index 8172b84368..8172b84368 100644
--- a/tui/newt/nmt-newt-form.c
+++ b/clients/tui/newt/nmt-newt-form.c
diff --git a/tui/newt/nmt-newt-form.h b/clients/tui/newt/nmt-newt-form.h
index be95eb68ad..be95eb68ad 100644
--- a/tui/newt/nmt-newt-form.h
+++ b/clients/tui/newt/nmt-newt-form.h
diff --git a/tui/newt/nmt-newt-grid.c b/clients/tui/newt/nmt-newt-grid.c
index ac96733452..ac96733452 100644
--- a/tui/newt/nmt-newt-grid.c
+++ b/clients/tui/newt/nmt-newt-grid.c
diff --git a/tui/newt/nmt-newt-grid.h b/clients/tui/newt/nmt-newt-grid.h
index f36a38ee8f..f36a38ee8f 100644
--- a/tui/newt/nmt-newt-grid.h
+++ b/clients/tui/newt/nmt-newt-grid.h
diff --git a/tui/newt/nmt-newt-hacks.c b/clients/tui/newt/nmt-newt-hacks.c
index 2d9b1725ae..2d9b1725ae 100644
--- a/tui/newt/nmt-newt-hacks.c
+++ b/clients/tui/newt/nmt-newt-hacks.c
diff --git a/tui/newt/nmt-newt-hacks.h b/clients/tui/newt/nmt-newt-hacks.h
index ba8464af0d..ba8464af0d 100644
--- a/tui/newt/nmt-newt-hacks.h
+++ b/clients/tui/newt/nmt-newt-hacks.h
diff --git a/tui/newt/nmt-newt-label.c b/clients/tui/newt/nmt-newt-label.c
index 9c4df8ed4e..9c4df8ed4e 100644
--- a/tui/newt/nmt-newt-label.c
+++ b/clients/tui/newt/nmt-newt-label.c
diff --git a/tui/newt/nmt-newt-label.h b/clients/tui/newt/nmt-newt-label.h
index a4e0dcca5c..a4e0dcca5c 100644
--- a/tui/newt/nmt-newt-label.h
+++ b/clients/tui/newt/nmt-newt-label.h
diff --git a/tui/newt/nmt-newt-listbox.c b/clients/tui/newt/nmt-newt-listbox.c
index e450df9123..e450df9123 100644
--- a/tui/newt/nmt-newt-listbox.c
+++ b/clients/tui/newt/nmt-newt-listbox.c
diff --git a/tui/newt/nmt-newt-listbox.h b/clients/tui/newt/nmt-newt-listbox.h
index c18c9f8e65..c18c9f8e65 100644
--- a/tui/newt/nmt-newt-listbox.h
+++ b/clients/tui/newt/nmt-newt-listbox.h
diff --git a/tui/newt/nmt-newt-popup.c b/clients/tui/newt/nmt-newt-popup.c
index 80fa0181c5..80fa0181c5 100644
--- a/tui/newt/nmt-newt-popup.c
+++ b/clients/tui/newt/nmt-newt-popup.c
diff --git a/tui/newt/nmt-newt-popup.h b/clients/tui/newt/nmt-newt-popup.h
index 643ea2d8c4..643ea2d8c4 100644
--- a/tui/newt/nmt-newt-popup.h
+++ b/clients/tui/newt/nmt-newt-popup.h
diff --git a/tui/newt/nmt-newt-section.c b/clients/tui/newt/nmt-newt-section.c
index b1d0b5ffa3..b1d0b5ffa3 100644
--- a/tui/newt/nmt-newt-section.c
+++ b/clients/tui/newt/nmt-newt-section.c
diff --git a/tui/newt/nmt-newt-section.h b/clients/tui/newt/nmt-newt-section.h
index a943ba2000..a943ba2000 100644
--- a/tui/newt/nmt-newt-section.h
+++ b/clients/tui/newt/nmt-newt-section.h
diff --git a/tui/newt/nmt-newt-separator.c b/clients/tui/newt/nmt-newt-separator.c
index 07deb1af90..07deb1af90 100644
--- a/tui/newt/nmt-newt-separator.c
+++ b/clients/tui/newt/nmt-newt-separator.c
diff --git a/tui/newt/nmt-newt-separator.h b/clients/tui/newt/nmt-newt-separator.h
index 3f4183d588..3f4183d588 100644
--- a/tui/newt/nmt-newt-separator.h
+++ b/clients/tui/newt/nmt-newt-separator.h
diff --git a/tui/newt/nmt-newt-stack.c b/clients/tui/newt/nmt-newt-stack.c
index d94bdebffc..d94bdebffc 100644
--- a/tui/newt/nmt-newt-stack.c
+++ b/clients/tui/newt/nmt-newt-stack.c
diff --git a/tui/newt/nmt-newt-stack.h b/clients/tui/newt/nmt-newt-stack.h
index 09afe4baf6..09afe4baf6 100644
--- a/tui/newt/nmt-newt-stack.h
+++ b/clients/tui/newt/nmt-newt-stack.h
diff --git a/tui/newt/nmt-newt-textbox.c b/clients/tui/newt/nmt-newt-textbox.c
index 3d297160d3..3d297160d3 100644
--- a/tui/newt/nmt-newt-textbox.c
+++ b/clients/tui/newt/nmt-newt-textbox.c
diff --git a/tui/newt/nmt-newt-textbox.h b/clients/tui/newt/nmt-newt-textbox.h
index b3743aea05..b3743aea05 100644
--- a/tui/newt/nmt-newt-textbox.h
+++ b/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
index ec4d9aca51..ec4d9aca51 100644
--- a/tui/newt/nmt-newt-toggle-button.c
+++ b/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
index e54c6d3fa1..e54c6d3fa1 100644
--- a/tui/newt/nmt-newt-toggle-button.h
+++ b/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
index 608f7ff6fa..608f7ff6fa 100644
--- a/tui/newt/nmt-newt-types.h
+++ b/clients/tui/newt/nmt-newt-types.h
diff --git a/tui/newt/nmt-newt-utils.c b/clients/tui/newt/nmt-newt-utils.c
index 68d8c449e5..68d8c449e5 100644
--- a/tui/newt/nmt-newt-utils.c
+++ b/clients/tui/newt/nmt-newt-utils.c
diff --git a/tui/newt/nmt-newt-utils.h b/clients/tui/newt/nmt-newt-utils.h
index 3b37868a0d..3b37868a0d 100644
--- a/tui/newt/nmt-newt-utils.h
+++ b/clients/tui/newt/nmt-newt-utils.h
diff --git a/tui/newt/nmt-newt-widget.c b/clients/tui/newt/nmt-newt-widget.c
index 24c94db940..24c94db940 100644
--- a/tui/newt/nmt-newt-widget.c
+++ b/clients/tui/newt/nmt-newt-widget.c
diff --git a/tui/newt/nmt-newt-widget.h b/clients/tui/newt/nmt-newt-widget.h
index a526a674c3..a526a674c3 100644
--- a/tui/newt/nmt-newt-widget.h
+++ b/clients/tui/newt/nmt-newt-widget.h
diff --git a/tui/newt/nmt-newt.h b/clients/tui/newt/nmt-newt.h
index 6a9c8d9fb5..6a9c8d9fb5 100644
--- a/tui/newt/nmt-newt.h
+++ b/clients/tui/newt/nmt-newt.h
diff --git a/tui/nm-editor-bindings.c b/clients/tui/nm-editor-bindings.c
index 5be13588ee..5be13588ee 100644
--- a/tui/nm-editor-bindings.c
+++ b/clients/tui/nm-editor-bindings.c
diff --git a/tui/nm-editor-bindings.h b/clients/tui/nm-editor-bindings.h
index a7a32dd142..a7a32dd142 100644
--- a/tui/nm-editor-bindings.h
+++ b/clients/tui/nm-editor-bindings.h
diff --git a/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c
index 4ac0eb6413..4ac0eb6413 100644
--- a/tui/nm-editor-utils.c
+++ b/clients/tui/nm-editor-utils.c
diff --git a/tui/nm-editor-utils.h b/clients/tui/nm-editor-utils.h
index 4b9ad5edbb..4b9ad5edbb 100644
--- a/tui/nm-editor-utils.h
+++ b/clients/tui/nm-editor-utils.h
diff --git a/tui/nmt-address-list.c b/clients/tui/nmt-address-list.c
index b822243c32..b822243c32 100644
--- a/tui/nmt-address-list.c
+++ b/clients/tui/nmt-address-list.c
diff --git a/tui/nmt-address-list.h b/clients/tui/nmt-address-list.h
index df7a4f7962..df7a4f7962 100644
--- a/tui/nmt-address-list.h
+++ b/clients/tui/nmt-address-list.h
diff --git a/tui/nmt-connect-connection-list.c b/clients/tui/nmt-connect-connection-list.c
index fffdc8ea4e..fffdc8ea4e 100644
--- a/tui/nmt-connect-connection-list.c
+++ b/clients/tui/nmt-connect-connection-list.c
diff --git a/tui/nmt-connect-connection-list.h b/clients/tui/nmt-connect-connection-list.h
index d47900437d..d47900437d 100644
--- a/tui/nmt-connect-connection-list.h
+++ b/clients/tui/nmt-connect-connection-list.h
diff --git a/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c
index de8b630554..de8b630554 100644
--- a/tui/nmt-device-entry.c
+++ b/clients/tui/nmt-device-entry.c
diff --git a/tui/nmt-device-entry.h b/clients/tui/nmt-device-entry.h
index 2b959aaa85..2b959aaa85 100644
--- a/tui/nmt-device-entry.h
+++ b/clients/tui/nmt-device-entry.h
diff --git a/tui/nmt-edit-connection-list.c b/clients/tui/nmt-edit-connection-list.c
index 2c2c084646..2c2c084646 100644
--- a/tui/nmt-edit-connection-list.c
+++ b/clients/tui/nmt-edit-connection-list.c
diff --git a/tui/nmt-edit-connection-list.h b/clients/tui/nmt-edit-connection-list.h
index 35157e94dc..35157e94dc 100644
--- a/tui/nmt-edit-connection-list.h
+++ b/clients/tui/nmt-edit-connection-list.h
diff --git a/tui/nmt-editor-page.c b/clients/tui/nmt-editor-page.c
index 80fb163bb4..80fb163bb4 100644
--- a/tui/nmt-editor-page.c
+++ b/clients/tui/nmt-editor-page.c
diff --git a/tui/nmt-editor-page.h b/clients/tui/nmt-editor-page.h
index d9a97102ee..d9a97102ee 100644
--- a/tui/nmt-editor-page.h
+++ b/clients/tui/nmt-editor-page.h
diff --git a/tui/nmt-editor.c b/clients/tui/nmt-editor.c
index c200045ab9..c200045ab9 100644
--- a/tui/nmt-editor.c
+++ b/clients/tui/nmt-editor.c
diff --git a/tui/nmt-editor.h b/clients/tui/nmt-editor.h
index a991a7666a..a991a7666a 100644
--- a/tui/nmt-editor.h
+++ b/clients/tui/nmt-editor.h
diff --git a/tui/nmt-ip-entry.c b/clients/tui/nmt-ip-entry.c
index 30c7e2e48f..30c7e2e48f 100644
--- a/tui/nmt-ip-entry.c
+++ b/clients/tui/nmt-ip-entry.c
diff --git a/tui/nmt-ip-entry.h b/clients/tui/nmt-ip-entry.h
index ceb355efcf..ceb355efcf 100644
--- a/tui/nmt-ip-entry.h
+++ b/clients/tui/nmt-ip-entry.h
diff --git a/tui/nmt-mac-entry.c b/clients/tui/nmt-mac-entry.c
index 0dad12363b..0dad12363b 100644
--- a/tui/nmt-mac-entry.c
+++ b/clients/tui/nmt-mac-entry.c
diff --git a/tui/nmt-mac-entry.h b/clients/tui/nmt-mac-entry.h
index 33a3232986..33a3232986 100644
--- a/tui/nmt-mac-entry.h
+++ b/clients/tui/nmt-mac-entry.h
diff --git a/tui/nmt-mtu-entry.c b/clients/tui/nmt-mtu-entry.c
index f599557aea..f599557aea 100644
--- a/tui/nmt-mtu-entry.c
+++ b/clients/tui/nmt-mtu-entry.c
diff --git a/tui/nmt-mtu-entry.h b/clients/tui/nmt-mtu-entry.h
index dfe416d0e7..dfe416d0e7 100644
--- a/tui/nmt-mtu-entry.h
+++ b/clients/tui/nmt-mtu-entry.h
diff --git a/tui/nmt-page-bond.c b/clients/tui/nmt-page-bond.c
index 55a6ffeebb..55a6ffeebb 100644
--- a/tui/nmt-page-bond.c
+++ b/clients/tui/nmt-page-bond.c
diff --git a/tui/nmt-page-bond.h b/clients/tui/nmt-page-bond.h
index c8e69dd5ee..c8e69dd5ee 100644
--- a/tui/nmt-page-bond.h
+++ b/clients/tui/nmt-page-bond.h
diff --git a/tui/nmt-page-bridge-port.c b/clients/tui/nmt-page-bridge-port.c
index ab7a78887f..ab7a78887f 100644
--- a/tui/nmt-page-bridge-port.c
+++ b/clients/tui/nmt-page-bridge-port.c
diff --git a/tui/nmt-page-bridge-port.h b/clients/tui/nmt-page-bridge-port.h
index 7fe3a92c43..7fe3a92c43 100644
--- a/tui/nmt-page-bridge-port.h
+++ b/clients/tui/nmt-page-bridge-port.h
diff --git a/tui/nmt-page-bridge.c b/clients/tui/nmt-page-bridge.c
index 713d83507e..713d83507e 100644
--- a/tui/nmt-page-bridge.c
+++ b/clients/tui/nmt-page-bridge.c
diff --git a/tui/nmt-page-bridge.h b/clients/tui/nmt-page-bridge.h
index b11d350291..b11d350291 100644
--- a/tui/nmt-page-bridge.h
+++ b/clients/tui/nmt-page-bridge.h
diff --git a/tui/nmt-page-device.c b/clients/tui/nmt-page-device.c
index 811b5a7db8..811b5a7db8 100644
--- a/tui/nmt-page-device.c
+++ b/clients/tui/nmt-page-device.c
diff --git a/tui/nmt-page-device.h b/clients/tui/nmt-page-device.h
index 8c90a67a08..8c90a67a08 100644
--- a/tui/nmt-page-device.h
+++ b/clients/tui/nmt-page-device.h
diff --git a/tui/nmt-page-ethernet.c b/clients/tui/nmt-page-ethernet.c
index 9eb08fe5b3..9eb08fe5b3 100644
--- a/tui/nmt-page-ethernet.c
+++ b/clients/tui/nmt-page-ethernet.c
diff --git a/tui/nmt-page-ethernet.h b/clients/tui/nmt-page-ethernet.h
index 5e001562f7..5e001562f7 100644
--- a/tui/nmt-page-ethernet.h
+++ b/clients/tui/nmt-page-ethernet.h
diff --git a/tui/nmt-page-grid.c b/clients/tui/nmt-page-grid.c
index 89ba9330f4..89ba9330f4 100644
--- a/tui/nmt-page-grid.c
+++ b/clients/tui/nmt-page-grid.c
diff --git a/tui/nmt-page-grid.h b/clients/tui/nmt-page-grid.h
index 40ff96c410..40ff96c410 100644
--- a/tui/nmt-page-grid.h
+++ b/clients/tui/nmt-page-grid.h
diff --git a/tui/nmt-page-infiniband.c b/clients/tui/nmt-page-infiniband.c
index 59fa68000f..59fa68000f 100644
--- a/tui/nmt-page-infiniband.c
+++ b/clients/tui/nmt-page-infiniband.c
diff --git a/tui/nmt-page-infiniband.h b/clients/tui/nmt-page-infiniband.h
index 706b7b60c3..706b7b60c3 100644
--- a/tui/nmt-page-infiniband.h
+++ b/clients/tui/nmt-page-infiniband.h
diff --git a/tui/nmt-page-ip4.c b/clients/tui/nmt-page-ip4.c
index 1c2d31744c..1c2d31744c 100644
--- a/tui/nmt-page-ip4.c
+++ b/clients/tui/nmt-page-ip4.c
diff --git a/tui/nmt-page-ip4.h b/clients/tui/nmt-page-ip4.h
index f3bb933e0e..f3bb933e0e 100644
--- a/tui/nmt-page-ip4.h
+++ b/clients/tui/nmt-page-ip4.h
diff --git a/tui/nmt-page-ip6.c b/clients/tui/nmt-page-ip6.c
index ae859bd931..ae859bd931 100644
--- a/tui/nmt-page-ip6.c
+++ b/clients/tui/nmt-page-ip6.c
diff --git a/tui/nmt-page-ip6.h b/clients/tui/nmt-page-ip6.h
index d0d2bfa298..d0d2bfa298 100644
--- a/tui/nmt-page-ip6.h
+++ b/clients/tui/nmt-page-ip6.h
diff --git a/tui/nmt-page-main.c b/clients/tui/nmt-page-main.c
index d22ec83459..d22ec83459 100644
--- a/tui/nmt-page-main.c
+++ b/clients/tui/nmt-page-main.c
diff --git a/tui/nmt-page-main.h b/clients/tui/nmt-page-main.h
index 20de14f36a..20de14f36a 100644
--- a/tui/nmt-page-main.h
+++ b/clients/tui/nmt-page-main.h
diff --git a/tui/nmt-page-team-port.c b/clients/tui/nmt-page-team-port.c
index aec6b80394..aec6b80394 100644
--- a/tui/nmt-page-team-port.c
+++ b/clients/tui/nmt-page-team-port.c
diff --git a/tui/nmt-page-team-port.h b/clients/tui/nmt-page-team-port.h
index d4ec7a557f..d4ec7a557f 100644
--- a/tui/nmt-page-team-port.h
+++ b/clients/tui/nmt-page-team-port.h
diff --git a/tui/nmt-page-team.c b/clients/tui/nmt-page-team.c
index 81db3d33f7..81db3d33f7 100644
--- a/tui/nmt-page-team.c
+++ b/clients/tui/nmt-page-team.c
diff --git a/tui/nmt-page-team.h b/clients/tui/nmt-page-team.h
index 49a81dd55e..49a81dd55e 100644
--- a/tui/nmt-page-team.h
+++ b/clients/tui/nmt-page-team.h
diff --git a/tui/nmt-page-vlan.c b/clients/tui/nmt-page-vlan.c
index f6de671c85..f6de671c85 100644
--- a/tui/nmt-page-vlan.c
+++ b/clients/tui/nmt-page-vlan.c
diff --git a/tui/nmt-page-vlan.h b/clients/tui/nmt-page-vlan.h
index 57d0024388..57d0024388 100644
--- a/tui/nmt-page-vlan.h
+++ b/clients/tui/nmt-page-vlan.h
diff --git a/tui/nmt-page-wifi.c b/clients/tui/nmt-page-wifi.c
index 153aee7ca5..153aee7ca5 100644
--- a/tui/nmt-page-wifi.c
+++ b/clients/tui/nmt-page-wifi.c
diff --git a/tui/nmt-page-wifi.h b/clients/tui/nmt-page-wifi.h
index 06cb2a9805..06cb2a9805 100644
--- a/tui/nmt-page-wifi.h
+++ b/clients/tui/nmt-page-wifi.h
diff --git a/tui/nmt-password-dialog.c b/clients/tui/nmt-password-dialog.c
index 3023404d96..3023404d96 100644
--- a/tui/nmt-password-dialog.c
+++ b/clients/tui/nmt-password-dialog.c
diff --git a/tui/nmt-password-dialog.h b/clients/tui/nmt-password-dialog.h
index 36c9f51e19..36c9f51e19 100644
--- a/tui/nmt-password-dialog.h
+++ b/clients/tui/nmt-password-dialog.h
diff --git a/tui/nmt-password-fields.c b/clients/tui/nmt-password-fields.c
index 8fba33fd97..8fba33fd97 100644
--- a/tui/nmt-password-fields.c
+++ b/clients/tui/nmt-password-fields.c
diff --git a/tui/nmt-password-fields.h b/clients/tui/nmt-password-fields.h
index 2ef830aa24..2ef830aa24 100644
--- a/tui/nmt-password-fields.h
+++ b/clients/tui/nmt-password-fields.h
diff --git a/tui/nmt-route-editor.c b/clients/tui/nmt-route-editor.c
index 98fd9ccbb6..98fd9ccbb6 100644
--- a/tui/nmt-route-editor.c
+++ b/clients/tui/nmt-route-editor.c
diff --git a/tui/nmt-route-editor.h b/clients/tui/nmt-route-editor.h
index e1040dffd9..e1040dffd9 100644
--- a/tui/nmt-route-editor.h
+++ b/clients/tui/nmt-route-editor.h
diff --git a/tui/nmt-route-entry.c b/clients/tui/nmt-route-entry.c
index 70a9003b43..70a9003b43 100644
--- a/tui/nmt-route-entry.c
+++ b/clients/tui/nmt-route-entry.c
diff --git a/tui/nmt-route-entry.h b/clients/tui/nmt-route-entry.h
index d37b14cd5b..d37b14cd5b 100644
--- a/tui/nmt-route-entry.h
+++ b/clients/tui/nmt-route-entry.h
diff --git a/tui/nmt-route-table.c b/clients/tui/nmt-route-table.c
index c2edf2ac5c..c2edf2ac5c 100644
--- a/tui/nmt-route-table.c
+++ b/clients/tui/nmt-route-table.c
diff --git a/tui/nmt-route-table.h b/clients/tui/nmt-route-table.h
index 217bf40da0..217bf40da0 100644
--- a/tui/nmt-route-table.h
+++ b/clients/tui/nmt-route-table.h
diff --git a/tui/nmt-secret-agent.c b/clients/tui/nmt-secret-agent.c
index 7939a84379..7939a84379 100644
--- a/tui/nmt-secret-agent.c
+++ b/clients/tui/nmt-secret-agent.c
diff --git a/tui/nmt-secret-agent.h b/clients/tui/nmt-secret-agent.h
index 04b1581946..04b1581946 100644
--- a/tui/nmt-secret-agent.h
+++ b/clients/tui/nmt-secret-agent.h
diff --git a/tui/nmt-slave-list.c b/clients/tui/nmt-slave-list.c
index d6b60be42a..d6b60be42a 100644
--- a/tui/nmt-slave-list.c
+++ b/clients/tui/nmt-slave-list.c
diff --git a/tui/nmt-slave-list.h b/clients/tui/nmt-slave-list.h
index d10cd3a73a..d10cd3a73a 100644
--- a/tui/nmt-slave-list.h
+++ b/clients/tui/nmt-slave-list.h
diff --git a/tui/nmt-utils.c b/clients/tui/nmt-utils.c
index f2bf70db82..f2bf70db82 100644
--- a/tui/nmt-utils.c
+++ b/clients/tui/nmt-utils.c
diff --git a/tui/nmt-utils.h b/clients/tui/nmt-utils.h
index 7e24fcab19..7e24fcab19 100644
--- a/tui/nmt-utils.h
+++ b/clients/tui/nmt-utils.h
diff --git a/tui/nmt-widget-list.c b/clients/tui/nmt-widget-list.c
index 6dc3f5c926..6dc3f5c926 100644
--- a/tui/nmt-widget-list.c
+++ b/clients/tui/nmt-widget-list.c
diff --git a/tui/nmt-widget-list.h b/clients/tui/nmt-widget-list.h
index 7dbeb21588..7dbeb21588 100644
--- a/tui/nmt-widget-list.h
+++ b/clients/tui/nmt-widget-list.h
diff --git a/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c
index a86b8df57d..a86b8df57d 100644
--- a/tui/nmtui-connect.c
+++ b/clients/tui/nmtui-connect.c
diff --git a/tui/nmtui-connect.h b/clients/tui/nmtui-connect.h
index 8310ac389a..8310ac389a 100644
--- a/tui/nmtui-connect.h
+++ b/clients/tui/nmtui-connect.h
diff --git a/tui/nmtui-edit.c b/clients/tui/nmtui-edit.c
index 2e59204b64..2e59204b64 100644
--- a/tui/nmtui-edit.c
+++ b/clients/tui/nmtui-edit.c
diff --git a/tui/nmtui-edit.h b/clients/tui/nmtui-edit.h
index dae91cfac7..dae91cfac7 100644
--- a/tui/nmtui-edit.h
+++ b/clients/tui/nmtui-edit.h
diff --git a/tui/nmtui-hostname.c b/clients/tui/nmtui-hostname.c
index 7c8aff3a85..7c8aff3a85 100644
--- a/tui/nmtui-hostname.c
+++ b/clients/tui/nmtui-hostname.c
diff --git a/tui/nmtui-hostname.h b/clients/tui/nmtui-hostname.h
index a14bc69937..a14bc69937 100644
--- a/tui/nmtui-hostname.h
+++ b/clients/tui/nmtui-hostname.h
diff --git a/tui/nmtui.c b/clients/tui/nmtui.c
index 7fcac445a2..7fcac445a2 100644
--- a/tui/nmtui.c
+++ b/clients/tui/nmtui.c
diff --git a/tui/nmtui.h b/clients/tui/nmtui.h
index 3e462b1130..3e462b1130 100644
--- a/tui/nmtui.h
+++ b/clients/tui/nmtui.h
diff --git a/tui/vpn-helpers.c b/clients/tui/vpn-helpers.c
index f4e32837a8..f4e32837a8 100644
--- a/tui/vpn-helpers.c
+++ b/clients/tui/vpn-helpers.c
diff --git a/tui/vpn-helpers.h b/clients/tui/vpn-helpers.h
index 28019ca9c8..28019ca9c8 100644
--- a/tui/vpn-helpers.h
+++ b/clients/tui/vpn-helpers.h
diff --git a/configure.ac b/configure.ac
index 7b1c1221a0..2185be5961 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 f4aee9ff67..34cce1c57e 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 d83560f35e..c3e34f5e8d 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 461200fade..2a7f3518a1 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 f577d8a7dd..a03c15fa77 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 \