diff --git a/lib-ce/emqx_management/.gitignore b/apps/emqx_management/.gitignore
similarity index 100%
rename from lib-ce/emqx_management/.gitignore
rename to apps/emqx_management/.gitignore
diff --git a/lib-ce/emqx_management/README.md b/apps/emqx_management/README.md
similarity index 100%
rename from lib-ce/emqx_management/README.md
rename to apps/emqx_management/README.md
diff --git a/lib-ce/emqx_management/etc/emqx_management.conf b/apps/emqx_management/etc/emqx_management.conf
similarity index 100%
rename from lib-ce/emqx_management/etc/emqx_management.conf
rename to apps/emqx_management/etc/emqx_management.conf
diff --git a/lib-ce/emqx_management/include/emqx_mgmt.hrl b/apps/emqx_management/include/emqx_mgmt.hrl
similarity index 100%
rename from lib-ce/emqx_management/include/emqx_mgmt.hrl
rename to apps/emqx_management/include/emqx_mgmt.hrl
diff --git a/lib-ce/emqx_management/priv/emqx_management.schema b/apps/emqx_management/priv/emqx_management.schema
similarity index 100%
rename from lib-ce/emqx_management/priv/emqx_management.schema
rename to apps/emqx_management/priv/emqx_management.schema
diff --git a/lib-ce/emqx_management/rebar.config b/apps/emqx_management/rebar.config
similarity index 100%
rename from lib-ce/emqx_management/rebar.config
rename to apps/emqx_management/rebar.config
diff --git a/lib-ce/emqx_management/src/emqx_management.app.src b/apps/emqx_management/src/emqx_management.app.src
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_management.app.src
rename to apps/emqx_management/src/emqx_management.app.src
diff --git a/lib-ce/emqx_management/src/emqx_mgmt.erl b/apps/emqx_management/src/emqx_mgmt.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt.erl
rename to apps/emqx_management/src/emqx_mgmt.erl
diff --git a/lib-ce/emqx_management/src/emqx_mgmt_api.erl b/apps/emqx_management/src/emqx_mgmt_api.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt_api.erl
rename to apps/emqx_management/src/emqx_mgmt_api.erl
diff --git a/lib-ce/emqx_management/src/emqx_mgmt_api_alarms.erl b/apps/emqx_management/src/emqx_mgmt_api_alarms.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt_api_alarms.erl
rename to apps/emqx_management/src/emqx_mgmt_api_alarms.erl
diff --git a/lib-ce/emqx_management/src/emqx_mgmt_api_apps.erl b/apps/emqx_management/src/emqx_mgmt_api_apps.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt_api_apps.erl
rename to apps/emqx_management/src/emqx_mgmt_api_apps.erl
diff --git a/lib-ce/emqx_management/src/emqx_mgmt_api_banned.erl b/apps/emqx_management/src/emqx_mgmt_api_banned.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt_api_banned.erl
rename to apps/emqx_management/src/emqx_mgmt_api_banned.erl
diff --git a/lib-ce/emqx_management/src/emqx_mgmt_api_brokers.erl b/apps/emqx_management/src/emqx_mgmt_api_brokers.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt_api_brokers.erl
rename to apps/emqx_management/src/emqx_mgmt_api_brokers.erl
diff --git a/lib-ce/emqx_management/src/emqx_mgmt_api_clients.erl b/apps/emqx_management/src/emqx_mgmt_api_clients.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt_api_clients.erl
rename to apps/emqx_management/src/emqx_mgmt_api_clients.erl
diff --git a/lib-ce/emqx_management/src/emqx_mgmt_api_data.erl b/apps/emqx_management/src/emqx_mgmt_api_data.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt_api_data.erl
rename to apps/emqx_management/src/emqx_mgmt_api_data.erl
diff --git a/lib-ce/emqx_management/src/emqx_mgmt_api_listeners.erl b/apps/emqx_management/src/emqx_mgmt_api_listeners.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt_api_listeners.erl
rename to apps/emqx_management/src/emqx_mgmt_api_listeners.erl
diff --git a/lib-ce/emqx_management/src/emqx_mgmt_api_metrics.erl b/apps/emqx_management/src/emqx_mgmt_api_metrics.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt_api_metrics.erl
rename to apps/emqx_management/src/emqx_mgmt_api_metrics.erl
diff --git a/lib-ce/emqx_management/src/emqx_mgmt_api_nodes.erl b/apps/emqx_management/src/emqx_mgmt_api_nodes.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt_api_nodes.erl
rename to apps/emqx_management/src/emqx_mgmt_api_nodes.erl
diff --git a/lib-ce/emqx_management/src/emqx_mgmt_api_plugins.erl b/apps/emqx_management/src/emqx_mgmt_api_plugins.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt_api_plugins.erl
rename to apps/emqx_management/src/emqx_mgmt_api_plugins.erl
diff --git a/lib-ce/emqx_management/src/emqx_mgmt_api_pubsub.erl b/apps/emqx_management/src/emqx_mgmt_api_pubsub.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt_api_pubsub.erl
rename to apps/emqx_management/src/emqx_mgmt_api_pubsub.erl
diff --git a/lib-ce/emqx_management/src/emqx_mgmt_api_routes.erl b/apps/emqx_management/src/emqx_mgmt_api_routes.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt_api_routes.erl
rename to apps/emqx_management/src/emqx_mgmt_api_routes.erl
diff --git a/lib-ce/emqx_management/src/emqx_mgmt_api_stats.erl b/apps/emqx_management/src/emqx_mgmt_api_stats.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt_api_stats.erl
rename to apps/emqx_management/src/emqx_mgmt_api_stats.erl
diff --git a/lib-ce/emqx_management/src/emqx_mgmt_api_subscriptions.erl b/apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt_api_subscriptions.erl
rename to apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl
diff --git a/lib-ce/emqx_management/src/emqx_mgmt_app.erl b/apps/emqx_management/src/emqx_mgmt_app.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt_app.erl
rename to apps/emqx_management/src/emqx_mgmt_app.erl
diff --git a/lib-ce/emqx_management/src/emqx_mgmt_auth.erl b/apps/emqx_management/src/emqx_mgmt_auth.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt_auth.erl
rename to apps/emqx_management/src/emqx_mgmt_auth.erl
diff --git a/lib-ce/emqx_management/src/emqx_mgmt_cli.erl b/apps/emqx_management/src/emqx_mgmt_cli.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt_cli.erl
rename to apps/emqx_management/src/emqx_mgmt_cli.erl
diff --git a/lib-ce/emqx_management/src/emqx_mgmt_data_backup.erl b/apps/emqx_management/src/emqx_mgmt_data_backup.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt_data_backup.erl
rename to apps/emqx_management/src/emqx_mgmt_data_backup.erl
diff --git a/lib-ce/emqx_management/src/emqx_mgmt_http.erl b/apps/emqx_management/src/emqx_mgmt_http.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt_http.erl
rename to apps/emqx_management/src/emqx_mgmt_http.erl
diff --git a/lib-ce/emqx_management/src/emqx_mgmt_sup.erl b/apps/emqx_management/src/emqx_mgmt_sup.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt_sup.erl
rename to apps/emqx_management/src/emqx_mgmt_sup.erl
diff --git a/lib-ce/emqx_management/src/emqx_mgmt_util.erl b/apps/emqx_management/src/emqx_mgmt_util.erl
similarity index 100%
rename from lib-ce/emqx_management/src/emqx_mgmt_util.erl
rename to apps/emqx_management/src/emqx_mgmt_util.erl
diff --git a/lib-ce/emqx_management/test/emqx_mgmt_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_SUITE.erl
similarity index 100%
rename from lib-ce/emqx_management/test/emqx_mgmt_SUITE.erl
rename to apps/emqx_management/test/emqx_mgmt_SUITE.erl
diff --git a/lib-ce/emqx_management/test/emqx_mgmt_api_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_SUITE.erl
similarity index 100%
rename from lib-ce/emqx_management/test/emqx_mgmt_api_SUITE.erl
rename to apps/emqx_management/test/emqx_mgmt_api_SUITE.erl
diff --git a/lib-ce/emqx_management/test/etc/emqx_management.conf b/apps/emqx_management/test/etc/emqx_management.conf
similarity index 100%
rename from lib-ce/emqx_management/test/etc/emqx_management.conf
rename to apps/emqx_management/test/etc/emqx_management.conf
diff --git a/lib-ce/emqx_management/test/etc/emqx_reloader.conf b/apps/emqx_management/test/etc/emqx_reloader.conf
similarity index 100%
rename from lib-ce/emqx_management/test/etc/emqx_reloader.conf
rename to apps/emqx_management/test/etc/emqx_reloader.conf
diff --git a/lib-ce/emqx_management/test/rfc6455_client.erl b/apps/emqx_management/test/rfc6455_client.erl
similarity index 100%
rename from lib-ce/emqx_management/test/rfc6455_client.erl
rename to apps/emqx_management/test/rfc6455_client.erl