diff --git a/sahara/plugins/cdh/cloudera_utils.py b/sahara/plugins/cdh/cloudera_utils.py
index c819d376..d372e052 100644
--- a/sahara/plugins/cdh/cloudera_utils.py
+++ b/sahara/plugins/cdh/cloudera_utils.py
@@ -25,7 +25,7 @@ except ImportError:
 
 from sahara.i18n import _
 from sahara.plugins.cdh import utils as pu
-from sahara.plugins.general import exceptions as ex
+from sahara.plugins import exceptions as ex
 
 CM_DEFAULT_USERNAME = 'admin'
 CM_DEFAULT_PASSWD = 'admin'
diff --git a/sahara/plugins/cdh/commands.py b/sahara/plugins/cdh/commands.py
index dc2d7854..c166283f 100644
--- a/sahara/plugins/cdh/commands.py
+++ b/sahara/plugins/cdh/commands.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 from sahara.i18n import _
-from sahara.plugins.general import exceptions as ex
+from sahara.plugins import exceptions as ex
 
 
 def _root(remote, cmd, **kwargs):
diff --git a/sahara/plugins/cdh/deploy.py b/sahara/plugins/cdh/deploy.py
index 618e7f9b..46443cab 100644
--- a/sahara/plugins/cdh/deploy.py
+++ b/sahara/plugins/cdh/deploy.py
@@ -26,8 +26,8 @@ from sahara.plugins.cdh import cloudera_utils as cu
 from sahara.plugins.cdh import commands as cmd
 from sahara.plugins.cdh import config_helper as c_helper
 from sahara.plugins.cdh import utils as pu
-from sahara.plugins.general import exceptions as ex
-from sahara.plugins.general import utils as gu
+from sahara.plugins import exceptions as ex
+from sahara.plugins import utils as gu
 from sahara.swift import swift_helper
 from sahara.utils import xmlutils
 
diff --git a/sahara/plugins/cdh/edp_engine.py b/sahara/plugins/cdh/edp_engine.py
index 029edbe7..0ee0ce1b 100644
--- a/sahara/plugins/cdh/edp_engine.py
+++ b/sahara/plugins/cdh/edp_engine.py
@@ -14,8 +14,8 @@
 # limitations under the License.
 
 from sahara.plugins.cdh import utils as cu
-from sahara.plugins.general import exceptions as ex
-from sahara.plugins.general import utils as u
+from sahara.plugins import exceptions as ex
+from sahara.plugins import utils as u
 from sahara.service.edp import hdfs_helper
 from sahara.service.edp.oozie import engine as edp_engine
 
diff --git a/sahara/plugins/cdh/utils.py b/sahara/plugins/cdh/utils.py
index db8e6579..199a41de 100644
--- a/sahara/plugins/cdh/utils.py
+++ b/sahara/plugins/cdh/utils.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from sahara.plugins.general import utils as u
+from sahara.plugins import utils as u
 
 
 def get_manager(cluster):
diff --git a/sahara/plugins/cdh/validation.py b/sahara/plugins/cdh/validation.py
index 6666fa73..6758dd7c 100644
--- a/sahara/plugins/cdh/validation.py
+++ b/sahara/plugins/cdh/validation.py
@@ -18,8 +18,8 @@ from sahara.i18n import _LE
 from sahara.openstack.common import log as logging
 from sahara.plugins.cdh import cloudera_utils as cmu
 from sahara.plugins.cdh import utils as cu
-from sahara.plugins.general import exceptions as ex
-from sahara.plugins.general import utils as u
+from sahara.plugins import exceptions as ex
+from sahara.plugins import utils as u
 from sahara.utils import general as gu
 
 LOG = logging.getLogger(__name__)
diff --git a/sahara/plugins/general/exceptions.py b/sahara/plugins/exceptions.py
similarity index 100%
rename from sahara/plugins/general/exceptions.py
rename to sahara/plugins/exceptions.py
diff --git a/sahara/plugins/general/__init__.py b/sahara/plugins/general/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/sahara/plugins/hdp/ambariplugin.py b/sahara/plugins/hdp/ambariplugin.py
index e7351e4a..372e2c3b 100644
--- a/sahara/plugins/hdp/ambariplugin.py
+++ b/sahara/plugins/hdp/ambariplugin.py
@@ -20,7 +20,7 @@ from sahara import context
 from sahara.i18n import _
 from sahara.i18n import _LI
 from sahara.openstack.common import log as logging
-from sahara.plugins.general import exceptions as ex
+from sahara.plugins import exceptions as ex
 from sahara.plugins.hdp import hadoopserver as h
 from sahara.plugins.hdp import saharautils as utils
 from sahara.plugins.hdp.versions import versionhandlerfactory as vhf
diff --git a/sahara/plugins/hdp/clusterspec.py b/sahara/plugins/hdp/clusterspec.py
index 280fd9d8..19c6dc19 100644
--- a/sahara/plugins/hdp/clusterspec.py
+++ b/sahara/plugins/hdp/clusterspec.py
@@ -17,7 +17,7 @@ from oslo.serialization import jsonutils as json
 
 from sahara.i18n import _
 from sahara.openstack.common import log as logging
-from sahara.plugins.general import exceptions as ex
+from sahara.plugins import exceptions as ex
 from sahara.plugins.hdp.versions import versionhandlerfactory as vhf
 
 
diff --git a/sahara/plugins/hdp/edp_engine.py b/sahara/plugins/hdp/edp_engine.py
index 8de7b3b1..05b82d68 100644
--- a/sahara/plugins/hdp/edp_engine.py
+++ b/sahara/plugins/hdp/edp_engine.py
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from sahara.plugins.general import exceptions as ex
-from sahara.plugins.general import utils as u
+from sahara.plugins import exceptions as ex
+from sahara.plugins import utils as u
 from sahara.service.edp.oozie import engine as edp_engine
 
 
diff --git a/sahara/plugins/hdp/hadoopserver.py b/sahara/plugins/hdp/hadoopserver.py
index 51de53da..4444eb90 100644
--- a/sahara/plugins/hdp/hadoopserver.py
+++ b/sahara/plugins/hdp/hadoopserver.py
@@ -18,7 +18,7 @@ import re
 from sahara.i18n import _
 from sahara.i18n import _LI
 from sahara.openstack.common import log as logging
-from sahara.plugins.general import exceptions as ex
+from sahara.plugins import exceptions as ex
 from sahara.plugins.hdp import saharautils
 from sahara.utils import files as f
 
diff --git a/sahara/plugins/hdp/versions/version_1_3_2/services.py b/sahara/plugins/hdp/versions/version_1_3_2/services.py
index 64cb5cdc..13562a36 100644
--- a/sahara/plugins/hdp/versions/version_1_3_2/services.py
+++ b/sahara/plugins/hdp/versions/version_1_3_2/services.py
@@ -21,8 +21,8 @@ import six
 
 from sahara import exceptions as e
 from sahara.i18n import _
-from sahara.plugins.general import exceptions as ex
-from sahara.plugins.general import utils
+from sahara.plugins import exceptions as ex
+from sahara.plugins import utils
 from sahara.swift import swift_helper as h
 from sahara.topology import topology_helper as th
 
diff --git a/sahara/plugins/hdp/versions/version_1_3_2/versionhandler.py b/sahara/plugins/hdp/versions/version_1_3_2/versionhandler.py
index af07c2e9..4b09a493 100644
--- a/sahara/plugins/hdp/versions/version_1_3_2/versionhandler.py
+++ b/sahara/plugins/hdp/versions/version_1_3_2/versionhandler.py
@@ -26,7 +26,7 @@ from sahara.i18n import _LC
 from sahara.i18n import _LE
 from sahara.i18n import _LI
 from sahara.i18n import _LW
-from sahara.plugins.general import exceptions as ex
+from sahara.plugins import exceptions as ex
 from sahara.plugins.hdp import clusterspec as cs
 from sahara.plugins.hdp import configprovider as cfgprov
 from sahara.plugins.hdp.versions import abstractversionhandler as avm
diff --git a/sahara/plugins/hdp/versions/version_2_0_6/services.py b/sahara/plugins/hdp/versions/version_2_0_6/services.py
index 34ad6cf9..4ed9772d 100644
--- a/sahara/plugins/hdp/versions/version_2_0_6/services.py
+++ b/sahara/plugins/hdp/versions/version_2_0_6/services.py
@@ -23,8 +23,8 @@ from sahara.i18n import _
 from sahara.i18n import _LI
 from sahara.i18n import _LW
 from sahara.openstack.common import log as logging
-from sahara.plugins.general import exceptions as ex
-from sahara.plugins.general import utils
+from sahara.plugins import exceptions as ex
+from sahara.plugins import utils
 from sahara.swift import swift_helper as h
 from sahara.topology import topology_helper as th
 
diff --git a/sahara/plugins/hdp/versions/version_2_0_6/versionhandler.py b/sahara/plugins/hdp/versions/version_2_0_6/versionhandler.py
index b925d740..c5d7e16a 100644
--- a/sahara/plugins/hdp/versions/version_2_0_6/versionhandler.py
+++ b/sahara/plugins/hdp/versions/version_2_0_6/versionhandler.py
@@ -26,7 +26,7 @@ from sahara.i18n import _LC
 from sahara.i18n import _LE
 from sahara.i18n import _LI
 from sahara.i18n import _LW
-from sahara.plugins.general import exceptions as ex
+from sahara.plugins import exceptions as ex
 from sahara.plugins.hdp import clusterspec as cs
 from sahara.plugins.hdp import configprovider as cfgprov
 from sahara.plugins.hdp.versions import abstractversionhandler as avm
diff --git a/sahara/plugins/spark/config_helper.py b/sahara/plugins/spark/config_helper.py
index b37f9657..c9924e1c 100644
--- a/sahara/plugins/spark/config_helper.py
+++ b/sahara/plugins/spark/config_helper.py
@@ -19,8 +19,8 @@ from sahara import conductor as c
 from sahara.i18n import _
 from sahara.i18n import _LI
 from sahara.openstack.common import log as logging
-from sahara.plugins.general import utils
 from sahara.plugins import provisioning as p
+from sahara.plugins import utils
 from sahara.topology import topology_helper as topology
 from sahara.utils import types as types
 from sahara.utils import xmlutils as x
diff --git a/sahara/plugins/spark/plugin.py b/sahara/plugins/spark/plugin.py
index cbac9703..43270a45 100644
--- a/sahara/plugins/spark/plugin.py
+++ b/sahara/plugins/spark/plugin.py
@@ -22,13 +22,13 @@ from sahara import context
 from sahara.i18n import _
 from sahara.i18n import _LI
 from sahara.openstack.common import log as logging
-from sahara.plugins.general import exceptions as ex
-from sahara.plugins.general import utils
+from sahara.plugins import exceptions as ex
 from sahara.plugins import provisioning as p
 from sahara.plugins.spark import config_helper as c_helper
 from sahara.plugins.spark import edp_engine
 from sahara.plugins.spark import run_scripts as run
 from sahara.plugins.spark import scaling as sc
+from sahara.plugins import utils
 from sahara.topology import topology_helper as th
 from sahara.utils import files as f
 from sahara.utils import general as ug
diff --git a/sahara/plugins/spark/scaling.py b/sahara/plugins/spark/scaling.py
index 1fbad1bd..512519d9 100644
--- a/sahara/plugins/spark/scaling.py
+++ b/sahara/plugins/spark/scaling.py
@@ -20,10 +20,10 @@ import six
 
 from sahara import context
 from sahara.i18n import _
-from sahara.plugins.general import exceptions as ex
-from sahara.plugins.general import utils
+from sahara.plugins import exceptions as ex
 from sahara.plugins.spark import config_helper as c_helper
 from sahara.plugins.spark import run_scripts as run
+from sahara.plugins import utils
 from sahara.utils import remote
 
 
diff --git a/sahara/plugins/general/utils.py b/sahara/plugins/utils.py
similarity index 97%
rename from sahara/plugins/general/utils.py
rename to sahara/plugins/utils.py
index fe7a3e83..a3c7e6cf 100644
--- a/sahara/plugins/general/utils.py
+++ b/sahara/plugins/utils.py
@@ -17,7 +17,7 @@ from oslo.utils import netutils
 from six.moves.urllib import parse as urlparse
 
 from sahara.i18n import _
-from sahara.plugins.general import exceptions as ex
+from sahara.plugins import exceptions as ex
 
 
 def get_node_groups(cluster, node_process=None):
diff --git a/sahara/plugins/vanilla/edp_engine.py b/sahara/plugins/vanilla/edp_engine.py
index 2b1939d9..58989a0f 100644
--- a/sahara/plugins/vanilla/edp_engine.py
+++ b/sahara/plugins/vanilla/edp_engine.py
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from sahara.plugins.general import exceptions as ex
-from sahara.plugins.general import utils as u
+from sahara.plugins import exceptions as ex
+from sahara.plugins import utils as u
 from sahara.plugins.vanilla import utils as vu
 from sahara.service.edp.oozie import engine as edp_engine
 
diff --git a/sahara/plugins/vanilla/hadoop2/run_scripts.py b/sahara/plugins/vanilla/hadoop2/run_scripts.py
index 2eff719a..f0db2305 100644
--- a/sahara/plugins/vanilla/hadoop2/run_scripts.py
+++ b/sahara/plugins/vanilla/hadoop2/run_scripts.py
@@ -17,7 +17,7 @@ from sahara import context
 from sahara.i18n import _
 from sahara.i18n import _LI
 from sahara.openstack.common import log as logging
-from sahara.plugins.general import exceptions as ex
+from sahara.plugins import exceptions as ex
 from sahara.plugins.vanilla.hadoop2 import config_helper as c_helper
 from sahara.plugins.vanilla import utils as vu
 from sahara.utils import files
diff --git a/sahara/plugins/vanilla/hadoop2/scaling.py b/sahara/plugins/vanilla/hadoop2/scaling.py
index 7ceae04f..fed47e5c 100644
--- a/sahara/plugins/vanilla/hadoop2/scaling.py
+++ b/sahara/plugins/vanilla/hadoop2/scaling.py
@@ -17,8 +17,8 @@ from oslo.utils import timeutils
 
 from sahara import context
 from sahara.i18n import _
-from sahara.plugins.general import exceptions as ex
-from sahara.plugins.general import utils as u
+from sahara.plugins import exceptions as ex
+from sahara.plugins import utils as u
 from sahara.plugins.vanilla.hadoop2 import config
 from sahara.plugins.vanilla.hadoop2 import run_scripts as run
 from sahara.plugins.vanilla.hadoop2 import utils as pu
diff --git a/sahara/plugins/vanilla/hadoop2/validation.py b/sahara/plugins/vanilla/hadoop2/validation.py
index 6af0d13f..1cddd0d0 100644
--- a/sahara/plugins/vanilla/hadoop2/validation.py
+++ b/sahara/plugins/vanilla/hadoop2/validation.py
@@ -14,8 +14,8 @@
 # limitations under the License.
 
 from sahara.i18n import _
-from sahara.plugins.general import exceptions as ex
-from sahara.plugins.general import utils as u
+from sahara.plugins import exceptions as ex
+from sahara.plugins import utils as u
 from sahara.plugins.vanilla.hadoop2 import config_helper as cu
 from sahara.plugins.vanilla import utils as vu
 from sahara.utils import general as gu
diff --git a/sahara/plugins/vanilla/utils.py b/sahara/plugins/vanilla/utils.py
index c153d1d1..e52d0549 100644
--- a/sahara/plugins/vanilla/utils.py
+++ b/sahara/plugins/vanilla/utils.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from sahara.plugins.general import utils as u
+from sahara.plugins import utils as u
 
 
 def get_namenode(cluster):
diff --git a/sahara/plugins/vanilla/v1_2_1/config_helper.py b/sahara/plugins/vanilla/v1_2_1/config_helper.py
index fba60b9e..850f24ca 100644
--- a/sahara/plugins/vanilla/v1_2_1/config_helper.py
+++ b/sahara/plugins/vanilla/v1_2_1/config_helper.py
@@ -22,8 +22,8 @@ from sahara.i18n import _
 from sahara.i18n import _LI
 from sahara.i18n import _LW
 from sahara.openstack.common import log as logging
-from sahara.plugins.general import utils
 from sahara.plugins import provisioning as p
+from sahara.plugins import utils
 from sahara.plugins.vanilla import utils as vu
 from sahara.plugins.vanilla.v1_2_1 import mysql_helper as m_h
 from sahara.plugins.vanilla.v1_2_1 import oozie_helper as o_h
diff --git a/sahara/plugins/vanilla/v1_2_1/scaling.py b/sahara/plugins/vanilla/v1_2_1/scaling.py
index 5a211376..97c57fe6 100644
--- a/sahara/plugins/vanilla/v1_2_1/scaling.py
+++ b/sahara/plugins/vanilla/v1_2_1/scaling.py
@@ -20,8 +20,8 @@ import six
 
 from sahara import context
 from sahara.i18n import _
-from sahara.plugins.general import exceptions as ex
-from sahara.plugins.general import utils
+from sahara.plugins import exceptions as ex
+from sahara.plugins import utils
 from sahara.plugins.vanilla.v1_2_1 import config_helper
 from sahara.plugins.vanilla.v1_2_1 import run_scripts as run
 from sahara.utils import remote
diff --git a/sahara/plugins/vanilla/v1_2_1/versionhandler.py b/sahara/plugins/vanilla/v1_2_1/versionhandler.py
index a94cafd1..23b25fbc 100644
--- a/sahara/plugins/vanilla/v1_2_1/versionhandler.py
+++ b/sahara/plugins/vanilla/v1_2_1/versionhandler.py
@@ -23,8 +23,8 @@ from sahara import context
 from sahara.i18n import _
 from sahara.i18n import _LI
 from sahara.openstack.common import log as logging
-from sahara.plugins.general import exceptions as ex
-from sahara.plugins.general import utils
+from sahara.plugins import exceptions as ex
+from sahara.plugins import utils
 from sahara.plugins.vanilla import abstractversionhandler as avm
 from sahara.plugins.vanilla import utils as vu
 from sahara.plugins.vanilla.v1_2_1 import config_helper as c_helper
diff --git a/sahara/plugins/vanilla/v2_3_0/versionhandler.py b/sahara/plugins/vanilla/v2_3_0/versionhandler.py
index 28a840af..bb9f2d9e 100644
--- a/sahara/plugins/vanilla/v2_3_0/versionhandler.py
+++ b/sahara/plugins/vanilla/v2_3_0/versionhandler.py
@@ -20,7 +20,7 @@ from sahara import context
 from sahara import exceptions as ex
 from sahara.i18n import _
 from sahara.openstack.common import log as logging
-from sahara.plugins.general import utils
+from sahara.plugins import utils
 from sahara.plugins.vanilla import abstractversionhandler as avm
 from sahara.plugins.vanilla.hadoop2 import config as c
 from sahara.plugins.vanilla.hadoop2 import edp_engine
diff --git a/sahara/plugins/vanilla/v2_4_1/versionhandler.py b/sahara/plugins/vanilla/v2_4_1/versionhandler.py
index 6d5619dc..9c27d7bf 100644
--- a/sahara/plugins/vanilla/v2_4_1/versionhandler.py
+++ b/sahara/plugins/vanilla/v2_4_1/versionhandler.py
@@ -18,7 +18,7 @@ from oslo.config import cfg
 from sahara import conductor
 from sahara import context
 from sahara.openstack.common import log as logging
-from sahara.plugins.general import utils
+from sahara.plugins import utils
 from sahara.plugins.vanilla import abstractversionhandler as avm
 from sahara.plugins.vanilla.hadoop2 import config as c
 from sahara.plugins.vanilla.hadoop2 import edp_engine
diff --git a/sahara/service/edp/hdfs_helper.py b/sahara/service/edp/hdfs_helper.py
index 63435642..5ce5c19d 100644
--- a/sahara/service/edp/hdfs_helper.py
+++ b/sahara/service/edp/hdfs_helper.py
@@ -20,7 +20,7 @@ from six.moves.urllib import parse as urlparse
 
 from sahara import conductor as c
 from sahara import context
-from sahara.plugins.general import utils as u
+from sahara.plugins import utils as u
 from sahara.utils import general as g
 
 
diff --git a/sahara/service/edp/spark/engine.py b/sahara/service/edp/spark/engine.py
index 38536e82..2c3247e7 100644
--- a/sahara/service/edp/spark/engine.py
+++ b/sahara/service/edp/spark/engine.py
@@ -19,8 +19,8 @@ from sahara import conductor as c
 from sahara import context
 from sahara import exceptions as e
 from sahara.i18n import _
-from sahara.plugins.general import utils as plugin_utils
 from sahara.plugins.spark import config_helper as c_helper
+from sahara.plugins import utils as plugin_utils
 from sahara.service.edp import base_engine
 from sahara.service.edp import job_utils
 from sahara.service.validations.edp import job_execution as j
diff --git a/sahara/tests/unit/plugins/general/test_utils.py b/sahara/tests/unit/plugins/general/test_utils.py
index 64d76471..6c314740 100644
--- a/sahara/tests/unit/plugins/general/test_utils.py
+++ b/sahara/tests/unit/plugins/general/test_utils.py
@@ -15,8 +15,8 @@
 
 import testtools
 
-from sahara.plugins.general import exceptions as ex
-from sahara.plugins.general import utils as u
+from sahara.plugins import exceptions as ex
+from sahara.plugins import utils as u
 from sahara.tests.unit import testutils as tu
 
 
diff --git a/sahara/tests/unit/plugins/hdp/test_ambariplugin.py b/sahara/tests/unit/plugins/hdp/test_ambariplugin.py
index 95b7ebd5..d07a014f 100644
--- a/sahara/tests/unit/plugins/hdp/test_ambariplugin.py
+++ b/sahara/tests/unit/plugins/hdp/test_ambariplugin.py
@@ -19,7 +19,7 @@ import testtools
 
 from sahara.conductor import resource as r
 from sahara.plugins import base as pb
-from sahara.plugins.general import exceptions as ex
+from sahara.plugins import exceptions as ex
 from sahara.plugins.hdp import ambariplugin as ap
 from sahara.plugins.hdp import clusterspec as cs
 from sahara.tests.unit import base as sahara_base
diff --git a/sahara/tests/unit/plugins/hdp/test_clusterspec.py b/sahara/tests/unit/plugins/hdp/test_clusterspec.py
index 4a6b2eef..6267503f 100644
--- a/sahara/tests/unit/plugins/hdp/test_clusterspec.py
+++ b/sahara/tests/unit/plugins/hdp/test_clusterspec.py
@@ -16,7 +16,7 @@
 import mock
 import pkg_resources as pkg
 
-from sahara.plugins.general import exceptions as ex
+from sahara.plugins import exceptions as ex
 from sahara.plugins.hdp import clusterspec as cs
 from sahara.plugins.hdp import hadoopserver
 from sahara.plugins.hdp.versions.version_1_3_2 import services as s
diff --git a/sahara/tests/unit/plugins/hdp/test_clusterspec_hdp2.py b/sahara/tests/unit/plugins/hdp/test_clusterspec_hdp2.py
index c5e864a4..2820eca7 100644
--- a/sahara/tests/unit/plugins/hdp/test_clusterspec_hdp2.py
+++ b/sahara/tests/unit/plugins/hdp/test_clusterspec_hdp2.py
@@ -16,7 +16,7 @@
 import mock
 import pkg_resources as pkg
 
-from sahara.plugins.general import exceptions as ex
+from sahara.plugins import exceptions as ex
 from sahara.plugins.hdp import clusterspec as cs
 from sahara.plugins.hdp.versions.version_2_0_6 import services as s2
 from sahara.plugins import provisioning
diff --git a/sahara/tests/unit/plugins/hdp/test_services.py b/sahara/tests/unit/plugins/hdp/test_services.py
index a5dd4de2..b9b58e9b 100644
--- a/sahara/tests/unit/plugins/hdp/test_services.py
+++ b/sahara/tests/unit/plugins/hdp/test_services.py
@@ -16,7 +16,7 @@
 import mock
 
 from sahara import exceptions as e
-from sahara.plugins.general import exceptions as ex
+from sahara.plugins import exceptions as ex
 from sahara.plugins.hdp.versions import versionhandlerfactory as vhf
 from sahara.tests.unit import base
 from sahara.tests.unit.plugins.hdp import hdp_test_base
diff --git a/sahara/tests/unit/plugins/vanilla/hadoop2/test_validation.py b/sahara/tests/unit/plugins/vanilla/hadoop2/test_validation.py
index a0095761..b2c3197e 100644
--- a/sahara/tests/unit/plugins/vanilla/hadoop2/test_validation.py
+++ b/sahara/tests/unit/plugins/vanilla/hadoop2/test_validation.py
@@ -15,7 +15,7 @@
 
 import testtools
 
-from sahara.plugins.general import exceptions as ex
+from sahara.plugins import exceptions as ex
 from sahara.plugins.vanilla import plugin as p
 from sahara.tests.unit import base
 from sahara.tests.unit import testutils as tu
diff --git a/sahara/tests/unit/plugins/vanilla/v1_2_1/test_plugin.py b/sahara/tests/unit/plugins/vanilla/v1_2_1/test_plugin.py
index f3501515..88d8ab88 100644
--- a/sahara/tests/unit/plugins/vanilla/v1_2_1/test_plugin.py
+++ b/sahara/tests/unit/plugins/vanilla/v1_2_1/test_plugin.py
@@ -20,7 +20,7 @@ from sahara import conductor as cond
 from sahara import context
 from sahara import exceptions as e
 from sahara.plugins import base as pb
-from sahara.plugins.general import exceptions as ex
+from sahara.plugins import exceptions as ex
 from sahara.plugins.vanilla import plugin as p
 from sahara.plugins.vanilla.v1_2_1 import config_helper as c_h
 from sahara.plugins.vanilla.v1_2_1 import mysql_helper as m_h
diff --git a/sahara/tests/unit/service/edp/spark/test_spark.py b/sahara/tests/unit/service/edp/spark/test_spark.py
index 8856e7d7..56a34cc4 100644
--- a/sahara/tests/unit/service/edp/spark/test_spark.py
+++ b/sahara/tests/unit/service/edp/spark/test_spark.py
@@ -315,7 +315,7 @@ class TestSpark(base.SaharaTestCase):
                               "/wfdir/jar2.jar"])
     @mock.patch('sahara.service.edp.job_utils.create_workflow_dir',
                 return_value="/wfdir")
-    @mock.patch('sahara.plugins.general.utils.get_instance')
+    @mock.patch('sahara.plugins.utils.get_instance')
     @mock.patch('sahara.conductor.API.job_get')
     @mock.patch('sahara.context.ctx', return_value="ctx")
     def test_run_job(self, ctx, job_get, get_instance, create_workflow_dir,