diff --git a/src/main/java/com/salesforce/dataloader/action/BulkExtractAction.java b/src/main/java/com/salesforce/dataloader/action/BulkExtractAction.java
index 8b9b16a6..ac579c6c 100644
--- a/src/main/java/com/salesforce/dataloader/action/BulkExtractAction.java
+++ b/src/main/java/com/salesforce/dataloader/action/BulkExtractAction.java
@@ -27,9 +27,9 @@
 package com.salesforce.dataloader.action;
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
-import com.salesforce.dataloader.action.visitor.BulkV1QueryVisitor;
-import com.salesforce.dataloader.action.visitor.BulkV2QueryVisitor;
 import com.salesforce.dataloader.action.visitor.IVisitor;
+import com.salesforce.dataloader.action.visitor.bulk.BulkV1QueryVisitor;
+import com.salesforce.dataloader.action.visitor.bulk.BulkV2QueryVisitor;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.exception.DataAccessObjectInitializationException;
 
diff --git a/src/main/java/com/salesforce/dataloader/action/BulkLoadAction.java b/src/main/java/com/salesforce/dataloader/action/BulkLoadAction.java
index 8d184931..5c821aac 100644
--- a/src/main/java/com/salesforce/dataloader/action/BulkLoadAction.java
+++ b/src/main/java/com/salesforce/dataloader/action/BulkLoadAction.java
@@ -29,8 +29,8 @@
 import java.util.List;
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
-import com.salesforce.dataloader.action.visitor.BulkLoadVisitor;
 import com.salesforce.dataloader.action.visitor.DAOLoadVisitor;
+import com.salesforce.dataloader.action.visitor.bulk.BulkLoadVisitor;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.exception.DataAccessObjectInitializationException;
 import com.salesforce.dataloader.mapping.LoadMapper;
diff --git a/src/main/java/com/salesforce/dataloader/action/DeleteAction.java b/src/main/java/com/salesforce/dataloader/action/DeleteAction.java
index 98c506f9..2d6dea18 100644
--- a/src/main/java/com/salesforce/dataloader/action/DeleteAction.java
+++ b/src/main/java/com/salesforce/dataloader/action/DeleteAction.java
@@ -29,8 +29,8 @@
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
 import com.salesforce.dataloader.action.visitor.DAOLoadVisitor;
-import com.salesforce.dataloader.action.visitor.DeleteVisitor;
-import com.salesforce.dataloader.action.visitor.RESTDeleteVisitor;
+import com.salesforce.dataloader.action.visitor.partner.PartnerDeleteVisitor;
+import com.salesforce.dataloader.action.visitor.rest.RESTDeleteVisitor;
 import com.salesforce.dataloader.config.Config;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.exception.DataAccessObjectException;
@@ -50,7 +50,7 @@ protected DAOLoadVisitor createVisitor() {
                 && getController().getConfig().getBoolean(Config.DELETE_WITH_EXTERNALID)) {
             return new RESTDeleteVisitor(getController(), getMonitor(), getSuccessWriter(), getErrorWriter());
         } else {
-            return new DeleteVisitor(getController(), getMonitor(), getSuccessWriter(), getErrorWriter());
+            return new PartnerDeleteVisitor(getController(), getMonitor(), getSuccessWriter(), getErrorWriter());
         }
     }
 
diff --git a/src/main/java/com/salesforce/dataloader/action/InsertAction.java b/src/main/java/com/salesforce/dataloader/action/InsertAction.java
index 7f96b0e5..c64c5543 100644
--- a/src/main/java/com/salesforce/dataloader/action/InsertAction.java
+++ b/src/main/java/com/salesforce/dataloader/action/InsertAction.java
@@ -28,7 +28,7 @@
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
 import com.salesforce.dataloader.action.visitor.DAOLoadVisitor;
-import com.salesforce.dataloader.action.visitor.InsertVisitor;
+import com.salesforce.dataloader.action.visitor.partner.PartnerInsertVisitor;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.exception.DataAccessObjectException;
 
@@ -44,7 +44,7 @@ public InsertAction(Controller controller, ILoaderProgress monitor) throws DataA
 
     @Override
     protected DAOLoadVisitor createVisitor() {
-        return new InsertVisitor(getController(), getMonitor(), getSuccessWriter(), getErrorWriter());
+        return new PartnerInsertVisitor(getController(), getMonitor(), getSuccessWriter(), getErrorWriter());
     }
 
 }
diff --git a/src/main/java/com/salesforce/dataloader/action/PartnerExtractAction.java b/src/main/java/com/salesforce/dataloader/action/PartnerExtractAction.java
index fb1a331f..43ae6386 100644
--- a/src/main/java/com/salesforce/dataloader/action/PartnerExtractAction.java
+++ b/src/main/java/com/salesforce/dataloader/action/PartnerExtractAction.java
@@ -28,7 +28,7 @@
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
 import com.salesforce.dataloader.action.visitor.IQueryVisitor;
-import com.salesforce.dataloader.action.visitor.PartnerQueryVisitor;
+import com.salesforce.dataloader.action.visitor.partner.PartnerQueryVisitor;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.exception.DataAccessObjectInitializationException;
 
diff --git a/src/main/java/com/salesforce/dataloader/action/PartnerExtractAllAction.java b/src/main/java/com/salesforce/dataloader/action/PartnerExtractAllAction.java
index be88bfee..cc4ee172 100644
--- a/src/main/java/com/salesforce/dataloader/action/PartnerExtractAllAction.java
+++ b/src/main/java/com/salesforce/dataloader/action/PartnerExtractAllAction.java
@@ -28,7 +28,7 @@
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
 import com.salesforce.dataloader.action.visitor.IVisitor;
-import com.salesforce.dataloader.action.visitor.PartnerQueryAllVisitor;
+import com.salesforce.dataloader.action.visitor.partner.PartnerQueryAllVisitor;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.exception.DataAccessObjectInitializationException;
 
diff --git a/src/main/java/com/salesforce/dataloader/action/UndeleteAction.java b/src/main/java/com/salesforce/dataloader/action/UndeleteAction.java
index bc29a0d4..eb63f923 100644
--- a/src/main/java/com/salesforce/dataloader/action/UndeleteAction.java
+++ b/src/main/java/com/salesforce/dataloader/action/UndeleteAction.java
@@ -29,7 +29,7 @@
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
 import com.salesforce.dataloader.action.visitor.DAOLoadVisitor;
-import com.salesforce.dataloader.action.visitor.UndeleteVisitor;
+import com.salesforce.dataloader.action.visitor.partner.PartnerUndeleteVisitor;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.exception.DataAccessObjectException;
 
@@ -44,7 +44,7 @@ public UndeleteAction(Controller controller, ILoaderProgress monitor) throws Dat
 
     @Override
     protected DAOLoadVisitor createVisitor() {
-        return new UndeleteVisitor(getController(), getMonitor(), getSuccessWriter(), getErrorWriter());
+        return new PartnerUndeleteVisitor(getController(), getMonitor(), getSuccessWriter(), getErrorWriter());
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/salesforce/dataloader/action/UpdateAction.java b/src/main/java/com/salesforce/dataloader/action/UpdateAction.java
index 46b866e9..f81d87db 100644
--- a/src/main/java/com/salesforce/dataloader/action/UpdateAction.java
+++ b/src/main/java/com/salesforce/dataloader/action/UpdateAction.java
@@ -27,8 +27,8 @@
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
 import com.salesforce.dataloader.action.visitor.DAOLoadVisitor;
-import com.salesforce.dataloader.action.visitor.RESTUpdateVisitor;
-import com.salesforce.dataloader.action.visitor.UpdateVisitor;
+import com.salesforce.dataloader.action.visitor.partner.PartnerUpdateVisitor;
+import com.salesforce.dataloader.action.visitor.rest.RESTUpdateVisitor;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.exception.DataAccessObjectException;
 
@@ -46,7 +46,7 @@ protected DAOLoadVisitor createVisitor() {
         if (getController().getConfig().isRESTAPIEnabled()) {
             return new RESTUpdateVisitor(getController(), getMonitor(), getSuccessWriter(), getErrorWriter());
         } else {
-            return new UpdateVisitor(getController(), getMonitor(), getSuccessWriter(), getErrorWriter());
+            return new PartnerUpdateVisitor(getController(), getMonitor(), getSuccessWriter(), getErrorWriter());
         }
     }
 
diff --git a/src/main/java/com/salesforce/dataloader/action/UpsertAction.java b/src/main/java/com/salesforce/dataloader/action/UpsertAction.java
index 77360d0b..da8fc820 100644
--- a/src/main/java/com/salesforce/dataloader/action/UpsertAction.java
+++ b/src/main/java/com/salesforce/dataloader/action/UpsertAction.java
@@ -28,7 +28,7 @@
 package com.salesforce.dataloader.action;
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
-import com.salesforce.dataloader.action.visitor.UpsertVisitor;
+import com.salesforce.dataloader.action.visitor.partner.PartnerUpsertVisitor;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.exception.DataAccessObjectException;
 
@@ -43,8 +43,8 @@ public UpsertAction(Controller controller, ILoaderProgress monitor) throws DataA
     }
 
     @Override
-    protected UpsertVisitor createVisitor() {
-        return new UpsertVisitor(getController(), getMonitor(), getSuccessWriter(), getErrorWriter());
+    protected PartnerUpsertVisitor createVisitor() {
+        return new PartnerUpsertVisitor(getController(), getMonitor(), getSuccessWriter(), getErrorWriter());
     }
 
 }
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/AbstractQueryVisitor.java b/src/main/java/com/salesforce/dataloader/action/visitor/AbstractQueryVisitor.java
index 242889ce..ce5a4a3c 100644
--- a/src/main/java/com/salesforce/dataloader/action/visitor/AbstractQueryVisitor.java
+++ b/src/main/java/com/salesforce/dataloader/action/visitor/AbstractQueryVisitor.java
@@ -64,7 +64,7 @@
  * @author Colin Jarvis
  * @since 21.0
  */
-abstract class AbstractQueryVisitor extends AbstractVisitor implements IQueryVisitor {
+public abstract class AbstractQueryVisitor extends AbstractVisitor implements IQueryVisitor {
 
     private final DataWriter queryWriter;
     private final String soql;
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/AbstractBulkQueryVisitor.java b/src/main/java/com/salesforce/dataloader/action/visitor/bulk/AbstractBulkQueryVisitor.java
similarity index 98%
rename from src/main/java/com/salesforce/dataloader/action/visitor/AbstractBulkQueryVisitor.java
rename to src/main/java/com/salesforce/dataloader/action/visitor/bulk/AbstractBulkQueryVisitor.java
index 5d87749b..8464be51 100644
--- a/src/main/java/com/salesforce/dataloader/action/visitor/AbstractBulkQueryVisitor.java
+++ b/src/main/java/com/salesforce/dataloader/action/visitor/bulk/AbstractBulkQueryVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.bulk;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -36,6 +36,7 @@
 
 import com.salesforce.dataloader.action.AbstractExtractAction;
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
+import com.salesforce.dataloader.action.visitor.AbstractQueryVisitor;
 import com.salesforce.dataloader.config.Config;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.dao.DataWriter;
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/BulkApiVisitorUtil.java b/src/main/java/com/salesforce/dataloader/action/visitor/bulk/BulkApiVisitorUtil.java
similarity index 99%
rename from src/main/java/com/salesforce/dataloader/action/visitor/BulkApiVisitorUtil.java
rename to src/main/java/com/salesforce/dataloader/action/visitor/bulk/BulkApiVisitorUtil.java
index 62df9b6d..d09a649f 100644
--- a/src/main/java/com/salesforce/dataloader/action/visitor/BulkApiVisitorUtil.java
+++ b/src/main/java/com/salesforce/dataloader/action/visitor/bulk/BulkApiVisitorUtil.java
@@ -23,7 +23,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.bulk;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/BulkLoadVisitor.java b/src/main/java/com/salesforce/dataloader/action/visitor/bulk/BulkLoadVisitor.java
similarity index 99%
rename from src/main/java/com/salesforce/dataloader/action/visitor/BulkLoadVisitor.java
rename to src/main/java/com/salesforce/dataloader/action/visitor/bulk/BulkLoadVisitor.java
index 6f918860..3341ff3c 100644
--- a/src/main/java/com/salesforce/dataloader/action/visitor/BulkLoadVisitor.java
+++ b/src/main/java/com/salesforce/dataloader/action/visitor/bulk/BulkLoadVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.bulk;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -57,6 +57,7 @@
 import org.apache.logging.log4j.LogManager;
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
+import com.salesforce.dataloader.action.visitor.DAOLoadVisitor;
 import com.salesforce.dataloader.client.DescribeRefObject;
 import com.salesforce.dataloader.config.Config;
 import com.salesforce.dataloader.config.Messages;
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/BulkV1Connection.java b/src/main/java/com/salesforce/dataloader/action/visitor/bulk/BulkV1Connection.java
similarity index 97%
rename from src/main/java/com/salesforce/dataloader/action/visitor/BulkV1Connection.java
rename to src/main/java/com/salesforce/dataloader/action/visitor/bulk/BulkV1Connection.java
index 2f681f3f..bc7bf0b3 100644
--- a/src/main/java/com/salesforce/dataloader/action/visitor/BulkV1Connection.java
+++ b/src/main/java/com/salesforce/dataloader/action/visitor/bulk/BulkV1Connection.java
@@ -23,7 +23,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.bulk;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/BulkV1QueryVisitor.java b/src/main/java/com/salesforce/dataloader/action/visitor/bulk/BulkV1QueryVisitor.java
similarity index 98%
rename from src/main/java/com/salesforce/dataloader/action/visitor/BulkV1QueryVisitor.java
rename to src/main/java/com/salesforce/dataloader/action/visitor/bulk/BulkV1QueryVisitor.java
index bb535265..4bee1dc4 100644
--- a/src/main/java/com/salesforce/dataloader/action/visitor/BulkV1QueryVisitor.java
+++ b/src/main/java/com/salesforce/dataloader/action/visitor/bulk/BulkV1QueryVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.bulk;
 
 import java.io.ByteArrayInputStream;
 
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/BulkV2Connection.java b/src/main/java/com/salesforce/dataloader/action/visitor/bulk/BulkV2Connection.java
similarity index 99%
rename from src/main/java/com/salesforce/dataloader/action/visitor/BulkV2Connection.java
rename to src/main/java/com/salesforce/dataloader/action/visitor/bulk/BulkV2Connection.java
index a9bec375..615ce625 100644
--- a/src/main/java/com/salesforce/dataloader/action/visitor/BulkV2Connection.java
+++ b/src/main/java/com/salesforce/dataloader/action/visitor/bulk/BulkV2Connection.java
@@ -129,7 +129,7 @@ private static void writeTo(BufferedInputStream bis, BufferedOutputStream bos) t
 }
  **************************/
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.bulk;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/BulkV2QueryVisitor.java b/src/main/java/com/salesforce/dataloader/action/visitor/bulk/BulkV2QueryVisitor.java
similarity index 98%
rename from src/main/java/com/salesforce/dataloader/action/visitor/BulkV2QueryVisitor.java
rename to src/main/java/com/salesforce/dataloader/action/visitor/bulk/BulkV2QueryVisitor.java
index dfbc16af..2e0ebc32 100644
--- a/src/main/java/com/salesforce/dataloader/action/visitor/BulkV2QueryVisitor.java
+++ b/src/main/java/com/salesforce/dataloader/action/visitor/bulk/BulkV2QueryVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.bulk;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/DeleteVisitor.java b/src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerDeleteVisitor.java
similarity index 90%
rename from src/main/java/com/salesforce/dataloader/action/visitor/DeleteVisitor.java
rename to src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerDeleteVisitor.java
index e609a93a..51f569c7 100644
--- a/src/main/java/com/salesforce/dataloader/action/visitor/DeleteVisitor.java
+++ b/src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerDeleteVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.partner;
 
 import java.util.List;
 
@@ -40,9 +40,9 @@
  * @author Lexi Viripaeff
  * @since 6.0
  */
-public class DeleteVisitor extends PartnerLoadVisitor {
+public class PartnerDeleteVisitor extends PartnerLoadVisitor {
 
-    public DeleteVisitor(Controller controller, ILoaderProgress monitor, DataWriter successWriter,
+    public PartnerDeleteVisitor(Controller controller, ILoaderProgress monitor, DataWriter successWriter,
             DataWriter errorWriter) {
         super(controller, monitor, successWriter, errorWriter);
     }
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/InsertVisitor.java b/src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerInsertVisitor.java
similarity index 90%
rename from src/main/java/com/salesforce/dataloader/action/visitor/InsertVisitor.java
rename to src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerInsertVisitor.java
index 72faa1c4..7d31cb01 100644
--- a/src/main/java/com/salesforce/dataloader/action/visitor/InsertVisitor.java
+++ b/src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerInsertVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.partner;
 
 import java.util.List;
 
@@ -40,9 +40,9 @@
  * @author Lexi Viripaeff
  * @since 6.0
  */
-public class InsertVisitor extends PartnerLoadVisitor {
+public class PartnerInsertVisitor extends PartnerLoadVisitor {
 
-    public InsertVisitor(Controller controller, ILoaderProgress monitor, DataWriter successWriter,
+    public PartnerInsertVisitor(Controller controller, ILoaderProgress monitor, DataWriter successWriter,
             DataWriter errorWriter) {
         super(controller, monitor, successWriter, errorWriter);
     }
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/PartnerLoadVisitor.java b/src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerLoadVisitor.java
similarity index 98%
rename from src/main/java/com/salesforce/dataloader/action/visitor/PartnerLoadVisitor.java
rename to src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerLoadVisitor.java
index 86f75478..fde6f7bf 100644
--- a/src/main/java/com/salesforce/dataloader/action/visitor/PartnerLoadVisitor.java
+++ b/src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerLoadVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.partner;
 
 import java.util.List;
 
@@ -33,6 +33,7 @@
 
 import com.salesforce.dataloader.action.OperationInfo;
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
+import com.salesforce.dataloader.action.visitor.DAOLoadVisitor;
 import com.salesforce.dataloader.client.PartnerClient;
 import com.salesforce.dataloader.config.*;
 import com.salesforce.dataloader.controller.Controller;
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/PartnerQueryAllVisitor.java b/src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerQueryAllVisitor.java
similarity index 97%
rename from src/main/java/com/salesforce/dataloader/action/visitor/PartnerQueryAllVisitor.java
rename to src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerQueryAllVisitor.java
index 96900551..574964e5 100644
--- a/src/main/java/com/salesforce/dataloader/action/visitor/PartnerQueryAllVisitor.java
+++ b/src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerQueryAllVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.partner;
 
 import com.salesforce.dataloader.action.AbstractExtractAction;
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/PartnerQueryVisitor.java b/src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerQueryVisitor.java
similarity index 98%
rename from src/main/java/com/salesforce/dataloader/action/visitor/PartnerQueryVisitor.java
rename to src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerQueryVisitor.java
index 7a978229..51e0074c 100644
--- a/src/main/java/com/salesforce/dataloader/action/visitor/PartnerQueryVisitor.java
+++ b/src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerQueryVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.partner;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -34,6 +34,7 @@
 import org.apache.logging.log4j.Logger;
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
+import com.salesforce.dataloader.action.visitor.AbstractQueryVisitor;
 import com.salesforce.dataloader.config.Config;
 import com.salesforce.dataloader.config.Messages;
 import com.salesforce.dataloader.controller.Controller;
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/UndeleteVisitor.java b/src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerUndeleteVisitor.java
similarity index 90%
rename from src/main/java/com/salesforce/dataloader/action/visitor/UndeleteVisitor.java
rename to src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerUndeleteVisitor.java
index 1b8ed192..65eeb3c3 100644
--- a/src/main/java/com/salesforce/dataloader/action/visitor/UndeleteVisitor.java
+++ b/src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerUndeleteVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.partner;
 
 import java.util.List;
 
@@ -40,9 +40,9 @@
  * @author Lexi Viripaeff
  * @since 6.0
  */
-public class UndeleteVisitor extends PartnerLoadVisitor {
+public class PartnerUndeleteVisitor extends PartnerLoadVisitor {
 
-    public UndeleteVisitor(Controller controller, ILoaderProgress monitor, DataWriter successWriter,
+    public PartnerUndeleteVisitor(Controller controller, ILoaderProgress monitor, DataWriter successWriter,
             DataWriter errorWriter) {
         super(controller, monitor, successWriter, errorWriter);
     }
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/UpdateVisitor.java b/src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerUpdateVisitor.java
similarity index 90%
rename from src/main/java/com/salesforce/dataloader/action/visitor/UpdateVisitor.java
rename to src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerUpdateVisitor.java
index 455d60f6..382b2830 100644
--- a/src/main/java/com/salesforce/dataloader/action/visitor/UpdateVisitor.java
+++ b/src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerUpdateVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.partner;
 
 import java.util.List;
 
@@ -40,9 +40,9 @@
  * @author Lexi Viripaeff
  * @since 6.0
  */
-public class UpdateVisitor extends PartnerLoadVisitor {
+public class PartnerUpdateVisitor extends PartnerLoadVisitor {
 
-    public UpdateVisitor(Controller controller, ILoaderProgress monitor, DataWriter successWriter,
+    public PartnerUpdateVisitor(Controller controller, ILoaderProgress monitor, DataWriter successWriter,
             DataWriter errorWriter) {
         super(controller, monitor, successWriter, errorWriter);
     }
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/UpsertVisitor.java b/src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerUpsertVisitor.java
similarity index 90%
rename from src/main/java/com/salesforce/dataloader/action/visitor/UpsertVisitor.java
rename to src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerUpsertVisitor.java
index 65d66c11..3be8bb06 100644
--- a/src/main/java/com/salesforce/dataloader/action/visitor/UpsertVisitor.java
+++ b/src/main/java/com/salesforce/dataloader/action/visitor/partner/PartnerUpsertVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.partner;
 
 import java.util.List;
 
@@ -40,9 +40,9 @@
  * @author Alex Warshavsky
  * @since 8.0
  */
-public class UpsertVisitor extends PartnerLoadVisitor {
+public class PartnerUpsertVisitor extends PartnerLoadVisitor {
 
-    public UpsertVisitor(Controller controller, ILoaderProgress monitor, DataWriter successWriter,
+    public PartnerUpsertVisitor(Controller controller, ILoaderProgress monitor, DataWriter successWriter,
             DataWriter errorWriter) {
         super(controller, monitor, successWriter, errorWriter);
     }
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/RESTConnection.java b/src/main/java/com/salesforce/dataloader/action/visitor/rest/RESTConnection.java
similarity index 97%
rename from src/main/java/com/salesforce/dataloader/action/visitor/RESTConnection.java
rename to src/main/java/com/salesforce/dataloader/action/visitor/rest/RESTConnection.java
index 99439e7f..6bc02d9e 100644
--- a/src/main/java/com/salesforce/dataloader/action/visitor/RESTConnection.java
+++ b/src/main/java/com/salesforce/dataloader/action/visitor/rest/RESTConnection.java
@@ -23,7 +23,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.rest;
 
 import com.salesforce.dataloader.controller.Controller;
 import com.sforce.async.AsyncApiException;
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/RESTDeleteVisitor.java b/src/main/java/com/salesforce/dataloader/action/visitor/rest/RESTDeleteVisitor.java
similarity index 97%
rename from src/main/java/com/salesforce/dataloader/action/visitor/RESTDeleteVisitor.java
rename to src/main/java/com/salesforce/dataloader/action/visitor/rest/RESTDeleteVisitor.java
index bb136e43..546af134 100644
--- a/src/main/java/com/salesforce/dataloader/action/visitor/RESTDeleteVisitor.java
+++ b/src/main/java/com/salesforce/dataloader/action/visitor/rest/RESTDeleteVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.rest;
 
 import java.util.List;
 
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/RESTLoadVisitor.java b/src/main/java/com/salesforce/dataloader/action/visitor/rest/RESTLoadVisitor.java
similarity index 97%
rename from src/main/java/com/salesforce/dataloader/action/visitor/RESTLoadVisitor.java
rename to src/main/java/com/salesforce/dataloader/action/visitor/rest/RESTLoadVisitor.java
index 8959cd5e..b23414f4 100644
--- a/src/main/java/com/salesforce/dataloader/action/visitor/RESTLoadVisitor.java
+++ b/src/main/java/com/salesforce/dataloader/action/visitor/rest/RESTLoadVisitor.java
@@ -23,7 +23,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.rest;
 
 
 import java.util.List;
@@ -32,6 +32,7 @@
 
 import com.salesforce.dataloader.action.OperationInfo;
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
+import com.salesforce.dataloader.action.visitor.DAOLoadVisitor;
 import com.salesforce.dataloader.client.CompositeRESTClient;
 import com.salesforce.dataloader.config.Config;
 import com.salesforce.dataloader.config.Messages;
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/RESTUpdateVisitor.java b/src/main/java/com/salesforce/dataloader/action/visitor/rest/RESTUpdateVisitor.java
similarity index 97%
rename from src/main/java/com/salesforce/dataloader/action/visitor/RESTUpdateVisitor.java
rename to src/main/java/com/salesforce/dataloader/action/visitor/rest/RESTUpdateVisitor.java
index 036f0c82..788ab80e 100644
--- a/src/main/java/com/salesforce/dataloader/action/visitor/RESTUpdateVisitor.java
+++ b/src/main/java/com/salesforce/dataloader/action/visitor/rest/RESTUpdateVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.rest;
 
 import java.util.List;
 
diff --git a/src/main/java/com/salesforce/dataloader/client/BulkV1Client.java b/src/main/java/com/salesforce/dataloader/client/BulkV1Client.java
index 69034dd0..eb0b72ba 100644
--- a/src/main/java/com/salesforce/dataloader/client/BulkV1Client.java
+++ b/src/main/java/com/salesforce/dataloader/client/BulkV1Client.java
@@ -29,7 +29,7 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 
-import com.salesforce.dataloader.action.visitor.BulkV1Connection;
+import com.salesforce.dataloader.action.visitor.bulk.BulkV1Connection;
 import com.salesforce.dataloader.config.Messages;
 import com.salesforce.dataloader.controller.Controller;
 import com.sforce.async.AsyncApiException;
diff --git a/src/main/java/com/salesforce/dataloader/client/BulkV2Client.java b/src/main/java/com/salesforce/dataloader/client/BulkV2Client.java
index 2c7c1ea3..639df734 100644
--- a/src/main/java/com/salesforce/dataloader/client/BulkV2Client.java
+++ b/src/main/java/com/salesforce/dataloader/client/BulkV2Client.java
@@ -28,7 +28,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.salesforce.dataloader.action.visitor.BulkV2Connection;
+import com.salesforce.dataloader.action.visitor.bulk.BulkV2Connection;
 import com.salesforce.dataloader.config.Messages;
 import com.salesforce.dataloader.controller.Controller;
 import com.sforce.async.AsyncApiException;
diff --git a/src/main/java/com/salesforce/dataloader/client/CompositeRESTClient.java b/src/main/java/com/salesforce/dataloader/client/CompositeRESTClient.java
index 01a8a90e..892263cf 100644
--- a/src/main/java/com/salesforce/dataloader/client/CompositeRESTClient.java
+++ b/src/main/java/com/salesforce/dataloader/client/CompositeRESTClient.java
@@ -41,7 +41,7 @@
 import org.apache.logging.log4j.Logger;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.salesforce.dataloader.action.visitor.RESTConnection;
+import com.salesforce.dataloader.action.visitor.rest.RESTConnection;
 import com.salesforce.dataloader.config.Config;
 import com.salesforce.dataloader.config.Messages;
 import com.salesforce.dataloader.controller.Controller;