diff --git a/sonic-xcvrd/setup.py b/sonic-xcvrd/setup.py
index cd4ff5c2e41f..dfb3fa508654 100644
--- a/sonic-xcvrd/setup.py
+++ b/sonic-xcvrd/setup.py
@@ -1,4 +1,4 @@
-from setuptools import setup
+from setuptools import setup, find_packages
 
 setup(
     name = 'sonic-xcvrd',
@@ -10,9 +10,10 @@
     url = 'https://github.com/Azure/sonic-platform-daemons',
     maintainer = 'Kebo Liu',
     maintainer_email = 'kebol@mellanox.com',
+    packages = find_packages(),
     entry_points = {
         'console_scripts': [
-            'xcvrd = src.xcvrd:main',
+            'xcvrd = xcvrd.xcvrd:main',
         ]
     },
     install_requires = [
diff --git a/sonic-xcvrd/src/__init__.py b/sonic-xcvrd/xcvrd/__init__.py
similarity index 100%
rename from sonic-xcvrd/src/__init__.py
rename to sonic-xcvrd/xcvrd/__init__.py
diff --git a/sonic-xcvrd/src/xcvrd.py b/sonic-xcvrd/xcvrd/xcvrd.py
similarity index 100%
rename from sonic-xcvrd/src/xcvrd.py
rename to sonic-xcvrd/xcvrd/xcvrd.py
diff --git a/sonic-xcvrd/src/xcvrd_utilities/__init__.py b/sonic-xcvrd/xcvrd/xcvrd_utilities/__init__.py
similarity index 100%
rename from sonic-xcvrd/src/xcvrd_utilities/__init__.py
rename to sonic-xcvrd/xcvrd/xcvrd_utilities/__init__.py
diff --git a/sonic-xcvrd/src/xcvrd_utilities/y_cable_helper.py b/sonic-xcvrd/xcvrd/xcvrd_utilities/y_cable_helper.py
similarity index 100%
rename from sonic-xcvrd/src/xcvrd_utilities/y_cable_helper.py
rename to sonic-xcvrd/xcvrd/xcvrd_utilities/y_cable_helper.py