diff --git a/apps/cli/executables/vlba_grabber/__init__.py b/apps/cli/executables/vlba_grabber/README.md
similarity index 100%
rename from apps/cli/executables/vlba_grabber/__init__.py
rename to apps/cli/executables/vlba_grabber/README.md
diff --git a/apps/cli/executables/vlba_grabber/setup.py b/apps/cli/executables/vlba_grabber/setup.py
new file mode 100644
index 0000000000000000000000000000000000000000..287ab64787dae5858d889da1b4716b4f0fe05aeb
--- /dev/null
+++ b/apps/cli/executables/vlba_grabber/setup.py
@@ -0,0 +1,29 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+from pathlib import Path
+from setuptools import setup, find_packages
+
+VERSION = open('src/vlba_grabber/_version.py').readlines()[-1].split()[-1].strip("\"'")
+README = Path('README.md').read_text()
+
+setup(
+    name=Path().absolute().name,
+    version=VERSION,
+    description='NRAO Archive VLBA Grabber',
+    long_description=README,
+    author='NRAO SSA Team',
+    author_email='dms-ssa@nrao.edu',
+    url='TBD',
+    license="GPL",
+    install_requires=['requests', 'pymygdala', 'pycapo', 'beautifulsoup4'],
+    keywords=[],
+    packages=['vlba_grabber'],
+    package_dir={'':'src'},
+    classifiers=[
+        'Programming Language :: Python :: 3.8'
+    ],
+    entry_points={
+        'console_scripts': ['aocRetriever = vlba_grabber.ngas_retriever:ngas_retriever']
+    },
+)
diff --git a/apps/cli/executables/weblog_thumbs/__init__.py b/apps/cli/executables/vlba_grabber/src/vlba_grabber/__init__.py
similarity index 100%
rename from apps/cli/executables/weblog_thumbs/__init__.py
rename to apps/cli/executables/vlba_grabber/src/vlba_grabber/__init__.py
diff --git a/apps/cli/executables/vlba_grabber/src/vlba_grabber/_version.py b/apps/cli/executables/vlba_grabber/src/vlba_grabber/_version.py
new file mode 100644
index 0000000000000000000000000000000000000000..e63ec3a147fc65f8e390ff413a349d66169f8ec1
--- /dev/null
+++ b/apps/cli/executables/vlba_grabber/src/vlba_grabber/_version.py
@@ -0,0 +1,2 @@
+""" Version information for this package, don't put anything else here. """
+___version___ = '4.0a1.dev1'
diff --git a/apps/cli/executables/vlba_grabber/ngas_retriever.py b/apps/cli/executables/vlba_grabber/src/vlba_grabber/ngas_retriever.py
similarity index 98%
rename from apps/cli/executables/vlba_grabber/ngas_retriever.py
rename to apps/cli/executables/vlba_grabber/src/vlba_grabber/ngas_retriever.py
index 8f15c23f19625798ff85c54fb8e42240fae4c757..db9040c44342729d03dafb626c24b1375f52a37c 100644
--- a/apps/cli/executables/vlba_grabber/ngas_retriever.py
+++ b/apps/cli/executables/vlba_grabber/src/vlba_grabber/ngas_retriever.py
@@ -12,8 +12,8 @@ import argparse as ap
 import logging
 import logging.handlers
 
-from pyat import version
-from pyat.pymygdala import LogHandler
+from _version import ___version___ as version
+from pymygdala import LogHandler
 from pycapo import CapoConfig
 from bs4 import BeautifulSoup
 
diff --git a/apps/cli/executables/weblog_thumbs/README.md b/apps/cli/executables/weblog_thumbs/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/apps/cli/executables/weblog_thumbs/setup.py b/apps/cli/executables/weblog_thumbs/setup.py
new file mode 100644
index 0000000000000000000000000000000000000000..d2a34103eeac80b00f36c9357230f4c99fa70a50
--- /dev/null
+++ b/apps/cli/executables/weblog_thumbs/setup.py
@@ -0,0 +1,29 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+from pathlib import Path
+from setuptools import setup, find_packages
+
+VERSION = open('src/weblog_thumbs/_version.py').readlines()[-1].split()[-1].strip("\"'")
+README = Path('README.md').read_text()
+
+setup(
+    name=Path().absolute().name,
+    version=VERSION,
+    description='NRAO Archive Weblog Thumbs',
+    long_description=README,
+    author='NRAO SSA Team',
+    author_email='dms-ssa@nrao.edu',
+    url='TBD',
+    license="GPL",
+    install_requires=['pymygdala'],
+    keywords=[],
+    packages=['weblog_thumbs'],
+    package_dir={'':'src'},
+    classifiers=[
+        'Programming Language :: Python :: 3.8'
+    ],
+    entry_points={
+        'console_scripts': ['findThumbnail = weblog_thumbs.thumbnail_finder:weblog_raid']
+    },
+)
diff --git a/apps/cli/executables/weblog_thumbs/src/weblog_thumbs/__init__.py b/apps/cli/executables/weblog_thumbs/src/weblog_thumbs/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/apps/cli/executables/weblog_thumbs/src/weblog_thumbs/_version.py b/apps/cli/executables/weblog_thumbs/src/weblog_thumbs/_version.py
new file mode 100644
index 0000000000000000000000000000000000000000..e63ec3a147fc65f8e390ff413a349d66169f8ec1
--- /dev/null
+++ b/apps/cli/executables/weblog_thumbs/src/weblog_thumbs/_version.py
@@ -0,0 +1,2 @@
+""" Version information for this package, don't put anything else here. """
+___version___ = '4.0a1.dev1'
diff --git a/apps/cli/executables/weblog_thumbs/thumbnail_finder.py b/apps/cli/executables/weblog_thumbs/src/weblog_thumbs/thumbnail_finder.py
similarity index 97%
rename from apps/cli/executables/weblog_thumbs/thumbnail_finder.py
rename to apps/cli/executables/weblog_thumbs/src/weblog_thumbs/thumbnail_finder.py
index 94e7e75745eb6e92eb5c16b28cea7ffdaaa86371..a89848b0cd228941b5bd9b8f648283fcbb4198d4 100644
--- a/apps/cli/executables/weblog_thumbs/thumbnail_finder.py
+++ b/apps/cli/executables/weblog_thumbs/src/weblog_thumbs/thumbnail_finder.py
@@ -3,9 +3,9 @@ import sys
 import logging
 import logging.handlers
 import argparse as ap
-from pyat import version
-from pyat.pymygdala import LogHandler
-from pyat.weblog_thumbs.weblogUtil import Weblog
+from ._version import ___version___ as version
+from pymygdala import LogHandler
+from .weblogUtil import Weblog
 
 # Global logger access:
 logger = logging.getLogger("thumbnail_cheater")
diff --git a/apps/cli/executables/weblog_thumbs/weblogUtil.py b/apps/cli/executables/weblog_thumbs/src/weblog_thumbs/weblogUtil.py
similarity index 100%
rename from apps/cli/executables/weblog_thumbs/weblogUtil.py
rename to apps/cli/executables/weblog_thumbs/src/weblog_thumbs/weblogUtil.py
diff --git a/environment.yml b/environment.yml
index 861bc1776c97e301b30ebe6afd24e09314918865..4dfeddc728ab5e6383f7564d602364614f478938 100644
--- a/environment.yml
+++ b/environment.yml
@@ -25,3 +25,4 @@ dependencies:
   - blessings=1.7
   - pytest=5.4
   - simplejson=3.17
+  - beautifulsoup4=4.9
\ No newline at end of file