diff --git a/etc/neutron/plugins/mlnx/mlnx_conf.ini b/etc/neutron/plugins/mlnx/mlnx_conf.ini
index 552971aed11..1eb7c7c6ddd 100644
--- a/etc/neutron/plugins/mlnx/mlnx_conf.ini
+++ b/etc/neutron/plugins/mlnx/mlnx_conf.ini
@@ -9,9 +9,6 @@
 # physical_interface_mappings =
 # Example: physical_interface_mappings = default:eth2
 
-# (StrOpt) Type of Network Interface to allocate for VM:
-# direct or hosdev according to libvirt terminology
-# vnic_type = mlnx_direct
 
 # (StrOpt) Eswitch daemon end point connection url
 # daemon_endpoint = 'tcp://127.0.0.1:60001'
diff --git a/neutron/cmd/eventlet/plugins/mlnx_neutron_agent.py b/neutron/cmd/eventlet/plugins/mlnx_neutron_agent.py
new file mode 100644
index 00000000000..5a3394a1cb0
--- /dev/null
+++ b/neutron/cmd/eventlet/plugins/mlnx_neutron_agent.py
@@ -0,0 +1,19 @@
+#    Copyright 2015 Mellanox Technologies, Ltd
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, 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.
+
+from neutron.plugins.ml2.drivers.mlnx.agent import eswitch_neutron_agent
+
+
+def main():
+    eswitch_neutron_agent.main()
diff --git a/neutron/plugins/mlnx/README b/neutron/plugins/ml2/drivers/mlnx/README
similarity index 50%
rename from neutron/plugins/mlnx/README
rename to neutron/plugins/ml2/drivers/mlnx/README
index e94c5216a1c..10fcabae917 100644
--- a/neutron/plugins/mlnx/README
+++ b/neutron/plugins/ml2/drivers/mlnx/README
@@ -1,4 +1,4 @@
-The Neutron Mellanox plugin has removed from the tree in Kilo.
+The Neutron Mellanox plugin has been removed from the tree in Kilo.
 This directory includes Mellanox L2 agent for MLNX mechanism driver.
 For more details, please refer to the following link:
 https://wiki.openstack.org/wiki/Mellanox-Neutron-ML2
\ No newline at end of file
diff --git a/neutron/plugins/mlnx/__init__.py b/neutron/plugins/ml2/drivers/mlnx/agent/__init__.py
similarity index 100%
rename from neutron/plugins/mlnx/__init__.py
rename to neutron/plugins/ml2/drivers/mlnx/agent/__init__.py
diff --git a/neutron/plugins/mlnx/agent/config.py b/neutron/plugins/ml2/drivers/mlnx/agent/config.py
similarity index 87%
rename from neutron/plugins/mlnx/agent/config.py
rename to neutron/plugins/ml2/drivers/mlnx/agent/config.py
index 341553834ec..3a022a9bbb3 100644
--- a/neutron/plugins/mlnx/agent/config.py
+++ b/neutron/plugins/ml2/drivers/mlnx/agent/config.py
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from networking_mlnx.plugins.mlnx.agent import constants
 from oslo_config import cfg
 
 from neutron.agent.common import config
@@ -24,10 +23,6 @@ eswitch_opts = [
     cfg.ListOpt('physical_interface_mappings',
                 default=DEFAULT_INTERFACE_MAPPINGS,
                 help=_("List of <physical_network>:<physical_interface>")),
-    cfg.StrOpt('vnic_type',
-               default=constants.VIF_TYPE_DIRECT,
-               choices=(constants.VIF_TYPE_DIRECT, constants.VIF_TYPE_HOSTDEV),
-               help=_("Type of VM network interface")),
     cfg.StrOpt('daemon_endpoint',
                default='tcp://127.0.0.1:60001',
                help=_('eswitch daemon end point')),
diff --git a/neutron/plugins/mlnx/agent/eswitch_neutron_agent.py b/neutron/plugins/ml2/drivers/mlnx/agent/eswitch_neutron_agent.py
similarity index 91%
rename from neutron/plugins/mlnx/agent/eswitch_neutron_agent.py
rename to neutron/plugins/ml2/drivers/mlnx/agent/eswitch_neutron_agent.py
index 688d7bebf20..046c495e35f 100644
--- a/neutron/plugins/mlnx/agent/eswitch_neutron_agent.py
+++ b/neutron/plugins/ml2/drivers/mlnx/agent/eswitch_neutron_agent.py
@@ -16,14 +16,15 @@
 
 import sys
 
-from networking_mlnx.plugins.mlnx.agent import mlnx_eswitch_neutron_agent
+from networking_mlnx.plugins.ml2.drivers.mlnx.agent import (
+    mlnx_eswitch_neutron_agent)
 from oslo_config import cfg
 from oslo_log import log as logging
 
 from neutron.i18n import _LE, _LI
 from neutron.common import config as common_config
 from neutron.common import utils
-from neutron.plugins.mlnx.agent import config  # noqa
+from neutron.plugins.ml2.drivers.mlnx.agent import config  # noqa
 
 LOG = logging.getLogger(__name__)
 
diff --git a/neutron/plugins/ml2/drivers/mlnx/requirements.txt b/neutron/plugins/ml2/drivers/mlnx/requirements.txt
index 0165a4cb7db..dacc9e91038 100644
--- a/neutron/plugins/ml2/drivers/mlnx/requirements.txt
+++ b/neutron/plugins/ml2/drivers/mlnx/requirements.txt
@@ -1,6 +1 @@
-# The order of packages is significant, because pip processes them in the
-# order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-
 networking_mlnx
diff --git a/neutron/plugins/mlnx/agent/__init__.py b/neutron/plugins/mlnx/agent/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/setup.cfg b/setup.cfg
index 126fa549deb..a446c015e00 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -96,7 +96,7 @@ console_scripts =
     neutron-l3-agent = neutron.cmd.eventlet.agents.l3:main
     neutron-linuxbridge-agent = neutron.plugins.linuxbridge.agent.linuxbridge_neutron_agent:main
     neutron-metadata-agent = neutron.cmd.eventlet.agents.metadata:main
-    neutron-mlnx-agent = neutron.plugins.mlnx.agent.eswitch_neutron_agent:main
+    neutron-mlnx-agent = neutron.cmd.eventlet.plugins.mlnx_neutron_agent:main
     neutron-nec-agent = neutron.cmd.eventlet.plugins.nec_neutron_agent:main
     neutron-netns-cleanup = neutron.cmd.netns_cleanup:main
     neutron-ns-metadata-proxy = neutron.cmd.eventlet.agents.metadata_proxy:main