diff --git a/pype/plugins/ftrack/collect_ftrack_api.py b/pype/plugins/ftrack/publish/collect_ftrack_api.py
similarity index 90%
rename from pype/plugins/ftrack/collect_ftrack_api.py
rename to pype/plugins/ftrack/publish/collect_ftrack_api.py
index 7afa4d50a0..f5e1cfd950 100644
--- a/pype/plugins/ftrack/collect_ftrack_api.py
+++ b/pype/plugins/ftrack/publish/collect_ftrack_api.py
@@ -1,8 +1,11 @@
 import os
-
-import ftrack_api_old as ftrack_api
 import pyblish.api
 
+try:
+    import ftrack_api_old as ftrack_api
+except Exception:
+    import ftrack_api
+
 
 class CollectFtrackApi(pyblish.api.ContextPlugin):
     """ Collects an ftrack session and the current task id. """
diff --git a/pype/plugins/ftrack/integrate_ftrack_api.py b/pype/plugins/ftrack/publish/integrate_ftrack_api.py
similarity index 100%
rename from pype/plugins/ftrack/integrate_ftrack_api.py
rename to pype/plugins/ftrack/publish/integrate_ftrack_api.py
diff --git a/pype/plugins/ftrack/integrate_ftrack_instances.py b/pype/plugins/ftrack/publish/integrate_ftrack_instances.py
similarity index 100%
rename from pype/plugins/ftrack/integrate_ftrack_instances.py
rename to pype/plugins/ftrack/publish/integrate_ftrack_instances.py
diff --git a/pype/plugins/ftrack/integrate_ftrack_review.py b/pype/plugins/ftrack/publish/integrate_ftrack_review.py
similarity index 100%
rename from pype/plugins/ftrack/integrate_ftrack_review.py
rename to pype/plugins/ftrack/publish/integrate_ftrack_review.py