diff --git a/.cz.toml b/.cz.toml
index f9eb014..750ad5b 100644
--- a/.cz.toml
+++ b/.cz.toml
@@ -6,6 +6,6 @@ version_scheme = "pep440"
 version = "17.25.0b5"
 update_changelog_on_bump = true
 version_files = [
-  "java-api/setup.cfg:version",
-  "java-api-stubs/pyproject.toml:version"
+  "setup.cfg:version",
+  "stubs/pyproject.toml:version"
 ]
diff --git a/.devcontainer.json b/.devcontainer.json
index d606eb2..13967b0 100644
--- a/.devcontainer.json
+++ b/.devcontainer.json
@@ -13,5 +13,5 @@
     }
   },
   "onCreateCommand": "pre-commit install --hook-type pre-commit --hook-type commit-msg --hook-type pre-push",
-  "postCreateCommand": "python2 -m pip install --requirement java-api/requirements.txt"
+  "postCreateCommand": "python2 -m pip install --requirement requirements.txt"
 }
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 66d3728..3a639a0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,4 +13,3 @@ jobs:
     uses: coatl-dev/workflows/.github/workflows/pylint.yml@v6
     with:
       path: src
-      working-directory: java-api
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index 7d3b3c1..1dc4128 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -9,18 +9,16 @@ on:
       - '**/pyproject.toml'
       - '**/requirements.txt'
       - '**/tox.ini'
-      - java-api/src/**
-      - java-api/setup.cfg
-      - java-api/setup.py
-      - java-api/tests/**
-      - java-api-stubs/stubs/**
+      - src/**
+      - setup.cfg
+      - setup.py
+      - tests/**
+      - stubs/stubs/**
   workflow_call:
 
 jobs:
   tox-java-api:
     uses: coatl-dev/workflows/.github/workflows/tox-docker.yml@v6
-    with:
-      working-directory: java-api
 
   tox-java-api-stubs:
     uses: coatl-dev/workflows/.github/workflows/tox.yml@v6
@@ -30,4 +28,4 @@ jobs:
         3.10
         3.11
         3.12
-      working-directory: java-api-stubs
+      working-directory: stubs
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index dcd13b5..38cfd7b 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -24,11 +24,10 @@ jobs:
         uses: coatl-dev/actions/pypi-upload@v5
         with:
           password: ${{ secrets.PYPI_API_TOKEN_JAVA_API_PKG }}
-          working-directory: java-api
 
       - name: Upload java-api-stubs to PyPI
         uses: coatl-dev/actions/pypi-upload@v5
         with:
           python-version: '3.12'
           password: ${{ secrets.PYPI_API_TOKEN_JAVA_API_STUBS }}
-          working-directory: java-api-stubs
+          working-directory: stubs
diff --git a/java-api/.mypy.ini b/.mypy.ini
similarity index 100%
rename from java-api/.mypy.ini
rename to .mypy.ini
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 49cd56c..bb837b0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,12 +9,12 @@ repos:
     rev: v1.3.0
     hooks:
       - id: sort-all
-        files: ^java-api/src/
+        files: ^src/
   - repo: https://github.com/bwhmather/ssort
     rev: 0.16.0
     hooks:
       - id: ssort
-        files: ^java-api/src/
+        files: ^src/
   - repo: https://github.com/psf/black-pre-commit-mirror
     rev: 25.12.0
     hooks:
@@ -23,36 +23,36 @@ repos:
     rev: 1.3.0
     hooks:
       - id: unimport
-        files: ^java-api/src/
+        files: ^src/
         language_version: python3.12
   - repo: https://github.com/PyCQA/isort
     rev: 7.0.0
     hooks:
       - id: isort
         name: isort-java-api
-        files: ^java-api/src/
-        args: [--settings-file, java-api/tox.ini]
+        files: ^src/
+        args: [--settings-file, tox.ini]
   - repo: https://github.com/PyCQA/isort
     rev: 7.0.0
     hooks:
       - id: isort
         name: isort-java-api-stubs
-        files: ^java-api-stubs/stubs/
-        args: [--settings-file, java-api-stubs/tox.ini]
+        files: ^stubs/stubs/
+        args: [--settings-file, stubs/tox.ini]
   - repo: https://github.com/PyCQA/docformatter
     rev: v1.7.7
     hooks:
       - id: docformatter
-        files: ^java-api/src/
-        args: [--config, java-api/tox.ini]
+        files: ^src/
+        args: [--config, tox.ini]
         language_version: python3.12
   - repo: https://github.com/coatl-dev/flake8
     rev: 5.0.4
     hooks:
       - id: flake8
         name: flake8-java-api
-        files: ^java-api/src/
-        args: [--config, java-api/tox.ini]
+        files: ^src/
+        args: [--config, tox.ini]
         additional_dependencies: [pydoclint]
         language_version: python3.12
   - repo: https://github.com/PyCQA/flake8
@@ -63,13 +63,13 @@ repos:
         types: [file]
         files: \.(pyi)$
         additional_dependencies: [flake8-pyi]
-        args: [--config, java-api-stubs/tox.ini]
+        args: [--config, stubs/tox.ini]
   - repo: https://github.com/PyCQA/pydocstyle
     rev: 6.3.0
     hooks:
       - id: pydocstyle
-        files: ^java-api/src/
-        args: [--config, java-api/tox.ini]
+        files: ^src/
+        args: [--config, tox.ini]
   - repo: https://github.com/commitizen-tools/commitizen
     rev: v4.10.0
     hooks:
@@ -82,6 +82,5 @@ repos:
         name: pylint
         entry: pylint
         language: system
-        files: ^java-api/src/
+        files: ^src/
         types: [python]
-        args: [--rcfile, java-api/.pylintrc]
diff --git a/java-api/.pylintrc b/.pylintrc
similarity index 100%
rename from java-api/.pylintrc
rename to .pylintrc
diff --git a/java-api-stubs/MANIFEST.in b/MANIFEST.in
similarity index 100%
rename from java-api-stubs/MANIFEST.in
rename to MANIFEST.in
diff --git a/README.md b/README.md
index 804f907..3bb7ef1 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,117 @@
-# java-api: Python 2 package and Python 3 stubs
+# java-api
 
+<!--- Badges --->
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/java-api)](https://pypi.org/project/java-api/)
+[![PyPI - Version](https://img.shields.io/pypi/v/java-api)](https://pypi.org/project/java-api/)
+[![PyPI - Downloads](https://static.pepy.tech/badge/java-api)](https://pepy.tech/projects/java-api)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/ignition-devs/java-api-17/main.svg)](https://results.pre-commit.ci/latest/github/ignition-devs/java-api-17/main)
 [![ci](https://github.com/ignition-devs/java-api-17/actions/workflows/ci.yml/badge.svg)](https://github.com/ignition-devs/java-api-17/actions/workflows/ci.yml)
 [![Join us on GitHub discussions](https://img.shields.io/badge/github-discussions-informational)](https://github.com/orgs/ignition-devs/discussions)
 
-This repository contains the following projects:
+java-api is a Python package that allows developers to get code completion
+for Java 17 API Specification functions and classes in their IDE of choice.
 
-- [java-api]: Java Version 17 API Specification for [`ignition-api`].
-- [java-api-stubs]: This package contains a collection of stubs for the
-  `java-api` package.
+## Table of contents
 
-[`ignition-api`]: https://pypi.org/project/ignition-api
-[java-api]: https://github.com/ignition-devs/java-api-17/tree/main/java-api
-[java-api-stubs]: https://github.com/ignition-devs/java-api/tree/main/java-api-stubs
+- [Prerequisites](#prerequisites)
+- [Installation and usage](#installation-and-usage)
+  - [Installing with pip](#installing-with-pip)
+- [Project structure](#project-structure)
+  - [Packages](#packages)
+- [Contributing](#contributing)
+- [Discussions](#discussions)
+- [Contributors](#contributors)
+- [License](#license)
+- [Code of conduct](#code-of-conduct)
+
+## Prerequisites
+
+Before you begin, ensure you have met the following requirements:
+
+- You have installed [Python 2.7.18]
+
+## Installation and usage
+
+To use java-api, you may install it using the following method.
+
+### Installing with `pip`
+
+> [!NOTE]
+> For stub files for this package, look for [`java-api-stubs`].
+
+The preferred method is to install it by running `pip`. It requires Python
+2.7.18.
+
+```bash
+python2 -m pip install java-api
+```
+
+This will install it as package to your Python installation, which will allow
+you to call Ignition Scripting functions from Python's REPL, and get code
+completion using an IDE such as PyCharm and Visual Studio Code.
+
+```bash
+$ python2
+Python 2.7.18 (default, Sep 23 2024, 13:23:35)
+[GCC Apple LLVM 16.0.0 (clang-1600.0.26.3)] on darwin
+Type "help", "copyright", "credits" or "license" for more information.
+>>> from __future__ import print_function
+>>> import java.lang
+>>> print(java.lang.__doc__)
+Provides classes that are fundamental to the design of the Java
+programming language.
+
+>>> quit()
+```
+
+And to uninstall:
+
+```bash
+python2 -m pip uninstall java-api
+```
+
+## Project structure
+
+### Packages
+
+This project consists of the following packages:
+
+- [java](#javajavax)
+- [javax](#javajavax)
+
+#### java/javax
+
+These packages include supporting Java classes and interfaces. For more
+information, see documentation here:
+<https://docs.oracle.com/en/java/javase/17/docs/api/index.html>.
+
+## Contributing
+
+See [CONTRIBUTING.md].
+
+## Discussions
+
+Feel free to post your questions and/or ideas at [Discussions].
+
+## Contributors
+
+Thanks to everyone who has contributed to this project.
+
+Up-to-date list of contributors can be found here: [CONTRIBUTORS].
+
+## License
+
+See the [LICENSE].
+
+## Code of conduct
+
+This project has adopted the [Microsoft Open Source Code of Conduct].
+
+<!-- Links -->
+[CONTRIBUTING.md]: https://github.com/ignition-devs/java-api-17/blob/main/CONTRIBUTING.md#contributing-to-java-api
+[CONTRIBUTORS]: https://github.com/ignition-devs/java-api-17/graphs/contributors
+[Discussions]: https://github.com/orgs/ignition-devs/discussions
+[`java-api-stubs`]: https://pypi.org/project/java-api-stubs/
+[LICENSE]: https://github.com/ignition-devs/java-api-17/blob/main/LICENSE
+[Microsoft Open Source Code of Conduct]: https://opensource.microsoft.com/codeofconduct/
+[Python 2.7.18]: https://www.python.org/downloads/release/python-2718/
diff --git a/java-api/CHANGELOG.md b/java-api/CHANGELOG.md
deleted file mode 120000
index 04c99a5..0000000
--- a/java-api/CHANGELOG.md
+++ /dev/null
@@ -1 +0,0 @@
-../CHANGELOG.md
\ No newline at end of file
diff --git a/java-api/LICENSE b/java-api/LICENSE
deleted file mode 120000
index ea5b606..0000000
--- a/java-api/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-../LICENSE
\ No newline at end of file
diff --git a/java-api/README.md b/java-api/README.md
deleted file mode 100755
index ceb06c5..0000000
--- a/java-api/README.md
+++ /dev/null
@@ -1,105 +0,0 @@
-# java-api
-
-java-api is a Python package that allows developers to get code completion
-for Java 17 API Specification functions and classes in their IDE of choice.
-
-## Table of contents
-
-- [Prerequisites](#prerequisites)
-- [Installation and usage](#installation-and-usage)
-  - [Installing with pip](#installing-with-pip)
-- [Project structure](#project-structure)
-  - [Packages](#packages)
-- [Contributing](#contributing)
-- [Discussions](#discussions)
-- [Contributors](#contributors)
-- [License](#license)
-- [Code of conduct](#code-of-conduct)
-
-## Prerequisites
-
-Before you begin, ensure you have met the following requirements:
-
-- You have installed [Python 2.7.18]
-
-## Installation and usage
-
-To use java-api, you may install it by doing any of the following.
-
-### Installing with `pip`
-
-The preferred method is to install it by running `pip`. It requires Python
-2.7.18.
-
-```bash
-python2 -m pip install java-api
-```
-
-This will install it as package to your Python installation, which will allow
-you to call Ignition Scripting functions from Python's REPL, and get code
-completion using an IDE such as PyCharm and Visual Studio Code.
-
-```bash
-$ python2
-Python 2.7.18 (default, Sep 23 2024, 13:23:35)
-[GCC Apple LLVM 16.0.0 (clang-1600.0.26.3)] on darwin
-Type "help", "copyright", "credits" or "license" for more information.
->>> from __future__ import print_function
->>> import java.lang
->>> print(java.lang.__doc__)
-Provides classes that are fundamental to the design of the Java
-programming language.
-
->>> quit()
-```
-
-And to uninstall:
-
-```bash
-python2 -m pip uninstall java-api
-```
-
-## Project structure
-
-### Packages
-
-This project consists of the following packages:
-
-- [java](#javajavax)
-- [javax](#javajavax)
-
-#### java/javax
-
-These packages include supporting Java classes and interfaces. For more
-information, see documentation here:
-<https://docs.oracle.com/en/java/javase/17/docs/api/index.html>.
-
-## Contributing
-
-See [CONTRIBUTING.md].
-
-## Discussions
-
-Feel free to post your questions and/or ideas at [Discussions].
-
-## Contributors
-
-Thanks to everyone who has contributed to this project.
-
-Up-to-date list of contributors can be found here: [CONTRIBUTORS].
-
-## License
-
-See the [LICENSE].
-
-## Code of conduct
-
-This project has adopted the [Microsoft Open Source Code of Conduct].
-
-<!-- Links -->
-[CONTRIBUTING.md]: https://github.com/ignition-devs/java-api-17/blob/main/CONTRIBUTING.md#contributing-to-java-api
-[CONTRIBUTORS]: https://github.com/ignition-devs/java-api-17/graphs/contributors
-[Discussions]: https://github.com/orgs/ignition-devs/discussions
-[LICENSE]: https://github.com/ignition-devs/java-api-17/blob/main/LICENSE
-[Microsoft Open Source Code of Conduct]: https://opensource.microsoft.com/codeofconduct/
-[Python 2.7.18]: https://www.python.org/downloads/release/python-2718/
diff --git a/java-api/pyproject.toml b/pyproject.toml
similarity index 100%
rename from java-api/pyproject.toml
rename to pyproject.toml
diff --git a/java-api/requirements.in b/requirements.in
similarity index 100%
rename from java-api/requirements.in
rename to requirements.in
diff --git a/java-api/requirements.txt b/requirements.txt
similarity index 100%
rename from java-api/requirements.txt
rename to requirements.txt
diff --git a/java-api/setup.cfg b/setup.cfg
similarity index 100%
rename from java-api/setup.cfg
rename to setup.cfg
diff --git a/java-api/setup.py b/setup.py
similarity index 100%
rename from java-api/setup.py
rename to setup.py
diff --git a/java-api/src/java/__init__.py b/src/java/__init__.py
similarity index 100%
rename from java-api/src/java/__init__.py
rename to src/java/__init__.py
diff --git a/java-api/src/java/awt/__init__.py b/src/java/awt/__init__.py
similarity index 100%
rename from java-api/src/java/awt/__init__.py
rename to src/java/awt/__init__.py
diff --git a/java-api/src/java/awt/event/__init__.py b/src/java/awt/event/__init__.py
similarity index 100%
rename from java-api/src/java/awt/event/__init__.py
rename to src/java/awt/event/__init__.py
diff --git a/java-api/src/java/awt/geom/__init__.py b/src/java/awt/geom/__init__.py
similarity index 100%
rename from java-api/src/java/awt/geom/__init__.py
rename to src/java/awt/geom/__init__.py
diff --git a/java-api/src/java/awt/image/__init__.py b/src/java/awt/image/__init__.py
similarity index 100%
rename from java-api/src/java/awt/image/__init__.py
rename to src/java/awt/image/__init__.py
diff --git a/java-api/src/java/awt/print/__init__.py b/src/java/awt/print/__init__.py
similarity index 100%
rename from java-api/src/java/awt/print/__init__.py
rename to src/java/awt/print/__init__.py
diff --git a/java-api/src/java/beans/__init__.py b/src/java/beans/__init__.py
similarity index 100%
rename from java-api/src/java/beans/__init__.py
rename to src/java/beans/__init__.py
diff --git a/java-api/src/java/io/__init__.py b/src/java/io/__init__.py
similarity index 100%
rename from java-api/src/java/io/__init__.py
rename to src/java/io/__init__.py
diff --git a/java-api/src/java/lang/__init__.py b/src/java/lang/__init__.py
similarity index 100%
rename from java-api/src/java/lang/__init__.py
rename to src/java/lang/__init__.py
diff --git a/java-api/src/java/lang/reflect/__init__.py b/src/java/lang/reflect/__init__.py
similarity index 100%
rename from java-api/src/java/lang/reflect/__init__.py
rename to src/java/lang/reflect/__init__.py
diff --git a/java-api/src/java/math/__init__.py b/src/java/math/__init__.py
similarity index 100%
rename from java-api/src/java/math/__init__.py
rename to src/java/math/__init__.py
diff --git a/java-api/src/java/net/__init__.py b/src/java/net/__init__.py
similarity index 100%
rename from java-api/src/java/net/__init__.py
rename to src/java/net/__init__.py
diff --git a/java-api/src/java/net/http/__init__.py b/src/java/net/http/__init__.py
similarity index 100%
rename from java-api/src/java/net/http/__init__.py
rename to src/java/net/http/__init__.py
diff --git a/java-api/src/java/nio/__init__.py b/src/java/nio/__init__.py
similarity index 100%
rename from java-api/src/java/nio/__init__.py
rename to src/java/nio/__init__.py
diff --git a/java-api/src/java/nio/channels/__init__.py b/src/java/nio/channels/__init__.py
similarity index 100%
rename from java-api/src/java/nio/channels/__init__.py
rename to src/java/nio/channels/__init__.py
diff --git a/java-api/src/java/nio/charset/__init__.py b/src/java/nio/charset/__init__.py
similarity index 100%
rename from java-api/src/java/nio/charset/__init__.py
rename to src/java/nio/charset/__init__.py
diff --git a/java-api/src/java/nio/file/__init__.py b/src/java/nio/file/__init__.py
similarity index 100%
rename from java-api/src/java/nio/file/__init__.py
rename to src/java/nio/file/__init__.py
diff --git a/java-api/src/java/nio/file/attribute/__init__.py b/src/java/nio/file/attribute/__init__.py
similarity index 100%
rename from java-api/src/java/nio/file/attribute/__init__.py
rename to src/java/nio/file/attribute/__init__.py
diff --git a/java-api/src/java/org/__init__.py b/src/java/org/__init__.py
similarity index 100%
rename from java-api/src/java/org/__init__.py
rename to src/java/org/__init__.py
diff --git a/java-api/src/java/org/jdesktop/__init__.py b/src/java/org/jdesktop/__init__.py
similarity index 100%
rename from java-api/src/java/org/jdesktop/__init__.py
rename to src/java/org/jdesktop/__init__.py
diff --git a/java-api/src/java/org/jdesktop/core/__init__.py b/src/java/org/jdesktop/core/__init__.py
similarity index 100%
rename from java-api/src/java/org/jdesktop/core/__init__.py
rename to src/java/org/jdesktop/core/__init__.py
diff --git a/java-api/src/java/org/jdesktop/core/animation/__init__.py b/src/java/org/jdesktop/core/animation/__init__.py
similarity index 100%
rename from java-api/src/java/org/jdesktop/core/animation/__init__.py
rename to src/java/org/jdesktop/core/animation/__init__.py
diff --git a/java-api/src/java/org/jdesktop/core/animation/timing/__init__.py b/src/java/org/jdesktop/core/animation/timing/__init__.py
similarity index 100%
rename from java-api/src/java/org/jdesktop/core/animation/timing/__init__.py
rename to src/java/org/jdesktop/core/animation/timing/__init__.py
diff --git a/java-api/src/java/security/__init__.py b/src/java/security/__init__.py
similarity index 100%
rename from java-api/src/java/security/__init__.py
rename to src/java/security/__init__.py
diff --git a/java-api/src/java/text/__init__.py b/src/java/text/__init__.py
similarity index 100%
rename from java-api/src/java/text/__init__.py
rename to src/java/text/__init__.py
diff --git a/java-api/src/java/time/__init__.py b/src/java/time/__init__.py
similarity index 100%
rename from java-api/src/java/time/__init__.py
rename to src/java/time/__init__.py
diff --git a/java-api/src/java/time/chrono/__init__.py b/src/java/time/chrono/__init__.py
similarity index 100%
rename from java-api/src/java/time/chrono/__init__.py
rename to src/java/time/chrono/__init__.py
diff --git a/java-api/src/java/time/format/__init__.py b/src/java/time/format/__init__.py
similarity index 100%
rename from java-api/src/java/time/format/__init__.py
rename to src/java/time/format/__init__.py
diff --git a/java-api/src/java/time/temporal/__init__.py b/src/java/time/temporal/__init__.py
similarity index 100%
rename from java-api/src/java/time/temporal/__init__.py
rename to src/java/time/temporal/__init__.py
diff --git a/java-api/src/java/util/__init__.py b/src/java/util/__init__.py
similarity index 100%
rename from java-api/src/java/util/__init__.py
rename to src/java/util/__init__.py
diff --git a/java-api/src/java/util/concurrent/__init__.py b/src/java/util/concurrent/__init__.py
similarity index 100%
rename from java-api/src/java/util/concurrent/__init__.py
rename to src/java/util/concurrent/__init__.py
diff --git a/java-api/src/java/util/function/__init__.py b/src/java/util/function/__init__.py
similarity index 100%
rename from java-api/src/java/util/function/__init__.py
rename to src/java/util/function/__init__.py
diff --git a/java-api/src/java/util/regex/__init__.py b/src/java/util/regex/__init__.py
similarity index 100%
rename from java-api/src/java/util/regex/__init__.py
rename to src/java/util/regex/__init__.py
diff --git a/java-api/src/java/util/stream/__init__.py b/src/java/util/stream/__init__.py
similarity index 100%
rename from java-api/src/java/util/stream/__init__.py
rename to src/java/util/stream/__init__.py
diff --git a/java-api/src/javax/__init__.py b/src/javax/__init__.py
similarity index 100%
rename from java-api/src/javax/__init__.py
rename to src/javax/__init__.py
diff --git a/java-api/src/javax/security/__init__.py b/src/javax/security/__init__.py
similarity index 100%
rename from java-api/src/javax/security/__init__.py
rename to src/javax/security/__init__.py
diff --git a/java-api/src/javax/security/auth/__init__.py b/src/javax/security/auth/__init__.py
similarity index 100%
rename from java-api/src/javax/security/auth/__init__.py
rename to src/javax/security/auth/__init__.py
diff --git a/java-api/src/javax/swing/__init__.py b/src/javax/swing/__init__.py
similarity index 100%
rename from java-api/src/javax/swing/__init__.py
rename to src/javax/swing/__init__.py
diff --git a/java-api/src/javax/swing/event/__init__.py b/src/javax/swing/event/__init__.py
similarity index 100%
rename from java-api/src/javax/swing/event/__init__.py
rename to src/javax/swing/event/__init__.py
diff --git a/java-api/src/javax/swing/plaf/__init__.py b/src/javax/swing/plaf/__init__.py
similarity index 100%
rename from java-api/src/javax/swing/plaf/__init__.py
rename to src/javax/swing/plaf/__init__.py
diff --git a/java-api/src/javax/swing/text/__init__.py b/src/javax/swing/text/__init__.py
similarity index 100%
rename from java-api/src/javax/swing/text/__init__.py
rename to src/javax/swing/text/__init__.py
diff --git a/java-api-stubs/.mypy.ini b/stubs/.mypy.ini
similarity index 100%
rename from java-api-stubs/.mypy.ini
rename to stubs/.mypy.ini
diff --git a/java-api-stubs/CHANGELOG.md b/stubs/CHANGELOG.md
similarity index 100%
rename from java-api-stubs/CHANGELOG.md
rename to stubs/CHANGELOG.md
diff --git a/java-api-stubs/LICENSE b/stubs/LICENSE
similarity index 100%
rename from java-api-stubs/LICENSE
rename to stubs/LICENSE
diff --git a/java-api/MANIFEST.in b/stubs/MANIFEST.in
similarity index 100%
rename from java-api/MANIFEST.in
rename to stubs/MANIFEST.in
diff --git a/java-api-stubs/README.md b/stubs/README.md
similarity index 74%
rename from java-api-stubs/README.md
rename to stubs/README.md
index 689b719..5c0d436 100644
--- a/java-api-stubs/README.md
+++ b/stubs/README.md
@@ -1,5 +1,11 @@
 # java-api-stubs
 
+<!--- Badges --->
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/java-api-stubs)](https://pypi.org/project/java-api-stubs/)
+[![PyPI - Version](https://img.shields.io/pypi/v/java-api-stubs)](https://pypi.org/project/java-api-stubs/)
+[![PyPI - Downloads](https://pepy.tech/badge/java-api-stubs)](https://pepy.tech/project/java-api-stubs)
+[![Join us on GitHub discussions](https://img.shields.io/badge/github-discussions-informational)](https://github.com/orgs/ignition-devs/discussions)
+
 This package contains a collection of [stubs] for [`java-api`]. These
 files were generated using `mypy`'s [`stubgen`].
 
diff --git a/java-api-stubs/pyproject.toml b/stubs/pyproject.toml
similarity index 100%
rename from java-api-stubs/pyproject.toml
rename to stubs/pyproject.toml
diff --git a/java-api-stubs/stubs/java/__init__.pyi b/stubs/stubs/java/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/__init__.pyi
rename to stubs/stubs/java/__init__.pyi
diff --git a/java-api-stubs/stubs/java/awt/__init__.pyi b/stubs/stubs/java/awt/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/awt/__init__.pyi
rename to stubs/stubs/java/awt/__init__.pyi
diff --git a/java-api-stubs/stubs/java/awt/event/__init__.pyi b/stubs/stubs/java/awt/event/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/awt/event/__init__.pyi
rename to stubs/stubs/java/awt/event/__init__.pyi
diff --git a/java-api-stubs/stubs/java/awt/geom/__init__.pyi b/stubs/stubs/java/awt/geom/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/awt/geom/__init__.pyi
rename to stubs/stubs/java/awt/geom/__init__.pyi
diff --git a/java-api-stubs/stubs/java/awt/image/__init__.pyi b/stubs/stubs/java/awt/image/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/awt/image/__init__.pyi
rename to stubs/stubs/java/awt/image/__init__.pyi
diff --git a/java-api-stubs/stubs/java/awt/print/__init__.pyi b/stubs/stubs/java/awt/print/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/awt/print/__init__.pyi
rename to stubs/stubs/java/awt/print/__init__.pyi
diff --git a/java-api-stubs/stubs/java/beans/__init__.pyi b/stubs/stubs/java/beans/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/beans/__init__.pyi
rename to stubs/stubs/java/beans/__init__.pyi
diff --git a/java-api-stubs/stubs/java/io/__init__.pyi b/stubs/stubs/java/io/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/io/__init__.pyi
rename to stubs/stubs/java/io/__init__.pyi
diff --git a/java-api-stubs/stubs/java/lang/__init__.pyi b/stubs/stubs/java/lang/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/lang/__init__.pyi
rename to stubs/stubs/java/lang/__init__.pyi
diff --git a/java-api-stubs/stubs/java/lang/reflect/__init__.pyi b/stubs/stubs/java/lang/reflect/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/lang/reflect/__init__.pyi
rename to stubs/stubs/java/lang/reflect/__init__.pyi
diff --git a/java-api-stubs/stubs/java/math/__init__.pyi b/stubs/stubs/java/math/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/math/__init__.pyi
rename to stubs/stubs/java/math/__init__.pyi
diff --git a/java-api-stubs/stubs/java/net/__init__.pyi b/stubs/stubs/java/net/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/net/__init__.pyi
rename to stubs/stubs/java/net/__init__.pyi
diff --git a/java-api-stubs/stubs/java/net/http/__init__.pyi b/stubs/stubs/java/net/http/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/net/http/__init__.pyi
rename to stubs/stubs/java/net/http/__init__.pyi
diff --git a/java-api-stubs/stubs/java/nio/__init__.pyi b/stubs/stubs/java/nio/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/nio/__init__.pyi
rename to stubs/stubs/java/nio/__init__.pyi
diff --git a/java-api-stubs/stubs/java/nio/channels/__init__.pyi b/stubs/stubs/java/nio/channels/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/nio/channels/__init__.pyi
rename to stubs/stubs/java/nio/channels/__init__.pyi
diff --git a/java-api-stubs/stubs/java/nio/charset/__init__.pyi b/stubs/stubs/java/nio/charset/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/nio/charset/__init__.pyi
rename to stubs/stubs/java/nio/charset/__init__.pyi
diff --git a/java-api-stubs/stubs/java/nio/file/__init__.pyi b/stubs/stubs/java/nio/file/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/nio/file/__init__.pyi
rename to stubs/stubs/java/nio/file/__init__.pyi
diff --git a/java-api-stubs/stubs/java/nio/file/attribute/__init__.pyi b/stubs/stubs/java/nio/file/attribute/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/nio/file/attribute/__init__.pyi
rename to stubs/stubs/java/nio/file/attribute/__init__.pyi
diff --git a/java-api-stubs/stubs/java/org/__init__.pyi b/stubs/stubs/java/org/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/org/__init__.pyi
rename to stubs/stubs/java/org/__init__.pyi
diff --git a/java-api-stubs/stubs/java/org/jdesktop/__init__.pyi b/stubs/stubs/java/org/jdesktop/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/org/jdesktop/__init__.pyi
rename to stubs/stubs/java/org/jdesktop/__init__.pyi
diff --git a/java-api-stubs/stubs/java/org/jdesktop/core/__init__.pyi b/stubs/stubs/java/org/jdesktop/core/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/org/jdesktop/core/__init__.pyi
rename to stubs/stubs/java/org/jdesktop/core/__init__.pyi
diff --git a/java-api-stubs/stubs/java/org/jdesktop/core/animation/__init__.pyi b/stubs/stubs/java/org/jdesktop/core/animation/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/org/jdesktop/core/animation/__init__.pyi
rename to stubs/stubs/java/org/jdesktop/core/animation/__init__.pyi
diff --git a/java-api-stubs/stubs/java/org/jdesktop/core/animation/timing/__init__.pyi b/stubs/stubs/java/org/jdesktop/core/animation/timing/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/org/jdesktop/core/animation/timing/__init__.pyi
rename to stubs/stubs/java/org/jdesktop/core/animation/timing/__init__.pyi
diff --git a/java-api-stubs/stubs/java/py.typed b/stubs/stubs/java/py.typed
similarity index 100%
rename from java-api-stubs/stubs/java/py.typed
rename to stubs/stubs/java/py.typed
diff --git a/java-api-stubs/stubs/java/security/__init__.pyi b/stubs/stubs/java/security/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/security/__init__.pyi
rename to stubs/stubs/java/security/__init__.pyi
diff --git a/java-api-stubs/stubs/java/text/__init__.pyi b/stubs/stubs/java/text/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/text/__init__.pyi
rename to stubs/stubs/java/text/__init__.pyi
diff --git a/java-api-stubs/stubs/java/time/__init__.pyi b/stubs/stubs/java/time/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/time/__init__.pyi
rename to stubs/stubs/java/time/__init__.pyi
diff --git a/java-api-stubs/stubs/java/time/chrono/__init__.pyi b/stubs/stubs/java/time/chrono/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/time/chrono/__init__.pyi
rename to stubs/stubs/java/time/chrono/__init__.pyi
diff --git a/java-api-stubs/stubs/java/time/format/__init__.pyi b/stubs/stubs/java/time/format/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/time/format/__init__.pyi
rename to stubs/stubs/java/time/format/__init__.pyi
diff --git a/java-api-stubs/stubs/java/time/temporal/__init__.pyi b/stubs/stubs/java/time/temporal/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/time/temporal/__init__.pyi
rename to stubs/stubs/java/time/temporal/__init__.pyi
diff --git a/java-api-stubs/stubs/java/util/__init__.pyi b/stubs/stubs/java/util/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/util/__init__.pyi
rename to stubs/stubs/java/util/__init__.pyi
diff --git a/java-api-stubs/stubs/java/util/concurrent/__init__.pyi b/stubs/stubs/java/util/concurrent/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/util/concurrent/__init__.pyi
rename to stubs/stubs/java/util/concurrent/__init__.pyi
diff --git a/java-api-stubs/stubs/java/util/function/__init__.pyi b/stubs/stubs/java/util/function/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/util/function/__init__.pyi
rename to stubs/stubs/java/util/function/__init__.pyi
diff --git a/java-api-stubs/stubs/java/util/regex/__init__.pyi b/stubs/stubs/java/util/regex/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/util/regex/__init__.pyi
rename to stubs/stubs/java/util/regex/__init__.pyi
diff --git a/java-api-stubs/stubs/java/util/stream/__init__.pyi b/stubs/stubs/java/util/stream/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/java/util/stream/__init__.pyi
rename to stubs/stubs/java/util/stream/__init__.pyi
diff --git a/java-api-stubs/stubs/javax/__init__.pyi b/stubs/stubs/javax/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/javax/__init__.pyi
rename to stubs/stubs/javax/__init__.pyi
diff --git a/java-api-stubs/stubs/javax/py.typed b/stubs/stubs/javax/py.typed
similarity index 100%
rename from java-api-stubs/stubs/javax/py.typed
rename to stubs/stubs/javax/py.typed
diff --git a/java-api-stubs/stubs/javax/security/__init__.pyi b/stubs/stubs/javax/security/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/javax/security/__init__.pyi
rename to stubs/stubs/javax/security/__init__.pyi
diff --git a/java-api-stubs/stubs/javax/security/auth/__init__.pyi b/stubs/stubs/javax/security/auth/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/javax/security/auth/__init__.pyi
rename to stubs/stubs/javax/security/auth/__init__.pyi
diff --git a/java-api-stubs/stubs/javax/swing/__init__.pyi b/stubs/stubs/javax/swing/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/javax/swing/__init__.pyi
rename to stubs/stubs/javax/swing/__init__.pyi
diff --git a/java-api-stubs/stubs/javax/swing/event/__init__.pyi b/stubs/stubs/javax/swing/event/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/javax/swing/event/__init__.pyi
rename to stubs/stubs/javax/swing/event/__init__.pyi
diff --git a/java-api-stubs/stubs/javax/swing/plaf/__init__.pyi b/stubs/stubs/javax/swing/plaf/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/javax/swing/plaf/__init__.pyi
rename to stubs/stubs/javax/swing/plaf/__init__.pyi
diff --git a/java-api-stubs/stubs/javax/swing/text/__init__.pyi b/stubs/stubs/javax/swing/text/__init__.pyi
similarity index 100%
rename from java-api-stubs/stubs/javax/swing/text/__init__.pyi
rename to stubs/stubs/javax/swing/text/__init__.pyi
diff --git a/java-api-stubs/tox.ini b/stubs/tox.ini
similarity index 86%
rename from java-api-stubs/tox.ini
rename to stubs/tox.ini
index b625a3e..13eb072 100644
--- a/java-api-stubs/tox.ini
+++ b/stubs/tox.ini
@@ -11,7 +11,7 @@ description = run type check on code base
 base_python = python3.12
 skip_install = true
 deps =
-    mypy[python2]==0.971
+    mypy[python2]@ git+https://github.com/coatl-dev/mypy.git@v0.971
 commands =
     mypy stubs
 
diff --git a/java-api/tests/__init__.py b/tests/__init__.py
similarity index 100%
rename from java-api/tests/__init__.py
rename to tests/__init__.py
diff --git a/java-api/tests/test_java_imports.py b/tests/test_java_imports.py
similarity index 100%
rename from java-api/tests/test_java_imports.py
rename to tests/test_java_imports.py
diff --git a/java-api/tests/test_javax_imports.py b/tests/test_javax_imports.py
similarity index 100%
rename from java-api/tests/test_javax_imports.py
rename to tests/test_javax_imports.py
diff --git a/java-api/tests/test_utils.py b/tests/test_utils.py
similarity index 100%
rename from java-api/tests/test_utils.py
rename to tests/test_utils.py
diff --git a/java-api/tox.ini b/tox.ini
similarity index 85%
rename from java-api/tox.ini
rename to tox.ini
index fd7358e..83c6a41 100644
--- a/java-api/tox.ini
+++ b/tox.ini
@@ -14,21 +14,21 @@ commands =
 
 [testenv:typecheck]
 description = run type check on code base
-base_python = {[type]base_python}
+base_python = python3.12
 skip_install = true
 deps =
-    {[type]deps}
+    mypy[python2]@ git+https://github.com/coatl-dev/mypy.git@v0.971
 commands =
     mypy --install-types --non-interactive src
 
 [testenv:stubgen]
 description = generate stubs
-base_python = {[type]base_python}
+base_python = python3.12
 skip_install = true
 deps =
-    {[type]deps}
+    mypy[python2]@ git+https://github.com/coatl-dev/mypy.git@v0.971
 commands =
-    stubgen --export-less --output=..{/}java-api-stubs{/}stubs src
+    stubgen --export-less --output=..{/}stubs{/}stubs src
 
 [testenv:style]
 description = apply style
@@ -37,7 +37,7 @@ skip_install = true
 deps =
     black
     docformatter
-    flake8==5.0.4
+    flake8@ git+https://github.com/coatl-dev/flake8.git@5.0.4
     isort
     pydoclint
     pydocstyle
@@ -60,11 +60,6 @@ commands =
     flake8 --select=DOC --config=tox.ini src
     pydocstyle --config=tox.ini src{/}system
 
-[type]
-base_python = python3.12
-deps =
-    mypy[python2]==0.971
-
 [docformatter]
 in-place = true
 wrap-summaries = 72
@@ -75,7 +70,6 @@ ignore = DOC202, E741, F821
 max-complexity = 10
 max-doc-length = 72
 max-line-length = 120
-# pydoclint
 style = google
 arg-type-hints-in-docstring = False
 arg-type-hints-in-signature = False