diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml
new file mode 100644
index 0000000000..c0236fd9f4
--- /dev/null
+++ b/maven-plugins/nar-maven-plugin/pom.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!--
+  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://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>
+
+    <parent>
+        <groupId>org.apache.nifi</groupId>
+        <artifactId>maven-plugins</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <artifactId>nar-maven-plugin</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>maven-plugin</packaging>
+    <name>Apache NiFi NAR Plugin</name>
+    <description>Apache NiFi Nar Plugin. It is currently a part of the Apache Incubator.</description>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-plugin-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-descriptor</id>
+                        <goals>
+                            <goal>descriptor</goal>
+                        </goals>
+                        <phase>process-classes</phase>
+                    </execution>
+                    <execution>
+                        <id>help-descriptor</id>
+                        <goals>
+                            <goal>helpmojo</goal>
+                        </goals>
+                        <phase>process-classes</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>                    
+        <dependency>          
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-plugin-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <type>maven-plugin</type>
+        </dependency>
+        <dependency>
+            <!-- No code from maven-jar-plugin is actually used; it's included
+            just to simplify the dependencies list.                     -->
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugin-tools</groupId>
+            <artifactId>maven-plugin-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/nar-maven-plugin/src/main/java/nifi/NarMojo.java b/maven-plugins/nar-maven-plugin/src/main/java/nifi/NarMojo.java
similarity index 100%
rename from nar-maven-plugin/src/main/java/nifi/NarMojo.java
rename to maven-plugins/nar-maven-plugin/src/main/java/nifi/NarMojo.java
diff --git a/nar-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/maven-plugins/nar-maven-plugin/src/main/resources/META-INF/plexus/components.xml
similarity index 100%
rename from nar-maven-plugin/src/main/resources/META-INF/plexus/components.xml
rename to maven-plugins/nar-maven-plugin/src/main/resources/META-INF/plexus/components.xml
diff --git a/nar-maven-plugin/pom.xml b/maven-plugins/pom.xml
similarity index 82%
rename from nar-maven-plugin/pom.xml
rename to maven-plugins/pom.xml
index 66c101e0b5..31d2bdca04 100644
--- a/nar-maven-plugin/pom.xml
+++ b/maven-plugins/pom.xml
@@ -23,11 +23,11 @@
         <relativePath/>
     </parent>
     <groupId>org.apache.nifi</groupId>
-    <artifactId>nar-maven-plugin</artifactId>
+    <artifactId>maven-plugins</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <packaging>maven-plugin</packaging>
-    <name>Apache NiFi NAR Plugin</name>
-    <description>Apache NiFi is a dataflow system based on the concepts of flow-based programming. It is currently a part of the Apache Incubator.</description>
+    <packaging>pom</packaging>
+    <name>Apache NiFi Maven Plugins</name>
+    <description>Apache NiFi Maven Plugins. It is currently a part of the Apache Incubator.</description>
     <url>http://nifi.incubator.apache.org/maven-site/</url>
     <organization>
         <name>Apache NiFi (incubating) Project</name>
@@ -58,6 +58,9 @@
     <prerequisites>
         <maven>${maven.min-version}</maven>
     </prerequisites>
+    <modules>
+        <module>nar-maven-plugin</module>
+    </modules>
     <scm>
         <connection>scm:git:git://git.apache.org/incubator-nifi.git</connection>
         <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git</developerConnection>
@@ -164,23 +167,23 @@
                     <artifactId>maven-release-plugin</artifactId>
                     <version>2.5.1</version>
                     <executions>
-                      <execution>
-                        <id>default</id>
-                        <goals>
-                          <goal>prepare</goal>
-                          <goal>perform</goal>
-                        </goals>
-                        <configuration>
-                          <pomFileName>platform/pom.xml</pomFileName>
-                          <arguments>-P apache-release,check-licenses</arguments>
-                          <autoVersionSubmodules>true</autoVersionSubmodules>
-                          <releaseProfiles>apache-release</releaseProfiles>
-                          <goals>deploy</goals>
-                          <tagNameFormat>nar-maven-plugin-@{project.version}</tagNameFormat>
-                          <pushChanges>false</pushChanges>
-                          <localCheckout>true</localCheckout>
-                        </configuration>
-                      </execution>
+                        <execution>
+                            <id>default</id>
+                            <goals>
+                                <goal>prepare</goal>
+                                <goal>perform</goal>
+                            </goals>
+                            <configuration>
+                                <pomFileName>platform/pom.xml</pomFileName>
+                                <arguments>-P apache-release,check-licenses</arguments>
+                                <autoVersionSubmodules>true</autoVersionSubmodules>
+                                <releaseProfiles>apache-release</releaseProfiles>
+                                <goals>deploy</goals>
+                                <tagNameFormat>@{project.artifactId}-@{project.version}</tagNameFormat>
+                                <pushChanges>false</pushChanges>
+                                <localCheckout>true</localCheckout>
+                            </configuration>
+                        </execution>
                     </executions>
                 </plugin>
                 <plugin>
@@ -198,26 +201,6 @@
             </plugins>
         </pluginManagement>       
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-plugin-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default-descriptor</id>
-                        <goals>
-                            <goal>descriptor</goal>
-                        </goals>
-                        <phase>process-classes</phase>
-                    </execution>
-                    <execution>
-                        <id>help-descriptor</id>
-                        <goals>
-                            <goal>helpmojo</goal>
-                        </goals>
-                        <phase>process-classes</phase>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
@@ -271,28 +254,6 @@
             </dependency>                        
         </dependencies>
     </dependencyManagement>
-    <dependencies>                    
-        <dependency>          
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <type>maven-plugin</type>
-        </dependency>
-        <dependency>
-            <!-- No code from maven-jar-plugin is actually used; it's included
-            just to simplify the dependencies list.                     -->
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.plugin-tools</groupId>
-            <artifactId>maven-plugin-annotations</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
     <profiles>
         <profile>
             <id>apache-release</id>
@@ -317,7 +278,7 @@
                                 <phase>validate</phase>
                                 <configuration>
                                     <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-                                    <finalName>nifi-${project.version}</finalName>
+                                    <finalName>nifi-${project.artifactId}-${project.version}</finalName>
                                     <descriptorRefs>
                                         <descriptorRef>source-release-zip-tar</descriptorRef>
                                     </descriptorRefs>
@@ -339,7 +300,7 @@
                                 <configuration>
                                     <executable>mv</executable>
                                     <workingDirectory>${project.build.directory}</workingDirectory>
-                                    <commandlineArgs>-n nifi-${project.version}-source-release.tar.gz nifi-${project.version}-src.tar.gz</commandlineArgs>
+                                    <commandlineArgs>-n nifi-${project.artifactId}-${project.version}-source-release.tar.gz nifi-${project.artifactId}-${project.version}-src.tar.gz</commandlineArgs>
                                     <successCodes>
                                         <successCode>0</successCode>
                                         <successCode>1</successCode>
diff --git a/assembly/pom.xml b/nifi/assembly/pom.xml
similarity index 99%
rename from assembly/pom.xml
rename to nifi/assembly/pom.xml
index e785c45ff0..2c1d59a376 100644
--- a/assembly/pom.xml
+++ b/nifi/assembly/pom.xml
@@ -385,16 +385,16 @@
                                             <directory>/opt/nifi/nifi-${project.version}</directory>
                                             <sources>
                                                 <source>
-                                                    <location>../LICENSE</location>
+                                                    <location>../../LICENSE</location>
                                                 </source>
                                                 <source>
-                                                    <location>../NOTICE</location>
+                                                    <location>../../NOTICE</location>
                                                 </source>
                                                 <source>
-                                                    <location>../DISCLAIMER</location>
+                                                    <location>../../DISCLAIMER</location>
                                                 </source>
                                                 <source>
-                                                    <location>../README.md</location>
+                                                    <location>../../README.md</location>
                                                     <destination>README</destination>
                                                 </source>
                                             </sources>
diff --git a/assembly/src/main/assembly/dependencies.xml b/nifi/assembly/src/main/assembly/dependencies.xml
similarity index 96%
rename from assembly/src/main/assembly/dependencies.xml
rename to nifi/assembly/src/main/assembly/dependencies.xml
index 3481b0afec..0f218a8fb0 100644
--- a/assembly/src/main/assembly/dependencies.xml
+++ b/nifi/assembly/src/main/assembly/dependencies.xml
@@ -109,28 +109,28 @@
     </dependencySets>
     <files>
         <file>
-            <source>../README.md</source>
+            <source>../../README.md</source>
             <outputDirectory>./</outputDirectory>
             <destName>README</destName>
             <fileMode>0644</fileMode>
             <filtered>true</filtered>
         </file>
         <file>
-            <source>../DISCLAIMER</source>
+            <source>../../DISCLAIMER</source>
             <outputDirectory>./</outputDirectory>
             <destName>DISCLAIMER</destName>
             <fileMode>0644</fileMode>
             <filtered>true</filtered>
         </file>
         <file>
-            <source>../LICENSE</source>
+            <source>../../LICENSE</source>
             <outputDirectory>./</outputDirectory>
             <destName>LICENSE</destName>
             <fileMode>0644</fileMode>
             <filtered>true</filtered>
         </file>       
         <file>
-            <source>../NOTICE</source>
+            <source>../../NOTICE</source>
             <outputDirectory>./</outputDirectory>
             <destName>NOTICE</destName>
             <fileMode>0644</fileMode>
diff --git a/commons/data-provenance-utils/.gitignore b/nifi/commons/data-provenance-utils/.gitignore
similarity index 100%
rename from commons/data-provenance-utils/.gitignore
rename to nifi/commons/data-provenance-utils/.gitignore
diff --git a/commons/data-provenance-utils/pom.xml b/nifi/commons/data-provenance-utils/pom.xml
similarity index 100%
rename from commons/data-provenance-utils/pom.xml
rename to nifi/commons/data-provenance-utils/pom.xml
diff --git a/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/AsyncLineageSubmission.java b/nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/AsyncLineageSubmission.java
similarity index 100%
rename from commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/AsyncLineageSubmission.java
rename to nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/AsyncLineageSubmission.java
diff --git a/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/AsyncQuerySubmission.java b/nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/AsyncQuerySubmission.java
similarity index 100%
rename from commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/AsyncQuerySubmission.java
rename to nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/AsyncQuerySubmission.java
diff --git a/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/NamedSearchableField.java b/nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/NamedSearchableField.java
similarity index 100%
rename from commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/NamedSearchableField.java
rename to nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/NamedSearchableField.java
diff --git a/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/SearchableFieldParser.java b/nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/SearchableFieldParser.java
similarity index 100%
rename from commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/SearchableFieldParser.java
rename to nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/SearchableFieldParser.java
diff --git a/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/SearchableFields.java b/nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/SearchableFields.java
similarity index 100%
rename from commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/SearchableFields.java
rename to nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/SearchableFields.java
diff --git a/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardLineageResult.java b/nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardLineageResult.java
similarity index 100%
rename from commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardLineageResult.java
rename to nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardLineageResult.java
diff --git a/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardProvenanceEventRecord.java b/nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardProvenanceEventRecord.java
similarity index 100%
rename from commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardProvenanceEventRecord.java
rename to nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardProvenanceEventRecord.java
diff --git a/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardQueryResult.java b/nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardQueryResult.java
similarity index 100%
rename from commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardQueryResult.java
rename to nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardQueryResult.java
diff --git a/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/EdgeNode.java b/nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/EdgeNode.java
similarity index 100%
rename from commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/EdgeNode.java
rename to nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/EdgeNode.java
diff --git a/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/EventNode.java b/nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/EventNode.java
similarity index 100%
rename from commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/EventNode.java
rename to nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/EventNode.java
diff --git a/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/FlowFileLineage.java b/nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/FlowFileLineage.java
similarity index 100%
rename from commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/FlowFileLineage.java
rename to nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/FlowFileLineage.java
diff --git a/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/FlowFileNode.java b/nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/FlowFileNode.java
similarity index 100%
rename from commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/FlowFileNode.java
rename to nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/FlowFileNode.java
diff --git a/commons/flowfile-packager/pom.xml b/nifi/commons/flowfile-packager/pom.xml
similarity index 100%
rename from commons/flowfile-packager/pom.xml
rename to nifi/commons/flowfile-packager/pom.xml
diff --git a/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackager.java b/nifi/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackager.java
similarity index 100%
rename from commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackager.java
rename to nifi/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackager.java
diff --git a/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV1.java b/nifi/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV1.java
similarity index 100%
rename from commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV1.java
rename to nifi/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV1.java
diff --git a/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV2.java b/nifi/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV2.java
similarity index 100%
rename from commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV2.java
rename to nifi/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV2.java
diff --git a/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV3.java b/nifi/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV3.java
similarity index 100%
rename from commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV3.java
rename to nifi/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV3.java
diff --git a/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackager.java b/nifi/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackager.java
similarity index 100%
rename from commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackager.java
rename to nifi/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackager.java
diff --git a/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackagerV1.java b/nifi/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackagerV1.java
similarity index 100%
rename from commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackagerV1.java
rename to nifi/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackagerV1.java
diff --git a/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackagerV2.java b/nifi/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackagerV2.java
similarity index 100%
rename from commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackagerV2.java
rename to nifi/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackagerV2.java
diff --git a/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackagerV3.java b/nifi/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackagerV3.java
similarity index 100%
rename from commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackagerV3.java
rename to nifi/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackagerV3.java
diff --git a/commons/flowfile-packager/src/main/java/org/apache/nifi/util/Unpackage.java b/nifi/commons/flowfile-packager/src/main/java/org/apache/nifi/util/Unpackage.java
similarity index 100%
rename from commons/flowfile-packager/src/main/java/org/apache/nifi/util/Unpackage.java
rename to nifi/commons/flowfile-packager/src/main/java/org/apache/nifi/util/Unpackage.java
diff --git a/commons/flowfile-packager/src/test/java/org/apache/nifi/util/TestPackageUnpackageV3.java b/nifi/commons/flowfile-packager/src/test/java/org/apache/nifi/util/TestPackageUnpackageV3.java
similarity index 100%
rename from commons/flowfile-packager/src/test/java/org/apache/nifi/util/TestPackageUnpackageV3.java
rename to nifi/commons/flowfile-packager/src/test/java/org/apache/nifi/util/TestPackageUnpackageV3.java
diff --git a/commons/nifi-expression-language/pom.xml b/nifi/commons/nifi-expression-language/pom.xml
similarity index 100%
rename from commons/nifi-expression-language/pom.xml
rename to nifi/commons/nifi-expression-language/pom.xml
diff --git a/commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g b/nifi/commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g
similarity index 100%
rename from commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g
rename to nifi/commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g
diff --git a/commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionParser.g b/nifi/commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionParser.g
similarity index 100%
rename from commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionParser.g
rename to nifi/commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionParser.g
diff --git a/commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/output/AttributeExpressionLexer.tokens b/nifi/commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/output/AttributeExpressionLexer.tokens
similarity index 100%
rename from commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/output/AttributeExpressionLexer.tokens
rename to nifi/commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/output/AttributeExpressionLexer.tokens
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/EmptyPreparedQuery.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/EmptyPreparedQuery.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/EmptyPreparedQuery.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/EmptyPreparedQuery.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/InvalidPreparedQuery.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/InvalidPreparedQuery.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/InvalidPreparedQuery.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/InvalidPreparedQuery.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/PreparedQuery.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/PreparedQuery.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/PreparedQuery.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/PreparedQuery.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardAttributeExpression.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardAttributeExpression.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardAttributeExpression.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardAttributeExpression.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardExpressionLanguageCompiler.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardExpressionLanguageCompiler.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardExpressionLanguageCompiler.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardExpressionLanguageCompiler.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardPreparedQuery.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardPreparedQuery.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardPreparedQuery.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardPreparedQuery.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/BooleanEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/BooleanEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/BooleanEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/BooleanEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/BooleanQueryResult.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/BooleanQueryResult.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/BooleanQueryResult.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/BooleanQueryResult.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/DateEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/DateEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/DateEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/DateEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/DateQueryResult.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/DateQueryResult.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/DateQueryResult.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/DateQueryResult.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/Evaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/Evaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/Evaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/Evaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/NumberEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/NumberEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/NumberEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/NumberEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/NumberQueryResult.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/NumberQueryResult.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/NumberQueryResult.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/NumberQueryResult.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/QueryResult.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/QueryResult.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/QueryResult.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/QueryResult.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/StringEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/StringEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/StringEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/StringEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/StringQueryResult.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/StringQueryResult.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/StringQueryResult.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/StringQueryResult.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/BooleanCastEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/BooleanCastEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/BooleanCastEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/BooleanCastEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/NumberCastEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/NumberCastEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/NumberCastEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/NumberCastEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/StringCastEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/StringCastEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/StringCastEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/StringCastEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/AndEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/AndEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/AndEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/AndEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/AppendEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/AppendEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/AppendEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/AppendEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/AttributeEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/AttributeEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/AttributeEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/AttributeEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ContainsEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ContainsEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ContainsEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ContainsEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/DateToNumberEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/DateToNumberEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/DateToNumberEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/DateToNumberEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/DivideEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/DivideEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/DivideEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/DivideEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EndsWithEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EndsWithEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EndsWithEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EndsWithEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EqualsEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EqualsEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EqualsEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EqualsEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EqualsIgnoreCaseEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EqualsIgnoreCaseEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EqualsIgnoreCaseEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EqualsIgnoreCaseEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/FindEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/FindEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/FindEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/FindEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/FormatEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/FormatEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/FormatEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/FormatEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GreaterThanEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GreaterThanEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GreaterThanEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GreaterThanEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GreaterThanOrEqualEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GreaterThanOrEqualEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GreaterThanOrEqualEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GreaterThanOrEqualEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/HostnameEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/HostnameEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/HostnameEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/HostnameEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IPEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IPEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IPEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IPEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IndexOfEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IndexOfEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IndexOfEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IndexOfEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IsEmptyEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IsEmptyEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IsEmptyEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IsEmptyEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IsNullEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IsNullEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IsNullEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IsNullEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LastIndexOfEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LastIndexOfEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LastIndexOfEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LastIndexOfEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LengthEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LengthEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LengthEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LengthEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LessThanEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LessThanEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LessThanEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LessThanEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LessThanOrEqualEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LessThanOrEqualEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LessThanOrEqualEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LessThanOrEqualEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MatchesEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MatchesEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MatchesEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MatchesEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MinusEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MinusEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MinusEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MinusEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ModEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ModEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ModEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ModEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MultiplyEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MultiplyEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MultiplyEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MultiplyEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NotEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NotEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NotEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NotEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NotNullEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NotNullEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NotNullEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NotNullEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NowEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NowEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NowEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NowEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NumberToDateEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NumberToDateEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NumberToDateEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NumberToDateEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/OneUpSequenceEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/OneUpSequenceEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/OneUpSequenceEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/OneUpSequenceEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/OrEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/OrEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/OrEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/OrEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/PlusEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/PlusEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/PlusEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/PlusEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/PrependEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/PrependEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/PrependEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/PrependEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceAllEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceAllEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceAllEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceAllEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceEmptyEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceEmptyEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceEmptyEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceEmptyEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceNullEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceNullEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceNullEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceNullEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/StartsWithEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/StartsWithEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/StartsWithEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/StartsWithEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/StringToDateEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/StringToDateEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/StringToDateEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/StringToDateEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringAfterEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringAfterEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringAfterEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringAfterEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringAfterLastEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringAfterLastEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringAfterLastEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringAfterLastEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringBeforeEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringBeforeEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringBeforeEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringBeforeEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringBeforeLastEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringBeforeLastEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringBeforeLastEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringBeforeLastEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToLowerEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToLowerEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToLowerEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToLowerEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToNumberEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToNumberEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToNumberEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToNumberEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToRadixEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToRadixEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToRadixEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToRadixEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToStringEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToStringEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToStringEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToStringEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToUpperEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToUpperEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToUpperEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToUpperEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/TrimEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/TrimEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/TrimEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/TrimEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UrlDecodeEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UrlDecodeEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UrlDecodeEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UrlDecodeEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UrlEncodeEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UrlEncodeEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UrlEncodeEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UrlEncodeEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UuidEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UuidEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UuidEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UuidEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/BooleanLiteralEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/BooleanLiteralEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/BooleanLiteralEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/BooleanLiteralEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/NumberLiteralEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/NumberLiteralEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/NumberLiteralEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/NumberLiteralEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/StringLiteralEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/StringLiteralEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/StringLiteralEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/StringLiteralEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/reduce/CountEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/reduce/CountEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/reduce/CountEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/reduce/CountEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/reduce/JoinEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/reduce/JoinEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/reduce/JoinEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/reduce/JoinEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/reduce/ReduceEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/reduce/ReduceEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/reduce/ReduceEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/reduce/ReduceEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AllAttributesEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AllAttributesEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AllAttributesEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AllAttributesEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AnyAttributeEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AnyAttributeEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AnyAttributeEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AnyAttributeEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AnyMatchingAttributeEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AnyMatchingAttributeEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AnyMatchingAttributeEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AnyMatchingAttributeEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/DelineatedAttributeEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/DelineatedAttributeEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/DelineatedAttributeEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/DelineatedAttributeEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MappingEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MappingEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MappingEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MappingEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MultiAttributeEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MultiAttributeEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MultiAttributeEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MultiAttributeEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MultiMatchAttributeEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MultiMatchAttributeEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MultiMatchAttributeEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MultiMatchAttributeEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MultiNamedAttributeEvaluator.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MultiNamedAttributeEvaluator.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MultiNamedAttributeEvaluator.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MultiNamedAttributeEvaluator.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/exception/AttributeExpressionLanguageException.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/exception/AttributeExpressionLanguageException.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/exception/AttributeExpressionLanguageException.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/exception/AttributeExpressionLanguageException.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/exception/AttributeExpressionLanguageParsingException.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/exception/AttributeExpressionLanguageParsingException.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/exception/AttributeExpressionLanguageParsingException.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/exception/AttributeExpressionLanguageParsingException.java
diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/exception/IllegalAttributeException.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/exception/IllegalAttributeException.java
similarity index 100%
rename from commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/exception/IllegalAttributeException.java
rename to nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/exception/IllegalAttributeException.java
diff --git a/commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java b/nifi/commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java
similarity index 100%
rename from commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java
rename to nifi/commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java
diff --git a/commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestStandardPreparedQuery.java b/nifi/commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestStandardPreparedQuery.java
similarity index 100%
rename from commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestStandardPreparedQuery.java
rename to nifi/commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestStandardPreparedQuery.java
diff --git a/commons/nifi-logging-utils/pom.xml b/nifi/commons/nifi-logging-utils/pom.xml
similarity index 100%
rename from commons/nifi-logging-utils/pom.xml
rename to nifi/commons/nifi-logging-utils/pom.xml
diff --git a/commons/nifi-logging-utils/src/main/java/org/apache/nifi/logging/NiFiLog.java b/nifi/commons/nifi-logging-utils/src/main/java/org/apache/nifi/logging/NiFiLog.java
similarity index 100%
rename from commons/nifi-logging-utils/src/main/java/org/apache/nifi/logging/NiFiLog.java
rename to nifi/commons/nifi-logging-utils/src/main/java/org/apache/nifi/logging/NiFiLog.java
diff --git a/commons/nifi-properties/.gitignore b/nifi/commons/nifi-properties/.gitignore
similarity index 100%
rename from commons/nifi-properties/.gitignore
rename to nifi/commons/nifi-properties/.gitignore
diff --git a/commons/nifi-properties/pom.xml b/nifi/commons/nifi-properties/pom.xml
similarity index 100%
rename from commons/nifi-properties/pom.xml
rename to nifi/commons/nifi-properties/pom.xml
diff --git a/commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java b/nifi/commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
similarity index 100%
rename from commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
rename to nifi/commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
diff --git a/commons/nifi-properties/src/main/java/org/apache/nifi/util/StringUtils.java b/nifi/commons/nifi-properties/src/main/java/org/apache/nifi/util/StringUtils.java
similarity index 100%
rename from commons/nifi-properties/src/main/java/org/apache/nifi/util/StringUtils.java
rename to nifi/commons/nifi-properties/src/main/java/org/apache/nifi/util/StringUtils.java
diff --git a/commons/nifi-security-utils/pom.xml b/nifi/commons/nifi-security-utils/pom.xml
similarity index 100%
rename from commons/nifi-security-utils/pom.xml
rename to nifi/commons/nifi-security-utils/pom.xml
diff --git a/commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/CertificateUtils.java b/nifi/commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/CertificateUtils.java
similarity index 100%
rename from commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/CertificateUtils.java
rename to nifi/commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/CertificateUtils.java
diff --git a/commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/EncryptionMethod.java b/nifi/commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/EncryptionMethod.java
similarity index 100%
rename from commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/EncryptionMethod.java
rename to nifi/commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/EncryptionMethod.java
diff --git a/commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/KeystoreType.java b/nifi/commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/KeystoreType.java
similarity index 100%
rename from commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/KeystoreType.java
rename to nifi/commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/KeystoreType.java
diff --git a/commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/SecurityStoreTypes.java b/nifi/commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/SecurityStoreTypes.java
similarity index 100%
rename from commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/SecurityStoreTypes.java
rename to nifi/commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/SecurityStoreTypes.java
diff --git a/commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/SslContextFactory.java b/nifi/commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/SslContextFactory.java
similarity index 100%
rename from commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/SslContextFactory.java
rename to nifi/commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/SslContextFactory.java
diff --git a/commons/nifi-socket-utils/pom.xml b/nifi/commons/nifi-socket-utils/pom.xml
similarity index 100%
rename from commons/nifi-socket-utils/pom.xml
rename to nifi/commons/nifi-socket-utils/pom.xml
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/AbstractChannelReader.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/AbstractChannelReader.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/AbstractChannelReader.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/AbstractChannelReader.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/BufferPool.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/BufferPool.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/BufferPool.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/BufferPool.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/ChannelDispatcher.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/ChannelDispatcher.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/ChannelDispatcher.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/ChannelDispatcher.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/ChannelListener.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/ChannelListener.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/ChannelListener.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/ChannelListener.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/DatagramChannelReader.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/DatagramChannelReader.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/DatagramChannelReader.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/DatagramChannelReader.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/SocketChannelReader.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/SocketChannelReader.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/SocketChannelReader.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/SocketChannelReader.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/consumer/AbstractStreamConsumer.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/consumer/AbstractStreamConsumer.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/consumer/AbstractStreamConsumer.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/consumer/AbstractStreamConsumer.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/consumer/StreamConsumer.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/consumer/StreamConsumer.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/consumer/StreamConsumer.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/consumer/StreamConsumer.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/consumer/StreamConsumerFactory.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/consumer/StreamConsumerFactory.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/consumer/StreamConsumerFactory.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/consumer/StreamConsumerFactory.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/SSLContextFactory.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/SSLContextFactory.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/SSLContextFactory.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/SSLContextFactory.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/ServerSocketConfiguration.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/ServerSocketConfiguration.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/ServerSocketConfiguration.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/ServerSocketConfiguration.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/SocketConfiguration.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/SocketConfiguration.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/SocketConfiguration.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/SocketConfiguration.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/SocketListener.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/SocketListener.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/SocketListener.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/SocketListener.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/SocketUtils.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/SocketUtils.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/SocketUtils.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/SocketUtils.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/DiscoverableService.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/DiscoverableService.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/DiscoverableService.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/DiscoverableService.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/DiscoverableServiceImpl.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/DiscoverableServiceImpl.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/DiscoverableServiceImpl.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/DiscoverableServiceImpl.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastConfiguration.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastConfiguration.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastConfiguration.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastConfiguration.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastListener.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastListener.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastListener.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastListener.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastServiceDiscovery.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastServiceDiscovery.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastServiceDiscovery.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastServiceDiscovery.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastServicesBroadcaster.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastServicesBroadcaster.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastServicesBroadcaster.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastServicesBroadcaster.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastTimeToLive.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastTimeToLive.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastTimeToLive.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastTimeToLive.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastUtils.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastUtils.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastUtils.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastUtils.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/ServiceDiscovery.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/ServiceDiscovery.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/ServiceDiscovery.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/ServiceDiscovery.java
diff --git a/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/ServicesBroadcaster.java b/nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/ServicesBroadcaster.java
similarity index 100%
rename from commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/ServicesBroadcaster.java
rename to nifi/commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/ServicesBroadcaster.java
diff --git a/commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/ServerMain.java b/nifi/commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/ServerMain.java
similarity index 100%
rename from commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/ServerMain.java
rename to nifi/commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/ServerMain.java
diff --git a/commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/TCPClient.java b/nifi/commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/TCPClient.java
similarity index 100%
rename from commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/TCPClient.java
rename to nifi/commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/TCPClient.java
diff --git a/commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/UDPClient.java b/nifi/commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/UDPClient.java
similarity index 100%
rename from commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/UDPClient.java
rename to nifi/commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/UDPClient.java
diff --git a/commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/UselessStreamConsumer.java b/nifi/commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/UselessStreamConsumer.java
similarity index 100%
rename from commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/UselessStreamConsumer.java
rename to nifi/commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/UselessStreamConsumer.java
diff --git a/commons/nifi-socket-utils/src/test/resources/log4j.xml b/nifi/commons/nifi-socket-utils/src/test/resources/log4j.xml
similarity index 100%
rename from commons/nifi-socket-utils/src/test/resources/log4j.xml
rename to nifi/commons/nifi-socket-utils/src/test/resources/log4j.xml
diff --git a/commons/nifi-utils/.gitignore b/nifi/commons/nifi-utils/.gitignore
similarity index 100%
rename from commons/nifi-utils/.gitignore
rename to nifi/commons/nifi-utils/.gitignore
diff --git a/commons/nifi-utils/pom.xml b/nifi/commons/nifi-utils/pom.xml
similarity index 100%
rename from commons/nifi-utils/pom.xml
rename to nifi/commons/nifi-utils/pom.xml
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/flowfile/attributes/CoreAttributes.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/flowfile/attributes/CoreAttributes.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/flowfile/attributes/CoreAttributes.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/flowfile/attributes/CoreAttributes.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/flowfile/attributes/FlowFileAttributeKey.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/flowfile/attributes/FlowFileAttributeKey.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/flowfile/attributes/FlowFileAttributeKey.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/flowfile/attributes/FlowFileAttributeKey.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/remote/StandardVersionNegotiator.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/StandardVersionNegotiator.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/remote/StandardVersionNegotiator.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/StandardVersionNegotiator.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/remote/VersionNegotiator.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/VersionNegotiator.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/remote/VersionNegotiator.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/VersionNegotiator.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/remote/exception/TransmissionDisabledException.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/exception/TransmissionDisabledException.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/remote/exception/TransmissionDisabledException.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/exception/TransmissionDisabledException.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/CompressionInputStream.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/CompressionInputStream.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/CompressionInputStream.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/CompressionInputStream.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/CompressionOutputStream.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/CompressionOutputStream.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/CompressionOutputStream.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/CompressionOutputStream.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/InterruptableInputStream.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/InterruptableInputStream.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/InterruptableInputStream.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/InterruptableInputStream.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/InterruptableOutputStream.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/InterruptableOutputStream.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/InterruptableOutputStream.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/InterruptableOutputStream.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/BufferStateManager.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/BufferStateManager.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/BufferStateManager.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/BufferStateManager.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelInputStream.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelInputStream.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelInputStream.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelInputStream.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelOutputStream.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelOutputStream.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelOutputStream.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelOutputStream.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannel.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannel.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannel.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannel.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelInputStream.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelInputStream.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelInputStream.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelInputStream.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelOutputStream.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelOutputStream.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelOutputStream.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelOutputStream.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/BufferedInputStream.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/BufferedInputStream.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/BufferedInputStream.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/BufferedInputStream.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/BufferedOutputStream.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/BufferedOutputStream.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/BufferedOutputStream.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/BufferedOutputStream.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ByteArrayInputStream.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ByteArrayInputStream.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ByteArrayInputStream.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ByteArrayInputStream.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ByteArrayOutputStream.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ByteArrayOutputStream.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ByteArrayOutputStream.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ByteArrayOutputStream.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ByteCountingInputStream.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ByteCountingInputStream.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ByteCountingInputStream.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ByteCountingInputStream.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ByteCountingOutputStream.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ByteCountingOutputStream.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ByteCountingOutputStream.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ByteCountingOutputStream.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/DataOutputStream.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/DataOutputStream.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/DataOutputStream.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/DataOutputStream.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/GZIPOutputStream.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/GZIPOutputStream.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/GZIPOutputStream.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/GZIPOutputStream.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/LeakyBucketStreamThrottler.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/LeakyBucketStreamThrottler.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/LeakyBucketStreamThrottler.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/LeakyBucketStreamThrottler.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/NonCloseableInputStream.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/NonCloseableInputStream.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/NonCloseableInputStream.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/NonCloseableInputStream.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/NonCloseableOutputStream.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/NonCloseableOutputStream.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/NonCloseableOutputStream.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/NonCloseableOutputStream.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/NullOutputStream.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/NullOutputStream.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/NullOutputStream.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/NullOutputStream.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/StreamThrottler.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/StreamThrottler.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/StreamThrottler.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/StreamThrottler.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/StreamUtils.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/StreamUtils.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/StreamUtils.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/StreamUtils.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ZipOutputStream.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ZipOutputStream.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ZipOutputStream.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ZipOutputStream.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/exception/BytePatternNotFoundException.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/exception/BytePatternNotFoundException.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/exception/BytePatternNotFoundException.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/exception/BytePatternNotFoundException.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/util/NonThreadSafeCircularBuffer.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/util/NonThreadSafeCircularBuffer.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/util/NonThreadSafeCircularBuffer.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/util/NonThreadSafeCircularBuffer.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/BooleanHolder.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/BooleanHolder.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/BooleanHolder.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/BooleanHolder.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/FormatUtils.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/FormatUtils.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/FormatUtils.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/FormatUtils.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/IntegerHolder.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/IntegerHolder.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/IntegerHolder.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/IntegerHolder.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/LongHolder.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/LongHolder.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/LongHolder.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/LongHolder.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/NaiveSearchRingBuffer.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/NaiveSearchRingBuffer.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/NaiveSearchRingBuffer.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/NaiveSearchRingBuffer.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/ObjectHolder.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/ObjectHolder.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/ObjectHolder.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/ObjectHolder.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/RingBuffer.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/RingBuffer.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/RingBuffer.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/RingBuffer.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/StopWatch.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/StopWatch.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/StopWatch.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/StopWatch.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/Tuple.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/Tuple.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/Tuple.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/Tuple.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/DebugDisabledTimedLock.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/DebugDisabledTimedLock.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/DebugDisabledTimedLock.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/DebugDisabledTimedLock.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/DebugEnabledTimedLock.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/DebugEnabledTimedLock.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/DebugEnabledTimedLock.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/DebugEnabledTimedLock.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/DebuggableTimedLock.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/DebuggableTimedLock.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/DebuggableTimedLock.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/DebuggableTimedLock.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/TimedLock.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/TimedLock.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/TimedLock.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/TimedLock.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/FileUtils.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/FileUtils.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/file/FileUtils.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/FileUtils.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/CompoundUpdateMonitor.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/CompoundUpdateMonitor.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/CompoundUpdateMonitor.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/CompoundUpdateMonitor.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/LastModifiedMonitor.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/LastModifiedMonitor.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/LastModifiedMonitor.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/LastModifiedMonitor.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/MD5SumMonitor.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/MD5SumMonitor.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/MD5SumMonitor.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/MD5SumMonitor.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/SynchronousFileWatcher.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/SynchronousFileWatcher.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/SynchronousFileWatcher.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/SynchronousFileWatcher.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/UpdateMonitor.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/UpdateMonitor.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/UpdateMonitor.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/monitor/UpdateMonitor.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/search/Search.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/search/Search.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/search/Search.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/search/Search.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/search/SearchTerm.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/search/SearchTerm.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/search/SearchTerm.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/search/SearchTerm.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/AhoCorasick.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/AhoCorasick.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/AhoCorasick.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/AhoCorasick.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/Node.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/Node.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/Node.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/Node.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/SearchState.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/SearchState.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/SearchState.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/SearchState.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/timebuffer/EntityAccess.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/timebuffer/EntityAccess.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/timebuffer/EntityAccess.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/timebuffer/EntityAccess.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/timebuffer/LongEntityAccess.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/timebuffer/LongEntityAccess.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/timebuffer/LongEntityAccess.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/timebuffer/LongEntityAccess.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/timebuffer/TimedBuffer.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/timebuffer/TimedBuffer.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/timebuffer/TimedBuffer.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/timebuffer/TimedBuffer.java
diff --git a/commons/nifi-utils/src/main/java/org/apache/nifi/util/timebuffer/TimestampedLong.java b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/timebuffer/TimestampedLong.java
similarity index 100%
rename from commons/nifi-utils/src/main/java/org/apache/nifi/util/timebuffer/TimestampedLong.java
rename to nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/timebuffer/TimestampedLong.java
diff --git a/commons/nifi-utils/src/test/java/org/apache/nifi/remote/io/TestCompressionInputOutputStreams.java b/nifi/commons/nifi-utils/src/test/java/org/apache/nifi/remote/io/TestCompressionInputOutputStreams.java
similarity index 100%
rename from commons/nifi-utils/src/test/java/org/apache/nifi/remote/io/TestCompressionInputOutputStreams.java
rename to nifi/commons/nifi-utils/src/test/java/org/apache/nifi/remote/io/TestCompressionInputOutputStreams.java
diff --git a/commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/TestLeakyBucketThrottler.java b/nifi/commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/TestLeakyBucketThrottler.java
similarity index 100%
rename from commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/TestLeakyBucketThrottler.java
rename to nifi/commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/TestLeakyBucketThrottler.java
diff --git a/commons/nifi-utils/src/test/java/org/apache/nifi/util/TestNaiveSearchRingBuffer.java b/nifi/commons/nifi-utils/src/test/java/org/apache/nifi/util/TestNaiveSearchRingBuffer.java
similarity index 100%
rename from commons/nifi-utils/src/test/java/org/apache/nifi/util/TestNaiveSearchRingBuffer.java
rename to nifi/commons/nifi-utils/src/test/java/org/apache/nifi/util/TestNaiveSearchRingBuffer.java
diff --git a/commons/nifi-utils/src/test/java/org/apache/nifi/util/file/monitor/TestCompoundUpdateMonitor.java b/nifi/commons/nifi-utils/src/test/java/org/apache/nifi/util/file/monitor/TestCompoundUpdateMonitor.java
similarity index 100%
rename from commons/nifi-utils/src/test/java/org/apache/nifi/util/file/monitor/TestCompoundUpdateMonitor.java
rename to nifi/commons/nifi-utils/src/test/java/org/apache/nifi/util/file/monitor/TestCompoundUpdateMonitor.java
diff --git a/commons/nifi-utils/src/test/java/org/apache/nifi/util/file/monitor/TestSynchronousFileWatcher.java b/nifi/commons/nifi-utils/src/test/java/org/apache/nifi/util/file/monitor/TestSynchronousFileWatcher.java
similarity index 100%
rename from commons/nifi-utils/src/test/java/org/apache/nifi/util/file/monitor/TestSynchronousFileWatcher.java
rename to nifi/commons/nifi-utils/src/test/java/org/apache/nifi/util/file/monitor/TestSynchronousFileWatcher.java
diff --git a/commons/nifi-utils/src/test/java/org/apache/nifi/util/timebuffer/TestRingBuffer.java b/nifi/commons/nifi-utils/src/test/java/org/apache/nifi/util/timebuffer/TestRingBuffer.java
similarity index 100%
rename from commons/nifi-utils/src/test/java/org/apache/nifi/util/timebuffer/TestRingBuffer.java
rename to nifi/commons/nifi-utils/src/test/java/org/apache/nifi/util/timebuffer/TestRingBuffer.java
diff --git a/commons/nifi-utils/src/test/java/org/apache/nifi/util/timebuffer/TestTimedBuffer.java b/nifi/commons/nifi-utils/src/test/java/org/apache/nifi/util/timebuffer/TestTimedBuffer.java
similarity index 100%
rename from commons/nifi-utils/src/test/java/org/apache/nifi/util/timebuffer/TestTimedBuffer.java
rename to nifi/commons/nifi-utils/src/test/java/org/apache/nifi/util/timebuffer/TestTimedBuffer.java
diff --git a/commons/nifi-utils/src/test/resources/logback-test.xml b/nifi/commons/nifi-utils/src/test/resources/logback-test.xml
similarity index 100%
rename from commons/nifi-utils/src/test/resources/logback-test.xml
rename to nifi/commons/nifi-utils/src/test/resources/logback-test.xml
diff --git a/commons/nifi-web-utils/pom.xml b/nifi/commons/nifi-web-utils/pom.xml
similarity index 100%
rename from commons/nifi-web-utils/pom.xml
rename to nifi/commons/nifi-web-utils/pom.xml
diff --git a/commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/ClientUtils.java b/nifi/commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/ClientUtils.java
similarity index 100%
rename from commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/ClientUtils.java
rename to nifi/commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/ClientUtils.java
diff --git a/commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/ObjectMapperResolver.java b/nifi/commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/ObjectMapperResolver.java
similarity index 100%
rename from commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/ObjectMapperResolver.java
rename to nifi/commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/ObjectMapperResolver.java
diff --git a/commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/WebUtils.java b/nifi/commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/WebUtils.java
similarity index 100%
rename from commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/WebUtils.java
rename to nifi/commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/WebUtils.java
diff --git a/commons/pom.xml b/nifi/commons/pom.xml
similarity index 100%
rename from commons/pom.xml
rename to nifi/commons/pom.xml
diff --git a/commons/processor-utilities/pom.xml b/nifi/commons/processor-utilities/pom.xml
similarity index 100%
rename from commons/processor-utilities/pom.xml
rename to nifi/commons/processor-utilities/pom.xml
diff --git a/commons/processor-utilities/src/main/java/org/apache/nifi/processor/util/FlowFileFilters.java b/nifi/commons/processor-utilities/src/main/java/org/apache/nifi/processor/util/FlowFileFilters.java
similarity index 100%
rename from commons/processor-utilities/src/main/java/org/apache/nifi/processor/util/FlowFileFilters.java
rename to nifi/commons/processor-utilities/src/main/java/org/apache/nifi/processor/util/FlowFileFilters.java
diff --git a/commons/processor-utilities/src/main/java/org/apache/nifi/processor/util/SSLProperties.java b/nifi/commons/processor-utilities/src/main/java/org/apache/nifi/processor/util/SSLProperties.java
similarity index 100%
rename from commons/processor-utilities/src/main/java/org/apache/nifi/processor/util/SSLProperties.java
rename to nifi/commons/processor-utilities/src/main/java/org/apache/nifi/processor/util/SSLProperties.java
diff --git a/commons/processor-utilities/src/main/java/org/apache/nifi/processor/util/StandardValidators.java b/nifi/commons/processor-utilities/src/main/java/org/apache/nifi/processor/util/StandardValidators.java
similarity index 100%
rename from commons/processor-utilities/src/main/java/org/apache/nifi/processor/util/StandardValidators.java
rename to nifi/commons/processor-utilities/src/main/java/org/apache/nifi/processor/util/StandardValidators.java
diff --git a/commons/processor-utilities/src/test/java/org/apache/nifi/processor/TestFormatUtils.java b/nifi/commons/processor-utilities/src/test/java/org/apache/nifi/processor/TestFormatUtils.java
similarity index 100%
rename from commons/processor-utilities/src/test/java/org/apache/nifi/processor/TestFormatUtils.java
rename to nifi/commons/processor-utilities/src/test/java/org/apache/nifi/processor/TestFormatUtils.java
diff --git a/commons/processor-utilities/src/test/java/org/apache/nifi/processor/util/TestStandardValidators.java b/nifi/commons/processor-utilities/src/test/java/org/apache/nifi/processor/util/TestStandardValidators.java
similarity index 100%
rename from commons/processor-utilities/src/test/java/org/apache/nifi/processor/util/TestStandardValidators.java
rename to nifi/commons/processor-utilities/src/test/java/org/apache/nifi/processor/util/TestStandardValidators.java
diff --git a/commons/wali/.gitignore b/nifi/commons/wali/.gitignore
similarity index 100%
rename from commons/wali/.gitignore
rename to nifi/commons/wali/.gitignore
diff --git a/commons/wali/pom.xml b/nifi/commons/wali/pom.xml
similarity index 100%
rename from commons/wali/pom.xml
rename to nifi/commons/wali/pom.xml
diff --git a/commons/wali/src/main/java/org/wali/MinimalLockingWriteAheadLog.java b/nifi/commons/wali/src/main/java/org/wali/MinimalLockingWriteAheadLog.java
similarity index 100%
rename from commons/wali/src/main/java/org/wali/MinimalLockingWriteAheadLog.java
rename to nifi/commons/wali/src/main/java/org/wali/MinimalLockingWriteAheadLog.java
diff --git a/commons/wali/src/main/java/org/wali/SerDe.java b/nifi/commons/wali/src/main/java/org/wali/SerDe.java
similarity index 100%
rename from commons/wali/src/main/java/org/wali/SerDe.java
rename to nifi/commons/wali/src/main/java/org/wali/SerDe.java
diff --git a/commons/wali/src/main/java/org/wali/SyncListener.java b/nifi/commons/wali/src/main/java/org/wali/SyncListener.java
similarity index 100%
rename from commons/wali/src/main/java/org/wali/SyncListener.java
rename to nifi/commons/wali/src/main/java/org/wali/SyncListener.java
diff --git a/commons/wali/src/main/java/org/wali/UpdateType.java b/nifi/commons/wali/src/main/java/org/wali/UpdateType.java
similarity index 100%
rename from commons/wali/src/main/java/org/wali/UpdateType.java
rename to nifi/commons/wali/src/main/java/org/wali/UpdateType.java
diff --git a/commons/wali/src/main/java/org/wali/WriteAheadRepository.java b/nifi/commons/wali/src/main/java/org/wali/WriteAheadRepository.java
similarity index 100%
rename from commons/wali/src/main/java/org/wali/WriteAheadRepository.java
rename to nifi/commons/wali/src/main/java/org/wali/WriteAheadRepository.java
diff --git a/commons/wali/src/test/java/org/wali/DummyRecord.java b/nifi/commons/wali/src/test/java/org/wali/DummyRecord.java
similarity index 100%
rename from commons/wali/src/test/java/org/wali/DummyRecord.java
rename to nifi/commons/wali/src/test/java/org/wali/DummyRecord.java
diff --git a/commons/wali/src/test/java/org/wali/DummyRecordSerde.java b/nifi/commons/wali/src/test/java/org/wali/DummyRecordSerde.java
similarity index 100%
rename from commons/wali/src/test/java/org/wali/DummyRecordSerde.java
rename to nifi/commons/wali/src/test/java/org/wali/DummyRecordSerde.java
diff --git a/commons/wali/src/test/java/org/wali/TestMinimalLockingWriteAheadLog.java b/nifi/commons/wali/src/test/java/org/wali/TestMinimalLockingWriteAheadLog.java
similarity index 100%
rename from commons/wali/src/test/java/org/wali/TestMinimalLockingWriteAheadLog.java
rename to nifi/commons/wali/src/test/java/org/wali/TestMinimalLockingWriteAheadLog.java
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/pom.xml b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/pom.xml
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/pom.xml
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/pom.xml
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/processors/script/ExecuteScript.java b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/processors/script/ExecuteScript.java
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/processors/script/ExecuteScript.java
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/processors/script/ExecuteScript.java
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ConverterScript.java b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ConverterScript.java
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ConverterScript.java
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ConverterScript.java
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/JRubyScriptFactory.java b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/JRubyScriptFactory.java
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/JRubyScriptFactory.java
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/JRubyScriptFactory.java
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/JavaScriptScriptFactory.java b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/JavaScriptScriptFactory.java
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/JavaScriptScriptFactory.java
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/JavaScriptScriptFactory.java
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/JythonScriptFactory.java b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/JythonScriptFactory.java
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/JythonScriptFactory.java
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/JythonScriptFactory.java
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/OutputStreamHandler.java b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/OutputStreamHandler.java
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/OutputStreamHandler.java
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/OutputStreamHandler.java
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ReaderScript.java b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ReaderScript.java
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ReaderScript.java
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ReaderScript.java
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/Script.java b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/Script.java
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/Script.java
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/Script.java
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ScriptEngineFactory.java b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ScriptEngineFactory.java
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ScriptEngineFactory.java
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ScriptEngineFactory.java
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ScriptFactory.java b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ScriptFactory.java
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ScriptFactory.java
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ScriptFactory.java
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/WriterScript.java b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/WriterScript.java
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/WriterScript.java
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/WriterScript.java
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/main/resources/docs/org.apache.nifi.processors.script.ExecuteScript/index.html b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/resources/docs/org.apache.nifi.processors.script.ExecuteScript/index.html
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/main/resources/docs/org.apache.nifi.processors.script.ExecuteScript/index.html
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/resources/docs/org.apache.nifi.processors.script.ExecuteScript/index.html
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteScript.java b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteScript.java
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteScript.java
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteScript.java
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/alwaysFail.js b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/alwaysFail.js
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/alwaysFail.js
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/alwaysFail.js
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/alwaysFail.py b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/alwaysFail.py
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/alwaysFail.py
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/alwaysFail.py
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/alwaysFail.rb b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/alwaysFail.rb
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/alwaysFail.rb
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/alwaysFail.rb
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/ffTest.js b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/ffTest.js
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/ffTest.js
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/ffTest.js
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/ffTest.py b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/ffTest.py
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/ffTest.py
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/ffTest.py
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/ffTest.rb b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/ffTest.rb
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/ffTest.rb
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/ffTest.rb
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/lib/Sub.py b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/lib/Sub.py
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/lib/Sub.py
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/lib/Sub.py
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/lib/sub.js b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/lib/sub.js
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/lib/sub.js
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/lib/sub.js
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/lib/sub.rb b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/lib/sub.rb
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/lib/sub.rb
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/lib/sub.rb
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/loadLocal.js b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/loadLocal.js
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/loadLocal.js
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/loadLocal.js
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/loadLocal.py b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/loadLocal.py
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/loadLocal.py
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/loadLocal.py
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/loadLocal.rb b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/loadLocal.rb
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/loadLocal.rb
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/loadLocal.rb
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/log4j.xml b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/log4j.xml
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/log4j.xml
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/log4j.xml
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/optionalValidators.js b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/optionalValidators.js
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/optionalValidators.js
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/optionalValidators.js
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/optionalValidators.py b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/optionalValidators.py
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/optionalValidators.py
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/optionalValidators.py
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/optionalValidators.rb b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/optionalValidators.rb
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/optionalValidators.rb
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/optionalValidators.rb
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/paramTest.js b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/paramTest.js
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/paramTest.js
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/paramTest.js
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/paramTest.py b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/paramTest.py
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/paramTest.py
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/paramTest.py
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/paramTest.rb b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/paramTest.rb
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/paramTest.rb
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/paramTest.rb
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/parseXml.js b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/parseXml.js
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/parseXml.js
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/parseXml.js
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readTest.js b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readTest.js
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readTest.js
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readTest.js
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readTest.py b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readTest.py
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readTest.py
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readTest.py
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readTest.rb b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readTest.rb
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readTest.rb
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readTest.rb
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readWithParams.js b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readWithParams.js
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readWithParams.js
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readWithParams.js
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readWithParams.py b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readWithParams.py
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readWithParams.py
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readWithParams.py
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readWithParams.rb b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readWithParams.rb
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readWithParams.rb
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/readWithParams.rb
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/routeTest.js b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/routeTest.js
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/routeTest.js
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/routeTest.js
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/routeTest.py b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/routeTest.py
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/routeTest.py
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/routeTest.py
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/routeTest.rb b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/routeTest.rb
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/routeTest.rb
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/routeTest.rb
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/simpleConverter.js b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/simpleConverter.js
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/simpleConverter.js
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/simpleConverter.js
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/simpleConverter.py b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/simpleConverter.py
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/simpleConverter.py
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/simpleConverter.py
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/simpleConverter.rb b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/simpleConverter.rb
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/simpleConverter.rb
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/simpleConverter.rb
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/writeTest.js b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/writeTest.js
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/writeTest.js
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/writeTest.js
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/writeTest.py b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/writeTest.py
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/writeTest.py
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/writeTest.py
diff --git a/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/writeTest.rb b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/writeTest.rb
similarity index 100%
rename from nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/writeTest.rb
rename to nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/test/resources/writeTest.rb
diff --git a/nar-bundles/execute-script-bundle/nar/pom.xml b/nifi/nar-bundles/execute-script-bundle/nar/pom.xml
similarity index 100%
rename from nar-bundles/execute-script-bundle/nar/pom.xml
rename to nifi/nar-bundles/execute-script-bundle/nar/pom.xml
diff --git a/nar-bundles/execute-script-bundle/pom.xml b/nifi/nar-bundles/execute-script-bundle/pom.xml
similarity index 100%
rename from nar-bundles/execute-script-bundle/pom.xml
rename to nifi/nar-bundles/execute-script-bundle/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/administration/.gitignore b/nifi/nar-bundles/framework-bundle/framework/administration/.gitignore
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/.gitignore
rename to nifi/nar-bundles/framework-bundle/framework/administration/.gitignore
diff --git a/nar-bundles/framework-bundle/framework/administration/pom.xml b/nifi/nar-bundles/framework-bundle/framework/administration/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/administration/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/AuditDataSourceFactoryBean.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/AuditDataSourceFactoryBean.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/AuditDataSourceFactoryBean.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/AuditDataSourceFactoryBean.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/RepositoryUtils.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/RepositoryUtils.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/RepositoryUtils.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/RepositoryUtils.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/UserDataSourceFactoryBean.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/UserDataSourceFactoryBean.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/UserDataSourceFactoryBean.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/UserDataSourceFactoryBean.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/ActionDAO.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/ActionDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/ActionDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/ActionDAO.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/AuthorityDAO.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/AuthorityDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/AuthorityDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/AuthorityDAO.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/DAOFactory.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/DAOFactory.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/DAOFactory.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/DAOFactory.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/DataAccessException.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/DataAccessException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/DataAccessException.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/DataAccessException.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/UserDAO.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/UserDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/UserDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/UserDAO.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/impl/DAOFactoryImpl.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/impl/DAOFactoryImpl.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/impl/DAOFactoryImpl.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/impl/DAOFactoryImpl.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardActionDAO.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardActionDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardActionDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardActionDAO.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardAuthorityDAO.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardAuthorityDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardAuthorityDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardAuthorityDAO.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardUserDAO.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardUserDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardUserDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardUserDAO.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/AccountDisabledException.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/AccountDisabledException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/AccountDisabledException.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/AccountDisabledException.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/AccountNotFoundException.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/AccountNotFoundException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/AccountNotFoundException.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/AccountNotFoundException.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/AccountPendingException.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/AccountPendingException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/AccountPendingException.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/AccountPendingException.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/AdministrationException.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/AdministrationException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/AdministrationException.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/AdministrationException.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/AuditService.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/AuditService.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/AuditService.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/AuditService.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/UserService.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/UserService.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/UserService.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/UserService.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/AbstractUserAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/AbstractUserAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/AbstractUserAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/AbstractUserAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/AddActionsAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/AddActionsAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/AddActionsAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/AddActionsAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/AdministrationAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/AdministrationAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/AdministrationAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/AdministrationAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/AuthorizeDownloadAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/AuthorizeDownloadAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/AuthorizeDownloadAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/AuthorizeDownloadAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/AuthorizeUserAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/AuthorizeUserAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/AuthorizeUserAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/AuthorizeUserAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/CreateUserAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/CreateUserAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/CreateUserAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/CreateUserAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/DeleteUserAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/DeleteUserAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/DeleteUserAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/DeleteUserAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/DisableUserAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/DisableUserAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/DisableUserAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/DisableUserAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/DisableUserGroupAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/DisableUserGroupAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/DisableUserGroupAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/DisableUserGroupAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/FindUserByDnAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/FindUserByDnAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/FindUserByDnAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/FindUserByDnAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/FindUserByIdAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/FindUserByIdAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/FindUserByIdAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/FindUserByIdAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/GetActionAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/GetActionAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/GetActionAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/GetActionAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/GetActionsAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/GetActionsAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/GetActionsAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/GetActionsAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/GetPreviousValues.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/GetPreviousValues.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/GetPreviousValues.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/GetPreviousValues.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/GetUserGroupAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/GetUserGroupAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/GetUserGroupAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/GetUserGroupAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/GetUsersAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/GetUsersAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/GetUsersAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/GetUsersAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/HasPendingUserAccounts.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/HasPendingUserAccounts.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/HasPendingUserAccounts.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/HasPendingUserAccounts.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/InvalidateUserAccountAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/InvalidateUserAccountAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/InvalidateUserAccountAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/InvalidateUserAccountAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/InvalidateUserGroupAccountsAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/InvalidateUserGroupAccountsAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/InvalidateUserGroupAccountsAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/InvalidateUserGroupAccountsAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/PurgeActionsAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/PurgeActionsAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/PurgeActionsAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/PurgeActionsAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/RequestUserAccountAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/RequestUserAccountAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/RequestUserAccountAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/RequestUserAccountAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/SeedUserAccountsAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/SeedUserAccountsAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/SeedUserAccountsAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/SeedUserAccountsAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UngroupUserAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UngroupUserAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UngroupUserAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UngroupUserAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UngroupUserGroupAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UngroupUserGroupAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UngroupUserGroupAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UngroupUserGroupAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UpdateUserAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UpdateUserAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UpdateUserAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UpdateUserAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UpdateUserAuthoritiesCacheAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UpdateUserAuthoritiesCacheAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UpdateUserAuthoritiesCacheAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UpdateUserAuthoritiesCacheAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UpdateUserCacheAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UpdateUserCacheAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UpdateUserCacheAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UpdateUserCacheAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UpdateUserGroupAction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UpdateUserGroupAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UpdateUserGroupAction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/action/UpdateUserGroupAction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/impl/StandardAuditService.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/impl/StandardAuditService.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/impl/StandardAuditService.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/impl/StandardAuditService.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/impl/StandardUserService.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/impl/StandardUserService.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/impl/StandardUserService.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/impl/StandardUserService.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/Transaction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/Transaction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/Transaction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/Transaction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionBuilder.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionBuilder.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionBuilder.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionBuilder.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionException.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionException.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionException.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/impl/StandardTransaction.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/impl/StandardTransaction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/impl/StandardTransaction.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/impl/StandardTransaction.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/impl/StandardTransactionBuilder.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/impl/StandardTransactionBuilder.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/impl/StandardTransactionBuilder.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/impl/StandardTransactionBuilder.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/authorization/AuthorityProviderFactoryBean.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/authorization/AuthorityProviderFactoryBean.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/authorization/AuthorityProviderFactoryBean.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/authorization/AuthorityProviderFactoryBean.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/authorization/StandardAuthorityProviderConfigurationContext.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/authorization/StandardAuthorityProviderConfigurationContext.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/authorization/StandardAuthorityProviderConfigurationContext.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/authorization/StandardAuthorityProviderConfigurationContext.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/authorization/StandardAuthorityProviderInitializationContext.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/authorization/StandardAuthorityProviderInitializationContext.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/authorization/StandardAuthorityProviderInitializationContext.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/authorization/StandardAuthorityProviderInitializationContext.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/history/History.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/history/History.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/history/History.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/history/History.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/history/HistoryQuery.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/history/HistoryQuery.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/history/HistoryQuery.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/history/HistoryQuery.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/history/PreviousValue.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/history/PreviousValue.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/history/PreviousValue.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/history/PreviousValue.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/user/AccountStatus.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/user/AccountStatus.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/user/AccountStatus.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/user/AccountStatus.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/user/NiFiUser.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/user/NiFiUser.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/user/NiFiUser.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/user/NiFiUser.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/user/NiFiUserGroup.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/user/NiFiUserGroup.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/user/NiFiUserGroup.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/user/NiFiUserGroup.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/resources/nifi-administration-context.xml b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/resources/nifi-administration-context.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/resources/nifi-administration-context.xml
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/resources/nifi-administration-context.xml
diff --git a/nar-bundles/framework-bundle/framework/administration/src/main/xsd/authority-providers.xsd b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/xsd/authority-providers.xsd
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/main/xsd/authority-providers.xsd
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/main/xsd/authority-providers.xsd
diff --git a/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/AuthorizeUserActionTest.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/AuthorizeUserActionTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/AuthorizeUserActionTest.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/AuthorizeUserActionTest.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/CreateUserActionTest.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/CreateUserActionTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/CreateUserActionTest.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/CreateUserActionTest.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/DisableUserActionTest.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/DisableUserActionTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/DisableUserActionTest.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/DisableUserActionTest.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/InvalidateUserAccountActionTest.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/InvalidateUserAccountActionTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/InvalidateUserAccountActionTest.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/InvalidateUserAccountActionTest.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/RequestUserAccountActionTest.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/RequestUserAccountActionTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/RequestUserAccountActionTest.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/RequestUserAccountActionTest.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/SeedUserAccountsActionTest.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/SeedUserAccountsActionTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/SeedUserAccountsActionTest.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/SeedUserAccountsActionTest.java
diff --git a/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/SetUserAuthoritiesActionTest.java b/nifi/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/SetUserAuthoritiesActionTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/SetUserAuthoritiesActionTest.java
rename to nifi/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/SetUserAuthoritiesActionTest.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/.gitignore b/nifi/nar-bundles/framework-bundle/framework/client-dto/.gitignore
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/.gitignore
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/.gitignore
diff --git a/nar-bundles/framework-bundle/framework/client-dto/pom.xml b/nifi/nar-bundles/framework-bundle/framework/client-dto/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/AboutDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/AboutDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/AboutDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/AboutDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/BannerDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/BannerDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/BannerDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/BannerDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinBoardDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinBoardDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinBoardDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinBoardDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinQueryDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinQueryDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinQueryDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinQueryDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ClusterDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ClusterDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ClusterDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ClusterDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectableDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectableDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectableDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectableDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectionDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectionDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectionDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectionDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerConfigurationDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerConfigurationDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerConfigurationDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerConfigurationDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/CounterDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/CounterDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/CounterDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/CounterDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/FunnelDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/FunnelDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/FunnelDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/FunnelDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/LabelDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/LabelDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/LabelDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/LabelDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NiFiComponentDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NiFiComponentDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NiFiComponentDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NiFiComponentDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeEventDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeEventDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeEventDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeEventDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeSystemDiagnosticsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeSystemDiagnosticsDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeSystemDiagnosticsDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeSystemDiagnosticsDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PortDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PortDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PortDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PortDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PositionDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PositionDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PositionDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PositionDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorConfigDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorConfigDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorConfigDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorConfigDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorHistoryDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorHistoryDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorHistoryDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorHistoryDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyHistoryDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyHistoryDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyHistoryDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyHistoryDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RelationshipDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RelationshipDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RelationshipDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RelationshipDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupContentsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupContentsDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupContentsDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupContentsDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RevisionDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RevisionDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RevisionDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RevisionDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/SnippetDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/SnippetDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/SnippetDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/SnippetDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/TemplateDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/TemplateDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/TemplateDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/TemplateDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/UserDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/UserDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/UserDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/UserDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/UserGroupDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/UserGroupDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/UserGroupDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/UserGroupDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryQueryDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryQueryDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryQueryDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryQueryDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ComponentDetailsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ComponentDetailsDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ComponentDetailsDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ComponentDetailsDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ProcessorDetailsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ProcessorDetailsDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ProcessorDetailsDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ProcessorDetailsDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/RemoteProcessGroupDetailsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/RemoteProcessGroupDetailsDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/RemoteProcessGroupDetailsDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/RemoteProcessGroupDetailsDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ActionDetailsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ActionDetailsDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ActionDetailsDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ActionDetailsDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConfigureDetailsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConfigureDetailsDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConfigureDetailsDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConfigureDetailsDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConnectDetailsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConnectDetailsDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConnectDetailsDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConnectDetailsDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/MoveDetailsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/MoveDetailsDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/MoveDetailsDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/MoveDetailsDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/PurgeDetailsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/PurgeDetailsDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/PurgeDetailsDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/PurgeDetailsDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/AttributeDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/AttributeDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/AttributeDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/AttributeDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceOptionsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceOptionsDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceOptionsDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceOptionsDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceRequestDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceRequestDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceRequestDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceRequestDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceResultsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceResultsDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceResultsDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceResultsDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceSearchableFieldDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceSearchableFieldDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceSearchableFieldDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceSearchableFieldDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageRequestDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageRequestDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageRequestDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageRequestDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageResultsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageResultsDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageResultsDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageResultsDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceLinkDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceLinkDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceLinkDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceLinkDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceNodeDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceNodeDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceNodeDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceNodeDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/search/ComponentSearchResultDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/search/ComponentSearchResultDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/search/ComponentSearchResultDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/search/ComponentSearchResultDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/search/NodeSearchResultDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/search/NodeSearchResultDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/search/NodeSearchResultDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/search/NodeSearchResultDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/search/SearchResultsDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/search/SearchResultsDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/search/SearchResultsDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/search/SearchResultsDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/search/UserGroupSearchResultDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/search/UserGroupSearchResultDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/search/UserGroupSearchResultDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/search/UserGroupSearchResultDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/search/UserSearchResultDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/search/UserSearchResultDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/search/UserSearchResultDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/search/UserSearchResultDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterConnectionStatusDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterConnectionStatusDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterConnectionStatusDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterConnectionStatusDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterPortStatusDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterPortStatusDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterPortStatusDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterPortStatusDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterProcessorStatusDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterProcessorStatusDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterProcessorStatusDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterProcessorStatusDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterRemoteProcessGroupStatusDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterRemoteProcessGroupStatusDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterRemoteProcessGroupStatusDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterRemoteProcessGroupStatusDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterStatusDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterStatusDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterStatusDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterStatusDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterStatusHistoryDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterStatusHistoryDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterStatusHistoryDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterStatusHistoryDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ControllerStatusDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ControllerStatusDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ControllerStatusDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ControllerStatusDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeConnectionStatusDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeConnectionStatusDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeConnectionStatusDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeConnectionStatusDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodePortStatusDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodePortStatusDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodePortStatusDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodePortStatusDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeProcessorStatusDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeProcessorStatusDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeProcessorStatusDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeProcessorStatusDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeRemoteProcessGroupStatusDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeRemoteProcessGroupStatusDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeRemoteProcessGroupStatusDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeRemoteProcessGroupStatusDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusHistoryDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusHistoryDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusHistoryDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusHistoryDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/PortStatusDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/PortStatusDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/PortStatusDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/PortStatusDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemotePortStatusDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemotePortStatusDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemotePortStatusDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemotePortStatusDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDescriptorDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDescriptorDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDescriptorDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDescriptorDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDetailDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDetailDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDetailDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDetailDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusSnapshotDTO.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusSnapshotDTO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusSnapshotDTO.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusSnapshotDTO.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/util/DateTimeAdapter.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/util/DateTimeAdapter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/util/DateTimeAdapter.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/util/DateTimeAdapter.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/util/TimeAdapter.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/util/TimeAdapter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/util/TimeAdapter.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/util/TimeAdapter.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/util/TimestampAdapter.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/util/TimestampAdapter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/util/TimestampAdapter.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/util/TimestampAdapter.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/AboutEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/AboutEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/AboutEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/AboutEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ActionEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ActionEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ActionEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ActionEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/AuthorityEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/AuthorityEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/AuthorityEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/AuthorityEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/BannerEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/BannerEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/BannerEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/BannerEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/BulletinBoardEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/BulletinBoardEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/BulletinBoardEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/BulletinBoardEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterConnectionStatusEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterConnectionStatusEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterConnectionStatusEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterConnectionStatusEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterPortStatusEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterPortStatusEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterPortStatusEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterPortStatusEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterProcessorStatusEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterProcessorStatusEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterProcessorStatusEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterProcessorStatusEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterRemoteProcessGroupStatusEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterRemoteProcessGroupStatusEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterRemoteProcessGroupStatusEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterRemoteProcessGroupStatusEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterSearchResultsEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterSearchResultsEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterSearchResultsEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterSearchResultsEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterStatusEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterStatusEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterStatusEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterStatusEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterStatusHistoryEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterStatusHistoryEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterStatusHistoryEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterStatusHistoryEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionsEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionsEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionsEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionsEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerConfigurationEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerConfigurationEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerConfigurationEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerConfigurationEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerStatusEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerStatusEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerStatusEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerStatusEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/CounterEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/CounterEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/CounterEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/CounterEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/CountersEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/CountersEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/CountersEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/CountersEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/Entity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/Entity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/Entity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/Entity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowSnippetEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowSnippetEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowSnippetEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowSnippetEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/FunnelEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/FunnelEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/FunnelEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/FunnelEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/FunnelsEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/FunnelsEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/FunnelsEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/FunnelsEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/HistoryEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/HistoryEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/HistoryEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/HistoryEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/InputPortEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/InputPortEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/InputPortEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/InputPortEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/InputPortsEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/InputPortsEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/InputPortsEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/InputPortsEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/LabelEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/LabelEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/LabelEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/LabelEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/LabelsEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/LabelsEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/LabelsEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/LabelsEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/LineageEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/LineageEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/LineageEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/LineageEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/NodeEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/NodeEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/NodeEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/NodeEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/NodeStatusEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/NodeStatusEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/NodeStatusEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/NodeStatusEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/NodeSystemDiagnosticsEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/NodeSystemDiagnosticsEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/NodeSystemDiagnosticsEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/NodeSystemDiagnosticsEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/OutputPortEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/OutputPortEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/OutputPortEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/OutputPortEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/OutputPortsEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/OutputPortsEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/OutputPortsEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/OutputPortsEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/PrioritizerTypesEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/PrioritizerTypesEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/PrioritizerTypesEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/PrioritizerTypesEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupStatusEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupStatusEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupStatusEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupStatusEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupsEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupsEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupsEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupsEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorHistoryEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorHistoryEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorHistoryEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorHistoryEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorTypesEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorTypesEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorTypesEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorTypesEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorsEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorsEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorsEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorsEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProvenanceEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProvenanceEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProvenanceEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProvenanceEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProvenanceEventEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProvenanceEventEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProvenanceEventEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProvenanceEventEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProvenanceOptionsEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProvenanceOptionsEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProvenanceOptionsEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ProvenanceOptionsEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupPortEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupPortEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupPortEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupPortEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupsEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupsEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupsEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupsEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/SearchResultsEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/SearchResultsEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/SearchResultsEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/SearchResultsEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/SnippetEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/SnippetEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/SnippetEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/SnippetEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/StatusHistoryEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/StatusHistoryEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/StatusHistoryEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/StatusHistoryEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/SystemDiagnosticsEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/SystemDiagnosticsEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/SystemDiagnosticsEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/SystemDiagnosticsEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/TemplateEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/TemplateEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/TemplateEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/TemplateEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/TemplatesEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/TemplatesEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/TemplatesEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/TemplatesEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/UserEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/UserEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/UserEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/UserEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/UserGroupEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/UserGroupEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/UserGroupEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/UserGroupEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/UserSearchResultsEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/UserSearchResultsEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/UserSearchResultsEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/UserSearchResultsEntity.java
diff --git a/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/UsersEntity.java b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/UsersEntity.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/UsersEntity.java
rename to nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/UsersEntity.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-authorization-provider/.gitignore b/nifi/nar-bundles/framework-bundle/framework/cluster-authorization-provider/.gitignore
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-authorization-provider/.gitignore
rename to nifi/nar-bundles/framework-bundle/framework/cluster-authorization-provider/.gitignore
diff --git a/nar-bundles/framework-bundle/framework/cluster-authorization-provider/pom.xml b/nifi/nar-bundles/framework-bundle/framework/cluster-authorization-provider/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-authorization-provider/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/cluster-authorization-provider/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/ClusterManagerAuthorizationProvider.java b/nifi/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/ClusterManagerAuthorizationProvider.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/ClusterManagerAuthorizationProvider.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/ClusterManagerAuthorizationProvider.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/NodeAuthorizationProvider.java b/nifi/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/NodeAuthorizationProvider.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/NodeAuthorizationProvider.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/NodeAuthorizationProvider.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/DoesDnExistMessage.java b/nifi/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/DoesDnExistMessage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/DoesDnExistMessage.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/DoesDnExistMessage.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/GetAuthoritiesMessage.java b/nifi/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/GetAuthoritiesMessage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/GetAuthoritiesMessage.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/GetAuthoritiesMessage.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/GetGroupForUserMessage.java b/nifi/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/GetGroupForUserMessage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/GetGroupForUserMessage.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/GetGroupForUserMessage.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/ProtocolMessage.java b/nifi/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/ProtocolMessage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/ProtocolMessage.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/ProtocolMessage.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/jaxb/JaxbProtocolUtils.java b/nifi/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/jaxb/JaxbProtocolUtils.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/jaxb/JaxbProtocolUtils.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/jaxb/JaxbProtocolUtils.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/jaxb/ObjectFactory.java b/nifi/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/jaxb/ObjectFactory.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/jaxb/ObjectFactory.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/jaxb/ObjectFactory.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/resources/META-INF/services/org.apache.nifi.authorization.AuthorityProvider b/nifi/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/resources/META-INF/services/org.apache.nifi.authorization.AuthorityProvider
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/resources/META-INF/services/org.apache.nifi.authorization.AuthorityProvider
rename to nifi/nar-bundles/framework-bundle/framework/cluster-authorization-provider/src/main/resources/META-INF/services/org.apache.nifi.authorization.AuthorityProvider
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/.gitignore b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/.gitignore
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/.gitignore
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/.gitignore
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/pom.xml b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ClusterManagerProtocolSender.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ClusterManagerProtocolSender.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ClusterManagerProtocolSender.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ClusterManagerProtocolSender.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ConnectionRequest.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ConnectionRequest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ConnectionRequest.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ConnectionRequest.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ConnectionResponse.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ConnectionResponse.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ConnectionResponse.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ConnectionResponse.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/Heartbeat.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/Heartbeat.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/Heartbeat.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/Heartbeat.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeBulletins.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeBulletins.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeBulletins.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeBulletins.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeProtocolSender.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeProtocolSender.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeProtocolSender.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeProtocolSender.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolContext.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolContext.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolContext.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolContext.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolException.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolException.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolException.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolHandler.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolHandler.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolHandler.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolHandler.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolListener.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolListener.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolListener.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolListener.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolMessageMarshaller.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolMessageMarshaller.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolMessageMarshaller.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolMessageMarshaller.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolMessageUnmarshaller.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolMessageUnmarshaller.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolMessageUnmarshaller.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolMessageUnmarshaller.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/StandardDataFlow.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/StandardDataFlow.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/StandardDataFlow.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/StandardDataFlow.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/UnknownServiceAddressException.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/UnknownServiceAddressException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/UnknownServiceAddressException.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/UnknownServiceAddressException.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderImpl.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderImpl.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderImpl.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderImpl.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderListener.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderListener.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderListener.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderListener.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceDiscovery.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceDiscovery.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceDiscovery.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceDiscovery.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceLocator.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceLocator.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceLocator.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceLocator.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcaster.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcaster.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcaster.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcaster.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/CopyingInputStream.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/CopyingInputStream.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/CopyingInputStream.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/CopyingInputStream.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListener.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListener.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListener.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListener.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/NodeProtocolSenderImpl.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/NodeProtocolSenderImpl.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/NodeProtocolSenderImpl.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/NodeProtocolSenderImpl.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/NodeProtocolSenderListener.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/NodeProtocolSenderListener.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/NodeProtocolSenderListener.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/NodeProtocolSenderListener.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListener.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListener.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListener.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListener.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/JaxbProtocolContext.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/JaxbProtocolContext.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/JaxbProtocolContext.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/JaxbProtocolContext.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedConnectionRequest.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedConnectionRequest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedConnectionRequest.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedConnectionRequest.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedConnectionResponse.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedConnectionResponse.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedConnectionResponse.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedConnectionResponse.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedCounter.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedCounter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedCounter.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedCounter.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedDataFlow.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedDataFlow.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedDataFlow.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedDataFlow.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedHeartbeat.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedHeartbeat.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedHeartbeat.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedHeartbeat.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedNodeBulletins.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedNodeBulletins.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedNodeBulletins.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedNodeBulletins.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedNodeIdentifier.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedNodeIdentifier.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedNodeIdentifier.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedNodeIdentifier.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ConnectionRequestAdapter.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ConnectionRequestAdapter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ConnectionRequestAdapter.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ConnectionRequestAdapter.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ConnectionResponseAdapter.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ConnectionResponseAdapter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ConnectionResponseAdapter.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ConnectionResponseAdapter.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/DataFlowAdapter.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/DataFlowAdapter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/DataFlowAdapter.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/DataFlowAdapter.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/HeartbeatAdapter.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/HeartbeatAdapter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/HeartbeatAdapter.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/HeartbeatAdapter.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/JaxbProtocolUtils.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/JaxbProtocolUtils.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/JaxbProtocolUtils.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/JaxbProtocolUtils.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/NodeBulletinsAdapter.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/NodeBulletinsAdapter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/NodeBulletinsAdapter.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/NodeBulletinsAdapter.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/NodeIdentifierAdapter.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/NodeIdentifierAdapter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/NodeIdentifierAdapter.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/NodeIdentifierAdapter.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ObjectFactory.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ObjectFactory.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ObjectFactory.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ObjectFactory.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ConnectionRequestMessage.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ConnectionRequestMessage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ConnectionRequestMessage.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ConnectionRequestMessage.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ConnectionResponseMessage.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ConnectionResponseMessage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ConnectionResponseMessage.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ConnectionResponseMessage.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ControllerStartupFailureMessage.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ControllerStartupFailureMessage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ControllerStartupFailureMessage.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ControllerStartupFailureMessage.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/DisconnectMessage.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/DisconnectMessage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/DisconnectMessage.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/DisconnectMessage.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ExceptionMessage.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ExceptionMessage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ExceptionMessage.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ExceptionMessage.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/FlowRequestMessage.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/FlowRequestMessage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/FlowRequestMessage.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/FlowRequestMessage.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/FlowResponseMessage.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/FlowResponseMessage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/FlowResponseMessage.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/FlowResponseMessage.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/HeartbeatMessage.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/HeartbeatMessage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/HeartbeatMessage.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/HeartbeatMessage.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/MulticastProtocolMessage.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/MulticastProtocolMessage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/MulticastProtocolMessage.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/MulticastProtocolMessage.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/NodeBulletinsMessage.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/NodeBulletinsMessage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/NodeBulletinsMessage.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/NodeBulletinsMessage.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/PingMessage.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/PingMessage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/PingMessage.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/PingMessage.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/PrimaryRoleAssignmentMessage.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/PrimaryRoleAssignmentMessage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/PrimaryRoleAssignmentMessage.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/PrimaryRoleAssignmentMessage.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ProtocolMessage.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ProtocolMessage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ProtocolMessage.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ProtocolMessage.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ReconnectionFailureMessage.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ReconnectionFailureMessage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ReconnectionFailureMessage.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ReconnectionFailureMessage.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ReconnectionRequestMessage.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ReconnectionRequestMessage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ReconnectionRequestMessage.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ReconnectionRequestMessage.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ReconnectionResponseMessage.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ReconnectionResponseMessage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ReconnectionResponseMessage.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ReconnectionResponseMessage.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ServiceBroadcastMessage.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ServiceBroadcastMessage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ServiceBroadcastMessage.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ServiceBroadcastMessage.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/spring/MulticastConfigurationFactoryBean.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/spring/MulticastConfigurationFactoryBean.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/spring/MulticastConfigurationFactoryBean.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/spring/MulticastConfigurationFactoryBean.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/spring/ServerSocketConfigurationFactoryBean.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/spring/ServerSocketConfigurationFactoryBean.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/spring/ServerSocketConfigurationFactoryBean.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/spring/ServerSocketConfigurationFactoryBean.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/spring/SocketConfigurationFactoryBean.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/spring/SocketConfigurationFactoryBean.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/spring/SocketConfigurationFactoryBean.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/spring/SocketConfigurationFactoryBean.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/resources/nifi-cluster-protocol-context.xml b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/resources/nifi-cluster-protocol-context.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/main/resources/nifi-cluster-protocol-context.xml
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/resources/nifi-cluster-protocol-context.xml
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderImplTest.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderImplTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderImplTest.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderImplTest.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceDiscoveryTest.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceDiscoveryTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceDiscoveryTest.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceDiscoveryTest.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceLocatorTest.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceLocatorTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceLocatorTest.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceLocatorTest.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/NodeProtocolSenderImplTest.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/NodeProtocolSenderImplTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/NodeProtocolSenderImplTest.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/NodeProtocolSenderImplTest.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/testutils/DelayedProtocolHandler.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/testutils/DelayedProtocolHandler.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/testutils/DelayedProtocolHandler.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/testutils/DelayedProtocolHandler.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/testutils/ReflexiveProtocolHandler.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/testutils/ReflexiveProtocolHandler.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/testutils/ReflexiveProtocolHandler.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/testutils/ReflexiveProtocolHandler.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-web/.gitignore b/nifi/nar-bundles/framework-bundle/framework/cluster-web/.gitignore
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-web/.gitignore
rename to nifi/nar-bundles/framework-bundle/framework/cluster-web/.gitignore
diff --git a/nar-bundles/framework-bundle/framework/cluster-web/pom.xml b/nifi/nar-bundles/framework-bundle/framework/cluster-web/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-web/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/cluster-web/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/cluster-web/src/main/java/org/apache/nifi/cluster/context/ClusterContext.java b/nifi/nar-bundles/framework-bundle/framework/cluster-web/src/main/java/org/apache/nifi/cluster/context/ClusterContext.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-web/src/main/java/org/apache/nifi/cluster/context/ClusterContext.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-web/src/main/java/org/apache/nifi/cluster/context/ClusterContext.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-web/src/main/java/org/apache/nifi/cluster/context/ClusterContextImpl.java b/nifi/nar-bundles/framework-bundle/framework/cluster-web/src/main/java/org/apache/nifi/cluster/context/ClusterContextImpl.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-web/src/main/java/org/apache/nifi/cluster/context/ClusterContextImpl.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-web/src/main/java/org/apache/nifi/cluster/context/ClusterContextImpl.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-web/src/main/java/org/apache/nifi/cluster/context/ClusterContextThreadLocal.java b/nifi/nar-bundles/framework-bundle/framework/cluster-web/src/main/java/org/apache/nifi/cluster/context/ClusterContextThreadLocal.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-web/src/main/java/org/apache/nifi/cluster/context/ClusterContextThreadLocal.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-web/src/main/java/org/apache/nifi/cluster/context/ClusterContextThreadLocal.java
diff --git a/nar-bundles/framework-bundle/framework/cluster-web/src/main/java/org/apache/nifi/web/ClusterAwareOptimisticLockingManager.java b/nifi/nar-bundles/framework-bundle/framework/cluster-web/src/main/java/org/apache/nifi/web/ClusterAwareOptimisticLockingManager.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster-web/src/main/java/org/apache/nifi/web/ClusterAwareOptimisticLockingManager.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster-web/src/main/java/org/apache/nifi/web/ClusterAwareOptimisticLockingManager.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/.gitignore b/nifi/nar-bundles/framework-bundle/framework/cluster/.gitignore
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/.gitignore
rename to nifi/nar-bundles/framework-bundle/framework/cluster/.gitignore
diff --git a/nar-bundles/framework-bundle/framework/cluster/pom.xml b/nifi/nar-bundles/framework-bundle/framework/cluster/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/cluster/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/client/MulticastTestClient.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/client/MulticastTestClient.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/client/MulticastTestClient.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/client/MulticastTestClient.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/event/Event.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/event/Event.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/event/Event.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/event/Event.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/event/EventManager.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/event/EventManager.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/event/EventManager.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/event/EventManager.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/event/impl/EventManagerImpl.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/event/impl/EventManagerImpl.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/event/impl/EventManagerImpl.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/event/impl/EventManagerImpl.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/firewall/ClusterNodeFirewall.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/firewall/ClusterNodeFirewall.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/firewall/ClusterNodeFirewall.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/firewall/ClusterNodeFirewall.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/firewall/impl/FileBasedClusterNodeFirewall.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/firewall/impl/FileBasedClusterNodeFirewall.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/firewall/impl/FileBasedClusterNodeFirewall.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/firewall/impl/FileBasedClusterNodeFirewall.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/ClusterDataFlow.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/ClusterDataFlow.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/ClusterDataFlow.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/ClusterDataFlow.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DaoException.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DaoException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DaoException.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DaoException.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowDao.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowDao.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowDao.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowDao.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowManagementService.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowManagementService.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowManagementService.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowManagementService.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/StaleFlowException.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/StaleFlowException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/StaleFlowException.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/StaleFlowException.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowDaoImpl.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowDaoImpl.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowDaoImpl.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowDaoImpl.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImpl.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImpl.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImpl.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImpl.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/ClusterManager.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/ClusterManager.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/ClusterManager.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/ClusterManager.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/HttpClusterManager.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/HttpClusterManager.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/HttpClusterManager.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/HttpClusterManager.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/HttpRequestReplicator.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/HttpRequestReplicator.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/HttpRequestReplicator.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/HttpRequestReplicator.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/HttpResponseMapper.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/HttpResponseMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/HttpResponseMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/HttpResponseMapper.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/NodeResponse.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/NodeResponse.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/NodeResponse.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/NodeResponse.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/BlockedByFirewallException.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/BlockedByFirewallException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/BlockedByFirewallException.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/BlockedByFirewallException.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/ClusterException.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/ClusterException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/ClusterException.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/ClusterException.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/ConnectingNodeMutableRequestException.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/ConnectingNodeMutableRequestException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/ConnectingNodeMutableRequestException.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/ConnectingNodeMutableRequestException.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/DisconnectedNodeMutableRequestException.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/DisconnectedNodeMutableRequestException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/DisconnectedNodeMutableRequestException.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/DisconnectedNodeMutableRequestException.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalClusterStateException.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalClusterStateException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalClusterStateException.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalClusterStateException.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeDeletionException.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeDeletionException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeDeletionException.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeDeletionException.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeDisconnectionException.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeDisconnectionException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeDisconnectionException.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeDisconnectionException.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeReconnectionException.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeReconnectionException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeReconnectionException.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeReconnectionException.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IneligiblePrimaryNodeException.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IneligiblePrimaryNodeException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IneligiblePrimaryNodeException.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IneligiblePrimaryNodeException.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/MutableRequestException.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/MutableRequestException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/MutableRequestException.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/MutableRequestException.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NoConnectedNodesException.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NoConnectedNodesException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NoConnectedNodesException.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NoConnectedNodesException.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NoResponseFromNodesException.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NoResponseFromNodesException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NoResponseFromNodesException.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NoResponseFromNodesException.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NodeDisconnectionException.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NodeDisconnectionException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NodeDisconnectionException.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NodeDisconnectionException.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NodeReconnectionException.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NodeReconnectionException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NodeReconnectionException.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NodeReconnectionException.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/PrimaryRoleAssignmentException.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/PrimaryRoleAssignmentException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/PrimaryRoleAssignmentException.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/PrimaryRoleAssignmentException.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/SafeModeMutableRequestException.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/SafeModeMutableRequestException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/SafeModeMutableRequestException.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/SafeModeMutableRequestException.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/UnknownNodeException.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/UnknownNodeException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/UnknownNodeException.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/UnknownNodeException.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/UriConstructionException.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/UriConstructionException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/UriConstructionException.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/exception/UriConstructionException.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/ClusteredEventAccess.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/ClusteredEventAccess.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/ClusteredEventAccess.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/ClusteredEventAccess.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/ClusteredReportingContext.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/ClusteredReportingContext.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/ClusteredReportingContext.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/ClusteredReportingContext.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImpl.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImpl.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImpl.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImpl.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpResponseMapperImpl.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpResponseMapperImpl.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpResponseMapperImpl.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpResponseMapperImpl.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/node/Node.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/spring/ClusterManagerProtocolServiceLocatorFactoryBean.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/spring/ClusterManagerProtocolServiceLocatorFactoryBean.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/spring/ClusterManagerProtocolServiceLocatorFactoryBean.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/spring/ClusterManagerProtocolServiceLocatorFactoryBean.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/spring/FileBasedClusterNodeFirewallFactoryBean.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/spring/FileBasedClusterNodeFirewallFactoryBean.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/spring/FileBasedClusterNodeFirewallFactoryBean.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/spring/FileBasedClusterNodeFirewallFactoryBean.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/spring/WebClusterManagerFactoryBean.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/spring/WebClusterManagerFactoryBean.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/spring/WebClusterManagerFactoryBean.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/spring/WebClusterManagerFactoryBean.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/controller/reporting/ClusteredReportingTaskNode.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/controller/reporting/ClusteredReportingTaskNode.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/controller/reporting/ClusteredReportingTaskNode.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/controller/reporting/ClusteredReportingTaskNode.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/resources/nifi-cluster-manager-context.xml b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/resources/nifi-cluster-manager-context.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/main/resources/nifi-cluster-manager-context.xml
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/main/resources/nifi-cluster-manager-context.xml
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/event/impl/EventManagerImplTest.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/event/impl/EventManagerImplTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/event/impl/EventManagerImplTest.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/event/impl/EventManagerImplTest.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/firewall/impl/FileBasedClusterNodeFirewallTest.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/firewall/impl/FileBasedClusterNodeFirewallTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/firewall/impl/FileBasedClusterNodeFirewallTest.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/firewall/impl/FileBasedClusterNodeFirewallTest.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImplTest.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImplTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImplTest.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImplTest.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImplTest.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImplTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImplTest.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImplTest.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/impl/HttpResponseMapperImplTest.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/impl/HttpResponseMapperImplTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/impl/HttpResponseMapperImplTest.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/impl/HttpResponseMapperImplTest.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/impl/TestWebClusterManager.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/impl/TestWebClusterManager.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/impl/TestWebClusterManager.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/impl/TestWebClusterManager.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpRequest.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpRequest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpRequest.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpRequest.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpResponse.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpResponse.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpResponse.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpResponse.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpResponseAction.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpResponseAction.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpResponseAction.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpResponseAction.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpServer.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpServer.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpServer.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpServer.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderImplTest.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderImplTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderImplTest.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderImplTest.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceLocatorTest.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceLocatorTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceLocatorTest.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceLocatorTest.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/NodeProtocolSenderImplTest.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/NodeProtocolSenderImplTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/NodeProtocolSenderImplTest.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/NodeProtocolSenderImplTest.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListenerTest.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListenerTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListenerTest.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListenerTest.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/testutils/DelayedProtocolHandler.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/testutils/DelayedProtocolHandler.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/testutils/DelayedProtocolHandler.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/testutils/DelayedProtocolHandler.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/testutils/ReflexiveProtocolHandler.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/testutils/ReflexiveProtocolHandler.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/testutils/ReflexiveProtocolHandler.java
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/testutils/ReflexiveProtocolHandler.java
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/resources/logback-test.xml b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/resources/logback-test.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/test/resources/logback-test.xml
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/test/resources/logback-test.xml
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/resources/org/apache/nifi/cluster/firewall/impl/empty.txt b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/resources/org/apache/nifi/cluster/firewall/impl/empty.txt
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/test/resources/org/apache/nifi/cluster/firewall/impl/empty.txt
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/test/resources/org/apache/nifi/cluster/firewall/impl/empty.txt
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/resources/org/apache/nifi/cluster/firewall/impl/ips.txt b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/resources/org/apache/nifi/cluster/firewall/impl/ips.txt
similarity index 100%
rename from nar-bundles/framework-bundle/framework/cluster/src/test/resources/org/apache/nifi/cluster/firewall/impl/ips.txt
rename to nifi/nar-bundles/framework-bundle/framework/cluster/src/test/resources/org/apache/nifi/cluster/firewall/impl/ips.txt
diff --git a/nar-bundles/framework-bundle/framework/core-api/.gitignore b/nifi/nar-bundles/framework-bundle/framework/core-api/.gitignore
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/.gitignore
rename to nifi/nar-bundles/framework-bundle/framework/core-api/.gitignore
diff --git a/nar-bundles/framework-bundle/framework/core-api/pom.xml b/nifi/nar-bundles/framework-bundle/framework/core-api/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/core-api/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/AdaptedNodeInformation.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/AdaptedNodeInformation.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/AdaptedNodeInformation.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/AdaptedNodeInformation.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/ClusterNodeInformation.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/ClusterNodeInformation.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/ClusterNodeInformation.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/ClusterNodeInformation.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/NodeInformant.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/NodeInformant.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/NodeInformant.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/NodeInformant.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/NodeInformation.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/NodeInformation.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/NodeInformation.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/NodeInformation.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/NodeInformationAdapter.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/NodeInformationAdapter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/NodeInformationAdapter.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/NodeInformationAdapter.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/protocol/DataFlow.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/protocol/DataFlow.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/protocol/DataFlow.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/cluster/protocol/DataFlow.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Connectable.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Connectable.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Connectable.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Connectable.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/ConnectableType.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/ConnectableType.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/ConnectableType.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/ConnectableType.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Connection.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Connection.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Connection.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Connection.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Funnel.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Funnel.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Funnel.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Funnel.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Port.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Port.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Port.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Port.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Position.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Position.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Position.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Position.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Size.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Size.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Size.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/connectable/Size.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/AbstractPort.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/AbstractPort.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/AbstractPort.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/AbstractPort.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/Availability.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/Availability.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/Availability.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/Availability.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ConfiguredComponent.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ConfiguredComponent.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ConfiguredComponent.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ConfiguredComponent.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ContentAvailability.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ContentAvailability.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ContentAvailability.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ContentAvailability.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/Counter.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/Counter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/Counter.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/Counter.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/EventBasedWorker.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/EventBasedWorker.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/EventBasedWorker.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/EventBasedWorker.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/Heartbeater.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/Heartbeater.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/Heartbeater.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/Heartbeater.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ProcessScheduler.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ProcessScheduler.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ProcessScheduler.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ProcessScheduler.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ProcessorNode.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ProcessorNode.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ProcessorNode.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ProcessorNode.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ReportingTaskNode.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ReportingTaskNode.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ReportingTaskNode.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ReportingTaskNode.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/StandardFunnel.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/StandardFunnel.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/StandardFunnel.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/StandardFunnel.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ValidationContextFactory.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ValidationContextFactory.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ValidationContextFactory.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/ValidationContextFactory.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/WorkerQueue.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/WorkerQueue.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/WorkerQueue.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/WorkerQueue.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/exception/CommunicationsException.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/exception/CommunicationsException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/exception/CommunicationsException.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/exception/CommunicationsException.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/exception/ControllerServiceAlreadyExistsException.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/exception/ControllerServiceAlreadyExistsException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/exception/ControllerServiceAlreadyExistsException.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/exception/ControllerServiceAlreadyExistsException.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/exception/ControllerServiceNotFoundException.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/exception/ControllerServiceNotFoundException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/exception/ControllerServiceNotFoundException.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/exception/ControllerServiceNotFoundException.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/exception/ProcessorInstantiationException.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/exception/ProcessorInstantiationException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/exception/ProcessorInstantiationException.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/exception/ProcessorInstantiationException.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/exception/ProcessorLifeCycleException.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/exception/ProcessorLifeCycleException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/exception/ProcessorLifeCycleException.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/exception/ProcessorLifeCycleException.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/label/Label.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/label/Label.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/label/Label.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/label/Label.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/reporting/ReportingTaskInstantiationException.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/reporting/ReportingTaskInstantiationException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/reporting/ReportingTaskInstantiationException.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/reporting/ReportingTaskInstantiationException.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/ContentNotFoundException.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/ContentNotFoundException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/ContentNotFoundException.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/ContentNotFoundException.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/CounterRepository.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/CounterRepository.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/CounterRepository.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/CounterRepository.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/FlowFileEvent.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/FlowFileEvent.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/FlowFileEvent.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/FlowFileEvent.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/FlowFileEventRepository.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/FlowFileEventRepository.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/FlowFileEventRepository.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/FlowFileEventRepository.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/RepositoryStatusReport.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/RepositoryStatusReport.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/RepositoryStatusReport.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/RepositoryStatusReport.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceNode.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceNode.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceNode.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceNode.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceProvider.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceProvider.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceProvider.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceProvider.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceReference.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceReference.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceReference.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceReference.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/events/BulletinFactory.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/events/BulletinFactory.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/events/BulletinFactory.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/events/BulletinFactory.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/events/BulletinProcessingStrategy.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/events/BulletinProcessingStrategy.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/events/BulletinProcessingStrategy.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/events/BulletinProcessingStrategy.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/events/ComponentBulletin.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/events/ComponentBulletin.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/events/ComponentBulletin.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/events/ComponentBulletin.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/events/SystemBulletin.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/events/SystemBulletin.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/events/SystemBulletin.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/events/SystemBulletin.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/groups/ProcessGroupCounts.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/groups/ProcessGroupCounts.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/groups/ProcessGroupCounts.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/groups/ProcessGroupCounts.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/groups/RemoteProcessGroup.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/groups/RemoteProcessGroup.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/groups/RemoteProcessGroup.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/groups/RemoteProcessGroup.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/groups/RemoteProcessGroupPortDescriptor.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/groups/RemoteProcessGroupPortDescriptor.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/groups/RemoteProcessGroupPortDescriptor.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/groups/RemoteProcessGroupPortDescriptor.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/logging/LogMessage.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/logging/LogMessage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/logging/LogMessage.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/logging/LogMessage.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/logging/LogObserver.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/logging/LogObserver.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/logging/LogObserver.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/logging/LogObserver.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/logging/LogRepository.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/logging/LogRepository.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/logging/LogRepository.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/logging/LogRepository.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/logging/LogRepositoryFactory.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/logging/LogRepositoryFactory.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/logging/LogRepositoryFactory.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/logging/LogRepositoryFactory.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/nar/NarCloseable.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/nar/NarCloseable.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/nar/NarCloseable.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/nar/NarCloseable.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/nar/NarThreadContextClassLoader.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/nar/NarThreadContextClassLoader.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/nar/NarThreadContextClassLoader.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/nar/NarThreadContextClassLoader.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/Peer.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/Peer.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/Peer.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/Peer.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/PeerStatus.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/PeerStatus.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/PeerStatus.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/PeerStatus.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/PortAuthorizationResult.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/PortAuthorizationResult.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/PortAuthorizationResult.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/PortAuthorizationResult.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/RemoteAuthorizationState.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/RemoteAuthorizationState.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/RemoteAuthorizationState.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/RemoteAuthorizationState.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/RemoteGroupPort.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/RemoteGroupPort.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/RemoteGroupPort.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/RemoteGroupPort.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/RootGroupPort.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/RootGroupPort.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/RootGroupPort.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/RootGroupPort.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/TransferDirection.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/TransferDirection.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/TransferDirection.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/TransferDirection.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/VersionedRemoteResource.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/VersionedRemoteResource.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/VersionedRemoteResource.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/VersionedRemoteResource.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/codec/FlowFileCodec.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/codec/FlowFileCodec.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/codec/FlowFileCodec.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/codec/FlowFileCodec.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/BadRequestException.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/BadRequestException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/BadRequestException.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/BadRequestException.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/HandshakeException.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/HandshakeException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/HandshakeException.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/HandshakeException.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/NotAuthorizedException.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/NotAuthorizedException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/NotAuthorizedException.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/NotAuthorizedException.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/PortNotRunningException.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/PortNotRunningException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/PortNotRunningException.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/PortNotRunningException.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/ProtocolException.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/ProtocolException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/ProtocolException.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/ProtocolException.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/RequestExpiredException.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/RequestExpiredException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/RequestExpiredException.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/RequestExpiredException.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/UnknownPortException.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/UnknownPortException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/UnknownPortException.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/exception/UnknownPortException.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/ClientProtocol.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/ClientProtocol.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/ClientProtocol.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/ClientProtocol.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/CommunicationsInput.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/CommunicationsInput.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/CommunicationsInput.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/CommunicationsInput.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/CommunicationsOutput.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/CommunicationsOutput.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/CommunicationsOutput.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/CommunicationsOutput.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/CommunicationsSession.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/CommunicationsSession.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/CommunicationsSession.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/CommunicationsSession.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/RequestType.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/RequestType.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/RequestType.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/RequestType.java
diff --git a/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/ServerProtocol.java b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/ServerProtocol.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/ServerProtocol.java
rename to nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/protocol/ServerProtocol.java
diff --git a/nar-bundles/framework-bundle/framework/core/.gitignore b/nifi/nar-bundles/framework-bundle/framework/core/.gitignore
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/.gitignore
rename to nifi/nar-bundles/framework-bundle/framework/core/.gitignore
diff --git a/nar-bundles/framework-bundle/framework/core/pom.xml b/nifi/nar-bundles/framework-bundle/framework/core/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/core/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/cluster/BulletinsPayload.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/cluster/BulletinsPayload.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/cluster/BulletinsPayload.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/cluster/BulletinsPayload.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/cluster/ConnectionException.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/cluster/ConnectionException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/cluster/ConnectionException.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/cluster/ConnectionException.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/cluster/DisconnectionException.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/cluster/DisconnectionException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/cluster/DisconnectionException.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/cluster/DisconnectionException.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/cluster/HeartbeatPayload.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/cluster/HeartbeatPayload.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/cluster/HeartbeatPayload.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/cluster/HeartbeatPayload.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/connectable/LocalPort.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/connectable/LocalPort.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/connectable/LocalPort.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/connectable/LocalPort.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/connectable/StandardConnection.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/connectable/StandardConnection.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/connectable/StandardConnection.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/connectable/StandardConnection.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/EventDrivenWorkerQueue.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/EventDrivenWorkerQueue.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/EventDrivenWorkerQueue.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/EventDrivenWorkerQueue.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowSerializationException.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowSerializationException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowSerializationException.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowSerializationException.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowSerializer.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowSerializer.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowSerializer.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowSerializer.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowSynchronizationException.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowSynchronizationException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowSynchronizationException.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowSynchronizationException.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowSynchronizer.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowSynchronizer.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowSynchronizer.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowSynchronizer.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowUnmarshaller.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowUnmarshaller.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowUnmarshaller.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowUnmarshaller.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/SnippetManager.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/SnippetManager.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/SnippetManager.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/SnippetManager.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardCounter.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardCounter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardCounter.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardCounter.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowSerializer.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowSerializer.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowSerializer.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowSerializer.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowService.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardSnippet.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardSnippet.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardSnippet.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardSnippet.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/Template.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/Template.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/Template.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/Template.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/TemplateManager.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/TemplateManager.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/TemplateManager.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/TemplateManager.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/UninheritableFlowException.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/UninheritableFlowException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/UninheritableFlowException.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/UninheritableFlowException.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/exception/FlowFileConsumptionException.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/exception/FlowFileConsumptionException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/exception/FlowFileConsumptionException.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/exception/FlowFileConsumptionException.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/exception/ReportingTaskInstantiationException.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/exception/ReportingTaskInstantiationException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/exception/ReportingTaskInstantiationException.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/exception/ReportingTaskInstantiationException.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/exception/ValidationException.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/exception/ValidationException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/exception/ValidationException.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/exception/ValidationException.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/label/StandardLabel.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/label/StandardLabel.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/label/StandardLabel.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/label/StandardLabel.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/reporting/StandardReportingContext.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/reporting/StandardReportingContext.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/reporting/StandardReportingContext.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/reporting/StandardReportingContext.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/reporting/StandardReportingInitializationContext.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/reporting/StandardReportingInitializationContext.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/reporting/StandardReportingInitializationContext.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/reporting/StandardReportingInitializationContext.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/reporting/StandardReportingTaskNode.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/reporting/StandardReportingTaskNode.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/reporting/StandardReportingTaskNode.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/reporting/StandardReportingTaskNode.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/BatchingSessionFactory.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/BatchingSessionFactory.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/BatchingSessionFactory.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/BatchingSessionFactory.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/ConnectionSwapInfo.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/ConnectionSwapInfo.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/ConnectionSwapInfo.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/ConnectionSwapInfo.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/ProcessContext.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/ProcessContext.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/ProcessContext.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/ProcessContext.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/ProvenanceEventEnricher.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/ProvenanceEventEnricher.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/ProvenanceEventEnricher.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/ProvenanceEventEnricher.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/RepositoryPurgeException.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/RepositoryPurgeException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/RepositoryPurgeException.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/RepositoryPurgeException.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/RingBufferEventRepository.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/RingBufferEventRepository.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/RingBufferEventRepository.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/RingBufferEventRepository.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardCounterRepository.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardCounterRepository.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardCounterRepository.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardCounterRepository.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardFlowFileEvent.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardFlowFileEvent.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardFlowFileEvent.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardFlowFileEvent.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardFlowFileRecord.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardFlowFileRecord.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardFlowFileRecord.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardFlowFileRecord.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSessionFactory.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSessionFactory.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSessionFactory.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSessionFactory.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProvenanceReporter.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProvenanceReporter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProvenanceReporter.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardProvenanceReporter.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardRepositoryRecord.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardRepositoryRecord.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardRepositoryRecord.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardRepositoryRecord.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardRepositoryStatusReport.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardRepositoryStatusReport.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardRepositoryStatusReport.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/StandardRepositoryStatusReport.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileFlowFileRepository.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileFlowFileRepository.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileFlowFileRepository.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileFlowFileRepository.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/WriteAheadFlowFileRepository.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/WriteAheadFlowFileRepository.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/WriteAheadFlowFileRepository.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/WriteAheadFlowFileRepository.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/claim/ContentDirection.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/claim/ContentDirection.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/claim/ContentDirection.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/claim/ContentDirection.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/claim/StandardContentClaim.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/claim/StandardContentClaim.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/claim/StandardContentClaim.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/claim/StandardContentClaim.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/claim/StandardContentClaimManager.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/claim/StandardContentClaimManager.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/claim/StandardContentClaimManager.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/claim/StandardContentClaimManager.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/ArrayManagedOutputStream.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/ArrayManagedOutputStream.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/ArrayManagedOutputStream.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/ArrayManagedOutputStream.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/ByteCountingInputStream.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/ByteCountingInputStream.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/ByteCountingInputStream.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/ByteCountingInputStream.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/ByteCountingOutputStream.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/ByteCountingOutputStream.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/ByteCountingOutputStream.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/ByteCountingOutputStream.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/DisableOnCloseOutputStream.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/DisableOnCloseOutputStream.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/DisableOnCloseOutputStream.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/DisableOnCloseOutputStream.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/FlowFileAccessInputStream.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/FlowFileAccessInputStream.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/FlowFileAccessInputStream.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/FlowFileAccessInputStream.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/FlowFileAccessOutputStream.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/FlowFileAccessOutputStream.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/FlowFileAccessOutputStream.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/FlowFileAccessOutputStream.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/LimitedInputStream.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/LimitedInputStream.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/LimitedInputStream.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/LimitedInputStream.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/LongHolder.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/LongHolder.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/LongHolder.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/LongHolder.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/MemoryManager.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/MemoryManager.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/MemoryManager.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/MemoryManager.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/SyncOnCloseOutputStream.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/SyncOnCloseOutputStream.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/SyncOnCloseOutputStream.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/io/SyncOnCloseOutputStream.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/ConnectableProcessContext.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/ConnectableProcessContext.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/ConnectableProcessContext.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/ConnectableProcessContext.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/ProcessContextFactory.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/ProcessContextFactory.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/ProcessContextFactory.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/ProcessContextFactory.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/QuartzSchedulingAgent.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/QuartzSchedulingAgent.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/QuartzSchedulingAgent.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/QuartzSchedulingAgent.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/ScheduleState.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/ScheduleState.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/ScheduleState.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/ScheduleState.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/SchedulingAgent.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/SchedulingAgent.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/SchedulingAgent.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/SchedulingAgent.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/TimerDrivenSchedulingAgent.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/TimerDrivenSchedulingAgent.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/TimerDrivenSchedulingAgent.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/scheduling/TimerDrivenSchedulingAgent.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/ControllerServiceLoader.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/ControllerServiceLoader.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/ControllerServiceLoader.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/ControllerServiceLoader.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/StandardConfigurationContext.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/StandardConfigurationContext.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/StandardConfigurationContext.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/StandardConfigurationContext.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceInitializationContext.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceInitializationContext.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceInitializationContext.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceInitializationContext.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceReference.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceReference.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceReference.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceReference.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/status/history/StandardMetricDescriptor.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/status/history/StandardMetricDescriptor.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/status/history/StandardMetricDescriptor.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/status/history/StandardMetricDescriptor.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/status/history/StandardStatusHistory.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/status/history/StandardStatusHistory.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/status/history/StandardStatusHistory.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/status/history/StandardStatusHistory.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/status/history/StandardStatusSnapshot.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/status/history/StandardStatusSnapshot.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/status/history/StandardStatusSnapshot.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/status/history/StandardStatusSnapshot.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/status/history/StatusHistoryUtil.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/status/history/StatusHistoryUtil.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/status/history/StatusHistoryUtil.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/status/history/StatusHistoryUtil.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/status/history/VolatileComponentStatusRepository.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/status/history/VolatileComponentStatusRepository.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/status/history/VolatileComponentStatusRepository.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/status/history/VolatileComponentStatusRepository.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunProcessorTask.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunProcessorTask.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunProcessorTask.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunProcessorTask.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/tasks/ExpireFlowFiles.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/tasks/ExpireFlowFiles.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/tasks/ExpireFlowFiles.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/tasks/ExpireFlowFiles.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/tasks/ReportingTaskWrapper.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/tasks/ReportingTaskWrapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/tasks/ReportingTaskWrapper.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/tasks/ReportingTaskWrapper.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/diagnostics/DiagnosticUtils.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/diagnostics/DiagnosticUtils.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/diagnostics/DiagnosticUtils.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/diagnostics/DiagnosticUtils.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/diagnostics/GarbageCollection.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/diagnostics/GarbageCollection.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/diagnostics/GarbageCollection.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/diagnostics/GarbageCollection.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/diagnostics/StorageUsage.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/diagnostics/StorageUsage.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/diagnostics/StorageUsage.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/diagnostics/StorageUsage.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnostics.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnostics.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnostics.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnostics.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnosticsFactory.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnosticsFactory.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnosticsFactory.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnosticsFactory.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/encrypt/EncryptionException.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/encrypt/EncryptionException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/encrypt/EncryptionException.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/encrypt/EncryptionException.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/encrypt/StringEncryptor.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/encrypt/StringEncryptor.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/encrypt/StringEncryptor.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/encrypt/StringEncryptor.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/engine/FlowEngine.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/engine/FlowEngine.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/engine/FlowEngine.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/engine/FlowEngine.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/events/NodeBulletinProcessingStrategy.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/events/NodeBulletinProcessingStrategy.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/events/NodeBulletinProcessingStrategy.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/events/NodeBulletinProcessingStrategy.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/events/VolatileBulletinRepository.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/events/VolatileBulletinRepository.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/events/VolatileBulletinRepository.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/events/VolatileBulletinRepository.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/events/network/CommunicationsFailure.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/events/network/CommunicationsFailure.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/events/network/CommunicationsFailure.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/events/network/CommunicationsFailure.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/events/network/NetworkTransfer.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/events/network/NetworkTransfer.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/events/network/NetworkTransfer.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/events/network/NetworkTransfer.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/fingerprint/FingerprintException.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/fingerprint/FingerprintException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/fingerprint/FingerprintException.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/fingerprint/FingerprintException.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/jaxb/AdaptedBulletin.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/jaxb/AdaptedBulletin.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/jaxb/AdaptedBulletin.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/jaxb/AdaptedBulletin.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/jaxb/AdaptedCounter.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/jaxb/AdaptedCounter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/jaxb/AdaptedCounter.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/jaxb/AdaptedCounter.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/jaxb/BulletinAdapter.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/jaxb/BulletinAdapter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/jaxb/BulletinAdapter.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/jaxb/BulletinAdapter.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/jaxb/CounterAdapter.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/jaxb/CounterAdapter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/jaxb/CounterAdapter.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/jaxb/CounterAdapter.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/lifecycle/LifeCycle.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/lifecycle/LifeCycle.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/lifecycle/LifeCycle.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/lifecycle/LifeCycle.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/lifecycle/LifeCycleException.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/lifecycle/LifeCycleException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/lifecycle/LifeCycleException.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/lifecycle/LifeCycleException.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/lifecycle/LifeCycleStartException.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/lifecycle/LifeCycleStartException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/lifecycle/LifeCycleStartException.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/lifecycle/LifeCycleStartException.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/lifecycle/LifeCycleStopException.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/lifecycle/LifeCycleStopException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/lifecycle/LifeCycleStopException.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/lifecycle/LifeCycleStopException.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/logging/ProcessorLogObserver.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/logging/ProcessorLogObserver.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/logging/ProcessorLogObserver.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/logging/ProcessorLogObserver.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/logging/repository/StandardLogRepository.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/logging/repository/StandardLogRepository.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/logging/repository/StandardLogRepository.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/logging/repository/StandardLogRepository.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/FlowConfigurationDAO.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/FlowConfigurationDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/FlowConfigurationDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/FlowConfigurationDAO.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/StandardSnippetDeserializer.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/StandardSnippetDeserializer.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/StandardSnippetDeserializer.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/StandardSnippetDeserializer.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/StandardSnippetSerializer.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/StandardSnippetSerializer.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/StandardSnippetSerializer.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/StandardSnippetSerializer.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/StandardXMLFlowConfigurationDAO.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/StandardXMLFlowConfigurationDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/StandardXMLFlowConfigurationDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/StandardXMLFlowConfigurationDAO.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/TemplateDeserializer.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/TemplateDeserializer.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/TemplateDeserializer.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/TemplateDeserializer.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/TemplateSerializer.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/TemplateSerializer.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/TemplateSerializer.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/persistence/TemplateSerializer.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardProcessContext.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardProcessContext.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardProcessContext.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardProcessContext.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardProcessorInitializationContext.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardProcessorInitializationContext.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardProcessorInitializationContext.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardProcessorInitializationContext.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardPropertyValue.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardPropertyValue.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardPropertyValue.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardPropertyValue.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardSchedulingContext.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardSchedulingContext.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardSchedulingContext.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardSchedulingContext.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardValidationContext.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardValidationContext.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardValidationContext.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardValidationContext.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardValidationContextFactory.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardValidationContextFactory.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardValidationContextFactory.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/processor/StandardValidationContextFactory.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroup.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroup.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroup.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroup.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroupPortDescriptor.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroupPortDescriptor.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroupPortDescriptor.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroupPortDescriptor.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/services/FlowService.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/services/FlowService.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/services/FlowService.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/services/FlowService.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/spring/FlowControllerFactoryBean.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/spring/FlowControllerFactoryBean.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/spring/FlowControllerFactoryBean.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/spring/FlowControllerFactoryBean.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/spring/RingBufferEventRepositoryBean.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/spring/RingBufferEventRepositoryBean.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/spring/RingBufferEventRepositoryBean.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/spring/RingBufferEventRepositoryBean.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/spring/StandardFlowServiceFactoryBean.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/spring/StandardFlowServiceFactoryBean.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/spring/StandardFlowServiceFactoryBean.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/spring/StandardFlowServiceFactoryBean.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/ComponentStatusReport.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/ComponentStatusReport.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/ComponentStatusReport.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/ComponentStatusReport.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/Connectables.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/Connectables.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/Connectables.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/Connectables.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/DomUtils.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/DomUtils.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/DomUtils.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/DomUtils.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/ReflectionUtils.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/ReflectionUtils.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/ReflectionUtils.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/ReflectionUtils.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/SnippetUtils.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/SnippetUtils.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/SnippetUtils.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/SnippetUtils.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/resources/ControllerServiceConfiguration.xsd b/nifi/nar-bundles/framework-bundle/framework/core/src/main/resources/ControllerServiceConfiguration.xsd
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/resources/ControllerServiceConfiguration.xsd
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/resources/ControllerServiceConfiguration.xsd
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/resources/FlowConfiguration.xsd b/nifi/nar-bundles/framework-bundle/framework/core/src/main/resources/FlowConfiguration.xsd
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/resources/FlowConfiguration.xsd
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/resources/FlowConfiguration.xsd
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/resources/ReportingTaskConfiguration.xsd b/nifi/nar-bundles/framework-bundle/framework/core/src/main/resources/ReportingTaskConfiguration.xsd
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/resources/ReportingTaskConfiguration.xsd
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/resources/ReportingTaskConfiguration.xsd
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/resources/nifi-context.xml b/nifi/nar-bundles/framework-bundle/framework/core/src/main/resources/nifi-context.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/main/resources/nifi-context.xml
rename to nifi/nar-bundles/framework-bundle/framework/core/src/main/resources/nifi-context.xml
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/cluster/HeartbeatPayloadTest.java b/nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/cluster/HeartbeatPayloadTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/cluster/HeartbeatPayloadTest.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/cluster/HeartbeatPayloadTest.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/StandardFlowServiceTest.java b/nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/StandardFlowServiceTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/StandardFlowServiceTest.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/StandardFlowServiceTest.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/TestFileSystemSwapManager.java b/nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/TestFileSystemSwapManager.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/TestFileSystemSwapManager.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/TestFileSystemSwapManager.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestFileSystemRepository.java b/nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestFileSystemRepository.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestFileSystemRepository.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestFileSystemRepository.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestRingBufferEventRepository.java b/nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestRingBufferEventRepository.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestRingBufferEventRepository.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestRingBufferEventRepository.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java b/nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProvenanceReporter.java b/nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProvenanceReporter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProvenanceReporter.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProvenanceReporter.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestVolatileContentRepository.java b/nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestVolatileContentRepository.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestVolatileContentRepository.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestVolatileContentRepository.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestWriteAheadFlowFileRepository.java b/nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestWriteAheadFlowFileRepository.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestWriteAheadFlowFileRepository.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestWriteAheadFlowFileRepository.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/io/TestLimitedOutputStream.java b/nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/io/TestLimitedOutputStream.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/io/TestLimitedOutputStream.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/io/TestLimitedOutputStream.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/util/DiskUtils.java b/nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/util/DiskUtils.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/util/DiskUtils.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/util/DiskUtils.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/fingerprint/FingerprintFactoryTest.java b/nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/fingerprint/FingerprintFactoryTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/fingerprint/FingerprintFactoryTest.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/fingerprint/FingerprintFactoryTest.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/processor/TestStandardPropertyValue.java b/nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/processor/TestStandardPropertyValue.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/processor/TestStandardPropertyValue.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/processor/TestStandardPropertyValue.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/test/processors/DataGeneratorTestProcessor.java b/nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/test/processors/DataGeneratorTestProcessor.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/test/processors/DataGeneratorTestProcessor.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/test/processors/DataGeneratorTestProcessor.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/test/processors/StubAttributeLoggerProcessor.java b/nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/test/processors/StubAttributeLoggerProcessor.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/test/processors/StubAttributeLoggerProcessor.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/test/processors/StubAttributeLoggerProcessor.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/test/processors/StubTerminationFileProcessor.java b/nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/test/processors/StubTerminationFileProcessor.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/test/processors/StubTerminationFileProcessor.java
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/test/processors/StubTerminationFileProcessor.java
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/0bytes.xml b/nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/0bytes.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/resources/conf/0bytes.xml
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/0bytes.xml
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/all-flow-corrupt.xml b/nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/all-flow-corrupt.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/resources/conf/all-flow-corrupt.xml
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/all-flow-corrupt.xml
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/all-flow-inheritable.xml b/nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/all-flow-inheritable.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/resources/conf/all-flow-inheritable.xml
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/all-flow-inheritable.xml
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/all-flow-uninheritable.xml b/nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/all-flow-uninheritable.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/resources/conf/all-flow-uninheritable.xml
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/all-flow-uninheritable.xml
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/all-flow.xml b/nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/all-flow.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/resources/conf/all-flow.xml
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/all-flow.xml
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/nifi.properties b/nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/nifi.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/resources/conf/nifi.properties
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/nifi.properties
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/only-termination.xml b/nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/only-termination.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/resources/conf/only-termination.xml
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/only-termination.xml
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/remote-flow.xml b/nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/remote-flow.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/resources/conf/remote-flow.xml
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/remote-flow.xml
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/standard-flow.xml b/nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/standard-flow.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/resources/conf/standard-flow.xml
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/standard-flow.xml
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/taskConfig.xml b/nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/taskConfig.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/resources/conf/taskConfig.xml
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/taskConfig.xml
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/termination-only.xml b/nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/termination-only.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/resources/conf/termination-only.xml
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/conf/termination-only.xml
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/resources/hello.txt b/nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/hello.txt
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/resources/hello.txt
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/hello.txt
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/resources/logback-test.xml b/nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/logback-test.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/resources/logback-test.xml
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/logback-test.xml
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/resources/nifi-with-remote.properties b/nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/nifi-with-remote.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/resources/nifi-with-remote.properties
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/nifi-with-remote.properties
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/resources/nifi.properties b/nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/nifi.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/resources/nifi.properties
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/nifi.properties
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/resources/nifi/fingerprint/flow1a.xml b/nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/nifi/fingerprint/flow1a.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/resources/nifi/fingerprint/flow1a.xml
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/nifi/fingerprint/flow1a.xml
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/resources/nifi/fingerprint/flow1b.xml b/nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/nifi/fingerprint/flow1b.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/resources/nifi/fingerprint/flow1b.xml
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/nifi/fingerprint/flow1b.xml
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/resources/nifi/fingerprint/flow2.xml b/nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/nifi/fingerprint/flow2.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/resources/nifi/fingerprint/flow2.xml
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/nifi/fingerprint/flow2.xml
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/resources/old-swap-file.swap b/nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/old-swap-file.swap
similarity index 100%
rename from nar-bundles/framework-bundle/framework/core/src/test/resources/old-swap-file.swap
rename to nifi/nar-bundles/framework-bundle/framework/core/src/test/resources/old-swap-file.swap
diff --git a/nar-bundles/framework-bundle/framework/file-authorization-provider/pom.xml b/nifi/nar-bundles/framework-bundle/framework/file-authorization-provider/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/file-authorization-provider/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/file-authorization-provider/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/file-authorization-provider/src/main/java/org/apache/nifi/authorization/FileAuthorizationProvider.java b/nifi/nar-bundles/framework-bundle/framework/file-authorization-provider/src/main/java/org/apache/nifi/authorization/FileAuthorizationProvider.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/file-authorization-provider/src/main/java/org/apache/nifi/authorization/FileAuthorizationProvider.java
rename to nifi/nar-bundles/framework-bundle/framework/file-authorization-provider/src/main/java/org/apache/nifi/authorization/FileAuthorizationProvider.java
diff --git a/nar-bundles/framework-bundle/framework/file-authorization-provider/src/main/resources/META-INF/services/org.apache.nifi.authorization.AuthorityProvider b/nifi/nar-bundles/framework-bundle/framework/file-authorization-provider/src/main/resources/META-INF/services/org.apache.nifi.authorization.AuthorityProvider
similarity index 100%
rename from nar-bundles/framework-bundle/framework/file-authorization-provider/src/main/resources/META-INF/services/org.apache.nifi.authorization.AuthorityProvider
rename to nifi/nar-bundles/framework-bundle/framework/file-authorization-provider/src/main/resources/META-INF/services/org.apache.nifi.authorization.AuthorityProvider
diff --git a/nar-bundles/framework-bundle/framework/file-authorization-provider/src/main/xsd/users.xsd b/nifi/nar-bundles/framework-bundle/framework/file-authorization-provider/src/main/xsd/users.xsd
similarity index 100%
rename from nar-bundles/framework-bundle/framework/file-authorization-provider/src/main/xsd/users.xsd
rename to nifi/nar-bundles/framework-bundle/framework/file-authorization-provider/src/main/xsd/users.xsd
diff --git a/nar-bundles/framework-bundle/framework/file-authorization-provider/src/test/java/org/apache/nifi/authorization/FileAuthorizationProviderTest.java b/nifi/nar-bundles/framework-bundle/framework/file-authorization-provider/src/test/java/org/apache/nifi/authorization/FileAuthorizationProviderTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/file-authorization-provider/src/test/java/org/apache/nifi/authorization/FileAuthorizationProviderTest.java
rename to nifi/nar-bundles/framework-bundle/framework/file-authorization-provider/src/test/java/org/apache/nifi/authorization/FileAuthorizationProviderTest.java
diff --git a/nar-bundles/framework-bundle/framework/nar/.gitignore b/nifi/nar-bundles/framework-bundle/framework/nar/.gitignore
similarity index 100%
rename from nar-bundles/framework-bundle/framework/nar/.gitignore
rename to nifi/nar-bundles/framework-bundle/framework/nar/.gitignore
diff --git a/nar-bundles/framework-bundle/framework/nar/pom.xml b/nifi/nar-bundles/framework-bundle/framework/nar/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/nar/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/nar/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/nar/ExtensionManager.java b/nifi/nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/nar/ExtensionManager.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/nar/ExtensionManager.java
rename to nifi/nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/nar/ExtensionManager.java
diff --git a/nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/nar/ExtensionMapping.java b/nifi/nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/nar/ExtensionMapping.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/nar/ExtensionMapping.java
rename to nifi/nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/nar/ExtensionMapping.java
diff --git a/nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/nar/NarClassLoader.java b/nifi/nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/nar/NarClassLoader.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/nar/NarClassLoader.java
rename to nifi/nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/nar/NarClassLoader.java
diff --git a/nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/nar/NarClassLoaders.java b/nifi/nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/nar/NarClassLoaders.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/nar/NarClassLoaders.java
rename to nifi/nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/nar/NarClassLoaders.java
diff --git a/nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/nar/NarUnpacker.java b/nifi/nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/nar/NarUnpacker.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/nar/NarUnpacker.java
rename to nifi/nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/nar/NarUnpacker.java
diff --git a/nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/util/FileUtils.java b/nifi/nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/util/FileUtils.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/util/FileUtils.java
rename to nifi/nar-bundles/framework-bundle/framework/nar/src/main/java/org/apache/nifi/util/FileUtils.java
diff --git a/nar-bundles/framework-bundle/framework/pom.xml b/nifi/nar-bundles/framework-bundle/framework/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/resources/pom.xml b/nifi/nar-bundles/framework-bundle/framework/resources/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/resources/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/resources/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/assembly/dependencies.xml b/nifi/nar-bundles/framework-bundle/framework/resources/src/main/assembly/dependencies.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/resources/src/main/assembly/dependencies.xml
rename to nifi/nar-bundles/framework-bundle/framework/resources/src/main/assembly/dependencies.xml
diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/dump-nifi.bat b/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/dump-nifi.bat
similarity index 100%
rename from nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/dump-nifi.bat
rename to nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/dump-nifi.bat
diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi-status.bat b/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi-status.bat
similarity index 100%
rename from nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi-status.bat
rename to nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi-status.bat
diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi.sh b/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi.sh
similarity index 100%
rename from nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi.sh
rename to nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi.sh
diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/run-nifi.bat b/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/run-nifi.bat
similarity index 100%
rename from nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/run-nifi.bat
rename to nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/run-nifi.bat
diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/start-nifi.bat b/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/start-nifi.bat
similarity index 100%
rename from nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/start-nifi.bat
rename to nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/start-nifi.bat
diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/stop-nifi.bat b/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/stop-nifi.bat
similarity index 100%
rename from nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/stop-nifi.bat
rename to nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/stop-nifi.bat
diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/authority-providers.xml b/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/authority-providers.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/authority-providers.xml
rename to nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/authority-providers.xml
diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/authorized-users.xml b/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/authorized-users.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/authorized-users.xml
rename to nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/authorized-users.xml
diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf b/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf
similarity index 100%
rename from nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf
rename to nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf
diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/controller-services.xml b/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/controller-services.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/controller-services.xml
rename to nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/controller-services.xml
diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/logback.xml b/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/logback.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/logback.xml
rename to nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/logback.xml
diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/nifi.properties b/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/nifi.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/nifi.properties
rename to nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/nifi.properties
diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/reporting-tasks.xml b/nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/reporting-tasks.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/reporting-tasks.xml
rename to nifi/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/reporting-tasks.xml
diff --git a/nar-bundles/framework-bundle/framework/runtime/.gitignore b/nifi/nar-bundles/framework-bundle/framework/runtime/.gitignore
similarity index 100%
rename from nar-bundles/framework-bundle/framework/runtime/.gitignore
rename to nifi/nar-bundles/framework-bundle/framework/runtime/.gitignore
diff --git a/nar-bundles/framework-bundle/framework/runtime/pom.xml b/nifi/nar-bundles/framework-bundle/framework/runtime/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/runtime/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/runtime/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/runtime/src/main/java/org/apache/nifi/BootstrapListener.java b/nifi/nar-bundles/framework-bundle/framework/runtime/src/main/java/org/apache/nifi/BootstrapListener.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/runtime/src/main/java/org/apache/nifi/BootstrapListener.java
rename to nifi/nar-bundles/framework-bundle/framework/runtime/src/main/java/org/apache/nifi/BootstrapListener.java
diff --git a/nar-bundles/framework-bundle/framework/runtime/src/main/java/org/apache/nifi/NiFi.java b/nifi/nar-bundles/framework-bundle/framework/runtime/src/main/java/org/apache/nifi/NiFi.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/runtime/src/main/java/org/apache/nifi/NiFi.java
rename to nifi/nar-bundles/framework-bundle/framework/runtime/src/main/java/org/apache/nifi/NiFi.java
diff --git a/nar-bundles/framework-bundle/framework/runtime/src/main/java/org/apache/nifi/NiFiServer.java b/nifi/nar-bundles/framework-bundle/framework/runtime/src/main/java/org/apache/nifi/NiFiServer.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/runtime/src/main/java/org/apache/nifi/NiFiServer.java
rename to nifi/nar-bundles/framework-bundle/framework/runtime/src/main/java/org/apache/nifi/NiFiServer.java
diff --git a/nar-bundles/framework-bundle/framework/runtime/src/main/java/org/apache/nifi/util/LimitingInputStream.java b/nifi/nar-bundles/framework-bundle/framework/runtime/src/main/java/org/apache/nifi/util/LimitingInputStream.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/runtime/src/main/java/org/apache/nifi/util/LimitingInputStream.java
rename to nifi/nar-bundles/framework-bundle/framework/runtime/src/main/java/org/apache/nifi/util/LimitingInputStream.java
diff --git a/nar-bundles/framework-bundle/framework/security/.gitignore b/nifi/nar-bundles/framework-bundle/framework/security/.gitignore
similarity index 100%
rename from nar-bundles/framework-bundle/framework/security/.gitignore
rename to nifi/nar-bundles/framework-bundle/framework/security/.gitignore
diff --git a/nar-bundles/framework-bundle/framework/security/pom.xml b/nifi/nar-bundles/framework-bundle/framework/security/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/security/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/security/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslContextCreationException.java b/nifi/nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslContextCreationException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslContextCreationException.java
rename to nifi/nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslContextCreationException.java
diff --git a/nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslContextFactory.java b/nifi/nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslContextFactory.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslContextFactory.java
rename to nifi/nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslContextFactory.java
diff --git a/nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslException.java b/nifi/nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslException.java
rename to nifi/nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslException.java
diff --git a/nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactory.java b/nifi/nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactory.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactory.java
rename to nifi/nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactory.java
diff --git a/nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactoryCreationException.java b/nifi/nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactoryCreationException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactoryCreationException.java
rename to nifi/nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactoryCreationException.java
diff --git a/nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactory.java b/nifi/nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactory.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactory.java
rename to nifi/nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactory.java
diff --git a/nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactoryCreationException.java b/nifi/nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactoryCreationException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactoryCreationException.java
rename to nifi/nar-bundles/framework-bundle/framework/security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactoryCreationException.java
diff --git a/nar-bundles/framework-bundle/framework/security/src/test/java/org/apache/nifi/framework/security/util/SslContextFactoryTest.java b/nifi/nar-bundles/framework-bundle/framework/security/src/test/java/org/apache/nifi/framework/security/util/SslContextFactoryTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/security/src/test/java/org/apache/nifi/framework/security/util/SslContextFactoryTest.java
rename to nifi/nar-bundles/framework-bundle/framework/security/src/test/java/org/apache/nifi/framework/security/util/SslContextFactoryTest.java
diff --git a/nar-bundles/framework-bundle/framework/security/src/test/resources/localhost-ks.jks b/nifi/nar-bundles/framework-bundle/framework/security/src/test/resources/localhost-ks.jks
similarity index 100%
rename from nar-bundles/framework-bundle/framework/security/src/test/resources/localhost-ks.jks
rename to nifi/nar-bundles/framework-bundle/framework/security/src/test/resources/localhost-ks.jks
diff --git a/nar-bundles/framework-bundle/framework/security/src/test/resources/localhost-ts.jks b/nifi/nar-bundles/framework-bundle/framework/security/src/test/resources/localhost-ts.jks
similarity index 100%
rename from nar-bundles/framework-bundle/framework/security/src/test/resources/localhost-ts.jks
rename to nifi/nar-bundles/framework-bundle/framework/security/src/test/resources/localhost-ts.jks
diff --git a/nar-bundles/framework-bundle/framework/security/src/test/resources/log4j.properties b/nifi/nar-bundles/framework-bundle/framework/security/src/test/resources/log4j.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/security/src/test/resources/log4j.properties
rename to nifi/nar-bundles/framework-bundle/framework/security/src/test/resources/log4j.properties
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/.gitignore b/nifi/nar-bundles/framework-bundle/framework/site-to-site/.gitignore
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/.gitignore
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/.gitignore
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/pom.xml b/nifi/nar-bundles/framework-bundle/framework/site-to-site/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/controller/util/RemoteProcessGroupUtils.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/controller/util/RemoteProcessGroupUtils.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/controller/util/RemoteProcessGroupUtils.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/controller/util/RemoteProcessGroupUtils.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/AbstractCommunicationsSession.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/AbstractCommunicationsSession.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/AbstractCommunicationsSession.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/AbstractCommunicationsSession.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/RemoteResourceFactory.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/RemoteResourceFactory.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/RemoteResourceFactory.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/RemoteResourceFactory.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/RemoteResourceManager.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/RemoteResourceManager.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/RemoteResourceManager.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/RemoteResourceManager.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/RemoteSiteListener.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/RemoteSiteListener.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/RemoteSiteListener.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/RemoteSiteListener.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/SocketRemoteSiteListener.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/SocketRemoteSiteListener.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/SocketRemoteSiteListener.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/SocketRemoteSiteListener.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/StandardRemoteGroupPort.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/StandardRemoteGroupPort.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/StandardRemoteGroupPort.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/StandardRemoteGroupPort.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/StandardRootGroupPort.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/StandardRootGroupPort.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/StandardRootGroupPort.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/StandardRootGroupPort.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/codec/StandardFlowFileCodec.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/codec/StandardFlowFileCodec.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/codec/StandardFlowFileCodec.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/codec/StandardFlowFileCodec.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/exception/UnsupportedCodecException.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/exception/UnsupportedCodecException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/exception/UnsupportedCodecException.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/exception/UnsupportedCodecException.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelCommunicationsSession.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelCommunicationsSession.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelCommunicationsSession.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelCommunicationsSession.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelInput.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelInput.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelInput.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelInput.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelOutput.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelOutput.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelOutput.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/SocketChannelOutput.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelCommunicationsSession.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelCommunicationsSession.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelCommunicationsSession.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelCommunicationsSession.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelInput.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelInput.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelInput.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelInput.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelOutput.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelOutput.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelOutput.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/io/socket/ssl/SSLSocketChannelOutput.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/ClusterManagerServerProtocol.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/ClusterManagerServerProtocol.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/ClusterManagerServerProtocol.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/ClusterManagerServerProtocol.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/HandshakeProperty.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/HandshakeProperty.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/HandshakeProperty.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/HandshakeProperty.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/Response.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/Response.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/Response.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/Response.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/ResponseCode.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/ResponseCode.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/ResponseCode.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/ResponseCode.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/SocketClientProtocol.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/SocketClientProtocol.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/SocketClientProtocol.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/SocketClientProtocol.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/SocketFlowFileServerProtocol.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/SocketFlowFileServerProtocol.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/SocketFlowFileServerProtocol.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/SocketFlowFileServerProtocol.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/resources/META-INF/services/org.apache.nifi.remote.codec.FlowFileCodec b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/resources/META-INF/services/org.apache.nifi.remote.codec.FlowFileCodec
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/resources/META-INF/services/org.apache.nifi.remote.codec.FlowFileCodec
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/resources/META-INF/services/org.apache.nifi.remote.codec.FlowFileCodec
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/resources/META-INF/services/org.apache.nifi.remote.protocol.ClientProtocol b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/resources/META-INF/services/org.apache.nifi.remote.protocol.ClientProtocol
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/resources/META-INF/services/org.apache.nifi.remote.protocol.ClientProtocol
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/resources/META-INF/services/org.apache.nifi.remote.protocol.ClientProtocol
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/main/resources/META-INF/services/org.apache.nifi.remote.protocol.ServerProtocol b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/resources/META-INF/services/org.apache.nifi.remote.protocol.ServerProtocol
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/main/resources/META-INF/services/org.apache.nifi.remote.protocol.ServerProtocol
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/main/resources/META-INF/services/org.apache.nifi.remote.protocol.ServerProtocol
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/test/java/org/apache/nifi/remote/TestStandardRemoteGroupPort.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/test/java/org/apache/nifi/remote/TestStandardRemoteGroupPort.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/test/java/org/apache/nifi/remote/TestStandardRemoteGroupPort.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/test/java/org/apache/nifi/remote/TestStandardRemoteGroupPort.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/test/java/org/apache/nifi/remote/TestStandardSiteToSiteProtocol.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/test/java/org/apache/nifi/remote/TestStandardSiteToSiteProtocol.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/test/java/org/apache/nifi/remote/TestStandardSiteToSiteProtocol.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/test/java/org/apache/nifi/remote/TestStandardSiteToSiteProtocol.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/test/java/org/apache/nifi/remote/io/socket/TestSocketChannelStreams.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/test/java/org/apache/nifi/remote/io/socket/TestSocketChannelStreams.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/test/java/org/apache/nifi/remote/io/socket/TestSocketChannelStreams.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/test/java/org/apache/nifi/remote/io/socket/TestSocketChannelStreams.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/test/java/org/apache/nifi/remote/io/socket/ssl/TestSSLSocketChannel.java b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/test/java/org/apache/nifi/remote/io/socket/ssl/TestSSLSocketChannel.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/test/java/org/apache/nifi/remote/io/socket/ssl/TestSSLSocketChannel.java
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/test/java/org/apache/nifi/remote/io/socket/ssl/TestSSLSocketChannel.java
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/test/resources/dummy-certs/localhost-ks.jks b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/test/resources/dummy-certs/localhost-ks.jks
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/test/resources/dummy-certs/localhost-ks.jks
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/test/resources/dummy-certs/localhost-ks.jks
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/test/resources/dummy-certs/localhost-ts.jks b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/test/resources/dummy-certs/localhost-ts.jks
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/test/resources/dummy-certs/localhost-ts.jks
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/test/resources/dummy-certs/localhost-ts.jks
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/test/resources/logback-test.xml b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/test/resources/logback-test.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/test/resources/logback-test.xml
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/test/resources/logback-test.xml
diff --git a/nar-bundles/framework-bundle/framework/site-to-site/src/test/resources/nifi.properties b/nifi/nar-bundles/framework-bundle/framework/site-to-site/src/test/resources/nifi.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/site-to-site/src/test/resources/nifi.properties
rename to nifi/nar-bundles/framework-bundle/framework/site-to-site/src/test/resources/nifi.properties
diff --git a/nar-bundles/framework-bundle/framework/user-actions/.gitignore b/nifi/nar-bundles/framework-bundle/framework/user-actions/.gitignore
similarity index 100%
rename from nar-bundles/framework-bundle/framework/user-actions/.gitignore
rename to nifi/nar-bundles/framework-bundle/framework/user-actions/.gitignore
diff --git a/nar-bundles/framework-bundle/framework/user-actions/pom.xml b/nifi/nar-bundles/framework-bundle/framework/user-actions/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/user-actions/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/user-actions/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/Action.java b/nifi/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/Action.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/Action.java
rename to nifi/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/Action.java
diff --git a/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/Component.java b/nifi/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/Component.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/Component.java
rename to nifi/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/Component.java
diff --git a/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/Operation.java b/nifi/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/Operation.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/Operation.java
rename to nifi/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/Operation.java
diff --git a/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/component/details/ComponentDetails.java b/nifi/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/component/details/ComponentDetails.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/component/details/ComponentDetails.java
rename to nifi/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/component/details/ComponentDetails.java
diff --git a/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/component/details/ProcessorDetails.java b/nifi/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/component/details/ProcessorDetails.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/component/details/ProcessorDetails.java
rename to nifi/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/component/details/ProcessorDetails.java
diff --git a/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/component/details/RemoteProcessGroupDetails.java b/nifi/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/component/details/RemoteProcessGroupDetails.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/component/details/RemoteProcessGroupDetails.java
rename to nifi/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/component/details/RemoteProcessGroupDetails.java
diff --git a/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/details/ActionDetails.java b/nifi/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/details/ActionDetails.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/details/ActionDetails.java
rename to nifi/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/details/ActionDetails.java
diff --git a/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/details/ConfigureDetails.java b/nifi/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/details/ConfigureDetails.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/details/ConfigureDetails.java
rename to nifi/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/details/ConfigureDetails.java
diff --git a/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/details/ConnectDetails.java b/nifi/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/details/ConnectDetails.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/details/ConnectDetails.java
rename to nifi/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/details/ConnectDetails.java
diff --git a/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/details/MoveDetails.java b/nifi/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/details/MoveDetails.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/details/MoveDetails.java
rename to nifi/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/details/MoveDetails.java
diff --git a/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/details/PurgeDetails.java b/nifi/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/details/PurgeDetails.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/details/PurgeDetails.java
rename to nifi/nar-bundles/framework-bundle/framework/user-actions/src/main/java/org/apache/nifi/action/details/PurgeDetails.java
diff --git a/nar-bundles/framework-bundle/framework/web/custom-ui-utilities/.gitignore b/nifi/nar-bundles/framework-bundle/framework/web/custom-ui-utilities/.gitignore
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/custom-ui-utilities/.gitignore
rename to nifi/nar-bundles/framework-bundle/framework/web/custom-ui-utilities/.gitignore
diff --git a/nar-bundles/framework-bundle/framework/web/custom-ui-utilities/pom.xml b/nifi/nar-bundles/framework-bundle/framework/web/custom-ui-utilities/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/custom-ui-utilities/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/web/custom-ui-utilities/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/web/custom-ui-utilities/src/main/java/org/apache/nifi/web/HttpServletRequestContextConfig.java b/nifi/nar-bundles/framework-bundle/framework/web/custom-ui-utilities/src/main/java/org/apache/nifi/web/HttpServletRequestContextConfig.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/custom-ui-utilities/src/main/java/org/apache/nifi/web/HttpServletRequestContextConfig.java
rename to nifi/nar-bundles/framework-bundle/framework/web/custom-ui-utilities/src/main/java/org/apache/nifi/web/HttpServletRequestContextConfig.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-jetty/.gitignore b/nifi/nar-bundles/framework-bundle/framework/web/nifi-jetty/.gitignore
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-jetty/.gitignore
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-jetty/.gitignore
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-jetty/pom.xml b/nifi/nar-bundles/framework-bundle/framework/web/nifi-jetty/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-jetty/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-jetty/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/assembly/distribution.xml b/nifi/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/assembly/distribution.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/assembly/distribution.xml
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/assembly/distribution.xml
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/ServerConfigurationException.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/ServerConfigurationException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/ServerConfigurationException.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/ServerConfigurationException.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/resources/org/apache/nifi/web/webdefault.xml b/nifi/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/resources/org/apache/nifi/web/webdefault.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/resources/org/apache/nifi/web/webdefault.xml
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/resources/org/apache/nifi/web/webdefault.xml
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/.gitignore b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/.gitignore
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/.gitignore
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/.gitignore
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/enunciate.xml b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/enunciate.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/enunciate.xml
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/enunciate.xml
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/home.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/home.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/home.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/home.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/aop/MethodProfiler.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/aop/MethodProfiler.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/aop/MethodProfiler.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/aop/MethodProfiler.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/ControllerAuditor.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/ControllerAuditor.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/ControllerAuditor.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/ControllerAuditor.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/FunnelAuditor.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/FunnelAuditor.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/FunnelAuditor.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/FunnelAuditor.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/NiFiAuditor.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/NiFiAuditor.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/NiFiAuditor.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/NiFiAuditor.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/PortAuditor.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/PortAuditor.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/PortAuditor.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/PortAuditor.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessGroupAuditor.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessGroupAuditor.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessGroupAuditor.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessGroupAuditor.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessorAuditor.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessorAuditor.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessorAuditor.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessorAuditor.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/RelationshipAuditor.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/RelationshipAuditor.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/RelationshipAuditor.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/RelationshipAuditor.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/RemoteProcessGroupAuditor.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/RemoteProcessGroupAuditor.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/RemoteProcessGroupAuditor.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/RemoteProcessGroupAuditor.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/SnippetAuditor.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/SnippetAuditor.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/SnippetAuditor.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/audit/SnippetAuditor.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/ClusterRequestException.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/ClusterRequestException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/ClusterRequestException.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/ClusterRequestException.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/IllegalClusterResourceRequestException.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/IllegalClusterResourceRequestException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/IllegalClusterResourceRequestException.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/IllegalClusterResourceRequestException.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiCoreException.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiCoreException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiCoreException.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiCoreException.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacadeLock.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacadeLock.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacadeLock.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacadeLock.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebContext.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebContext.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebContext.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebContext.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/BulletinBoardResource.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/BulletinBoardResource.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/BulletinBoardResource.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/BulletinBoardResource.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ClusterResource.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ClusterResource.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ClusterResource.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ClusterResource.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FunnelResource.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FunnelResource.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FunnelResource.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FunnelResource.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/HistoryResource.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/HistoryResource.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/HistoryResource.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/HistoryResource.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/InputPortResource.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/InputPortResource.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/InputPortResource.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/InputPortResource.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/LabelResource.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/LabelResource.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/LabelResource.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/LabelResource.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/NodeResource.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/NodeResource.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/NodeResource.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/NodeResource.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/OutputPortResource.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/OutputPortResource.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/OutputPortResource.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/OutputPortResource.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceResource.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceResource.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceResource.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceResource.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SnippetResource.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SnippetResource.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SnippetResource.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SnippetResource.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SystemDiagnosticsResource.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SystemDiagnosticsResource.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SystemDiagnosticsResource.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SystemDiagnosticsResource.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TemplateResource.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TemplateResource.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TemplateResource.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TemplateResource.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/UserGroupResource.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/UserGroupResource.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/UserGroupResource.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/UserGroupResource.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/UserResource.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/UserResource.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/UserResource.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/UserResource.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AccessDeniedExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AccessDeniedExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AccessDeniedExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AccessDeniedExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AccountNotFoundExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AccountNotFoundExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AccountNotFoundExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AccountNotFoundExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AdministrationExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AdministrationExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AdministrationExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AdministrationExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AuthenticationCredentialsNotFoundExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AuthenticationCredentialsNotFoundExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AuthenticationCredentialsNotFoundExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AuthenticationCredentialsNotFoundExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ClusterExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ClusterExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ClusterExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ClusterExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ConnectingNodeMutableRequestExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ConnectingNodeMutableRequestExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ConnectingNodeMutableRequestExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ConnectingNodeMutableRequestExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/DisconnectedNodeMutableRequestExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/DisconnectedNodeMutableRequestExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/DisconnectedNodeMutableRequestExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/DisconnectedNodeMutableRequestExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalArgumentExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalArgumentExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalArgumentExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalArgumentExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalClusterResourceRequestExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalClusterResourceRequestExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalClusterResourceRequestExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalClusterResourceRequestExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalClusterStateExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalClusterStateExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalClusterStateExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalClusterStateExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeDeletionExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeDeletionExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeDeletionExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeDeletionExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeDisconnectionExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeDisconnectionExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeDisconnectionExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeDisconnectionExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeReconnectionExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeReconnectionExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeReconnectionExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeReconnectionExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalStateExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalStateExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalStateExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalStateExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IneligiblePrimaryNodeExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IneligiblePrimaryNodeExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IneligiblePrimaryNodeExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IneligiblePrimaryNodeExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/InvalidRevisionExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/InvalidRevisionExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/InvalidRevisionExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/InvalidRevisionExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/JsonMappingExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/JsonMappingExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/JsonMappingExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/JsonMappingExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/JsonParseExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/JsonParseExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/JsonParseExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/JsonParseExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/MutableRequestExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/MutableRequestExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/MutableRequestExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/MutableRequestExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NiFiCoreExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NiFiCoreExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NiFiCoreExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NiFiCoreExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NoConnectedNodesExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NoConnectedNodesExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NoConnectedNodesExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NoConnectedNodesExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NoResponseFromNodesExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NoResponseFromNodesExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NoResponseFromNodesExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NoResponseFromNodesExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NodeDisconnectionExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NodeDisconnectionExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NodeDisconnectionExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NodeDisconnectionExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NodeReconnectionExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NodeReconnectionExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NodeReconnectionExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NodeReconnectionExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/PrimaryRoleAssignmentExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/PrimaryRoleAssignmentExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/PrimaryRoleAssignmentExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/PrimaryRoleAssignmentExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ResourceNotFoundExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ResourceNotFoundExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ResourceNotFoundExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ResourceNotFoundExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/SafeModeMutableRequestExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/SafeModeMutableRequestExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/SafeModeMutableRequestExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/SafeModeMutableRequestExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ThrowableMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ThrowableMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ThrowableMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ThrowableMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/UnknownNodeExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/UnknownNodeExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/UnknownNodeExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/UnknownNodeExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ValidationExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ValidationExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ValidationExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ValidationExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/WebApplicationExceptionMapper.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/WebApplicationExceptionMapper.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/WebApplicationExceptionMapper.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/WebApplicationExceptionMapper.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/package-info.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/package-info.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/package-info.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/package-info.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/BulletinBoardPatternParameter.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/BulletinBoardPatternParameter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/BulletinBoardPatternParameter.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/BulletinBoardPatternParameter.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/ClientIdParameter.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/ClientIdParameter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/ClientIdParameter.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/ClientIdParameter.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/ConnectableTypeParameter.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/ConnectableTypeParameter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/ConnectableTypeParameter.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/ConnectableTypeParameter.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/DateTimeParameter.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/DateTimeParameter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/DateTimeParameter.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/DateTimeParameter.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/DoubleParameter.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/DoubleParameter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/DoubleParameter.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/DoubleParameter.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/IntegerParameter.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/IntegerParameter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/IntegerParameter.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/IntegerParameter.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/LongParameter.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/LongParameter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/LongParameter.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/LongParameter.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/contextlistener/ApplicationStartupContextListener.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/contextlistener/ApplicationStartupContextListener.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/contextlistener/ApplicationStartupContextListener.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/contextlistener/ApplicationStartupContextListener.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/StandardSearchContext.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/StandardSearchContext.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/StandardSearchContext.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/StandardSearchContext.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/ConnectionDAO.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/ConnectionDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/ConnectionDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/ConnectionDAO.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/FunnelDAO.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/FunnelDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/FunnelDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/FunnelDAO.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/LabelDAO.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/LabelDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/LabelDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/LabelDAO.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/PortDAO.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/PortDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/PortDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/PortDAO.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/ProcessGroupDAO.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/ProcessGroupDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/ProcessGroupDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/ProcessGroupDAO.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/ProcessorDAO.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/ProcessorDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/ProcessorDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/ProcessorDAO.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/RemoteProcessGroupDAO.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/RemoteProcessGroupDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/RemoteProcessGroupDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/RemoteProcessGroupDAO.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/SnippetDAO.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/SnippetDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/SnippetDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/SnippetDAO.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/TemplateDAO.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/TemplateDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/TemplateDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/TemplateDAO.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/ComponentDAO.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/ComponentDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/ComponentDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/ComponentDAO.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardFunnelDAO.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardFunnelDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardFunnelDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardFunnelDAO.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardInputPortDAO.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardInputPortDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardInputPortDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardInputPortDAO.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardLabelDAO.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardLabelDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardLabelDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardLabelDAO.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardOutputPortDAO.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardOutputPortDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardOutputPortDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardOutputPortDAO.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessGroupDAO.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessGroupDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessGroupDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessGroupDAO.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessorDAO.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessorDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessorDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessorDAO.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardRemoteProcessGroupDAO.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardRemoteProcessGroupDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardRemoteProcessGroupDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardRemoteProcessGroupDAO.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardSnippetDAO.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardSnippetDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardSnippetDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardSnippetDAO.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardTemplateDAO.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardTemplateDAO.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardTemplateDAO.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardTemplateDAO.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/NodeRequestFilter.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/NodeRequestFilter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/NodeRequestFilter.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/NodeRequestFilter.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/RequestLogger.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/RequestLogger.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/RequestLogger.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/RequestLogger.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/ThreadLocalFilter.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/ThreadLocalFilter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/ThreadLocalFilter.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/ThreadLocalFilter.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/TimerFilter.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/TimerFilter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/TimerFilter.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/TimerFilter.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/util/ClientResponseUtils.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/util/ClientResponseUtils.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/util/ClientResponseUtils.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/util/ClientResponseUtils.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/util/DownloadableContent.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/util/DownloadableContent.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/util/DownloadableContent.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/util/DownloadableContent.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/resources/nifi-web-api-context.xml b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/resources/nifi-web-api-context.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/resources/nifi-web-api-context.xml
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/resources/nifi-web-api-context.xml
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/webapp/WEB-INF/web.xml b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/webapp/WEB-INF/web.xml
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/webapp/WEB-INF/web.xml
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/NiFiWebApiTest.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/NiFiWebApiTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/NiFiWebApiTest.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/NiFiWebApiTest.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/AdminAccessControlTest.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/AdminAccessControlTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/AdminAccessControlTest.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/AdminAccessControlTest.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/DfmAccessControlTest.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/DfmAccessControlTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/DfmAccessControlTest.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/DfmAccessControlTest.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ReadOnlyAccessControlTest.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ReadOnlyAccessControlTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ReadOnlyAccessControlTest.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ReadOnlyAccessControlTest.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestAuthorizationProvider.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestAuthorizationProvider.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestAuthorizationProvider.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestAuthorizationProvider.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestServer.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestServer.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestServer.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestServer.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestUser.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestUser.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestUser.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestUser.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/SourceTestProcessor.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/SourceTestProcessor.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/SourceTestProcessor.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/SourceTestProcessor.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/TerminationTestProcessor.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/TerminationTestProcessor.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/TerminationTestProcessor.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/TerminationTestProcessor.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/TestPrioritizer.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/TestPrioritizer.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/TestPrioritizer.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/TestPrioritizer.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/META-INF/services/org.apache.nifi.authorization.AuthorityProvider b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/META-INF/services/org.apache.nifi.authorization.AuthorityProvider
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/META-INF/services/org.apache.nifi.authorization.AuthorityProvider
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/META-INF/services/org.apache.nifi.authorization.AuthorityProvider
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/META-INF/services/org.apache.nifi.flowfile.FlowFilePrioritizer b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/META-INF/services/org.apache.nifi.flowfile.FlowFilePrioritizer
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/META-INF/services/org.apache.nifi.flowfile.FlowFilePrioritizer
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/META-INF/services/org.apache.nifi.flowfile.FlowFilePrioritizer
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/META-INF/services/org.apache.nifi.processor.Processor b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/META-INF/services/org.apache.nifi.processor.Processor
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/META-INF/services/org.apache.nifi.processor.Processor
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/META-INF/services/org.apache.nifi.processor.Processor
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/authority-providers.xml b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/authority-providers.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/authority-providers.xml
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/authority-providers.xml
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/controller-services.xml b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/controller-services.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/controller-services.xml
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/controller-services.xml
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/localhost-ks.jks b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/localhost-ks.jks
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/localhost-ks.jks
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/localhost-ks.jks
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/localhost-ts.jks b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/localhost-ts.jks
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/localhost-ts.jks
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/localhost-ts.jks
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/nifi.properties b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/nifi.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/nifi.properties
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/nifi.properties
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/reporting-tasks.xml b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/reporting-tasks.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/reporting-tasks.xml
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/access-control/reporting-tasks.xml
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/logback-test.xml b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/logback-test.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/logback-test.xml
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/test/resources/logback-test.xml
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/.gitignore b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/.gitignore
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-docs/.gitignore
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/.gitignore
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/pom.xml b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-docs/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/java/org/apache/nifi/web/docs/DocumentationController.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/java/org/apache/nifi/web/docs/DocumentationController.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/java/org/apache/nifi/web/docs/DocumentationController.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/java/org/apache/nifi/web/docs/DocumentationController.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/web.xml b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/web.xml
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/web.xml
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/main.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/main.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/main.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/main.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/images/bgBannerFoot.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/images/bgBannerFoot.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/images/bgBannerFoot.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/images/bgBannerFoot.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/images/bgHeader.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/images/bgHeader.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/images/bgHeader.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/images/bgHeader.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/images/bgTableHeader.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/images/bgTableHeader.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/images/bgTableHeader.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/images/bgTableHeader.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-error/.gitignore b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-error/.gitignore
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-error/.gitignore
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-error/.gitignore
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-error/pom.xml b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-error/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-error/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-error/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-error/src/main/java/org/apache/nifi/web/filter/CatchAllFilter.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-error/src/main/java/org/apache/nifi/web/filter/CatchAllFilter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-error/src/main/java/org/apache/nifi/web/filter/CatchAllFilter.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-error/src/main/java/org/apache/nifi/web/filter/CatchAllFilter.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-error/src/main/webapp/WEB-INF/web.xml b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-error/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-error/src/main/webapp/WEB-INF/web.xml
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-error/src/main/webapp/WEB-INF/web.xml
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-error/src/main/webapp/index.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-error/src/main/webapp/index.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-error/src/main/webapp/index.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-error/src/main/webapp/index.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/.gitignore b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/.gitignore
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/.gitignore
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/.gitignore
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/pom.xml b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/java/org/apache/nifi/web/filter/IeEdgeHeader.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/java/org/apache/nifi/web/filter/IeEdgeHeader.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/java/org/apache/nifi/web/filter/IeEdgeHeader.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/java/org/apache/nifi/web/filter/IeEdgeHeader.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/java/org/apache/nifi/web/servlet/ConvertSvg.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/java/org/apache/nifi/web/servlet/ConvertSvg.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/java/org/apache/nifi/web/servlet/ConvertSvg.java
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/java/org/apache/nifi/web/servlet/ConvertSvg.java
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/bulletin-board-min.properties b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/bulletin-board-min.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/bulletin-board-min.properties
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/bulletin-board-min.properties
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/bulletin-board.properties b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/bulletin-board.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/bulletin-board.properties
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/bulletin-board.properties
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/canvas-min.properties b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/canvas-min.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/canvas-min.properties
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/canvas-min.properties
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/canvas.properties b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/canvas.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/canvas.properties
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/canvas.properties
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/cluster-min.properties b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/cluster-min.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/cluster-min.properties
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/cluster-min.properties
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/cluster.properties b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/cluster.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/cluster.properties
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/cluster.properties
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/counters-min.properties b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/counters-min.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/counters-min.properties
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/counters-min.properties
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/counters.properties b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/counters.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/counters.properties
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/counters.properties
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/history-min.properties b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/history-min.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/history-min.properties
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/history-min.properties
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/history.properties b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/history.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/history.properties
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/history.properties
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/provenance-min.properties b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/provenance-min.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/provenance-min.properties
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/provenance-min.properties
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/provenance.properties b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/provenance.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/provenance.properties
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/provenance.properties
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/summary-min.properties b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/summary-min.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/summary-min.properties
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/summary-min.properties
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/summary.properties b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/summary.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/summary.properties
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/summary.properties
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/templates-min.properties b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/templates-min.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/templates-min.properties
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/templates-min.properties
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/templates.properties b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/templates.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/templates.properties
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/templates.properties
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/users-min.properties b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/users-min.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/users-min.properties
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/users-min.properties
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/users.properties b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/users.properties
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/users.properties
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/resources/filters/users.properties
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/message-page.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/message-page.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/message-page.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/message-page.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/banners-main.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/banners-main.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/banners-main.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/banners-main.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/banners-utility.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/banners-utility.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/banners-utility.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/banners-utility.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/about-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/about-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/about-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/about-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connection-configuration.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connection-configuration.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connection-configuration.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connection-configuration.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connections-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connections-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connections-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connections-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/fill-color-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/fill-color-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/fill-color-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/fill-color-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-status.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-status.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-status.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-status.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/instantiate-template-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/instantiate-template-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/instantiate-template-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/instantiate-template-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/label-configuration.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/label-configuration.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/label-configuration.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/label-configuration.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/navigation.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/navigation.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/navigation.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/navigation.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-port-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-port-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-port-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-port-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-process-group-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-process-group-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-process-group-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-process-group-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-property-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-property-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-property-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-property-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-remote-process-group-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-remote-process-group-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-remote-process-group-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-remote-process-group-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-template-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-template-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-template-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-template-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/port-configuration.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/port-configuration.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/port-configuration.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/port-configuration.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/port-details.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/port-details.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/port-details.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/port-details.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-details.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-details.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-details.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-details.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/processor-configuration.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/processor-configuration.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/processor-configuration.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/processor-configuration.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/registration.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/registration.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/registration.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/registration.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-port-configuration.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-port-configuration.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-port-configuration.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-port-configuration.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-configuration.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-configuration.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-configuration.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-configuration.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-details.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-details.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-details.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-details.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-ports.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-ports.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-ports.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-ports.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/secure-port-configuration.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/secure-port-configuration.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/secure-port-configuration.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/secure-port-configuration.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/secure-port-details.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/secure-port-details.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/secure-port-details.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/secure-port-details.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/shell.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/shell.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/shell.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/shell.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/cluster-content.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/cluster-content.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/cluster-content.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/cluster-content.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/node-details-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/node-details-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/node-details-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/node-details-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/connection-details.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/connection-details.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/connection-details.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/connection-details.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/action-details-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/action-details-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/action-details-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/action-details-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-content.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-content.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-content.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-content.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-filter-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-filter-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-filter-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-filter-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-purge-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-purge-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-purge-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-purge-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/message-pane.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/message-pane.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/message-pane.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/message-pane.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/ok-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/ok-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/ok-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/ok-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/processor-details.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/processor-details.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/processor-details.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/processor-details.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/lineage-query-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/lineage-query-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/lineage-query-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/lineage-query-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-event-details-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-event-details-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-event-details-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-event-details-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-query-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-query-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-query-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-query-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-search-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-search-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-search-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-search-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/status-history-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/status-history-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/status-history-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/status-history-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-connection-summary-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-connection-summary-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-connection-summary-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-connection-summary-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-input-port-summary-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-input-port-summary-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-input-port-summary-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-input-port-summary-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-output-port-summary-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-output-port-summary-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-output-port-summary-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-output-port-summary-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-processor-summary-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-processor-summary-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-processor-summary-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-processor-summary-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-remote-process-group-summary-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-remote-process-group-summary-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-remote-process-group-summary-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-remote-process-group-summary-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/summary-content.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/summary-content.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/summary-content.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/summary-content.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/system-diagnostics-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/system-diagnostics-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/system-diagnostics-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/system-diagnostics-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/view-single-node-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/view-single-node-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/view-single-node-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/view-single-node-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/group-revoke-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/group-revoke-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/group-revoke-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/group-revoke-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/group-roles-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/group-roles-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/group-roles-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/group-roles-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/user-delete-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/user-delete-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/user-delete-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/user-delete-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/user-details-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/user-details-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/user-details-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/user-details-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/user-group-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/user-group-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/user-group-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/user-group-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/user-revoke-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/user-revoke-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/user-revoke-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/user-revoke-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/user-roles-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/user-roles-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/user-roles-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/user-roles-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/users-content.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/users-content.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/users-content.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/users/users-content.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/yes-no-dialog.jsp b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/yes-no-dialog.jsp
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/yes-no-dialog.jsp
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/yes-no-dialog.jsp
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/web.xml b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/web.xml
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/web.xml
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/about.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/about.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/about.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/about.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/banner.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/banner.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/banner.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/banner.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/bulletin-board.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/bulletin-board.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/bulletin-board.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/bulletin-board.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/canvas.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/canvas.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/canvas.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/canvas.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/cluster.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/cluster.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/cluster.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/cluster.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/connection-configuration.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/connection-configuration.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/connection-configuration.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/connection-configuration.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/connection-details.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/connection-details.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/connection-details.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/connection-details.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/counters.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/counters.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/counters.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/counters.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/dialog.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/dialog.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/dialog.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/dialog.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/flow-status.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/flow-status.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/flow-status.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/flow-status.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/graph.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/graph.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/graph.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/graph.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/header.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/header.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/header.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/header.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/history.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/history.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/history.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/history.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/label-configuration.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/label-configuration.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/label-configuration.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/label-configuration.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/main.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/main.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/main.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/main.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/message-page.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/message-page.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/message-page.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/message-page.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/message-pane.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/message-pane.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/message-pane.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/message-pane.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/navigation.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/navigation.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/navigation.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/navigation.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/new-processor-dialog.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/new-processor-dialog.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/new-processor-dialog.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/new-processor-dialog.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/port-configuration.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/port-configuration.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/port-configuration.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/port-configuration.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/port-details.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/port-details.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/port-details.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/port-details.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/process-group-details.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/process-group-details.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/process-group-details.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/process-group-details.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/processor-configuration.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/processor-configuration.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/processor-configuration.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/processor-configuration.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/processor-details.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/processor-details.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/processor-details.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/processor-details.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/provenance.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/provenance.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/provenance.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/provenance.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/registration.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/registration.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/registration.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/registration.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/reset.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/reset.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/reset.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/reset.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/settings.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/settings.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/settings.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/settings.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/shell.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/shell.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/shell.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/shell.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/status-history.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/status-history.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/status-history.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/status-history.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/summary.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/summary.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/summary.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/summary.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/templates.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/templates.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/templates.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/templates.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/users.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/users.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/users.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/users.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/addConnect.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/addConnect.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/addConnect.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/addConnect.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bg-error.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bg-error.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bg-error.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bg-error.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgBannerFoot.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgBannerFoot.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgBannerFoot.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgBannerFoot.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgBannerHead.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgBannerHead.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgBannerHead.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgBannerHead.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgBreadcrumbs.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgBreadcrumbs.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgBreadcrumbs.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgBreadcrumbs.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgButton.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgButton.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgButton.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgButton.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgButtonOver.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgButtonOver.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgButtonOver.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgButtonOver.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgButtonSelected.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgButtonSelected.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgButtonSelected.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgButtonSelected.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgButtonSelectedOver.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgButtonSelectedOver.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgButtonSelectedOver.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgButtonSelectedOver.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgContextMenu.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgContextMenu.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgContextMenu.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgContextMenu.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgControlsInset.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgControlsInset.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgControlsInset.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgControlsInset.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgHeader.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgHeader.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgHeader.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgHeader.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgInputText.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgInputText.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgInputText.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgInputText.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgNifiLogo.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgNifiLogo.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgNifiLogo.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgNifiLogo.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgNifiToolbar.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgNifiToolbar.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgNifiToolbar.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgNifiToolbar.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgNifiToolbarEdge.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgNifiToolbarEdge.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgNifiToolbarEdge.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgNifiToolbarEdge.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgOutline.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgOutline.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgOutline.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgOutline.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgPanCenter.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgPanCenter.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgPanCenter.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgPanCenter.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgPanZoom.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgPanZoom.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgPanZoom.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgPanZoom.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgProcessGroupDetailsArea.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgProcessGroupDetailsArea.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgProcessGroupDetailsArea.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgProcessGroupDetailsArea.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgProcessorStatArea.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgProcessorStatArea.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgProcessorStatArea.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgProcessorStatArea.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgRemoteProcessGroupDetailsArea.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgRemoteProcessGroupDetailsArea.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgRemoteProcessGroupDetailsArea.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgRemoteProcessGroupDetailsArea.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgSearchInput.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgSearchInput.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgSearchInput.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgSearchInput.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgShellClose.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgShellClose.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgShellClose.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgShellClose.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgStatusPanel.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgStatusPanel.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgStatusPanel.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgStatusPanel.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgTabContainer.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgTabContainer.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgTabContainer.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgTabContainer.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgTableHeader.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgTableHeader.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgTableHeader.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgTableHeader.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgToolbarBtnBorder.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgToolbarBtnBorder.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgToolbarBtnBorder.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgToolbarBtnBorder.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/blueBtnBg-over.jpg b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/blueBtnBg-over.jpg
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/blueBtnBg-over.jpg
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/blueBtnBg-over.jpg
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/blueBtnBg.jpg b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/blueBtnBg.jpg
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/blueBtnBg.jpg
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/blueBtnBg.jpg
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonColor.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonColor.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonColor.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonColor.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonCopy.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonCopy.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonCopy.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonCopy.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonDelete.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonDelete.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonDelete.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonDelete.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonDisable.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonDisable.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonDisable.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonDisable.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonEnable.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonEnable.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonEnable.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonEnable.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonGroup.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonGroup.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonGroup.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonGroup.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonNewProperty.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonNewProperty.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonNewProperty.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonNewProperty.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonOutline.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonOutline.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonOutline.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonOutline.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonPanDown.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonPanDown.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonPanDown.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonPanDown.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonPanLeft.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonPanLeft.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonPanLeft.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonPanLeft.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonPanRight.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonPanRight.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonPanRight.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonPanRight.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonPanUp.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonPanUp.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonPanUp.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonPanUp.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonPaste.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonPaste.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonPaste.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonPaste.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonRefresh.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonRefresh.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonRefresh.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonRefresh.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonRun.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonRun.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonRun.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonRun.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonStop.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonStop.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonStop.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonStop.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonTemplate.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonTemplate.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonTemplate.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonTemplate.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonZoom100.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonZoom100.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonZoom100.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonZoom100.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonZoomFit.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonZoomFit.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonZoomFit.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonZoomFit.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonZoomIn.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonZoomIn.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonZoomIn.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonZoomIn.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonZoomOut.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonZoomOut.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonZoomOut.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/buttonZoomOut.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/cluster.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/cluster.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/cluster.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/cluster.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/grayBtnBg-over.jpg b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/grayBtnBg-over.jpg
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/grayBtnBg-over.jpg
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/grayBtnBg-over.jpg
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/grayBtnBg.jpg b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/grayBtnBg.jpg
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/grayBtnBg.jpg
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/grayBtnBg.jpg
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/grid.gif b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/grid.gif
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/grid.gif
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/grid.gif
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/headerTabBg.gif b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/headerTabBg.gif
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/headerTabBg.gif
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/headerTabBg.gif
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconAdminUser.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconAdminUser.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconAdminUser.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconAdminUser.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconAlert.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconAlert.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconAlert.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconAlert.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconAlertDialog.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconAlertDialog.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconAlertDialog.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconAlertDialog.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconAutoRefresh.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconAutoRefresh.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconAutoRefresh.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconAutoRefresh.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconBulletin.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconBulletin.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconBulletin.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconBulletin.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconBulletinBoard.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconBulletinBoard.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconBulletinBoard.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconBulletinBoard.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCenterView.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCenterView.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCenterView.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCenterView.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconChart.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconChart.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconChart.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconChart.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconClose.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconClose.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconClose.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconClose.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCluster.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCluster.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCluster.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCluster.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconClusterSmall.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconClusterSmall.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconClusterSmall.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconClusterSmall.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCollapseChildren.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCollapseChildren.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCollapseChildren.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCollapseChildren.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCollapseParents.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCollapseParents.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCollapseParents.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCollapseParents.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconColor.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconColor.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconColor.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconColor.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCommit.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCommit.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCommit.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCommit.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconConfigure.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconConfigure.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconConfigure.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconConfigure.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconConnect.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconConnect.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconConnect.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconConnect.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconConnection.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconConnection.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconConnection.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconConnection.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCopy.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCopy.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCopy.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCopy.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCounter.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCounter.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCounter.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconCounter.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconDelete.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconDelete.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconDelete.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconDelete.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconDetails.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconDetails.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconDetails.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconDetails.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconDisable.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconDisable.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconDisable.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconDisable.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconDisconnect.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconDisconnect.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconDisconnect.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconDisconnect.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconEdit.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconEdit.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconEdit.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconEdit.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconEditButton.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconEditButton.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconEditButton.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconEditButton.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconExpandChildren.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconExpandChildren.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconExpandChildren.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconExpandChildren.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconExpandParents.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconExpandParents.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconExpandParents.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconExpandParents.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconExport.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconExport.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconExport.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconExport.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconExportLineage.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconExportLineage.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconExportLineage.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconExportLineage.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconFlowSettings.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconFlowSettings.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconFlowSettings.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconFlowSettings.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconFunnel.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconFunnel.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconFunnel.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconFunnel.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconGoTo.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconGoTo.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconGoTo.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconGoTo.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconHistory.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconHistory.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconHistory.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconHistory.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconInfo.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconInfo.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconInfo.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconInfo.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconInputPort.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconInputPort.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconInputPort.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconInputPort.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconInputPortSmall.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconInputPortSmall.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconInputPortSmall.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconInputPortSmall.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconIsolatedProcessor.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconIsolatedProcessor.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconIsolatedProcessor.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconIsolatedProcessor.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconLineage.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconLineage.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconLineage.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconLineage.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconLoading.gif b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconLoading.gif
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconLoading.gif
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconLoading.gif
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconNotSecure.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconNotSecure.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconNotSecure.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconNotSecure.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconOutputPort.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconOutputPort.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconOutputPort.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconOutputPort.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconOutputPortSmall.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconOutputPortSmall.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconOutputPortSmall.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconOutputPortSmall.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPaste.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPaste.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPaste.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPaste.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPopOut.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPopOut.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPopOut.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPopOut.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPortNotTransmitting.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPortNotTransmitting.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPortNotTransmitting.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPortNotTransmitting.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPortRemoved.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPortRemoved.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPortRemoved.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPortRemoved.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPortTransmitting.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPortTransmitting.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPortTransmitting.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPortTransmitting.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPrimary.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPrimary.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPrimary.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconPrimary.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconProcessor.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconProcessor.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconProcessor.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconProcessor.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconProvenance.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconProvenance.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconProvenance.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconProvenance.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconRefresh.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconRefresh.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconRefresh.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconRefresh.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconRemotePorts.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconRemotePorts.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconRemotePorts.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconRemotePorts.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconRemoteProcessGroup.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconRemoteProcessGroup.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconRemoteProcessGroup.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconRemoteProcessGroup.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconReporting.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconReporting.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconReporting.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconReporting.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconResetCounter.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconResetCounter.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconResetCounter.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconResetCounter.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconResize.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconResize.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconResize.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconResize.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconRevoke.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconRevoke.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconRevoke.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconRevoke.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconRun.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconRun.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconRun.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconRun.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSecure.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSecure.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSecure.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSecure.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallFunnel.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallFunnel.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallFunnel.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallFunnel.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallInputPort.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallInputPort.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallInputPort.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallInputPort.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallOutputPort.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallOutputPort.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallOutputPort.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallOutputPort.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallProcessGroup.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallProcessGroup.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallProcessGroup.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallProcessGroup.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallProcessor.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallProcessor.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallProcessor.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallProcessor.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallRelationship.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallRelationship.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallRelationship.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallRelationship.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallRemoteProcessGroup.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallRemoteProcessGroup.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallRemoteProcessGroup.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconSmallRemoteProcessGroup.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconStop.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconStop.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconStop.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconStop.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconTemplates.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconTemplates.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconTemplates.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconTemplates.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconToFront.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconToFront.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconToFront.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconToFront.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconTransmissionActive.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconTransmissionActive.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconTransmissionActive.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconTransmissionActive.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconTransmissionInactive.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconTransmissionInactive.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconTransmissionInactive.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconTransmissionInactive.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconTwistArrow.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconTwistArrow.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconTwistArrow.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconTwistArrow.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconUndo.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconUndo.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconUndo.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconUndo.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconUsage.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconUsage.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconUsage.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/iconUsage.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/inputCheckbox.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/inputCheckbox.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/inputCheckbox.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/inputCheckbox.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/loadAnimation.gif b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/loadAnimation.gif
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/loadAnimation.gif
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/loadAnimation.gif
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/nifi16.ico b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/nifi16.ico
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/nifi16.ico
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/nifi16.ico
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/nifi_about.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/nifi_about.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/nifi_about.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/nifi_about.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/panelBg.jpg b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/panelBg.jpg
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/panelBg.jpg
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/panelBg.jpg
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/portRemoved.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/portRemoved.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/portRemoved.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/portRemoved.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/portRunning.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/portRunning.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/portRunning.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/portRunning.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/portStopped.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/portStopped.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/portStopped.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/portStopped.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/spacer.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/spacer.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/spacer.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/spacer.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/starburst.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/starburst.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/starburst.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/starburst.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/tabBg.jpg b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/tabBg.jpg
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/tabBg.jpg
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/tabBg.jpg
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolbarBg.gif b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolbarBg.gif
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolbarBg.gif
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolbarBg.gif
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconFunnel.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconFunnel.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconFunnel.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconFunnel.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconInputPort.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconInputPort.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconInputPort.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconInputPort.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconLabel.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconLabel.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconLabel.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconLabel.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconOutputPort.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconOutputPort.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconOutputPort.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconOutputPort.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconProcessGroup.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconProcessGroup.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconProcessGroup.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconProcessGroup.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconProcessor.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconProcessor.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconProcessor.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconProcessor.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconRemoteProcessGroup.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconRemoteProcessGroup.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconRemoteProcessGroup.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconRemoteProcessGroup.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconTemplate.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconTemplate.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconTemplate.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/toolboxIconTemplate.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/transmissionSwitchDisabled.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/transmissionSwitchDisabled.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/transmissionSwitchDisabled.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/transmissionSwitchDisabled.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/transmissionSwitchEnabled.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/transmissionSwitchEnabled.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/transmissionSwitchEnabled.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/transmissionSwitchEnabled.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/ungroup.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/ungroup.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/ungroup.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/ungroup.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/LICENSE b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/LICENSE
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/LICENSE
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/LICENSE
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/addon/hint/show-hint.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/addon/hint/show-hint.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/addon/hint/show-hint.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/addon/hint/show-hint.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror-compressed.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror-compressed.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror-compressed.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror-compressed.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/LICENSE b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/LICENSE
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/LICENSE
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/LICENSE
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/d3.min.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/d3.min.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/d3.min.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/d3.min.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/menuArrow.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/menuArrow.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/menuArrow.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/menuArrow.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/menuArrowSmall.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/menuArrowSmall.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/menuArrowSmall.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/menuArrowSmall.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-2.1.1.min.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-2.1.1.min.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-2.1.1.min.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-2.1.1.min.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.center.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.center.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.center.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.center.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.count.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.count.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.count.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.count.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.each.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.each.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.each.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.each.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.ellipsis.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.ellipsis.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.ellipsis.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.ellipsis.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.event.drag-2.2.min.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.event.drag-2.2.min.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.event.drag-2.2.min.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.event.drag-2.2.min.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.form.min.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.form.min.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.form.min.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.form.min.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.tab.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.tab.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.tab.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery.tab.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.min.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.min.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.min.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.min.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/languages/nfel.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/languages/nfel.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/languages/nfel.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/languages/nfel.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/languages/nfel.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/languages/nfel.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/languages/nfel.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/languages/nfel.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/qtip2/jquery.qtip.min.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/qtip2/jquery.qtip.min.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/qtip2/jquery.qtip.min.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/qtip2/jquery.qtip.min.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/qtip2/jquery.qtip.min.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/qtip2/jquery.qtip.min.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/qtip2/jquery.qtip.min.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/qtip2/jquery.qtip.min.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/MIT-LICENSE.txt b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/MIT-LICENSE.txt
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/MIT-LICENSE.txt
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/MIT-LICENSE.txt
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/images/collapse.gif b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/images/collapse.gif
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/images/collapse.gif
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/images/collapse.gif
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/images/expand.gif b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/images/expand.gif
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/images/expand.gif
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/images/expand.gif
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/images/sort-asc.gif b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/images/sort-asc.gif
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/images/sort-asc.gif
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/images/sort-asc.gif
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/images/sort-desc.gif b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/images/sort-desc.gif
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/images/sort-desc.gif
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/images/sort-desc.gif
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/slick-default-theme.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/slick-default-theme.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/slick-default-theme.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/slick-default-theme.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/slick.grid.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/slick.grid.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/slick.grid.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/slick.grid.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/plugins/slick.autotooltips.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/plugins/slick.autotooltips.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/plugins/slick.autotooltips.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/plugins/slick.autotooltips.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/plugins/slick.cellrangedecorator.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/plugins/slick.cellrangedecorator.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/plugins/slick.cellrangedecorator.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/plugins/slick.cellrangedecorator.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/plugins/slick.cellrangeselector.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/plugins/slick.cellrangeselector.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/plugins/slick.cellrangeselector.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/plugins/slick.cellrangeselector.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/plugins/slick.cellselectionmodel.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/plugins/slick.cellselectionmodel.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/plugins/slick.cellselectionmodel.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/plugins/slick.cellselectionmodel.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/plugins/slick.rowselectionmodel.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/plugins/slick.rowselectionmodel.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/plugins/slick.rowselectionmodel.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/plugins/slick.rowselectionmodel.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.core.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.core.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.core.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.core.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.dataview.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.dataview.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.dataview.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.dataview.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.editors.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.editors.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.editors.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.editors.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.formatters.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.formatters.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.formatters.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.formatters.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.grid.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.grid.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.grid.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.grid.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/tabbs/jquery.tabbs.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/tabbs/jquery.tabbs.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/tabbs/jquery.tabbs.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/tabbs/jquery.tabbs.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/tabbs/jquery.tabbs.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/tabbs/jquery.tabbs.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/tabbs/jquery.tabbs.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/tabbs/jquery.tabbs.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/animated-overlay.gif b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/animated-overlay.gif
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/animated-overlay.gif
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/animated-overlay.gif
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_75_ffffff_40x100.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_75_ffffff_40x100.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_65_ffffff_1x400.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_75_dadada_1x400.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_75_dadada_1x400.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_75_dadada_1x400.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-icons_222222_256x240.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-icons_222222_256x240.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-icons_222222_256x240.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-icons_222222_256x240.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-icons_2e83ff_256x240.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-icons_2e83ff_256x240.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-icons_2e83ff_256x240.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-icons_454545_256x240.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-icons_454545_256x240.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-icons_454545_256x240.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-icons_454545_256x240.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-icons_888888_256x240.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-icons_888888_256x240.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-icons_888888_256x240.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-icons_888888_256x240.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-icons_cd0a0a_256x240.png b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-icons_cd0a0a_256x240.png
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-icons_cd0a0a_256x240.png
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/json2.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/json2.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/json2.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/json2.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-birdseye.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-birdseye.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-birdseye.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-birdseye.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbar.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbar.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbar.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbar.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-clipboard.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-clipboard.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-clipboard.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-clipboard.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connectable.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connectable.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connectable.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connectable.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-custom-processor-ui.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-custom-processor-ui.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-custom-processor-ui.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-custom-processor-ui.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-draggable.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-draggable.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-draggable.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-draggable.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-funnel.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-funnel.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-funnel.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-funnel.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-go-to.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-go-to.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-go-to.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-go-to.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-graph-control.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-graph-control.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-graph-control.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-graph-control.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-graph.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-graph.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-graph.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-graph.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label-configuration.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label-configuration.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label-configuration.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label-configuration.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port-configuration.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port-configuration.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port-configuration.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port-configuration.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port-details.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port-details.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port-details.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port-details.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-details.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-details.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-details.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-details.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-combo-editor.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-combo-editor.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-combo-editor.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-combo-editor.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-nfel-editor.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-nfel-editor.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-nfel-editor.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-nfel-editor.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-table.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-table.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-table.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-table.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-text-editor.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-text-editor.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-text-editor.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-text-editor.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-registration.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-registration.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-registration.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-registration.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-configuration.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-configuration.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-configuration.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-configuration.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-details.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-details.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-details.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-details.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-configuration.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-configuration.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-configuration.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-configuration.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-details.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-details.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-details.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-details.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-selectable.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-selectable.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-selectable.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-selectable.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-snippet.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-snippet.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-snippet.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-snippet.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-storage.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-storage.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-storage.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-storage.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-toolbar-action.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-toolbar-action.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-toolbar-action.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-toolbar-action.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/counters/nf-counters-table.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/counters/nf-counters-table.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/counters/nf-counters-table.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/counters/nf-counters-table.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/counters/nf-counters.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/counters/nf-counters.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/counters/nf-counters.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/counters/nf-counters.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-model.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-model.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-model.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-model.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-client.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-client.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-client.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-client.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-connection-details.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-connection-details.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-connection-details.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-connection-details.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-dialog.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-dialog.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-dialog.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-dialog.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-namespace.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-namespace.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-namespace.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-namespace.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-cluster-search.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-cluster-search.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-cluster-search.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-cluster-search.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates-table.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates-table.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates-table.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates-table.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users.js b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users.js
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users.js
rename to nifi/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users.js
diff --git a/nar-bundles/framework-bundle/framework/web/pom.xml b/nifi/nar-bundles/framework-bundle/framework/web/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/web/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/web/web-optimistic-locking/.gitignore b/nifi/nar-bundles/framework-bundle/framework/web/web-optimistic-locking/.gitignore
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-optimistic-locking/.gitignore
rename to nifi/nar-bundles/framework-bundle/framework/web/web-optimistic-locking/.gitignore
diff --git a/nar-bundles/framework-bundle/framework/web/web-optimistic-locking/pom.xml b/nifi/nar-bundles/framework-bundle/framework/web/web-optimistic-locking/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-optimistic-locking/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/web/web-optimistic-locking/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/web/web-optimistic-locking/src/main/java/org/apache/nifi/web/ConfigurationSnapshot.java b/nifi/nar-bundles/framework-bundle/framework/web/web-optimistic-locking/src/main/java/org/apache/nifi/web/ConfigurationSnapshot.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-optimistic-locking/src/main/java/org/apache/nifi/web/ConfigurationSnapshot.java
rename to nifi/nar-bundles/framework-bundle/framework/web/web-optimistic-locking/src/main/java/org/apache/nifi/web/ConfigurationSnapshot.java
diff --git a/nar-bundles/framework-bundle/framework/web/web-optimistic-locking/src/main/java/org/apache/nifi/web/OptimisticLockingManager.java b/nifi/nar-bundles/framework-bundle/framework/web/web-optimistic-locking/src/main/java/org/apache/nifi/web/OptimisticLockingManager.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-optimistic-locking/src/main/java/org/apache/nifi/web/OptimisticLockingManager.java
rename to nifi/nar-bundles/framework-bundle/framework/web/web-optimistic-locking/src/main/java/org/apache/nifi/web/OptimisticLockingManager.java
diff --git a/nar-bundles/framework-bundle/framework/web/web-optimistic-locking/src/main/java/org/apache/nifi/web/StandardOptimisticLockingManager.java b/nifi/nar-bundles/framework-bundle/framework/web/web-optimistic-locking/src/main/java/org/apache/nifi/web/StandardOptimisticLockingManager.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-optimistic-locking/src/main/java/org/apache/nifi/web/StandardOptimisticLockingManager.java
rename to nifi/nar-bundles/framework-bundle/framework/web/web-optimistic-locking/src/main/java/org/apache/nifi/web/StandardOptimisticLockingManager.java
diff --git a/nar-bundles/framework-bundle/framework/web/web-security/.gitignore b/nifi/nar-bundles/framework-bundle/framework/web/web-security/.gitignore
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-security/.gitignore
rename to nifi/nar-bundles/framework-bundle/framework/web/web-security/.gitignore
diff --git a/nar-bundles/framework-bundle/framework/web/web-security/pom.xml b/nifi/nar-bundles/framework-bundle/framework/web/web-security/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-security/pom.xml
rename to nifi/nar-bundles/framework-bundle/framework/web/web-security/pom.xml
diff --git a/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/DnUtils.java b/nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/DnUtils.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/DnUtils.java
rename to nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/DnUtils.java
diff --git a/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/UntrustedProxyException.java b/nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/UntrustedProxyException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/UntrustedProxyException.java
rename to nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/UntrustedProxyException.java
diff --git a/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/anonymous/NiFiAnonymousUserFilter.java b/nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/anonymous/NiFiAnonymousUserFilter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/anonymous/NiFiAnonymousUserFilter.java
rename to nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/anonymous/NiFiAnonymousUserFilter.java
diff --git a/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/authentication/NiFiAuthenticationEntryPoint.java b/nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/authentication/NiFiAuthenticationEntryPoint.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/authentication/NiFiAuthenticationEntryPoint.java
rename to nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/authentication/NiFiAuthenticationEntryPoint.java
diff --git a/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/authorization/NiFiAuthorizationService.java b/nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/authorization/NiFiAuthorizationService.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/authorization/NiFiAuthorizationService.java
rename to nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/authorization/NiFiAuthorizationService.java
diff --git a/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/authorization/NodeAuthorizedUserFilter.java b/nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/authorization/NodeAuthorizedUserFilter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/authorization/NodeAuthorizedUserFilter.java
rename to nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/authorization/NodeAuthorizedUserFilter.java
diff --git a/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/user/NiFiUserDetails.java b/nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/user/NiFiUserDetails.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/user/NiFiUserDetails.java
rename to nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/user/NiFiUserDetails.java
diff --git a/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/user/NiFiUserUtils.java b/nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/user/NiFiUserUtils.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/user/NiFiUserUtils.java
rename to nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/user/NiFiUserUtils.java
diff --git a/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/SubjectDnX509PrincipalExtractor.java b/nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/SubjectDnX509PrincipalExtractor.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/SubjectDnX509PrincipalExtractor.java
rename to nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/SubjectDnX509PrincipalExtractor.java
diff --git a/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/X509AuthenticationFilter.java b/nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/X509AuthenticationFilter.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/X509AuthenticationFilter.java
rename to nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/X509AuthenticationFilter.java
diff --git a/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/X509CertificateExtractor.java b/nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/X509CertificateExtractor.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/X509CertificateExtractor.java
rename to nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/X509CertificateExtractor.java
diff --git a/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/ocsp/CertificateStatusException.java b/nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/ocsp/CertificateStatusException.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/ocsp/CertificateStatusException.java
rename to nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/ocsp/CertificateStatusException.java
diff --git a/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/ocsp/OcspCertificateValidator.java b/nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/ocsp/OcspCertificateValidator.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/ocsp/OcspCertificateValidator.java
rename to nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/ocsp/OcspCertificateValidator.java
diff --git a/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/ocsp/OcspRequest.java b/nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/ocsp/OcspRequest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/ocsp/OcspRequest.java
rename to nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/ocsp/OcspRequest.java
diff --git a/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/ocsp/OcspStatus.java b/nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/ocsp/OcspStatus.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/ocsp/OcspStatus.java
rename to nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/java/org/apache/nifi/web/security/x509/ocsp/OcspStatus.java
diff --git a/nar-bundles/framework-bundle/framework/web/web-security/src/main/resources/nifi-web-security-context.xml b/nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/resources/nifi-web-security-context.xml
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-security/src/main/resources/nifi-web-security-context.xml
rename to nifi/nar-bundles/framework-bundle/framework/web/web-security/src/main/resources/nifi-web-security-context.xml
diff --git a/nar-bundles/framework-bundle/framework/web/web-security/src/test/java/org/apache/nifi/web/security/authorization/NiFiAuthorizationServiceTest.java b/nifi/nar-bundles/framework-bundle/framework/web/web-security/src/test/java/org/apache/nifi/web/security/authorization/NiFiAuthorizationServiceTest.java
similarity index 100%
rename from nar-bundles/framework-bundle/framework/web/web-security/src/test/java/org/apache/nifi/web/security/authorization/NiFiAuthorizationServiceTest.java
rename to nifi/nar-bundles/framework-bundle/framework/web/web-security/src/test/java/org/apache/nifi/web/security/authorization/NiFiAuthorizationServiceTest.java
diff --git a/nar-bundles/framework-bundle/nar/.gitignore b/nifi/nar-bundles/framework-bundle/nar/.gitignore
similarity index 100%
rename from nar-bundles/framework-bundle/nar/.gitignore
rename to nifi/nar-bundles/framework-bundle/nar/.gitignore
diff --git a/nar-bundles/framework-bundle/nar/pom.xml b/nifi/nar-bundles/framework-bundle/nar/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/nar/pom.xml
rename to nifi/nar-bundles/framework-bundle/nar/pom.xml
diff --git a/nar-bundles/framework-bundle/pom.xml b/nifi/nar-bundles/framework-bundle/pom.xml
similarity index 100%
rename from nar-bundles/framework-bundle/pom.xml
rename to nifi/nar-bundles/framework-bundle/pom.xml
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/pom.xml b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/pom.xml
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/pom.xml
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/pom.xml
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/FlowFileStreamUnpackerSequenceFileWriter.java b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/FlowFileStreamUnpackerSequenceFileWriter.java
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/FlowFileStreamUnpackerSequenceFileWriter.java
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/FlowFileStreamUnpackerSequenceFileWriter.java
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFS.java b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFS.java
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFS.java
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFS.java
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFSSequenceFile.java b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFSSequenceFile.java
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFSSequenceFile.java
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFSSequenceFile.java
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/KeyValueReader.java b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/KeyValueReader.java
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/KeyValueReader.java
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/KeyValueReader.java
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/PutHDFS.java b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/PutHDFS.java
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/PutHDFS.java
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/PutHDFS.java
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/SequenceFileWriterImpl.java b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/SequenceFileWriterImpl.java
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/SequenceFileWriterImpl.java
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/SequenceFileWriterImpl.java
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/TarUnpackerSequenceFileWriter.java b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/TarUnpackerSequenceFileWriter.java
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/TarUnpackerSequenceFileWriter.java
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/TarUnpackerSequenceFileWriter.java
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ValueReader.java b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ValueReader.java
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ValueReader.java
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ValueReader.java
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ZipUnpackerSequenceFileWriter.java b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ZipUnpackerSequenceFileWriter.java
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ZipUnpackerSequenceFileWriter.java
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ZipUnpackerSequenceFileWriter.java
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/ByteFilteringOutputStream.java b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/ByteFilteringOutputStream.java
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/ByteFilteringOutputStream.java
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/ByteFilteringOutputStream.java
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/InputStreamWritable.java b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/InputStreamWritable.java
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/InputStreamWritable.java
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/InputStreamWritable.java
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/OutputStreamWritable.java b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/OutputStreamWritable.java
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/OutputStreamWritable.java
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/OutputStreamWritable.java
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/SequenceFileReader.java b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/SequenceFileReader.java
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/SequenceFileReader.java
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/SequenceFileReader.java
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/SequenceFileWriter.java b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/SequenceFileWriter.java
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/SequenceFileWriter.java
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/SequenceFileWriter.java
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/main/resources/docs/org.apache.nifi.processors.hadoop.CreateHadoopSequenceFile/index.html b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/resources/docs/org.apache.nifi.processors.hadoop.CreateHadoopSequenceFile/index.html
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/main/resources/docs/org.apache.nifi.processors.hadoop.CreateHadoopSequenceFile/index.html
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/resources/docs/org.apache.nifi.processors.hadoop.CreateHadoopSequenceFile/index.html
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/main/resources/docs/org.apache.nifi.processors.hadoop.GetHDFS/index.html b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/resources/docs/org.apache.nifi.processors.hadoop.GetHDFS/index.html
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/main/resources/docs/org.apache.nifi.processors.hadoop.GetHDFS/index.html
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/resources/docs/org.apache.nifi.processors.hadoop.GetHDFS/index.html
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/main/resources/docs/org.apache.nifi.processors.hadoop.GetHDFSSequenceFile/index.html b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/resources/docs/org.apache.nifi.processors.hadoop.GetHDFSSequenceFile/index.html
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/main/resources/docs/org.apache.nifi.processors.hadoop.GetHDFSSequenceFile/index.html
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/resources/docs/org.apache.nifi.processors.hadoop.GetHDFSSequenceFile/index.html
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/main/resources/docs/org.apache.nifi.processors.hadoop.PutHDFS/index.html b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/resources/docs/org.apache.nifi.processors.hadoop.PutHDFS/index.html
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/main/resources/docs/org.apache.nifi.processors.hadoop.PutHDFS/index.html
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/main/resources/docs/org.apache.nifi.processors.hadoop.PutHDFS/index.html
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/AbstractHadoopTest.java b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/AbstractHadoopTest.java
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/AbstractHadoopTest.java
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/AbstractHadoopTest.java
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/GetHDFSTest.java b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/GetHDFSTest.java
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/GetHDFSTest.java
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/GetHDFSTest.java
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/PutHDFSTest.java b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/PutHDFSTest.java
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/PutHDFSTest.java
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/PutHDFSTest.java
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/SimpleHadoopProcessor.java b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/SimpleHadoopProcessor.java
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/SimpleHadoopProcessor.java
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/SimpleHadoopProcessor.java
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestCreateHadoopSequenceFile.java b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestCreateHadoopSequenceFile.java
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestCreateHadoopSequenceFile.java
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestCreateHadoopSequenceFile.java
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/core-site-broken.xml b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/core-site-broken.xml
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/core-site-broken.xml
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/core-site-broken.xml
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/core-site.xml b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/core-site.xml
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/core-site.xml
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/core-site.xml
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/13545312236534130.tar b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/13545312236534130.tar
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/13545312236534130.tar
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/13545312236534130.tar
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/13545423550275052.zip b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/13545423550275052.zip
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/13545423550275052.zip
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/13545423550275052.zip
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/13545479542069498.pkg b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/13545479542069498.pkg
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/13545479542069498.pkg
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/13545479542069498.pkg
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/randombytes-1 b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/randombytes-1
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/randombytes-1
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/randombytes-1
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/randombytes-2 b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/randombytes-2
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/randombytes-2
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/randombytes-2
diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/randombytes-3 b/nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/randombytes-3
similarity index 100%
rename from nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/randombytes-3
rename to nifi/nar-bundles/hadoop-bundle/hdfs-processors/src/test/resources/testdata/randombytes-3
diff --git a/nar-bundles/hadoop-bundle/nar/pom.xml b/nifi/nar-bundles/hadoop-bundle/nar/pom.xml
similarity index 100%
rename from nar-bundles/hadoop-bundle/nar/pom.xml
rename to nifi/nar-bundles/hadoop-bundle/nar/pom.xml
diff --git a/nar-bundles/hadoop-bundle/pom.xml b/nifi/nar-bundles/hadoop-bundle/pom.xml
similarity index 100%
rename from nar-bundles/hadoop-bundle/pom.xml
rename to nifi/nar-bundles/hadoop-bundle/pom.xml
diff --git a/nar-bundles/hadoop-libraries-bundle/nar/pom.xml b/nifi/nar-bundles/hadoop-libraries-bundle/nar/pom.xml
similarity index 100%
rename from nar-bundles/hadoop-libraries-bundle/nar/pom.xml
rename to nifi/nar-bundles/hadoop-libraries-bundle/nar/pom.xml
diff --git a/nar-bundles/hadoop-libraries-bundle/pom.xml b/nifi/nar-bundles/hadoop-libraries-bundle/pom.xml
similarity index 100%
rename from nar-bundles/hadoop-libraries-bundle/pom.xml
rename to nifi/nar-bundles/hadoop-libraries-bundle/pom.xml
diff --git a/nar-bundles/jetty-bundle/pom.xml b/nifi/nar-bundles/jetty-bundle/pom.xml
similarity index 100%
rename from nar-bundles/jetty-bundle/pom.xml
rename to nifi/nar-bundles/jetty-bundle/pom.xml
diff --git a/nar-bundles/kafka-bundle/kafka-nar/pom.xml b/nifi/nar-bundles/kafka-bundle/kafka-nar/pom.xml
similarity index 100%
rename from nar-bundles/kafka-bundle/kafka-nar/pom.xml
rename to nifi/nar-bundles/kafka-bundle/kafka-nar/pom.xml
diff --git a/nar-bundles/kafka-bundle/kafka-processors/pom.xml b/nifi/nar-bundles/kafka-bundle/kafka-processors/pom.xml
similarity index 100%
rename from nar-bundles/kafka-bundle/kafka-processors/pom.xml
rename to nifi/nar-bundles/kafka-bundle/kafka-processors/pom.xml
diff --git a/nar-bundles/kafka-bundle/kafka-processors/src/main/java/org/apache/nifi/processors/kafka/GetKafka.java b/nifi/nar-bundles/kafka-bundle/kafka-processors/src/main/java/org/apache/nifi/processors/kafka/GetKafka.java
similarity index 100%
rename from nar-bundles/kafka-bundle/kafka-processors/src/main/java/org/apache/nifi/processors/kafka/GetKafka.java
rename to nifi/nar-bundles/kafka-bundle/kafka-processors/src/main/java/org/apache/nifi/processors/kafka/GetKafka.java
diff --git a/nar-bundles/kafka-bundle/kafka-processors/src/main/java/org/apache/nifi/processors/kafka/PutKafka.java b/nifi/nar-bundles/kafka-bundle/kafka-processors/src/main/java/org/apache/nifi/processors/kafka/PutKafka.java
similarity index 100%
rename from nar-bundles/kafka-bundle/kafka-processors/src/main/java/org/apache/nifi/processors/kafka/PutKafka.java
rename to nifi/nar-bundles/kafka-bundle/kafka-processors/src/main/java/org/apache/nifi/processors/kafka/PutKafka.java
diff --git a/nar-bundles/kafka-bundle/kafka-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor b/nifi/nar-bundles/kafka-bundle/kafka-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
similarity index 100%
rename from nar-bundles/kafka-bundle/kafka-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
rename to nifi/nar-bundles/kafka-bundle/kafka-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
diff --git a/nar-bundles/kafka-bundle/kafka-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.GetKafka/index.html b/nifi/nar-bundles/kafka-bundle/kafka-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.GetKafka/index.html
similarity index 100%
rename from nar-bundles/kafka-bundle/kafka-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.GetKafka/index.html
rename to nifi/nar-bundles/kafka-bundle/kafka-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.GetKafka/index.html
diff --git a/nar-bundles/kafka-bundle/kafka-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.PutKafka/index.html b/nifi/nar-bundles/kafka-bundle/kafka-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.PutKafka/index.html
similarity index 100%
rename from nar-bundles/kafka-bundle/kafka-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.PutKafka/index.html
rename to nifi/nar-bundles/kafka-bundle/kafka-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.PutKafka/index.html
diff --git a/nar-bundles/kafka-bundle/kafka-processors/src/test/java/org/apache/nifi/processors/kafka/TestGetKafka.java b/nifi/nar-bundles/kafka-bundle/kafka-processors/src/test/java/org/apache/nifi/processors/kafka/TestGetKafka.java
similarity index 100%
rename from nar-bundles/kafka-bundle/kafka-processors/src/test/java/org/apache/nifi/processors/kafka/TestGetKafka.java
rename to nifi/nar-bundles/kafka-bundle/kafka-processors/src/test/java/org/apache/nifi/processors/kafka/TestGetKafka.java
diff --git a/nar-bundles/kafka-bundle/kafka-processors/src/test/java/org/apache/nifi/processors/kafka/TestPutKafka.java b/nifi/nar-bundles/kafka-bundle/kafka-processors/src/test/java/org/apache/nifi/processors/kafka/TestPutKafka.java
similarity index 100%
rename from nar-bundles/kafka-bundle/kafka-processors/src/test/java/org/apache/nifi/processors/kafka/TestPutKafka.java
rename to nifi/nar-bundles/kafka-bundle/kafka-processors/src/test/java/org/apache/nifi/processors/kafka/TestPutKafka.java
diff --git a/nar-bundles/kafka-bundle/pom.xml b/nifi/nar-bundles/kafka-bundle/pom.xml
similarity index 100%
rename from nar-bundles/kafka-bundle/pom.xml
rename to nifi/nar-bundles/kafka-bundle/pom.xml
diff --git a/nar-bundles/monitor-threshold-bundle/nar/pom.xml b/nifi/nar-bundles/monitor-threshold-bundle/nar/pom.xml
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/nar/pom.xml
rename to nifi/nar-bundles/monitor-threshold-bundle/nar/pom.xml
diff --git a/nar-bundles/monitor-threshold-bundle/pom.xml b/nifi/nar-bundles/monitor-threshold-bundle/pom.xml
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/pom.xml
rename to nifi/nar-bundles/monitor-threshold-bundle/pom.xml
diff --git a/nar-bundles/monitor-threshold-bundle/processor/pom.xml b/nifi/nar-bundles/monitor-threshold-bundle/processor/pom.xml
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/processor/pom.xml
rename to nifi/nar-bundles/monitor-threshold-bundle/processor/pom.xml
diff --git a/nar-bundles/monitor-threshold-bundle/processor/src/main/java/org/apache/nifi/processors/monitor/MonitorThreshold.java b/nifi/nar-bundles/monitor-threshold-bundle/processor/src/main/java/org/apache/nifi/processors/monitor/MonitorThreshold.java
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/processor/src/main/java/org/apache/nifi/processors/monitor/MonitorThreshold.java
rename to nifi/nar-bundles/monitor-threshold-bundle/processor/src/main/java/org/apache/nifi/processors/monitor/MonitorThreshold.java
diff --git a/nar-bundles/monitor-threshold-bundle/processor/src/main/java/org/apache/nifi/processors/monitor/ThresholdsParser.java b/nifi/nar-bundles/monitor-threshold-bundle/processor/src/main/java/org/apache/nifi/processors/monitor/ThresholdsParser.java
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/processor/src/main/java/org/apache/nifi/processors/monitor/ThresholdsParser.java
rename to nifi/nar-bundles/monitor-threshold-bundle/processor/src/main/java/org/apache/nifi/processors/monitor/ThresholdsParser.java
diff --git a/nar-bundles/monitor-threshold-bundle/processor/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor b/nifi/nar-bundles/monitor-threshold-bundle/processor/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/processor/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
rename to nifi/nar-bundles/monitor-threshold-bundle/processor/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
diff --git a/nar-bundles/monitor-threshold-bundle/processor/src/main/resources/docs/org.apache.nifi.processors.monitor.MonitorThreshold/index.html b/nifi/nar-bundles/monitor-threshold-bundle/processor/src/main/resources/docs/org.apache.nifi.processors.monitor.MonitorThreshold/index.html
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/processor/src/main/resources/docs/org.apache.nifi.processors.monitor.MonitorThreshold/index.html
rename to nifi/nar-bundles/monitor-threshold-bundle/processor/src/main/resources/docs/org.apache.nifi.processors.monitor.MonitorThreshold/index.html
diff --git a/nar-bundles/monitor-threshold-bundle/processor/src/test/java/org/apache/nifi/processors/monitor/TestMonitorThreshold.java b/nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/java/org/apache/nifi/processors/monitor/TestMonitorThreshold.java
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/processor/src/test/java/org/apache/nifi/processors/monitor/TestMonitorThreshold.java
rename to nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/java/org/apache/nifi/processors/monitor/TestMonitorThreshold.java
diff --git a/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/testFile b/nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/testFile
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/processor/src/test/resources/testFile
rename to nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/testFile
diff --git a/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_0.xml b/nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_0.xml
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_0.xml
rename to nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_0.xml
diff --git a/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_1.xml b/nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_1.xml
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_1.xml
rename to nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_1.xml
diff --git a/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_10_KB.xml b/nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_10_KB.xml
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_10_KB.xml
rename to nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_10_KB.xml
diff --git a/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_10_KB_and_2_KB.xml b/nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_10_KB_and_2_KB.xml
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_10_KB_and_2_KB.xml
rename to nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_10_KB_and_2_KB.xml
diff --git a/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_1669_bytes.xml b/nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_1669_bytes.xml
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_1669_bytes.xml
rename to nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_1669_bytes.xml
diff --git a/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_2.xml b/nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_2.xml
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_2.xml
rename to nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_2.xml
diff --git a/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_2_default.xml b/nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_2_default.xml
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_2_default.xml
rename to nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_2_default.xml
diff --git a/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_3336_bytes_default.xml b/nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_3336_bytes_default.xml
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_3336_bytes_default.xml
rename to nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_allow_3336_bytes_default.xml
diff --git a/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_with_empty_attribute_value.xml b/nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_with_empty_attribute_value.xml
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_with_empty_attribute_value.xml
rename to nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_with_empty_attribute_value.xml
diff --git a/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_with_spaces_for_attribute_values.xml b/nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_with_spaces_for_attribute_values.xml
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_with_spaces_for_attribute_values.xml
rename to nifi/nar-bundles/monitor-threshold-bundle/processor/src/test/resources/threshold_settings_with_spaces_for_attribute_values.xml
diff --git a/nar-bundles/monitor-threshold-bundle/ui/nb-configuration.xml b/nifi/nar-bundles/monitor-threshold-bundle/ui/nb-configuration.xml
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/nb-configuration.xml
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/nb-configuration.xml
diff --git a/nar-bundles/monitor-threshold-bundle/ui/pom.xml b/nifi/nar-bundles/monitor-threshold-bundle/ui/pom.xml
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/pom.xml
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/pom.xml
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/AttributeComparator.java b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/AttributeComparator.java
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/AttributeComparator.java
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/AttributeComparator.java
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/AttributeResource.java b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/AttributeResource.java
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/AttributeResource.java
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/AttributeResource.java
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/RuleComparator.java b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/RuleComparator.java
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/RuleComparator.java
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/RuleComparator.java
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/ThresholdResource.java b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/ThresholdResource.java
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/ThresholdResource.java
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/ThresholdResource.java
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/ThresholdSettingsResource.java b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/ThresholdSettingsResource.java
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/ThresholdSettingsResource.java
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/ThresholdSettingsResource.java
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/ThresholdsConfigFile.java b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/ThresholdsConfigFile.java
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/ThresholdsConfigFile.java
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/java/org/apache/nifi/monitor/thresholds/ui/ThresholdsConfigFile.java
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/META-INF/nifi-processor b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/META-INF/nifi-processor
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/META-INF/nifi-processor
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/META-INF/nifi-processor
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/attribute-add-dialog.jsp b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/attribute-add-dialog.jsp
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/attribute-add-dialog.jsp
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/attribute-add-dialog.jsp
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/attribute-confirm-dialog.jsp b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/attribute-confirm-dialog.jsp
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/attribute-confirm-dialog.jsp
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/attribute-confirm-dialog.jsp
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/attribute-edit-dialog.jsp b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/attribute-edit-dialog.jsp
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/attribute-edit-dialog.jsp
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/attribute-edit-dialog.jsp
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/attribute-filter-dialog.jsp b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/attribute-filter-dialog.jsp
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/attribute-filter-dialog.jsp
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/attribute-filter-dialog.jsp
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/error-dialog.jsp b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/error-dialog.jsp
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/error-dialog.jsp
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/error-dialog.jsp
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/index.jsp b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/index.jsp
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/index.jsp
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/index.jsp
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/threshold-add-dialog.jsp b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/threshold-add-dialog.jsp
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/threshold-add-dialog.jsp
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/threshold-add-dialog.jsp
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/threshold-confirm-dialog.jsp b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/threshold-confirm-dialog.jsp
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/threshold-confirm-dialog.jsp
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/threshold-confirm-dialog.jsp
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/threshold-dialog.jsp b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/threshold-dialog.jsp
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/threshold-dialog.jsp
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/threshold-dialog.jsp
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/threshold-edit-dialog.jsp b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/threshold-edit-dialog.jsp
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/threshold-edit-dialog.jsp
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/threshold-edit-dialog.jsp
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/threshold-filter-dialog.jsp b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/threshold-filter-dialog.jsp
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/threshold-filter-dialog.jsp
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/threshold-filter-dialog.jsp
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/web.xml b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/web.xml
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/web.xml
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/css/threshold_styles.css b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/css/threshold_styles.css
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/css/threshold_styles.css
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/css/threshold_styles.css
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/addWorksheetRow.png b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/addWorksheetRow.png
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/addWorksheetRow.png
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/addWorksheetRow.png
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/clear.png b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/clear.png
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/clear.png
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/clear.png
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/filter.gif b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/filter.gif
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/filter.gif
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/filter.gif
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/firstPage.gif b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/firstPage.gif
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/firstPage.gif
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/firstPage.gif
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/firstPageDisabled.gif b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/firstPageDisabled.gif
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/firstPageDisabled.gif
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/firstPageDisabled.gif
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/lastPage.gif b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/lastPage.gif
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/lastPage.gif
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/lastPage.gif
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/lastPageDisabled.gif b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/lastPageDisabled.gif
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/lastPageDisabled.gif
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/lastPageDisabled.gif
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/nextPage.gif b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/nextPage.gif
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/nextPage.gif
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/nextPage.gif
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/nextPageDisabled.gif b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/nextPageDisabled.gif
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/nextPageDisabled.gif
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/nextPageDisabled.gif
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/prevPage.gif b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/prevPage.gif
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/prevPage.gif
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/prevPage.gif
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/prevPageDisabled.gif b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/prevPageDisabled.gif
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/prevPageDisabled.gif
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/prevPageDisabled.gif
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/removeWorksheetRow.png b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/removeWorksheetRow.png
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/removeWorksheetRow.png
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/removeWorksheetRow.png
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/separator.gif b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/separator.gif
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/separator.gif
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/images/separator.gif
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/css/ui.jqgrid.css b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/css/ui.jqgrid.css
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/css/ui.jqgrid.css
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/css/ui.jqgrid.css
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/js/i18n/grid.locale-en.js b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/js/i18n/grid.locale-en.js
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/js/i18n/grid.locale-en.js
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/js/i18n/grid.locale-en.js
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/js/jquery.jqGrid.min.js b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/js/jquery.jqGrid.min.js
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/js/jquery.jqGrid.min.js
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/js/jquery.jqGrid.min.js
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/nf-common.js b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/nf-common.js
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/nf-common.js
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/nf-common.js
diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/xsd/threshold_settings.xsd b/nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/xsd/threshold_settings.xsd
similarity index 100%
rename from nar-bundles/monitor-threshold-bundle/ui/src/main/xsd/threshold_settings.xsd
rename to nifi/nar-bundles/monitor-threshold-bundle/ui/src/main/xsd/threshold_settings.xsd
diff --git a/nar-bundles/persistent-provenance-repository-bundle/nar/pom.xml b/nifi/nar-bundles/persistent-provenance-repository-bundle/nar/pom.xml
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/nar/pom.xml
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/nar/pom.xml
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/pom.xml b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/pom.xml
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/pom.xml
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/pom.xml
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/IndexConfiguration.java b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/IndexConfiguration.java
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/IndexConfiguration.java
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/IndexConfiguration.java
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/RepositoryConfiguration.java b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/RepositoryConfiguration.java
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/RepositoryConfiguration.java
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/RepositoryConfiguration.java
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordReader.java b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordReader.java
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordReader.java
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordReader.java
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/expiration/ExpirationAction.java b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/expiration/ExpirationAction.java
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/expiration/ExpirationAction.java
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/expiration/ExpirationAction.java
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/expiration/FileRemovalAction.java b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/expiration/FileRemovalAction.java
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/expiration/FileRemovalAction.java
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/expiration/FileRemovalAction.java
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/DeleteIndexAction.java b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/DeleteIndexAction.java
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/DeleteIndexAction.java
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/DeleteIndexAction.java
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/DocsReader.java b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/DocsReader.java
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/DocsReader.java
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/DocsReader.java
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/FieldNames.java b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/FieldNames.java
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/FieldNames.java
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/FieldNames.java
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/IndexSearch.java b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/IndexSearch.java
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/IndexSearch.java
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/IndexSearch.java
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/IndexingAction.java b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/IndexingAction.java
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/IndexingAction.java
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/IndexingAction.java
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/LineageQuery.java b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/LineageQuery.java
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/LineageQuery.java
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/LineageQuery.java
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/LuceneUtil.java b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/LuceneUtil.java
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/LuceneUtil.java
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/LuceneUtil.java
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/rollover/CompressionAction.java b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/rollover/CompressionAction.java
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/rollover/CompressionAction.java
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/rollover/CompressionAction.java
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/rollover/RolloverAction.java b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/rollover/RolloverAction.java
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/rollover/RolloverAction.java
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/rollover/RolloverAction.java
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/serialization/RecordReader.java b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/serialization/RecordReader.java
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/serialization/RecordReader.java
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/serialization/RecordReader.java
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/serialization/RecordReaders.java b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/serialization/RecordReaders.java
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/serialization/RecordReaders.java
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/serialization/RecordReaders.java
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/serialization/RecordWriter.java b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/serialization/RecordWriter.java
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/serialization/RecordWriter.java
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/serialization/RecordWriter.java
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/serialization/RecordWriters.java b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/serialization/RecordWriters.java
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/serialization/RecordWriters.java
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/serialization/RecordWriters.java
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/resources/META-INF/services/org.apache.nifi.provenance.ProvenanceEventRepository b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/resources/META-INF/services/org.apache.nifi.provenance.ProvenanceEventRepository
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/resources/META-INF/services/org.apache.nifi.provenance.ProvenanceEventRepository
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/main/resources/META-INF/services/org.apache.nifi.provenance.ProvenanceEventRepository
diff --git a/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java b/nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java
diff --git a/nar-bundles/persistent-provenance-repository-bundle/pom.xml b/nifi/nar-bundles/persistent-provenance-repository-bundle/pom.xml
similarity index 100%
rename from nar-bundles/persistent-provenance-repository-bundle/pom.xml
rename to nifi/nar-bundles/persistent-provenance-repository-bundle/pom.xml
diff --git a/nar-bundles/pom.xml b/nifi/nar-bundles/pom.xml
similarity index 100%
rename from nar-bundles/pom.xml
rename to nifi/nar-bundles/pom.xml
diff --git a/nar-bundles/standard-bundle/jms-processors/pom.xml b/nifi/nar-bundles/standard-bundle/jms-processors/pom.xml
similarity index 100%
rename from nar-bundles/standard-bundle/jms-processors/pom.xml
rename to nifi/nar-bundles/standard-bundle/jms-processors/pom.xml
diff --git a/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/GetJMSQueue.java b/nifi/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/GetJMSQueue.java
similarity index 100%
rename from nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/GetJMSQueue.java
rename to nifi/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/GetJMSQueue.java
diff --git a/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/GetJMSTopic.java b/nifi/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/GetJMSTopic.java
similarity index 100%
rename from nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/GetJMSTopic.java
rename to nifi/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/GetJMSTopic.java
diff --git a/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/JmsConsumer.java b/nifi/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/JmsConsumer.java
similarity index 100%
rename from nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/JmsConsumer.java
rename to nifi/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/JmsConsumer.java
diff --git a/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/PutJMS.java b/nifi/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/PutJMS.java
similarity index 100%
rename from nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/PutJMS.java
rename to nifi/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/PutJMS.java
diff --git a/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/util/JmsFactory.java b/nifi/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/util/JmsFactory.java
similarity index 100%
rename from nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/util/JmsFactory.java
rename to nifi/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/util/JmsFactory.java
diff --git a/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/util/JmsProperties.java b/nifi/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/util/JmsProperties.java
similarity index 100%
rename from nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/util/JmsProperties.java
rename to nifi/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/util/JmsProperties.java
diff --git a/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/util/WrappedMessageConsumer.java b/nifi/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/util/WrappedMessageConsumer.java
similarity index 100%
rename from nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/util/WrappedMessageConsumer.java
rename to nifi/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/util/WrappedMessageConsumer.java
diff --git a/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/util/WrappedMessageProducer.java b/nifi/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/util/WrappedMessageProducer.java
similarity index 100%
rename from nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/util/WrappedMessageProducer.java
rename to nifi/nar-bundles/standard-bundle/jms-processors/src/main/java/org/apache/nifi/processors/jms/util/WrappedMessageProducer.java
diff --git a/nar-bundles/standard-bundle/jms-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor b/nifi/nar-bundles/standard-bundle/jms-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
similarity index 100%
rename from nar-bundles/standard-bundle/jms-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
rename to nifi/nar-bundles/standard-bundle/jms-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
diff --git a/nar-bundles/standard-bundle/jms-processors/src/main/resources/docs/org.apache.nifi.processors.jms.GetJMSQueue/index.html b/nifi/nar-bundles/standard-bundle/jms-processors/src/main/resources/docs/org.apache.nifi.processors.jms.GetJMSQueue/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/jms-processors/src/main/resources/docs/org.apache.nifi.processors.jms.GetJMSQueue/index.html
rename to nifi/nar-bundles/standard-bundle/jms-processors/src/main/resources/docs/org.apache.nifi.processors.jms.GetJMSQueue/index.html
diff --git a/nar-bundles/standard-bundle/jms-processors/src/main/resources/docs/org.apache.nifi.processors.jms.GetJMSTopic/index.html b/nifi/nar-bundles/standard-bundle/jms-processors/src/main/resources/docs/org.apache.nifi.processors.jms.GetJMSTopic/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/jms-processors/src/main/resources/docs/org.apache.nifi.processors.jms.GetJMSTopic/index.html
rename to nifi/nar-bundles/standard-bundle/jms-processors/src/main/resources/docs/org.apache.nifi.processors.jms.GetJMSTopic/index.html
diff --git a/nar-bundles/standard-bundle/jms-processors/src/main/resources/docs/org.apache.nifi.processors.jms.PutJMS/index.html b/nifi/nar-bundles/standard-bundle/jms-processors/src/main/resources/docs/org.apache.nifi.processors.jms.PutJMS/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/jms-processors/src/main/resources/docs/org.apache.nifi.processors.jms.PutJMS/index.html
rename to nifi/nar-bundles/standard-bundle/jms-processors/src/main/resources/docs/org.apache.nifi.processors.jms.PutJMS/index.html
diff --git a/nar-bundles/standard-bundle/jms-processors/src/test/java/org/apache/nifi/processors/jms/GetJMSQueueTest.java b/nifi/nar-bundles/standard-bundle/jms-processors/src/test/java/org/apache/nifi/processors/jms/GetJMSQueueTest.java
similarity index 100%
rename from nar-bundles/standard-bundle/jms-processors/src/test/java/org/apache/nifi/processors/jms/GetJMSQueueTest.java
rename to nifi/nar-bundles/standard-bundle/jms-processors/src/test/java/org/apache/nifi/processors/jms/GetJMSQueueTest.java
diff --git a/nar-bundles/standard-bundle/nar/pom.xml b/nifi/nar-bundles/standard-bundle/nar/pom.xml
similarity index 100%
rename from nar-bundles/standard-bundle/nar/pom.xml
rename to nifi/nar-bundles/standard-bundle/nar/pom.xml
diff --git a/nar-bundles/standard-bundle/pom.xml b/nifi/nar-bundles/standard-bundle/pom.xml
similarity index 100%
rename from nar-bundles/standard-bundle/pom.xml
rename to nifi/nar-bundles/standard-bundle/pom.xml
diff --git a/nar-bundles/standard-bundle/standard-ganglia-reporter/pom.xml b/nifi/nar-bundles/standard-bundle/standard-ganglia-reporter/pom.xml
similarity index 100%
rename from nar-bundles/standard-bundle/standard-ganglia-reporter/pom.xml
rename to nifi/nar-bundles/standard-bundle/standard-ganglia-reporter/pom.xml
diff --git a/nar-bundles/standard-bundle/standard-ganglia-reporter/src/main/java/org/apache/nifi/reporting/ganglia/StandardGangliaReporter.java b/nifi/nar-bundles/standard-bundle/standard-ganglia-reporter/src/main/java/org/apache/nifi/reporting/ganglia/StandardGangliaReporter.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-ganglia-reporter/src/main/java/org/apache/nifi/reporting/ganglia/StandardGangliaReporter.java
rename to nifi/nar-bundles/standard-bundle/standard-ganglia-reporter/src/main/java/org/apache/nifi/reporting/ganglia/StandardGangliaReporter.java
diff --git a/nar-bundles/standard-bundle/standard-ganglia-reporter/src/main/resources/META-INF/services/org.apache.nifi.reporting.ReportingTask b/nifi/nar-bundles/standard-bundle/standard-ganglia-reporter/src/main/resources/META-INF/services/org.apache.nifi.reporting.ReportingTask
similarity index 100%
rename from nar-bundles/standard-bundle/standard-ganglia-reporter/src/main/resources/META-INF/services/org.apache.nifi.reporting.ReportingTask
rename to nifi/nar-bundles/standard-bundle/standard-ganglia-reporter/src/main/resources/META-INF/services/org.apache.nifi.reporting.ReportingTask
diff --git a/nar-bundles/standard-bundle/standard-ganglia-reporter/src/main/resources/docs/org.apache.nifi.reporting.ganglia.StandardGangliaReporter/index.html b/nifi/nar-bundles/standard-bundle/standard-ganglia-reporter/src/main/resources/docs/org.apache.nifi.reporting.ganglia.StandardGangliaReporter/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-ganglia-reporter/src/main/resources/docs/org.apache.nifi.reporting.ganglia.StandardGangliaReporter/index.html
rename to nifi/nar-bundles/standard-bundle/standard-ganglia-reporter/src/main/resources/docs/org.apache.nifi.reporting.ganglia.StandardGangliaReporter/index.html
diff --git a/nar-bundles/standard-bundle/standard-prioritizers/pom.xml b/nifi/nar-bundles/standard-bundle/standard-prioritizers/pom.xml
similarity index 100%
rename from nar-bundles/standard-bundle/standard-prioritizers/pom.xml
rename to nifi/nar-bundles/standard-bundle/standard-prioritizers/pom.xml
diff --git a/nar-bundles/standard-bundle/standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/FirstInFirstOutPrioritizer.java b/nifi/nar-bundles/standard-bundle/standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/FirstInFirstOutPrioritizer.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/FirstInFirstOutPrioritizer.java
rename to nifi/nar-bundles/standard-bundle/standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/FirstInFirstOutPrioritizer.java
diff --git a/nar-bundles/standard-bundle/standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/NewestFlowFileFirstPrioritizer.java b/nifi/nar-bundles/standard-bundle/standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/NewestFlowFileFirstPrioritizer.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/NewestFlowFileFirstPrioritizer.java
rename to nifi/nar-bundles/standard-bundle/standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/NewestFlowFileFirstPrioritizer.java
diff --git a/nar-bundles/standard-bundle/standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/OldestFlowFileFirstPrioritizer.java b/nifi/nar-bundles/standard-bundle/standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/OldestFlowFileFirstPrioritizer.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/OldestFlowFileFirstPrioritizer.java
rename to nifi/nar-bundles/standard-bundle/standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/OldestFlowFileFirstPrioritizer.java
diff --git a/nar-bundles/standard-bundle/standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/PriorityAttributePrioritizer.java b/nifi/nar-bundles/standard-bundle/standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/PriorityAttributePrioritizer.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/PriorityAttributePrioritizer.java
rename to nifi/nar-bundles/standard-bundle/standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/PriorityAttributePrioritizer.java
diff --git a/nar-bundles/standard-bundle/standard-prioritizers/src/main/resources/META-INF/services/org.apache.nifi.flowfile.FlowFilePrioritizer b/nifi/nar-bundles/standard-bundle/standard-prioritizers/src/main/resources/META-INF/services/org.apache.nifi.flowfile.FlowFilePrioritizer
similarity index 100%
rename from nar-bundles/standard-bundle/standard-prioritizers/src/main/resources/META-INF/services/org.apache.nifi.flowfile.FlowFilePrioritizer
rename to nifi/nar-bundles/standard-bundle/standard-prioritizers/src/main/resources/META-INF/services/org.apache.nifi.flowfile.FlowFilePrioritizer
diff --git a/nar-bundles/standard-bundle/standard-prioritizers/src/test/java/org/apache/nifi/prioritizer/NewestFirstPrioritizerTest.java b/nifi/nar-bundles/standard-bundle/standard-prioritizers/src/test/java/org/apache/nifi/prioritizer/NewestFirstPrioritizerTest.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-prioritizers/src/test/java/org/apache/nifi/prioritizer/NewestFirstPrioritizerTest.java
rename to nifi/nar-bundles/standard-bundle/standard-prioritizers/src/test/java/org/apache/nifi/prioritizer/NewestFirstPrioritizerTest.java
diff --git a/nar-bundles/standard-bundle/standard-prioritizers/src/test/java/org/apache/nifi/prioritizer/OldestFirstPrioritizerTest.java b/nifi/nar-bundles/standard-bundle/standard-prioritizers/src/test/java/org/apache/nifi/prioritizer/OldestFirstPrioritizerTest.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-prioritizers/src/test/java/org/apache/nifi/prioritizer/OldestFirstPrioritizerTest.java
rename to nifi/nar-bundles/standard-bundle/standard-prioritizers/src/test/java/org/apache/nifi/prioritizer/OldestFirstPrioritizerTest.java
diff --git a/nar-bundles/standard-bundle/standard-prioritizers/src/test/java/org/apache/nifi/prioritizer/PriorityAttributePrioritizerTest.java b/nifi/nar-bundles/standard-bundle/standard-prioritizers/src/test/java/org/apache/nifi/prioritizer/PriorityAttributePrioritizerTest.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-prioritizers/src/test/java/org/apache/nifi/prioritizer/PriorityAttributePrioritizerTest.java
rename to nifi/nar-bundles/standard-bundle/standard-prioritizers/src/test/java/org/apache/nifi/prioritizer/PriorityAttributePrioritizerTest.java
diff --git a/nar-bundles/standard-bundle/standard-processors/pom.xml b/nifi/nar-bundles/standard-bundle/standard-processors/pom.xml
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/pom.xml
rename to nifi/nar-bundles/standard-bundle/standard-processors/pom.xml
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/Base64EncodeContent.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/Base64EncodeContent.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/Base64EncodeContent.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/Base64EncodeContent.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/DetectDuplicate.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/DetectDuplicate.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/DetectDuplicate.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/DetectDuplicate.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/DistributeLoad.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/DistributeLoad.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/DistributeLoad.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/DistributeLoad.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EncryptContent.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EncryptContent.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EncryptContent.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EncryptContent.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateRegularExpression.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateRegularExpression.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateRegularExpression.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateRegularExpression.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateFlowFile.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateFlowFile.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateFlowFile.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateFlowFile.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFTP.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFTP.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFTP.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFTP.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFile.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFile.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFile.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFile.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFileTransfer.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFileTransfer.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFileTransfer.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFileTransfer.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetSFTP.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetSFTP.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetSFTP.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetSFTP.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/HashContent.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/HashContent.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/HashContent.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/HashContent.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenUDP.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenUDP.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenUDP.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenUDP.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ModifyBytes.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ModifyBytes.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ModifyBytes.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ModifyBytes.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/MonitorActivity.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/MonitorActivity.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/MonitorActivity.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/MonitorActivity.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFTP.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFTP.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFTP.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFTP.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFile.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFile.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFile.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFile.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSFTP.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSFTP.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSFTP.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSFTP.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnContent.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnContent.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnContent.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnContent.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/SegmentContent.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/SegmentContent.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/SegmentContent.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/SegmentContent.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateXml.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateXml.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateXml.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateXml.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ContentAcknowledgmentServlet.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ContentAcknowledgmentServlet.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ContentAcknowledgmentServlet.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ContentAcknowledgmentServlet.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/Bin.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/Bin.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/Bin.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/Bin.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/BinManager.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/BinManager.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/BinManager.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/BinManager.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/DocumentReaderCallback.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/DocumentReaderCallback.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/DocumentReaderCallback.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/DocumentReaderCallback.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileInfo.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileInfo.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileInfo.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileInfo.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileTransfer.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileTransfer.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileTransfer.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileTransfer.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FlowFileSessionWrapper.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FlowFileSessionWrapper.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FlowFileSessionWrapper.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FlowFileSessionWrapper.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/NLKBufferedReader.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/NLKBufferedReader.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/NLKBufferedReader.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/NLKBufferedReader.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPConnection.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPConnection.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPConnection.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPConnection.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPUtils.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPUtils.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPUtils.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPUtils.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/ValidatingBase64InputStream.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/ValidatingBase64InputStream.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/ValidatingBase64InputStream.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/ValidatingBase64InputStream.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/XmlElementNotifier.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/XmlElementNotifier.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/XmlElementNotifier.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/XmlElementNotifier.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/XmlSplitterSaxParser.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/XmlSplitterSaxParser.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/XmlSplitterSaxParser.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/XmlSplitterSaxParser.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.Base64EncodeContent/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.Base64EncodeContent/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.Base64EncodeContent/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.Base64EncodeContent/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.CompressContent/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.CompressContent/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.CompressContent/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.CompressContent/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ControlRate/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ControlRate/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ControlRate/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ControlRate/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ConvertCharacterSet/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ConvertCharacterSet/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ConvertCharacterSet/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ConvertCharacterSet/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.DetectDuplicate/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.DetectDuplicate/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.DetectDuplicate/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.DetectDuplicate/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.DistributeLoad/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.DistributeLoad/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.DistributeLoad/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.DistributeLoad/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EncryptContent/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EncryptContent/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EncryptContent/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EncryptContent/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EvaluateRegularExpression/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EvaluateRegularExpression/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EvaluateRegularExpression/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EvaluateRegularExpression/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EvaluateXPath/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EvaluateXPath/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EvaluateXPath/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EvaluateXPath/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EvaluateXQuery/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EvaluateXQuery/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EvaluateXQuery/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EvaluateXQuery/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ExecuteStreamCommand/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ExecuteStreamCommand/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ExecuteStreamCommand/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ExecuteStreamCommand/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.GenerateFlowFile/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.GenerateFlowFile/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.GenerateFlowFile/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.GenerateFlowFile/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.GetFTP/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.GetFTP/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.GetFTP/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.GetFTP/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.GetFile/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.GetFile/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.GetFile/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.GetFile/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.GetHTTP/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.GetHTTP/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.GetHTTP/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.GetHTTP/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.GetSFTP/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.GetSFTP/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.GetSFTP/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.GetSFTP/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.HashAttribute/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.HashAttribute/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.HashAttribute/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.HashAttribute/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.HashContent/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.HashContent/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.HashContent/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.HashContent/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.InvokeHTTP/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.InvokeHTTP/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.InvokeHTTP/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.InvokeHTTP/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ListenHTTP/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ListenHTTP/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ListenHTTP/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ListenHTTP/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ListenUDP/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ListenUDP/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ListenUDP/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ListenUDP/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.LogAttribute/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.LogAttribute/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.LogAttribute/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.LogAttribute/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.MergeContent/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.MergeContent/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.MergeContent/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.MergeContent/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ModifyBytes/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ModifyBytes/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ModifyBytes/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ModifyBytes/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.MonitorActivity/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.MonitorActivity/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.MonitorActivity/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.MonitorActivity/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PostHTTP/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PostHTTP/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PostHTTP/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PostHTTP/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PutEmail/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PutEmail/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PutEmail/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PutEmail/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PutFTP/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PutFTP/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PutFTP/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PutFTP/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PutFile/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PutFile/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PutFile/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PutFile/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PutSFTP/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PutSFTP/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PutSFTP/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PutSFTP/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ReplaceText/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ReplaceText/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ReplaceText/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ReplaceText/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ReplaceTextWithMapping/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ReplaceTextWithMapping/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ReplaceTextWithMapping/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ReplaceTextWithMapping/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.RouteOnAttribute/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.RouteOnAttribute/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.RouteOnAttribute/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.RouteOnAttribute/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.RouteOnContent/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.RouteOnContent/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.RouteOnContent/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.RouteOnContent/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ScanAttribute/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ScanAttribute/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ScanAttribute/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ScanAttribute/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ScanContent/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ScanContent/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ScanContent/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ScanContent/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.SegmentContent/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.SegmentContent/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.SegmentContent/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.SegmentContent/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.SplitContent/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.SplitContent/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.SplitContent/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.SplitContent/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.SplitText/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.SplitText/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.SplitText/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.SplitText/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.SplitXml/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.SplitXml/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.SplitXml/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.SplitXml/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.TransformXml/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.TransformXml/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.TransformXml/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.TransformXml/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.UnpackContent/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.UnpackContent/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.UnpackContent/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.UnpackContent/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ValidateXml/index.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ValidateXml/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ValidateXml/index.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ValidateXml/index.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/TestIngestAndUpdate.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/TestIngestAndUpdate.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/TestIngestAndUpdate.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/TestIngestAndUpdate.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/TestSuccess.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/TestSuccess.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/TestSuccess.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/TestSuccess.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/HelloWorldServlet.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/HelloWorldServlet.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/HelloWorldServlet.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/HelloWorldServlet.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/RESTServiceContentModified.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/RESTServiceContentModified.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/RESTServiceContentModified.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/RESTServiceContentModified.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestBase64EncodeContent.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestBase64EncodeContent.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestBase64EncodeContent.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestBase64EncodeContent.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestCompressContent.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestCompressContent.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestCompressContent.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestCompressContent.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestControlRate.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestControlRate.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestControlRate.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestControlRate.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestConvertCharacterSet.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestConvertCharacterSet.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestConvertCharacterSet.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestConvertCharacterSet.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDistributeLoad.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDistributeLoad.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDistributeLoad.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDistributeLoad.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEncryptContent.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEncryptContent.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEncryptContent.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEncryptContent.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateRegularExpression.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateRegularExpression.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateRegularExpression.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateRegularExpression.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXPath.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXPath.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXPath.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXPath.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXQuery.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXQuery.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXQuery.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXQuery.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteStreamCommand.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteStreamCommand.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteStreamCommand.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteStreamCommand.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetFile.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetFile.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetFile.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetFile.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHashAttribute.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHashAttribute.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHashAttribute.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHashAttribute.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHashContent.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHashContent.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHashContent.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHashContent.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestIdentifyMimeType.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestIdentifyMimeType.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestIdentifyMimeType.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestIdentifyMimeType.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenUDP.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenUDP.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenUDP.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenUDP.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestModifyBytes.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestModifyBytes.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestModifyBytes.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestModifyBytes.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMonitorActivity.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMonitorActivity.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMonitorActivity.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMonitorActivity.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextLineByLine.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextLineByLine.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextLineByLine.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextLineByLine.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextWithMapping.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextWithMapping.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextWithMapping.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextWithMapping.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestRouteOnAttribute.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestRouteOnAttribute.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestRouteOnAttribute.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestRouteOnAttribute.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestRouteOnContent.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestRouteOnContent.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestRouteOnContent.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestRouteOnContent.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanAttribute.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanAttribute.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanAttribute.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanAttribute.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanContent.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanContent.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanContent.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanContent.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSegmentContent.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSegmentContent.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSegmentContent.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSegmentContent.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestServer.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestServer.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestServer.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestServer.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitContent.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitContent.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitContent.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitContent.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitText.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitText.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitText.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitText.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitXml.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitXml.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitXml.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitXml.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestTransformXml.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestTransformXml.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestTransformXml.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestTransformXml.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestUnpackContent.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestUnpackContent.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestUnpackContent.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestUnpackContent.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateXml.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateXml.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateXml.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateXml.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/UserAgentTestingServlet.java b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/UserAgentTestingServlet.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/UserAgentTestingServlet.java
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/UserAgentTestingServlet.java
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/CharacterSetConversionSamples/Converted.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/CharacterSetConversionSamples/Converted.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/CharacterSetConversionSamples/Converted.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/CharacterSetConversionSamples/Converted.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/CharacterSetConversionSamples/Converted2.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/CharacterSetConversionSamples/Converted2.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/CharacterSetConversionSamples/Converted2.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/CharacterSetConversionSamples/Converted2.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/CharacterSetConversionSamples/Original.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/CharacterSetConversionSamples/Original.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/CharacterSetConversionSamples/Original.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/CharacterSetConversionSamples/Original.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFile.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFile.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFile.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFile.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFile.txt.bz2 b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFile.txt.bz2
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFile.txt.bz2
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFile.txt.bz2
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFile.txt.gz b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFile.txt.gz
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFile.txt.gz
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFile.txt.gz
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFile1.txt.bz2 b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFile1.txt.bz2
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFile1.txt.bz2
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFile1.txt.bz2
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFile1.txt.gz b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFile1.txt.gz
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFile1.txt.gz
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFile1.txt.gz
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFileConcat.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFileConcat.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFileConcat.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFileConcat.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFileConcat.txt.bz2 b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFileConcat.txt.bz2
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFileConcat.txt.bz2
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/CompressedData/SampleFileConcat.txt.bz2
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/ExecuteCommand/1000bytes.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/ExecuteCommand/1000bytes.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/ExecuteCommand/1000bytes.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/ExecuteCommand/1000bytes.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/ExecuteCommand/TestIngestAndUpdate.jar b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/ExecuteCommand/TestIngestAndUpdate.jar
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/ExecuteCommand/TestIngestAndUpdate.jar
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/ExecuteCommand/TestIngestAndUpdate.jar
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/ExecuteCommand/TestSuccess.jar b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/ExecuteCommand/TestSuccess.jar
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/ExecuteCommand/TestSuccess.jar
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/ExecuteCommand/TestSuccess.jar
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/ExecuteCommand/test.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/ExecuteCommand/test.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/ExecuteCommand/test.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/ExecuteCommand/test.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/ScanAttribute/dictionary-with-empty-new-lines b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/ScanAttribute/dictionary-with-empty-new-lines
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/ScanAttribute/dictionary-with-empty-new-lines
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/ScanAttribute/dictionary-with-empty-new-lines
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/ScanAttribute/dictionary-with-extra-info b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/ScanAttribute/dictionary-with-extra-info
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/ScanAttribute/dictionary-with-extra-info
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/ScanAttribute/dictionary-with-extra-info
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/ScanAttribute/dictionary1 b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/ScanAttribute/dictionary1
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/ScanAttribute/dictionary1
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/ScanAttribute/dictionary1
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.7z b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.7z
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.7z
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.7z
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.jar b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.jar
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.jar
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.jar
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.mdb b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.mdb
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.mdb
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.mdb
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.pdf b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.pdf
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.pdf
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.pdf
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.tar b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.tar
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.tar
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.tar
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.txt.bz2 b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.txt.bz2
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.txt.bz2
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.txt.bz2
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.txt.gz b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.txt.gz
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.txt.gz
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.txt.gz
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.xml b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.xml
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.xml
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.xml
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.zip b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.zip
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.zip
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/1.zip
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/bgBannerFoot.png b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/bgBannerFoot.png
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/bgBannerFoot.png
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/bgBannerFoot.png
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/blueBtnBg.jpg b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/blueBtnBg.jpg
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/blueBtnBg.jpg
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/blueBtnBg.jpg
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/flowfilev1.tar b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/flowfilev1.tar
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/flowfilev1.tar
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/flowfilev1.tar
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/flowfilev3 b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/flowfilev3
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/flowfilev3
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/flowfilev3
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/grid.gif b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/grid.gif
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/grid.gif
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestIdentifyMimeType/grid.gif
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestMergeContent/demarcate b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestMergeContent/demarcate
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestMergeContent/demarcate
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestMergeContent/demarcate
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestMergeContent/foot b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestMergeContent/foot
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestMergeContent/foot
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestMergeContent/foot
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestMergeContent/head b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestMergeContent/head
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestMergeContent/head
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestMergeContent/head
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestModifyBytes/noFooter.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestModifyBytes/noFooter.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestModifyBytes/noFooter.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestModifyBytes/noFooter.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestModifyBytes/noFooter_noHeader.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestModifyBytes/noFooter_noHeader.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestModifyBytes/noFooter_noHeader.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestModifyBytes/noFooter_noHeader.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestModifyBytes/noHeader.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestModifyBytes/noHeader.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestModifyBytes/noHeader.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestModifyBytes/noHeader.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestModifyBytes/testFile.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestModifyBytes/testFile.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestModifyBytes/testFile.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestModifyBytes/testFile.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/$1$1.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/$1$1.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/$1$1.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/$1$1.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/BRue_cRue_RiRey.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/BRue_cRue_RiRey.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/BRue_cRue_RiRey.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/BRue_cRue_RiRey.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/Blu$2e_clu$2e.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/Blu$2e_clu$2e.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/Blu$2e_clu$2e.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/Blu$2e_clu$2e.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/D$d_h$d.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/D$d_h$d.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/D$d_h$d.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/D$d_h$d.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/Good.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/Good.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/Good.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/Good.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/Spider.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/Spider.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/Spider.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/Spider.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/[DODO].txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/[DODO].txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/[DODO].txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/[DODO].txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/cu[$1]_Po[$1].txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/cu[$1]_Po[$1].txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/cu[$1]_Po[$1].txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/cu[$1]_Po[$1].txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/cu_Po.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/cu_Po.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/cu_Po.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/cu_Po.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/food.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/food.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/food.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/food.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/testFile.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/testFile.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/testFile.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextLineByLine/testFile.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-backreference-mapping.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-backreference-mapping.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-backreference-mapping.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-backreference-mapping.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-blank-mapping.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-blank-mapping.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-blank-mapping.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-blank-mapping.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-escaped-dollar-mapping.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-escaped-dollar-mapping.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-escaped-dollar-mapping.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-escaped-dollar-mapping.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-excessive-backreference-mapping-simple.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-excessive-backreference-mapping-simple.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-excessive-backreference-mapping-simple.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-excessive-backreference-mapping-simple.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-excessive-backreference-mapping.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-excessive-backreference-mapping.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-excessive-backreference-mapping.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-excessive-backreference-mapping.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-invalid-backreference-mapping.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-invalid-backreference-mapping.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-invalid-backreference-mapping.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-invalid-backreference-mapping.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-mapping.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-mapping.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-mapping.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-mapping.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-no-match-mapping.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-no-match-mapping.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-no-match-mapping.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-no-match-mapping.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-space-mapping.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-space-mapping.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-space-mapping.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/color-fruit-space-mapping.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/colors-without-dashes.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/colors-without-dashes.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/colors-without-dashes.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/colors-without-dashes.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/colors.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/colors.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/colors.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestReplaceTextWithMapping/colors.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestScanContent/helloWorld b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestScanContent/helloWorld
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestScanContent/helloWorld
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestScanContent/helloWorld
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestScanContent/wellthengood-bye b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestScanContent/wellthengood-bye
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestScanContent/wellthengood-bye
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestScanContent/wellthengood-bye
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/1.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/1.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/1.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/1.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/2.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/2.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/2.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/2.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/3.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/3.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/3.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/3.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/4.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/4.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/4.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/4.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/5.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/5.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/5.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/5.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/6.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/6.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/6.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/6.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/original.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/original.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/original.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestSplitText/original.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/math.html b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/math.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/math.html
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/math.html
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/math.xml b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/math.xml
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/math.xml
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/math.xml
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/math.xsl b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/math.xsl
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/math.xsl
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/math.xsl
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/tokens.csv b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/tokens.csv
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/tokens.csv
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/tokens.csv
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/tokens.xml b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/tokens.xml
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/tokens.xml
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/tokens.xml
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/tokens.xsl b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/tokens.xsl
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/tokens.xsl
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestTransformXml/tokens.xsl
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/data.flowfilev2 b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/data.flowfilev2
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/data.flowfilev2
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/data.flowfilev2
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/data.flowfilev3 b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/data.flowfilev3
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/data.flowfilev3
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/data.flowfilev3
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/data.tar b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/data.tar
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/data.tar
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/data.tar
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/data.zip b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/data.zip
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/data.zip
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/data.zip
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/folder/cal.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/folder/cal.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/folder/cal.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/folder/cal.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/folder/date.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/folder/date.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/folder/date.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestUnpackContent/folder/date.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestXml/XmlBundle.xsd b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestXml/XmlBundle.xsd
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestXml/XmlBundle.xsd
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestXml/XmlBundle.xsd
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestXml/fruit.xml b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestXml/fruit.xml
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestXml/fruit.xml
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestXml/fruit.xml
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestXml/subNode.xml b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestXml/subNode.xml
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestXml/subNode.xml
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestXml/subNode.xml
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestXml/xml-bundle-1 b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestXml/xml-bundle-1
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestXml/xml-bundle-1
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestXml/xml-bundle-1
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestXml/xml-snippet.xml b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestXml/xml-snippet.xml
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/TestXml/xml-snippet.xml
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/TestXml/xml-snippet.xml
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/hello.txt b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/hello.txt
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/hello.txt
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/hello.txt
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/localhost-ks.jks b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/localhost-ks.jks
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/localhost-ks.jks
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/localhost-ks.jks
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/localhost-ts.jks b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/localhost-ts.jks
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/localhost-ts.jks
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/localhost-ts.jks
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/localhost.cer b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/localhost.cer
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/localhost.cer
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/localhost.cer
diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/resources/logback-test.xml b/nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/logback-test.xml
similarity index 100%
rename from nar-bundles/standard-bundle/standard-processors/src/test/resources/logback-test.xml
rename to nifi/nar-bundles/standard-bundle/standard-processors/src/test/resources/logback-test.xml
diff --git a/nar-bundles/standard-bundle/standard-reporting-tasks/pom.xml b/nifi/nar-bundles/standard-bundle/standard-reporting-tasks/pom.xml
similarity index 100%
rename from nar-bundles/standard-bundle/standard-reporting-tasks/pom.xml
rename to nifi/nar-bundles/standard-bundle/standard-reporting-tasks/pom.xml
diff --git a/nar-bundles/standard-bundle/standard-reporting-tasks/src/main/java/org/apache/nifi/controller/ControllerStatusReportingTask.java b/nifi/nar-bundles/standard-bundle/standard-reporting-tasks/src/main/java/org/apache/nifi/controller/ControllerStatusReportingTask.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-reporting-tasks/src/main/java/org/apache/nifi/controller/ControllerStatusReportingTask.java
rename to nifi/nar-bundles/standard-bundle/standard-reporting-tasks/src/main/java/org/apache/nifi/controller/ControllerStatusReportingTask.java
diff --git a/nar-bundles/standard-bundle/standard-reporting-tasks/src/main/java/org/apache/nifi/controller/MonitorDiskUsage.java b/nifi/nar-bundles/standard-bundle/standard-reporting-tasks/src/main/java/org/apache/nifi/controller/MonitorDiskUsage.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-reporting-tasks/src/main/java/org/apache/nifi/controller/MonitorDiskUsage.java
rename to nifi/nar-bundles/standard-bundle/standard-reporting-tasks/src/main/java/org/apache/nifi/controller/MonitorDiskUsage.java
diff --git a/nar-bundles/standard-bundle/standard-reporting-tasks/src/main/java/org/apache/nifi/controller/MonitorMemory.java b/nifi/nar-bundles/standard-bundle/standard-reporting-tasks/src/main/java/org/apache/nifi/controller/MonitorMemory.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-reporting-tasks/src/main/java/org/apache/nifi/controller/MonitorMemory.java
rename to nifi/nar-bundles/standard-bundle/standard-reporting-tasks/src/main/java/org/apache/nifi/controller/MonitorMemory.java
diff --git a/nar-bundles/standard-bundle/standard-reporting-tasks/src/main/resources/META-INF/services/org.apache.nifi.reporting.ReportingTask b/nifi/nar-bundles/standard-bundle/standard-reporting-tasks/src/main/resources/META-INF/services/org.apache.nifi.reporting.ReportingTask
similarity index 100%
rename from nar-bundles/standard-bundle/standard-reporting-tasks/src/main/resources/META-INF/services/org.apache.nifi.reporting.ReportingTask
rename to nifi/nar-bundles/standard-bundle/standard-reporting-tasks/src/main/resources/META-INF/services/org.apache.nifi.reporting.ReportingTask
diff --git a/nar-bundles/standard-bundle/standard-reporting-tasks/src/main/resources/docs/org.apache.nifi.controller.ControllerStatusReportingTask/index.html b/nifi/nar-bundles/standard-bundle/standard-reporting-tasks/src/main/resources/docs/org.apache.nifi.controller.ControllerStatusReportingTask/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-reporting-tasks/src/main/resources/docs/org.apache.nifi.controller.ControllerStatusReportingTask/index.html
rename to nifi/nar-bundles/standard-bundle/standard-reporting-tasks/src/main/resources/docs/org.apache.nifi.controller.ControllerStatusReportingTask/index.html
diff --git a/nar-bundles/standard-bundle/standard-reporting-tasks/src/main/resources/docs/org.apache.nifi.controller.MonitorDiskUsage/index.html b/nifi/nar-bundles/standard-bundle/standard-reporting-tasks/src/main/resources/docs/org.apache.nifi.controller.MonitorDiskUsage/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-reporting-tasks/src/main/resources/docs/org.apache.nifi.controller.MonitorDiskUsage/index.html
rename to nifi/nar-bundles/standard-bundle/standard-reporting-tasks/src/main/resources/docs/org.apache.nifi.controller.MonitorDiskUsage/index.html
diff --git a/nar-bundles/standard-bundle/standard-reporting-tasks/src/main/resources/docs/org.apache.nifi.controller.MonitorMemory/index.html b/nifi/nar-bundles/standard-bundle/standard-reporting-tasks/src/main/resources/docs/org.apache.nifi.controller.MonitorMemory/index.html
similarity index 100%
rename from nar-bundles/standard-bundle/standard-reporting-tasks/src/main/resources/docs/org.apache.nifi.controller.MonitorMemory/index.html
rename to nifi/nar-bundles/standard-bundle/standard-reporting-tasks/src/main/resources/docs/org.apache.nifi.controller.MonitorMemory/index.html
diff --git a/nar-bundles/standard-bundle/standard-reporting-tasks/src/test/java/org/apache/nifi/controller/TestMonitorDiskUsage.java b/nifi/nar-bundles/standard-bundle/standard-reporting-tasks/src/test/java/org/apache/nifi/controller/TestMonitorDiskUsage.java
similarity index 100%
rename from nar-bundles/standard-bundle/standard-reporting-tasks/src/test/java/org/apache/nifi/controller/TestMonitorDiskUsage.java
rename to nifi/nar-bundles/standard-bundle/standard-reporting-tasks/src/test/java/org/apache/nifi/controller/TestMonitorDiskUsage.java
diff --git a/nar-bundles/standard-services/distributed-cache-client-service-api/pom.xml b/nifi/nar-bundles/standard-services/distributed-cache-client-service-api/pom.xml
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-client-service-api/pom.xml
rename to nifi/nar-bundles/standard-services/distributed-cache-client-service-api/pom.xml
diff --git a/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/Deserializer.java b/nifi/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/Deserializer.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/Deserializer.java
rename to nifi/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/Deserializer.java
diff --git a/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClient.java b/nifi/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClient.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClient.java
rename to nifi/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClient.java
diff --git a/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClient.java b/nifi/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClient.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClient.java
rename to nifi/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClient.java
diff --git a/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/Serializer.java b/nifi/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/Serializer.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/Serializer.java
rename to nifi/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/Serializer.java
diff --git a/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/exception/DeserializationException.java b/nifi/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/exception/DeserializationException.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/exception/DeserializationException.java
rename to nifi/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/exception/DeserializationException.java
diff --git a/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/exception/SerializationException.java b/nifi/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/exception/SerializationException.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/exception/SerializationException.java
rename to nifi/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/exception/SerializationException.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/pom.xml b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/pom.xml
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/pom.xml
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/pom.xml
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/CommsSession.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/CommsSession.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/CommsSession.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/CommsSession.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClientService.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClientService.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClientService.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClientService.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClientService.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClientService.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClientService.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClientService.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/SSLCommsSession.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/SSLCommsSession.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/SSLCommsSession.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/SSLCommsSession.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/StandardCommsSession.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/StandardCommsSession.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/StandardCommsSession.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/StandardCommsSession.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/docs/org.apache.nifi.distributed.cache.client.DistributedMapCacheClientService/index.html b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/docs/org.apache.nifi.distributed.cache.client.DistributedMapCacheClientService/index.html
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/docs/org.apache.nifi.distributed.cache.client.DistributedMapCacheClientService/index.html
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/docs/org.apache.nifi.distributed.cache.client.DistributedMapCacheClientService/index.html
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/docs/org.apache.nifi.distributed.cache.client.DistributedSetCacheClientService/index.html b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/docs/org.apache.nifi.distributed.cache.client.DistributedSetCacheClientService/index.html
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/docs/org.apache.nifi.distributed.cache.client.DistributedSetCacheClientService/index.html
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/docs/org.apache.nifi.distributed.cache.client.DistributedSetCacheClientService/index.html
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-protocol/pom.xml b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-protocol/pom.xml
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-protocol/pom.xml
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-protocol/pom.xml
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/ProtocolHandshake.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/ProtocolHandshake.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/ProtocolHandshake.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/ProtocolHandshake.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/exception/HandshakeException.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/exception/HandshakeException.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/exception/HandshakeException.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/exception/HandshakeException.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/pom.xml b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/pom.xml
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/pom.xml
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/pom.xml
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/AbstractCacheServer.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/AbstractCacheServer.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/AbstractCacheServer.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/AbstractCacheServer.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/CacheRecord.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/CacheRecord.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/CacheRecord.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/CacheRecord.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/CacheServer.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/CacheServer.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/CacheServer.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/CacheServer.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/DistributedCacheServer.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/DistributedCacheServer.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/DistributedCacheServer.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/DistributedCacheServer.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/DistributedSetCacheServer.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/DistributedSetCacheServer.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/DistributedSetCacheServer.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/DistributedSetCacheServer.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/EvictionPolicy.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/EvictionPolicy.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/EvictionPolicy.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/EvictionPolicy.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/SetCacheServer.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/SetCacheServer.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/SetCacheServer.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/SetCacheServer.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/DistributedMapCacheServer.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/DistributedMapCacheServer.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/DistributedMapCacheServer.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/DistributedMapCacheServer.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCache.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCache.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCache.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCache.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCacheRecord.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCacheRecord.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCacheRecord.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCacheRecord.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCacheServer.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCacheServer.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCacheServer.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCacheServer.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapPutResult.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapPutResult.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapPutResult.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapPutResult.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/PersistentMapCache.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/PersistentMapCache.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/PersistentMapCache.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/PersistentMapCache.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/SimpleMapCache.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/SimpleMapCache.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/SimpleMapCache.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/SimpleMapCache.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/PersistentSetCache.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/PersistentSetCache.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/PersistentSetCache.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/PersistentSetCache.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCache.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCache.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCache.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCache.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCacheRecord.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCacheRecord.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCacheRecord.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCacheRecord.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCacheResult.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCacheResult.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCacheResult.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCacheResult.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SimpleSetCache.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SimpleSetCache.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SimpleSetCache.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SimpleSetCache.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/resources/docs/org.apache.nifi.distributed.cache.server.map.DistributedMapCacheServer/index.html b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/resources/docs/org.apache.nifi.distributed.cache.server.map.DistributedMapCacheServer/index.html
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/resources/docs/org.apache.nifi.distributed.cache.server.map.DistributedMapCacheServer/index.html
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/resources/docs/org.apache.nifi.distributed.cache.server.map.DistributedMapCacheServer/index.html
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/TestServerAndClient.java b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/TestServerAndClient.java
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/TestServerAndClient.java
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/TestServerAndClient.java
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/resources/localhost-ks.jks b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/resources/localhost-ks.jks
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/resources/localhost-ks.jks
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/resources/localhost-ks.jks
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/resources/localhost-ts.jks b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/resources/localhost-ts.jks
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/resources/localhost-ts.jks
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/resources/localhost-ts.jks
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-services-nar/pom.xml b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-services-nar/pom.xml
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-services-nar/pom.xml
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-services-nar/pom.xml
diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/pom.xml b/nifi/nar-bundles/standard-services/distributed-cache-services-bundle/pom.xml
similarity index 100%
rename from nar-bundles/standard-services/distributed-cache-services-bundle/pom.xml
rename to nifi/nar-bundles/standard-services/distributed-cache-services-bundle/pom.xml
diff --git a/nar-bundles/standard-services/load-distribution-service-api/pom.xml b/nifi/nar-bundles/standard-services/load-distribution-service-api/pom.xml
similarity index 100%
rename from nar-bundles/standard-services/load-distribution-service-api/pom.xml
rename to nifi/nar-bundles/standard-services/load-distribution-service-api/pom.xml
diff --git a/nar-bundles/standard-services/load-distribution-service-api/src/main/java/org/apache/nifi/loading/LoadDistributionListener.java b/nifi/nar-bundles/standard-services/load-distribution-service-api/src/main/java/org/apache/nifi/loading/LoadDistributionListener.java
similarity index 100%
rename from nar-bundles/standard-services/load-distribution-service-api/src/main/java/org/apache/nifi/loading/LoadDistributionListener.java
rename to nifi/nar-bundles/standard-services/load-distribution-service-api/src/main/java/org/apache/nifi/loading/LoadDistributionListener.java
diff --git a/nar-bundles/standard-services/load-distribution-service-api/src/main/java/org/apache/nifi/loading/LoadDistributionService.java b/nifi/nar-bundles/standard-services/load-distribution-service-api/src/main/java/org/apache/nifi/loading/LoadDistributionService.java
similarity index 100%
rename from nar-bundles/standard-services/load-distribution-service-api/src/main/java/org/apache/nifi/loading/LoadDistributionService.java
rename to nifi/nar-bundles/standard-services/load-distribution-service-api/src/main/java/org/apache/nifi/loading/LoadDistributionService.java
diff --git a/nar-bundles/standard-services/pom.xml b/nifi/nar-bundles/standard-services/pom.xml
similarity index 100%
rename from nar-bundles/standard-services/pom.xml
rename to nifi/nar-bundles/standard-services/pom.xml
diff --git a/nar-bundles/standard-services/ssl-context-bundle/nar/pom.xml b/nifi/nar-bundles/standard-services/ssl-context-bundle/nar/pom.xml
similarity index 100%
rename from nar-bundles/standard-services/ssl-context-bundle/nar/pom.xml
rename to nifi/nar-bundles/standard-services/ssl-context-bundle/nar/pom.xml
diff --git a/nar-bundles/standard-services/ssl-context-bundle/pom.xml b/nifi/nar-bundles/standard-services/ssl-context-bundle/pom.xml
similarity index 100%
rename from nar-bundles/standard-services/ssl-context-bundle/pom.xml
rename to nifi/nar-bundles/standard-services/ssl-context-bundle/pom.xml
diff --git a/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/pom.xml b/nifi/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/pom.xml
similarity index 100%
rename from nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/pom.xml
rename to nifi/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/pom.xml
diff --git a/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java b/nifi/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java
similarity index 100%
rename from nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java
rename to nifi/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java
diff --git a/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService b/nifi/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService
similarity index 100%
rename from nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService
rename to nifi/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService
diff --git a/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/resources/docs/org.apache.nifi.ssl.StandardSSLContextService/index.html b/nifi/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/resources/docs/org.apache.nifi.ssl.StandardSSLContextService/index.html
similarity index 100%
rename from nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/resources/docs/org.apache.nifi.ssl.StandardSSLContextService/index.html
rename to nifi/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/resources/docs/org.apache.nifi.ssl.StandardSSLContextService/index.html
diff --git a/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/java/org/apache/nifi/ssl/SSLContextServiceTest.java b/nifi/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/java/org/apache/nifi/ssl/SSLContextServiceTest.java
similarity index 100%
rename from nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/java/org/apache/nifi/ssl/SSLContextServiceTest.java
rename to nifi/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/java/org/apache/nifi/ssl/SSLContextServiceTest.java
diff --git a/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/java/org/apache/nifi/ssl/TestProcessor.java b/nifi/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/java/org/apache/nifi/ssl/TestProcessor.java
similarity index 100%
rename from nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/java/org/apache/nifi/ssl/TestProcessor.java
rename to nifi/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/java/org/apache/nifi/ssl/TestProcessor.java
diff --git a/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/resources/localhost-ks.jks b/nifi/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/resources/localhost-ks.jks
similarity index 100%
rename from nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/resources/localhost-ks.jks
rename to nifi/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/resources/localhost-ks.jks
diff --git a/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/resources/localhost-ts.jks b/nifi/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/resources/localhost-ts.jks
similarity index 100%
rename from nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/resources/localhost-ts.jks
rename to nifi/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/resources/localhost-ts.jks
diff --git a/nar-bundles/standard-services/ssl-context-service-api/pom.xml b/nifi/nar-bundles/standard-services/ssl-context-service-api/pom.xml
similarity index 100%
rename from nar-bundles/standard-services/ssl-context-service-api/pom.xml
rename to nifi/nar-bundles/standard-services/ssl-context-service-api/pom.xml
diff --git a/nar-bundles/standard-services/ssl-context-service-api/src/main/java/org/apache/nifi/ssl/SSLContextService.java b/nifi/nar-bundles/standard-services/ssl-context-service-api/src/main/java/org/apache/nifi/ssl/SSLContextService.java
similarity index 100%
rename from nar-bundles/standard-services/ssl-context-service-api/src/main/java/org/apache/nifi/ssl/SSLContextService.java
rename to nifi/nar-bundles/standard-services/ssl-context-service-api/src/main/java/org/apache/nifi/ssl/SSLContextService.java
diff --git a/nar-bundles/standard-services/standard-services-api-nar/pom.xml b/nifi/nar-bundles/standard-services/standard-services-api-nar/pom.xml
similarity index 100%
rename from nar-bundles/standard-services/standard-services-api-nar/pom.xml
rename to nifi/nar-bundles/standard-services/standard-services-api-nar/pom.xml
diff --git a/nar-bundles/update-attribute-bundle/model/pom.xml b/nifi/nar-bundles/update-attribute-bundle/model/pom.xml
similarity index 100%
rename from nar-bundles/update-attribute-bundle/model/pom.xml
rename to nifi/nar-bundles/update-attribute-bundle/model/pom.xml
diff --git a/nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/Action.java b/nifi/nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/Action.java
similarity index 100%
rename from nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/Action.java
rename to nifi/nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/Action.java
diff --git a/nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/Condition.java b/nifi/nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/Condition.java
similarity index 100%
rename from nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/Condition.java
rename to nifi/nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/Condition.java
diff --git a/nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/Criteria.java b/nifi/nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/Criteria.java
similarity index 100%
rename from nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/Criteria.java
rename to nifi/nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/Criteria.java
diff --git a/nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/FlowFilePolicy.java b/nifi/nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/FlowFilePolicy.java
similarity index 100%
rename from nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/FlowFilePolicy.java
rename to nifi/nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/FlowFilePolicy.java
diff --git a/nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/Rule.java b/nifi/nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/Rule.java
similarity index 100%
rename from nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/Rule.java
rename to nifi/nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/Rule.java
diff --git a/nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/serde/CriteriaSerDe.java b/nifi/nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/serde/CriteriaSerDe.java
similarity index 100%
rename from nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/serde/CriteriaSerDe.java
rename to nifi/nar-bundles/update-attribute-bundle/model/src/main/java/org/apache/nifi/update/attributes/serde/CriteriaSerDe.java
diff --git a/nar-bundles/update-attribute-bundle/nar/pom.xml b/nifi/nar-bundles/update-attribute-bundle/nar/pom.xml
similarity index 100%
rename from nar-bundles/update-attribute-bundle/nar/pom.xml
rename to nifi/nar-bundles/update-attribute-bundle/nar/pom.xml
diff --git a/nar-bundles/update-attribute-bundle/pom.xml b/nifi/nar-bundles/update-attribute-bundle/pom.xml
similarity index 100%
rename from nar-bundles/update-attribute-bundle/pom.xml
rename to nifi/nar-bundles/update-attribute-bundle/pom.xml
diff --git a/nar-bundles/update-attribute-bundle/processor/pom.xml b/nifi/nar-bundles/update-attribute-bundle/processor/pom.xml
similarity index 100%
rename from nar-bundles/update-attribute-bundle/processor/pom.xml
rename to nifi/nar-bundles/update-attribute-bundle/processor/pom.xml
diff --git a/nar-bundles/update-attribute-bundle/processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java b/nifi/nar-bundles/update-attribute-bundle/processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java
similarity index 100%
rename from nar-bundles/update-attribute-bundle/processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java
rename to nifi/nar-bundles/update-attribute-bundle/processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java
diff --git a/nar-bundles/update-attribute-bundle/processor/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor b/nifi/nar-bundles/update-attribute-bundle/processor/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
similarity index 100%
rename from nar-bundles/update-attribute-bundle/processor/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
rename to nifi/nar-bundles/update-attribute-bundle/processor/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
diff --git a/nar-bundles/update-attribute-bundle/processor/src/main/resources/docs/org.apache.nifi.processors.attributes.UpdateAttribute/index.html b/nifi/nar-bundles/update-attribute-bundle/processor/src/main/resources/docs/org.apache.nifi.processors.attributes.UpdateAttribute/index.html
similarity index 100%
rename from nar-bundles/update-attribute-bundle/processor/src/main/resources/docs/org.apache.nifi.processors.attributes.UpdateAttribute/index.html
rename to nifi/nar-bundles/update-attribute-bundle/processor/src/main/resources/docs/org.apache.nifi.processors.attributes.UpdateAttribute/index.html
diff --git a/nar-bundles/update-attribute-bundle/processor/src/test/java/org/apache/nifi/update/attributes/TestUpdateAttribute.java b/nifi/nar-bundles/update-attribute-bundle/processor/src/test/java/org/apache/nifi/update/attributes/TestUpdateAttribute.java
similarity index 100%
rename from nar-bundles/update-attribute-bundle/processor/src/test/java/org/apache/nifi/update/attributes/TestUpdateAttribute.java
rename to nifi/nar-bundles/update-attribute-bundle/processor/src/test/java/org/apache/nifi/update/attributes/TestUpdateAttribute.java
diff --git a/nar-bundles/update-attribute-bundle/ui/nb-configuration.xml b/nifi/nar-bundles/update-attribute-bundle/ui/nb-configuration.xml
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/nb-configuration.xml
rename to nifi/nar-bundles/update-attribute-bundle/ui/nb-configuration.xml
diff --git a/nar-bundles/update-attribute-bundle/ui/pom.xml b/nifi/nar-bundles/update-attribute-bundle/ui/pom.xml
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/pom.xml
rename to nifi/nar-bundles/update-attribute-bundle/ui/pom.xml
diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/UpdateAttributeModelFactory.java b/nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/UpdateAttributeModelFactory.java
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/UpdateAttributeModelFactory.java
rename to nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/UpdateAttributeModelFactory.java
diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/api/ObjectMapperResolver.java b/nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/api/ObjectMapperResolver.java
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/api/ObjectMapperResolver.java
rename to nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/api/ObjectMapperResolver.java
diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/api/RuleResource.java b/nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/api/RuleResource.java
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/api/RuleResource.java
rename to nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/api/RuleResource.java
diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/dto/ActionDTO.java b/nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/dto/ActionDTO.java
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/dto/ActionDTO.java
rename to nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/dto/ActionDTO.java
diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/dto/ConditionDTO.java b/nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/dto/ConditionDTO.java
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/dto/ConditionDTO.java
rename to nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/dto/ConditionDTO.java
diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/dto/DtoFactory.java b/nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/dto/DtoFactory.java
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/dto/DtoFactory.java
rename to nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/dto/DtoFactory.java
diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/dto/RuleDTO.java b/nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/dto/RuleDTO.java
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/dto/RuleDTO.java
rename to nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/dto/RuleDTO.java
diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/entity/ActionEntity.java b/nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/entity/ActionEntity.java
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/entity/ActionEntity.java
rename to nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/entity/ActionEntity.java
diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/entity/ConditionEntity.java b/nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/entity/ConditionEntity.java
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/entity/ConditionEntity.java
rename to nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/entity/ConditionEntity.java
diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/entity/EvaluationContextEntity.java b/nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/entity/EvaluationContextEntity.java
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/entity/EvaluationContextEntity.java
rename to nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/entity/EvaluationContextEntity.java
diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/entity/RuleEntity.java b/nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/entity/RuleEntity.java
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/entity/RuleEntity.java
rename to nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/entity/RuleEntity.java
diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/entity/RulesEntity.java b/nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/entity/RulesEntity.java
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/entity/RulesEntity.java
rename to nifi/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/entity/RulesEntity.java
diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/webapp/META-INF/nifi-processor b/nifi/nar-bundles/update-attribute-bundle/ui/src/main/webapp/META-INF/nifi-processor
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/src/main/webapp/META-INF/nifi-processor
rename to nifi/nar-bundles/update-attribute-bundle/ui/src/main/webapp/META-INF/nifi-processor
diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp b/nifi/nar-bundles/update-attribute-bundle/ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp
rename to nifi/nar-bundles/update-attribute-bundle/ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp
diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/webapp/WEB-INF/web.xml b/nifi/nar-bundles/update-attribute-bundle/ui/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/src/main/webapp/WEB-INF/web.xml
rename to nifi/nar-bundles/update-attribute-bundle/ui/src/main/webapp/WEB-INF/web.xml
diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/webapp/css/main.css b/nifi/nar-bundles/update-attribute-bundle/ui/src/main/webapp/css/main.css
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/src/main/webapp/css/main.css
rename to nifi/nar-bundles/update-attribute-bundle/ui/src/main/webapp/css/main.css
diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/webapp/images/bgInputText.png b/nifi/nar-bundles/update-attribute-bundle/ui/src/main/webapp/images/bgInputText.png
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/src/main/webapp/images/bgInputText.png
rename to nifi/nar-bundles/update-attribute-bundle/ui/src/main/webapp/images/bgInputText.png
diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/webapp/images/buttonNew.png b/nifi/nar-bundles/update-attribute-bundle/ui/src/main/webapp/images/buttonNew.png
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/src/main/webapp/images/buttonNew.png
rename to nifi/nar-bundles/update-attribute-bundle/ui/src/main/webapp/images/buttonNew.png
diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/webapp/images/iconDelete.png b/nifi/nar-bundles/update-attribute-bundle/ui/src/main/webapp/images/iconDelete.png
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/src/main/webapp/images/iconDelete.png
rename to nifi/nar-bundles/update-attribute-bundle/ui/src/main/webapp/images/iconDelete.png
diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/webapp/images/iconInfo.png b/nifi/nar-bundles/update-attribute-bundle/ui/src/main/webapp/images/iconInfo.png
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/src/main/webapp/images/iconInfo.png
rename to nifi/nar-bundles/update-attribute-bundle/ui/src/main/webapp/images/iconInfo.png
diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/webapp/js/application.js b/nifi/nar-bundles/update-attribute-bundle/ui/src/main/webapp/js/application.js
similarity index 100%
rename from nar-bundles/update-attribute-bundle/ui/src/main/webapp/js/application.js
rename to nifi/nar-bundles/update-attribute-bundle/ui/src/main/webapp/js/application.js
diff --git a/nar-bundles/volatile-provenance-repository-bundle/nar/pom.xml b/nifi/nar-bundles/volatile-provenance-repository-bundle/nar/pom.xml
similarity index 100%
rename from nar-bundles/volatile-provenance-repository-bundle/nar/pom.xml
rename to nifi/nar-bundles/volatile-provenance-repository-bundle/nar/pom.xml
diff --git a/nar-bundles/volatile-provenance-repository-bundle/pom.xml b/nifi/nar-bundles/volatile-provenance-repository-bundle/pom.xml
similarity index 100%
rename from nar-bundles/volatile-provenance-repository-bundle/pom.xml
rename to nifi/nar-bundles/volatile-provenance-repository-bundle/pom.xml
diff --git a/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/pom.xml b/nifi/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/pom.xml
similarity index 100%
rename from nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/pom.xml
rename to nifi/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/pom.xml
diff --git a/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java b/nifi/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
similarity index 100%
rename from nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
rename to nifi/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
diff --git a/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/resources/META-INF/services/org.apache.nifi.provenance.ProvenanceEventRepository b/nifi/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/resources/META-INF/services/org.apache.nifi.provenance.ProvenanceEventRepository
similarity index 100%
rename from nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/resources/META-INF/services/org.apache.nifi.provenance.ProvenanceEventRepository
rename to nifi/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/resources/META-INF/services/org.apache.nifi.provenance.ProvenanceEventRepository
diff --git a/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/test/java/org/apache/nifi/provenance/TestVolatileProvenanceRepository.java b/nifi/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/test/java/org/apache/nifi/provenance/TestVolatileProvenanceRepository.java
similarity index 100%
rename from nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/test/java/org/apache/nifi/provenance/TestVolatileProvenanceRepository.java
rename to nifi/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/test/java/org/apache/nifi/provenance/TestVolatileProvenanceRepository.java
diff --git a/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/test/resources/nifi.properties b/nifi/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/test/resources/nifi.properties
similarity index 100%
rename from nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/test/resources/nifi.properties
rename to nifi/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/test/resources/nifi.properties
diff --git a/nifi-api/.gitignore b/nifi/nifi-api/.gitignore
similarity index 100%
rename from nifi-api/.gitignore
rename to nifi/nifi-api/.gitignore
diff --git a/nifi-api/pom.xml b/nifi/nifi-api/pom.xml
similarity index 100%
rename from nifi-api/pom.xml
rename to nifi/nifi-api/pom.xml
diff --git a/nifi-api/src/main/java/org/apache/nifi/authorization/Authority.java b/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/Authority.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/authorization/Authority.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/authorization/Authority.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/authorization/AuthorityProvider.java b/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/AuthorityProvider.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/authorization/AuthorityProvider.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/authorization/AuthorityProvider.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/authorization/AuthorityProviderConfigurationContext.java b/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/AuthorityProviderConfigurationContext.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/authorization/AuthorityProviderConfigurationContext.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/authorization/AuthorityProviderConfigurationContext.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/authorization/AuthorityProviderInitializationContext.java b/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/AuthorityProviderInitializationContext.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/authorization/AuthorityProviderInitializationContext.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/authorization/AuthorityProviderInitializationContext.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/authorization/AuthorityProviderLookup.java b/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/AuthorityProviderLookup.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/authorization/AuthorityProviderLookup.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/authorization/AuthorityProviderLookup.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/authorization/DownloadAuthorization.java b/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/DownloadAuthorization.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/authorization/DownloadAuthorization.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/authorization/DownloadAuthorization.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/authorization/annotation/AuthorityProviderContext.java b/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/annotation/AuthorityProviderContext.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/authorization/annotation/AuthorityProviderContext.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/authorization/annotation/AuthorityProviderContext.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/authorization/exception/AuthorityAccessException.java b/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/exception/AuthorityAccessException.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/authorization/exception/AuthorityAccessException.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/authorization/exception/AuthorityAccessException.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/authorization/exception/IdentityAlreadyExistsException.java b/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/exception/IdentityAlreadyExistsException.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/authorization/exception/IdentityAlreadyExistsException.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/authorization/exception/IdentityAlreadyExistsException.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/authorization/exception/ProviderCreationException.java b/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/exception/ProviderCreationException.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/authorization/exception/ProviderCreationException.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/authorization/exception/ProviderCreationException.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/authorization/exception/ProviderDestructionException.java b/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/exception/ProviderDestructionException.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/authorization/exception/ProviderDestructionException.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/authorization/exception/ProviderDestructionException.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/authorization/exception/UnknownIdentityException.java b/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/exception/UnknownIdentityException.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/authorization/exception/UnknownIdentityException.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/authorization/exception/UnknownIdentityException.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/AbstractConfigurableComponent.java b/nifi/nifi-api/src/main/java/org/apache/nifi/components/AbstractConfigurableComponent.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/components/AbstractConfigurableComponent.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/components/AbstractConfigurableComponent.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/AllowableValue.java b/nifi/nifi-api/src/main/java/org/apache/nifi/components/AllowableValue.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/components/AllowableValue.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/components/AllowableValue.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/ConfigurableComponent.java b/nifi/nifi-api/src/main/java/org/apache/nifi/components/ConfigurableComponent.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/components/ConfigurableComponent.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/components/ConfigurableComponent.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java b/nifi/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/PropertyValue.java b/nifi/nifi-api/src/main/java/org/apache/nifi/components/PropertyValue.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/components/PropertyValue.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/components/PropertyValue.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/ValidationContext.java b/nifi/nifi-api/src/main/java/org/apache/nifi/components/ValidationContext.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/components/ValidationContext.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/components/ValidationContext.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/ValidationResult.java b/nifi/nifi-api/src/main/java/org/apache/nifi/components/ValidationResult.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/components/ValidationResult.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/components/ValidationResult.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/components/Validator.java b/nifi/nifi-api/src/main/java/org/apache/nifi/components/Validator.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/components/Validator.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/components/Validator.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/AbstractControllerService.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/AbstractControllerService.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/AbstractControllerService.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/AbstractControllerService.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/ConfigurationContext.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/ConfigurationContext.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/ConfigurationContext.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/ConfigurationContext.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/ControllerService.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/ControllerService.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/ControllerService.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/ControllerService.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/ControllerServiceInitializationContext.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/ControllerServiceInitializationContext.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/ControllerServiceInitializationContext.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/ControllerServiceInitializationContext.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/ControllerServiceLookup.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/ControllerServiceLookup.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/ControllerServiceLookup.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/ControllerServiceLookup.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/FlowFileQueue.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/FlowFileQueue.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/FlowFileQueue.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/FlowFileQueue.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/ScheduledState.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/ScheduledState.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/ScheduledState.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/ScheduledState.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/Snippet.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/Snippet.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/Snippet.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/Snippet.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/Triggerable.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/Triggerable.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/Triggerable.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/Triggerable.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/annotation/OnConfigured.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/annotation/OnConfigured.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/annotation/OnConfigured.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/annotation/OnConfigured.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/repository/ContentRepository.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/ContentRepository.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/repository/ContentRepository.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/ContentRepository.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/repository/FlowFileRecord.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/FlowFileRecord.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/repository/FlowFileRecord.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/FlowFileRecord.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/repository/FlowFileRepository.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/FlowFileRepository.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/repository/FlowFileRepository.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/FlowFileRepository.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/repository/FlowFileSwapManager.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/FlowFileSwapManager.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/repository/FlowFileSwapManager.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/FlowFileSwapManager.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/repository/QueueProvider.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/QueueProvider.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/repository/QueueProvider.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/QueueProvider.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/repository/RepositoryRecord.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/RepositoryRecord.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/repository/RepositoryRecord.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/RepositoryRecord.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/repository/RepositoryRecordType.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/RepositoryRecordType.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/repository/RepositoryRecordType.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/RepositoryRecordType.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/repository/claim/ContentClaim.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/claim/ContentClaim.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/repository/claim/ContentClaim.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/claim/ContentClaim.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/repository/claim/ContentClaimManager.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/claim/ContentClaimManager.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/repository/claim/ContentClaimManager.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/claim/ContentClaimManager.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/status/ConnectionStatus.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/ConnectionStatus.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/status/ConnectionStatus.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/ConnectionStatus.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/status/PortStatus.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/PortStatus.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/status/PortStatus.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/PortStatus.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessGroupStatus.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessGroupStatus.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessGroupStatus.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessGroupStatus.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessorStatus.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessorStatus.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessorStatus.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessorStatus.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/status/RemoteProcessGroupStatus.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/RemoteProcessGroupStatus.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/status/RemoteProcessGroupStatus.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/RemoteProcessGroupStatus.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/status/RunStatus.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/RunStatus.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/status/RunStatus.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/RunStatus.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/status/TransmissionStatus.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/TransmissionStatus.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/status/TransmissionStatus.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/TransmissionStatus.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/status/history/ComponentStatusRepository.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/history/ComponentStatusRepository.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/status/history/ComponentStatusRepository.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/history/ComponentStatusRepository.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/status/history/MetricDescriptor.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/history/MetricDescriptor.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/status/history/MetricDescriptor.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/history/MetricDescriptor.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/status/history/StatusHistory.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/history/StatusHistory.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/status/history/StatusHistory.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/history/StatusHistory.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/status/history/StatusSnapshot.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/history/StatusSnapshot.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/status/history/StatusSnapshot.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/history/StatusSnapshot.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/status/history/ValueMapper.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/history/ValueMapper.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/status/history/ValueMapper.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/history/ValueMapper.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/status/history/ValueReducer.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/history/ValueReducer.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/controller/status/history/ValueReducer.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/history/ValueReducer.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/events/EventReporter.java b/nifi/nifi-api/src/main/java/org/apache/nifi/events/EventReporter.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/events/EventReporter.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/events/EventReporter.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/expression/AttributeExpression.java b/nifi/nifi-api/src/main/java/org/apache/nifi/expression/AttributeExpression.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/expression/AttributeExpression.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/expression/AttributeExpression.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/expression/AttributeValueDecorator.java b/nifi/nifi-api/src/main/java/org/apache/nifi/expression/AttributeValueDecorator.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/expression/AttributeValueDecorator.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/expression/AttributeValueDecorator.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/expression/ExpressionLanguageCompiler.java b/nifi/nifi-api/src/main/java/org/apache/nifi/expression/ExpressionLanguageCompiler.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/expression/ExpressionLanguageCompiler.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/expression/ExpressionLanguageCompiler.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/flowfile/FlowFile.java b/nifi/nifi-api/src/main/java/org/apache/nifi/flowfile/FlowFile.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/flowfile/FlowFile.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/flowfile/FlowFile.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/flowfile/FlowFilePrioritizer.java b/nifi/nifi-api/src/main/java/org/apache/nifi/flowfile/FlowFilePrioritizer.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/flowfile/FlowFilePrioritizer.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/flowfile/FlowFilePrioritizer.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/logging/LogLevel.java b/nifi/nifi-api/src/main/java/org/apache/nifi/logging/LogLevel.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/logging/LogLevel.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/logging/LogLevel.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/logging/ProcessorLog.java b/nifi/nifi-api/src/main/java/org/apache/nifi/logging/ProcessorLog.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/logging/ProcessorLog.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/logging/ProcessorLog.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/AbstractProcessor.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/AbstractProcessor.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/AbstractProcessor.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/AbstractProcessor.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/AbstractSessionFactoryProcessor.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/AbstractSessionFactoryProcessor.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/AbstractSessionFactoryProcessor.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/AbstractSessionFactoryProcessor.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/DataUnit.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/DataUnit.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/DataUnit.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/DataUnit.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/FlowFileFilter.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/FlowFileFilter.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/FlowFileFilter.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/FlowFileFilter.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/ProcessContext.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/ProcessContext.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/ProcessContext.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/ProcessContext.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/ProcessSession.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/ProcessSession.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/ProcessSession.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/ProcessSession.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/ProcessSessionFactory.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/ProcessSessionFactory.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/ProcessSessionFactory.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/ProcessSessionFactory.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/Processor.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/Processor.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/Processor.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/Processor.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/ProcessorInitializationContext.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/ProcessorInitializationContext.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/ProcessorInitializationContext.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/ProcessorInitializationContext.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/QueueSize.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/QueueSize.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/QueueSize.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/QueueSize.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/Relationship.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/Relationship.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/Relationship.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/Relationship.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/SchedulingContext.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/SchedulingContext.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/SchedulingContext.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/SchedulingContext.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/annotation/CapabilityDescription.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/CapabilityDescription.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/annotation/CapabilityDescription.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/CapabilityDescription.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/annotation/EventDriven.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/EventDriven.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/annotation/EventDriven.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/EventDriven.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnAdded.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnAdded.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnAdded.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnAdded.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnRemoved.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnRemoved.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnRemoved.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnRemoved.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnScheduled.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnScheduled.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnScheduled.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnScheduled.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnShutdown.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnShutdown.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnShutdown.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnShutdown.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnStopped.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnStopped.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnStopped.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnStopped.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnUnscheduled.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnUnscheduled.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnUnscheduled.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnUnscheduled.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/annotation/SideEffectFree.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/SideEffectFree.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/annotation/SideEffectFree.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/SideEffectFree.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/annotation/SupportsBatching.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/SupportsBatching.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/annotation/SupportsBatching.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/SupportsBatching.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/annotation/Tags.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/Tags.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/annotation/Tags.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/Tags.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerSerially.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerSerially.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerSerially.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerSerially.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerWhenAnyDestinationAvailable.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerWhenAnyDestinationAvailable.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerWhenAnyDestinationAvailable.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerWhenAnyDestinationAvailable.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerWhenEmpty.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerWhenEmpty.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerWhenEmpty.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerWhenEmpty.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/exception/FlowFileAccessException.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/FlowFileAccessException.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/exception/FlowFileAccessException.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/FlowFileAccessException.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/exception/FlowFileHandlingException.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/FlowFileHandlingException.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/exception/FlowFileHandlingException.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/FlowFileHandlingException.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/exception/MissingFlowFileException.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/MissingFlowFileException.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/exception/MissingFlowFileException.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/MissingFlowFileException.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/exception/ProcessException.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/ProcessException.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/exception/ProcessException.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/ProcessException.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/io/InputStreamCallback.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/io/InputStreamCallback.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/io/InputStreamCallback.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/io/InputStreamCallback.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/io/OutputStreamCallback.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/io/OutputStreamCallback.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/io/OutputStreamCallback.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/io/OutputStreamCallback.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/io/StreamCallback.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/io/StreamCallback.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/processor/io/StreamCallback.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/processor/io/StreamCallback.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceEventBuilder.java b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceEventBuilder.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceEventBuilder.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceEventBuilder.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceEventRecord.java b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceEventRecord.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceEventRecord.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceEventRecord.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceEventRepository.java b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceEventRepository.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceEventRepository.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceEventRepository.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceEventType.java b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceEventType.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceEventType.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceEventType.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceReporter.java b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceReporter.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceReporter.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceReporter.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/ComputeLineageResult.java b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/ComputeLineageResult.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/provenance/lineage/ComputeLineageResult.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/ComputeLineageResult.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/ComputeLineageSubmission.java b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/ComputeLineageSubmission.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/provenance/lineage/ComputeLineageSubmission.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/ComputeLineageSubmission.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/Lineage.java b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/Lineage.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/provenance/lineage/Lineage.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/Lineage.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/LineageComputationType.java b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/LineageComputationType.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/provenance/lineage/LineageComputationType.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/LineageComputationType.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/LineageEdge.java b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/LineageEdge.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/provenance/lineage/LineageEdge.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/LineageEdge.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/LineageNode.java b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/LineageNode.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/provenance/lineage/LineageNode.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/LineageNode.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/LineageNodeType.java b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/LineageNodeType.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/provenance/lineage/LineageNodeType.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/LineageNodeType.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/ProvenanceEventLineageNode.java b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/ProvenanceEventLineageNode.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/provenance/lineage/ProvenanceEventLineageNode.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/ProvenanceEventLineageNode.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/provenance/search/Query.java b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/search/Query.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/provenance/search/Query.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/provenance/search/Query.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/provenance/search/QueryResult.java b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/search/QueryResult.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/provenance/search/QueryResult.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/provenance/search/QueryResult.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/provenance/search/QuerySubmission.java b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/search/QuerySubmission.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/provenance/search/QuerySubmission.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/provenance/search/QuerySubmission.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/provenance/search/SearchTerm.java b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/search/SearchTerm.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/provenance/search/SearchTerm.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/provenance/search/SearchTerm.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/provenance/search/SearchTerms.java b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/search/SearchTerms.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/provenance/search/SearchTerms.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/provenance/search/SearchTerms.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/provenance/search/SearchableField.java b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/search/SearchableField.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/provenance/search/SearchableField.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/provenance/search/SearchableField.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/provenance/search/SearchableFieldType.java b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/search/SearchableFieldType.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/provenance/search/SearchableFieldType.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/provenance/search/SearchableFieldType.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/reporting/AbstractReportingTask.java b/nifi/nifi-api/src/main/java/org/apache/nifi/reporting/AbstractReportingTask.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/reporting/AbstractReportingTask.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/reporting/AbstractReportingTask.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/reporting/Bulletin.java b/nifi/nifi-api/src/main/java/org/apache/nifi/reporting/Bulletin.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/reporting/Bulletin.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/reporting/Bulletin.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/reporting/BulletinQuery.java b/nifi/nifi-api/src/main/java/org/apache/nifi/reporting/BulletinQuery.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/reporting/BulletinQuery.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/reporting/BulletinQuery.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/reporting/BulletinRepository.java b/nifi/nifi-api/src/main/java/org/apache/nifi/reporting/BulletinRepository.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/reporting/BulletinRepository.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/reporting/BulletinRepository.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/reporting/EventAccess.java b/nifi/nifi-api/src/main/java/org/apache/nifi/reporting/EventAccess.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/reporting/EventAccess.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/reporting/EventAccess.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/reporting/InitializationException.java b/nifi/nifi-api/src/main/java/org/apache/nifi/reporting/InitializationException.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/reporting/InitializationException.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/reporting/InitializationException.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/reporting/ReportingContext.java b/nifi/nifi-api/src/main/java/org/apache/nifi/reporting/ReportingContext.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/reporting/ReportingContext.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/reporting/ReportingContext.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/reporting/ReportingInitializationContext.java b/nifi/nifi-api/src/main/java/org/apache/nifi/reporting/ReportingInitializationContext.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/reporting/ReportingInitializationContext.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/reporting/ReportingInitializationContext.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/reporting/ReportingTask.java b/nifi/nifi-api/src/main/java/org/apache/nifi/reporting/ReportingTask.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/reporting/ReportingTask.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/reporting/ReportingTask.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/reporting/Severity.java b/nifi/nifi-api/src/main/java/org/apache/nifi/reporting/Severity.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/reporting/Severity.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/reporting/Severity.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/scheduling/SchedulingStrategy.java b/nifi/nifi-api/src/main/java/org/apache/nifi/scheduling/SchedulingStrategy.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/scheduling/SchedulingStrategy.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/scheduling/SchedulingStrategy.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/search/SearchContext.java b/nifi/nifi-api/src/main/java/org/apache/nifi/search/SearchContext.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/search/SearchContext.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/search/SearchContext.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/search/SearchResult.java b/nifi/nifi-api/src/main/java/org/apache/nifi/search/SearchResult.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/search/SearchResult.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/search/SearchResult.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/search/Searchable.java b/nifi/nifi-api/src/main/java/org/apache/nifi/search/Searchable.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/search/Searchable.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/search/Searchable.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/web/ClusterRequestException.java b/nifi/nifi-api/src/main/java/org/apache/nifi/web/ClusterRequestException.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/web/ClusterRequestException.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/web/ClusterRequestException.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/web/InvalidRevisionException.java b/nifi/nifi-api/src/main/java/org/apache/nifi/web/InvalidRevisionException.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/web/InvalidRevisionException.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/web/InvalidRevisionException.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/web/NiFiWebContext.java b/nifi/nifi-api/src/main/java/org/apache/nifi/web/NiFiWebContext.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/web/NiFiWebContext.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/web/NiFiWebContext.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/web/NiFiWebContextConfig.java b/nifi/nifi-api/src/main/java/org/apache/nifi/web/NiFiWebContextConfig.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/web/NiFiWebContextConfig.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/web/NiFiWebContextConfig.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/web/ProcessorConfigurationAction.java b/nifi/nifi-api/src/main/java/org/apache/nifi/web/ProcessorConfigurationAction.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/web/ProcessorConfigurationAction.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/web/ProcessorConfigurationAction.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/web/ProcessorInfo.java b/nifi/nifi-api/src/main/java/org/apache/nifi/web/ProcessorInfo.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/web/ProcessorInfo.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/web/ProcessorInfo.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/web/ResourceNotFoundException.java b/nifi/nifi-api/src/main/java/org/apache/nifi/web/ResourceNotFoundException.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/web/ResourceNotFoundException.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/web/ResourceNotFoundException.java
diff --git a/nifi-api/src/main/java/org/apache/nifi/web/Revision.java b/nifi/nifi-api/src/main/java/org/apache/nifi/web/Revision.java
similarity index 100%
rename from nifi-api/src/main/java/org/apache/nifi/web/Revision.java
rename to nifi/nifi-api/src/main/java/org/apache/nifi/web/Revision.java
diff --git a/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java b/nifi/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
similarity index 100%
rename from nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
rename to nifi/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
diff --git a/nifi-api/src/test/java/org/apache/nifi/processor/TestDataUnit.java b/nifi/nifi-api/src/test/java/org/apache/nifi/processor/TestDataUnit.java
similarity index 100%
rename from nifi-api/src/test/java/org/apache/nifi/processor/TestDataUnit.java
rename to nifi/nifi-api/src/test/java/org/apache/nifi/processor/TestDataUnit.java
diff --git a/nifi-api/src/test/resources/logback-test.xml b/nifi/nifi-api/src/test/resources/logback-test.xml
similarity index 100%
rename from nifi-api/src/test/resources/logback-test.xml
rename to nifi/nifi-api/src/test/resources/logback-test.xml
diff --git a/nifi-bootstrap/pom.xml b/nifi/nifi-bootstrap/pom.xml
similarity index 100%
rename from nifi-bootstrap/pom.xml
rename to nifi/nifi-bootstrap/pom.xml
diff --git a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/BootstrapCodec.java b/nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/BootstrapCodec.java
similarity index 100%
rename from nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/BootstrapCodec.java
rename to nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/BootstrapCodec.java
diff --git a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/NiFiListener.java b/nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/NiFiListener.java
similarity index 100%
rename from nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/NiFiListener.java
rename to nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/NiFiListener.java
diff --git a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java b/nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
similarity index 100%
rename from nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
rename to nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
diff --git a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/ShutdownHook.java b/nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/ShutdownHook.java
similarity index 100%
rename from nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/ShutdownHook.java
rename to nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/ShutdownHook.java
diff --git a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/exception/InvalidCommandException.java b/nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/exception/InvalidCommandException.java
similarity index 100%
rename from nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/exception/InvalidCommandException.java
rename to nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/exception/InvalidCommandException.java
diff --git a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/util/LimitingInputStream.java b/nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/util/LimitingInputStream.java
similarity index 100%
rename from nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/util/LimitingInputStream.java
rename to nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/util/LimitingInputStream.java
diff --git a/nifi-docs/pom.xml b/nifi/nifi-docs/pom.xml
similarity index 100%
rename from nifi-docs/pom.xml
rename to nifi/nifi-docs/pom.xml
diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi/nifi-docs/src/main/asciidoc/administration-guide.adoc
similarity index 100%
rename from nifi-docs/src/main/asciidoc/administration-guide.adoc
rename to nifi/nifi-docs/src/main/asciidoc/administration-guide.adoc
diff --git a/nifi-docs/src/main/asciidoc/developer-guide.adoc b/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc
similarity index 100%
rename from nifi-docs/src/main/asciidoc/developer-guide.adoc
rename to nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc
diff --git a/nifi-docs/src/main/asciidoc/expression-language-guide.adoc b/nifi/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
similarity index 100%
rename from nifi-docs/src/main/asciidoc/expression-language-guide.adoc
rename to nifi/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
diff --git a/nifi-docs/src/main/asciidoc/images/add-processor-with-tag-cloud.png b/nifi/nifi-docs/src/main/asciidoc/images/add-processor-with-tag-cloud.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/add-processor-with-tag-cloud.png
rename to nifi/nifi-docs/src/main/asciidoc/images/add-processor-with-tag-cloud.png
diff --git a/nifi-docs/src/main/asciidoc/images/add-processor.png b/nifi/nifi-docs/src/main/asciidoc/images/add-processor.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/add-processor.png
rename to nifi/nifi-docs/src/main/asciidoc/images/add-processor.png
diff --git a/nifi-docs/src/main/asciidoc/images/addConnect.png b/nifi/nifi-docs/src/main/asciidoc/images/addConnect.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/addConnect.png
rename to nifi/nifi-docs/src/main/asciidoc/images/addConnect.png
diff --git a/nifi-docs/src/main/asciidoc/images/comments-tab.png b/nifi/nifi-docs/src/main/asciidoc/images/comments-tab.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/comments-tab.png
rename to nifi/nifi-docs/src/main/asciidoc/images/comments-tab.png
diff --git a/nifi-docs/src/main/asciidoc/images/components.png b/nifi/nifi-docs/src/main/asciidoc/images/components.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/components.png
rename to nifi/nifi-docs/src/main/asciidoc/images/components.png
diff --git a/nifi-docs/src/main/asciidoc/images/connection-settings.png b/nifi/nifi-docs/src/main/asciidoc/images/connection-settings.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/connection-settings.png
rename to nifi/nifi-docs/src/main/asciidoc/images/connection-settings.png
diff --git a/nifi-docs/src/main/asciidoc/images/create-connection.png b/nifi/nifi-docs/src/main/asciidoc/images/create-connection.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/create-connection.png
rename to nifi/nifi-docs/src/main/asciidoc/images/create-connection.png
diff --git a/nifi-docs/src/main/asciidoc/images/edit-property-dropdown.png b/nifi/nifi-docs/src/main/asciidoc/images/edit-property-dropdown.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/edit-property-dropdown.png
rename to nifi/nifi-docs/src/main/asciidoc/images/edit-property-dropdown.png
diff --git a/nifi-docs/src/main/asciidoc/images/edit-property-textarea.png b/nifi/nifi-docs/src/main/asciidoc/images/edit-property-textarea.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/edit-property-textarea.png
rename to nifi/nifi-docs/src/main/asciidoc/images/edit-property-textarea.png
diff --git a/nifi-docs/src/main/asciidoc/images/event-attributes.png b/nifi/nifi-docs/src/main/asciidoc/images/event-attributes.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/event-attributes.png
rename to nifi/nifi-docs/src/main/asciidoc/images/event-attributes.png
diff --git a/nifi-docs/src/main/asciidoc/images/event-content.png b/nifi/nifi-docs/src/main/asciidoc/images/event-content.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/event-content.png
rename to nifi/nifi-docs/src/main/asciidoc/images/event-content.png
diff --git a/nifi-docs/src/main/asciidoc/images/event-details.png b/nifi/nifi-docs/src/main/asciidoc/images/event-details.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/event-details.png
rename to nifi/nifi-docs/src/main/asciidoc/images/event-details.png
diff --git a/nifi-docs/src/main/asciidoc/images/expand-event.png b/nifi/nifi-docs/src/main/asciidoc/images/expand-event.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/expand-event.png
rename to nifi/nifi-docs/src/main/asciidoc/images/expand-event.png
diff --git a/nifi-docs/src/main/asciidoc/images/expanded-events.png b/nifi/nifi-docs/src/main/asciidoc/images/expanded-events.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/expanded-events.png
rename to nifi/nifi-docs/src/main/asciidoc/images/expanded-events.png
diff --git a/nifi-docs/src/main/asciidoc/images/find-parents.png b/nifi/nifi-docs/src/main/asciidoc/images/find-parents.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/find-parents.png
rename to nifi/nifi-docs/src/main/asciidoc/images/find-parents.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconAlert.png b/nifi/nifi-docs/src/main/asciidoc/images/iconAlert.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconAlert.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconAlert.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconConnection.png b/nifi/nifi-docs/src/main/asciidoc/images/iconConnection.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconConnection.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconConnection.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconDelete.png b/nifi/nifi-docs/src/main/asciidoc/images/iconDelete.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconDelete.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconDelete.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconDisable.png b/nifi/nifi-docs/src/main/asciidoc/images/iconDisable.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconDisable.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconDisable.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconEdit.png b/nifi/nifi-docs/src/main/asciidoc/images/iconEdit.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconEdit.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconEdit.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconEnable.png b/nifi/nifi-docs/src/main/asciidoc/images/iconEnable.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconEnable.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconEnable.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconExport.png b/nifi/nifi-docs/src/main/asciidoc/images/iconExport.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconExport.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconExport.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconFlowHistory.png b/nifi/nifi-docs/src/main/asciidoc/images/iconFlowHistory.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconFlowHistory.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconFlowHistory.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconFunnel.png b/nifi/nifi-docs/src/main/asciidoc/images/iconFunnel.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconFunnel.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconFunnel.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconInfo.png b/nifi/nifi-docs/src/main/asciidoc/images/iconInfo.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconInfo.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconInfo.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconInputPort.png b/nifi/nifi-docs/src/main/asciidoc/images/iconInputPort.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconInputPort.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconInputPort.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconInputPortSmall.png b/nifi/nifi-docs/src/main/asciidoc/images/iconInputPortSmall.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconInputPortSmall.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconInputPortSmall.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconLabel.png b/nifi/nifi-docs/src/main/asciidoc/images/iconLabel.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconLabel.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconLabel.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconLineage.png b/nifi/nifi-docs/src/main/asciidoc/images/iconLineage.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconLineage.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconLineage.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconNewTemplate.png b/nifi/nifi-docs/src/main/asciidoc/images/iconNewTemplate.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconNewTemplate.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconNewTemplate.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconNotSecure.png b/nifi/nifi-docs/src/main/asciidoc/images/iconNotSecure.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconNotSecure.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconNotSecure.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconOutputPort.png b/nifi/nifi-docs/src/main/asciidoc/images/iconOutputPort.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconOutputPort.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconOutputPort.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconOutputPortSmall.png b/nifi/nifi-docs/src/main/asciidoc/images/iconOutputPortSmall.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconOutputPortSmall.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconOutputPortSmall.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconProcessGroup.png b/nifi/nifi-docs/src/main/asciidoc/images/iconProcessGroup.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconProcessGroup.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconProcessGroup.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconProcessor.png b/nifi/nifi-docs/src/main/asciidoc/images/iconProcessor.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconProcessor.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconProcessor.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconProvenance.png b/nifi/nifi-docs/src/main/asciidoc/images/iconProvenance.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconProvenance.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconProvenance.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconRemoteProcessGroup.png b/nifi/nifi-docs/src/main/asciidoc/images/iconRemoteProcessGroup.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconRemoteProcessGroup.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconRemoteProcessGroup.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconResize.png b/nifi/nifi-docs/src/main/asciidoc/images/iconResize.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconResize.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconResize.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconRun.png b/nifi/nifi-docs/src/main/asciidoc/images/iconRun.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconRun.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconRun.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconSecure.png b/nifi/nifi-docs/src/main/asciidoc/images/iconSecure.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconSecure.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconSecure.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconSettings.png b/nifi/nifi-docs/src/main/asciidoc/images/iconSettings.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconSettings.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconSettings.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconStop.png b/nifi/nifi-docs/src/main/asciidoc/images/iconStop.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconStop.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconStop.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconSummary.png b/nifi/nifi-docs/src/main/asciidoc/images/iconSummary.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconSummary.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconSummary.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconTemplate.png b/nifi/nifi-docs/src/main/asciidoc/images/iconTemplate.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconTemplate.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconTemplate.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconTransmissionActive.png b/nifi/nifi-docs/src/main/asciidoc/images/iconTransmissionActive.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconTransmissionActive.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconTransmissionActive.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconTransmissionInactive.png b/nifi/nifi-docs/src/main/asciidoc/images/iconTransmissionInactive.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconTransmissionInactive.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconTransmissionInactive.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconUsers.png b/nifi/nifi-docs/src/main/asciidoc/images/iconUsers.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconUsers.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconUsers.png
diff --git a/nifi-docs/src/main/asciidoc/images/iconViewDetails.png b/nifi/nifi-docs/src/main/asciidoc/images/iconViewDetails.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/iconViewDetails.png
rename to nifi/nifi-docs/src/main/asciidoc/images/iconViewDetails.png
diff --git a/nifi-docs/src/main/asciidoc/images/instantiate-template-description.png b/nifi/nifi-docs/src/main/asciidoc/images/instantiate-template-description.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/instantiate-template-description.png
rename to nifi/nifi-docs/src/main/asciidoc/images/instantiate-template-description.png
diff --git a/nifi-docs/src/main/asciidoc/images/instantiate-template.png b/nifi/nifi-docs/src/main/asciidoc/images/instantiate-template.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/instantiate-template.png
rename to nifi/nifi-docs/src/main/asciidoc/images/instantiate-template.png
diff --git a/nifi-docs/src/main/asciidoc/images/invalid-processor.png b/nifi/nifi-docs/src/main/asciidoc/images/invalid-processor.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/invalid-processor.png
rename to nifi/nifi-docs/src/main/asciidoc/images/invalid-processor.png
diff --git a/nifi-docs/src/main/asciidoc/images/lineage-flowfile.png b/nifi/nifi-docs/src/main/asciidoc/images/lineage-flowfile.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/lineage-flowfile.png
rename to nifi/nifi-docs/src/main/asciidoc/images/lineage-flowfile.png
diff --git a/nifi-docs/src/main/asciidoc/images/lineage-graph-annotated.png b/nifi/nifi-docs/src/main/asciidoc/images/lineage-graph-annotated.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/lineage-graph-annotated.png
rename to nifi/nifi-docs/src/main/asciidoc/images/lineage-graph-annotated.png
diff --git a/nifi-docs/src/main/asciidoc/images/new-flow.png b/nifi/nifi-docs/src/main/asciidoc/images/new-flow.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/new-flow.png
rename to nifi/nifi-docs/src/main/asciidoc/images/new-flow.png
diff --git a/nifi-docs/src/main/asciidoc/images/nifi-arch-cluster.png b/nifi/nifi-docs/src/main/asciidoc/images/nifi-arch-cluster.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/nifi-arch-cluster.png
rename to nifi/nifi-docs/src/main/asciidoc/images/nifi-arch-cluster.png
diff --git a/nifi-docs/src/main/asciidoc/images/nifi-arch.png b/nifi/nifi-docs/src/main/asciidoc/images/nifi-arch.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/nifi-arch.png
rename to nifi/nifi-docs/src/main/asciidoc/images/nifi-arch.png
diff --git a/nifi-docs/src/main/asciidoc/images/nifi-navigation.png b/nifi/nifi-docs/src/main/asciidoc/images/nifi-navigation.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/nifi-navigation.png
rename to nifi/nifi-docs/src/main/asciidoc/images/nifi-navigation.png
diff --git a/nifi-docs/src/main/asciidoc/images/nifi-toolbar-components.png b/nifi/nifi-docs/src/main/asciidoc/images/nifi-toolbar-components.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/nifi-toolbar-components.png
rename to nifi/nifi-docs/src/main/asciidoc/images/nifi-toolbar-components.png
diff --git a/nifi-docs/src/main/asciidoc/images/parent-found.png b/nifi/nifi-docs/src/main/asciidoc/images/parent-found.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/parent-found.png
rename to nifi/nifi-docs/src/main/asciidoc/images/parent-found.png
diff --git a/nifi-docs/src/main/asciidoc/images/process-group-anatomy.png b/nifi/nifi-docs/src/main/asciidoc/images/process-group-anatomy.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/process-group-anatomy.png
rename to nifi/nifi-docs/src/main/asciidoc/images/process-group-anatomy.png
diff --git a/nifi-docs/src/main/asciidoc/images/processor-anatomy.png b/nifi/nifi-docs/src/main/asciidoc/images/processor-anatomy.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/processor-anatomy.png
rename to nifi/nifi-docs/src/main/asciidoc/images/processor-anatomy.png
diff --git a/nifi-docs/src/main/asciidoc/images/processor-connection-bubble.png b/nifi/nifi-docs/src/main/asciidoc/images/processor-connection-bubble.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/processor-connection-bubble.png
rename to nifi/nifi-docs/src/main/asciidoc/images/processor-connection-bubble.png
diff --git a/nifi-docs/src/main/asciidoc/images/properties-tab.png b/nifi/nifi-docs/src/main/asciidoc/images/properties-tab.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/properties-tab.png
rename to nifi/nifi-docs/src/main/asciidoc/images/properties-tab.png
diff --git a/nifi-docs/src/main/asciidoc/images/provenance-annotated.png b/nifi/nifi-docs/src/main/asciidoc/images/provenance-annotated.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/provenance-annotated.png
rename to nifi/nifi-docs/src/main/asciidoc/images/provenance-annotated.png
diff --git a/nifi-docs/src/main/asciidoc/images/provenance-table.png b/nifi/nifi-docs/src/main/asciidoc/images/provenance-table.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/provenance-table.png
rename to nifi/nifi-docs/src/main/asciidoc/images/provenance-table.png
diff --git a/nifi-docs/src/main/asciidoc/images/remote-group-anatomy.png b/nifi/nifi-docs/src/main/asciidoc/images/remote-group-anatomy.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/remote-group-anatomy.png
rename to nifi/nifi-docs/src/main/asciidoc/images/remote-group-anatomy.png
diff --git a/nifi-docs/src/main/asciidoc/images/remote-group-ports-dialog.png b/nifi/nifi-docs/src/main/asciidoc/images/remote-group-ports-dialog.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/remote-group-ports-dialog.png
rename to nifi/nifi-docs/src/main/asciidoc/images/remote-group-ports-dialog.png
diff --git a/nifi-docs/src/main/asciidoc/images/remote-port-connection-status.png b/nifi/nifi-docs/src/main/asciidoc/images/remote-port-connection-status.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/remote-port-connection-status.png
rename to nifi/nifi-docs/src/main/asciidoc/images/remote-port-connection-status.png
diff --git a/nifi-docs/src/main/asciidoc/images/scheduling-tab.png b/nifi/nifi-docs/src/main/asciidoc/images/scheduling-tab.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/scheduling-tab.png
rename to nifi/nifi-docs/src/main/asciidoc/images/scheduling-tab.png
diff --git a/nifi-docs/src/main/asciidoc/images/search-events.png b/nifi/nifi-docs/src/main/asciidoc/images/search-events.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/search-events.png
rename to nifi/nifi-docs/src/main/asciidoc/images/search-events.png
diff --git a/nifi-docs/src/main/asciidoc/images/search-receive-event-abc.png b/nifi/nifi-docs/src/main/asciidoc/images/search-receive-event-abc.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/search-receive-event-abc.png
rename to nifi/nifi-docs/src/main/asciidoc/images/search-receive-event-abc.png
diff --git a/nifi-docs/src/main/asciidoc/images/settings-tab.png b/nifi/nifi-docs/src/main/asciidoc/images/settings-tab.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/settings-tab.png
rename to nifi/nifi-docs/src/main/asciidoc/images/settings-tab.png
diff --git a/nifi-docs/src/main/asciidoc/images/simple-flow.png b/nifi/nifi-docs/src/main/asciidoc/images/simple-flow.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/simple-flow.png
rename to nifi/nifi-docs/src/main/asciidoc/images/simple-flow.png
diff --git a/nifi-docs/src/main/asciidoc/images/stats-history.png b/nifi/nifi-docs/src/main/asciidoc/images/stats-history.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/stats-history.png
rename to nifi/nifi-docs/src/main/asciidoc/images/stats-history.png
diff --git a/nifi-docs/src/main/asciidoc/images/status-bar.png b/nifi/nifi-docs/src/main/asciidoc/images/status-bar.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/status-bar.png
rename to nifi/nifi-docs/src/main/asciidoc/images/status-bar.png
diff --git a/nifi-docs/src/main/asciidoc/images/summary-annotated.png b/nifi/nifi-docs/src/main/asciidoc/images/summary-annotated.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/summary-annotated.png
rename to nifi/nifi-docs/src/main/asciidoc/images/summary-annotated.png
diff --git a/nifi-docs/src/main/asciidoc/images/summary-table.png b/nifi/nifi-docs/src/main/asciidoc/images/summary-table.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/summary-table.png
rename to nifi/nifi-docs/src/main/asciidoc/images/summary-table.png
diff --git a/nifi-docs/src/main/asciidoc/images/valid-processor.png b/nifi/nifi-docs/src/main/asciidoc/images/valid-processor.png
similarity index 100%
rename from nifi-docs/src/main/asciidoc/images/valid-processor.png
rename to nifi/nifi-docs/src/main/asciidoc/images/valid-processor.png
diff --git a/nifi-docs/src/main/asciidoc/overview.adoc b/nifi/nifi-docs/src/main/asciidoc/overview.adoc
similarity index 100%
rename from nifi-docs/src/main/asciidoc/overview.adoc
rename to nifi/nifi-docs/src/main/asciidoc/overview.adoc
diff --git a/nifi-docs/src/main/asciidoc/user-guide.adoc b/nifi/nifi-docs/src/main/asciidoc/user-guide.adoc
similarity index 100%
rename from nifi-docs/src/main/asciidoc/user-guide.adoc
rename to nifi/nifi-docs/src/main/asciidoc/user-guide.adoc
diff --git a/nifi-docs/src/main/assembly/dependencies.xml b/nifi/nifi-docs/src/main/assembly/dependencies.xml
similarity index 100%
rename from nifi-docs/src/main/assembly/dependencies.xml
rename to nifi/nifi-docs/src/main/assembly/dependencies.xml
diff --git a/nifi-mock/pom.xml b/nifi/nifi-mock/pom.xml
similarity index 100%
rename from nifi-mock/pom.xml
rename to nifi/nifi-mock/pom.xml
diff --git a/nifi-mock/src/main/java/org/apache/nifi/provenance/MockProvenanceEventRepository.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/provenance/MockProvenanceEventRepository.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/provenance/MockProvenanceEventRepository.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/provenance/MockProvenanceEventRepository.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/reporting/BulletinFactory.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/reporting/BulletinFactory.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/reporting/BulletinFactory.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/reporting/BulletinFactory.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/reporting/MockBulletin.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/reporting/MockBulletin.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/reporting/MockBulletin.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/reporting/MockBulletin.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/ControllerServiceConfiguration.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/ControllerServiceConfiguration.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/ControllerServiceConfiguration.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/ControllerServiceConfiguration.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockBulletinRepository.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockBulletinRepository.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/MockBulletinRepository.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockBulletinRepository.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockConfigurationContext.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockConfigurationContext.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/MockConfigurationContext.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockConfigurationContext.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceInitializationContext.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceInitializationContext.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceInitializationContext.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceInitializationContext.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceLookup.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceLookup.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceLookup.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceLookup.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockEventAccess.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockEventAccess.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/MockEventAccess.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockEventAccess.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFileQueue.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFileQueue.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFileQueue.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFileQueue.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessSession.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessSession.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/MockProcessSession.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessSession.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorInitializationContext.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorInitializationContext.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorInitializationContext.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorInitializationContext.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorLog.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorLog.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorLog.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorLog.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockPropertyValue.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockPropertyValue.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/MockPropertyValue.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockPropertyValue.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockProvenanceReporter.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProvenanceReporter.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/MockProvenanceReporter.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProvenanceReporter.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockReportingContext.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockReportingContext.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/MockReportingContext.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockReportingContext.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockReportingInitializationContext.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockReportingInitializationContext.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/MockReportingInitializationContext.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockReportingInitializationContext.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockSessionFactory.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockSessionFactory.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/MockSessionFactory.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockSessionFactory.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockValidationContext.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockValidationContext.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/MockValidationContext.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockValidationContext.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/ReflectionUtils.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/ReflectionUtils.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/ReflectionUtils.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/ReflectionUtils.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/SharedSessionState.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/SharedSessionState.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/SharedSessionState.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/SharedSessionState.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/SingleSessionFactory.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/SingleSessionFactory.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/SingleSessionFactory.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/SingleSessionFactory.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/TestRunners.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/TestRunners.java
similarity index 100%
rename from nifi-mock/src/main/java/org/apache/nifi/util/TestRunners.java
rename to nifi/nifi-mock/src/main/java/org/apache/nifi/util/TestRunners.java
diff --git a/pom.xml b/nifi/pom.xml
similarity index 98%
rename from pom.xml
rename to nifi/pom.xml
index 911f1a8c28..c79ef51eb9 100644
--- a/pom.xml
+++ b/nifi/pom.xml
@@ -62,12 +62,6 @@
         <maven>${maven.version}</maven>
     </prerequisites>
     <modules>
-        <!--
-        ! Would prefer to have the nar-maven-plugin built as part of this parent.  However, Maven
-        ! blocks building plugins with extensions in the same reactor as other components which want to use the plugin.
-        ! See MNG-1911 and MNG-5572 for more details.
-        -->
-        <!--<module>nar-maven-plugin</module>-->
         <module>commons</module>
         <module>nifi-api</module>
         <module>nifi-bootstrap</module>
@@ -684,7 +678,7 @@
                 <artifactId>nifi-resources</artifactId>
                 <version>0.0.1-SNAPSHOT</version>
                 <classifier>resources</classifier>
-                <scope>provided</scope> <!-- Provided - we don't want the zip in the libs -->
+                <scope>runtime</scope>
                 <type>zip</type>
             </dependency>
             <dependency>
@@ -692,7 +686,7 @@
                 <artifactId>nifi-docs</artifactId>
                 <version>0.0.1-SNAPSHOT</version>
                 <classifier>resources</classifier>
-                <scope>provided</scope> <!-- Provided - we don't want the zip in the libs -->
+                <scope>runtime</scope>
                 <type>zip</type>
             </dependency>
             <dependency>
@@ -988,7 +982,6 @@
                         <exclude>src/test/resources/</exclude> <!-- Test datasets -->
                         <exclude>nb-configuration.xml</exclude>
                         <exclude>nbactions.xml</exclude>
-                        <exclude>nar-maven-plugin/</exclude>
                     </excludes>
                 </configuration>
             </plugin>