diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9e5b75ebcdc2..fd19b75f4ac9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -583,11 +583,11 @@ jobs:
       - name: ide/db.sql.editor
         run: ant $OPTS -f ide/db.sql.editor test
 
-      - name: ide/docker.api
-        run: ant $OPTS -f ide/docker.api test
+      - name: devops/docker.api
+        run: ant $OPTS -f devops/docker.api test
 
-      - name: ide/docker.ui
-        run: ant $OPTS -f ide/docker.ui test
+      - name: devops/docker.ui
+        run: ant $OPTS -f devops/docker.ui test
 
       - name: ide/editor.bookmarks
         run: ant $OPTS -f ide/editor.bookmarks test
diff --git a/devops/devops.kit/build.xml b/devops/devops.kit/build.xml
new file mode 100644
index 000000000000..7649694237e7
--- /dev/null
+++ b/devops/devops.kit/build.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
+<project basedir="." default="build" name="devops/devops.kit">
+    <description>Builds, tests, and runs the project org.netbeans.modules.devops.kit</description>
+    <import file="../../nbbuild/templates/projectized.xml"/>
+</project>
diff --git a/devops/devops.kit/manifest.mf b/devops/devops.kit/manifest.mf
new file mode 100644
index 000000000000..372bebc9f027
--- /dev/null
+++ b/devops/devops.kit/manifest.mf
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: true
+OpenIDE-Module: org.netbeans.modules.devops.kit
+OpenIDE-Module-Display-Category: DevOps
+OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/devops/kit/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.0
+
diff --git a/devops/devops.kit/nbproject/project.properties b/devops/devops.kit/nbproject/project.properties
new file mode 100644
index 000000000000..4ee60455ff59
--- /dev/null
+++ b/devops/devops.kit/nbproject/project.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+javac.compilerargs=-Xlint -Xlint:-serial
+javac.release=17
diff --git a/devops/devops.kit/nbproject/project.xml b/devops/devops.kit/nbproject/project.xml
new file mode 100644
index 000000000000..94bdf30103e0
--- /dev/null
+++ b/devops/devops.kit/nbproject/project.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
+            <code-name-base>org.netbeans.modules.devops.kit</code-name-base>
+            <module-dependencies>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.docker.ui</code-name-base>
+                    <run-dependency>
+                        <release-version>0</release-version>
+                        <specification-version>1.27</specification-version>
+                    </run-dependency>
+                </dependency>
+            </module-dependencies>
+            <public-packages/>
+        </data>
+    </configuration>
+</project>
diff --git a/devops/devops.kit/src/org/netbeans/modules/devops/kit/Bundle.properties b/devops/devops.kit/src/org/netbeans/modules/devops/kit/Bundle.properties
new file mode 100644
index 000000000000..ab73b7b6d437
--- /dev/null
+++ b/devops/devops.kit/src/org/netbeans/modules/devops/kit/Bundle.properties
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+OpenIDE-Module-Display-Category=DevOps Toolbox
+OpenIDE-Module-Long-Description=\
+    Docker Service integration
+OpenIDE-Module-Name=DevOps Toolbox
+OpenIDE-Module-Short-Description=DevOps Support for Infrastructure as Code Development.
diff --git a/ide/docker.api/build.xml b/devops/docker.api/build.xml
similarity index 94%
rename from ide/docker.api/build.xml
rename to devops/docker.api/build.xml
index c2db6962df37..0a5f4b3c85b4 100644
--- a/ide/docker.api/build.xml
+++ b/devops/docker.api/build.xml
@@ -20,7 +20,7 @@
 
 -->
 
-<project basedir="." default="build" name="ide/docker.api">
+<project basedir="." default="build" name="devops/docker.api">
     <description>Builds, tests, and runs the project org.netbeans.modules.docker.api</description>
     <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/ide/docker.api/manifest.mf b/devops/docker.api/manifest.mf
similarity index 100%
rename from ide/docker.api/manifest.mf
rename to devops/docker.api/manifest.mf
diff --git a/ide/docker.api/nbproject/org-netbeans-modules-docker-api.sig b/devops/docker.api/nbproject/org-netbeans-modules-docker-api.sig
similarity index 100%
rename from ide/docker.api/nbproject/org-netbeans-modules-docker-api.sig
rename to devops/docker.api/nbproject/org-netbeans-modules-docker-api.sig
diff --git a/ide/docker.api/nbproject/project.properties b/devops/docker.api/nbproject/project.properties
similarity index 100%
rename from ide/docker.api/nbproject/project.properties
rename to devops/docker.api/nbproject/project.properties
diff --git a/ide/docker.api/nbproject/project.xml b/devops/docker.api/nbproject/project.xml
similarity index 100%
rename from ide/docker.api/nbproject/project.xml
rename to devops/docker.api/nbproject/project.xml
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/ChunkedInputStream.java b/devops/docker.api/src/org/netbeans/modules/docker/ChunkedInputStream.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/ChunkedInputStream.java
rename to devops/docker.api/src/org/netbeans/modules/docker/ChunkedInputStream.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/ChunkedOutputStream.java b/devops/docker.api/src/org/netbeans/modules/docker/ChunkedOutputStream.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/ChunkedOutputStream.java
rename to devops/docker.api/src/org/netbeans/modules/docker/ChunkedOutputStream.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/ConnectionListener.java b/devops/docker.api/src/org/netbeans/modules/docker/ConnectionListener.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/ConnectionListener.java
rename to devops/docker.api/src/org/netbeans/modules/docker/ConnectionListener.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/Demuxer.java b/devops/docker.api/src/org/netbeans/modules/docker/Demuxer.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/Demuxer.java
rename to devops/docker.api/src/org/netbeans/modules/docker/Demuxer.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/DirectStreamResult.java b/devops/docker.api/src/org/netbeans/modules/docker/DirectStreamResult.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/DirectStreamResult.java
rename to devops/docker.api/src/org/netbeans/modules/docker/DirectStreamResult.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/DockerActionAccessor.java b/devops/docker.api/src/org/netbeans/modules/docker/DockerActionAccessor.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/DockerActionAccessor.java
rename to devops/docker.api/src/org/netbeans/modules/docker/DockerActionAccessor.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/DockerConfig.java b/devops/docker.api/src/org/netbeans/modules/docker/DockerConfig.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/DockerConfig.java
rename to devops/docker.api/src/org/netbeans/modules/docker/DockerConfig.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/DockerEventBus.java b/devops/docker.api/src/org/netbeans/modules/docker/DockerEventBus.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/DockerEventBus.java
rename to devops/docker.api/src/org/netbeans/modules/docker/DockerEventBus.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/DockerRemoteException.java b/devops/docker.api/src/org/netbeans/modules/docker/DockerRemoteException.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/DockerRemoteException.java
rename to devops/docker.api/src/org/netbeans/modules/docker/DockerRemoteException.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/DockerUtils.java b/devops/docker.api/src/org/netbeans/modules/docker/DockerUtils.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/DockerUtils.java
rename to devops/docker.api/src/org/netbeans/modules/docker/DockerUtils.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/Endpoint.java b/devops/docker.api/src/org/netbeans/modules/docker/Endpoint.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/Endpoint.java
rename to devops/docker.api/src/org/netbeans/modules/docker/Endpoint.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/FolderUploader.java b/devops/docker.api/src/org/netbeans/modules/docker/FolderUploader.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/FolderUploader.java
rename to devops/docker.api/src/org/netbeans/modules/docker/FolderUploader.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/HttpUtils.java b/devops/docker.api/src/org/netbeans/modules/docker/HttpUtils.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/HttpUtils.java
rename to devops/docker.api/src/org/netbeans/modules/docker/HttpUtils.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/IgnoreFileFilter.java b/devops/docker.api/src/org/netbeans/modules/docker/IgnoreFileFilter.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/IgnoreFileFilter.java
rename to devops/docker.api/src/org/netbeans/modules/docker/IgnoreFileFilter.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/IgnorePattern.java b/devops/docker.api/src/org/netbeans/modules/docker/IgnorePattern.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/IgnorePattern.java
rename to devops/docker.api/src/org/netbeans/modules/docker/IgnorePattern.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/MuxedStreamResult.java b/devops/docker.api/src/org/netbeans/modules/docker/MuxedStreamResult.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/MuxedStreamResult.java
rename to devops/docker.api/src/org/netbeans/modules/docker/MuxedStreamResult.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/StreamItem.java b/devops/docker.api/src/org/netbeans/modules/docker/StreamItem.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/StreamItem.java
rename to devops/docker.api/src/org/netbeans/modules/docker/StreamItem.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/StreamResult.java b/devops/docker.api/src/org/netbeans/modules/docker/StreamResult.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/StreamResult.java
rename to devops/docker.api/src/org/netbeans/modules/docker/StreamResult.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/ActionChunkedResult.java b/devops/docker.api/src/org/netbeans/modules/docker/api/ActionChunkedResult.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/ActionChunkedResult.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/ActionChunkedResult.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/ActionStreamResult.java b/devops/docker.api/src/org/netbeans/modules/docker/api/ActionStreamResult.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/ActionStreamResult.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/ActionStreamResult.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/BuildEvent.java b/devops/docker.api/src/org/netbeans/modules/docker/api/BuildEvent.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/BuildEvent.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/BuildEvent.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/Credentials.java b/devops/docker.api/src/org/netbeans/modules/docker/api/Credentials.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/Credentials.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/Credentials.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/CredentialsManager.java b/devops/docker.api/src/org/netbeans/modules/docker/api/CredentialsManager.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/CredentialsManager.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/CredentialsManager.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerAction.java b/devops/docker.api/src/org/netbeans/modules/docker/api/DockerAction.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/DockerAction.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/DockerAction.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerAuthenticationException.java b/devops/docker.api/src/org/netbeans/modules/docker/api/DockerAuthenticationException.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/DockerAuthenticationException.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/DockerAuthenticationException.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerConflictException.java b/devops/docker.api/src/org/netbeans/modules/docker/api/DockerConflictException.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/DockerConflictException.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/DockerConflictException.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerContainer.java b/devops/docker.api/src/org/netbeans/modules/docker/api/DockerContainer.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/DockerContainer.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/DockerContainer.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerContainerDetail.java b/devops/docker.api/src/org/netbeans/modules/docker/api/DockerContainerDetail.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/DockerContainerDetail.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/DockerContainerDetail.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerEntity.java b/devops/docker.api/src/org/netbeans/modules/docker/api/DockerEntity.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/DockerEntity.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/DockerEntity.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerEntityType.java b/devops/docker.api/src/org/netbeans/modules/docker/api/DockerEntityType.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/DockerEntityType.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/DockerEntityType.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerEvent.java b/devops/docker.api/src/org/netbeans/modules/docker/api/DockerEvent.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/DockerEvent.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/DockerEvent.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerException.java b/devops/docker.api/src/org/netbeans/modules/docker/api/DockerException.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/DockerException.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/DockerException.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerImage.java b/devops/docker.api/src/org/netbeans/modules/docker/api/DockerImage.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/DockerImage.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/DockerImage.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerImageDetail.java b/devops/docker.api/src/org/netbeans/modules/docker/api/DockerImageDetail.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/DockerImageDetail.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/DockerImageDetail.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerInstance.java b/devops/docker.api/src/org/netbeans/modules/docker/api/DockerInstance.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/DockerInstance.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/DockerInstance.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerInstanceEntity.java b/devops/docker.api/src/org/netbeans/modules/docker/api/DockerInstanceEntity.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/DockerInstanceEntity.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/DockerInstanceEntity.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerName.java b/devops/docker.api/src/org/netbeans/modules/docker/api/DockerName.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/DockerName.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/DockerName.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerRegistryImage.java b/devops/docker.api/src/org/netbeans/modules/docker/api/DockerRegistryImage.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/DockerRegistryImage.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/DockerRegistryImage.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerSupport.java b/devops/docker.api/src/org/netbeans/modules/docker/api/DockerSupport.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/DockerSupport.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/DockerSupport.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerTag.java b/devops/docker.api/src/org/netbeans/modules/docker/api/DockerTag.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/DockerTag.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/DockerTag.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerfileDetail.java b/devops/docker.api/src/org/netbeans/modules/docker/api/DockerfileDetail.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/DockerfileDetail.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/DockerfileDetail.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/ExposedPort.java b/devops/docker.api/src/org/netbeans/modules/docker/api/ExposedPort.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/ExposedPort.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/ExposedPort.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/PortMapping.java b/devops/docker.api/src/org/netbeans/modules/docker/api/PortMapping.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/PortMapping.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/PortMapping.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/StatusEvent.java b/devops/docker.api/src/org/netbeans/modules/docker/api/StatusEvent.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/api/StatusEvent.java
rename to devops/docker.api/src/org/netbeans/modules/docker/api/StatusEvent.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/resources/Bundle.properties b/devops/docker.api/src/org/netbeans/modules/docker/resources/Bundle.properties
similarity index 95%
rename from ide/docker.api/src/org/netbeans/modules/docker/resources/Bundle.properties
rename to devops/docker.api/src/org/netbeans/modules/docker/resources/Bundle.properties
index 8cb843d998c7..587e1a79f44c 100644
--- a/ide/docker.api/src/org/netbeans/modules/docker/resources/Bundle.properties
+++ b/devops/docker.api/src/org/netbeans/modules/docker/resources/Bundle.properties
@@ -18,6 +18,6 @@
 #
 
 OpenIDE-Module-Name=Docker API
-OpenIDE-Module-Display-Category=Base IDE
+OpenIDE-Module-Display-Category=DevOps Toolbox
 OpenIDE-Module-Short-Description=Provides Docker API.
 OpenIDE-Module-Long-Description=Provides the API for management of Docker from the IDE.
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/tls/Asn1Object.java b/devops/docker.api/src/org/netbeans/modules/docker/tls/Asn1Object.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/tls/Asn1Object.java
rename to devops/docker.api/src/org/netbeans/modules/docker/tls/Asn1Object.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/tls/ContextProvider.java b/devops/docker.api/src/org/netbeans/modules/docker/tls/ContextProvider.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/tls/ContextProvider.java
rename to devops/docker.api/src/org/netbeans/modules/docker/tls/ContextProvider.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/tls/DerParser.java b/devops/docker.api/src/org/netbeans/modules/docker/tls/DerParser.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/tls/DerParser.java
rename to devops/docker.api/src/org/netbeans/modules/docker/tls/DerParser.java
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/tls/PrivateKeyParser.java b/devops/docker.api/src/org/netbeans/modules/docker/tls/PrivateKeyParser.java
similarity index 100%
rename from ide/docker.api/src/org/netbeans/modules/docker/tls/PrivateKeyParser.java
rename to devops/docker.api/src/org/netbeans/modules/docker/tls/PrivateKeyParser.java
diff --git a/ide/docker.api/test/unit/src/org/netbeans/modules/docker/ChunkedInputStreamTest.java b/devops/docker.api/test/unit/src/org/netbeans/modules/docker/ChunkedInputStreamTest.java
similarity index 100%
rename from ide/docker.api/test/unit/src/org/netbeans/modules/docker/ChunkedInputStreamTest.java
rename to devops/docker.api/test/unit/src/org/netbeans/modules/docker/ChunkedInputStreamTest.java
diff --git a/ide/docker.api/test/unit/src/org/netbeans/modules/docker/IgnorePatternTest.java b/devops/docker.api/test/unit/src/org/netbeans/modules/docker/IgnorePatternTest.java
similarity index 100%
rename from ide/docker.api/test/unit/src/org/netbeans/modules/docker/IgnorePatternTest.java
rename to devops/docker.api/test/unit/src/org/netbeans/modules/docker/IgnorePatternTest.java
diff --git a/ide/docker.ui/build.xml b/devops/docker.ui/build.xml
similarity index 94%
rename from ide/docker.ui/build.xml
rename to devops/docker.ui/build.xml
index 9f72cb154bf4..670086f971ab 100644
--- a/ide/docker.ui/build.xml
+++ b/devops/docker.ui/build.xml
@@ -20,7 +20,7 @@
 
 -->
 
-<project basedir="." default="build" name="ide/docker.ui">
+<project basedir="." default="build" name="devops/docker.ui">
     <description>Builds, tests, and runs the project org.netbeans.modules.docker.ui</description>
     <import file="../../nbbuild/templates/projectized.xml"/>
 </project>
diff --git a/ide/docker.ui/licenseinfo.xml b/devops/docker.ui/licenseinfo.xml
similarity index 100%
rename from ide/docker.ui/licenseinfo.xml
rename to devops/docker.ui/licenseinfo.xml
diff --git a/ide/docker.ui/manifest.mf b/devops/docker.ui/manifest.mf
similarity index 100%
rename from ide/docker.ui/manifest.mf
rename to devops/docker.ui/manifest.mf
diff --git a/ide/docker.ui/nbproject/project.properties b/devops/docker.ui/nbproject/project.properties
similarity index 100%
rename from ide/docker.ui/nbproject/project.properties
rename to devops/docker.ui/nbproject/project.properties
diff --git a/ide/docker.ui/nbproject/project.xml b/devops/docker.ui/nbproject/project.xml
similarity index 100%
rename from ide/docker.ui/nbproject/project.xml
rename to devops/docker.ui/nbproject/project.xml
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/JsonFormattingWriter.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/JsonFormattingWriter.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/JsonFormattingWriter.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/JsonFormattingWriter.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/UiUtils.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/UiUtils.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/UiUtils.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/UiUtils.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/Validations.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/Validations.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/Validations.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/Validations.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildActionListener.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildActionListener.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildActionListener.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildActionListener.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildContextPanel.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildContextPanel.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildContextPanel.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildContextPanel.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildContextVisual.form b/devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildContextVisual.form
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildContextVisual.form
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildContextVisual.form
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildContextVisual.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildContextVisual.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildContextVisual.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildContextVisual.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildImageAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildImageAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildImageAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildImageAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildImageWizard.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildImageWizard.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildImageWizard.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildImageWizard.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildInstancePanel.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildInstancePanel.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildInstancePanel.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildInstancePanel.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildInstanceVisual.form b/devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildInstanceVisual.form
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildInstanceVisual.form
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildInstanceVisual.form
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildInstanceVisual.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildInstanceVisual.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildInstanceVisual.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildInstanceVisual.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildOptionsPanel.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildOptionsPanel.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildOptionsPanel.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildOptionsPanel.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildOptionsVisual.form b/devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildOptionsVisual.form
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildOptionsVisual.form
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildOptionsVisual.form
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildOptionsVisual.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildOptionsVisual.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildOptionsVisual.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildOptionsVisual.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildTask.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildTask.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildTask.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildTask.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/Bundle.properties b/devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/Bundle.properties
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/Bundle.properties
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/Bundle.properties
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/InputOutputCache.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/InputOutputCache.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/InputOutputCache.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/build2/InputOutputCache.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/commit/Bundle.properties b/devops/docker.ui/src/org/netbeans/modules/docker/ui/commit/Bundle.properties
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/commit/Bundle.properties
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/commit/Bundle.properties
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/commit/CommitContainerAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/commit/CommitContainerAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/commit/CommitContainerAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/commit/CommitContainerAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/commit/CommitPanel.form b/devops/docker.ui/src/org/netbeans/modules/docker/ui/commit/CommitPanel.form
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/commit/CommitPanel.form
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/commit/CommitPanel.form
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/commit/CommitPanel.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/commit/CommitPanel.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/commit/CommitPanel.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/commit/CommitPanel.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/credentials/Bundle.properties b/devops/docker.ui/src/org/netbeans/modules/docker/ui/credentials/Bundle.properties
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/credentials/Bundle.properties
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/credentials/Bundle.properties
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsListPanel.form b/devops/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsListPanel.form
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsListPanel.form
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsListPanel.form
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsListPanel.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsListPanel.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsListPanel.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsListPanel.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsPanel.form b/devops/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsPanel.form
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsPanel.form
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsPanel.form
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsPanel.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsPanel.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsPanel.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsPanel.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsUtils.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsUtils.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsUtils.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/credentials/CredentialsUtils.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/AbstractContainerAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/AbstractContainerAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/AbstractContainerAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/AbstractContainerAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/AttachContainerAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/AttachContainerAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/AttachContainerAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/AttachContainerAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/Bundle.properties b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/Bundle.properties
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/Bundle.properties
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/Bundle.properties
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/CopyIdAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/CopyIdAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/CopyIdAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/CopyIdAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerChildFactory.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerChildFactory.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerChildFactory.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerChildFactory.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerContainerNode.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerContainerNode.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerContainerNode.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerContainerNode.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerContainersChildFactory.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerContainersChildFactory.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerContainersChildFactory.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerContainersChildFactory.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerContainersNode.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerContainersNode.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerContainersNode.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerContainersNode.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerImagesChildFactory.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerImagesChildFactory.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerImagesChildFactory.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerImagesChildFactory.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerImagesNode.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerImagesNode.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerImagesNode.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerImagesNode.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerInstanceChildFactory.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerInstanceChildFactory.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerInstanceChildFactory.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerInstanceChildFactory.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerInstanceNode.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerInstanceNode.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerInstanceNode.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerInstanceNode.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerNode.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerNode.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerNode.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerNode.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerTagNode.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerTagNode.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerTagNode.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/DockerTagNode.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/GetPortMappingsAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/GetPortMappingsAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/GetPortMappingsAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/GetPortMappingsAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/InspectContainerAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/InspectContainerAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/InspectContainerAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/InspectContainerAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/NodeClosingFactory.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/NodeClosingFactory.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/NodeClosingFactory.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/NodeClosingFactory.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/PauseContainerAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/PauseContainerAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/PauseContainerAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/PauseContainerAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/ProcessListAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/ProcessListAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/ProcessListAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/ProcessListAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/PushTagAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/PushTagAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/PushTagAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/PushTagAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/RefreshAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/RefreshAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/RefreshAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/RefreshAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/Refreshable.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/Refreshable.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/Refreshable.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/Refreshable.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/RemoveContainerAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/RemoveContainerAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/RemoveContainerAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/RemoveContainerAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/RemoveInstanceAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/RemoveInstanceAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/RemoveInstanceAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/RemoveInstanceAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/RemoveTagAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/RemoveTagAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/RemoveTagAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/RemoveTagAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/ShowLogAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/ShowLogAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/ShowLogAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/ShowLogAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/StartContainerAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/StartContainerAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/StartContainerAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/StartContainerAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/StatefulDockerContainer.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/StatefulDockerContainer.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/StatefulDockerContainer.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/StatefulDockerContainer.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/StatefulDockerInstance.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/StatefulDockerInstance.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/StatefulDockerInstance.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/StatefulDockerInstance.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/StopContainerAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/StopContainerAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/StopContainerAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/StopContainerAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/UnpauseContainerAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/UnpauseContainerAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/UnpauseContainerAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/UnpauseContainerAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/ViewPortBindingsPanel.form b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/ViewPortBindingsPanel.form
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/ViewPortBindingsPanel.form
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/ViewPortBindingsPanel.form
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/ViewPortBindingsPanel.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/node/ViewPortBindingsPanel.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/node/ViewPortBindingsPanel.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/node/ViewPortBindingsPanel.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/output/ChunkedResultOutputTask.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/output/ChunkedResultOutputTask.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/output/ChunkedResultOutputTask.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/output/ChunkedResultOutputTask.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/output/ExceptionHandler.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/output/ExceptionHandler.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/output/ExceptionHandler.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/output/ExceptionHandler.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/output/OutputUtils.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/output/OutputUtils.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/output/OutputUtils.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/output/OutputUtils.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/output/StatusOutputListener.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/output/StatusOutputListener.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/output/StatusOutputListener.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/output/StatusOutputListener.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/output/TerminalInputStream.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/output/TerminalInputStream.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/output/TerminalInputStream.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/output/TerminalInputStream.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/output/TerminalOptionsAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/output/TerminalOptionsAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/output/TerminalOptionsAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/output/TerminalOptionsAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/output/TerminalResizeListener.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/output/TerminalResizeListener.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/output/TerminalResizeListener.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/output/TerminalResizeListener.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/pull/Bundle.properties b/devops/docker.ui/src/org/netbeans/modules/docker/ui/pull/Bundle.properties
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/pull/Bundle.properties
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/pull/Bundle.properties
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/pull/DockerHubImageItem.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/pull/DockerHubImageItem.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/pull/DockerHubImageItem.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/pull/DockerHubImageItem.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/pull/DockerHubSearchPanel.form b/devops/docker.ui/src/org/netbeans/modules/docker/ui/pull/DockerHubSearchPanel.form
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/pull/DockerHubSearchPanel.form
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/pull/DockerHubSearchPanel.form
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/pull/DockerHubSearchPanel.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/pull/DockerHubSearchPanel.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/pull/DockerHubSearchPanel.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/pull/DockerHubSearchPanel.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/pull/PullImageAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/pull/PullImageAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/pull/PullImageAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/pull/PullImageAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/rename/Bundle.properties b/devops/docker.ui/src/org/netbeans/modules/docker/ui/rename/Bundle.properties
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/rename/Bundle.properties
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/rename/Bundle.properties
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/rename/RenameContainerAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/rename/RenameContainerAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/rename/RenameContainerAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/rename/RenameContainerAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/rename/RenamePanel.form b/devops/docker.ui/src/org/netbeans/modules/docker/ui/rename/RenamePanel.form
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/rename/RenamePanel.form
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/rename/RenamePanel.form
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/rename/RenamePanel.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/rename/RenamePanel.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/rename/RenamePanel.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/rename/RenamePanel.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/Bundle.properties b/devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/Bundle.properties
similarity index 95%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/Bundle.properties
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/Bundle.properties
index f82b430b49d4..78576228270e 100644
--- a/ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/Bundle.properties
+++ b/devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/Bundle.properties
@@ -18,6 +18,6 @@
 #
 
 OpenIDE-Module-Name=Docker UI
-OpenIDE-Module-Display-Category=Base IDE
+OpenIDE-Module-Display-Category=DevOps Toolbox
 OpenIDE-Module-Short-Description=Provides Docker UI integration.
 OpenIDE-Module-Long-Description=Provides UI widgets for management of the Docker from the IDE.
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/action_rerun.png b/devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/action_rerun.png
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/action_rerun.png
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/action_rerun.png
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/action_rerun.svg b/devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/action_rerun.svg
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/action_rerun.svg
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/action_rerun.svg
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/action_stop.png b/devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/action_stop.png
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/action_stop.png
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/action_stop.png
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/action_stop.svg b/devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/action_stop.svg
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/action_stop.svg
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/action_stop.svg
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/badge_paused.png b/devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/badge_paused.png
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/badge_paused.png
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/badge_paused.png
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/badge_running.png b/devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/badge_running.png
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/badge_running.png
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/badge_running.png
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/badge_running.svg b/devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/badge_running.svg
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/badge_running.svg
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/badge_running.svg
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/docker_image.png b/devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/docker_image.png
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/docker_image.png
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/docker_image.png
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/docker_instance.png b/devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/docker_instance.png
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/docker_instance.png
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/docker_instance.png
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/docker_root.png b/devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/docker_root.png
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/docker_root.png
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/docker_root.png
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/terminal_options.png b/devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/terminal_options.png
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/terminal_options.png
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/terminal_options.png
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/run/Bundle.properties b/devops/docker.ui/src/org/netbeans/modules/docker/ui/run/Bundle.properties
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/run/Bundle.properties
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/run/Bundle.properties
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/run/RunContainerPropertiesPanel.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/run/RunContainerPropertiesPanel.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/run/RunContainerPropertiesPanel.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/run/RunContainerPropertiesPanel.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/run/RunContainerPropertiesVisual.form b/devops/docker.ui/src/org/netbeans/modules/docker/ui/run/RunContainerPropertiesVisual.form
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/run/RunContainerPropertiesVisual.form
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/run/RunContainerPropertiesVisual.form
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/run/RunContainerPropertiesVisual.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/run/RunContainerPropertiesVisual.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/run/RunContainerPropertiesVisual.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/run/RunContainerPropertiesVisual.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/run/RunPortBindingsPanel.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/run/RunPortBindingsPanel.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/run/RunPortBindingsPanel.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/run/RunPortBindingsPanel.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/run/RunPortBindingsVisual.form b/devops/docker.ui/src/org/netbeans/modules/docker/ui/run/RunPortBindingsVisual.form
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/run/RunPortBindingsVisual.form
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/run/RunPortBindingsVisual.form
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/run/RunPortBindingsVisual.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/run/RunPortBindingsVisual.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/run/RunPortBindingsVisual.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/run/RunPortBindingsVisual.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/run/RunTagAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/run/RunTagAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/run/RunTagAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/run/RunTagAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/run/RunTagWizard.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/run/RunTagWizard.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/run/RunTagWizard.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/run/RunTagWizard.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/tag/Bundle.properties b/devops/docker.ui/src/org/netbeans/modules/docker/ui/tag/Bundle.properties
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/tag/Bundle.properties
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/tag/Bundle.properties
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/tag/TagPanel.form b/devops/docker.ui/src/org/netbeans/modules/docker/ui/tag/TagPanel.form
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/tag/TagPanel.form
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/tag/TagPanel.form
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/tag/TagPanel.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/tag/TagPanel.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/tag/TagPanel.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/tag/TagPanel.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/tag/TagTagAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/tag/TagTagAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/tag/TagTagAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/tag/TagTagAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/wizard/AddDockerInstanceAction.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/wizard/AddDockerInstanceAction.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/wizard/AddDockerInstanceAction.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/wizard/AddDockerInstanceAction.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/wizard/AddDockerInstanceWizard.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/wizard/AddDockerInstanceWizard.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/wizard/AddDockerInstanceWizard.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/wizard/AddDockerInstanceWizard.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/wizard/Bundle.properties b/devops/docker.ui/src/org/netbeans/modules/docker/ui/wizard/Bundle.properties
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/wizard/Bundle.properties
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/wizard/Bundle.properties
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/wizard/Configuration.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/wizard/Configuration.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/wizard/Configuration.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/wizard/Configuration.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/wizard/ConfigurationLinuxPanel.form b/devops/docker.ui/src/org/netbeans/modules/docker/ui/wizard/ConfigurationLinuxPanel.form
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/wizard/ConfigurationLinuxPanel.form
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/wizard/ConfigurationLinuxPanel.form
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/wizard/ConfigurationLinuxPanel.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/wizard/ConfigurationLinuxPanel.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/wizard/ConfigurationLinuxPanel.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/wizard/ConfigurationLinuxPanel.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/wizard/ConfigurationPanel.form b/devops/docker.ui/src/org/netbeans/modules/docker/ui/wizard/ConfigurationPanel.form
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/wizard/ConfigurationPanel.form
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/wizard/ConfigurationPanel.form
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/wizard/ConfigurationPanel.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/wizard/ConfigurationPanel.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/wizard/ConfigurationPanel.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/wizard/ConfigurationPanel.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/wizard/DockerConnectionPanel.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/wizard/DockerConnectionPanel.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/wizard/DockerConnectionPanel.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/wizard/DockerConnectionPanel.java
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/wizard/DockerConnectionVisual.form b/devops/docker.ui/src/org/netbeans/modules/docker/ui/wizard/DockerConnectionVisual.form
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/wizard/DockerConnectionVisual.form
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/wizard/DockerConnectionVisual.form
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/wizard/DockerConnectionVisual.java b/devops/docker.ui/src/org/netbeans/modules/docker/ui/wizard/DockerConnectionVisual.java
similarity index 100%
rename from ide/docker.ui/src/org/netbeans/modules/docker/ui/wizard/DockerConnectionVisual.java
rename to devops/docker.ui/src/org/netbeans/modules/docker/ui/wizard/DockerConnectionVisual.java
diff --git a/ide/docker.ui/test/unit/src/org/netbeans/modules/docker/ui/ValidationsTest.java b/devops/docker.ui/test/unit/src/org/netbeans/modules/docker/ui/ValidationsTest.java
similarity index 100%
rename from ide/docker.ui/test/unit/src/org/netbeans/modules/docker/ui/ValidationsTest.java
rename to devops/docker.ui/test/unit/src/org/netbeans/modules/docker/ui/ValidationsTest.java
diff --git a/ergonomics/ide.ergonomics/devops.properties b/ergonomics/ide.ergonomics/devops.properties
new file mode 100644
index 000000000000..0c7591adc95d
--- /dev/null
+++ b/ergonomics/ide.ergonomics/devops.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+
+mainModule=org.netbeans.modules.devops.kit
diff --git a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FeatureManager.java b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FeatureManager.java
index 560106e3a51c..b8294f8572de 100644
--- a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FeatureManager.java
+++ b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FeatureManager.java
@@ -219,7 +219,7 @@ private static synchronized Lookup featureTypesLookup() {
                 String bundleName = basename + "/Bundle.properties";
                 URL layer = FeatureManager.class.getResource(layerName);
                 URL bundle = FeatureManager.class.getResource(bundleName);
-                if (layer != null && bundle != null) {
+                if (bundle != null) {
                     FeatureInfo info;
                     try {
                         info = FeatureInfo.create(clusterName, layer, bundle);
diff --git a/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/VerifyFullIDETest.java b/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/VerifyFullIDETest.java
index 4a4167be5a0f..b02769733c84 100644
--- a/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/VerifyFullIDETest.java
+++ b/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/VerifyFullIDETest.java
@@ -103,8 +103,11 @@ public void testGetAllProjectTemplates() throws Exception {
         List<XMLFileSystem> all = new ArrayList<XMLFileSystem>();
 
         for (FeatureInfo fi : FeatureManager.features()) {
-            XMLFileSystem xfs = new XMLFileSystem(fi.getLayerURL());
-            all.add(xfs);
+            URL url = fi.getLayerURL();
+            if (url != null) {
+                XMLFileSystem xfs = new XMLFileSystem(url);
+                all.add(xfs);
+            }
         }
 
         MultiFileSystem mfs = new MultiFileSystem(all.toArray(new FileSystem[0]));
diff --git a/ide/editor.kit/src/org/netbeans/modules/editor/kit/Bundle.properties b/ide/editor.kit/src/org/netbeans/modules/editor/kit/Bundle.properties
index 5e147410359d..75c5cf0b2207 100644
--- a/ide/editor.kit/src/org/netbeans/modules/editor/kit/Bundle.properties
+++ b/ide/editor.kit/src/org/netbeans/modules/editor/kit/Bundle.properties
@@ -19,4 +19,4 @@ OpenIDE-Module-Long-Description=\
     Editing support for various types of files: bat, diff, manifest, sh, css, html, images, Java Script, properties files, xml, etc. \
     Also contains various editor features, such as go to file, bookmarks, templates, error stripe, etc.
 OpenIDE-Module-Name=Editing Files
-OpenIDE-Module-Short-Description=Editting support for various types of files.
+OpenIDE-Module-Short-Description=Editing support for various types of files.
diff --git a/nb/ide.launcher/netbeans.clusters b/nb/ide.launcher/netbeans.clusters
index 343c4c8abad0..e9517d91650b 100644
--- a/nb/ide.launcher/netbeans.clusters
+++ b/nb/ide.launcher/netbeans.clusters
@@ -38,6 +38,7 @@ harness
 cnd
 cndext
 cpplite
+devops
 dlight
 groovy
 extra
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
index 39f3c33866c8..235575047a62 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -25,6 +25,7 @@ clusters.config.release.list=\
         nb.cluster.apisupport,\
         nb.cluster.webcommon,\
         nb.cluster.php,\
+        nb.cluster.devops,\
         nb.cluster.groovy,\
         nb.cluster.enterprise,\
         nb.cluster.cpplite,\
@@ -80,6 +81,12 @@ clusters.config.rust.list=\
         nb.cluster.rust,\
         nb.cluster.nb
 
+clusters.config.devops.list=\
+        ${clusters.config.platform.list},\
+        nb.cluster.ide,\
+        nb.cluster.devops,\
+        nb.cluster.nb
+
 clusters.config.cpplite.list=\
         ${clusters.config.platform.list},\
         nb.cluster.ide,\
@@ -307,9 +314,7 @@ nb.cluster.ide=\
         dlight.nativeexecution,\
         dlight.nativeexecution.nb,\
         dlight.terminal,\
-        docker.api,\
         docker.editor,\
-        docker.ui,\
         editor,\
         editor.actions,\
         editor.autosave,\
@@ -1362,3 +1367,13 @@ nb.cluster.javafx=\
         javafx2.samples,\
         javafx2.scenebuilder,\
         maven.htmlui
+
+nb.cluster.devops.dir=devops
+nb.cluster.devops.depends=\
+        nb.cluster.ide,\
+        nb.cluster.platform,\
+        nb.cluster.harness
+nb.cluster.devops=\
+        devops.kit,\
+        docker.api,\
+        docker.ui