diff --git a/.gitignore b/.gitignore
index d00a0796b..24aaf4088 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,12 @@
-lib
+.eunit
+deps
+!deps/.placeholder
+*.o
+*.beam
+*.plt
+erl_crash.dump
 ebin
-var
-*.log
 rel/emqtt
-
+.concrete/DEV_MODE
+.rebar
+test/ebin/*.beam
diff --git a/Makefile b/Makefile
index 8fc76bff6..dc3ef6625 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,5 @@ deps:
 clean:
 	./rebar clean
 
-generate:
+dist:
 	./rebar generate -f
-
-relclean:
-	rm -rf rel/emqtt
diff --git a/include/emqtt.hrl b/apps/emqtt/include/emqtt.hrl
similarity index 100%
rename from include/emqtt.hrl
rename to apps/emqtt/include/emqtt.hrl
diff --git a/include/emqtt_frame.hrl b/apps/emqtt/include/emqtt_frame.hrl
similarity index 100%
rename from include/emqtt_frame.hrl
rename to apps/emqtt/include/emqtt_frame.hrl
diff --git a/include/emqtt_internal.hrl b/apps/emqtt/include/emqtt_internal.hrl
similarity index 100%
rename from include/emqtt_internal.hrl
rename to apps/emqtt/include/emqtt_internal.hrl
diff --git a/src/emqtt.app.src b/apps/emqtt/src/emqtt.app.src
similarity index 100%
rename from src/emqtt.app.src
rename to apps/emqtt/src/emqtt.app.src
diff --git a/src/emqtt.erl b/apps/emqtt/src/emqtt.erl
similarity index 100%
rename from src/emqtt.erl
rename to apps/emqtt/src/emqtt.erl
diff --git a/src/emqtt_app.erl b/apps/emqtt/src/emqtt_app.erl
similarity index 100%
rename from src/emqtt_app.erl
rename to apps/emqtt/src/emqtt_app.erl
diff --git a/src/emqtt_auth.erl b/apps/emqtt/src/emqtt_auth.erl
similarity index 100%
rename from src/emqtt_auth.erl
rename to apps/emqtt/src/emqtt_auth.erl
diff --git a/src/emqtt_auth_anonymous.erl b/apps/emqtt/src/emqtt_auth_anonymous.erl
similarity index 100%
rename from src/emqtt_auth_anonymous.erl
rename to apps/emqtt/src/emqtt_auth_anonymous.erl
diff --git a/src/emqtt_auth_internal.erl b/apps/emqtt/src/emqtt_auth_internal.erl
similarity index 100%
rename from src/emqtt_auth_internal.erl
rename to apps/emqtt/src/emqtt_auth_internal.erl
diff --git a/src/emqtt_client.erl b/apps/emqtt/src/emqtt_client.erl
similarity index 100%
rename from src/emqtt_client.erl
rename to apps/emqtt/src/emqtt_client.erl
diff --git a/src/emqtt_client_monitor.erl b/apps/emqtt/src/emqtt_client_monitor.erl
similarity index 100%
rename from src/emqtt_client_monitor.erl
rename to apps/emqtt/src/emqtt_client_monitor.erl
diff --git a/src/emqtt_client_sup.erl b/apps/emqtt/src/emqtt_client_sup.erl
similarity index 100%
rename from src/emqtt_client_sup.erl
rename to apps/emqtt/src/emqtt_client_sup.erl
diff --git a/src/emqtt_ctl.erl b/apps/emqtt/src/emqtt_ctl.erl
similarity index 100%
rename from src/emqtt_ctl.erl
rename to apps/emqtt/src/emqtt_ctl.erl
diff --git a/src/emqtt_db.erl b/apps/emqtt/src/emqtt_db.erl
similarity index 100%
rename from src/emqtt_db.erl
rename to apps/emqtt/src/emqtt_db.erl
diff --git a/src/emqtt_frame.erl b/apps/emqtt/src/emqtt_frame.erl
similarity index 100%
rename from src/emqtt_frame.erl
rename to apps/emqtt/src/emqtt_frame.erl
diff --git a/src/emqtt_keep_alive.erl b/apps/emqtt/src/emqtt_keep_alive.erl
similarity index 100%
rename from src/emqtt_keep_alive.erl
rename to apps/emqtt/src/emqtt_keep_alive.erl
diff --git a/src/emqtt_lib.erl b/apps/emqtt/src/emqtt_lib.erl
similarity index 100%
rename from src/emqtt_lib.erl
rename to apps/emqtt/src/emqtt_lib.erl
diff --git a/src/emqtt_listener.erl b/apps/emqtt/src/emqtt_listener.erl
similarity index 100%
rename from src/emqtt_listener.erl
rename to apps/emqtt/src/emqtt_listener.erl
diff --git a/src/emqtt_monitor.erl b/apps/emqtt/src/emqtt_monitor.erl
similarity index 100%
rename from src/emqtt_monitor.erl
rename to apps/emqtt/src/emqtt_monitor.erl
diff --git a/src/emqtt_net.erl b/apps/emqtt/src/emqtt_net.erl
similarity index 100%
rename from src/emqtt_net.erl
rename to apps/emqtt/src/emqtt_net.erl
diff --git a/src/emqtt_registry.erl b/apps/emqtt/src/emqtt_registry.erl
similarity index 100%
rename from src/emqtt_registry.erl
rename to apps/emqtt/src/emqtt_registry.erl
diff --git a/src/emqtt_retained.erl b/apps/emqtt/src/emqtt_retained.erl
similarity index 100%
rename from src/emqtt_retained.erl
rename to apps/emqtt/src/emqtt_retained.erl
diff --git a/src/emqtt_router.erl b/apps/emqtt/src/emqtt_router.erl
similarity index 100%
rename from src/emqtt_router.erl
rename to apps/emqtt/src/emqtt_router.erl
diff --git a/src/emqtt_sup.erl b/apps/emqtt/src/emqtt_sup.erl
similarity index 100%
rename from src/emqtt_sup.erl
rename to apps/emqtt/src/emqtt_sup.erl
diff --git a/src/emqtt_topic.erl b/apps/emqtt/src/emqtt_topic.erl
similarity index 100%
rename from src/emqtt_topic.erl
rename to apps/emqtt/src/emqtt_topic.erl
diff --git a/src/file_handle_cache.erl b/apps/emqtt/src/file_handle_cache.erl
similarity index 100%
rename from src/file_handle_cache.erl
rename to apps/emqtt/src/file_handle_cache.erl
diff --git a/src/gen_server2.erl b/apps/emqtt/src/gen_server2.erl
similarity index 100%
rename from src/gen_server2.erl
rename to apps/emqtt/src/gen_server2.erl
diff --git a/src/priority_queue.erl b/apps/emqtt/src/priority_queue.erl
similarity index 100%
rename from src/priority_queue.erl
rename to apps/emqtt/src/priority_queue.erl
diff --git a/src/supervisor2.erl b/apps/emqtt/src/supervisor2.erl
similarity index 100%
rename from src/supervisor2.erl
rename to apps/emqtt/src/supervisor2.erl
diff --git a/src/tcp_acceptor.erl b/apps/emqtt/src/tcp_acceptor.erl
similarity index 100%
rename from src/tcp_acceptor.erl
rename to apps/emqtt/src/tcp_acceptor.erl
diff --git a/src/tcp_acceptor_sup.erl b/apps/emqtt/src/tcp_acceptor_sup.erl
similarity index 100%
rename from src/tcp_acceptor_sup.erl
rename to apps/emqtt/src/tcp_acceptor_sup.erl
diff --git a/src/tcp_listener.erl b/apps/emqtt/src/tcp_listener.erl
similarity index 100%
rename from src/tcp_listener.erl
rename to apps/emqtt/src/tcp_listener.erl
diff --git a/src/tcp_listener_sup.erl b/apps/emqtt/src/tcp_listener_sup.erl
similarity index 100%
rename from src/tcp_listener_sup.erl
rename to apps/emqtt/src/tcp_listener_sup.erl
diff --git a/deps/.placeholder b/deps/.placeholder
new file mode 100644
index 000000000..e69de29bb
diff --git a/rebar b/rebar
index 204e87509..13f76298b 100755
Binary files a/rebar and b/rebar differ
diff --git a/rebar.config b/rebar.config
index 0be427654..7c558a08e 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,18 +1,16 @@
-{require_min_otp_vsn, "R15"}.
+{require_min_otp_vsn, "R17"}.
 
 {erl_opts, [debug_info, {parse_transform, lager_transform}]}.
 
 {erl_opts, [{i, "include"},
-			{src_dirs, ["src", "test"]}]}.
+			{src_dirs, ["src"]}]}.
 
-{sub_dirs, ["rel"]}.
-
-{lib_dirs,["lib", "plugins"]}.
-
-{deps_dir, ["lib"]}.
+{sub_dirs, [
+    "rel", 
+    "apps/emqtt"]}.
 
 {deps, [
 	{lager, ".*", {git, "git://github.com/basho/lager.git", {branch, "master"}}},
-	{elog, ".*", {git, "git://github.com/erylee/elog.git", {branch, "master"}}},
-	{folsom, ".*", {git, "git://github.com/boundary/folsom.git", {branch, "master"}}}
+	{esockd, ".*", {git, "git://github.com/slimpp/esockd.git", {branch, "master"}}},
+	{mochiweb, ".*", {git, "git@github.com:slimpp/mochiweb.git", {branch, "master"}}}
 ]}.