diff --git a/plugins/emqttd_auth_ldap/src/emqttd_auth_ldap.erl b/apps/emqttd/src/emqttd_auth_ldap.erl
similarity index 100%
rename from plugins/emqttd_auth_ldap/src/emqttd_auth_ldap.erl
rename to apps/emqttd/src/emqttd_auth_ldap.erl
diff --git a/plugins/emqttd_auth_ldap/.placeholder b/plugins/emqttd_auth_ldap/.placeholder
deleted file mode 100644
index e69de29bb..000000000
diff --git a/plugins/emqttd_auth_ldap/README.md b/plugins/emqttd_auth_ldap/README.md
deleted file mode 100644
index 083b318ac..000000000
--- a/plugins/emqttd_auth_ldap/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-## Overview
-
-Authentication with LDAP.
-
-## Plugin Config
-
-```
- {emqttd_auth_ldap, [
-    {servers, ["localhost"]},
-    {port, 389},
-    {timeout, 30},
-    {user_dn, "uid=$u,ou=People,dc=example,dc=com"},
-    {ssl, fasle},
-    {sslopts, [
-        {"certfile", "ssl.crt"},
-        {"keyfile", "ssl.key"}]}
- ]}
-```
-
-## Load Plugin
-
-Merge the'etc/plugin.config' to emqttd/etc/plugins.config, and the plugin will be loaded automatically.
-
diff --git a/plugins/emqttd_auth_ldap/etc/plugin.config b/plugins/emqttd_auth_ldap/etc/plugin.config
deleted file mode 100644
index ac582d7d4..000000000
--- a/plugins/emqttd_auth_ldap/etc/plugin.config
+++ /dev/null
@@ -1,12 +0,0 @@
-[
- {emqttd_auth_ldap, [
-    {servers, ["localhost"]},
-    {port, 389},
-    {timeout, 30},
-    {user_dn, "uid=$u,ou=People,dc=example,dc=com"},
-    {ssl, fasle},
-    {sslopts, [
-        {"certfile", "ssl.crt"},
-        {"keyfile", "ssl.key"}]}
- ]}
-].
diff --git a/plugins/emqttd_auth_ldap/src/emqttd_auth_ldap.app.src b/plugins/emqttd_auth_ldap/src/emqttd_auth_ldap.app.src
deleted file mode 100644
index e699fdba3..000000000
--- a/plugins/emqttd_auth_ldap/src/emqttd_auth_ldap.app.src
+++ /dev/null
@@ -1,12 +0,0 @@
-{application, emqttd_auth_ldap,
- [
-  {description, "emqttd LDAP Authentication Plugin"},
-  {vsn, "1.0"},
-  {registered, []},
-  {applications, [
-                  kernel,
-                  stdlib
-                 ]},
-  {mod, { emqttd_auth_ldap_app, []}},
-  {env, []}
- ]}.
diff --git a/plugins/emqttd_auth_ldap/src/emqttd_auth_ldap_app.erl b/plugins/emqttd_auth_ldap/src/emqttd_auth_ldap_app.erl
deleted file mode 100644
index 1cea23075..000000000
--- a/plugins/emqttd_auth_ldap/src/emqttd_auth_ldap_app.erl
+++ /dev/null
@@ -1,58 +0,0 @@
-%%%-----------------------------------------------------------------------------
-%%% Copyright (c) 2012-2015 eMQTT.IO, All Rights Reserved.
-%%%
-%%% Permission is hereby granted, free of charge, to any person obtaining a copy
-%%% of this software and associated documentation files (the "Software"), to deal
-%%% in the Software without restriction, including without limitation the rights
-%%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-%%% copies of the Software, and to permit persons to whom the Software is
-%%% furnished to do so, subject to the following conditions:
-%%%
-%%% The above copyright notice and this permission notice shall be included in all
-%%% copies or substantial portions of the Software.
-%%%
-%%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-%%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-%%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-%%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-%%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-%%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-%%% SOFTWARE.
-%%%-----------------------------------------------------------------------------
-%%% @doc
-%%% LDAP Authentication Plugin.
-%%%
-%%% @end
-%%%-----------------------------------------------------------------------------
--module(emqttd_auth_ldap_app).
-
--behaviour(application).
-%% Application callbacks
--export([start/2, prep_stop/1, stop/1]).
-
--behaviour(supervisor).
-%% Supervisor callbacks
--export([init/1]).
-
-%%%=============================================================================
-%%% Application callbacks
-%%%=============================================================================
-
-start(_StartType, _StartArgs) ->
-    Env = application:get_all_env(emqttd_auth_ldap),
-    emqttd_access_control:register_mod(auth, emqttd_auth_ldap, Env),
-    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
-
-prep_stop(State) ->
-    emqttd_access_control:unregister_mod(auth, emqttd_auth_ldap), State.
-
-stop(_State) ->
-    ok.
-
-%%%=============================================================================
-%%% Supervisor callbacks(Dummy)
-%%%=============================================================================
-
-init([]) ->
-    {ok, { {one_for_one, 5, 10}, []} }.
-