diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52060448..1eb93dc2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,4 +4,4 @@ PROJECT(bbf C)
 
 add_subdirectory(libbbfdm-api)
 add_subdirectory(libbbfdm)
-add_subdirectory(bbfdmd/src)
+add_subdirectory(bbfdmd)
diff --git a/bbfdmd/CMakeLists.txt b/bbfdmd/CMakeLists.txt
new file mode 100644
index 00000000..c5fce146
--- /dev/null
+++ b/bbfdmd/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.0)
+
+PROJECT(bbfdmd C)
+
+OPTION(DM_ENABLE_UBUS "Build with UBus Support" ON)
+
+IF(DM_ENABLE_UBUS)
+        add_subdirectory(ubus)
+ENDIF(DM_ENABLE_UBUS)
diff --git a/bbfdmd/src/CMakeLists.txt b/bbfdmd/ubus/CMakeLists.txt
similarity index 100%
rename from bbfdmd/src/CMakeLists.txt
rename to bbfdmd/ubus/CMakeLists.txt
diff --git a/bbfdmd/src/add_delete.c b/bbfdmd/ubus/add_delete.c
similarity index 100%
rename from bbfdmd/src/add_delete.c
rename to bbfdmd/ubus/add_delete.c
diff --git a/bbfdmd/src/add_delete.h b/bbfdmd/ubus/add_delete.h
similarity index 100%
rename from bbfdmd/src/add_delete.h
rename to bbfdmd/ubus/add_delete.h
diff --git a/bbfdmd/src/bbfdmd.c b/bbfdmd/ubus/bbfdmd.c
similarity index 100%
rename from bbfdmd/src/bbfdmd.c
rename to bbfdmd/ubus/bbfdmd.c
diff --git a/bbfdmd/src/bbfdmd.h b/bbfdmd/ubus/bbfdmd.h
similarity index 100%
rename from bbfdmd/src/bbfdmd.h
rename to bbfdmd/ubus/bbfdmd.h
diff --git a/bbfdmd/src/cli.c b/bbfdmd/ubus/cli.c
similarity index 100%
rename from bbfdmd/src/cli.c
rename to bbfdmd/ubus/cli.c
diff --git a/bbfdmd/src/cli.h b/bbfdmd/ubus/cli.h
similarity index 100%
rename from bbfdmd/src/cli.h
rename to bbfdmd/ubus/cli.h
diff --git a/bbfdmd/src/common.c b/bbfdmd/ubus/common.c
similarity index 100%
rename from bbfdmd/src/common.c
rename to bbfdmd/ubus/common.c
diff --git a/bbfdmd/src/common.h b/bbfdmd/ubus/common.h
similarity index 100%
rename from bbfdmd/src/common.h
rename to bbfdmd/ubus/common.h
diff --git a/bbfdmd/src/events.c b/bbfdmd/ubus/events.c
similarity index 100%
rename from bbfdmd/src/events.c
rename to bbfdmd/ubus/events.c
diff --git a/bbfdmd/src/events.h b/bbfdmd/ubus/events.h
similarity index 100%
rename from bbfdmd/src/events.h
rename to bbfdmd/ubus/events.h
diff --git a/bbfdmd/src/get.c b/bbfdmd/ubus/get.c
similarity index 100%
rename from bbfdmd/src/get.c
rename to bbfdmd/ubus/get.c
diff --git a/bbfdmd/src/get.h b/bbfdmd/ubus/get.h
similarity index 100%
rename from bbfdmd/src/get.h
rename to bbfdmd/ubus/get.h
diff --git a/bbfdmd/src/get_helper.c b/bbfdmd/ubus/get_helper.c
similarity index 100%
rename from bbfdmd/src/get_helper.c
rename to bbfdmd/ubus/get_helper.c
diff --git a/bbfdmd/src/get_helper.h b/bbfdmd/ubus/get_helper.h
similarity index 100%
rename from bbfdmd/src/get_helper.h
rename to bbfdmd/ubus/get_helper.h
diff --git a/bbfdmd/src/ipc.h b/bbfdmd/ubus/ipc.h
similarity index 100%
rename from bbfdmd/src/ipc.h
rename to bbfdmd/ubus/ipc.h
diff --git a/bbfdmd/src/operate.c b/bbfdmd/ubus/operate.c
similarity index 100%
rename from bbfdmd/src/operate.c
rename to bbfdmd/ubus/operate.c
diff --git a/bbfdmd/src/operate.h b/bbfdmd/ubus/operate.h
similarity index 100%
rename from bbfdmd/src/operate.h
rename to bbfdmd/ubus/operate.h
diff --git a/bbfdmd/src/plugin.c b/bbfdmd/ubus/plugin.c
similarity index 100%
rename from bbfdmd/src/plugin.c
rename to bbfdmd/ubus/plugin.c
diff --git a/bbfdmd/src/plugin.h b/bbfdmd/ubus/plugin.h
similarity index 100%
rename from bbfdmd/src/plugin.h
rename to bbfdmd/ubus/plugin.h
diff --git a/bbfdmd/src/pretty_print.c b/bbfdmd/ubus/pretty_print.c
similarity index 100%
rename from bbfdmd/src/pretty_print.c
rename to bbfdmd/ubus/pretty_print.c
diff --git a/bbfdmd/src/pretty_print.h b/bbfdmd/ubus/pretty_print.h
similarity index 100%
rename from bbfdmd/src/pretty_print.h
rename to bbfdmd/ubus/pretty_print.h
diff --git a/bbfdmd/src/set.c b/bbfdmd/ubus/set.c
similarity index 100%
rename from bbfdmd/src/set.c
rename to bbfdmd/ubus/set.c
diff --git a/bbfdmd/src/set.h b/bbfdmd/ubus/set.h
similarity index 100%
rename from bbfdmd/src/set.h
rename to bbfdmd/ubus/set.h