diff --git a/bundles/org.eclipse.passage.lic.api/pom.xml b/bundles/org.eclipse.passage.lic.api/pom.xml
new file mode 100644
index 000000000..95fc98b13
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.api/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2021 ArSysOp
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	https://www.eclipse.org/legal/epl-2.0/.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>org.eclipse.passage.lic.api</artifactId>
+	<version>2.1.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+
+	<parent>
+		<groupId>org.eclipse.passage</groupId>
+		<artifactId>org.eclipse.passage.bundles</artifactId>
+		<version>2.1.0-SNAPSHOT</version>
+	</parent>
+
+</project>
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.base/pom.xml b/bundles/org.eclipse.passage.lic.base/pom.xml
new file mode 100644
index 000000000..21ccb9811
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.base/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2021 ArSysOp
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	https://www.eclipse.org/legal/epl-2.0/.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>org.eclipse.passage.lic.base</artifactId>
+	<version>2.1.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+
+	<parent>
+		<groupId>org.eclipse.passage</groupId>
+		<artifactId>org.eclipse.passage.bundles</artifactId>
+		<version>2.1.0-SNAPSHOT</version>
+	</parent>
+
+</project>
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.bc/pom.xml b/bundles/org.eclipse.passage.lic.bc/pom.xml
new file mode 100644
index 000000000..7137d40a5
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.bc/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2021 ArSysOp
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	https://www.eclipse.org/legal/epl-2.0/.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>org.eclipse.passage.lic.bc</artifactId>
+	<version>1.1.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+
+	<parent>
+		<groupId>org.eclipse.passage</groupId>
+		<artifactId>org.eclipse.passage.bundles</artifactId>
+		<version>2.1.0-SNAPSHOT</version>
+	</parent>
+
+</project>
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.equinox/pom.xml b/bundles/org.eclipse.passage.lic.equinox/pom.xml
new file mode 100644
index 000000000..99853420f
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.equinox/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2021 ArSysOp
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	https://www.eclipse.org/legal/epl-2.0/.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>org.eclipse.passage.lic.equinox</artifactId>
+	<version>2.1.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+
+	<parent>
+		<groupId>org.eclipse.passage</groupId>
+		<artifactId>org.eclipse.passage.bundles</artifactId>
+		<version>2.1.0-SNAPSHOT</version>
+	</parent>
+
+</project>
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.execute/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.execute/META-INF/MANIFEST.MF
index f3d56f586..59f079c43 100644
--- a/bundles/org.eclipse.passage.lic.execute/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.execute/META-INF/MANIFEST.MF
@@ -15,6 +15,7 @@ Require-Bundle: org.apache.logging.log4j;bundle-version="2.8.2",
  org.eclipse.passage.lic.bc;bundle-version="0.0.0",
  org.eclipse.passage.lic.equinox;bundle-version="0.0.0",
  org.eclipse.passage.lic.hc;bundle-version="0.0.0",
+ org.eclipse.passage.lic.licenses;bundle-version="0.0.0",
  org.eclipse.passage.lic.licenses.model;bundle-version="0.0.0",
  org.eclipse.passage.lic.oshi;bundle-version="0.0.0"
 Export-Package: org.eclipse.passage.lic.execute
diff --git a/bundles/org.eclipse.passage.lic.execute/pom.xml b/bundles/org.eclipse.passage.lic.execute/pom.xml
new file mode 100644
index 000000000..06ca4ef48
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.execute/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2021 ArSysOp
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	https://www.eclipse.org/legal/epl-2.0/.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>org.eclipse.passage.lic.execute</artifactId>
+	<version>2.1.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+
+	<parent>
+		<groupId>org.eclipse.passage</groupId>
+		<artifactId>org.eclipse.passage.bundles</artifactId>
+		<version>2.1.0-SNAPSHOT</version>
+	</parent>
+
+</project>
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.hc/pom.xml b/bundles/org.eclipse.passage.lic.hc/pom.xml
new file mode 100644
index 000000000..b3ad8f316
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.hc/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2021 ArSysOp
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	https://www.eclipse.org/legal/epl-2.0/.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>org.eclipse.passage.lic.hc</artifactId>
+	<version>1.1.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+
+	<parent>
+		<groupId>org.eclipse.passage</groupId>
+		<artifactId>org.eclipse.passage.bundles</artifactId>
+		<version>2.1.0-SNAPSHOT</version>
+	</parent>
+
+</project>
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.licenses.model/pom.xml b/bundles/org.eclipse.passage.lic.licenses.model/pom.xml
new file mode 100644
index 000000000..e45890a5f
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.licenses.model/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2021 ArSysOp
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	https://www.eclipse.org/legal/epl-2.0/.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>org.eclipse.passage.lic.licenses.model</artifactId>
+	<version>2.1.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+
+	<parent>
+		<groupId>org.eclipse.passage</groupId>
+		<artifactId>org.eclipse.passage.bundles</artifactId>
+		<version>2.1.0-SNAPSHOT</version>
+	</parent>
+
+</project>
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.licenses/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.licenses/META-INF/MANIFEST.MF
index f2fa7f23a..09d5a7222 100644
--- a/bundles/org.eclipse.passage.lic.licenses/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.licenses/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Automatic-Module-Name: org.eclipse.passage.lic.licenses
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.passage.lic.licenses
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
diff --git a/bundles/org.eclipse.passage.lic.licenses/pom.xml b/bundles/org.eclipse.passage.lic.licenses/pom.xml
new file mode 100644
index 000000000..bd85abbd0
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.licenses/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2021 ArSysOp
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	https://www.eclipse.org/legal/epl-2.0/.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>org.eclipse.passage.lic.licenses</artifactId>
+	<version>2.1.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+
+	<parent>
+		<groupId>org.eclipse.passage</groupId>
+		<artifactId>org.eclipse.passage.bundles</artifactId>
+		<version>2.1.0-SNAPSHOT</version>
+	</parent>
+
+</project>
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.oshi/pom.xml b/bundles/org.eclipse.passage.lic.oshi/pom.xml
new file mode 100644
index 000000000..69d8179ee
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.oshi/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2021 ArSysOp
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	https://www.eclipse.org/legal/epl-2.0/.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		ArSysOp - initial API and implementation
+-->
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>org.eclipse.passage.lic.oshi</artifactId>
+	<version>1.1.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+
+	<parent>
+		<groupId>org.eclipse.passage</groupId>
+		<artifactId>org.eclipse.passage.bundles</artifactId>
+		<version>2.1.0-SNAPSHOT</version>
+	</parent>
+
+</project>
\ No newline at end of file
diff --git a/bundles/pom.xml b/bundles/pom.xml
index fb4e98fcb..9ff7d2f7b 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -18,7 +18,7 @@
 >
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>org.eclipse.passage.lic.bundles</artifactId>
+	<artifactId>org.eclipse.passage.bundles</artifactId>
 	<packaging>pom</packaging>
 
 	<parent>