diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
index 1642027..3bca0ab 100644
--- a/.github/workflows/linters.yml
+++ b/.github/workflows/linters.yml
@@ -30,7 +30,10 @@ jobs:
             pip install mypy
         - name: Run mypy on bashi source code
           run: |
-            mypy bashi
+            mypy src/bashi
+        - name: Run mypy on bashi-validate
+          run: |
+            mypy src/bashiValidate/validate.py
         - name: Run mypy on example
           run: |
             mypy example
@@ -56,7 +59,10 @@ jobs:
             pip install pylint
         - name: Run pylint on bashi source code
           run: |
-            pylint bashi
+            pylint src/bashi
+        - name: Run pylint on bashi-validate
+          run: |
+            pylint src/bashiValidate/validate.py
         - name: Run pylint on example
           run: |
             pylint example/example.py
diff --git a/pyproject.toml b/pyproject.toml
index 22cf465..44fe427 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -31,7 +31,7 @@ dependencies = [
 [project.scripts]
 # creates a python script named bashi-validate
 # in principal, the script does the following: from bashi.validate import main; main()
-bashi-validate = "bashi.validate:main"
+bashi-validate = "bashiValidate.validate:main"
 
 [tool.setuptools.dynamic]
 version = {file = "version.txt"}
@@ -44,7 +44,7 @@ Issues = "https://github.com/alpaka-group/bashi/issues"
 [tool.coverage.run]
 command_line = "-m unittest discover -s tests/"
 branch = true
-source = ["bashi"]
+source = ["src/bashi"]
 
 [tool.black]
 line-length = 100
diff --git a/bashi/__init__.py b/src/bashi/__init__.py
similarity index 100%
rename from bashi/__init__.py
rename to src/bashi/__init__.py
diff --git a/bashi/filter_backend.py b/src/bashi/filter_backend.py
similarity index 100%
rename from bashi/filter_backend.py
rename to src/bashi/filter_backend.py
diff --git a/bashi/filter_chain.py b/src/bashi/filter_chain.py
similarity index 100%
rename from bashi/filter_chain.py
rename to src/bashi/filter_chain.py
diff --git a/bashi/filter_compiler.py b/src/bashi/filter_compiler.py
similarity index 100%
rename from bashi/filter_compiler.py
rename to src/bashi/filter_compiler.py
diff --git a/bashi/filter_software_dependency.py b/src/bashi/filter_software_dependency.py
similarity index 100%
rename from bashi/filter_software_dependency.py
rename to src/bashi/filter_software_dependency.py
diff --git a/bashi/generator.py b/src/bashi/generator.py
similarity index 100%
rename from bashi/generator.py
rename to src/bashi/generator.py
diff --git a/bashi/globals.py b/src/bashi/globals.py
similarity index 100%
rename from bashi/globals.py
rename to src/bashi/globals.py
diff --git a/src/bashi/py.typed b/src/bashi/py.typed
new file mode 100644
index 0000000..e69de29
diff --git a/bashi/results.py b/src/bashi/results.py
similarity index 100%
rename from bashi/results.py
rename to src/bashi/results.py
diff --git a/bashi/types.py b/src/bashi/types.py
similarity index 100%
rename from bashi/types.py
rename to src/bashi/types.py
diff --git a/bashi/utils.py b/src/bashi/utils.py
similarity index 100%
rename from bashi/utils.py
rename to src/bashi/utils.py
diff --git a/bashi/versions.py b/src/bashi/versions.py
similarity index 100%
rename from bashi/versions.py
rename to src/bashi/versions.py
diff --git a/bashi/validate.py b/src/bashiValidate/validate.py
similarity index 99%
rename from bashi/validate.py
rename to src/bashiValidate/validate.py
index 6885095..48c6a08 100644
--- a/bashi/validate.py
+++ b/src/bashiValidate/validate.py
@@ -5,7 +5,7 @@
 import argparse
 from argparse import ArgumentParser, Namespace
 
-from typing import Sequence, Any, Callable, Optional, IO, Dict, NamedTuple
+from typing import Sequence, Any, Callable, Optional, IO, Dict, NamedTuple, List
 from collections import OrderedDict
 import io
 import sys