diff --git a/.gitignore b/.gitignore
index 8768b8c47..b76313a2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ rel/emqttd*
 .rebar
 test/ebin/*.beam
 .exrc
+plugins/*/ebin
diff --git a/plugins/TODO b/plugins/TODO
index a91daf1c2..73b14df1b 100644
--- a/plugins/TODO
+++ b/plugins/TODO
@@ -1,3 +1,5 @@
 LDAP Auth
 MySQL Auth
+Admin Console
+AMQP
 
diff --git a/plugins/emqtt_plugin_admin/src/emqtt_plugin_admin.app.src b/plugins/emqttd_admin/src/emqttd_admin.app.src
similarity index 69%
rename from plugins/emqtt_plugin_admin/src/emqtt_plugin_admin.app.src
rename to plugins/emqttd_admin/src/emqttd_admin.app.src
index 501633331..b0f6cb746 100644
--- a/plugins/emqtt_plugin_admin/src/emqtt_plugin_admin.app.src
+++ b/plugins/emqttd_admin/src/emqttd_admin.app.src
@@ -1,4 +1,4 @@
-{application, emqtt_plugin_admin,
+{application, emqttd_admin,
  [
   {description, ""},
   {vsn, "1"},
@@ -7,6 +7,6 @@
                   kernel,
                   stdlib
                  ]},
-  {mod, { emqtt_plugin_admin_app, []}},
+  {mod, { emqttd_admin_app, []}},
   {env, []}
  ]}.
diff --git a/plugins/emqtt_plugin_admin/src/emqtt_plugin_admin_app.erl b/plugins/emqttd_admin/src/emqttd_admin_app.erl
similarity index 80%
rename from plugins/emqtt_plugin_admin/src/emqtt_plugin_admin_app.erl
rename to plugins/emqttd_admin/src/emqttd_admin_app.erl
index e89e2c8b4..ce4c12373 100644
--- a/plugins/emqtt_plugin_admin/src/emqtt_plugin_admin_app.erl
+++ b/plugins/emqttd_admin/src/emqttd_admin_app.erl
@@ -1,4 +1,4 @@
--module(emqtt_plugin_admin_app).
+-module(emqttd_admin_app).
 
 -behaviour(application).
 
@@ -10,7 +10,7 @@
 %% ===================================================================
 
 start(_StartType, _StartArgs) ->
-    emqtt_plugin_admin_sup:start_link().
+    emqttd_admin_sup:start_link().
 
 stop(_State) ->
     ok.
diff --git a/plugins/emqtt_plugin_admin/src/emqtt_plugin_admin_sup.erl b/plugins/emqttd_admin/src/emqttd_admin_sup.erl
similarity index 95%
rename from plugins/emqtt_plugin_admin/src/emqtt_plugin_admin_sup.erl
rename to plugins/emqttd_admin/src/emqttd_admin_sup.erl
index c26ce8c12..e1487629c 100644
--- a/plugins/emqtt_plugin_admin/src/emqtt_plugin_admin_sup.erl
+++ b/plugins/emqttd_admin/src/emqttd_admin_sup.erl
@@ -1,5 +1,4 @@
-
--module(emqtt_plugin_admin_sup).
+-module(emqttd_admin_sup).
 
 -behaviour(supervisor).
 
diff --git a/plugins/emqttd_amqp/src/emqttd_amqp.app.src b/plugins/emqttd_amqp/src/emqttd_amqp.app.src
new file mode 100644
index 000000000..1664bee18
--- /dev/null
+++ b/plugins/emqttd_amqp/src/emqttd_amqp.app.src
@@ -0,0 +1,12 @@
+{application, emqttd_amqp,
+ [
+  {description, ""},
+  {vsn, "1"},
+  {registered, []},
+  {applications, [
+                  kernel,
+                  stdlib
+                 ]},
+  {mod, { emqttd_amqp_app, []}},
+  {env, []}
+ ]}.
diff --git a/plugins/emqttd_amqp/src/emqttd_amqp_app.erl b/plugins/emqttd_amqp/src/emqttd_amqp_app.erl
new file mode 100644
index 000000000..0087e7a7d
--- /dev/null
+++ b/plugins/emqttd_amqp/src/emqttd_amqp_app.erl
@@ -0,0 +1,16 @@
+-module(emqttd_amqp_app).
+
+-behaviour(application).
+
+%% Application callbacks
+-export([start/2, stop/1]).
+
+%% ===================================================================
+%% Application callbacks
+%% ===================================================================
+
+start(_StartType, _StartArgs) ->
+    emqttd_amqp_sup:start_link().
+
+stop(_State) ->
+    ok.
diff --git a/plugins/emqttd_amqp/src/emqttd_amqp_sup.erl b/plugins/emqttd_amqp/src/emqttd_amqp_sup.erl
new file mode 100644
index 000000000..79ef00dff
--- /dev/null
+++ b/plugins/emqttd_amqp/src/emqttd_amqp_sup.erl
@@ -0,0 +1,27 @@
+-module(emqttd_amqp_sup).
+
+-behaviour(supervisor).
+
+%% API
+-export([start_link/0]).
+
+%% Supervisor callbacks
+-export([init/1]).
+
+%% Helper macro for declaring children of supervisor
+-define(CHILD(I, Type), {I, {I, start_link, []}, permanent, 5000, Type, [I]}).
+
+%% ===================================================================
+%% API functions
+%% ===================================================================
+
+start_link() ->
+    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+%% ===================================================================
+%% Supervisor callbacks
+%% ===================================================================
+
+init([]) ->
+    {ok, { {one_for_one, 5, 10}, []} }.
+
diff --git a/plugins/emqttd_auth_ldap/.placeholder b/plugins/emqttd_auth_ldap/.placeholder
new file mode 100644
index 000000000..e69de29bb
diff --git a/plugins/emqttd_auth_mysql/.placehodler b/plugins/emqttd_auth_mysql/.placehodler
new file mode 100644
index 000000000..e69de29bb