diff --git a/packages/strapi-admin/files/controllers/Admin.js b/packages/strapi-admin/files/controllers/Admin.js
index 5564c7d9a0..b9488d9951 100644
--- a/packages/strapi-admin/files/controllers/Admin.js
+++ b/packages/strapi-admin/files/controllers/Admin.js
@@ -20,7 +20,7 @@ module.exports = {
 
   pluginFile: async ctx => {
     try {
-      const file = fs.readFileSync(path.resolve(process.cwd(), 'plugins', ctx.params.plugin, 'public', 'build', 'main.js'));
+      const file = fs.readFileSync(path.resolve(process.cwd(), 'plugins', ctx.params.plugin, 'admin', 'build', 'main.js'));
       ctx.body = file;
     } catch (err) {
       ctx.body = ctx.notFound();
diff --git a/packages/strapi-plugin-content-manager/public/.gitignore b/packages/strapi-plugin-content-manager/admin/.gitignore
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/.gitignore
rename to packages/strapi-plugin-content-manager/admin/.gitignore
diff --git a/packages/strapi-plugin-content-manager/public/app/components/Container/index.js b/packages/strapi-plugin-content-manager/admin/app/components/Container/index.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/components/Container/index.js
rename to packages/strapi-plugin-content-manager/admin/app/components/Container/index.js
diff --git a/packages/strapi-plugin-content-manager/public/app/components/Container/styles.scss b/packages/strapi-plugin-content-manager/admin/app/components/Container/styles.scss
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/components/Container/styles.scss
rename to packages/strapi-plugin-content-manager/admin/app/components/Container/styles.scss
diff --git a/packages/strapi-plugin-content-manager/public/app/components/EditForm/index.js b/packages/strapi-plugin-content-manager/admin/app/components/EditForm/index.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/components/EditForm/index.js
rename to packages/strapi-plugin-content-manager/admin/app/components/EditForm/index.js
diff --git a/packages/strapi-plugin-content-manager/public/app/components/LimitSelect/index.js b/packages/strapi-plugin-content-manager/admin/app/components/LimitSelect/index.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/components/LimitSelect/index.js
rename to packages/strapi-plugin-content-manager/admin/app/components/LimitSelect/index.js
diff --git a/packages/strapi-plugin-content-manager/public/app/components/LimitSelect/styles.scss b/packages/strapi-plugin-content-manager/admin/app/components/LimitSelect/styles.scss
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/components/LimitSelect/styles.scss
rename to packages/strapi-plugin-content-manager/admin/app/components/LimitSelect/styles.scss
diff --git a/packages/strapi-plugin-content-manager/public/app/components/Pagination/index.js b/packages/strapi-plugin-content-manager/admin/app/components/Pagination/index.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/components/Pagination/index.js
rename to packages/strapi-plugin-content-manager/admin/app/components/Pagination/index.js
diff --git a/packages/strapi-plugin-content-manager/public/app/components/Pagination/styles.scss b/packages/strapi-plugin-content-manager/admin/app/components/Pagination/styles.scss
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/components/Pagination/styles.scss
rename to packages/strapi-plugin-content-manager/admin/app/components/Pagination/styles.scss
diff --git a/packages/strapi-plugin-content-manager/public/app/components/Table/index.js b/packages/strapi-plugin-content-manager/admin/app/components/Table/index.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/components/Table/index.js
rename to packages/strapi-plugin-content-manager/admin/app/components/Table/index.js
diff --git a/packages/strapi-plugin-content-manager/public/app/components/Table/styles.scss b/packages/strapi-plugin-content-manager/admin/app/components/Table/styles.scss
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/components/Table/styles.scss
rename to packages/strapi-plugin-content-manager/admin/app/components/Table/styles.scss
diff --git a/packages/strapi-plugin-content-manager/public/app/components/TableFooter/index.js b/packages/strapi-plugin-content-manager/admin/app/components/TableFooter/index.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/components/TableFooter/index.js
rename to packages/strapi-plugin-content-manager/admin/app/components/TableFooter/index.js
diff --git a/packages/strapi-plugin-content-manager/public/app/components/TableFooter/styles.scss b/packages/strapi-plugin-content-manager/admin/app/components/TableFooter/styles.scss
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/components/TableFooter/styles.scss
rename to packages/strapi-plugin-content-manager/admin/app/components/TableFooter/styles.scss
diff --git a/packages/strapi-plugin-content-manager/public/app/components/TableHeader/index.js b/packages/strapi-plugin-content-manager/admin/app/components/TableHeader/index.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/components/TableHeader/index.js
rename to packages/strapi-plugin-content-manager/admin/app/components/TableHeader/index.js
diff --git a/packages/strapi-plugin-content-manager/public/app/components/TableHeader/styles.scss b/packages/strapi-plugin-content-manager/admin/app/components/TableHeader/styles.scss
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/components/TableHeader/styles.scss
rename to packages/strapi-plugin-content-manager/admin/app/components/TableHeader/styles.scss
diff --git a/packages/strapi-plugin-content-manager/public/app/components/TableRow/index.js b/packages/strapi-plugin-content-manager/admin/app/components/TableRow/index.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/components/TableRow/index.js
rename to packages/strapi-plugin-content-manager/admin/app/components/TableRow/index.js
diff --git a/packages/strapi-plugin-content-manager/public/app/components/TableRow/styles.scss b/packages/strapi-plugin-content-manager/admin/app/components/TableRow/styles.scss
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/components/TableRow/styles.scss
rename to packages/strapi-plugin-content-manager/admin/app/components/TableRow/styles.scss
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/App/actions.js b/packages/strapi-plugin-content-manager/admin/app/containers/App/actions.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/App/actions.js
rename to packages/strapi-plugin-content-manager/admin/app/containers/App/actions.js
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/App/constants.js b/packages/strapi-plugin-content-manager/admin/app/containers/App/constants.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/App/constants.js
rename to packages/strapi-plugin-content-manager/admin/app/containers/App/constants.js
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/App/index.js b/packages/strapi-plugin-content-manager/admin/app/containers/App/index.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/App/index.js
rename to packages/strapi-plugin-content-manager/admin/app/containers/App/index.js
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/App/reducer.js b/packages/strapi-plugin-content-manager/admin/app/containers/App/reducer.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/App/reducer.js
rename to packages/strapi-plugin-content-manager/admin/app/containers/App/reducer.js
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/App/sagas.js b/packages/strapi-plugin-content-manager/admin/app/containers/App/sagas.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/App/sagas.js
rename to packages/strapi-plugin-content-manager/admin/app/containers/App/sagas.js
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/App/selectors.js b/packages/strapi-plugin-content-manager/admin/app/containers/App/selectors.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/App/selectors.js
rename to packages/strapi-plugin-content-manager/admin/app/containers/App/selectors.js
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/Edit/actions.js b/packages/strapi-plugin-content-manager/admin/app/containers/Edit/actions.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/Edit/actions.js
rename to packages/strapi-plugin-content-manager/admin/app/containers/Edit/actions.js
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/Edit/constants.js b/packages/strapi-plugin-content-manager/admin/app/containers/Edit/constants.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/Edit/constants.js
rename to packages/strapi-plugin-content-manager/admin/app/containers/Edit/constants.js
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/Edit/index.js b/packages/strapi-plugin-content-manager/admin/app/containers/Edit/index.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/Edit/index.js
rename to packages/strapi-plugin-content-manager/admin/app/containers/Edit/index.js
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/Edit/messages.js b/packages/strapi-plugin-content-manager/admin/app/containers/Edit/messages.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/Edit/messages.js
rename to packages/strapi-plugin-content-manager/admin/app/containers/Edit/messages.js
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/Edit/reducer.js b/packages/strapi-plugin-content-manager/admin/app/containers/Edit/reducer.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/Edit/reducer.js
rename to packages/strapi-plugin-content-manager/admin/app/containers/Edit/reducer.js
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/Edit/sagas.js b/packages/strapi-plugin-content-manager/admin/app/containers/Edit/sagas.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/Edit/sagas.js
rename to packages/strapi-plugin-content-manager/admin/app/containers/Edit/sagas.js
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/Edit/selectors.js b/packages/strapi-plugin-content-manager/admin/app/containers/Edit/selectors.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/Edit/selectors.js
rename to packages/strapi-plugin-content-manager/admin/app/containers/Edit/selectors.js
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/Edit/styles.scss b/packages/strapi-plugin-content-manager/admin/app/containers/Edit/styles.scss
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/Edit/styles.scss
rename to packages/strapi-plugin-content-manager/admin/app/containers/Edit/styles.scss
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/Home/index.js b/packages/strapi-plugin-content-manager/admin/app/containers/Home/index.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/Home/index.js
rename to packages/strapi-plugin-content-manager/admin/app/containers/Home/index.js
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/Home/styles.scss b/packages/strapi-plugin-content-manager/admin/app/containers/Home/styles.scss
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/Home/styles.scss
rename to packages/strapi-plugin-content-manager/admin/app/containers/Home/styles.scss
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/List/actions.js b/packages/strapi-plugin-content-manager/admin/app/containers/List/actions.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/List/actions.js
rename to packages/strapi-plugin-content-manager/admin/app/containers/List/actions.js
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/List/constants.js b/packages/strapi-plugin-content-manager/admin/app/containers/List/constants.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/List/constants.js
rename to packages/strapi-plugin-content-manager/admin/app/containers/List/constants.js
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/List/index.js b/packages/strapi-plugin-content-manager/admin/app/containers/List/index.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/List/index.js
rename to packages/strapi-plugin-content-manager/admin/app/containers/List/index.js
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/List/reducer.js b/packages/strapi-plugin-content-manager/admin/app/containers/List/reducer.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/List/reducer.js
rename to packages/strapi-plugin-content-manager/admin/app/containers/List/reducer.js
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/List/sagas.js b/packages/strapi-plugin-content-manager/admin/app/containers/List/sagas.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/List/sagas.js
rename to packages/strapi-plugin-content-manager/admin/app/containers/List/sagas.js
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/List/selectors.js b/packages/strapi-plugin-content-manager/admin/app/containers/List/selectors.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/List/selectors.js
rename to packages/strapi-plugin-content-manager/admin/app/containers/List/selectors.js
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/List/styles.scss b/packages/strapi-plugin-content-manager/admin/app/containers/List/styles.scss
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/List/styles.scss
rename to packages/strapi-plugin-content-manager/admin/app/containers/List/styles.scss
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/NotFoundPage/index.js b/packages/strapi-plugin-content-manager/admin/app/containers/NotFoundPage/index.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/NotFoundPage/index.js
rename to packages/strapi-plugin-content-manager/admin/app/containers/NotFoundPage/index.js
diff --git a/packages/strapi-plugin-content-manager/public/app/containers/NotFoundPage/messages.js b/packages/strapi-plugin-content-manager/admin/app/containers/NotFoundPage/messages.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/containers/NotFoundPage/messages.js
rename to packages/strapi-plugin-content-manager/admin/app/containers/NotFoundPage/messages.js
diff --git a/packages/strapi-plugin-content-manager/public/app/routes.json b/packages/strapi-plugin-content-manager/admin/app/routes.json
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/routes.json
rename to packages/strapi-plugin-content-manager/admin/app/routes.json
diff --git a/packages/strapi-plugin-content-manager/public/app/styles/main.scss b/packages/strapi-plugin-content-manager/admin/app/styles/main.scss
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/styles/main.scss
rename to packages/strapi-plugin-content-manager/admin/app/styles/main.scss
diff --git a/packages/strapi-plugin-content-manager/public/app/styles/variables/variables.bootstrap.scss b/packages/strapi-plugin-content-manager/admin/app/styles/variables/variables.bootstrap.scss
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/styles/variables/variables.bootstrap.scss
rename to packages/strapi-plugin-content-manager/admin/app/styles/variables/variables.bootstrap.scss
diff --git a/packages/strapi-plugin-content-manager/public/app/styles/variables/variables.scss b/packages/strapi-plugin-content-manager/admin/app/styles/variables/variables.scss
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/styles/variables/variables.scss
rename to packages/strapi-plugin-content-manager/admin/app/styles/variables/variables.scss
diff --git a/packages/strapi-plugin-content-manager/public/app/translations/de.json b/packages/strapi-plugin-content-manager/admin/app/translations/de.json
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/translations/de.json
rename to packages/strapi-plugin-content-manager/admin/app/translations/de.json
diff --git a/packages/strapi-plugin-content-manager/public/app/translations/en.json b/packages/strapi-plugin-content-manager/admin/app/translations/en.json
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/translations/en.json
rename to packages/strapi-plugin-content-manager/admin/app/translations/en.json
diff --git a/packages/strapi-plugin-content-manager/public/app/translations/fr.json b/packages/strapi-plugin-content-manager/admin/app/translations/fr.json
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/translations/fr.json
rename to packages/strapi-plugin-content-manager/admin/app/translations/fr.json
diff --git a/packages/strapi-plugin-content-manager/public/app/utils/request.js b/packages/strapi-plugin-content-manager/admin/app/utils/request.js
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/app/utils/request.js
rename to packages/strapi-plugin-content-manager/admin/app/utils/request.js
diff --git a/packages/strapi-plugin-content-manager/public/package.json b/packages/strapi-plugin-content-manager/admin/package.json
similarity index 100%
rename from packages/strapi-plugin-content-manager/public/package.json
rename to packages/strapi-plugin-content-manager/admin/package.json
diff --git a/packages/strapi/lib/configuration/hooks/dictionary/_config/index.js b/packages/strapi/lib/configuration/hooks/dictionary/_config/index.js
index cfa579cad3..a9d554092d 100644
--- a/packages/strapi/lib/configuration/hooks/dictionary/_config/index.js
+++ b/packages/strapi/lib/configuration/hooks/dictionary/_config/index.js
@@ -111,7 +111,7 @@ module.exports = strapi => {
         'plugins/**': cb => {
           dictionary.optional({
             dirname: path.resolve(strapi.config.appPath, strapi.config.paths.plugins),
-            excludeDirs: /(public)$/,
+            excludeDirs: /(public|admin)$/,
             filter: /(.+)\.(js|json)$/,
             depth: 4
           }, cb);