From 97e391f1c1489128992f331e3581577f349dbb61 Mon Sep 17 00:00:00 2001
From: Dirk Fauth <dirk.fauth@gmail.com>
Date: Fri, 25 Oct 2024 11:10:03 +0200
Subject: [PATCH] Fixes #758 - Improve UI project structure

Signed-off-by: Dirk Fauth <dirk.fauth@gmail.com>
---
 .../_plugin.xml                               |  23 ---
 .../bnd.bnd                                   |   2 +-
 .../_plugin.xml                               |  23 ---
 com.osgifx.console.ui.batchinstall/bnd.bnd    |   2 +-
 com.osgifx.console.ui.bundles/_plugin.xml     |  23 ---
 com.osgifx.console.ui.bundles/bnd.bnd         |   2 +-
 com.osgifx.console.ui.bundles/fragment.e4xmi  | 133 +++++-------------
 com.osgifx.console.ui.components/_plugin.xml  |  23 ---
 com.osgifx.console.ui.components/bnd.bnd      |   2 +-
 .../fragment.e4xmi                            |  90 +++---------
 .../_plugin.xml                               |  23 ---
 com.osgifx.console.ui.configurations/bnd.bnd  |   2 +-
 .../fragment.e4xmi                            |  58 +-------
 com.osgifx.console.ui.dmt/_plugin.xml         |  23 ---
 com.osgifx.console.ui.dmt/bnd.bnd             |   2 +-
 com.osgifx.console.ui.dmt/fragment.e4xmi      |  20 +--
 com.osgifx.console.ui.dto/_plugin.xml         |  23 ---
 com.osgifx.console.ui.dto/bnd.bnd             |   2 +-
 com.osgifx.console.ui.dto/fragment.e4xmi      |  20 +--
 com.osgifx.console.ui.events/_plugin.xml      |  23 ---
 com.osgifx.console.ui.events/bnd.bnd          |   2 +-
 com.osgifx.console.ui.events/fragment.e4xmi   |  60 ++------
 com.osgifx.console.ui.extension/_plugin.xml   |  23 ---
 com.osgifx.console.ui.extension/bnd.bnd       |   2 +-
 com.osgifx.console.ui.gogo/_plugin.xml        |  23 ---
 com.osgifx.console.ui.gogo/bnd.bnd            |   2 +-
 com.osgifx.console.ui.gogo/fragment.e4xmi     |  20 +--
 com.osgifx.console.ui.graph/_plugin.xml       |  23 ---
 com.osgifx.console.ui.graph/bnd.bnd           |   2 +-
 com.osgifx.console.ui.graph/fragment.e4xmi    |  35 +----
 .../_plugin.xml                               |  23 ---
 com.osgifx.console.ui.healthchecks/bnd.bnd    |   2 +-
 .../fragment.e4xmi                            |  19 +--
 com.osgifx.console.ui.heap/_plugin.xml        |  23 ---
 com.osgifx.console.ui.heap/bnd.bnd            |   2 +-
 com.osgifx.console.ui.heap/fragment.e4xmi     |  21 +--
 com.osgifx.console.ui.http/_plugin.xml        |  23 ---
 com.osgifx.console.ui.http/bnd.bnd            |   2 +-
 com.osgifx.console.ui.http/fragment.e4xmi     |  35 +----
 com.osgifx.console.ui.leaks/_plugin.xml       |  23 ---
 com.osgifx.console.ui.leaks/bnd.bnd           |   2 +-
 com.osgifx.console.ui.leaks/fragment.e4xmi    |  35 +----
 com.osgifx.console.ui.logs/_plugin.xml        |  23 ---
 com.osgifx.console.ui.logs/bnd.bnd            |   2 +-
 com.osgifx.console.ui.logs/fragment.e4xmi     |  61 ++------
 com.osgifx.console.ui.overview/_plugin.xml    |  23 ---
 com.osgifx.console.ui.overview/bnd.bnd        |   2 +-
 com.osgifx.console.ui.overview/fragment.e4xmi |  36 +----
 com.osgifx.console.ui.packages/_plugin.xml    |  23 ---
 com.osgifx.console.ui.packages/bnd.bnd        |   2 +-
 com.osgifx.console.ui.packages/fragment.e4xmi |  36 +----
 com.osgifx.console.ui.properties/_plugin.xml  |  23 ---
 com.osgifx.console.ui.properties/bnd.bnd      |   2 +-
 .../fragment.e4xmi                            |  35 +----
 com.osgifx.console.ui.roles/_plugin.xml       |  23 ---
 com.osgifx.console.ui.roles/bnd.bnd           |   2 +-
 com.osgifx.console.ui.roles/fragment.e4xmi    |  35 +----
 com.osgifx.console.ui.search/_plugin.xml      |  23 ---
 com.osgifx.console.ui.search/bnd.bnd          |   2 +-
 com.osgifx.console.ui.services/_plugin.xml    |  23 ---
 com.osgifx.console.ui.services/bnd.bnd        |   2 +-
 com.osgifx.console.ui.services/fragment.e4xmi |  35 +----
 .../org.eclipse.core.resources.prefs          |   1 -
 com.osgifx.console.ui.snapshot/_plugin.xml    |  23 ---
 com.osgifx.console.ui.snapshot/bnd.bnd        |   2 +-
 com.osgifx.console.ui.terminal/_plugin.xml    |  23 ---
 com.osgifx.console.ui.terminal/bnd.bnd        |   2 +-
 com.osgifx.console.ui.terminal/fragment.e4xmi |  20 +--
 com.osgifx.console.ui.threads/_plugin.xml     |  23 ---
 com.osgifx.console.ui.threads/bnd.bnd         |   2 +-
 com.osgifx.console.ui.threads/fragment.e4xmi  |  35 +----
 71 files changed, 169 insertions(+), 1296 deletions(-)
 delete mode 100644 com.osgifx.console.extension.ui.tictactoe/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.batchinstall/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.bundles/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.components/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.configurations/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.dmt/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.dto/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.events/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.extension/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.gogo/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.graph/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.healthchecks/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.heap/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.http/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.leaks/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.logs/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.overview/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.packages/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.properties/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.roles/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.search/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.services/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.snapshot/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.terminal/_plugin.xml
 delete mode 100644 com.osgifx.console.ui.threads/_plugin.xml

diff --git a/com.osgifx.console.extension.ui.tictactoe/_plugin.xml b/com.osgifx.console.extension.ui.tictactoe/_plugin.xml
deleted file mode 100644
index 51c0c8f3b..000000000
--- a/com.osgifx.console.extension.ui.tictactoe/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.extension.ui.tictactoe">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
\ No newline at end of file
diff --git a/com.osgifx.console.extension.ui.tictactoe/bnd.bnd b/com.osgifx.console.extension.ui.tictactoe/bnd.bnd
index 678ae17af..2db600df1 100644
--- a/com.osgifx.console.extension.ui.tictactoe/bnd.bnd
+++ b/com.osgifx.console.extension.ui.tictactoe/bnd.bnd
@@ -1,8 +1,8 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -fixupmessages      : 'No translation found'
 -privatepackage     : com.osgifx.console.extension.tictactoe
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.batchinstall/_plugin.xml b/com.osgifx.console.ui.batchinstall/_plugin.xml
deleted file mode 100644
index bcf799465..000000000
--- a/com.osgifx.console.ui.batchinstall/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.batchinstall">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.batchinstall/bnd.bnd b/com.osgifx.console.ui.batchinstall/bnd.bnd
index 804068a1b..1cbc70661 100644
--- a/com.osgifx.console.ui.batchinstall/bnd.bnd
+++ b/com.osgifx.console.ui.batchinstall/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.bundles/_plugin.xml b/com.osgifx.console.ui.bundles/_plugin.xml
deleted file mode 100644
index 3e1ee438f..000000000
--- a/com.osgifx.console.ui.bundles/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.bundles">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.bundles/bnd.bnd b/com.osgifx.console.ui.bundles/bnd.bnd
index d763e275b..c29e77db1 100644
--- a/com.osgifx.console.ui.bundles/bnd.bnd
+++ b/com.osgifx.console.ui.bundles/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.bundles/fragment.e4xmi b/com.osgifx.console.ui.bundles/fragment.e4xmi
index 007595d47..4048b4c8b 100644
--- a/com.osgifx.console.ui.bundles/fragment.e4xmi
+++ b/com.osgifx.console.ui.bundles/fragment.e4xmi
@@ -1,103 +1,34 @@
 <?xml version="1.0" encoding="ASCII"?>
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application"
-	xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic"
-	xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands"
-	xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment"
-	xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu"
-	xmi:id="_s7J3oCBGEey33dbookdebQ">
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children"
-		parentElementId="com.osgifx.console.ui.extensions.partstack">
-		<elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ"
-			elementId="com.osgifx.console.application.tab.bundles"
-			accessibilityPhrase=""
-			contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.BundlesFxUI"
-			label="Bundles"
-			iconURI="platform:/plugin/com.osgifx.console.ui.bundles/graphic/icons/bundles.png"
-			tooltip="Shows all installed bundles in the remote framework"
-			closeable="true" />
-	</fragments>
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_kPgEQH67EeyYfeV-7UqQeg" featurename="handlers"
-		parentElementId="com.osgifx.console.application">
-		<elements xsi:type="commands:Handler" xmi:id="_kPgEQX67EeyYfeV-7UqQeg"
-			elementId="com.osgifx.console.application.handler.bundle.start"
-			contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.handler.BundleStartHandler"
-			command="_kPgERX67EeyYfeV-7UqQeg" />
-		<elements xsi:type="commands:Handler" xmi:id="_kPgEQn67EeyYfeV-7UqQeg"
-			elementId="com.osgifx.console.application.handler.bundle.stop"
-			contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.handler.BundleStopHandler"
-			command="_kPgER367EeyYfeV-7UqQeg" />
-		<elements xsi:type="commands:Handler" xmi:id="_kPgEQ367EeyYfeV-7UqQeg"
-			elementId="com.osgifx.console.application.handler.bundle.uninstall"
-			contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.handler.BundleUninstallHandler"
-			command="_kPgESX67EeyYfeV-7UqQeg" />
-	</fragments>
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_kPgERH67EeyYfeV-7UqQeg" featurename="commands"
-		parentElementId="com.osgifx.console.application">
-		<elements xsi:type="commands:Command" xmi:id="_kPgERX67EeyYfeV-7UqQeg"
-			elementId="com.osgifx.console.application.command.bundle.start"
-			commandName="Bundle Start Command"
-			description="Starts the specified bundle having the specified ID"
-			category="_kPgETH67EeyYfeV-7UqQeg">
-			<parameters xmi:id="_kPgERn67EeyYfeV-7UqQeg" elementId="id"
-				name="ID" optional="false" />
-		</elements>
-		<elements xsi:type="commands:Command" xmi:id="_kPgER367EeyYfeV-7UqQeg"
-			elementId="com.osgifx.console.application.command.bundle.stop"
-			commandName="Bundle Stop Command"
-			description="Stops the specified bundle having the specified ID"
-			category="_kPgETH67EeyYfeV-7UqQeg">
-			<parameters xmi:id="_kPgESH67EeyYfeV-7UqQeg" elementId="id"
-				name="ID" optional="false" />
-		</elements>
-		<elements xsi:type="commands:Command" xmi:id="_kPgESX67EeyYfeV-7UqQeg"
-			elementId="com.osgifx.console.application.command.bundle.uninstall"
-			commandName="Bundle Uninstall Command"
-			description="Uninstalls the specified bundle having the specified ID"
-			category="_kPgETH67EeyYfeV-7UqQeg">
-			<parameters xmi:id="_kPgESn67EeyYfeV-7UqQeg" elementId="id"
-				name="ID" optional="false" />
-		</elements>
-	</fragments>
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_kPgES367EeyYfeV-7UqQeg" featurename="categories"
-		parentElementId="com.osgifx.console.application">
-		<elements xsi:type="commands:Category" xmi:id="_kPgETH67EeyYfeV-7UqQeg"
-			elementId="com.osgifx.console.application.category.bundle"
-			name="Bundle Action"
-			description="This category is used to group all commands relating to bundle state changes" />
-	</fragments>
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_kPgET367EeyYfeV-7UqQeg" featurename="children"
-		parentElementId="com.osgifx.console.application.menu.actions">
-		<elements xsi:type="menu:DirectMenuItem"
-			xmi:id="_kPgEUH67EeyYfeV-7UqQeg"
-			elementId="com.osgifx.console.application.directmenuitem.install"
-			label="Install/Update Bundle"
-			iconURI="platform:/plugin/com.osgifx.console.ui.bundles/graphic/icons/install.png"
-			tooltip="Installs or updates bundle in the remote OSGi framework"
-			contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.handler.BundleInstallHandler" />
-	</fragments>
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_VmcXgM78EeyLr9jX3JzBRQ" featurename="children"
-		parentElementId="com.osgifx.console.application.menu.actions">
-		<elements xsi:type="menu:DirectMenuItem"
-			xmi:id="_VmcXgc78EeyLr9jX3JzBRQ"
-			elementId="com.osgifx.console.application.directmenuitem.obr"
-			label="Generate OBR"
-			iconURI="platform:/plugin/com.osgifx.console.ui.bundles/graphic/icons/obr.png"
-			tooltip="Generates OBR XML from the connected runtime resources"
-			contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.handler.GenerateObrHandler" />
-	</fragments>
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_cBJPIGpBEe21Cs8uJesKFQ" featurename="addons"
-		parentElementId="com.osgifx.console.application">
-		<elements xsi:type="application:Addon" xmi:id="_cBJPIWpBEe21Cs8uJesKFQ"
-			elementId="com.osgifx.console.ui.bundles.addon.dragndrop"
-			contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.addon.DragAndDropAddon" />
-	</fragments>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmi:id="_s7J3oCBGEey33dbookdebQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children" parentElementId="com.osgifx.console.ui.extensions.partstack" positionInList="index:1">
+    <elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ" elementId="com.osgifx.console.application.tab.bundles" accessibilityPhrase="" contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.BundlesFxUI" label="Bundles" iconURI="platform:/plugin/com.osgifx.console.ui.bundles/graphic/icons/bundles.png" tooltip="Shows all installed bundles in the remote framework" closeable="true"/>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_kPgEQH67EeyYfeV-7UqQeg" featurename="handlers" parentElementId="com.osgifx.console.application">
+    <elements xsi:type="commands:Handler" xmi:id="_kPgEQX67EeyYfeV-7UqQeg" elementId="com.osgifx.console.application.handler.bundle.start" contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.handler.BundleStartHandler" command="_kPgERX67EeyYfeV-7UqQeg"/>
+    <elements xsi:type="commands:Handler" xmi:id="_kPgEQn67EeyYfeV-7UqQeg" elementId="com.osgifx.console.application.handler.bundle.stop" contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.handler.BundleStopHandler" command="_kPgER367EeyYfeV-7UqQeg"/>
+    <elements xsi:type="commands:Handler" xmi:id="_kPgEQ367EeyYfeV-7UqQeg" elementId="com.osgifx.console.application.handler.bundle.uninstall" contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.handler.BundleUninstallHandler" command="_kPgESX67EeyYfeV-7UqQeg"/>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_kPgERH67EeyYfeV-7UqQeg" featurename="commands" parentElementId="com.osgifx.console.application">
+    <elements xsi:type="commands:Command" xmi:id="_kPgERX67EeyYfeV-7UqQeg" elementId="com.osgifx.console.application.command.bundle.start" commandName="Bundle Start Command" description="Starts the specified bundle having the specified ID" category="_kPgETH67EeyYfeV-7UqQeg">
+      <parameters xmi:id="_kPgERn67EeyYfeV-7UqQeg" elementId="id" name="ID" optional="false"/>
+    </elements>
+    <elements xsi:type="commands:Command" xmi:id="_kPgER367EeyYfeV-7UqQeg" elementId="com.osgifx.console.application.command.bundle.stop" commandName="Bundle Stop Command" description="Stops the specified bundle having the specified ID" category="_kPgETH67EeyYfeV-7UqQeg">
+      <parameters xmi:id="_kPgESH67EeyYfeV-7UqQeg" elementId="id" name="ID" optional="false"/>
+    </elements>
+    <elements xsi:type="commands:Command" xmi:id="_kPgESX67EeyYfeV-7UqQeg" elementId="com.osgifx.console.application.command.bundle.uninstall" commandName="Bundle Uninstall Command" description="Uninstalls the specified bundle having the specified ID" category="_kPgETH67EeyYfeV-7UqQeg">
+      <parameters xmi:id="_kPgESn67EeyYfeV-7UqQeg" elementId="id" name="ID" optional="false"/>
+    </elements>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_kPgES367EeyYfeV-7UqQeg" featurename="categories" parentElementId="com.osgifx.console.application">
+    <elements xsi:type="commands:Category" xmi:id="_kPgETH67EeyYfeV-7UqQeg" elementId="com.osgifx.console.application.category.bundle" name="Bundle Action" description="This category is used to group all commands relating to bundle state changes"/>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_kPgET367EeyYfeV-7UqQeg" featurename="children" parentElementId="com.osgifx.console.application.menu.actions">
+    <elements xsi:type="menu:DirectMenuItem" xmi:id="_kPgEUH67EeyYfeV-7UqQeg" elementId="com.osgifx.console.application.directmenuitem.install" label="Install/Update Bundle" iconURI="platform:/plugin/com.osgifx.console.ui.bundles/graphic/icons/install.png" tooltip="Installs or updates bundle in the remote OSGi framework" contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.handler.BundleInstallHandler"/>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_VmcXgM78EeyLr9jX3JzBRQ" featurename="children" parentElementId="com.osgifx.console.application.menu.actions">
+    <elements xsi:type="menu:DirectMenuItem" xmi:id="_VmcXgc78EeyLr9jX3JzBRQ" elementId="com.osgifx.console.application.directmenuitem.obr" label="Generate OBR" iconURI="platform:/plugin/com.osgifx.console.ui.bundles/graphic/icons/obr.png" tooltip="Generates OBR XML from the connected runtime resources" contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.handler.GenerateObrHandler"/>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_cBJPIGpBEe21Cs8uJesKFQ" featurename="addons" parentElementId="com.osgifx.console.application">
+    <elements xsi:type="application:Addon" xmi:id="_cBJPIWpBEe21Cs8uJesKFQ" elementId="com.osgifx.console.ui.bundles.addon.dragndrop" contributionURI="bundleclass://com.osgifx.console.ui.bundles/com.osgifx.console.ui.bundles.addon.DragAndDropAddon"/>
+  </fragments>
 </fragment:ModelFragments>
diff --git a/com.osgifx.console.ui.components/_plugin.xml b/com.osgifx.console.ui.components/_plugin.xml
deleted file mode 100644
index 3ae016b94..000000000
--- a/com.osgifx.console.ui.components/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.components">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.components/bnd.bnd b/com.osgifx.console.ui.components/bnd.bnd
index 41e9a11d6..a4c7e9466 100644
--- a/com.osgifx.console.ui.components/bnd.bnd
+++ b/com.osgifx.console.ui.components/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.components/fragment.e4xmi b/com.osgifx.console.ui.components/fragment.e4xmi
index ee9278211..4a8657aa6 100644
--- a/com.osgifx.console.ui.components/fragment.e4xmi
+++ b/com.osgifx.console.ui.components/fragment.e4xmi
@@ -1,73 +1,21 @@
 <?xml version="1.0" encoding="ASCII"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic"
-	xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands"
-	xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment"
-	xmi:id="_s7J3oCBGEey33dbookdebQ">
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children"
-		parentElementId="com.osgifx.console.ui.extensions.partstack">
-		<elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ"
-			elementId="com.osgifx.console.application.tab.components"
-			accessibilityPhrase=""
-			contributionURI="bundleclass://com.osgifx.console.ui.components/com.osgifx.console.ui.components.ComponentsFxUI"
-			label="Components"
-			iconURI="platform:/plugin/com.osgifx.console.ui.components/graphic/icons/components.png"
-			tooltip="Shows all service components registered in the remote framework"
-			closeable="true" />
-	</fragments>
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_oFFuYH6-EeyYfeV-7UqQeg" featurename="handlers"
-		parentElementId="com.osgifx.console.application">
-		<elements xsi:type="commands:Handler" xmi:id="_oFFuYX6-EeyYfeV-7UqQeg"
-			elementId="com.osgifx.console.application.handler.component.enable"
-			contributionURI="bundleclass://com.osgifx.console.ui.components/com.osgifx.console.ui.components.handler.ComponentEnableHandler"
-			command="_oFFuZH6-EeyYfeV-7UqQeg" />
-		<elements xsi:type="commands:Handler" xmi:id="_oFFuYn6-EeyYfeV-7UqQeg"
-			elementId="com.osgifx.console.application.handler.component.disable"
-			contributionURI="bundleclass://com.osgifx.console.ui.components/com.osgifx.console.ui.components.handler.ComponentDisableHandler"
-			command="_oFFuZn6-EeyYfeV-7UqQeg" />
-	</fragments>
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_oFFuY36-EeyYfeV-7UqQeg" featurename="commands"
-		parentElementId="com.osgifx.console.application">
-		<elements xsi:type="commands:Command" xmi:id="_oFFuZH6-EeyYfeV-7UqQeg"
-			elementId="com.osgifx.console.application.command.component.enable"
-			commandName="Component Enable Command"
-			description="Enables the component with the specified ID">
-			<parameters xmi:id="_oFFuZX6-EeyYfeV-7UqQeg" elementId="name"
-				name="Name" optional="false" />
-		</elements>
-		<elements xsi:type="commands:Command" xmi:id="_oFFuZn6-EeyYfeV-7UqQeg"
-			elementId="com.osgifx.console.application.command.component.disable"
-			commandName="Component Disable Command"
-			description="Disables the component with the specified ID">
-			<parameters xmi:id="_oFFuZ36-EeyYfeV-7UqQeg" elementId="id"
-				name="ID" optional="false" />
-		</elements>
-	</fragments>
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_oFFuaH6-EeyYfeV-7UqQeg" featurename="categories"
-		parentElementId="com.osgifx.console.application">
-		<elements xsi:type="commands:Category" xmi:id="_oFFuaX6-EeyYfeV-7UqQeg"
-			elementId="com.osgifx.console.application.category.component"
-			name="Component Action"
-			description="This category is used to group all commands relating to component state changes" />
-	</fragments>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_s7J3oCBGEey33dbookdebQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children" parentElementId="com.osgifx.console.ui.extensions.partstack" positionInList="index:4">
+    <elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ" elementId="com.osgifx.console.application.tab.components" accessibilityPhrase="" contributionURI="bundleclass://com.osgifx.console.ui.components/com.osgifx.console.ui.components.ComponentsFxUI" label="Components" iconURI="platform:/plugin/com.osgifx.console.ui.components/graphic/icons/components.png" tooltip="Shows all service components registered in the remote framework" closeable="true"/>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_oFFuYH6-EeyYfeV-7UqQeg" featurename="handlers" parentElementId="com.osgifx.console.application">
+    <elements xsi:type="commands:Handler" xmi:id="_oFFuYX6-EeyYfeV-7UqQeg" elementId="com.osgifx.console.application.handler.component.enable" contributionURI="bundleclass://com.osgifx.console.ui.components/com.osgifx.console.ui.components.handler.ComponentEnableHandler" command="_oFFuZH6-EeyYfeV-7UqQeg"/>
+    <elements xsi:type="commands:Handler" xmi:id="_oFFuYn6-EeyYfeV-7UqQeg" elementId="com.osgifx.console.application.handler.component.disable" contributionURI="bundleclass://com.osgifx.console.ui.components/com.osgifx.console.ui.components.handler.ComponentDisableHandler" command="_oFFuZn6-EeyYfeV-7UqQeg"/>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_oFFuY36-EeyYfeV-7UqQeg" featurename="commands" parentElementId="com.osgifx.console.application">
+    <elements xsi:type="commands:Command" xmi:id="_oFFuZH6-EeyYfeV-7UqQeg" elementId="com.osgifx.console.application.command.component.enable" commandName="Component Enable Command" description="Enables the component with the specified ID">
+      <parameters xmi:id="_oFFuZX6-EeyYfeV-7UqQeg" elementId="name" name="Name" optional="false"/>
+    </elements>
+    <elements xsi:type="commands:Command" xmi:id="_oFFuZn6-EeyYfeV-7UqQeg" elementId="com.osgifx.console.application.command.component.disable" commandName="Component Disable Command" description="Disables the component with the specified ID">
+      <parameters xmi:id="_oFFuZ36-EeyYfeV-7UqQeg" elementId="id" name="ID" optional="false"/>
+    </elements>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_oFFuaH6-EeyYfeV-7UqQeg" featurename="categories" parentElementId="com.osgifx.console.application">
+    <elements xsi:type="commands:Category" xmi:id="_oFFuaX6-EeyYfeV-7UqQeg" elementId="com.osgifx.console.application.category.component" name="Component Action" description="This category is used to group all commands relating to component state changes"/>
+  </fragments>
 </fragment:ModelFragments>
diff --git a/com.osgifx.console.ui.configurations/_plugin.xml b/com.osgifx.console.ui.configurations/_plugin.xml
deleted file mode 100644
index aceda6381..000000000
--- a/com.osgifx.console.ui.configurations/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.configurations">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.configurations/bnd.bnd b/com.osgifx.console.ui.configurations/bnd.bnd
index 676c28977..6c2bf37b8 100644
--- a/com.osgifx.console.ui.configurations/bnd.bnd
+++ b/com.osgifx.console.ui.configurations/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.configurations/fragment.e4xmi b/com.osgifx.console.ui.configurations/fragment.e4xmi
index af869e692..37346a50f 100644
--- a/com.osgifx.console.ui.configurations/fragment.e4xmi
+++ b/com.osgifx.console.ui.configurations/fragment.e4xmi
@@ -1,53 +1,9 @@
 <?xml version="1.0" encoding="ASCII"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic"
-	xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment"
-	xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu"
-	xmi:id="_s7J3oCBGEey33dbookdebQ"> Copyright 2021-2024 Amit Kumar Mondal
-	Licensed under the Apache License, Version 2.0 (the "License"); you may not
-	use this file except in compliance with the License. You may obtain a copy
-	of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
-	by applicable law or agreed to in writing, software distributed under the
-	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-	OF ANY KIND, either express or implied. See the License for the specific
-	language governing permissions and limitations under the License. --> <fragments
-		xsi:type="fragment:StringModelFragment" xmi:id="_s7J3oSBGEey33dbookdebQ"
-		featurename="children"
-		parentElementId="com.osgifx.console.ui.extensions.partstack">
-		<elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ"
-			elementId="com.osgifx.console.application.tab.configurations"
-			contributionURI="bundleclass://com.osgifx.console.ui.configurations/com.osgifx.console.ui.configurations.ConfigurationsFxUI"
-			label="Configurations"
-			iconURI="platform:/plugin/com.osgifx.console.ui.configurations/graphic/icons/configurations.png"
-			tooltip="Shows all available configurations and metatype descriptors in the remote framework"
-			closeable="true" />
-	</fragments>
-  <fragments
-		xsi:type="fragment:StringModelFragment" xmi:id="_gdcQYH-WEeyYfeV-7UqQeg"
-		featurename="children"
-		parentElementId="com.osgifx.console.application.menu.actions">
-		<elements xsi:type="menu:DirectMenuItem"
-			xmi:id="_gdcQYX-WEeyYfeV-7UqQeg"
-			elementId="com.osgifx.console.application.directmenuitem.create.config"
-			label="Add New Configuration"
-			iconURI="platform:/plugin/com.osgifx.console.ui.configurations/graphic/icons/new-config.png"
-			tooltip="Creates OSGi configuration admin configuration"
-			contributionURI="bundleclass://com.osgifx.console.ui.configurations/com.osgifx.console.ui.configurations.handler.ConfigurationCreateHandler" />
-	</fragments>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmi:id="_s7J3oCBGEey33dbookdebQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children" parentElementId="com.osgifx.console.ui.extensions.partstack" positionInList="index:5">
+    <elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ" elementId="com.osgifx.console.application.tab.configurations" contributionURI="bundleclass://com.osgifx.console.ui.configurations/com.osgifx.console.ui.configurations.ConfigurationsFxUI" label="Configurations" iconURI="platform:/plugin/com.osgifx.console.ui.configurations/graphic/icons/configurations.png" tooltip="Shows all available configurations and metatype descriptors in the remote framework" closeable="true"/>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_gdcQYH-WEeyYfeV-7UqQeg" featurename="children" parentElementId="com.osgifx.console.application.menu.actions">
+    <elements xsi:type="menu:DirectMenuItem" xmi:id="_gdcQYX-WEeyYfeV-7UqQeg" elementId="com.osgifx.console.application.directmenuitem.create.config" label="Add New Configuration" iconURI="platform:/plugin/com.osgifx.console.ui.configurations/graphic/icons/new-config.png" tooltip="Creates OSGi configuration admin configuration" contributionURI="bundleclass://com.osgifx.console.ui.configurations/com.osgifx.console.ui.configurations.handler.ConfigurationCreateHandler"/>
+  </fragments>
 </fragment:ModelFragments>
diff --git a/com.osgifx.console.ui.dmt/_plugin.xml b/com.osgifx.console.ui.dmt/_plugin.xml
deleted file mode 100644
index 7a05e0dba..000000000
--- a/com.osgifx.console.ui.dmt/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.dmt">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.dmt/bnd.bnd b/com.osgifx.console.ui.dmt/bnd.bnd
index 3ff7f812f..5914eb3be 100644
--- a/com.osgifx.console.ui.dmt/bnd.bnd
+++ b/com.osgifx.console.ui.dmt/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.dmt/fragment.e4xmi b/com.osgifx.console.ui.dmt/fragment.e4xmi
index 253185ed7..b6de7e383 100644
--- a/com.osgifx.console.ui.dmt/fragment.e4xmi
+++ b/com.osgifx.console.ui.dmt/fragment.e4xmi
@@ -1,18 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic"
-	xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment"
-	xmi:id="_s7J3oCBGEey33dbookdebQ">
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children"
-		parentElementId="com.osgifx.console.ui.extensions.partstack">
-		<elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ"
-			elementId="com.osgifx.console.application.tab.dmt"
-			contributionURI="bundleclass://com.osgifx.console.ui.dmt/com.osgifx.console.ui.dmt.DmtFxUI"
-			label="DMT"
-			iconURI="platform:/plugin/com.osgifx.console.ui.dmt/graphic/icons/tree.png"
-			tooltip="Shows all available DMT nodes in the remote framework"
-			closeable="true" />
-	</fragments>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_s7J3oCBGEey33dbookdebQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children" parentElementId="com.osgifx.console.ui.extensions.partstack" positionInList="index:18">
+    <elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ" elementId="com.osgifx.console.application.tab.dmt" contributionURI="bundleclass://com.osgifx.console.ui.dmt/com.osgifx.console.ui.dmt.DmtFxUI" label="DMT" iconURI="platform:/plugin/com.osgifx.console.ui.dmt/graphic/icons/tree.png" tooltip="Shows all available DMT nodes in the remote framework" closeable="true"/>
+  </fragments>
 </fragment:ModelFragments>
diff --git a/com.osgifx.console.ui.dto/_plugin.xml b/com.osgifx.console.ui.dto/_plugin.xml
deleted file mode 100644
index 25b06ede2..000000000
--- a/com.osgifx.console.ui.dto/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.dto">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.dto/bnd.bnd b/com.osgifx.console.ui.dto/bnd.bnd
index 58901ce3f..3521aad0b 100644
--- a/com.osgifx.console.ui.dto/bnd.bnd
+++ b/com.osgifx.console.ui.dto/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.dto/fragment.e4xmi b/com.osgifx.console.ui.dto/fragment.e4xmi
index 03ec778be..8fc1a8db7 100644
--- a/com.osgifx.console.ui.dto/fragment.e4xmi
+++ b/com.osgifx.console.ui.dto/fragment.e4xmi
@@ -1,18 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic"
-	xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment"
-	xmi:id="_s7J3oCBGEey33dbookdebQ">
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children"
-		parentElementId="com.osgifx.console.ui.extensions.partstack">
-		<elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ"
-			elementId="com.osgifx.console.application.tab.dto"
-			contributionURI="bundleclass://com.osgifx.console.ui.dto/com.osgifx.console.ui.dto.DtoFxUI"
-			label="DTO"
-			iconURI="platform:/plugin/com.osgifx.console.ui.dto/graphic/icons/dto.png"
-			tooltip="Shows all available runtime DTOs in the remote framework"
-			closeable="true" />
-	</fragments>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_s7J3oCBGEey33dbookdebQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children" parentElementId="com.osgifx.console.ui.extensions.partstack" positionInList="index:17">
+    <elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ" elementId="com.osgifx.console.application.tab.dto" contributionURI="bundleclass://com.osgifx.console.ui.dto/com.osgifx.console.ui.dto.DtoFxUI" label="DTO" iconURI="platform:/plugin/com.osgifx.console.ui.dto/graphic/icons/dto.png" tooltip="Shows all available runtime DTOs in the remote framework" closeable="true"/>
+  </fragments>
 </fragment:ModelFragments>
diff --git a/com.osgifx.console.ui.events/_plugin.xml b/com.osgifx.console.ui.events/_plugin.xml
deleted file mode 100644
index 0832eba04..000000000
--- a/com.osgifx.console.ui.events/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.events">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.events/bnd.bnd b/com.osgifx.console.ui.events/bnd.bnd
index bf99da38f..c7af2090e 100644
--- a/com.osgifx.console.ui.events/bnd.bnd
+++ b/com.osgifx.console.ui.events/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.events/fragment.e4xmi b/com.osgifx.console.ui.events/fragment.e4xmi
index e047cb0bb..ef08df2f5 100644
--- a/com.osgifx.console.ui.events/fragment.e4xmi
+++ b/com.osgifx.console.ui.events/fragment.e4xmi
@@ -1,49 +1,15 @@
 <?xml version="1.0" encoding="ASCII"?>
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic"
-	xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment"
-	xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu"
-	xmi:id="_s7J3oCBGEey33dbookdebQ">
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children"
-		parentElementId="com.osgifx.console.ui.extensions.partstack">
-		<elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ"
-			elementId="com.osgifx.console.application.tab.events"
-			contributionURI="bundleclass://com.osgifx.console.ui.events/com.osgifx.console.ui.events.EventsFxUI"
-			label="Events"
-			iconURI="platform:/plugin/com.osgifx.console.ui.events/graphic/icons/events.png"
-			tooltip="Receives events triggered in the remote framework"
-			closeable="true" />
-	</fragments>
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_Q07dwH7CEeyYfeV-7UqQeg" featurename="children"
-		parentElementId="com.osgifx.console.application.menu.actions">
-		<elements xsi:type="menu:DirectMenuItem"
-			xmi:id="_Q07dwX7CEeyYfeV-7UqQeg"
-			elementId="com.osgifx.console.application.directmenuitem.clear.events"
-			label="Clear Events"
-			iconURI="platform:/plugin/com.osgifx.console.ui.events/graphic/icons/clear.png"
-			tooltip="Clears events table"
-			contributionURI="bundleclass://com.osgifx.console.ui.events/com.osgifx.console.ui.events.handler.ClearEventsTableHandler" />
-	</fragments>
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_2zSEUH7CEeyYfeV-7UqQeg" featurename="children"
-		parentElementId="com.osgifx.console.application.menu.actions">
-		<elements xsi:type="menu:DynamicMenuContribution"
-			xmi:id="_2zSEUX7CEeyYfeV-7UqQeg"
-			elementId="com.osgifx.console.application.menu.event.actions"
-			contributionURI="bundleclass://com.osgifx.console.ui.events/com.osgifx.console.ui.events.handler.EventReceiveMenuContributionHandler" />
-	</fragments>
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_IU5WEIAlEeyYfeV-7UqQeg" featurename="children"
-		parentElementId="com.osgifx.console.application.menu.actions">
-		<elements xsi:type="menu:DirectMenuItem"
-			xmi:id="_IU5WEYAlEeyYfeV-7UqQeg"
-			elementId="com.osgifx.console.application.directmenuitem.event.send"
-			label="Send Events"
-			iconURI="platform:/plugin/com.osgifx.console.ui.events/graphic/icons/send-event.png"
-			tooltip="Sends OSGi EventAdmin events"
-			contributionURI="bundleclass://com.osgifx.console.ui.events/com.osgifx.console.ui.events.handler.SendEventHandler" />
-	</fragments>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmi:id="_s7J3oCBGEey33dbookdebQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children" parentElementId="com.osgifx.console.ui.extensions.partstack" positionInList="index:6">
+    <elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ" elementId="com.osgifx.console.application.tab.events" contributionURI="bundleclass://com.osgifx.console.ui.events/com.osgifx.console.ui.events.EventsFxUI" label="Events" iconURI="platform:/plugin/com.osgifx.console.ui.events/graphic/icons/events.png" tooltip="Receives events triggered in the remote framework" closeable="true"/>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_Q07dwH7CEeyYfeV-7UqQeg" featurename="children" parentElementId="com.osgifx.console.application.menu.actions">
+    <elements xsi:type="menu:DirectMenuItem" xmi:id="_Q07dwX7CEeyYfeV-7UqQeg" elementId="com.osgifx.console.application.directmenuitem.clear.events" label="Clear Events" iconURI="platform:/plugin/com.osgifx.console.ui.events/graphic/icons/clear.png" tooltip="Clears events table" contributionURI="bundleclass://com.osgifx.console.ui.events/com.osgifx.console.ui.events.handler.ClearEventsTableHandler"/>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_2zSEUH7CEeyYfeV-7UqQeg" featurename="children" parentElementId="com.osgifx.console.application.menu.actions">
+    <elements xsi:type="menu:DynamicMenuContribution" xmi:id="_2zSEUX7CEeyYfeV-7UqQeg" elementId="com.osgifx.console.application.menu.event.actions" contributionURI="bundleclass://com.osgifx.console.ui.events/com.osgifx.console.ui.events.handler.EventReceiveMenuContributionHandler"/>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_IU5WEIAlEeyYfeV-7UqQeg" featurename="children" parentElementId="com.osgifx.console.application.menu.actions">
+    <elements xsi:type="menu:DirectMenuItem" xmi:id="_IU5WEYAlEeyYfeV-7UqQeg" elementId="com.osgifx.console.application.directmenuitem.event.send" label="Send Events" iconURI="platform:/plugin/com.osgifx.console.ui.events/graphic/icons/send-event.png" tooltip="Sends OSGi EventAdmin events" contributionURI="bundleclass://com.osgifx.console.ui.events/com.osgifx.console.ui.events.handler.SendEventHandler"/>
+  </fragments>
 </fragment:ModelFragments>
diff --git a/com.osgifx.console.ui.extension/_plugin.xml b/com.osgifx.console.ui.extension/_plugin.xml
deleted file mode 100644
index 2fc9ca260..000000000
--- a/com.osgifx.console.ui.extension/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.feature">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.extension/bnd.bnd b/com.osgifx.console.ui.extension/bnd.bnd
index 36f3cae00..6dd7b195b 100644
--- a/com.osgifx.console.ui.extension/bnd.bnd
+++ b/com.osgifx.console.ui.extension/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.gogo/_plugin.xml b/com.osgifx.console.ui.gogo/_plugin.xml
deleted file mode 100644
index c0689b3d4..000000000
--- a/com.osgifx.console.ui.gogo/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.gogo">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.gogo/bnd.bnd b/com.osgifx.console.ui.gogo/bnd.bnd
index 318676bf3..81d6d1c08 100644
--- a/com.osgifx.console.ui.gogo/bnd.bnd
+++ b/com.osgifx.console.ui.gogo/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.gogo/fragment.e4xmi b/com.osgifx.console.ui.gogo/fragment.e4xmi
index 9a9e05bdd..0ed350954 100644
--- a/com.osgifx.console.ui.gogo/fragment.e4xmi
+++ b/com.osgifx.console.ui.gogo/fragment.e4xmi
@@ -1,18 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic"
-	xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment"
-	xmi:id="_s7J3oCBGEey33dbookdebQ">
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children"
-		parentElementId="com.osgifx.console.ui.extensions.partstack">
-		<elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ"
-			elementId="com.osgifx.console.application.tab.gogo"
-			contributionURI="bundleclass://com.osgifx.console.ui.gogo/com.osgifx.console.ui.gogo.GogoFxUI"
-			label="Gogo"
-			iconURI="platform:/plugin/com.osgifx.console.ui.gogo/graphic/icons/gogo.png"
-			tooltip="Executes gogo command in the remote framework's gogo console"
-			closeable="true" />
-	</fragments>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_s7J3oCBGEey33dbookdebQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children" parentElementId="com.osgifx.console.ui.extensions.partstack" positionInList="index:11">
+    <elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ" elementId="com.osgifx.console.application.tab.gogo" contributionURI="bundleclass://com.osgifx.console.ui.gogo/com.osgifx.console.ui.gogo.GogoFxUI" label="Gogo" iconURI="platform:/plugin/com.osgifx.console.ui.gogo/graphic/icons/gogo.png" tooltip="Executes gogo command in the remote framework's gogo console" closeable="true"/>
+  </fragments>
 </fragment:ModelFragments>
diff --git a/com.osgifx.console.ui.graph/_plugin.xml b/com.osgifx.console.ui.graph/_plugin.xml
deleted file mode 100644
index 05669ef01..000000000
--- a/com.osgifx.console.ui.graph/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.graph">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.graph/bnd.bnd b/com.osgifx.console.ui.graph/bnd.bnd
index 457fd8ab5..873efab44 100644
--- a/com.osgifx.console.ui.graph/bnd.bnd
+++ b/com.osgifx.console.ui.graph/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.graph/fragment.e4xmi b/com.osgifx.console.ui.graph/fragment.e4xmi
index aaf5f6930..dadea9847 100644
--- a/com.osgifx.console.ui.graph/fragment.e4xmi
+++ b/com.osgifx.console.ui.graph/fragment.e4xmi
@@ -1,33 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic"
-	xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment"
-	xmi:id="_s7J3oCBGEey33dbookdebQ">
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_s7J3oSBGGEey33dbookdebQ" featurename="children"
-		parentElementId="com.osgifx.console.ui.extensions.partstack">
-		<elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ"
-			elementId="com.osgifx.console.application.tab.graph"
-			contributionURI="bundleclass://com.osgifx.console.ui.graph/com.osgifx.console.ui.graph.GraphFxUI"
-			label="Graph"
-			iconURI="platform:/plugin/com.osgifx.console.ui.graph/graphic/icons/graph.png"
-			tooltip="Shows dependency graph of the bundles and DS components in the remote framework"
-			closeable="true" />
-	</fragments>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_s7J3oCBGEey33dbookdebQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_s7J3oSBGGEey33dbookdebQ" featurename="children" parentElementId="com.osgifx.console.ui.extensions.partstack" positionInList="index:10">
+    <elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ" elementId="com.osgifx.console.application.tab.graph" contributionURI="bundleclass://com.osgifx.console.ui.graph/com.osgifx.console.ui.graph.GraphFxUI" label="Graph" iconURI="platform:/plugin/com.osgifx.console.ui.graph/graphic/icons/graph.png" tooltip="Shows dependency graph of the bundles and DS components in the remote framework" closeable="true"/>
+  </fragments>
 </fragment:ModelFragments>
diff --git a/com.osgifx.console.ui.healthchecks/_plugin.xml b/com.osgifx.console.ui.healthchecks/_plugin.xml
deleted file mode 100644
index 00b090a27..000000000
--- a/com.osgifx.console.ui.healthchecks/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.healthchecks">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.healthchecks/bnd.bnd b/com.osgifx.console.ui.healthchecks/bnd.bnd
index 3232a87b6..cc84064ec 100644
--- a/com.osgifx.console.ui.healthchecks/bnd.bnd
+++ b/com.osgifx.console.ui.healthchecks/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.healthchecks/fragment.e4xmi b/com.osgifx.console.ui.healthchecks/fragment.e4xmi
index c86f3c0ea..2c223dedd 100644
--- a/com.osgifx.console.ui.healthchecks/fragment.e4xmi
+++ b/com.osgifx.console.ui.healthchecks/fragment.e4xmi
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic"
-	xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment"
-	xmi:id="_s7J3oCBGEey33dbookdebQ">
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_s7J3oSBGGEey33dbookdebQ" featurename="children"
-		parentElementId="com.osgifx.console.ui.extensions.partstack">
-		<elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ"
-			elementId="com.osgifx.console.application.tab.healthchecks"
-			contributionURI="bundleclass://com.osgifx.console.ui.healthchecks/com.osgifx.console.ui.healthchecks.HealthCheckFxUI"
-			label="Healthchecks"
-			iconURI="platform:/plugin/com.osgifx.console.ui.healthchecks/graphic/icons/healthcheck.png"
-			tooltip="Executes Felix Healthchecks" closeable="true" />
-	</fragments>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_s7J3oCBGEey33dbookdebQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_s7J3oSBGGEey33dbookdebQ" featurename="children" parentElementId="com.osgifx.console.ui.extensions.partstack" positionInList="index:19">
+    <elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ" elementId="com.osgifx.console.application.tab.healthchecks" contributionURI="bundleclass://com.osgifx.console.ui.healthchecks/com.osgifx.console.ui.healthchecks.HealthCheckFxUI" label="Healthchecks" iconURI="platform:/plugin/com.osgifx.console.ui.healthchecks/graphic/icons/healthcheck.png" tooltip="Executes Felix Healthchecks" closeable="true"/>
+  </fragments>
 </fragment:ModelFragments>
diff --git a/com.osgifx.console.ui.heap/_plugin.xml b/com.osgifx.console.ui.heap/_plugin.xml
deleted file mode 100644
index 6d51d902a..000000000
--- a/com.osgifx.console.ui.heap/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.heap">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.heap/bnd.bnd b/com.osgifx.console.ui.heap/bnd.bnd
index 1395fa159..c4b9b97cf 100644
--- a/com.osgifx.console.ui.heap/bnd.bnd
+++ b/com.osgifx.console.ui.heap/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.heap/fragment.e4xmi b/com.osgifx.console.ui.heap/fragment.e4xmi
index 91ced1c60..99b41a9a2 100644
--- a/com.osgifx.console.ui.heap/fragment.e4xmi
+++ b/com.osgifx.console.ui.heap/fragment.e4xmi
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic"
-	xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment"
-	xmi:id="_s7J3oCBGEey33dbookdebQ">
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children"
-		parentElementId="com.osgifx.console.ui.extensions.partstack">
-		<elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ"
-			elementId="com.osgifx.console.application.tab.heap"
-			accessibilityPhrase=""
-			contributionURI="bundleclass://com.osgifx.console.ui.heap/com.osgifx.console.ui.heap.HeapMonitorFxUI"
-			label="Heap"
-			iconURI="platform:/plugin/com.osgifx.console.ui.heap/graphic/icons/heap.png"
-			tooltip="Shows heap usage over time and the number of garbage collections"
-			closeable="true" />
-	</fragments>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_s7J3oCBGEey33dbookdebQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children" parentElementId="com.osgifx.console.ui.extensions.partstack" positionInList="index:13">
+    <elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ" elementId="com.osgifx.console.application.tab.heap" accessibilityPhrase="" contributionURI="bundleclass://com.osgifx.console.ui.heap/com.osgifx.console.ui.heap.HeapMonitorFxUI" label="Heap" iconURI="platform:/plugin/com.osgifx.console.ui.heap/graphic/icons/heap.png" tooltip="Shows heap usage over time and the number of garbage collections" closeable="true"/>
+  </fragments>
 </fragment:ModelFragments>
diff --git a/com.osgifx.console.ui.http/_plugin.xml b/com.osgifx.console.ui.http/_plugin.xml
deleted file mode 100644
index 7afbe9492..000000000
--- a/com.osgifx.console.ui.http/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.http">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.http/bnd.bnd b/com.osgifx.console.ui.http/bnd.bnd
index d23cabc1f..69037a307 100644
--- a/com.osgifx.console.ui.http/bnd.bnd
+++ b/com.osgifx.console.ui.http/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.http/fragment.e4xmi b/com.osgifx.console.ui.http/fragment.e4xmi
index af64a9704..efb186cd7 100644
--- a/com.osgifx.console.ui.http/fragment.e4xmi
+++ b/com.osgifx.console.ui.http/fragment.e4xmi
@@ -1,33 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic"
-	xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment"
-	xmi:id="_s7J3oCBGEey33dbookdebQ">
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children"
-		parentElementId="com.osgifx.console.ui.extensions.partstack">
-		<elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ"
-			elementId="com.osgifx.console.application.tab.http"
-			contributionURI="bundleclass://com.osgifx.console.ui.http/com.osgifx.console.ui.http.HttpFxUI"
-			label="HTTP"
-			iconURI="platform:/plugin/com.osgifx.console.ui.http/graphic/icons/http.png"
-			tooltip="Shows HTTP runtime information - servlets, resources, listeners, filters and error pages"
-			closeable="true" />
-	</fragments>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_s7J3oCBGEey33dbookdebQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children" parentElementId="com.osgifx.console.ui.extensions.partstack" positionInList="index:15">
+    <elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ" elementId="com.osgifx.console.application.tab.http" contributionURI="bundleclass://com.osgifx.console.ui.http/com.osgifx.console.ui.http.HttpFxUI" label="HTTP" iconURI="platform:/plugin/com.osgifx.console.ui.http/graphic/icons/http.png" tooltip="Shows HTTP runtime information - servlets, resources, listeners, filters and error pages" closeable="true"/>
+  </fragments>
 </fragment:ModelFragments>
diff --git a/com.osgifx.console.ui.leaks/_plugin.xml b/com.osgifx.console.ui.leaks/_plugin.xml
deleted file mode 100644
index 08e30e560..000000000
--- a/com.osgifx.console.ui.leaks/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.leaks">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.leaks/bnd.bnd b/com.osgifx.console.ui.leaks/bnd.bnd
index fe9da22af..d5795c3ff 100644
--- a/com.osgifx.console.ui.leaks/bnd.bnd
+++ b/com.osgifx.console.ui.leaks/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.leaks/fragment.e4xmi b/com.osgifx.console.ui.leaks/fragment.e4xmi
index 28fb36dc3..510592a4d 100644
--- a/com.osgifx.console.ui.leaks/fragment.e4xmi
+++ b/com.osgifx.console.ui.leaks/fragment.e4xmi
@@ -1,33 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic"
-	xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment"
-	xmi:id="_s7J3oCBGEey33dbookdebQ">
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children"
-		parentElementId="com.osgifx.console.ui.extensions.partstack">
-		<elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ"
-			elementId="com.osgifx.console.application.tab.leaks"
-			contributionURI="bundleclass://com.osgifx.console.ui.leaks/com.osgifx.console.ui.leaks.LeaksFxUI"
-			label="Leaks"
-			iconURI="platform:/plugin/com.osgifx.console.ui.leaks/graphic/icons/leaks.png"
-			tooltip="Shows all classloader leaks in the remote framework"
-			closeable="true" />
-	</fragments>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_s7J3oCBGEey33dbookdebQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children" parentElementId="com.osgifx.console.ui.extensions.partstack" positionInList="index:14">
+    <elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ" elementId="com.osgifx.console.application.tab.leaks" contributionURI="bundleclass://com.osgifx.console.ui.leaks/com.osgifx.console.ui.leaks.LeaksFxUI" label="Leaks" iconURI="platform:/plugin/com.osgifx.console.ui.leaks/graphic/icons/leaks.png" tooltip="Shows all classloader leaks in the remote framework" closeable="true"/>
+  </fragments>
 </fragment:ModelFragments>
diff --git a/com.osgifx.console.ui.logs/_plugin.xml b/com.osgifx.console.ui.logs/_plugin.xml
deleted file mode 100644
index ed3ecb248..000000000
--- a/com.osgifx.console.ui.logs/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.logs">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.logs/bnd.bnd b/com.osgifx.console.ui.logs/bnd.bnd
index d3e8badf5..5b70619ea 100644
--- a/com.osgifx.console.ui.logs/bnd.bnd
+++ b/com.osgifx.console.ui.logs/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.logs/fragment.e4xmi b/com.osgifx.console.ui.logs/fragment.e4xmi
index 2dfc4d7b2..39c589e18 100644
--- a/com.osgifx.console.ui.logs/fragment.e4xmi
+++ b/com.osgifx.console.ui.logs/fragment.e4xmi
@@ -1,53 +1,12 @@
 <?xml version="1.0" encoding="ASCII"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic"
-	xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment"
-	xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu"
-	xmi:id="_s7J3oCBGEey33dbookdebQ">
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children"
-		parentElementId="com.osgifx.console.ui.extensions.partstack">
-		<elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ"
-			elementId="com.osgifx.console.application.tab.logs"
-			contributionURI="bundleclass://com.osgifx.console.ui.logs/com.osgifx.console.ui.logs.LogsFxUI"
-			label="Logs"
-			iconURI="platform:/plugin/com.osgifx.console.ui.logs/graphic/icons/logs.png"
-			tooltip="Receives logs created in the remote framework"
-			closeable="true" />
-	</fragments>
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_oPKlgH7AEeyYfeV-7UqQeg" featurename="children"
-		parentElementId="com.osgifx.console.application.menu.actions">
-		<elements xsi:type="menu:DirectMenuItem"
-			xmi:id="_oPKlgX7AEeyYfeV-7UqQeg"
-			elementId="com.osgifx.console.application.directmenuitem.clear.logs"
-			label="Clear Logs"
-			iconURI="platform:/plugin/com.osgifx.console.ui.logs/graphic/icons/clear.png"
-			tooltip="Clear logs table"
-			contributionURI="bundleclass://com.osgifx.console.ui.logs/com.osgifx.console.ui.logs.handler.ClearLogsTableHandler" />
-	</fragments>
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_JDivoH7DEeyYfeV-7UqQeg" featurename="children"
-		parentElementId="com.osgifx.console.application.menu.actions">
-		<elements xsi:type="menu:DynamicMenuContribution"
-			xmi:id="_JDivoX7DEeyYfeV-7UqQeg"
-			elementId="com.osgifx.console.application.menu.log.actions"
-			contributionURI="bundleclass://com.osgifx.console.ui.logs/com.osgifx.console.ui.logs.handler.LogReceiveMenuContributionHandler" />
-	</fragments>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmi:id="_s7J3oCBGEey33dbookdebQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children" parentElementId="com.osgifx.console.ui.extensions.partstack" positionInList="index:7">
+    <elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ" elementId="com.osgifx.console.application.tab.logs" contributionURI="bundleclass://com.osgifx.console.ui.logs/com.osgifx.console.ui.logs.LogsFxUI" label="Logs" iconURI="platform:/plugin/com.osgifx.console.ui.logs/graphic/icons/logs.png" tooltip="Receives logs created in the remote framework" closeable="true"/>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_oPKlgH7AEeyYfeV-7UqQeg" featurename="children" parentElementId="com.osgifx.console.application.menu.actions">
+    <elements xsi:type="menu:DirectMenuItem" xmi:id="_oPKlgX7AEeyYfeV-7UqQeg" elementId="com.osgifx.console.application.directmenuitem.clear.logs" label="Clear Logs" iconURI="platform:/plugin/com.osgifx.console.ui.logs/graphic/icons/clear.png" tooltip="Clear logs table" contributionURI="bundleclass://com.osgifx.console.ui.logs/com.osgifx.console.ui.logs.handler.ClearLogsTableHandler"/>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_JDivoH7DEeyYfeV-7UqQeg" featurename="children" parentElementId="com.osgifx.console.application.menu.actions">
+    <elements xsi:type="menu:DynamicMenuContribution" xmi:id="_JDivoX7DEeyYfeV-7UqQeg" elementId="com.osgifx.console.application.menu.log.actions" contributionURI="bundleclass://com.osgifx.console.ui.logs/com.osgifx.console.ui.logs.handler.LogReceiveMenuContributionHandler"/>
+  </fragments>
 </fragment:ModelFragments>
diff --git a/com.osgifx.console.ui.overview/_plugin.xml b/com.osgifx.console.ui.overview/_plugin.xml
deleted file mode 100644
index 58e0cd62b..000000000
--- a/com.osgifx.console.ui.overview/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.overview">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.overview/bnd.bnd b/com.osgifx.console.ui.overview/bnd.bnd
index 23a473684..ddb54964c 100644
--- a/com.osgifx.console.ui.overview/bnd.bnd
+++ b/com.osgifx.console.ui.overview/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.overview/fragment.e4xmi b/com.osgifx.console.ui.overview/fragment.e4xmi
index dadff8887..12d27bb18 100644
--- a/com.osgifx.console.ui.overview/fragment.e4xmi
+++ b/com.osgifx.console.ui.overview/fragment.e4xmi
@@ -1,34 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic"
-	xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment"
-	xmi:id="_s7J3oCBGEey33dbookdebQ">
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children"
-		parentElementId="com.osgifx.console.ui.extensions.partstack">
-		<elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ"
-			elementId="com.osgifx.console.application.tab.overview"
-			accessibilityPhrase=""
-			contributionURI="bundleclass://com.osgifx.console.ui.overview/com.osgifx.console.ui.overview.OverviewFxUI"
-			label="Overview"
-			iconURI="platform:/plugin/com.osgifx.console.ui.overview/graphic/icons/overview.png"
-			tooltip="Shows general overview of the remote framework"
-			closeable="true" />
-	</fragments>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_s7J3oCBGEey33dbookdebQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children" parentElementId="com.osgifx.console.ui.extensions.partstack" positionInList="index:0">
+    <elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ" elementId="com.osgifx.console.application.tab.overview" accessibilityPhrase="" contributionURI="bundleclass://com.osgifx.console.ui.overview/com.osgifx.console.ui.overview.OverviewFxUI" label="Overview" iconURI="platform:/plugin/com.osgifx.console.ui.overview/graphic/icons/overview.png" tooltip="Shows general overview of the remote framework" closeable="true"/>
+  </fragments>
 </fragment:ModelFragments>
diff --git a/com.osgifx.console.ui.packages/_plugin.xml b/com.osgifx.console.ui.packages/_plugin.xml
deleted file mode 100644
index 4b5ef4b4e..000000000
--- a/com.osgifx.console.ui.packages/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.packages">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.packages/bnd.bnd b/com.osgifx.console.ui.packages/bnd.bnd
index fd787a3ef..b21b1dd94 100644
--- a/com.osgifx.console.ui.packages/bnd.bnd
+++ b/com.osgifx.console.ui.packages/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.packages/fragment.e4xmi b/com.osgifx.console.ui.packages/fragment.e4xmi
index c2ecd38ea..135d57d30 100644
--- a/com.osgifx.console.ui.packages/fragment.e4xmi
+++ b/com.osgifx.console.ui.packages/fragment.e4xmi
@@ -1,34 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic"
-	xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment"
-	xmi:id="_s7J3oCBGEey33dbookdebQ">
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children"
-		parentElementId="com.osgifx.console.ui.extensions.partstack">
-		<elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ"
-			elementId="com.osgifx.console.application.tab.packages"
-			accessibilityPhrase=""
-			contributionURI="bundleclass://com.osgifx.console.ui.packages/com.osgifx.console.ui.packages.PackagesFxUI"
-			label="Packages"
-			iconURI="platform:/plugin/com.osgifx.console.ui.packages/graphic/icons/packages.png"
-			tooltip="Shows all exported and imported packages in the remote framework"
-			closeable="true" />
-	</fragments>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_s7J3oCBGEey33dbookdebQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children" parentElementId="com.osgifx.console.ui.extensions.partstack" positionInList="index:2">
+    <elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ" elementId="com.osgifx.console.application.tab.packages" accessibilityPhrase="" contributionURI="bundleclass://com.osgifx.console.ui.packages/com.osgifx.console.ui.packages.PackagesFxUI" label="Packages" iconURI="platform:/plugin/com.osgifx.console.ui.packages/graphic/icons/packages.png" tooltip="Shows all exported and imported packages in the remote framework" closeable="true"/>
+  </fragments>
 </fragment:ModelFragments>
diff --git a/com.osgifx.console.ui.properties/_plugin.xml b/com.osgifx.console.ui.properties/_plugin.xml
deleted file mode 100644
index aedac18a2..000000000
--- a/com.osgifx.console.ui.properties/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.properties">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.properties/bnd.bnd b/com.osgifx.console.ui.properties/bnd.bnd
index 3be389003..7c74610fa 100644
--- a/com.osgifx.console.ui.properties/bnd.bnd
+++ b/com.osgifx.console.ui.properties/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.properties/fragment.e4xmi b/com.osgifx.console.ui.properties/fragment.e4xmi
index 9544b7501..1417ef40e 100644
--- a/com.osgifx.console.ui.properties/fragment.e4xmi
+++ b/com.osgifx.console.ui.properties/fragment.e4xmi
@@ -1,33 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic"
-	xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment"
-	xmi:id="_s7J3oCBGEey33dbookdebQ">
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children"
-		parentElementId="com.osgifx.console.ui.extensions.partstack">
-		<elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ"
-			elementId="com.osgifx.console.application.tab.properties"
-			contributionURI="bundleclass://com.osgifx.console.ui.properties/com.osgifx.console.ui.properties.PropertiesFxUI"
-			label="Properties"
-			iconURI="platform:/plugin/com.osgifx.console.ui.properties/graphic/icons/properties.png"
-			tooltip="Shows all framework and system properties set in the remote framework"
-			closeable="true" />
-	</fragments>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_s7J3oCBGEey33dbookdebQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children" parentElementId="com.osgifx.console.ui.extensions.partstack" positionInList="index:8">
+    <elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ" elementId="com.osgifx.console.application.tab.properties" contributionURI="bundleclass://com.osgifx.console.ui.properties/com.osgifx.console.ui.properties.PropertiesFxUI" label="Properties" iconURI="platform:/plugin/com.osgifx.console.ui.properties/graphic/icons/properties.png" tooltip="Shows all framework and system properties set in the remote framework" closeable="true"/>
+  </fragments>
 </fragment:ModelFragments>
diff --git a/com.osgifx.console.ui.roles/_plugin.xml b/com.osgifx.console.ui.roles/_plugin.xml
deleted file mode 100644
index 166ddc9db..000000000
--- a/com.osgifx.console.ui.roles/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.roles">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.roles/bnd.bnd b/com.osgifx.console.ui.roles/bnd.bnd
index 04f0c80dd..2e57180f0 100644
--- a/com.osgifx.console.ui.roles/bnd.bnd
+++ b/com.osgifx.console.ui.roles/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.roles/fragment.e4xmi b/com.osgifx.console.ui.roles/fragment.e4xmi
index a8d38d576..f64b368ec 100644
--- a/com.osgifx.console.ui.roles/fragment.e4xmi
+++ b/com.osgifx.console.ui.roles/fragment.e4xmi
@@ -1,30 +1,9 @@
 <?xml version="1.0" encoding="ASCII"?>
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic"
-	xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment"
-	xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu"
-	xmi:id="_s7J3oCBGEey33dbookdebQ">
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children"
-		parentElementId="com.osgifx.console.ui.extensions.partstack">
-		<elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ"
-			elementId="com.osgifx.console.application.tab.roles"
-			contributionURI="bundleclass://com.osgifx.console.ui.roles/com.osgifx.console.ui.roles.RolesFxUI"
-			label="Roles"
-			iconURI="platform:/plugin/com.osgifx.console.ui.roles/graphic/icons/roles.png"
-			tooltip="Shows all available User Admin roles in the remote framework"
-			closeable="true" />
-	</fragments>
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_gdcQYH-WEeyYfeV-7UqQeg" featurename="children"
-		parentElementId="com.osgifx.console.application.menu.actions">
-		<elements xsi:type="menu:DirectMenuItem"
-			xmi:id="_gdcQYX-WEeyYfeV-7UqQeg"
-			elementId="com.osgifx.console.application.directmenuitem.create.role"
-			label="Add New Role"
-			iconURI="platform:/plugin/com.osgifx.console.ui.roles/graphic/icons/new-role.png"
-			tooltip="Creates OSGi user admin role"
-			contributionURI="bundleclass://com.osgifx.console.ui.roles/com.osgifx.console.ui.roles.handler.RoleCreateHandler" />
-	</fragments>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmi:id="_s7J3oCBGEey33dbookdebQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children" parentElementId="com.osgifx.console.ui.extensions.partstack" positionInList="index:16">
+    <elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ" elementId="com.osgifx.console.application.tab.roles" contributionURI="bundleclass://com.osgifx.console.ui.roles/com.osgifx.console.ui.roles.RolesFxUI" label="Roles" iconURI="platform:/plugin/com.osgifx.console.ui.roles/graphic/icons/roles.png" tooltip="Shows all available User Admin roles in the remote framework" closeable="true"/>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_gdcQYH-WEeyYfeV-7UqQeg" featurename="children" parentElementId="com.osgifx.console.application.menu.actions">
+    <elements xsi:type="menu:DirectMenuItem" xmi:id="_gdcQYX-WEeyYfeV-7UqQeg" elementId="com.osgifx.console.application.directmenuitem.create.role" label="Add New Role" iconURI="platform:/plugin/com.osgifx.console.ui.roles/graphic/icons/new-role.png" tooltip="Creates OSGi user admin role" contributionURI="bundleclass://com.osgifx.console.ui.roles/com.osgifx.console.ui.roles.handler.RoleCreateHandler"/>
+  </fragments>
 </fragment:ModelFragments>
diff --git a/com.osgifx.console.ui.search/_plugin.xml b/com.osgifx.console.ui.search/_plugin.xml
deleted file mode 100644
index eb57692c8..000000000
--- a/com.osgifx.console.ui.search/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.search">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.search/bnd.bnd b/com.osgifx.console.ui.search/bnd.bnd
index b67a79053..dc67fe224 100644
--- a/com.osgifx.console.ui.search/bnd.bnd
+++ b/com.osgifx.console.ui.search/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.services/_plugin.xml b/com.osgifx.console.ui.services/_plugin.xml
deleted file mode 100644
index b2c151e03..000000000
--- a/com.osgifx.console.ui.services/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.services">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.services/bnd.bnd b/com.osgifx.console.ui.services/bnd.bnd
index 6da868b55..9b9351f13 100644
--- a/com.osgifx.console.ui.services/bnd.bnd
+++ b/com.osgifx.console.ui.services/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.services/fragment.e4xmi b/com.osgifx.console.ui.services/fragment.e4xmi
index 4508911b9..aa7805917 100644
--- a/com.osgifx.console.ui.services/fragment.e4xmi
+++ b/com.osgifx.console.ui.services/fragment.e4xmi
@@ -1,33 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic"
-	xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment"
-	xmi:id="_s7J3oCBGEey33dbookdebQ">
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children"
-		parentElementId="com.osgifx.console.ui.extensions.partstack">
-		<elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ"
-			elementId="com.osgifx.console.application.tab.services"
-			contributionURI="bundleclass://com.osgifx.console.ui.services/com.osgifx.console.ui.services.ServicesFxUI"
-			label="Services"
-			iconURI="platform:/plugin/com.osgifx.console.ui.services/graphic/icons/services.png"
-			tooltip="Shows all registered services in the remote framework"
-			closeable="true" />
-	</fragments>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_s7J3oCBGEey33dbookdebQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children" parentElementId="com.osgifx.console.ui.extensions.partstack" positionInList="index:3">
+    <elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ" elementId="com.osgifx.console.application.tab.services" contributionURI="bundleclass://com.osgifx.console.ui.services/com.osgifx.console.ui.services.ServicesFxUI" label="Services" iconURI="platform:/plugin/com.osgifx.console.ui.services/graphic/icons/services.png" tooltip="Shows all registered services in the remote framework" closeable="true"/>
+  </fragments>
 </fragment:ModelFragments>
diff --git a/com.osgifx.console.ui.snapshot/.settings/org.eclipse.core.resources.prefs b/com.osgifx.console.ui.snapshot/.settings/org.eclipse.core.resources.prefs
index a72cbfafd..dcb28e6d1 100644
--- a/com.osgifx.console.ui.snapshot/.settings/org.eclipse.core.resources.prefs
+++ b/com.osgifx.console.ui.snapshot/.settings/org.eclipse.core.resources.prefs
@@ -2,6 +2,5 @@ eclipse.preferences.version=1
 encoding//fxml/tab-content.fxml=UTF-8
 encoding//graphic/icons/extension.png=UTF-8
 encoding/<project>=UTF-8
-encoding/_plugin.xml=UTF-8
 encoding/bnd.bnd=UTF-8
 encoding/fragment.e4xmi=UTF-8
diff --git a/com.osgifx.console.ui.snapshot/_plugin.xml b/com.osgifx.console.ui.snapshot/_plugin.xml
deleted file mode 100644
index a1ec80ac1..000000000
--- a/com.osgifx.console.ui.snapshot/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.snapshot">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
\ No newline at end of file
diff --git a/com.osgifx.console.ui.snapshot/bnd.bnd b/com.osgifx.console.ui.snapshot/bnd.bnd
index e5b329bef..f8ced13fb 100644
--- a/com.osgifx.console.ui.snapshot/bnd.bnd
+++ b/com.osgifx.console.ui.snapshot/bnd.bnd
@@ -1,7 +1,7 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -privatepackage     : com.osgifx.console.ui.snapshot*
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.terminal/_plugin.xml b/com.osgifx.console.ui.terminal/_plugin.xml
deleted file mode 100644
index 63731f9bc..000000000
--- a/com.osgifx.console.ui.terminal/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.terminal">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.terminal/bnd.bnd b/com.osgifx.console.ui.terminal/bnd.bnd
index f7459827c..d8d250d61 100644
--- a/com.osgifx.console.ui.terminal/bnd.bnd
+++ b/com.osgifx.console.ui.terminal/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.terminal/fragment.e4xmi b/com.osgifx.console.ui.terminal/fragment.e4xmi
index 030fccb83..c743e8d54 100644
--- a/com.osgifx.console.ui.terminal/fragment.e4xmi
+++ b/com.osgifx.console.ui.terminal/fragment.e4xmi
@@ -1,18 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic"
-	xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment"
-	xmi:id="_s7J3oCBGEey33dbookdebQ">
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children"
-		parentElementId="com.osgifx.console.ui.extensions.partstack">
-		<elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ"
-			elementId="com.osgifx.console.application.tab.terminal"
-			contributionURI="bundleclass://com.osgifx.console.ui.terminal/com.osgifx.console.ui.terminal.TerminalFxUI"
-			label="Terminal"
-			iconURI="platform:/plugin/com.osgifx.console.ui.terminal/graphic/icons/gogo.png"
-			tooltip="Executes terminal command (CLI) in the remote machine"
-			closeable="true" />
-	</fragments>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_s7J3oCBGEey33dbookdebQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children" parentElementId="com.osgifx.console.ui.extensions.partstack" positionInList="index:12">
+    <elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ" elementId="com.osgifx.console.application.tab.terminal" contributionURI="bundleclass://com.osgifx.console.ui.terminal/com.osgifx.console.ui.terminal.TerminalFxUI" label="Terminal" iconURI="platform:/plugin/com.osgifx.console.ui.terminal/graphic/icons/gogo.png" tooltip="Executes terminal command (CLI) in the remote machine" closeable="true"/>
+  </fragments>
 </fragment:ModelFragments>
diff --git a/com.osgifx.console.ui.threads/_plugin.xml b/com.osgifx.console.ui.threads/_plugin.xml
deleted file mode 100644
index ae9b44388..000000000
--- a/com.osgifx.console.ui.threads/_plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<plugin>
-	<extension point="org.eclipse.e4.workbench.model"
-		id="com.osgifx.console.ui.threads">
-		<fragment apply="always" uri="fragment.e4xmi">
-		</fragment>
-	</extension>
-</plugin>
diff --git a/com.osgifx.console.ui.threads/bnd.bnd b/com.osgifx.console.ui.threads/bnd.bnd
index 4b5ab0d9e..69167e601 100644
--- a/com.osgifx.console.ui.threads/bnd.bnd
+++ b/com.osgifx.console.ui.threads/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName : ${p}; singleton:=true
+Model-Fragment: fragment.e4xmi;apply=always
 -includeresource    : \
-                      plugin.xml = _plugin.xml,\
 					  fragment.e4xmi = fragment.e4xmi,\
 					  css = css,\
 					  fxml = fxml,\
diff --git a/com.osgifx.console.ui.threads/fragment.e4xmi b/com.osgifx.console.ui.threads/fragment.e4xmi
index ed7b42690..493551f7f 100644
--- a/com.osgifx.console.ui.threads/fragment.e4xmi
+++ b/com.osgifx.console.ui.threads/fragment.e4xmi
@@ -1,33 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<!--
-  Copyright 2021-2024 Amit Kumar Mondal
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.  You may obtain a copy
-  of the License at
-  
-    http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-  License for the specific language governing permissions and limitations under
-  the License.
--->
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic"
-	xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment"
-	xmi:id="_s7J3oCBGEey33dbookdebQ">
-	<fragments xsi:type="fragment:StringModelFragment"
-		xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children"
-		parentElementId="com.osgifx.console.ui.extensions.partstack">
-		<elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ"
-			elementId="com.osgifx.console.application.tab.threads"
-			contributionURI="bundleclass://com.osgifx.console.ui.threads/com.osgifx.console.ui.threads.ThreadsFxUI"
-			label="Threads"
-			iconURI="platform:/plugin/com.osgifx.console.ui.threads/graphic/icons/threads.png"
-			tooltip="Shows all available threads in the remote framework"
-			closeable="true" />
-	</fragments>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_s7J3oCBGEey33dbookdebQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_s7J3oSBGEey33dbookdebQ" featurename="children" parentElementId="com.osgifx.console.ui.extensions.partstack" positionInList="index:9">
+    <elements xsi:type="basic:Part" xmi:id="_s7J3oiBGEey33dbookdebQ" elementId="com.osgifx.console.application.tab.threads" contributionURI="bundleclass://com.osgifx.console.ui.threads/com.osgifx.console.ui.threads.ThreadsFxUI" label="Threads" iconURI="platform:/plugin/com.osgifx.console.ui.threads/graphic/icons/threads.png" tooltip="Shows all available threads in the remote framework" closeable="true"/>
+  </fragments>
 </fragment:ModelFragments>