-INSTALL_CONF(conf mobile-display)
-INSTALL_CONF(conf wearable-display)
-INSTALL_CONF(conf tv-display)
-INSTALL_CONF(conf iot-headed-display)
+ADD_SUBDIRECTORY(isu)
+
+INSTALL_CONF(conf display-profile-mobile)
+INSTALL_CONF(conf display-profile-wearable)
+INSTALL_CONF(conf display-profile-tv)
+
+# Tests
+ADD_SUBDIRECTORY(tests/deviced-common-private-test)
+ADD_SUBDIRECTORY(tests/auto-test)