diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt
index ac1f8e7..d97f47e 100644
--- a/res/CMakeLists.txt
+++ b/res/CMakeLists.txt
@@ -25,15 +25,15 @@ install(
     )
 
 configure_file(
-    miracle-wfdctl.service.cmake
-    miracle-wfdctl.service
+    miracle-dispd.service.cmake
+    miracle-dispd.service
     )
 install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/miracle-wfdctl.service
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/miracle-dispd.service
     DESTINATION ${SYSTEMD_SYSTEM_UNIT_DIR}/
     )
 install(
-    CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink miracle-wfdctl.service ${SYSTEMD_SYSTEM_UNIT_DIR}/dbus-org.freedesktop.miracle.wfd.service)"
+    CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink miracle-dispd.service ${SYSTEMD_SYSTEM_UNIT_DIR}/dbus-org.freedesktop.miracle.wfd.service)"
     )
 
 configure_file(
diff --git a/res/miracle-wfdctl.service.cmake b/res/miracle-dispd.service.cmake
similarity index 64%
rename from res/miracle-wfdctl.service.cmake
rename to res/miracle-dispd.service.cmake
index ecaf5dc..58ac8e4 100644
--- a/res/miracle-wfdctl.service.cmake
+++ b/res/miracle-dispd.service.cmake
@@ -1,14 +1,13 @@
 [Unit]
-Description=Miraclecast WiFi Display Controller
+Description=Miraclecast WiFi Display Service
 After=dbus.service
 Requires=miracle-wifid.service
 After=miracle-wifid.service
 
 [Service]
 BusName=org.freedesktop.miracle.wfd
-Environment=PATH=/sbin:/usr/bin
 Environment=LOG_LEVEL=trace
-ExecStart=@CMAKE_INSTALL_PREFIX@/bin/miracle-wfdctl
+ExecStart=@CMAKE_INSTALL_PREFIX@/bin/miracle-dispd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/res/org.freedesktop.miracle.wfd.service.cmake b/res/org.freedesktop.miracle.wfd.service.cmake
index fd3c39f..38690ba 100644
--- a/res/org.freedesktop.miracle.wfd.service.cmake
+++ b/res/org.freedesktop.miracle.wfd.service.cmake
@@ -1,5 +1,5 @@
 [D-BUS Service]
 Name=org.freedesktop.miracle.wfd
-Exec=/bin/sh -c 'PATH=/sbin:/usr/bin LOG_LEVEL=trace @CMAKE_INSTALL_PREFIX@/bin/miracle-wfdctl'
+Exec=/bin/sh -c 'LOG_LEVEL=trace @CMAKE_INSTALL_PREFIX@/bin/miracle-dispd'
 User=root
 SystemdService=dbus-org.freedesktop.miracle.wfd.service
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 96fe570..3c284a1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,6 +5,7 @@ add_subdirectory(wifi)
 add_subdirectory(dhcp)
 add_subdirectory(ctl)
 add_subdirectory(uibc)
+add_subdirectory(disp)
 
 set(miracled_SRCS miracled.h miracled.c)
 add_executable(miracled ${miracled_SRCS})
diff --git a/src/ctl/CMakeLists.txt b/src/ctl/CMakeLists.txt
index 5acafe3..583ec3b 100644
--- a/src/ctl/CMakeLists.txt
+++ b/src/ctl/CMakeLists.txt
@@ -43,46 +43,8 @@ endif(READLINE_FOUND)
 
 target_link_libraries(miracle-sinkctl miracle-shared)
 
-include_directories(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/shared)
-
-########### next target ###############
-set(miracle-wfdctl_SRCS ctl-cli.c
-						ctl-wifi.c
-						wfd-sink.c
-						wfd-dbus.c
-						wfd-session.c
-						wfd-out-session.c
-						wfdctl.c
-						wfd.c
-						wfd-arg.c)
-
 include_directories(${CMAKE_BINARY_DIR}
-					${GSTREAMER_INCLUDE_DIRS}
-					${GSTREAMER_BASE_INCLUDE_DIRS}
-					${CMAKE_SOURCE_DIR}/src
-					${CMAKE_SOURCE_DIR}/src/shared)
-
-add_executable(miracle-wfdctl ${miracle-wfdctl_SRCS})
-
-install(TARGETS miracle-wfdctl DESTINATION bin)
-
-if(READLINE_FOUND)
-	message(STATUS "Compiling with Readline support")
-	set_property(TARGET miracle-wfdctl
-						APPEND
-						PROPERTY COMPILE_DEFINITIONS HAVE_READLINE)
-	target_link_libraries(miracle-wfdctl ${READLINE_LIBRARY})
-endif(READLINE_FOUND)
-
-target_link_libraries(miracle-wfdctl
-				miracle-shared
-				${GSTREAMER_LIBRARIES}
-				${GSTREAMER_BASE_LIBRARIES})
-
-########### install files ###############
-
-
-
+         ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/shared)
 
 #original Makefile.am contents follow:
 
diff --git a/src/disp/CMakeLists.txt b/src/disp/CMakeLists.txt
new file mode 100644
index 0000000..79ad540
--- /dev/null
+++ b/src/disp/CMakeLists.txt
@@ -0,0 +1,35 @@
+set(miracle-dispd_SRCS ../ctl/ctl-cli.c
+						../ctl/ctl-wifi.c
+						wfd-sink.c
+						wfd-dbus.c
+						wfd-session.c
+						wfd-out-session.c
+						dispd.c
+						../ctl/wfd.c
+						wfd-arg.c)
+
+include_directories(${CMAKE_SOURCE_DIR}/src/ctl
+					${CMAKE_BINARY_DIR}
+					${GSTREAMER_INCLUDE_DIRS}
+					${GSTREAMER_BASE_INCLUDE_DIRS}
+					${CMAKE_SOURCE_DIR}/src
+					${CMAKE_SOURCE_DIR}/src/shared)
+
+add_executable(miracle-dispd ${miracle-dispd_SRCS})
+
+install(TARGETS miracle-dispd DESTINATION bin)
+
+if(READLINE_FOUND)
+	message(STATUS "Compiling with Readline support")
+	set_property(TARGET miracle-dispd
+						APPEND
+						PROPERTY COMPILE_DEFINITIONS HAVE_READLINE)
+	target_link_libraries(miracle-dispd ${READLINE_LIBRARY})
+endif(READLINE_FOUND)
+
+target_link_libraries(miracle-dispd
+				miracle-shared
+				${GSTREAMER_LIBRARIES}
+				${GSTREAMER_BASE_LIBRARIES}
+				${READLINE_LIBRARY})
+
diff --git a/src/ctl/wfdctl.c b/src/disp/dispd.c
similarity index 100%
rename from src/ctl/wfdctl.c
rename to src/disp/dispd.c
diff --git a/src/ctl/wfd-arg.c b/src/disp/wfd-arg.c
similarity index 100%
rename from src/ctl/wfd-arg.c
rename to src/disp/wfd-arg.c
diff --git a/src/ctl/wfd-arg.h b/src/disp/wfd-arg.h
similarity index 100%
rename from src/ctl/wfd-arg.h
rename to src/disp/wfd-arg.h
diff --git a/src/ctl/wfd-arg.inc b/src/disp/wfd-arg.inc
similarity index 100%
rename from src/ctl/wfd-arg.inc
rename to src/disp/wfd-arg.inc
diff --git a/src/ctl/wfd-dbus.c b/src/disp/wfd-dbus.c
similarity index 100%
rename from src/ctl/wfd-dbus.c
rename to src/disp/wfd-dbus.c
diff --git a/src/ctl/wfd-dbus.h b/src/disp/wfd-dbus.h
similarity index 100%
rename from src/ctl/wfd-dbus.h
rename to src/disp/wfd-dbus.h
diff --git a/src/ctl/wfd-out-session.c b/src/disp/wfd-out-session.c
similarity index 100%
rename from src/ctl/wfd-out-session.c
rename to src/disp/wfd-out-session.c
diff --git a/src/ctl/wfd-session.c b/src/disp/wfd-session.c
similarity index 100%
rename from src/ctl/wfd-session.c
rename to src/disp/wfd-session.c
diff --git a/src/ctl/wfd-session.h b/src/disp/wfd-session.h
similarity index 100%
rename from src/ctl/wfd-session.h
rename to src/disp/wfd-session.h
diff --git a/src/ctl/wfd-sink.c b/src/disp/wfd-sink.c
similarity index 100%
rename from src/ctl/wfd-sink.c
rename to src/disp/wfd-sink.c