diff --git a/pype/modules/__init__.py b/pype/modules/__init__.py
index 3a73647da3..93fc92f9d5 100644
--- a/pype/modules/__init__.py
+++ b/pype/modules/__init__.py
@@ -35,6 +35,7 @@ from .ftrack import (
 from .clockify import ClockifyModule
 from .log_viewer import LogViewModule
 from .muster import MusterModule
+from .deadline import DeadlineModule
 from .standalonepublish_action import StandAlonePublishAction
 from .websocket_server import WebsocketModule
 from .sync_server import SyncServer
@@ -74,6 +75,7 @@ __all__ = (
     "IdleManager",
     "LogViewModule",
     "MusterModule",
+    "DeadlineModule",
     "StandAlonePublishAction",
 
     "WebsocketModule",
diff --git a/pype/modules/deadline/deadline_module.py b/pype/modules/deadline/deadline_module.py
index 6de68c390f..ba920f7f13 100644
--- a/pype/modules/deadline/deadline_module.py
+++ b/pype/modules/deadline/deadline_module.py
@@ -1,7 +1,9 @@
-from .. import PypeModule
+import os
+from pype.modules import (
+    PypeModule, IPluginPaths)
 
 
-class DeadlineModule(PypeModule):
+class DeadlineModule(PypeModule, IPluginPaths):
     name = "deadline"
 
     def initialize(self, modules_settings):
@@ -18,3 +20,10 @@ class DeadlineModule(PypeModule):
 
     def connect_with_modules(self, *_a, **_kw):
         return
+
+    def get_plugin_paths(self):
+        """Deadline plugin paths."""
+        current_dir = os.path.dirname(os.path.abspath(__file__))
+        return {
+            "publish": [os.path.join(current_dir, "plugins", "publish")]
+        }
diff --git a/pype/plugins/aftereffects/publish/submit_aftereffects_deadline.py b/pype/modules/deadline/plugins/publish/submit_aftereffects_deadline.py
similarity index 100%
rename from pype/plugins/aftereffects/publish/submit_aftereffects_deadline.py
rename to pype/modules/deadline/plugins/publish/submit_aftereffects_deadline.py
diff --git a/pype/plugins/maya/publish/submit_maya_deadline.py b/pype/modules/deadline/plugins/publish/submit_maya_deadline.py
similarity index 100%
rename from pype/plugins/maya/publish/submit_maya_deadline.py
rename to pype/modules/deadline/plugins/publish/submit_maya_deadline.py
diff --git a/pype/plugins/nuke/publish/submit_nuke_deadline.py b/pype/modules/deadline/plugins/publish/submit_nuke_deadline.py
similarity index 100%
rename from pype/plugins/nuke/publish/submit_nuke_deadline.py
rename to pype/modules/deadline/plugins/publish/submit_nuke_deadline.py
diff --git a/pype/plugins/global/publish/submit_publish_job.py b/pype/modules/deadline/plugins/publish/submit_publish_job.py
similarity index 100%
rename from pype/plugins/global/publish/submit_publish_job.py
rename to pype/modules/deadline/plugins/publish/submit_publish_job.py
diff --git a/pype/plugins/maya/publish/validate_deadline_connection.py b/pype/modules/deadline/plugins/publish/validate_deadline_connection.py
similarity index 98%
rename from pype/plugins/maya/publish/validate_deadline_connection.py
rename to pype/modules/deadline/plugins/publish/validate_deadline_connection.py
index 0733c3badf..1c49e68ee1 100644
--- a/pype/plugins/maya/publish/validate_deadline_connection.py
+++ b/pype/modules/deadline/plugins/publish/validate_deadline_connection.py
@@ -10,7 +10,7 @@ class ValidateDeadlineConnection(pyblish.api.ContextPlugin):
 
     label = "Validate Deadline Web Service"
     order = pyblish.api.ValidatorOrder
-    hosts = ["maya"]
+    hosts = ["maya", "nuke"]
     families = ["renderlayer"]
 
     def process(self, context):
diff --git a/pype/plugins/maya/create/create_render.py b/pype/plugins/maya/create/create_render.py
index b718079b43..2b0b0e19f7 100644
--- a/pype/plugins/maya/create/create_render.py
+++ b/pype/plugins/maya/create/create_render.py
@@ -127,18 +127,18 @@ class CreateRender(avalon.maya.Creator):
 
         system_settings = get_system_settings()["modules"]
 
+        deadline_enabled = system_settings["deadline"]["enabled"]
+        muster_enabled = system_settings["muster"]["enabled"]
         deadline_url = system_settings["deadline"]["DEADLINE_REST_URL"]
         muster_url = system_settings["muster"]["MUSTER_REST_URL"]
 
-        if deadline_url and muster_url:
+        if deadline_enabled and muster_enabled:
             self.log.error(
                 "Both Deadline and Muster are enabled. " "Cannot support both."
             )
             raise RuntimeError("Both Deadline and Muster are enabled")
 
-        if deadline_url is None:
-            self.log.warning("Deadline REST API url not found.")
-        else:
+        if deadline_enabled:
             argument = "{}/api/pools?NamesOnly=true".format(deadline_url)
             try:
                 response = self._requests_get(argument)
@@ -155,9 +155,7 @@ class CreateRender(avalon.maya.Creator):
                 # set any secondary pools
                 self.data["secondaryPool"] = ["-"] + pools
 
-        if muster_url is None:
-            self.log.warning("Muster REST API URL not found.")
-        else:
+        if muster_enabled:
             self.log.info(">>> Loading Muster credentials ...")
             self._load_credentials()
             self.log.info(">>> Getting pools ...")
diff --git a/requirements.txt b/requirements.txt
index 658405e2fb..6faadba909 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -24,6 +24,7 @@ pytest-cov
 pytest-print
 pyqt5
 Qt.py
+scandir
 speedcopy
 six
 Sphinx