Make backends use src subdirectories

beeware · Oct 18, 2022 · 0d3c0f2 · 0d3c0f2
1 parent 0a4dff2
commit 0d3c0f2
Show file tree

Hide file tree

Showing 273 changed files with 76 additions and 112 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -77,50 +77,49 @@ jobs:
         flags: unittests
         fail_ci_if_error: true
 
-  # FIXME
-  # backend:
-  #   needs: beefore
-  #   strategy:
-  #     matrix:
-  #       backend: [android, cocoa, gtk, iOS, web, winforms]
-  #       include:
-  #         - runs-on: ubuntu-latest
-  #         - python-version: "3.7"  # Should be env.min_python_version (https://github.com/actions/runner/issues/480)
-  #         - pre-command:
-  #         - test-command: pytest
-  #         - backend: cocoa
-  #           runs-on: macos-latest
-  #         - backend: gtk
-  #           pre-command: "sudo apt-get update -y && sudo apt-get install -y python3-gi python3-gi-cairo gir1.2-gtk-3.0 python3-dev libgirepository1.0-dev libcairo2-dev pkg-config"
-  #           test-command: "xvfb-run -a -s '-screen 0 2048x1536x24' pytest"
-  #         - backend: iOS
-  #           runs-on: macos-latest
-  #         - backend: winforms
-  #           runs-on: windows-latest
-  #           # Py3.9 is the first Python version for which
-  #           # a wheel of pythonnet isn't available on PyPI.
-  #           python-version: "3.9"
-  #   runs-on: ${{ matrix.runs-on }}
-  #   steps:
-  #   - uses: actions/checkout@v1
-  #   - name: Set up Python ${{ matrix.python-version }}
-  #     uses: actions/[email protected]
-  #     with:
-  #       # Py3.9 is the first Python version for which
-  #       # a wheel of pythonnet isn't available on PyPI.
-  #       python-version: ${{ matrix.python-version }}
-  #   - name: Get packages
-  #     uses: actions/download-artifact@v3
-  #     with:
-  #       name: packages
-  #   - name: Install dependencies
-  #     run: |
-  #       ${{ matrix.pre-command }}
-  #       python -m pip install --upgrade pip
-  #       python -m pip install --upgrade setuptools
-  #       python -m pip install pytest-tldr
-  #       python -m pip install src/{core,dummy,${{ matrix.backend }}}/dist/*.whl
-  #   - name: Test
-  #     run: |
-  #       cd src/${{ matrix.backend }}
-  #       ${{ matrix.test-command }}
+  backend:
+    needs: beefore
+    strategy:
+      matrix:
+        backend: [android, cocoa, gtk, iOS, web, winforms]
+        include:
+          - runs-on: ubuntu-latest
+          - python-version: "3.7"  # Should be env.min_python_version (https://github.com/actions/runner/issues/480)
+          - pre-command:
+          - test-command: pytest
+          - backend: cocoa
+            runs-on: macos-latest
+          - backend: gtk
+            pre-command: "sudo apt-get update -y && sudo apt-get install -y python3-gi python3-gi-cairo gir1.2-gtk-3.0 python3-dev libgirepository1.0-dev libcairo2-dev pkg-config"
+            test-command: "xvfb-run -a -s '-screen 0 2048x1536x24' pytest"
+          - backend: iOS
+            runs-on: macos-latest
+          - backend: winforms
+            runs-on: windows-latest
+            # Py3.9 is the first Python version for which
+            # a wheel of pythonnet isn't available on PyPI.
+            python-version: "3.9"
+    runs-on: ${{ matrix.runs-on }}
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/[email protected]
+      with:
+        # Py3.9 is the first Python version for which
+        # a wheel of pythonnet isn't available on PyPI.
+        python-version: ${{ matrix.python-version }}
+    - name: Get packages
+      uses: actions/download-artifact@v3
+      with:
+        name: packages
+    - name: Install dependencies
+      run: |
+        ${{ matrix.pre-command }}
+        python -m pip install --upgrade pip
+        python -m pip install --upgrade setuptools
+        python -m pip install pytest-tldr
+        python -m pip install src/{core,dummy,${{ matrix.backend }}}/dist/*.whl
+    - name: Test
+      run: |
+        cd src/${{ matrix.backend }}
+        ${{ matrix.test-command }}
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -38,9 +38,15 @@ recursive-include examples *.css
 recursive-include examples *.html
 recursive-include examples README
 prune examples/*/.vscode
+prune examples/*/android
+prune examples/*/cocoa
+prune examples/*/gtk
+prune examples/*/iOS
+prune examples/*/web
+prune examples/*/winforms
 
-include src/winforms/toga_winforms/libs/WebView2/LICENSE.md
-include src/winforms/toga_winforms/libs/WebView2/README.md
+include src/winforms/src/toga_winforms/libs/WebView2/LICENSE.md
+include src/winforms/src/toga_winforms/libs/WebView2/README.md
 recursive-include src *.css
 recursive-include src *.html
 recursive-include src *.icns
@@ -52,7 +58,7 @@ recursive-include src *.rst
 recursive-include src CONTRIBUTING.md
 recursive-include src LICENSE
 recursive-include src MANIFEST.in
-recursive-include src/winforms/toga_winforms/libs/WebView2 *.dll
+recursive-include src/winforms/src/toga_winforms/libs/WebView2 *.dll
 prune src/*/build
 prune src/*/.eggs
 

diff --git a/release.sh b/release.sh
@@ -91,7 +91,7 @@ function install {
 }
 
 
-MODULES="core dummy"  # FIXME android cocoa core dummy gtk iOS web winforms toga demo
+MODULES="android cocoa core dummy gtk iOS web winforms toga demo"
 
 action=$1
 shift

diff --git a/src/android/MANIFEST.in b/src/android/MANIFEST.in
@@ -2,4 +2,3 @@ include CONTRIBUTING.md
 include LICENSE
 include README.rst
 recursive-include tests *.py
-recursive-include toga_android *.py
diff --git a/src/android/setup.cfg b/src/android/setup.cfg
@@ -38,15 +38,11 @@ keywords =
     android
 
 [options]
-packages = find:
+package_dir =
+    = src
 python_requires = >= 3.6
 zip_safe = False
 
-[options.packages.find]
-include =
-    toga_android
-    toga_android.*
-
 [flake8]
 exclude=\
     .eggs/*,\

diff --git a/src/android/setup.py b/src/android/setup.py
@@ -6,7 +6,7 @@
 # Version handline needs to be programatic because
 # we can't import toga_android to compute the version;
 # and to support versioned subpackage dependencies
-with open('toga_android/__init__.py', encoding='utf8') as version_file:
+with open('src/toga_android/__init__.py', encoding='utf8') as version_file:
     version_match = re.search(
         r"^__version__ = ['\"]([^'\"]*)['\"]",
         version_file.read(),

diff --git a/src/android/toga_android/__init__.py → src/android/src/toga_android/__init__.py b/src/android/toga_android/__init__.py → src/android/src/toga_android/__init__.py
diff --git a/src/android/toga_android/app.py → src/android/src/toga_android/app.py b/src/android/toga_android/app.py → src/android/src/toga_android/app.py
diff --git a/src/android/toga_android/colors.py → src/android/src/toga_android/colors.py b/src/android/toga_android/colors.py → src/android/src/toga_android/colors.py
diff --git a/src/android/toga_android/command.py → src/android/src/toga_android/command.py b/src/android/toga_android/command.py → src/android/src/toga_android/command.py
diff --git a/src/android/toga_android/dialogs.py → src/android/src/toga_android/dialogs.py b/src/android/toga_android/dialogs.py → src/android/src/toga_android/dialogs.py
diff --git a/src/android/toga_android/factory.py → src/android/src/toga_android/factory.py b/src/android/toga_android/factory.py → src/android/src/toga_android/factory.py
diff --git a/src/android/toga_android/fonts.py → src/android/src/toga_android/fonts.py b/src/android/toga_android/fonts.py → src/android/src/toga_android/fonts.py
diff --git a/...android/toga_android/hardware/__init__.py → ...oid/src/toga_android/hardware/__init__.py b/...android/toga_android/hardware/__init__.py → ...oid/src/toga_android/hardware/__init__.py
diff --git a/src/android/toga_android/icons.py → src/android/src/toga_android/icons.py b/src/android/toga_android/icons.py → src/android/src/toga_android/icons.py
diff --git a/src/android/toga_android/images.py → src/android/src/toga_android/images.py b/src/android/toga_android/images.py → src/android/src/toga_android/images.py
diff --git a/src/android/toga_android/libs/__init__.py → ...android/src/toga_android/libs/__init__.py b/src/android/toga_android/libs/__init__.py → ...android/src/toga_android/libs/__init__.py
diff --git a/src/android/toga_android/libs/activity.py → ...android/src/toga_android/libs/activity.py b/src/android/toga_android/libs/activity.py → ...android/src/toga_android/libs/activity.py
diff --git a/...oid/toga_android/libs/android/__init__.py → ...src/toga_android/libs/android/__init__.py b/...oid/toga_android/libs/android/__init__.py → ...src/toga_android/libs/android/__init__.py
diff --git a/src/android/toga_android/libs/android/app.py → ...roid/src/toga_android/libs/android/app.py b/src/android/toga_android/libs/android/app.py → ...roid/src/toga_android/libs/android/app.py
diff --git a/...roid/toga_android/libs/android/content.py → .../src/toga_android/libs/android/content.py b/...roid/toga_android/libs/android/content.py → .../src/toga_android/libs/android/content.py
diff --git a/...oid/toga_android/libs/android/graphics.py → ...src/toga_android/libs/android/graphics.py b/...oid/toga_android/libs/android/graphics.py → ...src/toga_android/libs/android/graphics.py
diff --git a/...android/toga_android/libs/android/text.py → ...oid/src/toga_android/libs/android/text.py b/...android/toga_android/libs/android/text.py → ...oid/src/toga_android/libs/android/text.py
diff --git a/...android/toga_android/libs/android/util.py → ...oid/src/toga_android/libs/android/util.py b/...android/toga_android/libs/android/util.py → ...oid/src/toga_android/libs/android/util.py
diff --git a/...android/toga_android/libs/android/view.py → ...oid/src/toga_android/libs/android/view.py b/...android/toga_android/libs/android/view.py → ...oid/src/toga_android/libs/android/view.py
diff --git a/...droid/toga_android/libs/android/webkit.py → ...d/src/toga_android/libs/android/webkit.py b/...droid/toga_android/libs/android/webkit.py → ...d/src/toga_android/libs/android/webkit.py
diff --git a/...droid/toga_android/libs/android/widget.py → ...d/src/toga_android/libs/android/widget.py b/...droid/toga_android/libs/android/widget.py → ...d/src/toga_android/libs/android/widget.py
diff --git a/...id/toga_android/libs/androidx/__init__.py → ...rc/toga_android/libs/androidx/__init__.py b/...id/toga_android/libs/androidx/__init__.py → ...rc/toga_android/libs/androidx/__init__.py
diff --git a/...droid/libs/androidx/swiperefreshlayout.py → ...droid/libs/androidx/swiperefreshlayout.py b/...droid/libs/androidx/swiperefreshlayout.py → ...droid/libs/androidx/swiperefreshlayout.py
diff --git a/src/android/toga_android/paths.py → src/android/src/toga_android/paths.py b/src/android/toga_android/paths.py → src/android/src/toga_android/paths.py
diff --git a/src/android/toga_android/widgets/__init__.py → ...roid/src/toga_android/widgets/__init__.py b/src/android/toga_android/widgets/__init__.py → ...roid/src/toga_android/widgets/__init__.py
diff --git a/src/android/toga_android/widgets/base.py → src/android/src/toga_android/widgets/base.py b/src/android/toga_android/widgets/base.py → src/android/src/toga_android/widgets/base.py
diff --git a/src/android/toga_android/widgets/box.py → src/android/src/toga_android/widgets/box.py b/src/android/toga_android/widgets/box.py → src/android/src/toga_android/widgets/box.py
diff --git a/src/android/toga_android/widgets/button.py → ...ndroid/src/toga_android/widgets/button.py b/src/android/toga_android/widgets/button.py → ...ndroid/src/toga_android/widgets/button.py
diff --git a/src/android/toga_android/widgets/canvas.py → ...ndroid/src/toga_android/widgets/canvas.py b/src/android/toga_android/widgets/canvas.py → ...ndroid/src/toga_android/widgets/canvas.py
diff --git a/...ndroid/toga_android/widgets/datepicker.py → ...id/src/toga_android/widgets/datepicker.py b/...ndroid/toga_android/widgets/datepicker.py → ...id/src/toga_android/widgets/datepicker.py
diff --git a/...roid/toga_android/widgets/detailedlist.py → .../src/toga_android/widgets/detailedlist.py b/...roid/toga_android/widgets/detailedlist.py → .../src/toga_android/widgets/detailedlist.py
diff --git a/...android/toga_android/widgets/imageview.py → ...oid/src/toga_android/widgets/imageview.py b/...android/toga_android/widgets/imageview.py → ...oid/src/toga_android/widgets/imageview.py
diff --git a/...toga_android/widgets/internal/__init__.py → ...toga_android/widgets/internal/__init__.py b/...toga_android/widgets/internal/__init__.py → ...toga_android/widgets/internal/__init__.py
diff --git a/.../toga_android/widgets/internal/pickers.py → .../toga_android/widgets/internal/pickers.py b/.../toga_android/widgets/internal/pickers.py → .../toga_android/widgets/internal/pickers.py
diff --git a/src/android/toga_android/widgets/label.py → ...android/src/toga_android/widgets/label.py b/src/android/toga_android/widgets/label.py → ...android/src/toga_android/widgets/label.py
diff --git a/...oga_android/widgets/multilinetextinput.py → ...oga_android/widgets/multilinetextinput.py b/...oga_android/widgets/multilinetextinput.py → ...oga_android/widgets/multilinetextinput.py
diff --git a/...droid/toga_android/widgets/numberinput.py → ...d/src/toga_android/widgets/numberinput.py b/...droid/toga_android/widgets/numberinput.py → ...d/src/toga_android/widgets/numberinput.py
diff --git a/...oid/toga_android/widgets/passwordinput.py → ...src/toga_android/widgets/passwordinput.py b/...oid/toga_android/widgets/passwordinput.py → ...src/toga_android/widgets/passwordinput.py
diff --git a/...droid/toga_android/widgets/progressbar.py → ...d/src/toga_android/widgets/progressbar.py b/...droid/toga_android/widgets/progressbar.py → ...d/src/toga_android/widgets/progressbar.py
diff --git a/...d/toga_android/widgets/scrollcontainer.py → ...c/toga_android/widgets/scrollcontainer.py b/...d/toga_android/widgets/scrollcontainer.py → ...c/toga_android/widgets/scrollcontainer.py
diff --git a/...android/toga_android/widgets/selection.py → ...oid/src/toga_android/widgets/selection.py b/...android/toga_android/widgets/selection.py → ...oid/src/toga_android/widgets/selection.py
diff --git a/src/android/toga_android/widgets/slider.py → ...ndroid/src/toga_android/widgets/slider.py b/src/android/toga_android/widgets/slider.py → ...ndroid/src/toga_android/widgets/slider.py
diff --git a/src/android/toga_android/widgets/switch.py → ...ndroid/src/toga_android/widgets/switch.py b/src/android/toga_android/widgets/switch.py → ...ndroid/src/toga_android/widgets/switch.py
diff --git a/src/android/toga_android/widgets/table.py → ...android/src/toga_android/widgets/table.py b/src/android/toga_android/widgets/table.py → ...android/src/toga_android/widgets/table.py
diff --git a/...android/toga_android/widgets/textinput.py → ...oid/src/toga_android/widgets/textinput.py b/...android/toga_android/widgets/textinput.py → ...oid/src/toga_android/widgets/textinput.py
diff --git a/...ndroid/toga_android/widgets/timepicker.py → ...id/src/toga_android/widgets/timepicker.py b/...ndroid/toga_android/widgets/timepicker.py → ...id/src/toga_android/widgets/timepicker.py
diff --git a/src/android/toga_android/widgets/webview.py → ...droid/src/toga_android/widgets/webview.py b/src/android/toga_android/widgets/webview.py → ...droid/src/toga_android/widgets/webview.py
diff --git a/src/android/toga_android/window.py → src/android/src/toga_android/window.py b/src/android/toga_android/window.py → src/android/src/toga_android/window.py
diff --git a/src/cocoa/MANIFEST.in b/src/cocoa/MANIFEST.in
@@ -2,4 +2,3 @@ include CONTRIBUTING.md
 include LICENSE
 include README.rst
 recursive-include tests *.py
-recursive-include toga_cocoa *.py
diff --git a/src/cocoa/setup.cfg b/src/cocoa/setup.cfg
@@ -39,15 +39,11 @@ keywords =
     cocoa
 
 [options]
-packages = find:
+package_dir =
+    = src
 python_requires = >= 3.6
 zip_safe = False
 
-[options.packages.find]
-include =
-    toga_cocoa
-    toga_cocoa.*
-
 [flake8]
 exclude=\
     .eggs/*,\

diff --git a/src/cocoa/setup.py b/src/cocoa/setup.py
@@ -6,7 +6,7 @@
 # Version handline needs to be programatic because
 # we can't import toga_cocoa to compute the version;
 # and to support versioned subpackage dependencies
-with open('toga_cocoa/__init__.py', encoding='utf8') as version_file:
+with open('src/toga_cocoa/__init__.py', encoding='utf8') as version_file:
     version_match = re.search(
         r"^__version__ = ['\"]([^'\"]*)['\"]",
         version_file.read(),

diff --git a/src/cocoa/toga_cocoa/__init__.py → src/cocoa/src/toga_cocoa/__init__.py b/src/cocoa/toga_cocoa/__init__.py → src/cocoa/src/toga_cocoa/__init__.py
diff --git a/src/cocoa/toga_cocoa/app.py → src/cocoa/src/toga_cocoa/app.py b/src/cocoa/toga_cocoa/app.py → src/cocoa/src/toga_cocoa/app.py
diff --git a/src/cocoa/toga_cocoa/colors.py → src/cocoa/src/toga_cocoa/colors.py b/src/cocoa/toga_cocoa/colors.py → src/cocoa/src/toga_cocoa/colors.py
diff --git a/src/cocoa/toga_cocoa/command.py → src/cocoa/src/toga_cocoa/command.py b/src/cocoa/toga_cocoa/command.py → src/cocoa/src/toga_cocoa/command.py
diff --git a/src/cocoa/toga_cocoa/constraints.py → src/cocoa/src/toga_cocoa/constraints.py b/src/cocoa/toga_cocoa/constraints.py → src/cocoa/src/toga_cocoa/constraints.py
diff --git a/src/cocoa/toga_cocoa/dialogs.py → src/cocoa/src/toga_cocoa/dialogs.py b/src/cocoa/toga_cocoa/dialogs.py → src/cocoa/src/toga_cocoa/dialogs.py
diff --git a/src/cocoa/toga_cocoa/documents.py → src/cocoa/src/toga_cocoa/documents.py b/src/cocoa/toga_cocoa/documents.py → src/cocoa/src/toga_cocoa/documents.py
diff --git a/src/cocoa/toga_cocoa/factory.py → src/cocoa/src/toga_cocoa/factory.py b/src/cocoa/toga_cocoa/factory.py → src/cocoa/src/toga_cocoa/factory.py
diff --git a/src/cocoa/toga_cocoa/fonts.py → src/cocoa/src/toga_cocoa/fonts.py b/src/cocoa/toga_cocoa/fonts.py → src/cocoa/src/toga_cocoa/fonts.py
diff --git a/src/cocoa/toga_cocoa/hardware/__init__.py → ...cocoa/src/toga_cocoa/hardware/__init__.py b/src/cocoa/toga_cocoa/hardware/__init__.py → ...cocoa/src/toga_cocoa/hardware/__init__.py
diff --git a/src/cocoa/toga_cocoa/icons.py → src/cocoa/src/toga_cocoa/icons.py b/src/cocoa/toga_cocoa/icons.py → src/cocoa/src/toga_cocoa/icons.py
diff --git a/src/cocoa/toga_cocoa/images.py → src/cocoa/src/toga_cocoa/images.py b/src/cocoa/toga_cocoa/images.py → src/cocoa/src/toga_cocoa/images.py
diff --git a/src/cocoa/toga_cocoa/keys.py → src/cocoa/src/toga_cocoa/keys.py b/src/cocoa/toga_cocoa/keys.py → src/cocoa/src/toga_cocoa/keys.py
diff --git a/src/cocoa/toga_cocoa/libs/__init__.py → src/cocoa/src/toga_cocoa/libs/__init__.py b/src/cocoa/toga_cocoa/libs/__init__.py → src/cocoa/src/toga_cocoa/libs/__init__.py
diff --git a/src/cocoa/toga_cocoa/libs/appkit.py → src/cocoa/src/toga_cocoa/libs/appkit.py b/src/cocoa/toga_cocoa/libs/appkit.py → src/cocoa/src/toga_cocoa/libs/appkit.py
diff --git a/src/cocoa/toga_cocoa/libs/core_graphics.py → ...ocoa/src/toga_cocoa/libs/core_graphics.py b/src/cocoa/toga_cocoa/libs/core_graphics.py → ...ocoa/src/toga_cocoa/libs/core_graphics.py
diff --git a/src/cocoa/toga_cocoa/libs/core_text.py → src/cocoa/src/toga_cocoa/libs/core_text.py b/src/cocoa/toga_cocoa/libs/core_text.py → src/cocoa/src/toga_cocoa/libs/core_text.py
diff --git a/src/cocoa/toga_cocoa/libs/foundation.py → src/cocoa/src/toga_cocoa/libs/foundation.py b/src/cocoa/toga_cocoa/libs/foundation.py → src/cocoa/src/toga_cocoa/libs/foundation.py
diff --git a/src/cocoa/toga_cocoa/libs/webkit.py → src/cocoa/src/toga_cocoa/libs/webkit.py b/src/cocoa/toga_cocoa/libs/webkit.py → src/cocoa/src/toga_cocoa/libs/webkit.py
diff --git a/src/cocoa/toga_cocoa/paths.py → src/cocoa/src/toga_cocoa/paths.py b/src/cocoa/toga_cocoa/paths.py → src/cocoa/src/toga_cocoa/paths.py
diff --git a/src/cocoa/toga_cocoa/resources/__init__.py → ...ocoa/src/toga_cocoa/resources/__init__.py b/src/cocoa/toga_cocoa/resources/__init__.py → ...ocoa/src/toga_cocoa/resources/__init__.py
diff --git a/src/cocoa/toga_cocoa/widgets/__init__.py → src/cocoa/src/toga_cocoa/widgets/__init__.py b/src/cocoa/toga_cocoa/widgets/__init__.py → src/cocoa/src/toga_cocoa/widgets/__init__.py
diff --git a/...a/toga_cocoa/widgets/activityindicator.py → ...c/toga_cocoa/widgets/activityindicator.py b/...a/toga_cocoa/widgets/activityindicator.py → ...c/toga_cocoa/widgets/activityindicator.py
diff --git a/src/cocoa/toga_cocoa/widgets/base.py → src/cocoa/src/toga_cocoa/widgets/base.py b/src/cocoa/toga_cocoa/widgets/base.py → src/cocoa/src/toga_cocoa/widgets/base.py
diff --git a/src/cocoa/toga_cocoa/widgets/box.py → src/cocoa/src/toga_cocoa/widgets/box.py b/src/cocoa/toga_cocoa/widgets/box.py → src/cocoa/src/toga_cocoa/widgets/box.py
diff --git a/src/cocoa/toga_cocoa/widgets/button.py → src/cocoa/src/toga_cocoa/widgets/button.py b/src/cocoa/toga_cocoa/widgets/button.py → src/cocoa/src/toga_cocoa/widgets/button.py
diff --git a/src/cocoa/toga_cocoa/widgets/canvas.py → src/cocoa/src/toga_cocoa/widgets/canvas.py b/src/cocoa/toga_cocoa/widgets/canvas.py → src/cocoa/src/toga_cocoa/widgets/canvas.py
diff --git a/src/cocoa/toga_cocoa/widgets/detailedlist.py → ...oa/src/toga_cocoa/widgets/detailedlist.py b/src/cocoa/toga_cocoa/widgets/detailedlist.py → ...oa/src/toga_cocoa/widgets/detailedlist.py
diff --git a/src/cocoa/toga_cocoa/widgets/divider.py → src/cocoa/src/toga_cocoa/widgets/divider.py b/src/cocoa/toga_cocoa/widgets/divider.py → src/cocoa/src/toga_cocoa/widgets/divider.py
diff --git a/src/cocoa/toga_cocoa/widgets/imageview.py → ...cocoa/src/toga_cocoa/widgets/imageview.py b/src/cocoa/toga_cocoa/widgets/imageview.py → ...cocoa/src/toga_cocoa/widgets/imageview.py
diff --git a/...a/toga_cocoa/widgets/internal/__init__.py → ...c/toga_cocoa/widgets/internal/__init__.py b/...a/toga_cocoa/widgets/internal/__init__.py → ...c/toga_cocoa/widgets/internal/__init__.py
diff --git a/...ocoa/toga_cocoa/widgets/internal/cells.py → .../src/toga_cocoa/widgets/internal/cells.py b/...ocoa/toga_cocoa/widgets/internal/cells.py → .../src/toga_cocoa/widgets/internal/cells.py
diff --git a/...cocoa/toga_cocoa/widgets/internal/data.py → ...a/src/toga_cocoa/widgets/internal/data.py b/...cocoa/toga_cocoa/widgets/internal/data.py → ...a/src/toga_cocoa/widgets/internal/data.py
diff --git a/...oa/toga_cocoa/widgets/internal/refresh.py → ...rc/toga_cocoa/widgets/internal/refresh.py b/...oa/toga_cocoa/widgets/internal/refresh.py → ...rc/toga_cocoa/widgets/internal/refresh.py
diff --git a/src/cocoa/toga_cocoa/widgets/label.py → src/cocoa/src/toga_cocoa/widgets/label.py b/src/cocoa/toga_cocoa/widgets/label.py → src/cocoa/src/toga_cocoa/widgets/label.py
diff --git a/.../toga_cocoa/widgets/multilinetextinput.py → .../toga_cocoa/widgets/multilinetextinput.py b/.../toga_cocoa/widgets/multilinetextinput.py → .../toga_cocoa/widgets/multilinetextinput.py
diff --git a/src/cocoa/toga_cocoa/widgets/numberinput.py → ...coa/src/toga_cocoa/widgets/numberinput.py b/src/cocoa/toga_cocoa/widgets/numberinput.py → ...coa/src/toga_cocoa/widgets/numberinput.py
diff --git a/...coa/toga_cocoa/widgets/optioncontainer.py → ...src/toga_cocoa/widgets/optioncontainer.py b/...coa/toga_cocoa/widgets/optioncontainer.py → ...src/toga_cocoa/widgets/optioncontainer.py
diff --git a/...cocoa/toga_cocoa/widgets/passwordinput.py → ...a/src/toga_cocoa/widgets/passwordinput.py b/...cocoa/toga_cocoa/widgets/passwordinput.py → ...a/src/toga_cocoa/widgets/passwordinput.py
diff --git a/src/cocoa/toga_cocoa/widgets/progressbar.py → ...coa/src/toga_cocoa/widgets/progressbar.py b/src/cocoa/toga_cocoa/widgets/progressbar.py → ...coa/src/toga_cocoa/widgets/progressbar.py
diff --git a/...coa/toga_cocoa/widgets/scrollcontainer.py → ...src/toga_cocoa/widgets/scrollcontainer.py b/...coa/toga_cocoa/widgets/scrollcontainer.py → ...src/toga_cocoa/widgets/scrollcontainer.py
diff --git a/src/cocoa/toga_cocoa/widgets/selection.py → ...cocoa/src/toga_cocoa/widgets/selection.py b/src/cocoa/toga_cocoa/widgets/selection.py → ...cocoa/src/toga_cocoa/widgets/selection.py
diff --git a/src/cocoa/toga_cocoa/widgets/slider.py → src/cocoa/src/toga_cocoa/widgets/slider.py b/src/cocoa/toga_cocoa/widgets/slider.py → src/cocoa/src/toga_cocoa/widgets/slider.py
diff --git a/...ocoa/toga_cocoa/widgets/splitcontainer.py → .../src/toga_cocoa/widgets/splitcontainer.py b/...ocoa/toga_cocoa/widgets/splitcontainer.py → .../src/toga_cocoa/widgets/splitcontainer.py
diff --git a/src/cocoa/toga_cocoa/widgets/switch.py → src/cocoa/src/toga_cocoa/widgets/switch.py b/src/cocoa/toga_cocoa/widgets/switch.py → src/cocoa/src/toga_cocoa/widgets/switch.py
diff --git a/src/cocoa/toga_cocoa/widgets/table.py → src/cocoa/src/toga_cocoa/widgets/table.py b/src/cocoa/toga_cocoa/widgets/table.py → src/cocoa/src/toga_cocoa/widgets/table.py
diff --git a/src/cocoa/toga_cocoa/widgets/textinput.py → ...cocoa/src/toga_cocoa/widgets/textinput.py b/src/cocoa/toga_cocoa/widgets/textinput.py → ...cocoa/src/toga_cocoa/widgets/textinput.py
diff --git a/src/cocoa/toga_cocoa/widgets/tree.py → src/cocoa/src/toga_cocoa/widgets/tree.py b/src/cocoa/toga_cocoa/widgets/tree.py → src/cocoa/src/toga_cocoa/widgets/tree.py
diff --git a/src/cocoa/toga_cocoa/widgets/webview.py → src/cocoa/src/toga_cocoa/widgets/webview.py b/src/cocoa/toga_cocoa/widgets/webview.py → src/cocoa/src/toga_cocoa/widgets/webview.py
diff --git a/src/cocoa/toga_cocoa/window.py → src/cocoa/src/toga_cocoa/window.py b/src/cocoa/toga_cocoa/window.py → src/cocoa/src/toga_cocoa/window.py
diff --git a/src/gtk/MANIFEST.in b/src/gtk/MANIFEST.in
@@ -1,5 +1,4 @@
 include CONTRIBUTING.md
 include LICENSE
 include README.rst
-recursive-include toga_gtk *.py
 recursive-include tests *.py
diff --git a/src/gtk/setup.cfg b/src/gtk/setup.cfg
@@ -39,15 +39,11 @@ keywords =
     gtk
 
 [options]
-packages = find:
+package_dir =
+    = src
 python_requires = >= 3.6
 zip_safe = False
 
-[options.packages.find]
-include =
-    toga_gtk
-    toga_gtk.*
-
 [flake8]
 exclude=\
     .eggs/*,\

diff --git a/src/gtk/setup.py b/src/gtk/setup.py
@@ -6,7 +6,7 @@
 # Version handline needs to be programatic because
 # we can't import toga_gtk to compute the version;
 # and to support versioned subpackage dependencies
-with open('toga_gtk/__init__.py', encoding='utf8') as version_file:
+with open('src/toga_gtk/__init__.py', encoding='utf8') as version_file:
     version_match = re.search(
         r"^__version__ = ['\"]([^'\"]*)['\"]",
         version_file.read(),

diff --git a/src/gtk/toga_gtk/__init__.py → src/gtk/src/toga_gtk/__init__.py b/src/gtk/toga_gtk/__init__.py → src/gtk/src/toga_gtk/__init__.py
diff --git a/src/gtk/toga_gtk/app.py → src/gtk/src/toga_gtk/app.py b/src/gtk/toga_gtk/app.py → src/gtk/src/toga_gtk/app.py
diff --git a/src/gtk/toga_gtk/colors.py → src/gtk/src/toga_gtk/colors.py b/src/gtk/toga_gtk/colors.py → src/gtk/src/toga_gtk/colors.py
diff --git a/src/gtk/toga_gtk/command.py → src/gtk/src/toga_gtk/command.py b/src/gtk/toga_gtk/command.py → src/gtk/src/toga_gtk/command.py
diff --git a/src/gtk/toga_gtk/dialogs.py → src/gtk/src/toga_gtk/dialogs.py b/src/gtk/toga_gtk/dialogs.py → src/gtk/src/toga_gtk/dialogs.py
diff --git a/src/gtk/toga_gtk/documents.py → src/gtk/src/toga_gtk/documents.py b/src/gtk/toga_gtk/documents.py → src/gtk/src/toga_gtk/documents.py
diff --git a/src/gtk/toga_gtk/factory.py → src/gtk/src/toga_gtk/factory.py b/src/gtk/toga_gtk/factory.py → src/gtk/src/toga_gtk/factory.py
diff --git a/src/gtk/toga_gtk/fonts.py → src/gtk/src/toga_gtk/fonts.py b/src/gtk/toga_gtk/fonts.py → src/gtk/src/toga_gtk/fonts.py
diff --git a/src/gtk/toga_gtk/hardware/__init__.py → src/gtk/src/toga_gtk/hardware/__init__.py b/src/gtk/toga_gtk/hardware/__init__.py → src/gtk/src/toga_gtk/hardware/__init__.py
diff --git a/src/gtk/toga_gtk/icons.py → src/gtk/src/toga_gtk/icons.py b/src/gtk/toga_gtk/icons.py → src/gtk/src/toga_gtk/icons.py
diff --git a/src/gtk/toga_gtk/images.py → src/gtk/src/toga_gtk/images.py b/src/gtk/toga_gtk/images.py → src/gtk/src/toga_gtk/images.py
diff --git a/src/gtk/toga_gtk/keys.py → src/gtk/src/toga_gtk/keys.py b/src/gtk/toga_gtk/keys.py → src/gtk/src/toga_gtk/keys.py
diff --git a/src/gtk/toga_gtk/libs/__init__.py → src/gtk/src/toga_gtk/libs/__init__.py b/src/gtk/toga_gtk/libs/__init__.py → src/gtk/src/toga_gtk/libs/__init__.py
diff --git a/src/gtk/toga_gtk/libs/gtk.py → src/gtk/src/toga_gtk/libs/gtk.py b/src/gtk/toga_gtk/libs/gtk.py → src/gtk/src/toga_gtk/libs/gtk.py
diff --git a/src/gtk/toga_gtk/libs/styles.py → src/gtk/src/toga_gtk/libs/styles.py b/src/gtk/toga_gtk/libs/styles.py → src/gtk/src/toga_gtk/libs/styles.py
diff --git a/src/gtk/toga_gtk/libs/utils.py → src/gtk/src/toga_gtk/libs/utils.py b/src/gtk/toga_gtk/libs/utils.py → src/gtk/src/toga_gtk/libs/utils.py
diff --git a/src/gtk/toga_gtk/paths.py → src/gtk/src/toga_gtk/paths.py b/src/gtk/toga_gtk/paths.py → src/gtk/src/toga_gtk/paths.py
diff --git a/src/gtk/toga_gtk/widgets/__init__.py → src/gtk/src/toga_gtk/widgets/__init__.py b/src/gtk/toga_gtk/widgets/__init__.py → src/gtk/src/toga_gtk/widgets/__init__.py
diff --git a/...gtk/toga_gtk/widgets/activityindicator.py → ...src/toga_gtk/widgets/activityindicator.py b/...gtk/toga_gtk/widgets/activityindicator.py → ...src/toga_gtk/widgets/activityindicator.py
diff --git a/src/gtk/toga_gtk/widgets/base.py → src/gtk/src/toga_gtk/widgets/base.py b/src/gtk/toga_gtk/widgets/base.py → src/gtk/src/toga_gtk/widgets/base.py
diff --git a/src/gtk/toga_gtk/widgets/box.py → src/gtk/src/toga_gtk/widgets/box.py b/src/gtk/toga_gtk/widgets/box.py → src/gtk/src/toga_gtk/widgets/box.py
diff --git a/src/gtk/toga_gtk/widgets/button.py → src/gtk/src/toga_gtk/widgets/button.py b/src/gtk/toga_gtk/widgets/button.py → src/gtk/src/toga_gtk/widgets/button.py
diff --git a/src/gtk/toga_gtk/widgets/canvas.py → src/gtk/src/toga_gtk/widgets/canvas.py b/src/gtk/toga_gtk/widgets/canvas.py → src/gtk/src/toga_gtk/widgets/canvas.py
diff --git a/src/gtk/toga_gtk/widgets/detailedlist.py → src/gtk/src/toga_gtk/widgets/detailedlist.py b/src/gtk/toga_gtk/widgets/detailedlist.py → src/gtk/src/toga_gtk/widgets/detailedlist.py
diff --git a/src/gtk/toga_gtk/widgets/divider.py → src/gtk/src/toga_gtk/widgets/divider.py b/src/gtk/toga_gtk/widgets/divider.py → src/gtk/src/toga_gtk/widgets/divider.py
diff --git a/src/gtk/toga_gtk/widgets/imageview.py → src/gtk/src/toga_gtk/widgets/imageview.py b/src/gtk/toga_gtk/widgets/imageview.py → src/gtk/src/toga_gtk/widgets/imageview.py
diff --git a/...gtk/toga_gtk/widgets/internal/__init__.py → ...src/toga_gtk/widgets/internal/__init__.py b/...gtk/toga_gtk/widgets/internal/__init__.py → ...src/toga_gtk/widgets/internal/__init__.py
diff --git a/..._gtk/widgets/internal/buttons/__init__.py → ..._gtk/widgets/internal/buttons/__init__.py b/..._gtk/widgets/internal/buttons/__init__.py → ..._gtk/widgets/internal/buttons/__init__.py
diff --git a/...toga_gtk/widgets/internal/buttons/base.py → ...toga_gtk/widgets/internal/buttons/base.py b/...toga_gtk/widgets/internal/buttons/base.py → ...toga_gtk/widgets/internal/buttons/base.py
diff --git a/...a_gtk/widgets/internal/buttons/refresh.py → ...a_gtk/widgets/internal/buttons/refresh.py b/...a_gtk/widgets/internal/buttons/refresh.py → ...a_gtk/widgets/internal/buttons/refresh.py
diff --git a/...ga_gtk/widgets/internal/buttons/scroll.py → ...ga_gtk/widgets/internal/buttons/scroll.py b/...ga_gtk/widgets/internal/buttons/scroll.py → ...ga_gtk/widgets/internal/buttons/scroll.py
diff --git a/...oga_gtk/widgets/internal/rows/__init__.py → ...oga_gtk/widgets/internal/rows/__init__.py b/...oga_gtk/widgets/internal/rows/__init__.py → ...oga_gtk/widgets/internal/rows/__init__.py
diff --git a/...tk/toga_gtk/widgets/internal/rows/base.py → ...rc/toga_gtk/widgets/internal/rows/base.py b/...tk/toga_gtk/widgets/internal/rows/base.py → ...rc/toga_gtk/widgets/internal/rows/base.py
diff --git a/...a_gtk/widgets/internal/rows/scrollable.py → ...a_gtk/widgets/internal/rows/scrollable.py b/...a_gtk/widgets/internal/rows/scrollable.py → ...a_gtk/widgets/internal/rows/scrollable.py
diff --git a/...oga_gtk/widgets/internal/rows/texticon.py → ...oga_gtk/widgets/internal/rows/texticon.py b/...oga_gtk/widgets/internal/rows/texticon.py → ...oga_gtk/widgets/internal/rows/texticon.py
diff --git a/...a_gtk/widgets/internal/sourcetreemodel.py → ...a_gtk/widgets/internal/sourcetreemodel.py b/...a_gtk/widgets/internal/sourcetreemodel.py → ...a_gtk/widgets/internal/sourcetreemodel.py
diff --git a/src/gtk/toga_gtk/widgets/label.py → src/gtk/src/toga_gtk/widgets/label.py b/src/gtk/toga_gtk/widgets/label.py → src/gtk/src/toga_gtk/widgets/label.py
diff --git a/...tk/toga_gtk/widgets/multilinetextinput.py → ...rc/toga_gtk/widgets/multilinetextinput.py b/...tk/toga_gtk/widgets/multilinetextinput.py → ...rc/toga_gtk/widgets/multilinetextinput.py
diff --git a/src/gtk/toga_gtk/widgets/numberinput.py → src/gtk/src/toga_gtk/widgets/numberinput.py b/src/gtk/toga_gtk/widgets/numberinput.py → src/gtk/src/toga_gtk/widgets/numberinput.py
diff --git a/src/gtk/toga_gtk/widgets/optioncontainer.py → ...k/src/toga_gtk/widgets/optioncontainer.py b/src/gtk/toga_gtk/widgets/optioncontainer.py → ...k/src/toga_gtk/widgets/optioncontainer.py
diff --git a/src/gtk/toga_gtk/widgets/passwordinput.py → ...gtk/src/toga_gtk/widgets/passwordinput.py b/src/gtk/toga_gtk/widgets/passwordinput.py → ...gtk/src/toga_gtk/widgets/passwordinput.py
diff --git a/src/gtk/toga_gtk/widgets/progressbar.py → src/gtk/src/toga_gtk/widgets/progressbar.py b/src/gtk/toga_gtk/widgets/progressbar.py → src/gtk/src/toga_gtk/widgets/progressbar.py
diff --git a/src/gtk/toga_gtk/widgets/scrollcontainer.py → ...k/src/toga_gtk/widgets/scrollcontainer.py b/src/gtk/toga_gtk/widgets/scrollcontainer.py → ...k/src/toga_gtk/widgets/scrollcontainer.py
diff --git a/src/gtk/toga_gtk/widgets/selection.py → src/gtk/src/toga_gtk/widgets/selection.py b/src/gtk/toga_gtk/widgets/selection.py → src/gtk/src/toga_gtk/widgets/selection.py
diff --git a/src/gtk/toga_gtk/widgets/slider.py → src/gtk/src/toga_gtk/widgets/slider.py b/src/gtk/toga_gtk/widgets/slider.py → src/gtk/src/toga_gtk/widgets/slider.py
diff --git a/src/gtk/toga_gtk/widgets/splitcontainer.py → ...tk/src/toga_gtk/widgets/splitcontainer.py b/src/gtk/toga_gtk/widgets/splitcontainer.py → ...tk/src/toga_gtk/widgets/splitcontainer.py
diff --git a/src/gtk/toga_gtk/widgets/switch.py → src/gtk/src/toga_gtk/widgets/switch.py b/src/gtk/toga_gtk/widgets/switch.py → src/gtk/src/toga_gtk/widgets/switch.py
diff --git a/src/gtk/toga_gtk/widgets/table.py → src/gtk/src/toga_gtk/widgets/table.py b/src/gtk/toga_gtk/widgets/table.py → src/gtk/src/toga_gtk/widgets/table.py
diff --git a/src/gtk/toga_gtk/widgets/textinput.py → src/gtk/src/toga_gtk/widgets/textinput.py b/src/gtk/toga_gtk/widgets/textinput.py → src/gtk/src/toga_gtk/widgets/textinput.py
diff --git a/src/gtk/toga_gtk/widgets/tree.py → src/gtk/src/toga_gtk/widgets/tree.py b/src/gtk/toga_gtk/widgets/tree.py → src/gtk/src/toga_gtk/widgets/tree.py
diff --git a/src/gtk/toga_gtk/widgets/webview.py → src/gtk/src/toga_gtk/widgets/webview.py b/src/gtk/toga_gtk/widgets/webview.py → src/gtk/src/toga_gtk/widgets/webview.py
diff --git a/src/gtk/toga_gtk/window.py → src/gtk/src/toga_gtk/window.py b/src/gtk/toga_gtk/window.py → src/gtk/src/toga_gtk/window.py
diff --git a/src/iOS/MANIFEST.in b/src/iOS/MANIFEST.in
@@ -2,4 +2,3 @@ include CONTRIBUTING.md
 include LICENSE
 include README.rst
 recursive-include tests *.py
-recursive-include toga_iOS *.py
diff --git a/src/iOS/setup.cfg b/src/iOS/setup.cfg
@@ -38,15 +38,11 @@ keywords =
     iOS
 
 [options]
-packages = find:
+package_dir =
+    = src
 python_requires = >= 3.6
 zip_safe = False
 
-[options.packages.find]
-include =
-    toga_iOS
-    toga_iOS.*
-
 [flake8]
 exclude=\
     .eggs/*,\

diff --git a/src/iOS/setup.py b/src/iOS/setup.py
@@ -6,7 +6,7 @@
 # Version handline needs to be programatic because
 # we can't import toga_iOS to compute the version;
 # and to support versioned subpackage dependencies
-with open('toga_iOS/__init__.py', encoding='utf8') as version_file:
+with open('src/toga_iOS/__init__.py', encoding='utf8') as version_file:
     version_match = re.search(
         r"^__version__ = ['\"]([^'\"]*)['\"]",
         version_file.read(),

diff --git a/src/iOS/toga_iOS/__init__.py → src/iOS/src/toga_iOS/__init__.py b/src/iOS/toga_iOS/__init__.py → src/iOS/src/toga_iOS/__init__.py
diff --git a/src/iOS/toga_iOS/app.py → src/iOS/src/toga_iOS/app.py b/src/iOS/toga_iOS/app.py → src/iOS/src/toga_iOS/app.py
diff --git a/src/iOS/toga_iOS/colors.py → src/iOS/src/toga_iOS/colors.py b/src/iOS/toga_iOS/colors.py → src/iOS/src/toga_iOS/colors.py
diff --git a/src/iOS/toga_iOS/constraints.py → src/iOS/src/toga_iOS/constraints.py b/src/iOS/toga_iOS/constraints.py → src/iOS/src/toga_iOS/constraints.py
diff --git a/src/iOS/toga_iOS/dialogs.py → src/iOS/src/toga_iOS/dialogs.py b/src/iOS/toga_iOS/dialogs.py → src/iOS/src/toga_iOS/dialogs.py
diff --git a/src/iOS/toga_iOS/factory.py → src/iOS/src/toga_iOS/factory.py b/src/iOS/toga_iOS/factory.py → src/iOS/src/toga_iOS/factory.py
diff --git a/src/iOS/toga_iOS/fonts.py → src/iOS/src/toga_iOS/fonts.py b/src/iOS/toga_iOS/fonts.py → src/iOS/src/toga_iOS/fonts.py
diff --git a/src/iOS/toga_iOS/hardware/__init__.py → src/iOS/src/toga_iOS/hardware/__init__.py b/src/iOS/toga_iOS/hardware/__init__.py → src/iOS/src/toga_iOS/hardware/__init__.py
diff --git a/src/iOS/toga_iOS/icons.py → src/iOS/src/toga_iOS/icons.py b/src/iOS/toga_iOS/icons.py → src/iOS/src/toga_iOS/icons.py
diff --git a/src/iOS/toga_iOS/images.py → src/iOS/src/toga_iOS/images.py b/src/iOS/toga_iOS/images.py → src/iOS/src/toga_iOS/images.py
diff --git a/src/iOS/toga_iOS/libs/__init__.py → src/iOS/src/toga_iOS/libs/__init__.py b/src/iOS/toga_iOS/libs/__init__.py → src/iOS/src/toga_iOS/libs/__init__.py
diff --git a/src/iOS/toga_iOS/libs/core_graphics.py → src/iOS/src/toga_iOS/libs/core_graphics.py b/src/iOS/toga_iOS/libs/core_graphics.py → src/iOS/src/toga_iOS/libs/core_graphics.py
diff --git a/src/iOS/toga_iOS/libs/foundation.py → src/iOS/src/toga_iOS/libs/foundation.py b/src/iOS/toga_iOS/libs/foundation.py → src/iOS/src/toga_iOS/libs/foundation.py
diff --git a/src/iOS/toga_iOS/libs/uikit.py → src/iOS/src/toga_iOS/libs/uikit.py b/src/iOS/toga_iOS/libs/uikit.py → src/iOS/src/toga_iOS/libs/uikit.py
diff --git a/src/iOS/toga_iOS/libs/webkit.py → src/iOS/src/toga_iOS/libs/webkit.py b/src/iOS/toga_iOS/libs/webkit.py → src/iOS/src/toga_iOS/libs/webkit.py
diff --git a/src/iOS/toga_iOS/paths.py → src/iOS/src/toga_iOS/paths.py b/src/iOS/toga_iOS/paths.py → src/iOS/src/toga_iOS/paths.py
diff --git a/src/iOS/toga_iOS/widgets/__init__.py → src/iOS/src/toga_iOS/widgets/__init__.py b/src/iOS/toga_iOS/widgets/__init__.py → src/iOS/src/toga_iOS/widgets/__init__.py
diff --git a/src/iOS/toga_iOS/widgets/base.py → src/iOS/src/toga_iOS/widgets/base.py b/src/iOS/toga_iOS/widgets/base.py → src/iOS/src/toga_iOS/widgets/base.py
diff --git a/src/iOS/toga_iOS/widgets/box.py → src/iOS/src/toga_iOS/widgets/box.py b/src/iOS/toga_iOS/widgets/box.py → src/iOS/src/toga_iOS/widgets/box.py
diff --git a/src/iOS/toga_iOS/widgets/button.py → src/iOS/src/toga_iOS/widgets/button.py b/src/iOS/toga_iOS/widgets/button.py → src/iOS/src/toga_iOS/widgets/button.py
diff --git a/src/iOS/toga_iOS/widgets/canvas.py → src/iOS/src/toga_iOS/widgets/canvas.py b/src/iOS/toga_iOS/widgets/canvas.py → src/iOS/src/toga_iOS/widgets/canvas.py
diff --git a/src/iOS/toga_iOS/widgets/detailedlist.py → src/iOS/src/toga_iOS/widgets/detailedlist.py b/src/iOS/toga_iOS/widgets/detailedlist.py → src/iOS/src/toga_iOS/widgets/detailedlist.py
diff --git a/src/iOS/toga_iOS/widgets/imageview.py → src/iOS/src/toga_iOS/widgets/imageview.py b/src/iOS/toga_iOS/widgets/imageview.py → src/iOS/src/toga_iOS/widgets/imageview.py
diff --git a/src/iOS/toga_iOS/widgets/label.py → src/iOS/src/toga_iOS/widgets/label.py b/src/iOS/toga_iOS/widgets/label.py → src/iOS/src/toga_iOS/widgets/label.py
diff --git a/...OS/toga_iOS/widgets/multilinetextinput.py → ...rc/toga_iOS/widgets/multilinetextinput.py b/...OS/toga_iOS/widgets/multilinetextinput.py → ...rc/toga_iOS/widgets/multilinetextinput.py
diff --git a/src/iOS/toga_iOS/widgets/navigationview.py → ...OS/src/toga_iOS/widgets/navigationview.py b/src/iOS/toga_iOS/widgets/navigationview.py → ...OS/src/toga_iOS/widgets/navigationview.py
diff --git a/src/iOS/toga_iOS/widgets/numberinput.py → src/iOS/src/toga_iOS/widgets/numberinput.py b/src/iOS/toga_iOS/widgets/numberinput.py → src/iOS/src/toga_iOS/widgets/numberinput.py
diff --git a/src/iOS/toga_iOS/widgets/passwordinput.py → ...iOS/src/toga_iOS/widgets/passwordinput.py b/src/iOS/toga_iOS/widgets/passwordinput.py → ...iOS/src/toga_iOS/widgets/passwordinput.py
diff --git a/src/iOS/toga_iOS/widgets/progressbar.py → src/iOS/src/toga_iOS/widgets/progressbar.py b/src/iOS/toga_iOS/widgets/progressbar.py → src/iOS/src/toga_iOS/widgets/progressbar.py
diff --git a/src/iOS/toga_iOS/widgets/scrollcontainer.py → ...S/src/toga_iOS/widgets/scrollcontainer.py b/src/iOS/toga_iOS/widgets/scrollcontainer.py → ...S/src/toga_iOS/widgets/scrollcontainer.py
diff --git a/src/iOS/toga_iOS/widgets/selection.py → src/iOS/src/toga_iOS/widgets/selection.py b/src/iOS/toga_iOS/widgets/selection.py → src/iOS/src/toga_iOS/widgets/selection.py
diff --git a/src/iOS/toga_iOS/widgets/slider.py → src/iOS/src/toga_iOS/widgets/slider.py b/src/iOS/toga_iOS/widgets/slider.py → src/iOS/src/toga_iOS/widgets/slider.py
diff --git a/src/iOS/toga_iOS/widgets/switch.py → src/iOS/src/toga_iOS/widgets/switch.py b/src/iOS/toga_iOS/widgets/switch.py → src/iOS/src/toga_iOS/widgets/switch.py
diff --git a/src/iOS/toga_iOS/widgets/textinput.py → src/iOS/src/toga_iOS/widgets/textinput.py b/src/iOS/toga_iOS/widgets/textinput.py → src/iOS/src/toga_iOS/widgets/textinput.py
diff --git a/src/iOS/toga_iOS/widgets/webview.py → src/iOS/src/toga_iOS/widgets/webview.py b/src/iOS/toga_iOS/widgets/webview.py → src/iOS/src/toga_iOS/widgets/webview.py
diff --git a/src/iOS/toga_iOS/window.py → src/iOS/src/toga_iOS/window.py b/src/iOS/toga_iOS/window.py → src/iOS/src/toga_iOS/window.py
diff --git a/src/web/MANIFEST.in b/src/web/MANIFEST.in
@@ -2,5 +2,3 @@ include CONTRIBUTING.md
 include LICENSE
 include README.rst
 recursive-include tests *.py
-recursive-include toga_web *.py
-recursive-include toga_web/static *.css
diff --git a/src/web/setup.cfg b/src/web/setup.cfg
@@ -37,19 +37,14 @@ keywords =
     web
 
 [options]
-packages = find:
+package_dir =
+    = src
 python_requires = >= 3.6
 zip_safe = False
-include_package_data = True
 
 [options.package_data]
 toga_web =
-    toga_web/static/toga.css
-
-[options.packages.find]
-include =
-    toga_web
-    toga_web.*
+    static/**
 
 [flake8]
 exclude=\

diff --git a/src/web/setup.py b/src/web/setup.py
@@ -6,7 +6,7 @@
 # Version handline needs to be programatic because
 # we can't import toga_web to compute the version;
 # and to support versioned subpackage dependencies
-with open('toga_web/__init__.py', encoding='utf8') as version_file:
+with open('src/toga_web/__init__.py', encoding='utf8') as version_file:
     version_match = re.search(
         r"^__version__ = ['\"]([^'\"]*)['\"]",
         version_file.read(),

diff --git a/src/web/toga_web/__init__.py → src/web/src/toga_web/__init__.py b/src/web/toga_web/__init__.py → src/web/src/toga_web/__init__.py
diff --git a/src/web/toga_web/app.py → src/web/src/toga_web/app.py b/src/web/toga_web/app.py → src/web/src/toga_web/app.py
diff --git a/src/web/toga_web/command.py → src/web/src/toga_web/command.py b/src/web/toga_web/command.py → src/web/src/toga_web/command.py
diff --git a/src/web/toga_web/dialogs.py → src/web/src/toga_web/dialogs.py b/src/web/toga_web/dialogs.py → src/web/src/toga_web/dialogs.py
diff --git a/src/web/toga_web/factory.py → src/web/src/toga_web/factory.py b/src/web/toga_web/factory.py → src/web/src/toga_web/factory.py
diff --git a/src/web/toga_web/icons.py → src/web/src/toga_web/icons.py b/src/web/toga_web/icons.py → src/web/src/toga_web/icons.py
diff --git a/src/web/toga_web/libs.py → src/web/src/toga_web/libs.py b/src/web/toga_web/libs.py → src/web/src/toga_web/libs.py
diff --git a/src/web/toga_web/paths.py → src/web/src/toga_web/paths.py b/src/web/toga_web/paths.py → src/web/src/toga_web/paths.py
diff --git a/src/web/toga_web/static/toga.css → src/web/src/toga_web/static/toga.css b/src/web/toga_web/static/toga.css → src/web/src/toga_web/static/toga.css
diff --git a/src/web/toga_web/widgets/__init__.py → src/web/src/toga_web/widgets/__init__.py b/src/web/toga_web/widgets/__init__.py → src/web/src/toga_web/widgets/__init__.py
diff --git a/src/web/toga_web/widgets/base.py → src/web/src/toga_web/widgets/base.py b/src/web/toga_web/widgets/base.py → src/web/src/toga_web/widgets/base.py
diff --git a/src/web/toga_web/widgets/box.py → src/web/src/toga_web/widgets/box.py b/src/web/toga_web/widgets/box.py → src/web/src/toga_web/widgets/box.py
diff --git a/src/web/toga_web/widgets/button.py → src/web/src/toga_web/widgets/button.py b/src/web/toga_web/widgets/button.py → src/web/src/toga_web/widgets/button.py
diff --git a/src/web/toga_web/widgets/label.py → src/web/src/toga_web/widgets/label.py b/src/web/toga_web/widgets/label.py → src/web/src/toga_web/widgets/label.py
diff --git a/src/web/toga_web/widgets/textinput.py → src/web/src/toga_web/widgets/textinput.py b/src/web/toga_web/widgets/textinput.py → src/web/src/toga_web/widgets/textinput.py
diff --git a/src/web/toga_web/window.py → src/web/src/toga_web/window.py b/src/web/toga_web/window.py → src/web/src/toga_web/window.py
diff --git a/src/winforms/MANIFEST.in b/src/winforms/MANIFEST.in
@@ -1,8 +1,4 @@
 include CONTRIBUTING.md
 include LICENSE
 include README.rst
-include toga_winforms/libs/WebView2/LICENSE.md
-include toga_winforms/libs/WebView2/README.md
-recursive-include toga_winforms *.py
 recursive-include tests *.py
-recursive-include toga_winforms/libs/WebView2 *.dll
diff --git a/src/winforms/setup.cfg b/src/winforms/setup.cfg
@@ -39,24 +39,14 @@ keywords =
     winforms
 
 [options]
-packages = find:
+package_dir =
+    = src
 python_requires = >= 3.6
 zip_safe = False
-include_package_data = True
 
 [options.package_data]
 toga_winforms =
-    toga_winforms/libs/WebView2/LICENSE.md
-    toga_winforms/libs/WebView2/Microsoft.Web.WebView2.Core.dll
-    toga_winforms/libs/WebView2/Microsoft.Web.WebView2.WinForms.dll
-    toga_winforms/libs/WebView2/arm64/WebView2Loader.dll
-    toga_winforms/libs/WebView2/x64/WebView2Loader.dll
-    toga_winforms/libs/WebView2/x86/WebView2Loader.dll
-
-[options.packages.find]
-include =
-    toga_winforms
-    toga_winforms.*
+    libs/WebView2/**
 
 [flake8]
 exclude=\

diff --git a/src/winforms/setup.py b/src/winforms/setup.py
@@ -6,7 +6,7 @@
 # Version handline needs to be programatic because
 # we can't import toga_winforms to compute the version;
 # and to support versioned subpackage dependencies
-with open('toga_winforms/__init__.py', encoding='utf8') as version_file:
+with open('src/toga_winforms/__init__.py', encoding='utf8') as version_file:
     version_match = re.search(
         r"^__version__ = ['\"]([^'\"]*)['\"]",
         version_file.read(),

diff --git a/src/winforms/toga_winforms/__init__.py → src/winforms/src/toga_winforms/__init__.py b/src/winforms/toga_winforms/__init__.py → src/winforms/src/toga_winforms/__init__.py
diff --git a/src/winforms/toga_winforms/app.py → src/winforms/src/toga_winforms/app.py b/src/winforms/toga_winforms/app.py → src/winforms/src/toga_winforms/app.py
diff --git a/src/winforms/toga_winforms/colors.py → src/winforms/src/toga_winforms/colors.py b/src/winforms/toga_winforms/colors.py → src/winforms/src/toga_winforms/colors.py
diff --git a/src/winforms/toga_winforms/command.py → src/winforms/src/toga_winforms/command.py b/src/winforms/toga_winforms/command.py → src/winforms/src/toga_winforms/command.py
diff --git a/src/winforms/toga_winforms/dialogs.py → src/winforms/src/toga_winforms/dialogs.py b/src/winforms/toga_winforms/dialogs.py → src/winforms/src/toga_winforms/dialogs.py
diff --git a/src/winforms/toga_winforms/factory.py → src/winforms/src/toga_winforms/factory.py b/src/winforms/toga_winforms/factory.py → src/winforms/src/toga_winforms/factory.py
diff --git a/src/winforms/toga_winforms/fonts.py → src/winforms/src/toga_winforms/fonts.py b/src/winforms/toga_winforms/fonts.py → src/winforms/src/toga_winforms/fonts.py
diff --git a/...nforms/toga_winforms/hardware/__init__.py → ...ms/src/toga_winforms/hardware/__init__.py b/...nforms/toga_winforms/hardware/__init__.py → ...ms/src/toga_winforms/hardware/__init__.py
diff --git a/src/winforms/toga_winforms/icons.py → src/winforms/src/toga_winforms/icons.py b/src/winforms/toga_winforms/icons.py → src/winforms/src/toga_winforms/icons.py
diff --git a/src/winforms/toga_winforms/images.py → src/winforms/src/toga_winforms/images.py b/src/winforms/toga_winforms/images.py → src/winforms/src/toga_winforms/images.py
diff --git a/src/winforms/toga_winforms/keys.py → src/winforms/src/toga_winforms/keys.py b/src/winforms/toga_winforms/keys.py → src/winforms/src/toga_winforms/keys.py
diff --git a/...ms/toga_winforms/libs/WebView2/LICENSE.md → ...rc/toga_winforms/libs/WebView2/LICENSE.md b/...ms/toga_winforms/libs/WebView2/LICENSE.md → ...rc/toga_winforms/libs/WebView2/LICENSE.md
diff --git a/.../WebView2/Microsoft.Web.WebView2.Core.dll → .../WebView2/Microsoft.Web.WebView2.Core.dll b/.../WebView2/Microsoft.Web.WebView2.Core.dll → .../WebView2/Microsoft.Web.WebView2.Core.dll
diff --git a/...View2/Microsoft.Web.WebView2.WinForms.dll → ...View2/Microsoft.Web.WebView2.WinForms.dll b/...View2/Microsoft.Web.WebView2.WinForms.dll → ...View2/Microsoft.Web.WebView2.WinForms.dll
diff --git a/...rms/toga_winforms/libs/WebView2/README.md → ...src/toga_winforms/libs/WebView2/README.md b/...rms/toga_winforms/libs/WebView2/README.md → ...src/toga_winforms/libs/WebView2/README.md
diff --git a/...ms/libs/WebView2/arm64/WebView2Loader.dll → ...ms/libs/WebView2/arm64/WebView2Loader.dll b/...ms/libs/WebView2/arm64/WebView2Loader.dll → ...ms/libs/WebView2/arm64/WebView2Loader.dll
diff --git a/...orms/libs/WebView2/x64/WebView2Loader.dll → ...orms/libs/WebView2/x64/WebView2Loader.dll b/...orms/libs/WebView2/x64/WebView2Loader.dll → ...orms/libs/WebView2/x64/WebView2Loader.dll
diff --git a/...orms/libs/WebView2/x86/WebView2Loader.dll → ...orms/libs/WebView2/x86/WebView2Loader.dll b/...orms/libs/WebView2/x86/WebView2Loader.dll → ...orms/libs/WebView2/x86/WebView2Loader.dll
diff --git a/src/winforms/toga_winforms/libs/__init__.py → ...nforms/src/toga_winforms/libs/__init__.py b/src/winforms/toga_winforms/libs/__init__.py → ...nforms/src/toga_winforms/libs/__init__.py
diff --git a/...winforms/toga_winforms/libs/extensions.py → ...orms/src/toga_winforms/libs/extensions.py b/...winforms/toga_winforms/libs/extensions.py → ...orms/src/toga_winforms/libs/extensions.py
diff --git a/src/winforms/toga_winforms/libs/fonts.py → src/winforms/src/toga_winforms/libs/fonts.py b/src/winforms/toga_winforms/libs/fonts.py → src/winforms/src/toga_winforms/libs/fonts.py
diff --git a/src/winforms/toga_winforms/libs/proactor.py → ...nforms/src/toga_winforms/libs/proactor.py b/src/winforms/toga_winforms/libs/proactor.py → ...nforms/src/toga_winforms/libs/proactor.py
diff --git a/src/winforms/toga_winforms/libs/winforms.py → ...nforms/src/toga_winforms/libs/winforms.py b/src/winforms/toga_winforms/libs/winforms.py → ...nforms/src/toga_winforms/libs/winforms.py
diff --git a/src/winforms/toga_winforms/paths.py → src/winforms/src/toga_winforms/paths.py b/src/winforms/toga_winforms/paths.py → src/winforms/src/toga_winforms/paths.py
diff --git a/...informs/toga_winforms/widgets/__init__.py → ...rms/src/toga_winforms/widgets/__init__.py b/...informs/toga_winforms/widgets/__init__.py → ...rms/src/toga_winforms/widgets/__init__.py
diff --git a/src/winforms/toga_winforms/widgets/base.py → ...informs/src/toga_winforms/widgets/base.py b/src/winforms/toga_winforms/widgets/base.py → ...informs/src/toga_winforms/widgets/base.py
diff --git a/src/winforms/toga_winforms/widgets/box.py → ...winforms/src/toga_winforms/widgets/box.py b/src/winforms/toga_winforms/widgets/box.py → ...winforms/src/toga_winforms/widgets/box.py
diff --git a/src/winforms/toga_winforms/widgets/button.py → ...forms/src/toga_winforms/widgets/button.py b/src/winforms/toga_winforms/widgets/button.py → ...forms/src/toga_winforms/widgets/button.py
diff --git a/src/winforms/toga_winforms/widgets/canvas.py → ...forms/src/toga_winforms/widgets/canvas.py b/src/winforms/toga_winforms/widgets/canvas.py → ...forms/src/toga_winforms/widgets/canvas.py
diff --git a/...forms/toga_winforms/widgets/datepicker.py → ...s/src/toga_winforms/widgets/datepicker.py b/...forms/toga_winforms/widgets/datepicker.py → ...s/src/toga_winforms/widgets/datepicker.py
diff --git a/...rms/toga_winforms/widgets/detailedlist.py → ...src/toga_winforms/widgets/detailedlist.py b/...rms/toga_winforms/widgets/detailedlist.py → ...src/toga_winforms/widgets/detailedlist.py
diff --git a/...winforms/toga_winforms/widgets/divider.py → ...orms/src/toga_winforms/widgets/divider.py b/...winforms/toga_winforms/widgets/divider.py → ...orms/src/toga_winforms/widgets/divider.py
diff --git a/...nforms/toga_winforms/widgets/imageview.py → ...ms/src/toga_winforms/widgets/imageview.py b/...nforms/toga_winforms/widgets/imageview.py → ...ms/src/toga_winforms/widgets/imageview.py
diff --git a/src/winforms/toga_winforms/widgets/label.py → ...nforms/src/toga_winforms/widgets/label.py b/src/winforms/toga_winforms/widgets/label.py → ...nforms/src/toga_winforms/widgets/label.py
diff --git a/...ga_winforms/widgets/multilinetextinput.py → ...ga_winforms/widgets/multilinetextinput.py b/...ga_winforms/widgets/multilinetextinput.py → ...ga_winforms/widgets/multilinetextinput.py
diff --git a/...orms/toga_winforms/widgets/numberinput.py → .../src/toga_winforms/widgets/numberinput.py b/...orms/toga_winforms/widgets/numberinput.py → .../src/toga_winforms/widgets/numberinput.py
diff --git a/.../toga_winforms/widgets/optioncontainer.py → .../toga_winforms/widgets/optioncontainer.py b/.../toga_winforms/widgets/optioncontainer.py → .../toga_winforms/widgets/optioncontainer.py
diff --git a/...ms/toga_winforms/widgets/passwordinput.py → ...rc/toga_winforms/widgets/passwordinput.py b/...ms/toga_winforms/widgets/passwordinput.py → ...rc/toga_winforms/widgets/passwordinput.py
diff --git a/...orms/toga_winforms/widgets/progressbar.py → .../src/toga_winforms/widgets/progressbar.py b/...orms/toga_winforms/widgets/progressbar.py → .../src/toga_winforms/widgets/progressbar.py
diff --git a/.../toga_winforms/widgets/scrollcontainer.py → .../toga_winforms/widgets/scrollcontainer.py b/.../toga_winforms/widgets/scrollcontainer.py → .../toga_winforms/widgets/scrollcontainer.py
diff --git a/...nforms/toga_winforms/widgets/selection.py → ...ms/src/toga_winforms/widgets/selection.py b/...nforms/toga_winforms/widgets/selection.py → ...ms/src/toga_winforms/widgets/selection.py
diff --git a/src/winforms/toga_winforms/widgets/slider.py → ...forms/src/toga_winforms/widgets/slider.py b/src/winforms/toga_winforms/widgets/slider.py → ...forms/src/toga_winforms/widgets/slider.py
diff --git a/...s/toga_winforms/widgets/splitcontainer.py → ...c/toga_winforms/widgets/splitcontainer.py b/...s/toga_winforms/widgets/splitcontainer.py → ...c/toga_winforms/widgets/splitcontainer.py
diff --git a/src/winforms/toga_winforms/widgets/switch.py → ...forms/src/toga_winforms/widgets/switch.py b/src/winforms/toga_winforms/widgets/switch.py → ...forms/src/toga_winforms/widgets/switch.py
diff --git a/src/winforms/toga_winforms/widgets/table.py → ...nforms/src/toga_winforms/widgets/table.py b/src/winforms/toga_winforms/widgets/table.py → ...nforms/src/toga_winforms/widgets/table.py
diff --git a/...nforms/toga_winforms/widgets/textinput.py → ...ms/src/toga_winforms/widgets/textinput.py b/...nforms/toga_winforms/widgets/textinput.py → ...ms/src/toga_winforms/widgets/textinput.py
diff --git a/...forms/toga_winforms/widgets/timepicker.py → ...s/src/toga_winforms/widgets/timepicker.py b/...forms/toga_winforms/widgets/timepicker.py → ...s/src/toga_winforms/widgets/timepicker.py
diff --git a/src/winforms/toga_winforms/widgets/tree.py → ...informs/src/toga_winforms/widgets/tree.py b/src/winforms/toga_winforms/widgets/tree.py → ...informs/src/toga_winforms/widgets/tree.py
diff --git a/...winforms/toga_winforms/widgets/webview.py → ...orms/src/toga_winforms/widgets/webview.py b/...winforms/toga_winforms/widgets/webview.py → ...orms/src/toga_winforms/widgets/webview.py
diff --git a/src/winforms/toga_winforms/window.py → src/winforms/src/toga_winforms/window.py b/src/winforms/toga_winforms/window.py → src/winforms/src/toga_winforms/window.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -91,7 +91,7 @@ function install { @@
     }
-    MODULES="core dummy"  # FIXME android cocoa core dummy gtk iOS web winforms toga demo
+    MODULES="android cocoa core dummy gtk iOS web winforms toga demo"
     action=$1
     shift
@@ Expand Down @@