Move to src/ project infrastructure

cmarqu · Nov 6, 2023 · d9f8133 · d9f8133
1 parent a4272cd
commit d9f8133
Show file tree

Hide file tree

Showing 103 changed files with 23 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@
 *.gcno
 *.gcda
 *.gcov
+*.xml
 
 # Packaging
 *.egg
@@ -86,7 +87,7 @@ bpad_*.err
 waves.shm/
 
 # Interface libraries built on setup
-cocotb/libs
+src/cocotb/libs
 pip-wheel-metadata/
 
 # Mentor Modelsim/Questa

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -25,7 +25,7 @@ repos:
   rev: "v16.0.6"
   hooks:
   - id: "clang-format"
-    exclude: "^cocotb/share/include/(sv_vpi|vhpi|vpi)_user(_ext)?.h"
+    exclude: "^src/cocotb/share/include/(sv_vpi|vhpi|vpi)_user(_ext)?.h"
 
 - repo: "https://github.com/pre-commit/pre-commit-hooks"
   rev: "v4.4.0"

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,5 @@
-recursive-include cocotb/share *
-recursive-include cocotb/_vendor *
+recursive-include src/cocotb/share *
+recursive-include src/cocotb/_vendor *
 include README.md
 include LICENSE
 include cocotb_build_libs.py
diff --git a/cocotb_build_libs.py b/cocotb_build_libs.py
@@ -18,7 +18,7 @@
 
 logger = logging.getLogger(__name__)
 cocotb_share_dir = os.path.abspath(
-    os.path.join(os.path.dirname(__file__), "cocotb", "share")
+    os.path.join(os.path.dirname(__file__), "src", "cocotb", "share")
 )
 _base_warns = [
     "-Wall",
@@ -675,7 +675,7 @@ def get_ext():
     share_lib_dir = os.path.relpath(os.path.join(cocotb_share_dir, "lib"))
     include_dirs = [
         os.path.relpath(os.path.join(cocotb_share_dir, "include")),
-        os.path.relpath(os.path.join(os.path.dirname(__file__), "cocotb")),
+        os.path.relpath(os.path.join(os.path.dirname(__file__), "src", "cocotb")),
     ]
 
     ext = []

diff --git a/documentation/Doxyfile b/documentation/Doxyfile
@@ -834,7 +834,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = ../cocotb/share/include/gpi.h
+INPUT                  = ../src/cocotb/share/include/gpi.h
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

diff --git a/documentation/source/building.rst b/documentation/source/building.rst
@@ -7,8 +7,8 @@ Build options and Environment Variables
 Make System
 ===========
 
-Makefiles are provided for a variety of simulators in :file:`cocotb/share/makefiles/simulators`.
-The common Makefile :file:`cocotb/share/makefiles/Makefile.sim` includes the appropriate simulator Makefile based on the contents of the :make:var:`SIM` variable.
+Makefiles are provided for a variety of simulators in :file:`src/cocotb/share/makefiles/simulators`.
+The common Makefile :file:`src/cocotb/share/makefiles/Makefile.sim` includes the appropriate simulator Makefile based on the contents of the :make:var:`SIM` variable.
 
 Make Targets
 ------------
@@ -38,7 +38,7 @@ Of the environment variables, only :envvar:`MODULE` is mandatory to be set
 (typically done in a makefile or run script), all others are optional.
 
 ..
-  If you edit the following sections, please also update the "helpmsg" text in cocotb/config.py
+  If you edit the following sections, please also update the "helpmsg" text in src/cocotb/config.py
 
 Cocotb
 ------
@@ -261,7 +261,7 @@ The following variables are makefile variables, not environment variables.
 
 .. make:var:: SIM
 
-      Selects which simulator Makefile to use.  Attempts to include a simulator specific makefile from :file:`cocotb/share/makefiles/simulators/makefile.$(SIM)`
+      Selects which simulator Makefile to use.  Attempts to include a simulator specific makefile from :file:`src/cocotb/share/makefiles/simulators/makefile.$(SIM)`
 
 .. make:var:: WAVES
 

diff --git a/documentation/source/library_reference_c.rst b/documentation/source/library_reference_c.rst
@@ -2,13 +2,13 @@
 GPI Library Reference
 *********************
 
-Cocotb contains a library called ``GPI`` (in directory :file:`cocotb/share/lib/gpi/`) written in C++
+Cocotb contains a library called ``GPI`` (in directory :file:`src/cocotb/share/lib/gpi/`) written in C++
 that is an abstraction layer for the VPI, VHPI, and FLI simulator interfaces.
 
 .. image:: diagrams/svg/cocotb_overview.svg
 
 The interaction between Python and GPI is via a Python extension module called ``simulator``
-(in directory :file:`cocotb/share/lib/simulator/`) which provides routines for
+(in directory :file:`src/cocotb/share/lib/simulator/`) which provides routines for
 traversing the hierarchy, getting/setting an object's value, registering callbacks etc.
 
 .. doxygenfile:: gpi.h
diff --git a/setup.cfg b/setup.cfg
@@ -38,7 +38,7 @@ omit =
 
 [coverage:paths]
 source =
-    cocotb/
+    src/cocotb/
     .nox/**/cocotb/
 
 [coverage:report]

diff --git a/setup.py b/setup.py
@@ -70,12 +70,12 @@ def package_files(directory):
     paths = []
     for fpath, directories, filenames in walk(directory):
         for filename in filenames:
-            paths.append(path.join("..", fpath, filename))
+            paths.append(path.join("..", "..", fpath, filename))
     return paths
 
 
 # this sets the __version__ variable
-exec(read_file(path.join("cocotb", "_version.py")))
+exec(read_file(path.join("src", "cocotb", "_version.py")))
 
 # store log from build_libs and display at the end in verbose mode
 # see https://github.com/pypa/pip/issues/6634
@@ -101,13 +101,14 @@ def package_files(directory):
         "find_libpython",
     ],
     python_requires=">=3.6",
-    packages=find_packages(),
+    packages=find_packages(where="src"),
+    package_dir={"": "src"},
     package_data={
         "cocotb": (
-            package_files("cocotb/share/makefiles")
-            + package_files("cocotb/share/include")  # noqa: W504
-            + package_files("cocotb/share/def")  # noqa: W504
-            + package_files("cocotb/share/lib/verilator")  # noqa: W504
+            package_files("src/cocotb/share/makefiles")
+            + package_files("src/cocotb/share/include")  # noqa: W504
+            + package_files("src/cocotb/share/def")  # noqa: W504
+            + package_files("src/cocotb/share/lib/verilator")  # noqa: W504
         )
     },
     ext_modules=get_ext(),

diff --git a/cocotb/ANSI.py → src/cocotb/ANSI.py b/cocotb/ANSI.py → src/cocotb/ANSI.py
diff --git a/cocotb/__init__.py → src/cocotb/__init__.py b/cocotb/__init__.py → src/cocotb/__init__.py
diff --git a/cocotb/_deprecation.py → src/cocotb/_deprecation.py b/cocotb/_deprecation.py → src/cocotb/_deprecation.py
diff --git a/cocotb/_py_compat.py → src/cocotb/_py_compat.py b/cocotb/_py_compat.py → src/cocotb/_py_compat.py
diff --git a/cocotb/_sim_versions.py → src/cocotb/_sim_versions.py b/cocotb/_sim_versions.py → src/cocotb/_sim_versions.py
diff --git a/cocotb/_vendor/README.md → src/cocotb/_vendor/README.md b/cocotb/_vendor/README.md → src/cocotb/_vendor/README.md
diff --git a/cocotb/_vendor/__init__.py → src/cocotb/_vendor/__init__.py b/cocotb/_vendor/__init__.py → src/cocotb/_vendor/__init__.py
diff --git a/cocotb/_vendor/distutils_version.py → src/cocotb/_vendor/distutils_version.py b/cocotb/_vendor/distutils_version.py → src/cocotb/_vendor/distutils_version.py
diff --git a/cocotb/_vendor/fli/acc_user.h → src/cocotb/_vendor/fli/acc_user.h b/cocotb/_vendor/fli/acc_user.h → src/cocotb/_vendor/fli/acc_user.h
diff --git a/cocotb/_vendor/fli/acc_vhdl.h → src/cocotb/_vendor/fli/acc_vhdl.h b/cocotb/_vendor/fli/acc_vhdl.h → src/cocotb/_vendor/fli/acc_vhdl.h
diff --git a/cocotb/_vendor/fli/mti.h → src/cocotb/_vendor/fli/mti.h b/cocotb/_vendor/fli/mti.h → src/cocotb/_vendor/fli/mti.h
diff --git a/cocotb/_vendor/tcl/license.terms → src/cocotb/_vendor/tcl/license.terms b/cocotb/_vendor/tcl/license.terms → src/cocotb/_vendor/tcl/license.terms
diff --git a/cocotb/_vendor/tcl/tcl.h → src/cocotb/_vendor/tcl/tcl.h b/cocotb/_vendor/tcl/tcl.h → src/cocotb/_vendor/tcl/tcl.h
diff --git a/cocotb/_vendor/tcl/tclDecls.h → src/cocotb/_vendor/tcl/tclDecls.h b/cocotb/_vendor/tcl/tclDecls.h → src/cocotb/_vendor/tcl/tclDecls.h
diff --git a/cocotb/_vendor/tcl/tclPlatDecls.h → src/cocotb/_vendor/tcl/tclPlatDecls.h b/cocotb/_vendor/tcl/tclPlatDecls.h → src/cocotb/_vendor/tcl/tclPlatDecls.h
diff --git a/cocotb/_vendor/vhpi/vhpi_user.h → src/cocotb/_vendor/vhpi/vhpi_user.h b/cocotb/_vendor/vhpi/vhpi_user.h → src/cocotb/_vendor/vhpi/vhpi_user.h
diff --git a/cocotb/_vendor/vpi/sv_vpi_user.h → src/cocotb/_vendor/vpi/sv_vpi_user.h b/cocotb/_vendor/vpi/sv_vpi_user.h → src/cocotb/_vendor/vpi/sv_vpi_user.h
diff --git a/cocotb/_vendor/vpi/vpi_user.h → src/cocotb/_vendor/vpi/vpi_user.h b/cocotb/_vendor/vpi/vpi_user.h → src/cocotb/_vendor/vpi/vpi_user.h
diff --git a/cocotb/_version.py → src/cocotb/_version.py b/cocotb/_version.py → src/cocotb/_version.py
diff --git a/cocotb/binary.py → src/cocotb/binary.py b/cocotb/binary.py → src/cocotb/binary.py
diff --git a/cocotb/clock.py → src/cocotb/clock.py b/cocotb/clock.py → src/cocotb/clock.py
diff --git a/cocotb/config.py → src/cocotb/config.py b/cocotb/config.py → src/cocotb/config.py
diff --git a/cocotb/decorators.py → src/cocotb/decorators.py b/cocotb/decorators.py → src/cocotb/decorators.py
diff --git a/cocotb/handle.py → src/cocotb/handle.py b/cocotb/handle.py → src/cocotb/handle.py
diff --git a/cocotb/ipython_support.py → src/cocotb/ipython_support.py b/cocotb/ipython_support.py → src/cocotb/ipython_support.py
diff --git a/cocotb/log.py → src/cocotb/log.py b/cocotb/log.py → src/cocotb/log.py
diff --git a/cocotb/memdebug.py → src/cocotb/memdebug.py b/cocotb/memdebug.py → src/cocotb/memdebug.py
diff --git a/cocotb/outcomes.py → src/cocotb/outcomes.py b/cocotb/outcomes.py → src/cocotb/outcomes.py
diff --git a/cocotb/queue.py → src/cocotb/queue.py b/cocotb/queue.py → src/cocotb/queue.py
diff --git a/cocotb/regression.py → src/cocotb/regression.py b/cocotb/regression.py → src/cocotb/regression.py
diff --git a/cocotb/result.py → src/cocotb/result.py b/cocotb/result.py → src/cocotb/result.py
diff --git a/cocotb/runner.py → src/cocotb/runner.py b/cocotb/runner.py → src/cocotb/runner.py
diff --git a/cocotb/scheduler.py → src/cocotb/scheduler.py b/cocotb/scheduler.py → src/cocotb/scheduler.py
diff --git a/cocotb/share/def/.gitignore → src/cocotb/share/def/.gitignore b/cocotb/share/def/.gitignore → src/cocotb/share/def/.gitignore
diff --git a/cocotb/share/def/README.md → src/cocotb/share/def/README.md b/cocotb/share/def/README.md → src/cocotb/share/def/README.md
diff --git a/cocotb/share/def/aldec.def → src/cocotb/share/def/aldec.def b/cocotb/share/def/aldec.def → src/cocotb/share/def/aldec.def
diff --git a/cocotb/share/def/ghdl.def → src/cocotb/share/def/ghdl.def b/cocotb/share/def/ghdl.def → src/cocotb/share/def/ghdl.def
diff --git a/cocotb/share/def/icarus.def → src/cocotb/share/def/icarus.def b/cocotb/share/def/icarus.def → src/cocotb/share/def/icarus.def
diff --git a/cocotb/share/def/modelsim.def → src/cocotb/share/def/modelsim.def b/cocotb/share/def/modelsim.def → src/cocotb/share/def/modelsim.def
diff --git a/cocotb/share/include/cocotb_utils.h → src/cocotb/share/include/cocotb_utils.h b/cocotb/share/include/cocotb_utils.h → src/cocotb/share/include/cocotb_utils.h
diff --git a/cocotb/share/include/embed.h → src/cocotb/share/include/embed.h b/cocotb/share/include/embed.h → src/cocotb/share/include/embed.h
diff --git a/cocotb/share/include/exports.h → src/cocotb/share/include/exports.h b/cocotb/share/include/exports.h → src/cocotb/share/include/exports.h
diff --git a/cocotb/share/include/gpi.h → src/cocotb/share/include/gpi.h b/cocotb/share/include/gpi.h → src/cocotb/share/include/gpi.h
diff --git a/cocotb/share/include/gpi_logging.h → src/cocotb/share/include/gpi_logging.h b/cocotb/share/include/gpi_logging.h → src/cocotb/share/include/gpi_logging.h
diff --git a/cocotb/share/include/py_gpi_logging.h → src/cocotb/share/include/py_gpi_logging.h b/cocotb/share/include/py_gpi_logging.h → src/cocotb/share/include/py_gpi_logging.h
diff --git a/cocotb/share/include/vhpi_user_ext.h → src/cocotb/share/include/vhpi_user_ext.h b/cocotb/share/include/vhpi_user_ext.h → src/cocotb/share/include/vhpi_user_ext.h
diff --git a/cocotb/share/include/vpi_user_ext.h → src/cocotb/share/include/vpi_user_ext.h b/cocotb/share/include/vpi_user_ext.h → src/cocotb/share/include/vpi_user_ext.h
diff --git a/cocotb/share/lib/embed/embed.cpp → src/cocotb/share/lib/embed/embed.cpp b/cocotb/share/lib/embed/embed.cpp → src/cocotb/share/lib/embed/embed.cpp
diff --git a/cocotb/share/lib/embed/gpi_embed.cpp → src/cocotb/share/lib/embed/gpi_embed.cpp b/cocotb/share/lib/embed/gpi_embed.cpp → src/cocotb/share/lib/embed/gpi_embed.cpp
diff --git a/cocotb/share/lib/fli/FliCbHdl.cpp → src/cocotb/share/lib/fli/FliCbHdl.cpp b/cocotb/share/lib/fli/FliCbHdl.cpp → src/cocotb/share/lib/fli/FliCbHdl.cpp
diff --git a/cocotb/share/lib/fli/FliImpl.cpp → src/cocotb/share/lib/fli/FliImpl.cpp b/cocotb/share/lib/fli/FliImpl.cpp → src/cocotb/share/lib/fli/FliImpl.cpp
diff --git a/cocotb/share/lib/fli/FliImpl.h → src/cocotb/share/lib/fli/FliImpl.h b/cocotb/share/lib/fli/FliImpl.h → src/cocotb/share/lib/fli/FliImpl.h
diff --git a/cocotb/share/lib/fli/FliObjHdl.cpp → src/cocotb/share/lib/fli/FliObjHdl.cpp b/cocotb/share/lib/fli/FliObjHdl.cpp → src/cocotb/share/lib/fli/FliObjHdl.cpp
diff --git a/cocotb/share/lib/gpi/GpiCbHdl.cpp → src/cocotb/share/lib/gpi/GpiCbHdl.cpp b/cocotb/share/lib/gpi/GpiCbHdl.cpp → src/cocotb/share/lib/gpi/GpiCbHdl.cpp
diff --git a/cocotb/share/lib/gpi/GpiCommon.cpp → src/cocotb/share/lib/gpi/GpiCommon.cpp b/cocotb/share/lib/gpi/GpiCommon.cpp → src/cocotb/share/lib/gpi/GpiCommon.cpp
diff --git a/cocotb/share/lib/gpi/gpi_priv.h → src/cocotb/share/lib/gpi/gpi_priv.h b/cocotb/share/lib/gpi/gpi_priv.h → src/cocotb/share/lib/gpi/gpi_priv.h
diff --git a/cocotb/share/lib/gpi_log/gpi_logging.cpp → src/cocotb/share/lib/gpi_log/gpi_logging.cpp b/cocotb/share/lib/gpi_log/gpi_logging.cpp → src/cocotb/share/lib/gpi_log/gpi_logging.cpp
diff --git a/...b/share/lib/py_gpi_log/py_gpi_logging.cpp → ...b/share/lib/py_gpi_log/py_gpi_logging.cpp b/...b/share/lib/py_gpi_log/py_gpi_logging.cpp → ...b/share/lib/py_gpi_log/py_gpi_logging.cpp
diff --git a/...b/share/lib/simulator/simulatormodule.cpp → ...b/share/lib/simulator/simulatormodule.cpp b/...b/share/lib/simulator/simulatormodule.cpp → ...b/share/lib/simulator/simulatormodule.cpp
diff --git a/cocotb/share/lib/utils/cocotb_utils.cpp → src/cocotb/share/lib/utils/cocotb_utils.cpp b/cocotb/share/lib/utils/cocotb_utils.cpp → src/cocotb/share/lib/utils/cocotb_utils.cpp
diff --git a/cocotb/share/lib/verilator/verilator.cpp → src/cocotb/share/lib/verilator/verilator.cpp b/cocotb/share/lib/verilator/verilator.cpp → src/cocotb/share/lib/verilator/verilator.cpp
diff --git a/cocotb/share/lib/vhpi/VhpiCbHdl.cpp → src/cocotb/share/lib/vhpi/VhpiCbHdl.cpp b/cocotb/share/lib/vhpi/VhpiCbHdl.cpp → src/cocotb/share/lib/vhpi/VhpiCbHdl.cpp
diff --git a/cocotb/share/lib/vhpi/VhpiImpl.cpp → src/cocotb/share/lib/vhpi/VhpiImpl.cpp b/cocotb/share/lib/vhpi/VhpiImpl.cpp → src/cocotb/share/lib/vhpi/VhpiImpl.cpp
diff --git a/cocotb/share/lib/vhpi/VhpiImpl.h → src/cocotb/share/lib/vhpi/VhpiImpl.h b/cocotb/share/lib/vhpi/VhpiImpl.h → src/cocotb/share/lib/vhpi/VhpiImpl.h
diff --git a/cocotb/share/lib/vpi/VpiCbHdl.cpp → src/cocotb/share/lib/vpi/VpiCbHdl.cpp b/cocotb/share/lib/vpi/VpiCbHdl.cpp → src/cocotb/share/lib/vpi/VpiCbHdl.cpp
diff --git a/cocotb/share/lib/vpi/VpiImpl.cpp → src/cocotb/share/lib/vpi/VpiImpl.cpp b/cocotb/share/lib/vpi/VpiImpl.cpp → src/cocotb/share/lib/vpi/VpiImpl.cpp
diff --git a/cocotb/share/lib/vpi/VpiImpl.h → src/cocotb/share/lib/vpi/VpiImpl.h b/cocotb/share/lib/vpi/VpiImpl.h → src/cocotb/share/lib/vpi/VpiImpl.h
diff --git a/cocotb/share/makefiles/Makefile.deprecations → ...otb/share/makefiles/Makefile.deprecations b/cocotb/share/makefiles/Makefile.deprecations → ...otb/share/makefiles/Makefile.deprecations
diff --git a/cocotb/share/makefiles/Makefile.inc → src/cocotb/share/makefiles/Makefile.inc b/cocotb/share/makefiles/Makefile.inc → src/cocotb/share/makefiles/Makefile.inc
diff --git a/cocotb/share/makefiles/Makefile.sim → src/cocotb/share/makefiles/Makefile.sim b/cocotb/share/makefiles/Makefile.sim → src/cocotb/share/makefiles/Makefile.sim
diff --git a/...e/makefiles/simulators/Makefile.activehdl → ...e/makefiles/simulators/Makefile.activehdl b/...e/makefiles/simulators/Makefile.activehdl → ...e/makefiles/simulators/Makefile.activehdl
diff --git a/...b/share/makefiles/simulators/Makefile.cvc → ...b/share/makefiles/simulators/Makefile.cvc b/...b/share/makefiles/simulators/Makefile.cvc → ...b/share/makefiles/simulators/Makefile.cvc
diff --git a/.../share/makefiles/simulators/Makefile.ghdl → .../share/makefiles/simulators/Makefile.ghdl b/.../share/makefiles/simulators/Makefile.ghdl → .../share/makefiles/simulators/Makefile.ghdl
diff --git a/...hare/makefiles/simulators/Makefile.icarus → ...hare/makefiles/simulators/Makefile.icarus b/...hare/makefiles/simulators/Makefile.icarus → ...hare/makefiles/simulators/Makefile.icarus
diff --git a/...b/share/makefiles/simulators/Makefile.ius → ...b/share/makefiles/simulators/Makefile.ius b/...b/share/makefiles/simulators/Makefile.ius → ...b/share/makefiles/simulators/Makefile.ius
diff --git a/...re/makefiles/simulators/Makefile.modelsim → ...re/makefiles/simulators/Makefile.modelsim b/...re/makefiles/simulators/Makefile.modelsim → ...re/makefiles/simulators/Makefile.modelsim
diff --git a/...b/share/makefiles/simulators/Makefile.nvc → ...b/share/makefiles/simulators/Makefile.nvc b/...b/share/makefiles/simulators/Makefile.nvc → ...b/share/makefiles/simulators/Makefile.nvc
diff --git a/...hare/makefiles/simulators/Makefile.questa → ...hare/makefiles/simulators/Makefile.questa b/...hare/makefiles/simulators/Makefile.questa → ...hare/makefiles/simulators/Makefile.questa
diff --git a/...are/makefiles/simulators/Makefile.riviera → ...are/makefiles/simulators/Makefile.riviera b/...are/makefiles/simulators/Makefile.riviera → ...are/makefiles/simulators/Makefile.riviera
diff --git a/...b/share/makefiles/simulators/Makefile.vcs → ...b/share/makefiles/simulators/Makefile.vcs b/...b/share/makefiles/simulators/Makefile.vcs → ...b/share/makefiles/simulators/Makefile.vcs
diff --git a/...e/makefiles/simulators/Makefile.verilator → ...e/makefiles/simulators/Makefile.verilator b/...e/makefiles/simulators/Makefile.verilator → ...e/makefiles/simulators/Makefile.verilator
diff --git a/...are/makefiles/simulators/Makefile.xcelium → ...are/makefiles/simulators/Makefile.xcelium b/...are/makefiles/simulators/Makefile.xcelium → ...are/makefiles/simulators/Makefile.xcelium
diff --git a/cocotb/task.py → src/cocotb/task.py b/cocotb/task.py → src/cocotb/task.py
diff --git a/cocotb/triggers.py → src/cocotb/triggers.py b/cocotb/triggers.py → src/cocotb/triggers.py
diff --git a/cocotb/types/__init__.py → src/cocotb/types/__init__.py b/cocotb/types/__init__.py → src/cocotb/types/__init__.py
diff --git a/cocotb/types/array.py → src/cocotb/types/array.py b/cocotb/types/array.py → src/cocotb/types/array.py
diff --git a/cocotb/types/logic.py → src/cocotb/types/logic.py b/cocotb/types/logic.py → src/cocotb/types/logic.py
diff --git a/cocotb/types/logic_array.py → src/cocotb/types/logic_array.py b/cocotb/types/logic_array.py → src/cocotb/types/logic_array.py
diff --git a/cocotb/types/range.py → src/cocotb/types/range.py b/cocotb/types/range.py → src/cocotb/types/range.py
diff --git a/cocotb/utils.py → src/cocotb/utils.py b/cocotb/utils.py → src/cocotb/utils.py
diff --git a/cocotb/wavedrom.py → src/cocotb/wavedrom.py b/cocotb/wavedrom.py → src/cocotb/wavedrom.py
diff --git a/cocotb/xunit_reporter.py → src/cocotb/xunit_reporter.py b/cocotb/xunit_reporter.py → src/cocotb/xunit_reporter.py
diff --git a/pygpi/__init__.py → src/pygpi/__init__.py b/pygpi/__init__.py → src/pygpi/__init__.py
diff --git a/pygpi/entry.py → src/pygpi/entry.py b/pygpi/entry.py → src/pygpi/entry.py