diff --git a/src/sonic-bgpcfgd/bgpmon/__init__.py b/src/sonic-bgpcfgd/bgpmon/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/sonic-bgpcfgd/bgpmon.py b/src/sonic-bgpcfgd/bgpmon/bgpmon.py
similarity index 100%
rename from src/sonic-bgpcfgd/bgpmon.py
rename to src/sonic-bgpcfgd/bgpmon/bgpmon.py
diff --git a/src/sonic-bgpcfgd/setup.py b/src/sonic-bgpcfgd/setup.py
index 2f485592c712..29d441e09a66 100755
--- a/src/sonic-bgpcfgd/setup.py
+++ b/src/sonic-bgpcfgd/setup.py
@@ -12,7 +12,7 @@
       scripts=['bgpcfgd'],
       entry_points={
           'console_scripts': [
-              'bgpmon = bgpmon:main',
+              'bgpmon = bgpmon.bgpmon:main',
           ]
       },
       install_requires=['jinja2>=2.10', 'netaddr', 'pyyaml'],