diff --git a/check_plugins_location.sh b/check_plugins_location.sh
index ec88b5f4bf..8f1339ae1f 100755
--- a/check_plugins_location.sh
+++ b/check_plugins_location.sh
@@ -1,33 +1,40 @@
 #!/bin/bash
 
 ## browse all plugin directories which names goes as follow
-##  <plugin id>/<plugin version>
+##  <organization id>/<plugin id>/<plugin version>
 ## and check that directory names match with id/version in meta.yaml files
 cd plugins
-for d in */ ; do
-  ID_DIR_NAME=${d%/}
-  cd $d
-
-  for VERSION_DIR_NAME in */ ; do
-    # Remove trailing slash
-    VERSION_DIR_NAME=${VERSION_DIR_NAME%/}
-    cd $VERSION_DIR_NAME
-
-    ID_YAML=$(yq r meta.yaml id | sed 's/^"\(.*\)"$/\1/')
-    if [[ "$ID_YAML" != "$ID_DIR_NAME" ]];then
-      echo "!!! ID mismatch in plugin '${ID_DIR_NAME}/${VERSION_DIR_NAME}':"
-      echo "!!!   id in meta.yaml: '${ID_YAML}'"
-      echo "!!!   id directory name: '${ID_DIR_NAME}' "
-      FOUND=true
-    fi
-
-    VERSION_YAML=$(yq r meta.yaml version | sed 's/^"\(.*\)"$/\1/')
-    if [[ "$VERSION_YAML" != "$VERSION_DIR_NAME" ]];then
-      echo "!!! Version mismatch in plugin '${ID_DIR_NAME}/${VERSION_DIR_NAME}':"
-      echo "!!!   version in meta.yaml: '${VERSION_YAML}'"
-      echo "!!!   version directory name: '${VERSION_DIR_NAME}' "
-      FOUND=true
-    fi
+for org in */ ; do
+  ORG_DIR_NAME=${org%/}
+  cd $org
+
+  for d in */ ; do
+    ID_DIR_NAME=${d%/}
+    cd $d
+
+    for VERSION_DIR_NAME in */ ; do
+      # Remove trailing slash
+      VERSION_DIR_NAME=${VERSION_DIR_NAME%/}
+      cd $VERSION_DIR_NAME
+
+      ID_YAML=$(yq r meta.yaml id | sed 's/^"\(.*\)"$/\1/')
+      if [[ "$ID_YAML" != "$ID_DIR_NAME" ]];then
+        echo "!!! ID mismatch in plugin '${ID_DIR_NAME}/${VERSION_DIR_NAME}':"
+        echo "!!!   id in meta.yaml: '${ID_YAML}'"
+        echo "!!!   id directory name: '${ID_DIR_NAME}' "
+        FOUND=true
+      fi
+
+      VERSION_YAML=$(yq r meta.yaml version | sed 's/^"\(.*\)"$/\1/')
+      if [[ "$VERSION_YAML" != "$VERSION_DIR_NAME" ]];then
+        echo "!!! Version mismatch in plugin '${ID_DIR_NAME}/${VERSION_DIR_NAME}':"
+        echo "!!!   version in meta.yaml: '${VERSION_YAML}'"
+        echo "!!!   version directory name: '${VERSION_DIR_NAME}' "
+        FOUND=true
+      fi
+
+      cd ..
+    done
 
     cd ..
   done
diff --git a/plugins/che-machine-exec-plugin/0.0.1/meta.yaml b/plugins/che-machine-exec-plugin/0.0.1/meta.yaml
deleted file mode 100644
index 558df4b6aa..0000000000
--- a/plugins/che-machine-exec-plugin/0.0.1/meta.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-id: che-machine-exec-plugin
-version: 0.0.1
-type: Che Plugin
-name: Che machine-exec Service
-title: Che machine-exec Service Plugin
-description: Che Plug-in with che-machine-exec service to provide creation terminal or tasks for Eclipse CHE workspace machines.
-icon: https://www.eclipse.org/che/images/ico/16x16.png
-url: https://github.com/ws-skeleton/che-machine-exec/releases/download/0.0.1alfa2/che-service-plugin.tar.gz
diff --git a/plugins/org.eclipse.che.editor.dirigible/1.0.0/meta.yaml b/plugins/dirigiblelabs/dirigible-editor/1.0.0/meta.yaml
similarity index 90%
rename from plugins/org.eclipse.che.editor.dirigible/1.0.0/meta.yaml
rename to plugins/dirigiblelabs/dirigible-editor/1.0.0/meta.yaml
index 6ca2a6ecf1..9cf35bd711 100644
--- a/plugins/org.eclipse.che.editor.dirigible/1.0.0/meta.yaml
+++ b/plugins/dirigiblelabs/dirigible-editor/1.0.0/meta.yaml
@@ -1,4 +1,4 @@
-id: org.eclipse.che.editor.dirigible
+id: dirigible-editor
 version: 1.0.0
 type: Che Editor
 name: dirigible-che-editor-plugin
diff --git a/plugins/eclipse/che-container-exec/0.0.1/meta.yaml b/plugins/eclipse/che-container-exec/0.0.1/meta.yaml
new file mode 100644
index 0000000000..3ff1f9d439
--- /dev/null
+++ b/plugins/eclipse/che-container-exec/0.0.1/meta.yaml
@@ -0,0 +1,8 @@
+id: che-container-exec
+version: 0.0.1
+type: Che Plugin
+name: Che Container Exec Service
+title: Container Exec Service Plugin for Che Workspaces
+description: Che Plug-in with container-exec service that provides the ability to creatie a terminal or to execute commands for Eclipse Che workspaces.
+icon: https://www.eclipse.org/che/images/ico/16x16.png
+url: https://github.com/ws-skeleton/che-machine-exec/releases/download/0.0.1alfa2/che-service-plugin.tar.gz
diff --git a/plugins/org.eclipse.che.editor.eclipseide/0.0.1/meta.yaml b/plugins/eclipse/eclipse-ide-editor/0.0.1/meta.yaml
similarity index 90%
rename from plugins/org.eclipse.che.editor.eclipseide/0.0.1/meta.yaml
rename to plugins/eclipse/eclipse-ide-editor/0.0.1/meta.yaml
index 2535200c4b..1e16361ce1 100644
--- a/plugins/org.eclipse.che.editor.eclipseide/0.0.1/meta.yaml
+++ b/plugins/eclipse/eclipse-ide-editor/0.0.1/meta.yaml
@@ -1,4 +1,4 @@
-id: org.eclipse.che.editor.eclipseide
+id: eclipse-ide-editor
 version: 0.0.1
 type: Che Editor
 name: eclipse-ide
diff --git a/plugins/org.eclipse.che.editor.gwt/1.0.0/meta.yaml b/plugins/eclipse/gwt-editor/1.0.0/meta.yaml
similarity index 88%
rename from plugins/org.eclipse.che.editor.gwt/1.0.0/meta.yaml
rename to plugins/eclipse/gwt-editor/1.0.0/meta.yaml
index bf16ed82c0..0b8334a057 100644
--- a/plugins/org.eclipse.che.editor.gwt/1.0.0/meta.yaml
+++ b/plugins/eclipse/gwt-editor/1.0.0/meta.yaml
@@ -1,4 +1,4 @@
-id: org.eclipse.che.editor.gwt
+id: gwt-editor
 version: 1.0.0
 type: Che Editor
 name: gwt-ide
diff --git a/plugins/org.eclipse.che.editor.jupyter/1.0.0/meta.yaml b/plugins/eclipse/jupyter-editor/1.0.0/meta.yaml
similarity index 90%
rename from plugins/org.eclipse.che.editor.jupyter/1.0.0/meta.yaml
rename to plugins/eclipse/jupyter-editor/1.0.0/meta.yaml
index 391868be97..6cbc233050 100644
--- a/plugins/org.eclipse.che.editor.jupyter/1.0.0/meta.yaml
+++ b/plugins/eclipse/jupyter-editor/1.0.0/meta.yaml
@@ -1,4 +1,4 @@
-id: org.eclipse.che.editor.jupyter
+id: jupyter-editor
 version: 1.0.0
 type: Che Editor
 name: jupyter-notebook
diff --git a/plugins/org.eclipse.che.editor.theia/1.0.0/meta.yaml b/plugins/eclipse/theia-editor/1.0.0/meta.yaml
similarity index 90%
rename from plugins/org.eclipse.che.editor.theia/1.0.0/meta.yaml
rename to plugins/eclipse/theia-editor/1.0.0/meta.yaml
index aa7ef756f1..c066f1692f 100644
--- a/plugins/org.eclipse.che.editor.theia/1.0.0/meta.yaml
+++ b/plugins/eclipse/theia-editor/1.0.0/meta.yaml
@@ -1,4 +1,4 @@
-id: org.eclipse.che.editor.theia
+id: theia-editor
 version: 1.0.0
 type: Che Editor
 name: theia-ide