diff --git a/include/logger.hrl b/include/logger.hrl
index 1effab695..503b6cf21 100644
--- a/include/logger.hrl
+++ b/include/logger.hrl
@@ -41,5 +41,3 @@
         begin
           (logger:log(Level,#{},#{report_cb => fun(_) -> {(Format), (Args)} end}))
         end).
-
--define(LOG(Level, Format), ?LOG(Level, Format, [])).
diff --git a/src/bridge/emqx_bridge.erl b/src/emqx_bridge.erl
similarity index 100%
rename from src/bridge/emqx_bridge.erl
rename to src/emqx_bridge.erl
diff --git a/src/bridge/emqx_bridge_mqtt.erl b/src/emqx_bridge_mqtt.erl
similarity index 100%
rename from src/bridge/emqx_bridge_mqtt.erl
rename to src/emqx_bridge_mqtt.erl
diff --git a/src/bridge/emqx_bridge_msg.erl b/src/emqx_bridge_msg.erl
similarity index 100%
rename from src/bridge/emqx_bridge_msg.erl
rename to src/emqx_bridge_msg.erl
diff --git a/src/bridge/emqx_bridge_rpc.erl b/src/emqx_bridge_rpc.erl
similarity index 100%
rename from src/bridge/emqx_bridge_rpc.erl
rename to src/emqx_bridge_rpc.erl
diff --git a/src/bridge/emqx_bridge_sup.erl b/src/emqx_bridge_sup.erl
similarity index 100%
rename from src/bridge/emqx_bridge_sup.erl
rename to src/emqx_bridge_sup.erl