diff --git a/requirements.txt b/requirements.txt
index 8465dd717c..d99f874f98 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,32 +12,32 @@
 # for more details please refer to official Python documentation, see
 # https://www.python.org/dev/peps/pep-0440/#version-specifiers
 
-Cheetah3~=3.2.6.post2         # wmagent,reqmgr2,reqmon
-CherryPy~=17.4.0              # wmagent,wmagent-devtools,reqmgr2,reqmon,global-workqueue,reqmgr2ms
-CMSCouchapp~=1.3.4            # wmagent
-CMSMonitoring~=0.3.4          # wmagent,reqmgr2,reqmon,global-workqueue,reqmgr2ms
-coverage~=5.4                 # wmagent,wmagent-devtools
-cx-Oracle~=7.3.0              # wmagent
-dbs3-client~=4.0.7            # wmagent,reqmgr2,reqmon,global-workqueue
-future~=0.18.2                # wmagent,wmagent-devtools,reqmgr2,reqmon,acdcserver,global-workqueue,reqmgr2ms
-gfal2-python~=1.11.0.post3    # reqmgr2ms
-httplib2~=0.19.0              # wmagent,reqmgr2,reqmon,acdcserver,global-workqueue,reqmgr2ms
-htcondor~=8.9.7               # wmagent
-Jinja2~=3.0.1                 # wmagent
-memory-profiler~=0.58.0       # wmagent-devtools
-mock~=4.0.3                   # wmagent,wmagent-devtools
-mox3~=1.1.0                   # wmagent-devtools
-mysqlclient~=2.0.3            # wmagent
-nose~=1.3.7                   # wmagent-devtools
-nose2~=0.10.0                 # wmagent-devtools
-pep8~=1.7.1                   # wmagent-devtools
-psutil~=5.8.0                 # wmagent,wmagent-devtools,reqmgr2,reqmon,global-workqueue
-pycurl~=7.43.0.6              # wmagent,reqmgr2,reqmon,global-workqueue,reqmgr2ms
-pylint~=2.7.0                 # wmagent-devtools
-pymongo~=4.0.1                # wmagent-devtools,reqmgr2ms
-pyOpenSSL~=18.0.0             # wmagent
-pyzmq~=19.0.2                 # wmagent
-retry~=0.9.2                  # wmagent,wmagent-devtools,reqmgr2,reqmon,global-workqueue,reqmgr2ms
-rucio-clients~=1.25.5         # wmagent,global-workqueue,reqmgr2ms
-Sphinx~=4.0.3                 # wmagent,wmagent-devtools,reqmgr2,reqmon,acdcserver,global-workqueue,reqmgr2ms
-SQLAlchemy~=1.3.3             # wmagent
+Cheetah3~=3.2.6.post2         # wmcore,wmagent,reqmgr2,reqmon
+CherryPy~=17.4.0              # wmcore,wmagent,wmagent-devtools,reqmgr2,reqmon,global-workqueue,reqmgr2ms
+CMSCouchapp~=1.3.4            # wmcore,wmagent
+CMSMonitoring~=0.3.4          # wmcore,wmagent,reqmgr2,reqmon,global-workqueue,reqmgr2ms
+coverage~=5.4                 # wmcore,wmagent,wmagent-devtools
+cx-Oracle~=7.3.0              # wmcore,wmagent
+dbs3-client~=4.0.7            # wmcore,wmagent,reqmgr2,reqmon,global-workqueue
+future~=0.18.2                # wmcore,wmagent,wmagent-devtools,reqmgr2,reqmon,acdcserver,global-workqueue,reqmgr2ms
+gfal2-python~=1.11.0.post3    # wmcore,reqmgr2ms
+httplib2~=0.19.0              # wmcore,wmagent,reqmgr2,reqmon,acdcserver,global-workqueue,reqmgr2ms
+htcondor~=8.9.7               # wmcore,wmagent
+Jinja2~=3.0.1                 # wmcore,wmagent
+memory-profiler~=0.58.0       # wmcore,wmagent-devtools
+mock~=4.0.3                   # wmcore,wmagent,wmagent-devtools
+mox3~=1.1.0                   # wmcore,wmagent-devtools
+mysqlclient~=2.0.3            # wmcore,wmagent
+nose~=1.3.7                   # wmcore,wmagent-devtools
+nose2~=0.10.0                 # wmcore,wmagent-devtools
+pep8~=1.7.1                   # wmcore,wmagent-devtools
+psutil~=5.8.0                 # wmcore,wmagent,wmagent-devtools,reqmgr2,reqmon,global-workqueue
+pycurl~=7.43.0.6              # wmcore,wmagent,reqmgr2,reqmon,global-workqueue,reqmgr2ms
+pylint~=2.7.0                 # wmcore,wmagent-devtools
+pymongo~=4.0.1                # wmcore,wmagent-devtools,reqmgr2ms
+pyOpenSSL~=18.0.0             # wmcore,wmagent
+pyzmq~=19.0.2                 # wmcore,wmagent
+retry~=0.9.2                  # wmcore,wmagent,wmagent-devtools,reqmgr2,reqmon,global-workqueue,reqmgr2ms
+rucio-clients~=1.25.5         # wmcore,wmagent,global-workqueue,reqmgr2ms
+Sphinx~=4.0.3                 # wmcore,wmagent,wmagent-devtools,reqmgr2,reqmon,acdcserver,global-workqueue,reqmgr2ms
+SQLAlchemy~=1.3.3             # wmcore,wmagent
diff --git a/setup_dependencies.py b/setup_dependencies.py
index cac2fb186a..56204779ef 100644
--- a/setup_dependencies.py
+++ b/setup_dependencies.py
@@ -59,7 +59,8 @@
                     'src/html+',
                     'src/javascript+',
                     'src/templates+',
-                    'etc+'
+                    'etc+',
+                    'bin+'
                     ],
     },
     'wmagent-devtools': {