diff --git a/Processors/nifi-salesforce/nifi-salesforce-api-nar/pom.xml b/Processors/nifi-salesforce/nifi-salesforce-api-nar/pom.xml
index 4610f4c..a324b8e 100644
--- a/Processors/nifi-salesforce/nifi-salesforce-api-nar/pom.xml
+++ b/Processors/nifi-salesforce/nifi-salesforce-api-nar/pom.xml
@@ -26,12 +26,7 @@
     <packaging>nar</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>${nifi.version}</version>
-            <type>nar</type>
-        </dependency>
+
         <dependency>
             <groupId>com.github.jdye64</groupId>
             <artifactId>nifi-salesforce-api</artifactId>
diff --git a/Processors/nifi-salesforce/nifi-salesforce-processors/pom.xml b/Processors/nifi-salesforce/nifi-salesforce-processors/pom.xml
index 5a4e787..7707eb4 100644
--- a/Processors/nifi-salesforce/nifi-salesforce-processors/pom.xml
+++ b/Processors/nifi-salesforce/nifi-salesforce-processors/pom.xml
@@ -32,6 +32,13 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.nifi</groupId>
+            <artifactId>nifi-standard-services-api-nar</artifactId>
+            <version>${nifi.version}</version>
+            <type>nar</type>
+        </dependency>
+
         <dependency>
             <groupId>com.github.jdye64</groupId>
             <artifactId>nifi-salesforce-api</artifactId>
diff --git a/Processors/nifi-salesforce/nifi-salesforce-api/src/main/java/com/jeremydyer/nifi/salesforce/SalesforceUserPassAuthentication.java b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/SalesforceUserPassAuthentication.java
similarity index 96%
rename from Processors/nifi-salesforce/nifi-salesforce-api/src/main/java/com/jeremydyer/nifi/salesforce/SalesforceUserPassAuthentication.java
rename to Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/SalesforceUserPassAuthentication.java
index 8e84a3a..73a7b51 100644
--- a/Processors/nifi-salesforce/nifi-salesforce-api/src/main/java/com/jeremydyer/nifi/salesforce/SalesforceUserPassAuthentication.java
+++ b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/SalesforceUserPassAuthentication.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jeremydyer.nifi.salesforce;
+package com.jeremydyer.processors.salesforce;
 
 import org.apache.nifi.annotation.documentation.CapabilityDescription;
 import org.apache.nifi.annotation.documentation.Tags;
diff --git a/Processors/nifi-salesforce/nifi-salesforce-controllerservice/src/main/java/com/jeremydyer/nifi/salesforce/SalesforceUserPassAuthenticationService.java b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/SalesforceUserPassAuthenticationService.java
similarity index 99%
rename from Processors/nifi-salesforce/nifi-salesforce-controllerservice/src/main/java/com/jeremydyer/nifi/salesforce/SalesforceUserPassAuthenticationService.java
rename to Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/SalesforceUserPassAuthenticationService.java
index f33197a..674531b 100644
--- a/Processors/nifi-salesforce/nifi-salesforce-controllerservice/src/main/java/com/jeremydyer/nifi/salesforce/SalesforceUserPassAuthenticationService.java
+++ b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/SalesforceUserPassAuthenticationService.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jeremydyer.nifi.salesforce;
+package com.jeremydyer.processors.salesforce;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
diff --git a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/base/AbstractSalesforceRESTOperation.java b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/base/AbstractSalesforceRESTOperation.java
index 1469c13..3eb5e75 100644
--- a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/base/AbstractSalesforceRESTOperation.java
+++ b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/base/AbstractSalesforceRESTOperation.java
@@ -32,7 +32,7 @@
 import org.apache.nifi.processor.Relationship;
 import org.apache.nifi.processor.exception.ProcessException;
 
-import com.jeremydyer.nifi.salesforce.SalesforceUserPassAuthentication;
+import com.jeremydyer.processors.salesforce.SalesforceUserPassAuthentication;
 
 /**
  * Created by jdyer on 8/4/16.
diff --git a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/organization/SalesforceOrganizationLimitsProcessor.java b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/organization/SalesforceOrganizationLimitsProcessor.java
index 2ba86a5..d0b4cf0 100644
--- a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/organization/SalesforceOrganizationLimitsProcessor.java
+++ b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/organization/SalesforceOrganizationLimitsProcessor.java
@@ -36,7 +36,7 @@
 import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.processor.io.OutputStreamCallback;
 
-import com.jeremydyer.nifi.salesforce.SalesforceUserPassAuthentication;
+import com.jeremydyer.processors.salesforce.SalesforceUserPassAuthentication;
 import com.jeremydyer.processors.salesforce.base.AbstractSalesforceRESTOperation;
 
 @Tags({"salesforce", "organization", "limits"})
diff --git a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/query/SalesforceQueryProcessor.java b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/query/SalesforceQueryProcessor.java
index 100e095..0d19e76 100644
--- a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/query/SalesforceQueryProcessor.java
+++ b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/query/SalesforceQueryProcessor.java
@@ -37,7 +37,7 @@
 import org.apache.nifi.processor.io.OutputStreamCallback;
 import org.apache.nifi.processor.util.StandardValidators;
 
-import com.jeremydyer.nifi.salesforce.SalesforceUserPassAuthentication;
+import com.jeremydyer.processors.salesforce.SalesforceUserPassAuthentication;
 import com.jeremydyer.processors.salesforce.base.AbstractSalesforceRESTOperation;
 
 @Tags({"salesforce", "soql", "sobject", "query"})
diff --git a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/DescribeGlobalProcessor.java b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/DescribeGlobalProcessor.java
index 369d166..c7b61f5 100644
--- a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/DescribeGlobalProcessor.java
+++ b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/DescribeGlobalProcessor.java
@@ -37,7 +37,7 @@
 import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.processor.io.OutputStreamCallback;
 
-import com.jeremydyer.nifi.salesforce.SalesforceUserPassAuthentication;
+import com.jeremydyer.processors.salesforce.SalesforceUserPassAuthentication;
 import com.jeremydyer.processors.salesforce.base.AbstractSalesforceRESTOperation;
 
 @Tags({"salesforce", "describe", "sobject"})
diff --git a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectBasicInfoProcessor.java b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectBasicInfoProcessor.java
index 4bb99c6..e526e80 100644
--- a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectBasicInfoProcessor.java
+++ b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectBasicInfoProcessor.java
@@ -37,7 +37,7 @@
 import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.processor.io.OutputStreamCallback;
 
-import com.jeremydyer.nifi.salesforce.SalesforceUserPassAuthentication;
+import com.jeremydyer.processors.salesforce.SalesforceUserPassAuthentication;
 import com.jeremydyer.processors.salesforce.base.AbstractSalesforceRESTOperation;
 
 @Tags({"salesforce", "describe", "metadata", "basic", "info"})
diff --git a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectDescribeProcessor.java b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectDescribeProcessor.java
index 8d9123b..ce8ab4b 100644
--- a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectDescribeProcessor.java
+++ b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectDescribeProcessor.java
@@ -37,7 +37,7 @@
 import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.processor.io.OutputStreamCallback;
 
-import com.jeremydyer.nifi.salesforce.SalesforceUserPassAuthentication;
+import com.jeremydyer.processors.salesforce.SalesforceUserPassAuthentication;
 import com.jeremydyer.processors.salesforce.base.AbstractSalesforceRESTOperation;
 
 @Tags({"salesforce", "describe", "sobject"})
diff --git a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectGetDeletedProcessor.java b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectGetDeletedProcessor.java
index 7e2e0c9..c6a9507 100644
--- a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectGetDeletedProcessor.java
+++ b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectGetDeletedProcessor.java
@@ -38,7 +38,7 @@
 import org.apache.nifi.processor.io.OutputStreamCallback;
 import org.apache.nifi.processor.util.StandardValidators;
 
-import com.jeremydyer.nifi.salesforce.SalesforceUserPassAuthentication;
+import com.jeremydyer.processors.salesforce.SalesforceUserPassAuthentication;
 import com.jeremydyer.processors.salesforce.base.AbstractSalesforceRESTOperation;
 
 @Tags({"salesforce", "deleted", "sobject"})
diff --git a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectGetUpdatedProcessor.java b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectGetUpdatedProcessor.java
index 017d6ae..1d3f5c1 100644
--- a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectGetUpdatedProcessor.java
+++ b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectGetUpdatedProcessor.java
@@ -38,7 +38,7 @@
 import org.apache.nifi.processor.io.OutputStreamCallback;
 import org.apache.nifi.processor.util.StandardValidators;
 
-import com.jeremydyer.nifi.salesforce.SalesforceUserPassAuthentication;
+import com.jeremydyer.processors.salesforce.SalesforceUserPassAuthentication;
 import com.jeremydyer.processors.salesforce.base.AbstractSalesforceRESTOperation;
 
 @Tags({"salesforce", "updated", "sobject"})
diff --git a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectRowsProcessor.java b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectRowsProcessor.java
index 02b0fc4..a02af64 100644
--- a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectRowsProcessor.java
+++ b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectRowsProcessor.java
@@ -37,7 +37,7 @@
 import org.apache.nifi.processor.io.OutputStreamCallback;
 import org.apache.nifi.processor.util.StandardValidators;
 
-import com.jeremydyer.nifi.salesforce.SalesforceUserPassAuthentication;
+import com.jeremydyer.processors.salesforce.SalesforceUserPassAuthentication;
 import com.jeremydyer.processors.salesforce.base.AbstractSalesforceRESTOperation;
 
 @Tags({"salesforce", "rows", "sobject"})
diff --git a/Processors/nifi-salesforce/nifi-salesforce-controllerservice/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService
similarity index 91%
rename from Processors/nifi-salesforce/nifi-salesforce-controllerservice/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService
rename to Processors/nifi-salesforce/nifi-salesforce-processors/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService
index 9eb458e..fd03abe 100644
--- a/Processors/nifi-salesforce/nifi-salesforce-controllerservice/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService
+++ b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService
@@ -12,4 +12,4 @@
 # 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.
-com.jeremydyer.nifi.salesforce.SalesforceUserPassAuthenticationService
\ No newline at end of file
+com.jeremydyer.processors.salesforce.SalesforceUserPassAuthenticationService
\ No newline at end of file
diff --git a/Processors/nifi-salesforce/pom.xml b/Processors/nifi-salesforce/pom.xml
index 26332a9..e8aa99f 100644
--- a/Processors/nifi-salesforce/pom.xml
+++ b/Processors/nifi-salesforce/pom.xml
@@ -28,10 +28,6 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>nifi-salesforce-api</module>
-        <module>nifi-salesforce-api-nar</module>
-        <module>nifi-salesforce-controllerservice</module>
-        <module>nifi-salesforce-controllerservice-nar</module>
         <module>nifi-salesforce-processors</module>
         <module>nifi-salesforce-nar</module>
     </modules>