diff --git a/justfile b/justfile
index 82a3b2e..df19356 100644
--- a/justfile
+++ b/justfile
@@ -4,11 +4,8 @@ publish:
     git diff-index --quiet HEAD
     # assert we are on main
     git branch --show-current | grep '^main$'
-    # remove any previous builds
     rm -rf dist rdkit-stubs.egg-info
-    # build
     pyproject-build # pipx install build
-    # upload
     twine upload dist/* # pipx install twine
 
 test:
diff --git a/pyproject.toml b/pyproject.toml
index 26eb523..9503d2f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,27 +1,26 @@
-[tool.poetry]
+[project]
 name = "rdkit-stubs"
 version = "0.8"
-description = "type stubs for rdkit"
+requires-python = ">=3.10"
 authors = [
-  "Andrew Dirksen <andrew@dirksen.com>",
-  "Ryan Rightmer <rrightmer@gmail.com>",
-  "K. Yanagisawa (https://github.com/keisuke-yanagisawa)",
+  { name = "Andrew Dirksen", email = "andrew@dirksen.com" },
+  { name = "Ryan Rightmer", email = "rrightmer@gmail.com" },
+  { name = "K. Yanagisawa" },
 ]
-license = "MIT OR Apache-2.0"
+description = "type stubs for rdkit"
 readme = "README.md"
-homepage = "https://github.com/postera-ai/rdkit-stubs"
+license = { text = "MIT OR Apache-2.0" }
 keywords = ["stubs", "rdkit", "typing"]
 classifiers = [
   "Development Status :: 1 - Planning",
   "Typing :: Stubs Only",
   "Programming Language :: Python :: 3.10",
 ]
-packages = [{ include = "rdkit-stubs" }]
-include = ["rdkit-stubs/**/*.pyi"]
+urls.Homepage = "https://github.com/postera-ai/rdkit-stubs"
 
-[tool.poetry.dependencies]
-python = "^3.10"
+[tool.setuptools.package-data]
+"*" = ["*.pyi"]
 
 [build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta"
diff --git a/rdkit-stubs/Avalon/__init__.pyi b/src/rdkit-stubs/Avalon/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Avalon/__init__.pyi
rename to src/rdkit-stubs/Avalon/__init__.pyi
diff --git a/rdkit-stubs/Avalon/pyAvalonTools.pyi b/src/rdkit-stubs/Avalon/pyAvalonTools.pyi
similarity index 100%
rename from rdkit-stubs/Avalon/pyAvalonTools.pyi
rename to src/rdkit-stubs/Avalon/pyAvalonTools.pyi
diff --git a/rdkit-stubs/Chem/AllChem.pyi b/src/rdkit-stubs/Chem/AllChem.pyi
similarity index 100%
rename from rdkit-stubs/Chem/AllChem.pyi
rename to src/rdkit-stubs/Chem/AllChem.pyi
diff --git a/rdkit-stubs/Chem/AtomPairs/Pairs.pyi b/src/rdkit-stubs/Chem/AtomPairs/Pairs.pyi
similarity index 100%
rename from rdkit-stubs/Chem/AtomPairs/Pairs.pyi
rename to src/rdkit-stubs/Chem/AtomPairs/Pairs.pyi
diff --git a/rdkit-stubs/Chem/AtomPairs/Sheridan.pyi b/src/rdkit-stubs/Chem/AtomPairs/Sheridan.pyi
similarity index 100%
rename from rdkit-stubs/Chem/AtomPairs/Sheridan.pyi
rename to src/rdkit-stubs/Chem/AtomPairs/Sheridan.pyi
diff --git a/rdkit-stubs/Chem/AtomPairs/Torsions.pyi b/src/rdkit-stubs/Chem/AtomPairs/Torsions.pyi
similarity index 100%
rename from rdkit-stubs/Chem/AtomPairs/Torsions.pyi
rename to src/rdkit-stubs/Chem/AtomPairs/Torsions.pyi
diff --git a/rdkit-stubs/Chem/AtomPairs/Utils.pyi b/src/rdkit-stubs/Chem/AtomPairs/Utils.pyi
similarity index 100%
rename from rdkit-stubs/Chem/AtomPairs/Utils.pyi
rename to src/rdkit-stubs/Chem/AtomPairs/Utils.pyi
diff --git a/rdkit-stubs/Chem/AtomPairs/__init__.pyi b/src/rdkit-stubs/Chem/AtomPairs/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Chem/AtomPairs/__init__.pyi
rename to src/rdkit-stubs/Chem/AtomPairs/__init__.pyi
diff --git a/rdkit-stubs/Chem/BRICS.pyi b/src/rdkit-stubs/Chem/BRICS.pyi
similarity index 100%
rename from rdkit-stubs/Chem/BRICS.pyi
rename to src/rdkit-stubs/Chem/BRICS.pyi
diff --git a/rdkit-stubs/Chem/BuildFragmentCatalog.pyi b/src/rdkit-stubs/Chem/BuildFragmentCatalog.pyi
similarity index 100%
rename from rdkit-stubs/Chem/BuildFragmentCatalog.pyi
rename to src/rdkit-stubs/Chem/BuildFragmentCatalog.pyi
diff --git a/rdkit-stubs/Chem/ChemUtils/AlignDepict.pyi b/src/rdkit-stubs/Chem/ChemUtils/AlignDepict.pyi
similarity index 100%
rename from rdkit-stubs/Chem/ChemUtils/AlignDepict.pyi
rename to src/rdkit-stubs/Chem/ChemUtils/AlignDepict.pyi
diff --git a/rdkit-stubs/Chem/ChemUtils/BulkTester.pyi b/src/rdkit-stubs/Chem/ChemUtils/BulkTester.pyi
similarity index 100%
rename from rdkit-stubs/Chem/ChemUtils/BulkTester.pyi
rename to src/rdkit-stubs/Chem/ChemUtils/BulkTester.pyi
diff --git a/rdkit-stubs/Chem/ChemUtils/DescriptorUtilities.pyi b/src/rdkit-stubs/Chem/ChemUtils/DescriptorUtilities.pyi
similarity index 100%
rename from rdkit-stubs/Chem/ChemUtils/DescriptorUtilities.pyi
rename to src/rdkit-stubs/Chem/ChemUtils/DescriptorUtilities.pyi
diff --git a/rdkit-stubs/Chem/ChemUtils/SDFToCSV.pyi b/src/rdkit-stubs/Chem/ChemUtils/SDFToCSV.pyi
similarity index 100%
rename from rdkit-stubs/Chem/ChemUtils/SDFToCSV.pyi
rename to src/rdkit-stubs/Chem/ChemUtils/SDFToCSV.pyi
diff --git a/rdkit-stubs/Chem/ChemUtils/TemplateExpand.pyi b/src/rdkit-stubs/Chem/ChemUtils/TemplateExpand.pyi
similarity index 100%
rename from rdkit-stubs/Chem/ChemUtils/TemplateExpand.pyi
rename to src/rdkit-stubs/Chem/ChemUtils/TemplateExpand.pyi
diff --git a/rdkit-stubs/Chem/ChemUtils/__init__.pyi b/src/rdkit-stubs/Chem/ChemUtils/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Chem/ChemUtils/__init__.pyi
rename to src/rdkit-stubs/Chem/ChemUtils/__init__.pyi
diff --git a/rdkit-stubs/Chem/ChemicalFeatures.pyi b/src/rdkit-stubs/Chem/ChemicalFeatures.pyi
similarity index 100%
rename from rdkit-stubs/Chem/ChemicalFeatures.pyi
rename to src/rdkit-stubs/Chem/ChemicalFeatures.pyi
diff --git a/rdkit-stubs/Chem/ChemicalForceFields.pyi b/src/rdkit-stubs/Chem/ChemicalForceFields.pyi
similarity index 100%
rename from rdkit-stubs/Chem/ChemicalForceFields.pyi
rename to src/rdkit-stubs/Chem/ChemicalForceFields.pyi
diff --git a/rdkit-stubs/Chem/Crippen.pyi b/src/rdkit-stubs/Chem/Crippen.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Crippen.pyi
rename to src/rdkit-stubs/Chem/Crippen.pyi
diff --git a/rdkit-stubs/Chem/DSViewer.pyi b/src/rdkit-stubs/Chem/DSViewer.pyi
similarity index 100%
rename from rdkit-stubs/Chem/DSViewer.pyi
rename to src/rdkit-stubs/Chem/DSViewer.pyi
diff --git a/rdkit-stubs/Chem/Descriptors.pyi b/src/rdkit-stubs/Chem/Descriptors.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Descriptors.pyi
rename to src/rdkit-stubs/Chem/Descriptors.pyi
diff --git a/rdkit-stubs/Chem/Descriptors3D.pyi b/src/rdkit-stubs/Chem/Descriptors3D.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Descriptors3D.pyi
rename to src/rdkit-stubs/Chem/Descriptors3D.pyi
diff --git a/rdkit-stubs/Chem/Draw/IPythonConsole.pyi b/src/rdkit-stubs/Chem/Draw/IPythonConsole.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Draw/IPythonConsole.pyi
rename to src/rdkit-stubs/Chem/Draw/IPythonConsole.pyi
diff --git a/rdkit-stubs/Chem/Draw/InteractiveRenderer.pyi b/src/rdkit-stubs/Chem/Draw/InteractiveRenderer.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Draw/InteractiveRenderer.pyi
rename to src/rdkit-stubs/Chem/Draw/InteractiveRenderer.pyi
diff --git a/rdkit-stubs/Chem/Draw/MolDrawing.pyi b/src/rdkit-stubs/Chem/Draw/MolDrawing.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Draw/MolDrawing.pyi
rename to src/rdkit-stubs/Chem/Draw/MolDrawing.pyi
diff --git a/rdkit-stubs/Chem/Draw/SimilarityMaps.pyi b/src/rdkit-stubs/Chem/Draw/SimilarityMaps.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Draw/SimilarityMaps.pyi
rename to src/rdkit-stubs/Chem/Draw/SimilarityMaps.pyi
diff --git a/rdkit-stubs/Chem/Draw/__init__.pyi b/src/rdkit-stubs/Chem/Draw/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Draw/__init__.pyi
rename to src/rdkit-stubs/Chem/Draw/__init__.pyi
diff --git a/rdkit-stubs/Chem/Draw/aggCanvas.pyi b/src/rdkit-stubs/Chem/Draw/aggCanvas.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Draw/aggCanvas.pyi
rename to src/rdkit-stubs/Chem/Draw/aggCanvas.pyi
diff --git a/rdkit-stubs/Chem/Draw/cairoCanvas.pyi b/src/rdkit-stubs/Chem/Draw/cairoCanvas.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Draw/cairoCanvas.pyi
rename to src/rdkit-stubs/Chem/Draw/cairoCanvas.pyi
diff --git a/rdkit-stubs/Chem/Draw/canvasbase.pyi b/src/rdkit-stubs/Chem/Draw/canvasbase.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Draw/canvasbase.pyi
rename to src/rdkit-stubs/Chem/Draw/canvasbase.pyi
diff --git a/rdkit-stubs/Chem/Draw/mplCanvas.pyi b/src/rdkit-stubs/Chem/Draw/mplCanvas.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Draw/mplCanvas.pyi
rename to src/rdkit-stubs/Chem/Draw/mplCanvas.pyi
diff --git a/rdkit-stubs/Chem/Draw/qtCanvas.pyi b/src/rdkit-stubs/Chem/Draw/qtCanvas.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Draw/qtCanvas.pyi
rename to src/rdkit-stubs/Chem/Draw/qtCanvas.pyi
diff --git a/rdkit-stubs/Chem/Draw/rdMolDraw2D.pyi b/src/rdkit-stubs/Chem/Draw/rdMolDraw2D.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Draw/rdMolDraw2D.pyi
rename to src/rdkit-stubs/Chem/Draw/rdMolDraw2D.pyi
diff --git a/rdkit-stubs/Chem/Draw/spingCanvas.pyi b/src/rdkit-stubs/Chem/Draw/spingCanvas.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Draw/spingCanvas.pyi
rename to src/rdkit-stubs/Chem/Draw/spingCanvas.pyi
diff --git a/rdkit-stubs/Chem/EState/AtomTypes.pyi b/src/rdkit-stubs/Chem/EState/AtomTypes.pyi
similarity index 100%
rename from rdkit-stubs/Chem/EState/AtomTypes.pyi
rename to src/rdkit-stubs/Chem/EState/AtomTypes.pyi
diff --git a/rdkit-stubs/Chem/EState/EState.pyi b/src/rdkit-stubs/Chem/EState/EState.pyi
similarity index 100%
rename from rdkit-stubs/Chem/EState/EState.pyi
rename to src/rdkit-stubs/Chem/EState/EState.pyi
diff --git a/rdkit-stubs/Chem/EState/EState_VSA.pyi b/src/rdkit-stubs/Chem/EState/EState_VSA.pyi
similarity index 100%
rename from rdkit-stubs/Chem/EState/EState_VSA.pyi
rename to src/rdkit-stubs/Chem/EState/EState_VSA.pyi
diff --git a/rdkit-stubs/Chem/EState/Fingerprinter.pyi b/src/rdkit-stubs/Chem/EState/Fingerprinter.pyi
similarity index 100%
rename from rdkit-stubs/Chem/EState/Fingerprinter.pyi
rename to src/rdkit-stubs/Chem/EState/Fingerprinter.pyi
diff --git a/rdkit-stubs/Chem/EState/__init__.pyi b/src/rdkit-stubs/Chem/EState/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Chem/EState/__init__.pyi
rename to src/rdkit-stubs/Chem/EState/__init__.pyi
diff --git a/rdkit-stubs/Chem/EnumerateHeterocycles.pyi b/src/rdkit-stubs/Chem/EnumerateHeterocycles.pyi
similarity index 100%
rename from rdkit-stubs/Chem/EnumerateHeterocycles.pyi
rename to src/rdkit-stubs/Chem/EnumerateHeterocycles.pyi
diff --git a/rdkit-stubs/Chem/EnumerateStereoisomers.pyi b/src/rdkit-stubs/Chem/EnumerateStereoisomers.pyi
similarity index 100%
rename from rdkit-stubs/Chem/EnumerateStereoisomers.pyi
rename to src/rdkit-stubs/Chem/EnumerateStereoisomers.pyi
diff --git a/rdkit-stubs/Chem/FastSDMolSupplier.pyi b/src/rdkit-stubs/Chem/FastSDMolSupplier.pyi
similarity index 100%
rename from rdkit-stubs/Chem/FastSDMolSupplier.pyi
rename to src/rdkit-stubs/Chem/FastSDMolSupplier.pyi
diff --git a/rdkit-stubs/Chem/FeatFinderCLI.pyi b/src/rdkit-stubs/Chem/FeatFinderCLI.pyi
similarity index 100%
rename from rdkit-stubs/Chem/FeatFinderCLI.pyi
rename to src/rdkit-stubs/Chem/FeatFinderCLI.pyi
diff --git a/rdkit-stubs/Chem/FeatMaps/FeatMapParser.pyi b/src/rdkit-stubs/Chem/FeatMaps/FeatMapParser.pyi
similarity index 100%
rename from rdkit-stubs/Chem/FeatMaps/FeatMapParser.pyi
rename to src/rdkit-stubs/Chem/FeatMaps/FeatMapParser.pyi
diff --git a/rdkit-stubs/Chem/FeatMaps/FeatMapPoint.pyi b/src/rdkit-stubs/Chem/FeatMaps/FeatMapPoint.pyi
similarity index 100%
rename from rdkit-stubs/Chem/FeatMaps/FeatMapPoint.pyi
rename to src/rdkit-stubs/Chem/FeatMaps/FeatMapPoint.pyi
diff --git a/rdkit-stubs/Chem/FeatMaps/FeatMapUtils.pyi b/src/rdkit-stubs/Chem/FeatMaps/FeatMapUtils.pyi
similarity index 100%
rename from rdkit-stubs/Chem/FeatMaps/FeatMapUtils.pyi
rename to src/rdkit-stubs/Chem/FeatMaps/FeatMapUtils.pyi
diff --git a/rdkit-stubs/Chem/FeatMaps/FeatMaps.pyi b/src/rdkit-stubs/Chem/FeatMaps/FeatMaps.pyi
similarity index 100%
rename from rdkit-stubs/Chem/FeatMaps/FeatMaps.pyi
rename to src/rdkit-stubs/Chem/FeatMaps/FeatMaps.pyi
diff --git a/rdkit-stubs/Chem/FeatMaps/__init__.pyi b/src/rdkit-stubs/Chem/FeatMaps/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Chem/FeatMaps/__init__.pyi
rename to src/rdkit-stubs/Chem/FeatMaps/__init__.pyi
diff --git a/rdkit-stubs/Chem/Features/FeatDirUtilsRD.pyi b/src/rdkit-stubs/Chem/Features/FeatDirUtilsRD.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Features/FeatDirUtilsRD.pyi
rename to src/rdkit-stubs/Chem/Features/FeatDirUtilsRD.pyi
diff --git a/rdkit-stubs/Chem/Features/ShowFeats.pyi b/src/rdkit-stubs/Chem/Features/ShowFeats.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Features/ShowFeats.pyi
rename to src/rdkit-stubs/Chem/Features/ShowFeats.pyi
diff --git a/rdkit-stubs/Chem/Features/__init__.pyi b/src/rdkit-stubs/Chem/Features/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Features/__init__.pyi
rename to src/rdkit-stubs/Chem/Features/__init__.pyi
diff --git a/rdkit-stubs/Chem/FilterCatalog.pyi b/src/rdkit-stubs/Chem/FilterCatalog.pyi
similarity index 100%
rename from rdkit-stubs/Chem/FilterCatalog.pyi
rename to src/rdkit-stubs/Chem/FilterCatalog.pyi
diff --git a/rdkit-stubs/Chem/Fingerprints/ClusterMols.pyi b/src/rdkit-stubs/Chem/Fingerprints/ClusterMols.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Fingerprints/ClusterMols.pyi
rename to src/rdkit-stubs/Chem/Fingerprints/ClusterMols.pyi
diff --git a/rdkit-stubs/Chem/Fingerprints/DbFpSupplier.pyi b/src/rdkit-stubs/Chem/Fingerprints/DbFpSupplier.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Fingerprints/DbFpSupplier.pyi
rename to src/rdkit-stubs/Chem/Fingerprints/DbFpSupplier.pyi
diff --git a/rdkit-stubs/Chem/Fingerprints/FingerprintMols.pyi b/src/rdkit-stubs/Chem/Fingerprints/FingerprintMols.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Fingerprints/FingerprintMols.pyi
rename to src/rdkit-stubs/Chem/Fingerprints/FingerprintMols.pyi
diff --git a/rdkit-stubs/Chem/Fingerprints/MolSimilarity.pyi b/src/rdkit-stubs/Chem/Fingerprints/MolSimilarity.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Fingerprints/MolSimilarity.pyi
rename to src/rdkit-stubs/Chem/Fingerprints/MolSimilarity.pyi
diff --git a/rdkit-stubs/Chem/Fingerprints/SimilarityScreener.pyi b/src/rdkit-stubs/Chem/Fingerprints/SimilarityScreener.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Fingerprints/SimilarityScreener.pyi
rename to src/rdkit-stubs/Chem/Fingerprints/SimilarityScreener.pyi
diff --git a/rdkit-stubs/Chem/Fingerprints/__init__.pyi b/src/rdkit-stubs/Chem/Fingerprints/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Fingerprints/__init__.pyi
rename to src/rdkit-stubs/Chem/Fingerprints/__init__.pyi
diff --git a/rdkit-stubs/Chem/Fraggle/FraggleSim.pyi b/src/rdkit-stubs/Chem/Fraggle/FraggleSim.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Fraggle/FraggleSim.pyi
rename to src/rdkit-stubs/Chem/Fraggle/FraggleSim.pyi
diff --git a/rdkit-stubs/Chem/Fraggle/__init__.pyi b/src/rdkit-stubs/Chem/Fraggle/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Fraggle/__init__.pyi
rename to src/rdkit-stubs/Chem/Fraggle/__init__.pyi
diff --git a/rdkit-stubs/Chem/FragmentCatalog.pyi b/src/rdkit-stubs/Chem/FragmentCatalog.pyi
similarity index 100%
rename from rdkit-stubs/Chem/FragmentCatalog.pyi
rename to src/rdkit-stubs/Chem/FragmentCatalog.pyi
diff --git a/rdkit-stubs/Chem/FragmentMatcher.pyi b/src/rdkit-stubs/Chem/FragmentMatcher.pyi
similarity index 100%
rename from rdkit-stubs/Chem/FragmentMatcher.pyi
rename to src/rdkit-stubs/Chem/FragmentMatcher.pyi
diff --git a/rdkit-stubs/Chem/Fragments.pyi b/src/rdkit-stubs/Chem/Fragments.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Fragments.pyi
rename to src/rdkit-stubs/Chem/Fragments.pyi
diff --git a/rdkit-stubs/Chem/FunctionalGroups.pyi b/src/rdkit-stubs/Chem/FunctionalGroups.pyi
similarity index 100%
rename from rdkit-stubs/Chem/FunctionalGroups.pyi
rename to src/rdkit-stubs/Chem/FunctionalGroups.pyi
diff --git a/rdkit-stubs/Chem/GraphDescriptors.pyi b/src/rdkit-stubs/Chem/GraphDescriptors.pyi
similarity index 100%
rename from rdkit-stubs/Chem/GraphDescriptors.pyi
rename to src/rdkit-stubs/Chem/GraphDescriptors.pyi
diff --git a/rdkit-stubs/Chem/Graphs.pyi b/src/rdkit-stubs/Chem/Graphs.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Graphs.pyi
rename to src/rdkit-stubs/Chem/Graphs.pyi
diff --git a/rdkit-stubs/Chem/Lipinski.pyi b/src/rdkit-stubs/Chem/Lipinski.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Lipinski.pyi
rename to src/rdkit-stubs/Chem/Lipinski.pyi
diff --git a/rdkit-stubs/Chem/MACCSkeys.pyi b/src/rdkit-stubs/Chem/MACCSkeys.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MACCSkeys.pyi
rename to src/rdkit-stubs/Chem/MACCSkeys.pyi
diff --git a/rdkit-stubs/Chem/MCS.pyi b/src/rdkit-stubs/Chem/MCS.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MCS.pyi
rename to src/rdkit-stubs/Chem/MCS.pyi
diff --git a/rdkit-stubs/Chem/MolCatalog.pyi b/src/rdkit-stubs/Chem/MolCatalog.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MolCatalog.pyi
rename to src/rdkit-stubs/Chem/MolCatalog.pyi
diff --git a/rdkit-stubs/Chem/MolDb/FingerprintUtils.pyi b/src/rdkit-stubs/Chem/MolDb/FingerprintUtils.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MolDb/FingerprintUtils.pyi
rename to src/rdkit-stubs/Chem/MolDb/FingerprintUtils.pyi
diff --git a/rdkit-stubs/Chem/MolDb/Loader_orig.pyi b/src/rdkit-stubs/Chem/MolDb/Loader_orig.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MolDb/Loader_orig.pyi
rename to src/rdkit-stubs/Chem/MolDb/Loader_orig.pyi
diff --git a/rdkit-stubs/Chem/MolDb/Loader_sa.pyi b/src/rdkit-stubs/Chem/MolDb/Loader_sa.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MolDb/Loader_sa.pyi
rename to src/rdkit-stubs/Chem/MolDb/Loader_sa.pyi
diff --git a/rdkit-stubs/Chem/MolDb/__init__.pyi b/src/rdkit-stubs/Chem/MolDb/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MolDb/__init__.pyi
rename to src/rdkit-stubs/Chem/MolDb/__init__.pyi
diff --git a/rdkit-stubs/Chem/MolKey/InchiInfo.pyi b/src/rdkit-stubs/Chem/MolKey/InchiInfo.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MolKey/InchiInfo.pyi
rename to src/rdkit-stubs/Chem/MolKey/InchiInfo.pyi
diff --git a/rdkit-stubs/Chem/MolKey/MolKey.pyi b/src/rdkit-stubs/Chem/MolKey/MolKey.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MolKey/MolKey.pyi
rename to src/rdkit-stubs/Chem/MolKey/MolKey.pyi
diff --git a/rdkit-stubs/Chem/MolKey/__init__.pyi b/src/rdkit-stubs/Chem/MolKey/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MolKey/__init__.pyi
rename to src/rdkit-stubs/Chem/MolKey/__init__.pyi
diff --git a/rdkit-stubs/Chem/MolStandardize/__init__.pyi b/src/rdkit-stubs/Chem/MolStandardize/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MolStandardize/__init__.pyi
rename to src/rdkit-stubs/Chem/MolStandardize/__init__.pyi
diff --git a/rdkit-stubs/Chem/MolStandardize/charge.pyi b/src/rdkit-stubs/Chem/MolStandardize/charge.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MolStandardize/charge.pyi
rename to src/rdkit-stubs/Chem/MolStandardize/charge.pyi
diff --git a/rdkit-stubs/Chem/MolStandardize/errors.pyi b/src/rdkit-stubs/Chem/MolStandardize/errors.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MolStandardize/errors.pyi
rename to src/rdkit-stubs/Chem/MolStandardize/errors.pyi
diff --git a/rdkit-stubs/Chem/MolStandardize/fragment.pyi b/src/rdkit-stubs/Chem/MolStandardize/fragment.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MolStandardize/fragment.pyi
rename to src/rdkit-stubs/Chem/MolStandardize/fragment.pyi
diff --git a/rdkit-stubs/Chem/MolStandardize/metal.pyi b/src/rdkit-stubs/Chem/MolStandardize/metal.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MolStandardize/metal.pyi
rename to src/rdkit-stubs/Chem/MolStandardize/metal.pyi
diff --git a/rdkit-stubs/Chem/MolStandardize/normalize.pyi b/src/rdkit-stubs/Chem/MolStandardize/normalize.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MolStandardize/normalize.pyi
rename to src/rdkit-stubs/Chem/MolStandardize/normalize.pyi
diff --git a/rdkit-stubs/Chem/MolStandardize/rdMolStandardize.pyi b/src/rdkit-stubs/Chem/MolStandardize/rdMolStandardize.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MolStandardize/rdMolStandardize.pyi
rename to src/rdkit-stubs/Chem/MolStandardize/rdMolStandardize.pyi
diff --git a/rdkit-stubs/Chem/MolStandardize/resonance.pyi b/src/rdkit-stubs/Chem/MolStandardize/resonance.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MolStandardize/resonance.pyi
rename to src/rdkit-stubs/Chem/MolStandardize/resonance.pyi
diff --git a/rdkit-stubs/Chem/MolStandardize/standardize.pyi b/src/rdkit-stubs/Chem/MolStandardize/standardize.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MolStandardize/standardize.pyi
rename to src/rdkit-stubs/Chem/MolStandardize/standardize.pyi
diff --git a/rdkit-stubs/Chem/MolStandardize/tautomer.pyi b/src/rdkit-stubs/Chem/MolStandardize/tautomer.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MolStandardize/tautomer.pyi
rename to src/rdkit-stubs/Chem/MolStandardize/tautomer.pyi
diff --git a/rdkit-stubs/Chem/MolStandardize/utils.pyi b/src/rdkit-stubs/Chem/MolStandardize/utils.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MolStandardize/utils.pyi
rename to src/rdkit-stubs/Chem/MolStandardize/utils.pyi
diff --git a/rdkit-stubs/Chem/MolStandardize/validate.pyi b/src/rdkit-stubs/Chem/MolStandardize/validate.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MolStandardize/validate.pyi
rename to src/rdkit-stubs/Chem/MolStandardize/validate.pyi
diff --git a/rdkit-stubs/Chem/MolStandardize/validations.pyi b/src/rdkit-stubs/Chem/MolStandardize/validations.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MolStandardize/validations.pyi
rename to src/rdkit-stubs/Chem/MolStandardize/validations.pyi
diff --git a/rdkit-stubs/Chem/MolSurf.pyi b/src/rdkit-stubs/Chem/MolSurf.pyi
similarity index 100%
rename from rdkit-stubs/Chem/MolSurf.pyi
rename to src/rdkit-stubs/Chem/MolSurf.pyi
diff --git a/rdkit-stubs/Chem/PandasTools.pyi b/src/rdkit-stubs/Chem/PandasTools.pyi
similarity index 100%
rename from rdkit-stubs/Chem/PandasTools.pyi
rename to src/rdkit-stubs/Chem/PandasTools.pyi
diff --git a/rdkit-stubs/Chem/Pharm2D/Generate.pyi b/src/rdkit-stubs/Chem/Pharm2D/Generate.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Pharm2D/Generate.pyi
rename to src/rdkit-stubs/Chem/Pharm2D/Generate.pyi
diff --git a/rdkit-stubs/Chem/Pharm2D/Gobbi_Pharm2D.pyi b/src/rdkit-stubs/Chem/Pharm2D/Gobbi_Pharm2D.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Pharm2D/Gobbi_Pharm2D.pyi
rename to src/rdkit-stubs/Chem/Pharm2D/Gobbi_Pharm2D.pyi
diff --git a/rdkit-stubs/Chem/Pharm2D/LazyGenerator.pyi b/src/rdkit-stubs/Chem/Pharm2D/LazyGenerator.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Pharm2D/LazyGenerator.pyi
rename to src/rdkit-stubs/Chem/Pharm2D/LazyGenerator.pyi
diff --git a/rdkit-stubs/Chem/Pharm2D/Matcher.pyi b/src/rdkit-stubs/Chem/Pharm2D/Matcher.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Pharm2D/Matcher.pyi
rename to src/rdkit-stubs/Chem/Pharm2D/Matcher.pyi
diff --git a/rdkit-stubs/Chem/Pharm2D/SigFactory.pyi b/src/rdkit-stubs/Chem/Pharm2D/SigFactory.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Pharm2D/SigFactory.pyi
rename to src/rdkit-stubs/Chem/Pharm2D/SigFactory.pyi
diff --git a/rdkit-stubs/Chem/Pharm2D/Utils.pyi b/src/rdkit-stubs/Chem/Pharm2D/Utils.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Pharm2D/Utils.pyi
rename to src/rdkit-stubs/Chem/Pharm2D/Utils.pyi
diff --git a/rdkit-stubs/Chem/Pharm2D/__init__.pyi b/src/rdkit-stubs/Chem/Pharm2D/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Pharm2D/__init__.pyi
rename to src/rdkit-stubs/Chem/Pharm2D/__init__.pyi
diff --git a/rdkit-stubs/Chem/Pharm3D/EmbedLib.pyi b/src/rdkit-stubs/Chem/Pharm3D/EmbedLib.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Pharm3D/EmbedLib.pyi
rename to src/rdkit-stubs/Chem/Pharm3D/EmbedLib.pyi
diff --git a/rdkit-stubs/Chem/Pharm3D/ExcludedVolume.pyi b/src/rdkit-stubs/Chem/Pharm3D/ExcludedVolume.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Pharm3D/ExcludedVolume.pyi
rename to src/rdkit-stubs/Chem/Pharm3D/ExcludedVolume.pyi
diff --git a/rdkit-stubs/Chem/Pharm3D/Pharmacophore.pyi b/src/rdkit-stubs/Chem/Pharm3D/Pharmacophore.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Pharm3D/Pharmacophore.pyi
rename to src/rdkit-stubs/Chem/Pharm3D/Pharmacophore.pyi
diff --git a/rdkit-stubs/Chem/Pharm3D/__init__.pyi b/src/rdkit-stubs/Chem/Pharm3D/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Pharm3D/__init__.pyi
rename to src/rdkit-stubs/Chem/Pharm3D/__init__.pyi
diff --git a/rdkit-stubs/Chem/PropertyMol.pyi b/src/rdkit-stubs/Chem/PropertyMol.pyi
similarity index 100%
rename from rdkit-stubs/Chem/PropertyMol.pyi
rename to src/rdkit-stubs/Chem/PropertyMol.pyi
diff --git a/rdkit-stubs/Chem/PyMol.pyi b/src/rdkit-stubs/Chem/PyMol.pyi
similarity index 100%
rename from rdkit-stubs/Chem/PyMol.pyi
rename to src/rdkit-stubs/Chem/PyMol.pyi
diff --git a/rdkit-stubs/Chem/QED.pyi b/src/rdkit-stubs/Chem/QED.pyi
similarity index 100%
rename from rdkit-stubs/Chem/QED.pyi
rename to src/rdkit-stubs/Chem/QED.pyi
diff --git a/rdkit-stubs/Chem/Randomize.pyi b/src/rdkit-stubs/Chem/Randomize.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Randomize.pyi
rename to src/rdkit-stubs/Chem/Randomize.pyi
diff --git a/rdkit-stubs/Chem/Recap.pyi b/src/rdkit-stubs/Chem/Recap.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Recap.pyi
rename to src/rdkit-stubs/Chem/Recap.pyi
diff --git a/rdkit-stubs/Chem/ReducedGraphs.pyi b/src/rdkit-stubs/Chem/ReducedGraphs.pyi
similarity index 100%
rename from rdkit-stubs/Chem/ReducedGraphs.pyi
rename to src/rdkit-stubs/Chem/ReducedGraphs.pyi
diff --git a/rdkit-stubs/Chem/SATIS.pyi b/src/rdkit-stubs/Chem/SATIS.pyi
similarity index 100%
rename from rdkit-stubs/Chem/SATIS.pyi
rename to src/rdkit-stubs/Chem/SATIS.pyi
diff --git a/rdkit-stubs/Chem/SaltRemover.pyi b/src/rdkit-stubs/Chem/SaltRemover.pyi
similarity index 100%
rename from rdkit-stubs/Chem/SaltRemover.pyi
rename to src/rdkit-stubs/Chem/SaltRemover.pyi
diff --git a/rdkit-stubs/Chem/Scaffolds/MurckoScaffold.pyi b/src/rdkit-stubs/Chem/Scaffolds/MurckoScaffold.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Scaffolds/MurckoScaffold.pyi
rename to src/rdkit-stubs/Chem/Scaffolds/MurckoScaffold.pyi
diff --git a/rdkit-stubs/Chem/Scaffolds/__init__.pyi b/src/rdkit-stubs/Chem/Scaffolds/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Scaffolds/__init__.pyi
rename to src/rdkit-stubs/Chem/Scaffolds/__init__.pyi
diff --git a/rdkit-stubs/Chem/Scaffolds/rdScaffoldNetwork.pyi b/src/rdkit-stubs/Chem/Scaffolds/rdScaffoldNetwork.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Scaffolds/rdScaffoldNetwork.pyi
rename to src/rdkit-stubs/Chem/Scaffolds/rdScaffoldNetwork.pyi
diff --git a/rdkit-stubs/Chem/ShowMols.pyi b/src/rdkit-stubs/Chem/ShowMols.pyi
similarity index 100%
rename from rdkit-stubs/Chem/ShowMols.pyi
rename to src/rdkit-stubs/Chem/ShowMols.pyi
diff --git a/rdkit-stubs/Chem/SimpleEnum/Enumerator.pyi b/src/rdkit-stubs/Chem/SimpleEnum/Enumerator.pyi
similarity index 100%
rename from rdkit-stubs/Chem/SimpleEnum/Enumerator.pyi
rename to src/rdkit-stubs/Chem/SimpleEnum/Enumerator.pyi
diff --git a/rdkit-stubs/Chem/SimpleEnum/__init__.pyi b/src/rdkit-stubs/Chem/SimpleEnum/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Chem/SimpleEnum/__init__.pyi
rename to src/rdkit-stubs/Chem/SimpleEnum/__init__.pyi
diff --git a/rdkit-stubs/Chem/Subshape/BuilderUtils.pyi b/src/rdkit-stubs/Chem/Subshape/BuilderUtils.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Subshape/BuilderUtils.pyi
rename to src/rdkit-stubs/Chem/Subshape/BuilderUtils.pyi
diff --git a/rdkit-stubs/Chem/Subshape/SubshapeAligner.pyi b/src/rdkit-stubs/Chem/Subshape/SubshapeAligner.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Subshape/SubshapeAligner.pyi
rename to src/rdkit-stubs/Chem/Subshape/SubshapeAligner.pyi
diff --git a/rdkit-stubs/Chem/Subshape/SubshapeBuilder.pyi b/src/rdkit-stubs/Chem/Subshape/SubshapeBuilder.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Subshape/SubshapeBuilder.pyi
rename to src/rdkit-stubs/Chem/Subshape/SubshapeBuilder.pyi
diff --git a/rdkit-stubs/Chem/Subshape/SubshapeObjects.pyi b/src/rdkit-stubs/Chem/Subshape/SubshapeObjects.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Subshape/SubshapeObjects.pyi
rename to src/rdkit-stubs/Chem/Subshape/SubshapeObjects.pyi
diff --git a/rdkit-stubs/Chem/Subshape/__init__.pyi b/src/rdkit-stubs/Chem/Subshape/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Subshape/__init__.pyi
rename to src/rdkit-stubs/Chem/Subshape/__init__.pyi
diff --git a/rdkit-stubs/Chem/Subshape/testCombined.pyi b/src/rdkit-stubs/Chem/Subshape/testCombined.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Subshape/testCombined.pyi
rename to src/rdkit-stubs/Chem/Subshape/testCombined.pyi
diff --git a/rdkit-stubs/Chem/Suppliers/DbMolSupplier.pyi b/src/rdkit-stubs/Chem/Suppliers/DbMolSupplier.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Suppliers/DbMolSupplier.pyi
rename to src/rdkit-stubs/Chem/Suppliers/DbMolSupplier.pyi
diff --git a/rdkit-stubs/Chem/Suppliers/MolSupplier.pyi b/src/rdkit-stubs/Chem/Suppliers/MolSupplier.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Suppliers/MolSupplier.pyi
rename to src/rdkit-stubs/Chem/Suppliers/MolSupplier.pyi
diff --git a/rdkit-stubs/Chem/Suppliers/__init__.pyi b/src/rdkit-stubs/Chem/Suppliers/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Chem/Suppliers/__init__.pyi
rename to src/rdkit-stubs/Chem/Suppliers/__init__.pyi
diff --git a/rdkit-stubs/Chem/TemplateAlign.pyi b/src/rdkit-stubs/Chem/TemplateAlign.pyi
similarity index 100%
rename from rdkit-stubs/Chem/TemplateAlign.pyi
rename to src/rdkit-stubs/Chem/TemplateAlign.pyi
diff --git a/rdkit-stubs/Chem/TorsionFingerprints.pyi b/src/rdkit-stubs/Chem/TorsionFingerprints.pyi
similarity index 100%
rename from rdkit-stubs/Chem/TorsionFingerprints.pyi
rename to src/rdkit-stubs/Chem/TorsionFingerprints.pyi
diff --git a/rdkit-stubs/Chem/__init__.pyi b/src/rdkit-stubs/Chem/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Chem/__init__.pyi
rename to src/rdkit-stubs/Chem/__init__.pyi
diff --git a/rdkit-stubs/Chem/fmcs/__init__.pyi b/src/rdkit-stubs/Chem/fmcs/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Chem/fmcs/__init__.pyi
rename to src/rdkit-stubs/Chem/fmcs/__init__.pyi
diff --git a/rdkit-stubs/Chem/fmcs/fmcs.pyi b/src/rdkit-stubs/Chem/fmcs/fmcs.pyi
similarity index 100%
rename from rdkit-stubs/Chem/fmcs/fmcs.pyi
rename to src/rdkit-stubs/Chem/fmcs/fmcs.pyi
diff --git a/rdkit-stubs/Chem/inchi.pyi b/src/rdkit-stubs/Chem/inchi.pyi
similarity index 100%
rename from rdkit-stubs/Chem/inchi.pyi
rename to src/rdkit-stubs/Chem/inchi.pyi
diff --git a/rdkit-stubs/Chem/rdAbbreviations.pyi b/src/rdkit-stubs/Chem/rdAbbreviations.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdAbbreviations.pyi
rename to src/rdkit-stubs/Chem/rdAbbreviations.pyi
diff --git a/rdkit-stubs/Chem/rdCIPLabeler.pyi b/src/rdkit-stubs/Chem/rdCIPLabeler.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdCIPLabeler.pyi
rename to src/rdkit-stubs/Chem/rdCIPLabeler.pyi
diff --git a/rdkit-stubs/Chem/rdChemReactions.pyi b/src/rdkit-stubs/Chem/rdChemReactions.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdChemReactions.pyi
rename to src/rdkit-stubs/Chem/rdChemReactions.pyi
diff --git a/rdkit-stubs/Chem/rdChemicalFeatures.pyi b/src/rdkit-stubs/Chem/rdChemicalFeatures.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdChemicalFeatures.pyi
rename to src/rdkit-stubs/Chem/rdChemicalFeatures.pyi
diff --git a/rdkit-stubs/Chem/rdCoordGen.pyi b/src/rdkit-stubs/Chem/rdCoordGen.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdCoordGen.pyi
rename to src/rdkit-stubs/Chem/rdCoordGen.pyi
diff --git a/rdkit-stubs/Chem/rdDepictor.pyi b/src/rdkit-stubs/Chem/rdDepictor.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdDepictor.pyi
rename to src/rdkit-stubs/Chem/rdDepictor.pyi
diff --git a/rdkit-stubs/Chem/rdDeprotect.pyi b/src/rdkit-stubs/Chem/rdDeprotect.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdDeprotect.pyi
rename to src/rdkit-stubs/Chem/rdDeprotect.pyi
diff --git a/rdkit-stubs/Chem/rdDistGeom.pyi b/src/rdkit-stubs/Chem/rdDistGeom.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdDistGeom.pyi
rename to src/rdkit-stubs/Chem/rdDistGeom.pyi
diff --git a/rdkit-stubs/Chem/rdEHTTools.pyi b/src/rdkit-stubs/Chem/rdEHTTools.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdEHTTools.pyi
rename to src/rdkit-stubs/Chem/rdEHTTools.pyi
diff --git a/rdkit-stubs/Chem/rdFMCS.pyi b/src/rdkit-stubs/Chem/rdFMCS.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdFMCS.pyi
rename to src/rdkit-stubs/Chem/rdFMCS.pyi
diff --git a/rdkit-stubs/Chem/rdFingerprintGenerator.pyi b/src/rdkit-stubs/Chem/rdFingerprintGenerator.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdFingerprintGenerator.pyi
rename to src/rdkit-stubs/Chem/rdFingerprintGenerator.pyi
diff --git a/rdkit-stubs/Chem/rdForceFieldHelpers.pyi b/src/rdkit-stubs/Chem/rdForceFieldHelpers.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdForceFieldHelpers.pyi
rename to src/rdkit-stubs/Chem/rdForceFieldHelpers.pyi
diff --git a/rdkit-stubs/Chem/rdFreeSASA.pyi b/src/rdkit-stubs/Chem/rdFreeSASA.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdFreeSASA.pyi
rename to src/rdkit-stubs/Chem/rdFreeSASA.pyi
diff --git a/rdkit-stubs/Chem/rdMHFPFingerprint.pyi b/src/rdkit-stubs/Chem/rdMHFPFingerprint.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdMHFPFingerprint.pyi
rename to src/rdkit-stubs/Chem/rdMHFPFingerprint.pyi
diff --git a/rdkit-stubs/Chem/rdMMPA.pyi b/src/rdkit-stubs/Chem/rdMMPA.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdMMPA.pyi
rename to src/rdkit-stubs/Chem/rdMMPA.pyi
diff --git a/rdkit-stubs/Chem/rdMolAlign.pyi b/src/rdkit-stubs/Chem/rdMolAlign.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdMolAlign.pyi
rename to src/rdkit-stubs/Chem/rdMolAlign.pyi
diff --git a/rdkit-stubs/Chem/rdMolCatalog.pyi b/src/rdkit-stubs/Chem/rdMolCatalog.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdMolCatalog.pyi
rename to src/rdkit-stubs/Chem/rdMolCatalog.pyi
diff --git a/rdkit-stubs/Chem/rdMolChemicalFeatures.pyi b/src/rdkit-stubs/Chem/rdMolChemicalFeatures.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdMolChemicalFeatures.pyi
rename to src/rdkit-stubs/Chem/rdMolChemicalFeatures.pyi
diff --git a/rdkit-stubs/Chem/rdMolDescriptors.pyi b/src/rdkit-stubs/Chem/rdMolDescriptors.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdMolDescriptors.pyi
rename to src/rdkit-stubs/Chem/rdMolDescriptors.pyi
diff --git a/rdkit-stubs/Chem/rdMolEnumerator.pyi b/src/rdkit-stubs/Chem/rdMolEnumerator.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdMolEnumerator.pyi
rename to src/rdkit-stubs/Chem/rdMolEnumerator.pyi
diff --git a/rdkit-stubs/Chem/rdMolHash.pyi b/src/rdkit-stubs/Chem/rdMolHash.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdMolHash.pyi
rename to src/rdkit-stubs/Chem/rdMolHash.pyi
diff --git a/rdkit-stubs/Chem/rdMolInterchange.pyi b/src/rdkit-stubs/Chem/rdMolInterchange.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdMolInterchange.pyi
rename to src/rdkit-stubs/Chem/rdMolInterchange.pyi
diff --git a/rdkit-stubs/Chem/rdMolTransforms.pyi b/src/rdkit-stubs/Chem/rdMolTransforms.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdMolTransforms.pyi
rename to src/rdkit-stubs/Chem/rdMolTransforms.pyi
diff --git a/rdkit-stubs/Chem/rdPartialCharges.pyi b/src/rdkit-stubs/Chem/rdPartialCharges.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdPartialCharges.pyi
rename to src/rdkit-stubs/Chem/rdPartialCharges.pyi
diff --git a/rdkit-stubs/Chem/rdRGroupDecomposition.pyi b/src/rdkit-stubs/Chem/rdRGroupDecomposition.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdRGroupDecomposition.pyi
rename to src/rdkit-stubs/Chem/rdRGroupDecomposition.pyi
diff --git a/rdkit-stubs/Chem/rdReducedGraphs.pyi b/src/rdkit-stubs/Chem/rdReducedGraphs.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdReducedGraphs.pyi
rename to src/rdkit-stubs/Chem/rdReducedGraphs.pyi
diff --git a/rdkit-stubs/Chem/rdSLNParse.pyi b/src/rdkit-stubs/Chem/rdSLNParse.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdSLNParse.pyi
rename to src/rdkit-stubs/Chem/rdSLNParse.pyi
diff --git a/rdkit-stubs/Chem/rdShapeHelpers.pyi b/src/rdkit-stubs/Chem/rdShapeHelpers.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdShapeHelpers.pyi
rename to src/rdkit-stubs/Chem/rdShapeHelpers.pyi
diff --git a/rdkit-stubs/Chem/rdSubstructLibrary.pyi b/src/rdkit-stubs/Chem/rdSubstructLibrary.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdSubstructLibrary.pyi
rename to src/rdkit-stubs/Chem/rdSubstructLibrary.pyi
diff --git a/rdkit-stubs/Chem/rdTautomerQuery.pyi b/src/rdkit-stubs/Chem/rdTautomerQuery.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdTautomerQuery.pyi
rename to src/rdkit-stubs/Chem/rdTautomerQuery.pyi
diff --git a/rdkit-stubs/Chem/rdchem.pyi b/src/rdkit-stubs/Chem/rdchem.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdchem.pyi
rename to src/rdkit-stubs/Chem/rdchem.pyi
diff --git a/rdkit-stubs/Chem/rdfiltercatalog.pyi b/src/rdkit-stubs/Chem/rdfiltercatalog.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdfiltercatalog.pyi
rename to src/rdkit-stubs/Chem/rdfiltercatalog.pyi
diff --git a/rdkit-stubs/Chem/rdfragcatalog.pyi b/src/rdkit-stubs/Chem/rdfragcatalog.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdfragcatalog.pyi
rename to src/rdkit-stubs/Chem/rdfragcatalog.pyi
diff --git a/rdkit-stubs/Chem/rdinchi.pyi b/src/rdkit-stubs/Chem/rdinchi.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdinchi.pyi
rename to src/rdkit-stubs/Chem/rdinchi.pyi
diff --git a/rdkit-stubs/Chem/rdmolfiles.pyi b/src/rdkit-stubs/Chem/rdmolfiles.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdmolfiles.pyi
rename to src/rdkit-stubs/Chem/rdmolfiles.pyi
diff --git a/rdkit-stubs/Chem/rdmolops.pyi b/src/rdkit-stubs/Chem/rdmolops.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdmolops.pyi
rename to src/rdkit-stubs/Chem/rdmolops.pyi
diff --git a/rdkit-stubs/Chem/rdqueries.pyi b/src/rdkit-stubs/Chem/rdqueries.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdqueries.pyi
rename to src/rdkit-stubs/Chem/rdqueries.pyi
diff --git a/rdkit-stubs/Chem/rdtrajectory.pyi b/src/rdkit-stubs/Chem/rdtrajectory.pyi
similarity index 100%
rename from rdkit-stubs/Chem/rdtrajectory.pyi
rename to src/rdkit-stubs/Chem/rdtrajectory.pyi
diff --git a/rdkit-stubs/DataManip/Metric/__init__.pyi b/src/rdkit-stubs/DataManip/Metric/__init__.pyi
similarity index 100%
rename from rdkit-stubs/DataManip/Metric/__init__.pyi
rename to src/rdkit-stubs/DataManip/Metric/__init__.pyi
diff --git a/rdkit-stubs/DataManip/Metric/rdMetricMatrixCalc.pyi b/src/rdkit-stubs/DataManip/Metric/rdMetricMatrixCalc.pyi
similarity index 100%
rename from rdkit-stubs/DataManip/Metric/rdMetricMatrixCalc.pyi
rename to src/rdkit-stubs/DataManip/Metric/rdMetricMatrixCalc.pyi
diff --git a/rdkit-stubs/DataManip/__init__.pyi b/src/rdkit-stubs/DataManip/__init__.pyi
similarity index 100%
rename from rdkit-stubs/DataManip/__init__.pyi
rename to src/rdkit-stubs/DataManip/__init__.pyi
diff --git a/rdkit-stubs/DataStructs/BitEnsemble.pyi b/src/rdkit-stubs/DataStructs/BitEnsemble.pyi
similarity index 100%
rename from rdkit-stubs/DataStructs/BitEnsemble.pyi
rename to src/rdkit-stubs/DataStructs/BitEnsemble.pyi
diff --git a/rdkit-stubs/DataStructs/BitEnsembleDb.pyi b/src/rdkit-stubs/DataStructs/BitEnsembleDb.pyi
similarity index 100%
rename from rdkit-stubs/DataStructs/BitEnsembleDb.pyi
rename to src/rdkit-stubs/DataStructs/BitEnsembleDb.pyi
diff --git a/rdkit-stubs/DataStructs/BitUtils.pyi b/src/rdkit-stubs/DataStructs/BitUtils.pyi
similarity index 100%
rename from rdkit-stubs/DataStructs/BitUtils.pyi
rename to src/rdkit-stubs/DataStructs/BitUtils.pyi
diff --git a/rdkit-stubs/DataStructs/HierarchyVis.pyi b/src/rdkit-stubs/DataStructs/HierarchyVis.pyi
similarity index 100%
rename from rdkit-stubs/DataStructs/HierarchyVis.pyi
rename to src/rdkit-stubs/DataStructs/HierarchyVis.pyi
diff --git a/rdkit-stubs/DataStructs/LazySignature.pyi b/src/rdkit-stubs/DataStructs/LazySignature.pyi
similarity index 100%
rename from rdkit-stubs/DataStructs/LazySignature.pyi
rename to src/rdkit-stubs/DataStructs/LazySignature.pyi
diff --git a/rdkit-stubs/DataStructs/TopNContainer.pyi b/src/rdkit-stubs/DataStructs/TopNContainer.pyi
similarity index 100%
rename from rdkit-stubs/DataStructs/TopNContainer.pyi
rename to src/rdkit-stubs/DataStructs/TopNContainer.pyi
diff --git a/rdkit-stubs/DataStructs/VectCollection.pyi b/src/rdkit-stubs/DataStructs/VectCollection.pyi
similarity index 100%
rename from rdkit-stubs/DataStructs/VectCollection.pyi
rename to src/rdkit-stubs/DataStructs/VectCollection.pyi
diff --git a/rdkit-stubs/DataStructs/__init__.pyi b/src/rdkit-stubs/DataStructs/__init__.pyi
similarity index 100%
rename from rdkit-stubs/DataStructs/__init__.pyi
rename to src/rdkit-stubs/DataStructs/__init__.pyi
diff --git a/rdkit-stubs/DataStructs/cDataStructs.pyi b/src/rdkit-stubs/DataStructs/cDataStructs.pyi
similarity index 100%
rename from rdkit-stubs/DataStructs/cDataStructs.pyi
rename to src/rdkit-stubs/DataStructs/cDataStructs.pyi
diff --git a/rdkit-stubs/Dbase/DbConnection.pyi b/src/rdkit-stubs/Dbase/DbConnection.pyi
similarity index 100%
rename from rdkit-stubs/Dbase/DbConnection.pyi
rename to src/rdkit-stubs/Dbase/DbConnection.pyi
diff --git a/rdkit-stubs/Dbase/DbInfo.pyi b/src/rdkit-stubs/Dbase/DbInfo.pyi
similarity index 100%
rename from rdkit-stubs/Dbase/DbInfo.pyi
rename to src/rdkit-stubs/Dbase/DbInfo.pyi
diff --git a/rdkit-stubs/Dbase/DbModule.pyi b/src/rdkit-stubs/Dbase/DbModule.pyi
similarity index 100%
rename from rdkit-stubs/Dbase/DbModule.pyi
rename to src/rdkit-stubs/Dbase/DbModule.pyi
diff --git a/rdkit-stubs/Dbase/DbReport.pyi b/src/rdkit-stubs/Dbase/DbReport.pyi
similarity index 100%
rename from rdkit-stubs/Dbase/DbReport.pyi
rename to src/rdkit-stubs/Dbase/DbReport.pyi
diff --git a/rdkit-stubs/Dbase/DbResultSet.pyi b/src/rdkit-stubs/Dbase/DbResultSet.pyi
similarity index 100%
rename from rdkit-stubs/Dbase/DbResultSet.pyi
rename to src/rdkit-stubs/Dbase/DbResultSet.pyi
diff --git a/rdkit-stubs/Dbase/DbUtils.pyi b/src/rdkit-stubs/Dbase/DbUtils.pyi
similarity index 100%
rename from rdkit-stubs/Dbase/DbUtils.pyi
rename to src/rdkit-stubs/Dbase/DbUtils.pyi
diff --git a/rdkit-stubs/Dbase/StorageUtils.pyi b/src/rdkit-stubs/Dbase/StorageUtils.pyi
similarity index 100%
rename from rdkit-stubs/Dbase/StorageUtils.pyi
rename to src/rdkit-stubs/Dbase/StorageUtils.pyi
diff --git a/rdkit-stubs/Dbase/__init__.pyi b/src/rdkit-stubs/Dbase/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Dbase/__init__.pyi
rename to src/rdkit-stubs/Dbase/__init__.pyi
diff --git a/rdkit-stubs/DistanceGeometry/DistGeom.pyi b/src/rdkit-stubs/DistanceGeometry/DistGeom.pyi
similarity index 100%
rename from rdkit-stubs/DistanceGeometry/DistGeom.pyi
rename to src/rdkit-stubs/DistanceGeometry/DistGeom.pyi
diff --git a/rdkit-stubs/DistanceGeometry/__init__.pyi b/src/rdkit-stubs/DistanceGeometry/__init__.pyi
similarity index 100%
rename from rdkit-stubs/DistanceGeometry/__init__.pyi
rename to src/rdkit-stubs/DistanceGeometry/__init__.pyi
diff --git a/rdkit-stubs/ForceField/__init__.pyi b/src/rdkit-stubs/ForceField/__init__.pyi
similarity index 100%
rename from rdkit-stubs/ForceField/__init__.pyi
rename to src/rdkit-stubs/ForceField/__init__.pyi
diff --git a/rdkit-stubs/ForceField/rdForceField.pyi b/src/rdkit-stubs/ForceField/rdForceField.pyi
similarity index 100%
rename from rdkit-stubs/ForceField/rdForceField.pyi
rename to src/rdkit-stubs/ForceField/rdForceField.pyi
diff --git a/rdkit-stubs/Geometry/__init__.pyi b/src/rdkit-stubs/Geometry/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Geometry/__init__.pyi
rename to src/rdkit-stubs/Geometry/__init__.pyi
diff --git a/rdkit-stubs/Geometry/rdGeometry.pyi b/src/rdkit-stubs/Geometry/rdGeometry.pyi
similarity index 100%
rename from rdkit-stubs/Geometry/rdGeometry.pyi
rename to src/rdkit-stubs/Geometry/rdGeometry.pyi
diff --git a/rdkit-stubs/ML/AnalyzeComposite.pyi b/src/rdkit-stubs/ML/AnalyzeComposite.pyi
similarity index 100%
rename from rdkit-stubs/ML/AnalyzeComposite.pyi
rename to src/rdkit-stubs/ML/AnalyzeComposite.pyi
diff --git a/rdkit-stubs/ML/BuildComposite.pyi b/src/rdkit-stubs/ML/BuildComposite.pyi
similarity index 100%
rename from rdkit-stubs/ML/BuildComposite.pyi
rename to src/rdkit-stubs/ML/BuildComposite.pyi
diff --git a/rdkit-stubs/ML/Cluster/Butina.pyi b/src/rdkit-stubs/ML/Cluster/Butina.pyi
similarity index 100%
rename from rdkit-stubs/ML/Cluster/Butina.pyi
rename to src/rdkit-stubs/ML/Cluster/Butina.pyi
diff --git a/rdkit-stubs/ML/Cluster/ClusterUtils.pyi b/src/rdkit-stubs/ML/Cluster/ClusterUtils.pyi
similarity index 100%
rename from rdkit-stubs/ML/Cluster/ClusterUtils.pyi
rename to src/rdkit-stubs/ML/Cluster/ClusterUtils.pyi
diff --git a/rdkit-stubs/ML/Cluster/ClusterVis.pyi b/src/rdkit-stubs/ML/Cluster/ClusterVis.pyi
similarity index 100%
rename from rdkit-stubs/ML/Cluster/ClusterVis.pyi
rename to src/rdkit-stubs/ML/Cluster/ClusterVis.pyi
diff --git a/rdkit-stubs/ML/Cluster/Clustering.pyi b/src/rdkit-stubs/ML/Cluster/Clustering.pyi
similarity index 100%
rename from rdkit-stubs/ML/Cluster/Clustering.pyi
rename to src/rdkit-stubs/ML/Cluster/Clustering.pyi
diff --git a/rdkit-stubs/ML/Cluster/Clusters.pyi b/src/rdkit-stubs/ML/Cluster/Clusters.pyi
similarity index 100%
rename from rdkit-stubs/ML/Cluster/Clusters.pyi
rename to src/rdkit-stubs/ML/Cluster/Clusters.pyi
diff --git a/rdkit-stubs/ML/Cluster/Murtagh.pyi b/src/rdkit-stubs/ML/Cluster/Murtagh.pyi
similarity index 100%
rename from rdkit-stubs/ML/Cluster/Murtagh.pyi
rename to src/rdkit-stubs/ML/Cluster/Murtagh.pyi
diff --git a/rdkit-stubs/ML/Cluster/Resemblance.pyi b/src/rdkit-stubs/ML/Cluster/Resemblance.pyi
similarity index 100%
rename from rdkit-stubs/ML/Cluster/Resemblance.pyi
rename to src/rdkit-stubs/ML/Cluster/Resemblance.pyi
diff --git a/rdkit-stubs/ML/Cluster/Standardize.pyi b/src/rdkit-stubs/ML/Cluster/Standardize.pyi
similarity index 100%
rename from rdkit-stubs/ML/Cluster/Standardize.pyi
rename to src/rdkit-stubs/ML/Cluster/Standardize.pyi
diff --git a/rdkit-stubs/ML/Cluster/__init__.pyi b/src/rdkit-stubs/ML/Cluster/__init__.pyi
similarity index 100%
rename from rdkit-stubs/ML/Cluster/__init__.pyi
rename to src/rdkit-stubs/ML/Cluster/__init__.pyi
diff --git a/rdkit-stubs/ML/Cluster/murtagh_test.pyi b/src/rdkit-stubs/ML/Cluster/murtagh_test.pyi
similarity index 100%
rename from rdkit-stubs/ML/Cluster/murtagh_test.pyi
rename to src/rdkit-stubs/ML/Cluster/murtagh_test.pyi
diff --git a/rdkit-stubs/ML/Composite/AdjustComposite.pyi b/src/rdkit-stubs/ML/Composite/AdjustComposite.pyi
similarity index 100%
rename from rdkit-stubs/ML/Composite/AdjustComposite.pyi
rename to src/rdkit-stubs/ML/Composite/AdjustComposite.pyi
diff --git a/rdkit-stubs/ML/Composite/Composite.pyi b/src/rdkit-stubs/ML/Composite/Composite.pyi
similarity index 100%
rename from rdkit-stubs/ML/Composite/Composite.pyi
rename to src/rdkit-stubs/ML/Composite/Composite.pyi
diff --git a/rdkit-stubs/ML/Composite/__init__.pyi b/src/rdkit-stubs/ML/Composite/__init__.pyi
similarity index 100%
rename from rdkit-stubs/ML/Composite/__init__.pyi
rename to src/rdkit-stubs/ML/Composite/__init__.pyi
diff --git a/rdkit-stubs/ML/CompositeRun.pyi b/src/rdkit-stubs/ML/CompositeRun.pyi
similarity index 100%
rename from rdkit-stubs/ML/CompositeRun.pyi
rename to src/rdkit-stubs/ML/CompositeRun.pyi
diff --git a/rdkit-stubs/ML/Data/DataUtils.pyi b/src/rdkit-stubs/ML/Data/DataUtils.pyi
similarity index 100%
rename from rdkit-stubs/ML/Data/DataUtils.pyi
rename to src/rdkit-stubs/ML/Data/DataUtils.pyi
diff --git a/rdkit-stubs/ML/Data/FindQuantBounds.pyi b/src/rdkit-stubs/ML/Data/FindQuantBounds.pyi
similarity index 100%
rename from rdkit-stubs/ML/Data/FindQuantBounds.pyi
rename to src/rdkit-stubs/ML/Data/FindQuantBounds.pyi
diff --git a/rdkit-stubs/ML/Data/MLData.pyi b/src/rdkit-stubs/ML/Data/MLData.pyi
similarity index 100%
rename from rdkit-stubs/ML/Data/MLData.pyi
rename to src/rdkit-stubs/ML/Data/MLData.pyi
diff --git a/rdkit-stubs/ML/Data/Quantize.pyi b/src/rdkit-stubs/ML/Data/Quantize.pyi
similarity index 100%
rename from rdkit-stubs/ML/Data/Quantize.pyi
rename to src/rdkit-stubs/ML/Data/Quantize.pyi
diff --git a/rdkit-stubs/ML/Data/SplitData.pyi b/src/rdkit-stubs/ML/Data/SplitData.pyi
similarity index 100%
rename from rdkit-stubs/ML/Data/SplitData.pyi
rename to src/rdkit-stubs/ML/Data/SplitData.pyi
diff --git a/rdkit-stubs/ML/Data/Stats.pyi b/src/rdkit-stubs/ML/Data/Stats.pyi
similarity index 100%
rename from rdkit-stubs/ML/Data/Stats.pyi
rename to src/rdkit-stubs/ML/Data/Stats.pyi
diff --git a/rdkit-stubs/ML/Data/Transforms.pyi b/src/rdkit-stubs/ML/Data/Transforms.pyi
similarity index 100%
rename from rdkit-stubs/ML/Data/Transforms.pyi
rename to src/rdkit-stubs/ML/Data/Transforms.pyi
diff --git a/rdkit-stubs/ML/Data/__init__.pyi b/src/rdkit-stubs/ML/Data/__init__.pyi
similarity index 100%
rename from rdkit-stubs/ML/Data/__init__.pyi
rename to src/rdkit-stubs/ML/Data/__init__.pyi
diff --git a/rdkit-stubs/ML/Data/cQuantize.pyi b/src/rdkit-stubs/ML/Data/cQuantize.pyi
similarity index 100%
rename from rdkit-stubs/ML/Data/cQuantize.pyi
rename to src/rdkit-stubs/ML/Data/cQuantize.pyi
diff --git a/rdkit-stubs/ML/DecTree/BuildQuantTree.pyi b/src/rdkit-stubs/ML/DecTree/BuildQuantTree.pyi
similarity index 100%
rename from rdkit-stubs/ML/DecTree/BuildQuantTree.pyi
rename to src/rdkit-stubs/ML/DecTree/BuildQuantTree.pyi
diff --git a/rdkit-stubs/ML/DecTree/BuildSigTree.pyi b/src/rdkit-stubs/ML/DecTree/BuildSigTree.pyi
similarity index 100%
rename from rdkit-stubs/ML/DecTree/BuildSigTree.pyi
rename to src/rdkit-stubs/ML/DecTree/BuildSigTree.pyi
diff --git a/rdkit-stubs/ML/DecTree/CrossValidate.pyi b/src/rdkit-stubs/ML/DecTree/CrossValidate.pyi
similarity index 100%
rename from rdkit-stubs/ML/DecTree/CrossValidate.pyi
rename to src/rdkit-stubs/ML/DecTree/CrossValidate.pyi
diff --git a/rdkit-stubs/ML/DecTree/DecTree.pyi b/src/rdkit-stubs/ML/DecTree/DecTree.pyi
similarity index 100%
rename from rdkit-stubs/ML/DecTree/DecTree.pyi
rename to src/rdkit-stubs/ML/DecTree/DecTree.pyi
diff --git a/rdkit-stubs/ML/DecTree/Forest.pyi b/src/rdkit-stubs/ML/DecTree/Forest.pyi
similarity index 100%
rename from rdkit-stubs/ML/DecTree/Forest.pyi
rename to src/rdkit-stubs/ML/DecTree/Forest.pyi
diff --git a/rdkit-stubs/ML/DecTree/ID3.pyi b/src/rdkit-stubs/ML/DecTree/ID3.pyi
similarity index 100%
rename from rdkit-stubs/ML/DecTree/ID3.pyi
rename to src/rdkit-stubs/ML/DecTree/ID3.pyi
diff --git a/rdkit-stubs/ML/DecTree/PruneTree.pyi b/src/rdkit-stubs/ML/DecTree/PruneTree.pyi
similarity index 100%
rename from rdkit-stubs/ML/DecTree/PruneTree.pyi
rename to src/rdkit-stubs/ML/DecTree/PruneTree.pyi
diff --git a/rdkit-stubs/ML/DecTree/QuantTree.pyi b/src/rdkit-stubs/ML/DecTree/QuantTree.pyi
similarity index 100%
rename from rdkit-stubs/ML/DecTree/QuantTree.pyi
rename to src/rdkit-stubs/ML/DecTree/QuantTree.pyi
diff --git a/rdkit-stubs/ML/DecTree/SigTree.pyi b/src/rdkit-stubs/ML/DecTree/SigTree.pyi
similarity index 100%
rename from rdkit-stubs/ML/DecTree/SigTree.pyi
rename to src/rdkit-stubs/ML/DecTree/SigTree.pyi
diff --git a/rdkit-stubs/ML/DecTree/Tree.pyi b/src/rdkit-stubs/ML/DecTree/Tree.pyi
similarity index 100%
rename from rdkit-stubs/ML/DecTree/Tree.pyi
rename to src/rdkit-stubs/ML/DecTree/Tree.pyi
diff --git a/rdkit-stubs/ML/DecTree/TreeUtils.pyi b/src/rdkit-stubs/ML/DecTree/TreeUtils.pyi
similarity index 100%
rename from rdkit-stubs/ML/DecTree/TreeUtils.pyi
rename to src/rdkit-stubs/ML/DecTree/TreeUtils.pyi
diff --git a/rdkit-stubs/ML/DecTree/TreeVis.pyi b/src/rdkit-stubs/ML/DecTree/TreeVis.pyi
similarity index 100%
rename from rdkit-stubs/ML/DecTree/TreeVis.pyi
rename to src/rdkit-stubs/ML/DecTree/TreeVis.pyi
diff --git a/rdkit-stubs/ML/DecTree/__init__.pyi b/src/rdkit-stubs/ML/DecTree/__init__.pyi
similarity index 100%
rename from rdkit-stubs/ML/DecTree/__init__.pyi
rename to src/rdkit-stubs/ML/DecTree/__init__.pyi
diff --git a/rdkit-stubs/ML/DecTree/randomtest.pyi b/src/rdkit-stubs/ML/DecTree/randomtest.pyi
similarity index 100%
rename from rdkit-stubs/ML/DecTree/randomtest.pyi
rename to src/rdkit-stubs/ML/DecTree/randomtest.pyi
diff --git a/rdkit-stubs/ML/Descriptors/CompoundDescriptors.pyi b/src/rdkit-stubs/ML/Descriptors/CompoundDescriptors.pyi
similarity index 100%
rename from rdkit-stubs/ML/Descriptors/CompoundDescriptors.pyi
rename to src/rdkit-stubs/ML/Descriptors/CompoundDescriptors.pyi
diff --git a/rdkit-stubs/ML/Descriptors/Descriptors.pyi b/src/rdkit-stubs/ML/Descriptors/Descriptors.pyi
similarity index 100%
rename from rdkit-stubs/ML/Descriptors/Descriptors.pyi
rename to src/rdkit-stubs/ML/Descriptors/Descriptors.pyi
diff --git a/rdkit-stubs/ML/Descriptors/MoleculeDescriptors.pyi b/src/rdkit-stubs/ML/Descriptors/MoleculeDescriptors.pyi
similarity index 100%
rename from rdkit-stubs/ML/Descriptors/MoleculeDescriptors.pyi
rename to src/rdkit-stubs/ML/Descriptors/MoleculeDescriptors.pyi
diff --git a/rdkit-stubs/ML/Descriptors/Parser.pyi b/src/rdkit-stubs/ML/Descriptors/Parser.pyi
similarity index 100%
rename from rdkit-stubs/ML/Descriptors/Parser.pyi
rename to src/rdkit-stubs/ML/Descriptors/Parser.pyi
diff --git a/rdkit-stubs/ML/Descriptors/__init__.pyi b/src/rdkit-stubs/ML/Descriptors/__init__.pyi
similarity index 100%
rename from rdkit-stubs/ML/Descriptors/__init__.pyi
rename to src/rdkit-stubs/ML/Descriptors/__init__.pyi
diff --git a/rdkit-stubs/ML/EnrichPlot.pyi b/src/rdkit-stubs/ML/EnrichPlot.pyi
similarity index 100%
rename from rdkit-stubs/ML/EnrichPlot.pyi
rename to src/rdkit-stubs/ML/EnrichPlot.pyi
diff --git a/rdkit-stubs/ML/GrowComposite.pyi b/src/rdkit-stubs/ML/GrowComposite.pyi
similarity index 100%
rename from rdkit-stubs/ML/GrowComposite.pyi
rename to src/rdkit-stubs/ML/GrowComposite.pyi
diff --git a/rdkit-stubs/ML/InfoTheory/BitClusterer.pyi b/src/rdkit-stubs/ML/InfoTheory/BitClusterer.pyi
similarity index 100%
rename from rdkit-stubs/ML/InfoTheory/BitClusterer.pyi
rename to src/rdkit-stubs/ML/InfoTheory/BitClusterer.pyi
diff --git a/rdkit-stubs/ML/InfoTheory/BitRank.pyi b/src/rdkit-stubs/ML/InfoTheory/BitRank.pyi
similarity index 100%
rename from rdkit-stubs/ML/InfoTheory/BitRank.pyi
rename to src/rdkit-stubs/ML/InfoTheory/BitRank.pyi
diff --git a/rdkit-stubs/ML/InfoTheory/__init__.pyi b/src/rdkit-stubs/ML/InfoTheory/__init__.pyi
similarity index 100%
rename from rdkit-stubs/ML/InfoTheory/__init__.pyi
rename to src/rdkit-stubs/ML/InfoTheory/__init__.pyi
diff --git a/rdkit-stubs/ML/InfoTheory/entropy.pyi b/src/rdkit-stubs/ML/InfoTheory/entropy.pyi
similarity index 100%
rename from rdkit-stubs/ML/InfoTheory/entropy.pyi
rename to src/rdkit-stubs/ML/InfoTheory/entropy.pyi
diff --git a/rdkit-stubs/ML/InfoTheory/rdInfoTheory.pyi b/src/rdkit-stubs/ML/InfoTheory/rdInfoTheory.pyi
similarity index 100%
rename from rdkit-stubs/ML/InfoTheory/rdInfoTheory.pyi
rename to src/rdkit-stubs/ML/InfoTheory/rdInfoTheory.pyi
diff --git a/rdkit-stubs/ML/KNN/CrossValidate.pyi b/src/rdkit-stubs/ML/KNN/CrossValidate.pyi
similarity index 100%
rename from rdkit-stubs/ML/KNN/CrossValidate.pyi
rename to src/rdkit-stubs/ML/KNN/CrossValidate.pyi
diff --git a/rdkit-stubs/ML/KNN/DistFunctions.pyi b/src/rdkit-stubs/ML/KNN/DistFunctions.pyi
similarity index 100%
rename from rdkit-stubs/ML/KNN/DistFunctions.pyi
rename to src/rdkit-stubs/ML/KNN/DistFunctions.pyi
diff --git a/rdkit-stubs/ML/KNN/KNNClassificationModel.pyi b/src/rdkit-stubs/ML/KNN/KNNClassificationModel.pyi
similarity index 100%
rename from rdkit-stubs/ML/KNN/KNNClassificationModel.pyi
rename to src/rdkit-stubs/ML/KNN/KNNClassificationModel.pyi
diff --git a/rdkit-stubs/ML/KNN/KNNModel.pyi b/src/rdkit-stubs/ML/KNN/KNNModel.pyi
similarity index 100%
rename from rdkit-stubs/ML/KNN/KNNModel.pyi
rename to src/rdkit-stubs/ML/KNN/KNNModel.pyi
diff --git a/rdkit-stubs/ML/KNN/KNNRegressionModel.pyi b/src/rdkit-stubs/ML/KNN/KNNRegressionModel.pyi
similarity index 100%
rename from rdkit-stubs/ML/KNN/KNNRegressionModel.pyi
rename to src/rdkit-stubs/ML/KNN/KNNRegressionModel.pyi
diff --git a/rdkit-stubs/ML/KNN/__init__.pyi b/src/rdkit-stubs/ML/KNN/__init__.pyi
similarity index 100%
rename from rdkit-stubs/ML/KNN/__init__.pyi
rename to src/rdkit-stubs/ML/KNN/__init__.pyi
diff --git a/rdkit-stubs/ML/MLUtils/VoteImg.pyi b/src/rdkit-stubs/ML/MLUtils/VoteImg.pyi
similarity index 100%
rename from rdkit-stubs/ML/MLUtils/VoteImg.pyi
rename to src/rdkit-stubs/ML/MLUtils/VoteImg.pyi
diff --git a/rdkit-stubs/ML/MLUtils/__init__.pyi b/src/rdkit-stubs/ML/MLUtils/__init__.pyi
similarity index 100%
rename from rdkit-stubs/ML/MLUtils/__init__.pyi
rename to src/rdkit-stubs/ML/MLUtils/__init__.pyi
diff --git a/rdkit-stubs/ML/MatOps.pyi b/src/rdkit-stubs/ML/MatOps.pyi
similarity index 100%
rename from rdkit-stubs/ML/MatOps.pyi
rename to src/rdkit-stubs/ML/MatOps.pyi
diff --git a/rdkit-stubs/ML/ModelPackage/PackageUtils.pyi b/src/rdkit-stubs/ML/ModelPackage/PackageUtils.pyi
similarity index 100%
rename from rdkit-stubs/ML/ModelPackage/PackageUtils.pyi
rename to src/rdkit-stubs/ML/ModelPackage/PackageUtils.pyi
diff --git a/rdkit-stubs/ML/ModelPackage/Packager.pyi b/src/rdkit-stubs/ML/ModelPackage/Packager.pyi
similarity index 100%
rename from rdkit-stubs/ML/ModelPackage/Packager.pyi
rename to src/rdkit-stubs/ML/ModelPackage/Packager.pyi
diff --git a/rdkit-stubs/ML/ModelPackage/__init__.pyi b/src/rdkit-stubs/ML/ModelPackage/__init__.pyi
similarity index 100%
rename from rdkit-stubs/ML/ModelPackage/__init__.pyi
rename to src/rdkit-stubs/ML/ModelPackage/__init__.pyi
diff --git a/rdkit-stubs/ML/NaiveBayes/ClassificationModel.pyi b/src/rdkit-stubs/ML/NaiveBayes/ClassificationModel.pyi
similarity index 100%
rename from rdkit-stubs/ML/NaiveBayes/ClassificationModel.pyi
rename to src/rdkit-stubs/ML/NaiveBayes/ClassificationModel.pyi
diff --git a/rdkit-stubs/ML/NaiveBayes/CrossValidate.pyi b/src/rdkit-stubs/ML/NaiveBayes/CrossValidate.pyi
similarity index 100%
rename from rdkit-stubs/ML/NaiveBayes/CrossValidate.pyi
rename to src/rdkit-stubs/ML/NaiveBayes/CrossValidate.pyi
diff --git a/rdkit-stubs/ML/NaiveBayes/__init__.pyi b/src/rdkit-stubs/ML/NaiveBayes/__init__.pyi
similarity index 100%
rename from rdkit-stubs/ML/NaiveBayes/__init__.pyi
rename to src/rdkit-stubs/ML/NaiveBayes/__init__.pyi
diff --git a/rdkit-stubs/ML/Neural/ActFuncs.pyi b/src/rdkit-stubs/ML/Neural/ActFuncs.pyi
similarity index 100%
rename from rdkit-stubs/ML/Neural/ActFuncs.pyi
rename to src/rdkit-stubs/ML/Neural/ActFuncs.pyi
diff --git a/rdkit-stubs/ML/Neural/CrossValidate.pyi b/src/rdkit-stubs/ML/Neural/CrossValidate.pyi
similarity index 100%
rename from rdkit-stubs/ML/Neural/CrossValidate.pyi
rename to src/rdkit-stubs/ML/Neural/CrossValidate.pyi
diff --git a/rdkit-stubs/ML/Neural/NetNode.pyi b/src/rdkit-stubs/ML/Neural/NetNode.pyi
similarity index 100%
rename from rdkit-stubs/ML/Neural/NetNode.pyi
rename to src/rdkit-stubs/ML/Neural/NetNode.pyi
diff --git a/rdkit-stubs/ML/Neural/Network.pyi b/src/rdkit-stubs/ML/Neural/Network.pyi
similarity index 100%
rename from rdkit-stubs/ML/Neural/Network.pyi
rename to src/rdkit-stubs/ML/Neural/Network.pyi
diff --git a/rdkit-stubs/ML/Neural/Trainers.pyi b/src/rdkit-stubs/ML/Neural/Trainers.pyi
similarity index 100%
rename from rdkit-stubs/ML/Neural/Trainers.pyi
rename to src/rdkit-stubs/ML/Neural/Trainers.pyi
diff --git a/rdkit-stubs/ML/Neural/__init__.pyi b/src/rdkit-stubs/ML/Neural/__init__.pyi
similarity index 100%
rename from rdkit-stubs/ML/Neural/__init__.pyi
rename to src/rdkit-stubs/ML/Neural/__init__.pyi
diff --git a/rdkit-stubs/ML/SLT/Risk.pyi b/src/rdkit-stubs/ML/SLT/Risk.pyi
similarity index 100%
rename from rdkit-stubs/ML/SLT/Risk.pyi
rename to src/rdkit-stubs/ML/SLT/Risk.pyi
diff --git a/rdkit-stubs/ML/SLT/__init__.pyi b/src/rdkit-stubs/ML/SLT/__init__.pyi
similarity index 100%
rename from rdkit-stubs/ML/SLT/__init__.pyi
rename to src/rdkit-stubs/ML/SLT/__init__.pyi
diff --git a/rdkit-stubs/ML/Scoring/Scoring.pyi b/src/rdkit-stubs/ML/Scoring/Scoring.pyi
similarity index 100%
rename from rdkit-stubs/ML/Scoring/Scoring.pyi
rename to src/rdkit-stubs/ML/Scoring/Scoring.pyi
diff --git a/rdkit-stubs/ML/Scoring/__init__.pyi b/src/rdkit-stubs/ML/Scoring/__init__.pyi
similarity index 100%
rename from rdkit-stubs/ML/Scoring/__init__.pyi
rename to src/rdkit-stubs/ML/Scoring/__init__.pyi
diff --git a/rdkit-stubs/ML/ScreenComposite.pyi b/src/rdkit-stubs/ML/ScreenComposite.pyi
similarity index 100%
rename from rdkit-stubs/ML/ScreenComposite.pyi
rename to src/rdkit-stubs/ML/ScreenComposite.pyi
diff --git a/rdkit-stubs/ML/__init__.pyi b/src/rdkit-stubs/ML/__init__.pyi
similarity index 100%
rename from rdkit-stubs/ML/__init__.pyi
rename to src/rdkit-stubs/ML/__init__.pyi
diff --git a/rdkit-stubs/ML/files.pyi b/src/rdkit-stubs/ML/files.pyi
similarity index 100%
rename from rdkit-stubs/ML/files.pyi
rename to src/rdkit-stubs/ML/files.pyi
diff --git a/rdkit-stubs/Numerics/__init__.pyi b/src/rdkit-stubs/Numerics/__init__.pyi
similarity index 100%
rename from rdkit-stubs/Numerics/__init__.pyi
rename to src/rdkit-stubs/Numerics/__init__.pyi
diff --git a/rdkit-stubs/Numerics/rdAlignment.pyi b/src/rdkit-stubs/Numerics/rdAlignment.pyi
similarity index 100%
rename from rdkit-stubs/Numerics/rdAlignment.pyi
rename to src/rdkit-stubs/Numerics/rdAlignment.pyi
diff --git a/rdkit-stubs/RDConfig.pyi b/src/rdkit-stubs/RDConfig.pyi
similarity index 100%
rename from rdkit-stubs/RDConfig.pyi
rename to src/rdkit-stubs/RDConfig.pyi
diff --git a/rdkit-stubs/RDLogger.pyi b/src/rdkit-stubs/RDLogger.pyi
similarity index 100%
rename from rdkit-stubs/RDLogger.pyi
rename to src/rdkit-stubs/RDLogger.pyi
diff --git a/rdkit-stubs/RDPaths.pyi b/src/rdkit-stubs/RDPaths.pyi
similarity index 100%
rename from rdkit-stubs/RDPaths.pyi
rename to src/rdkit-stubs/RDPaths.pyi
diff --git a/rdkit-stubs/RDRandom.pyi b/src/rdkit-stubs/RDRandom.pyi
similarity index 100%
rename from rdkit-stubs/RDRandom.pyi
rename to src/rdkit-stubs/RDRandom.pyi
diff --git a/rdkit-stubs/SimDivFilters/SimilarityPickers.pyi b/src/rdkit-stubs/SimDivFilters/SimilarityPickers.pyi
similarity index 100%
rename from rdkit-stubs/SimDivFilters/SimilarityPickers.pyi
rename to src/rdkit-stubs/SimDivFilters/SimilarityPickers.pyi
diff --git a/rdkit-stubs/SimDivFilters/__init__.pyi b/src/rdkit-stubs/SimDivFilters/__init__.pyi
similarity index 100%
rename from rdkit-stubs/SimDivFilters/__init__.pyi
rename to src/rdkit-stubs/SimDivFilters/__init__.pyi
diff --git a/rdkit-stubs/SimDivFilters/rdSimDivPickers.pyi b/src/rdkit-stubs/SimDivFilters/rdSimDivPickers.pyi
similarity index 100%
rename from rdkit-stubs/SimDivFilters/rdSimDivPickers.pyi
rename to src/rdkit-stubs/SimDivFilters/rdSimDivPickers.pyi
diff --git a/rdkit-stubs/TestRunner.pyi b/src/rdkit-stubs/TestRunner.pyi
similarity index 100%
rename from rdkit-stubs/TestRunner.pyi
rename to src/rdkit-stubs/TestRunner.pyi
diff --git a/rdkit-stubs/VLib/Filter.pyi b/src/rdkit-stubs/VLib/Filter.pyi
similarity index 100%
rename from rdkit-stubs/VLib/Filter.pyi
rename to src/rdkit-stubs/VLib/Filter.pyi
diff --git a/rdkit-stubs/VLib/Node.pyi b/src/rdkit-stubs/VLib/Node.pyi
similarity index 100%
rename from rdkit-stubs/VLib/Node.pyi
rename to src/rdkit-stubs/VLib/Node.pyi
diff --git a/rdkit-stubs/VLib/NodeLib/DbMolSupply.pyi b/src/rdkit-stubs/VLib/NodeLib/DbMolSupply.pyi
similarity index 100%
rename from rdkit-stubs/VLib/NodeLib/DbMolSupply.pyi
rename to src/rdkit-stubs/VLib/NodeLib/DbMolSupply.pyi
diff --git a/rdkit-stubs/VLib/NodeLib/DbPickleSupplier.pyi b/src/rdkit-stubs/VLib/NodeLib/DbPickleSupplier.pyi
similarity index 100%
rename from rdkit-stubs/VLib/NodeLib/DbPickleSupplier.pyi
rename to src/rdkit-stubs/VLib/NodeLib/DbPickleSupplier.pyi
diff --git a/rdkit-stubs/VLib/NodeLib/SDSupply.pyi b/src/rdkit-stubs/VLib/NodeLib/SDSupply.pyi
similarity index 100%
rename from rdkit-stubs/VLib/NodeLib/SDSupply.pyi
rename to src/rdkit-stubs/VLib/NodeLib/SDSupply.pyi
diff --git a/rdkit-stubs/VLib/NodeLib/SmartsMolFilter.pyi b/src/rdkit-stubs/VLib/NodeLib/SmartsMolFilter.pyi
similarity index 100%
rename from rdkit-stubs/VLib/NodeLib/SmartsMolFilter.pyi
rename to src/rdkit-stubs/VLib/NodeLib/SmartsMolFilter.pyi
diff --git a/rdkit-stubs/VLib/NodeLib/SmartsRemover.pyi b/src/rdkit-stubs/VLib/NodeLib/SmartsRemover.pyi
similarity index 100%
rename from rdkit-stubs/VLib/NodeLib/SmartsRemover.pyi
rename to src/rdkit-stubs/VLib/NodeLib/SmartsRemover.pyi
diff --git a/rdkit-stubs/VLib/NodeLib/SmilesDupeFilter.pyi b/src/rdkit-stubs/VLib/NodeLib/SmilesDupeFilter.pyi
similarity index 100%
rename from rdkit-stubs/VLib/NodeLib/SmilesDupeFilter.pyi
rename to src/rdkit-stubs/VLib/NodeLib/SmilesDupeFilter.pyi
diff --git a/rdkit-stubs/VLib/NodeLib/SmilesOutput.pyi b/src/rdkit-stubs/VLib/NodeLib/SmilesOutput.pyi
similarity index 100%
rename from rdkit-stubs/VLib/NodeLib/SmilesOutput.pyi
rename to src/rdkit-stubs/VLib/NodeLib/SmilesOutput.pyi
diff --git a/rdkit-stubs/VLib/NodeLib/SmilesSupply.pyi b/src/rdkit-stubs/VLib/NodeLib/SmilesSupply.pyi
similarity index 100%
rename from rdkit-stubs/VLib/NodeLib/SmilesSupply.pyi
rename to src/rdkit-stubs/VLib/NodeLib/SmilesSupply.pyi
diff --git a/rdkit-stubs/VLib/NodeLib/__init__.pyi b/src/rdkit-stubs/VLib/NodeLib/__init__.pyi
similarity index 100%
rename from rdkit-stubs/VLib/NodeLib/__init__.pyi
rename to src/rdkit-stubs/VLib/NodeLib/__init__.pyi
diff --git a/rdkit-stubs/VLib/NodeLib/demo.pyi b/src/rdkit-stubs/VLib/NodeLib/demo.pyi
similarity index 100%
rename from rdkit-stubs/VLib/NodeLib/demo.pyi
rename to src/rdkit-stubs/VLib/NodeLib/demo.pyi
diff --git a/rdkit-stubs/VLib/Output.pyi b/src/rdkit-stubs/VLib/Output.pyi
similarity index 100%
rename from rdkit-stubs/VLib/Output.pyi
rename to src/rdkit-stubs/VLib/Output.pyi
diff --git a/rdkit-stubs/VLib/Supply.pyi b/src/rdkit-stubs/VLib/Supply.pyi
similarity index 100%
rename from rdkit-stubs/VLib/Supply.pyi
rename to src/rdkit-stubs/VLib/Supply.pyi
diff --git a/rdkit-stubs/VLib/Transform.pyi b/src/rdkit-stubs/VLib/Transform.pyi
similarity index 100%
rename from rdkit-stubs/VLib/Transform.pyi
rename to src/rdkit-stubs/VLib/Transform.pyi
diff --git a/rdkit-stubs/VLib/__init__.pyi b/src/rdkit-stubs/VLib/__init__.pyi
similarity index 100%
rename from rdkit-stubs/VLib/__init__.pyi
rename to src/rdkit-stubs/VLib/__init__.pyi
diff --git a/rdkit-stubs/__init__.pyi b/src/rdkit-stubs/__init__.pyi
similarity index 100%
rename from rdkit-stubs/__init__.pyi
rename to src/rdkit-stubs/__init__.pyi
diff --git a/rdkit-stubs/rdBase.pyi b/src/rdkit-stubs/rdBase.pyi
similarity index 100%
rename from rdkit-stubs/rdBase.pyi
rename to src/rdkit-stubs/rdBase.pyi
diff --git a/rdkit-stubs/sping/PDF/__init__.pyi b/src/rdkit-stubs/sping/PDF/__init__.pyi
similarity index 100%
rename from rdkit-stubs/sping/PDF/__init__.pyi
rename to src/rdkit-stubs/sping/PDF/__init__.pyi
diff --git a/rdkit-stubs/sping/PDF/pdfdoc.pyi b/src/rdkit-stubs/sping/PDF/pdfdoc.pyi
similarity index 100%
rename from rdkit-stubs/sping/PDF/pdfdoc.pyi
rename to src/rdkit-stubs/sping/PDF/pdfdoc.pyi
diff --git a/rdkit-stubs/sping/PDF/pdfgen.pyi b/src/rdkit-stubs/sping/PDF/pdfgen.pyi
similarity index 100%
rename from rdkit-stubs/sping/PDF/pdfgen.pyi
rename to src/rdkit-stubs/sping/PDF/pdfgen.pyi
diff --git a/rdkit-stubs/sping/PDF/pdfgeom.pyi b/src/rdkit-stubs/sping/PDF/pdfgeom.pyi
similarity index 100%
rename from rdkit-stubs/sping/PDF/pdfgeom.pyi
rename to src/rdkit-stubs/sping/PDF/pdfgeom.pyi
diff --git a/rdkit-stubs/sping/PDF/pdfmetrics.pyi b/src/rdkit-stubs/sping/PDF/pdfmetrics.pyi
similarity index 100%
rename from rdkit-stubs/sping/PDF/pdfmetrics.pyi
rename to src/rdkit-stubs/sping/PDF/pdfmetrics.pyi
diff --git a/rdkit-stubs/sping/PDF/pdfutils.pyi b/src/rdkit-stubs/sping/PDF/pdfutils.pyi
similarity index 100%
rename from rdkit-stubs/sping/PDF/pdfutils.pyi
rename to src/rdkit-stubs/sping/PDF/pdfutils.pyi
diff --git a/rdkit-stubs/sping/PDF/pidPDF.pyi b/src/rdkit-stubs/sping/PDF/pidPDF.pyi
similarity index 100%
rename from rdkit-stubs/sping/PDF/pidPDF.pyi
rename to src/rdkit-stubs/sping/PDF/pidPDF.pyi
diff --git a/rdkit-stubs/sping/PIL/__init__.pyi b/src/rdkit-stubs/sping/PIL/__init__.pyi
similarity index 100%
rename from rdkit-stubs/sping/PIL/__init__.pyi
rename to src/rdkit-stubs/sping/PIL/__init__.pyi
diff --git a/rdkit-stubs/sping/PIL/pidPIL.pyi b/src/rdkit-stubs/sping/PIL/pidPIL.pyi
similarity index 100%
rename from rdkit-stubs/sping/PIL/pidPIL.pyi
rename to src/rdkit-stubs/sping/PIL/pidPIL.pyi
diff --git a/rdkit-stubs/sping/PS/__init__.pyi b/src/rdkit-stubs/sping/PS/__init__.pyi
similarity index 100%
rename from rdkit-stubs/sping/PS/__init__.pyi
rename to src/rdkit-stubs/sping/PS/__init__.pyi
diff --git a/rdkit-stubs/sping/PS/fontinfo.pyi b/src/rdkit-stubs/sping/PS/fontinfo.pyi
similarity index 100%
rename from rdkit-stubs/sping/PS/fontinfo.pyi
rename to src/rdkit-stubs/sping/PS/fontinfo.pyi
diff --git a/rdkit-stubs/sping/PS/latin1MetricsCache.pyi b/src/rdkit-stubs/sping/PS/latin1MetricsCache.pyi
similarity index 100%
rename from rdkit-stubs/sping/PS/latin1MetricsCache.pyi
rename to src/rdkit-stubs/sping/PS/latin1MetricsCache.pyi
diff --git a/rdkit-stubs/sping/PS/pidPS.pyi b/src/rdkit-stubs/sping/PS/pidPS.pyi
similarity index 100%
rename from rdkit-stubs/sping/PS/pidPS.pyi
rename to src/rdkit-stubs/sping/PS/pidPS.pyi
diff --git a/rdkit-stubs/sping/PS/psmetrics.pyi b/src/rdkit-stubs/sping/PS/psmetrics.pyi
similarity index 100%
rename from rdkit-stubs/sping/PS/psmetrics.pyi
rename to src/rdkit-stubs/sping/PS/psmetrics.pyi
diff --git a/rdkit-stubs/sping/Pyart/__init__.pyi b/src/rdkit-stubs/sping/Pyart/__init__.pyi
similarity index 100%
rename from rdkit-stubs/sping/Pyart/__init__.pyi
rename to src/rdkit-stubs/sping/Pyart/__init__.pyi
diff --git a/rdkit-stubs/sping/Qt/__init__.pyi b/src/rdkit-stubs/sping/Qt/__init__.pyi
similarity index 100%
rename from rdkit-stubs/sping/Qt/__init__.pyi
rename to src/rdkit-stubs/sping/Qt/__init__.pyi
diff --git a/rdkit-stubs/sping/Qt/pidQt.pyi b/src/rdkit-stubs/sping/Qt/pidQt.pyi
similarity index 100%
rename from rdkit-stubs/sping/Qt/pidQt.pyi
rename to src/rdkit-stubs/sping/Qt/pidQt.pyi
diff --git a/rdkit-stubs/sping/Qt/pidQt4.pyi b/src/rdkit-stubs/sping/Qt/pidQt4.pyi
similarity index 100%
rename from rdkit-stubs/sping/Qt/pidQt4.pyi
rename to src/rdkit-stubs/sping/Qt/pidQt4.pyi
diff --git a/rdkit-stubs/sping/ReportLab/__init__.pyi b/src/rdkit-stubs/sping/ReportLab/__init__.pyi
similarity index 100%
rename from rdkit-stubs/sping/ReportLab/__init__.pyi
rename to src/rdkit-stubs/sping/ReportLab/__init__.pyi
diff --git a/rdkit-stubs/sping/ReportLab/pidReportLab.pyi b/src/rdkit-stubs/sping/ReportLab/pidReportLab.pyi
similarity index 100%
rename from rdkit-stubs/sping/ReportLab/pidReportLab.pyi
rename to src/rdkit-stubs/sping/ReportLab/pidReportLab.pyi
diff --git a/rdkit-stubs/sping/SVG/__init__.pyi b/src/rdkit-stubs/sping/SVG/__init__.pyi
similarity index 100%
rename from rdkit-stubs/sping/SVG/__init__.pyi
rename to src/rdkit-stubs/sping/SVG/__init__.pyi
diff --git a/rdkit-stubs/sping/SVG/pidSVG.pyi b/src/rdkit-stubs/sping/SVG/pidSVG.pyi
similarity index 100%
rename from rdkit-stubs/sping/SVG/pidSVG.pyi
rename to src/rdkit-stubs/sping/SVG/pidSVG.pyi
diff --git a/rdkit-stubs/sping/TK/__init__.pyi b/src/rdkit-stubs/sping/TK/__init__.pyi
similarity index 100%
rename from rdkit-stubs/sping/TK/__init__.pyi
rename to src/rdkit-stubs/sping/TK/__init__.pyi
diff --git a/rdkit-stubs/sping/WX/__init__.pyi b/src/rdkit-stubs/sping/WX/__init__.pyi
similarity index 100%
rename from rdkit-stubs/sping/WX/__init__.pyi
rename to src/rdkit-stubs/sping/WX/__init__.pyi
diff --git a/rdkit-stubs/sping/__init__.pyi b/src/rdkit-stubs/sping/__init__.pyi
similarity index 100%
rename from rdkit-stubs/sping/__init__.pyi
rename to src/rdkit-stubs/sping/__init__.pyi
diff --git a/rdkit-stubs/sping/colors.pyi b/src/rdkit-stubs/sping/colors.pyi
similarity index 100%
rename from rdkit-stubs/sping/colors.pyi
rename to src/rdkit-stubs/sping/colors.pyi
diff --git a/rdkit-stubs/sping/pagesizes.pyi b/src/rdkit-stubs/sping/pagesizes.pyi
similarity index 100%
rename from rdkit-stubs/sping/pagesizes.pyi
rename to src/rdkit-stubs/sping/pagesizes.pyi
diff --git a/rdkit-stubs/sping/pid.pyi b/src/rdkit-stubs/sping/pid.pyi
similarity index 100%
rename from rdkit-stubs/sping/pid.pyi
rename to src/rdkit-stubs/sping/pid.pyi
diff --git a/rdkit-stubs/sping/stringformat.pyi b/src/rdkit-stubs/sping/stringformat.pyi
similarity index 100%
rename from rdkit-stubs/sping/stringformat.pyi
rename to src/rdkit-stubs/sping/stringformat.pyi
diff --git a/rdkit-stubs/sping/util/HTMLPiddler.pyi b/src/rdkit-stubs/sping/util/HTMLPiddler.pyi
similarity index 100%
rename from rdkit-stubs/sping/util/HTMLPiddler.pyi
rename to src/rdkit-stubs/sping/util/HTMLPiddler.pyi
diff --git a/rdkit-stubs/sping/util/__init__.pyi b/src/rdkit-stubs/sping/util/__init__.pyi
similarity index 100%
rename from rdkit-stubs/sping/util/__init__.pyi
rename to src/rdkit-stubs/sping/util/__init__.pyi
diff --git a/rdkit-stubs/sping/utils.pyi b/src/rdkit-stubs/sping/utils.pyi
similarity index 100%
rename from rdkit-stubs/sping/utils.pyi
rename to src/rdkit-stubs/sping/utils.pyi
diff --git a/rdkit-stubs/utils/__init__.pyi b/src/rdkit-stubs/utils/__init__.pyi
similarity index 100%
rename from rdkit-stubs/utils/__init__.pyi
rename to src/rdkit-stubs/utils/__init__.pyi
diff --git a/rdkit-stubs/utils/cactvs.pyi b/src/rdkit-stubs/utils/cactvs.pyi
similarity index 100%
rename from rdkit-stubs/utils/cactvs.pyi
rename to src/rdkit-stubs/utils/cactvs.pyi
diff --git a/rdkit-stubs/utils/chemdraw.pyi b/src/rdkit-stubs/utils/chemdraw.pyi
similarity index 100%
rename from rdkit-stubs/utils/chemdraw.pyi
rename to src/rdkit-stubs/utils/chemdraw.pyi
diff --git a/rdkit-stubs/utils/chemdraw_qax.pyi b/src/rdkit-stubs/utils/chemdraw_qax.pyi
similarity index 100%
rename from rdkit-stubs/utils/chemdraw_qax.pyi
rename to src/rdkit-stubs/utils/chemdraw_qax.pyi
diff --git a/rdkit-stubs/utils/chemutils.pyi b/src/rdkit-stubs/utils/chemutils.pyi
similarity index 100%
rename from rdkit-stubs/utils/chemutils.pyi
rename to src/rdkit-stubs/utils/chemutils.pyi
diff --git a/rdkit-stubs/utils/comhack.pyi b/src/rdkit-stubs/utils/comhack.pyi
similarity index 100%
rename from rdkit-stubs/utils/comhack.pyi
rename to src/rdkit-stubs/utils/comhack.pyi
diff --git a/rdkit-stubs/utils/fileutils.pyi b/src/rdkit-stubs/utils/fileutils.pyi
similarity index 100%
rename from rdkit-stubs/utils/fileutils.pyi
rename to src/rdkit-stubs/utils/fileutils.pyi
diff --git a/rdkit-stubs/utils/listutils.pyi b/src/rdkit-stubs/utils/listutils.pyi
similarity index 100%
rename from rdkit-stubs/utils/listutils.pyi
rename to src/rdkit-stubs/utils/listutils.pyi
diff --git a/rdkit-stubs/utils/spiral.pyi b/src/rdkit-stubs/utils/spiral.pyi
similarity index 100%
rename from rdkit-stubs/utils/spiral.pyi
rename to src/rdkit-stubs/utils/spiral.pyi
diff --git a/test/poetry.lock b/test/poetry.lock
index ac9a52a..e87768d 100644
--- a/test/poetry.lock
+++ b/test/poetry.lock
@@ -275,13 +275,13 @@ testing = ["pytest", "pytest-benchmark"]
 
 [[package]]
 name = "pyright"
-version = "1.1.380"
+version = "1.1.381"
 description = "Command line wrapper for pyright"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "pyright-1.1.380-py3-none-any.whl", hash = "sha256:a6404392053d8848bacc7aebcbd9d318bb46baf1a1a000359305481920f43879"},
-    {file = "pyright-1.1.380.tar.gz", hash = "sha256:e6ceb1a5f7e9f03106e0aa1d6fbb4d97735a5e7ffb59f3de6b2db590baf935b2"},
+    {file = "pyright-1.1.381-py3-none-any.whl", hash = "sha256:5dc0aa80a265675d36abab59c674ae01dbe476714f91845b61b841d34aa99081"},
+    {file = "pyright-1.1.381.tar.gz", hash = "sha256:314cf0c1351c189524fb10c7ac20688ecd470e8cc505c394d642c9c80bf7c3a5"},
 ]
 
 [package.dependencies]
@@ -353,10 +353,10 @@ Pillow = "*"
 
 [[package]]
 name = "rdkit-stubs"
-version = "0.7"
+version = "0.8"
 description = "type stubs for rdkit"
 optional = false
-python-versions = "^3.10"
+python-versions = ">=3.10"
 files = []
 develop = true
 
diff --git a/test/test.bash b/test/test.bash
index 5658c1e..b0732aa 100755
--- a/test/test.bash
+++ b/test/test.bash
@@ -16,6 +16,6 @@ poetry run mypy .
 poetry run pytest .
 
 # typecheck the stubs themselves
-cd ../rdkit-stubs
+cd "$parent"/..
 poetry run --directory "$parent" pyright .
 poetry run --directory "$parent" mypy .