From b0405438149185be267455f1f69c6a376646f1c9 Mon Sep 17 00:00:00 2001
From: Tim Monko <timmonko@gmail.com>
Date: Fri, 27 Feb 2026 23:46:34 -0600
Subject: [PATCH 1/5] reorg project with mv of files

---
 src/napari_metadata/{_file_size.py => file_size.py}               | 0
 src/napari_metadata/{_model.py => layer_utils.py}                 | 0
 src/napari_metadata/{_axis_units.py => units.py}                  | 0
 .../{_axis_metadata_widgets.py => widgets/_axis_components.py}    | 0
 .../{_collapsible_containers.py => widgets/_containers.py}        | 0
 .../{_file_metadata_widgets.py => widgets/_file_components.py}    | 0
 .../{_inheritance_widget.py => widgets/_inheritance.py}           | 0
 src/napari_metadata/{_widget.py => widgets/_main.py}              | 0
 src/napari_metadata/{ => widgets}/_protocols.py                   | 0
 9 files changed, 0 insertions(+), 0 deletions(-)
 rename src/napari_metadata/{_file_size.py => file_size.py} (100%)
 rename src/napari_metadata/{_model.py => layer_utils.py} (100%)
 rename src/napari_metadata/{_axis_units.py => units.py} (100%)
 rename src/napari_metadata/{_axis_metadata_widgets.py => widgets/_axis_components.py} (100%)
 rename src/napari_metadata/{_collapsible_containers.py => widgets/_containers.py} (100%)
 rename src/napari_metadata/{_file_metadata_widgets.py => widgets/_file_components.py} (100%)
 rename src/napari_metadata/{_inheritance_widget.py => widgets/_inheritance.py} (100%)
 rename src/napari_metadata/{_widget.py => widgets/_main.py} (100%)
 rename src/napari_metadata/{ => widgets}/_protocols.py (100%)

diff --git a/src/napari_metadata/_file_size.py b/src/napari_metadata/file_size.py
similarity index 100%
rename from src/napari_metadata/_file_size.py
rename to src/napari_metadata/file_size.py
diff --git a/src/napari_metadata/_model.py b/src/napari_metadata/layer_utils.py
similarity index 100%
rename from src/napari_metadata/_model.py
rename to src/napari_metadata/layer_utils.py
diff --git a/src/napari_metadata/_axis_units.py b/src/napari_metadata/units.py
similarity index 100%
rename from src/napari_metadata/_axis_units.py
rename to src/napari_metadata/units.py
diff --git a/src/napari_metadata/_axis_metadata_widgets.py b/src/napari_metadata/widgets/_axis_components.py
similarity index 100%
rename from src/napari_metadata/_axis_metadata_widgets.py
rename to src/napari_metadata/widgets/_axis_components.py
diff --git a/src/napari_metadata/_collapsible_containers.py b/src/napari_metadata/widgets/_containers.py
similarity index 100%
rename from src/napari_metadata/_collapsible_containers.py
rename to src/napari_metadata/widgets/_containers.py
diff --git a/src/napari_metadata/_file_metadata_widgets.py b/src/napari_metadata/widgets/_file_components.py
similarity index 100%
rename from src/napari_metadata/_file_metadata_widgets.py
rename to src/napari_metadata/widgets/_file_components.py
diff --git a/src/napari_metadata/_inheritance_widget.py b/src/napari_metadata/widgets/_inheritance.py
similarity index 100%
rename from src/napari_metadata/_inheritance_widget.py
rename to src/napari_metadata/widgets/_inheritance.py
diff --git a/src/napari_metadata/_widget.py b/src/napari_metadata/widgets/_main.py
similarity index 100%
rename from src/napari_metadata/_widget.py
rename to src/napari_metadata/widgets/_main.py
diff --git a/src/napari_metadata/_protocols.py b/src/napari_metadata/widgets/_protocols.py
similarity index 100%
rename from src/napari_metadata/_protocols.py
rename to src/napari_metadata/widgets/_protocols.py

From efb29731591655e31df7523db0797eb160042203 Mon Sep 17 00:00:00 2001
From: Tim Monko <timmonko@gmail.com>
Date: Fri, 27 Feb 2026 23:47:19 -0600
Subject: [PATCH 2/5] update imports throughout

---
 src/napari_metadata/napari.yaml               |  2 +-
 src/napari_metadata/widgets/__init__.py       |  8 ++++++
 .../widgets/_axis_components.py               |  6 ++---
 src/napari_metadata/widgets/_containers.py    |  2 +-
 .../widgets/_file_components.py               |  6 ++---
 src/napari_metadata/widgets/_inheritance.py   |  4 +--
 src/napari_metadata/widgets/_main.py          | 26 +++++++++----------
 tests/test_axis_units.py                      |  2 +-
 tests/test_file_size.py                       |  4 +--
 tests/test_model.py                           |  2 +-
 tests/test_napari.py                          |  2 +-
 11 files changed, 36 insertions(+), 28 deletions(-)
 create mode 100644 src/napari_metadata/widgets/__init__.py

diff --git a/src/napari_metadata/napari.yaml b/src/napari_metadata/napari.yaml
index 94b99bd..3447ddc 100644
--- a/src/napari_metadata/napari.yaml
+++ b/src/napari_metadata/napari.yaml
@@ -3,7 +3,7 @@ display_name: Layer metadata
 contributions:
   commands:
     - id: napari-metadata.make_metadata_qwidget
-      python_name: napari_metadata._widget:MetadataWidget
+      python_name: napari_metadata.widgets:MetadataWidget
       title: Make metadata widget
   widgets:
     - command: napari-metadata.make_metadata_qwidget
diff --git a/src/napari_metadata/widgets/__init__.py b/src/napari_metadata/widgets/__init__.py
new file mode 100644
index 0000000..50eaa5f
--- /dev/null
+++ b/src/napari_metadata/widgets/__init__.py
@@ -0,0 +1,8 @@
+"""Widget subpackage for napari-metadata.
+
+All Qt-dependent code lives here.
+"""
+
+from napari_metadata.widgets._main import MetadataWidget
+
+__all__ = ['MetadataWidget']
diff --git a/src/napari_metadata/widgets/_axis_components.py b/src/napari_metadata/widgets/_axis_components.py
index fa5cbbb..29595d2 100644
--- a/src/napari_metadata/widgets/_axis_components.py
+++ b/src/napari_metadata/widgets/_axis_components.py
@@ -19,8 +19,7 @@
     QWidget,
 )
 
-from napari_metadata._axis_units import AxisUnitEnum
-from napari_metadata._model import (
+from napari_metadata.layer_utils import (
     get_axes_labels,
     get_axes_scales,
     get_axes_translations,
@@ -32,7 +31,8 @@
     set_axes_translations,
     set_axes_units,
 )
-from napari_metadata._protocols import (
+from napari_metadata.units import AxisUnitEnum
+from napari_metadata.widgets._protocols import (
     AxesMetadataComponentsInstanceAPI,
     AxisComponent,
     MetadataWidgetAPI,
diff --git a/src/napari_metadata/widgets/_containers.py b/src/napari_metadata/widgets/_containers.py
index f0c9cd6..195e4d6 100644
--- a/src/napari_metadata/widgets/_containers.py
+++ b/src/napari_metadata/widgets/_containers.py
@@ -16,7 +16,7 @@
     QWidget,
 )
 
-from napari_metadata._protocols import MetadataWidgetAPI
+from napari_metadata.widgets._protocols import MetadataWidgetAPI
 
 if TYPE_CHECKING:
     import napari.viewer
diff --git a/src/napari_metadata/widgets/_file_components.py b/src/napari_metadata/widgets/_file_components.py
index 54e39c9..0af434c 100644
--- a/src/napari_metadata/widgets/_file_components.py
+++ b/src/napari_metadata/widgets/_file_components.py
@@ -4,14 +4,14 @@
 from qtpy.QtGui import QFontMetrics
 from qtpy.QtWidgets import QLabel, QLineEdit, QSizePolicy, QTextEdit, QWidget
 
-from napari_metadata._file_size import generate_display_size
-from napari_metadata._model import (
+from napari_metadata.file_size import generate_display_size
+from napari_metadata.layer_utils import (
     get_layer_data_dtype,
     get_layer_data_shape,
     get_layer_source_path,
     resolve_layer,
 )
-from napari_metadata._protocols import MetadataComponent
+from napari_metadata.widgets._protocols import MetadataComponent
 
 if TYPE_CHECKING:
     from napari.layers import Layer
diff --git a/src/napari_metadata/widgets/_inheritance.py b/src/napari_metadata/widgets/_inheritance.py
index 33c8508..8b98a26 100644
--- a/src/napari_metadata/widgets/_inheritance.py
+++ b/src/napari_metadata/widgets/_inheritance.py
@@ -10,7 +10,7 @@
     QWidget,
 )
 
-from napari_metadata._model import (
+from napari_metadata.layer_utils import (
     connect_callback_to_layer_name_changed,
     connect_callback_to_layer_selection_events,
     connect_callback_to_list_events,
@@ -20,7 +20,7 @@
     get_layers_list,
     resolve_layer,
 )
-from napari_metadata._protocols import MetadataWidgetAPI
+from napari_metadata.widgets._protocols import MetadataWidgetAPI
 
 if TYPE_CHECKING:
     from napari.components import ViewerModel
diff --git a/src/napari_metadata/widgets/_main.py b/src/napari_metadata/widgets/_main.py
index 63d0069..bad4574 100644
--- a/src/napari_metadata/widgets/_main.py
+++ b/src/napari_metadata/widgets/_main.py
@@ -22,27 +22,27 @@
     QWidget,
 )
 
-from napari_metadata._axis_metadata_widgets import (
+from napari_metadata.layer_utils import (
+    resolve_layer,
+    set_axes_labels,
+    set_axes_scales,
+    set_axes_translations,
+    set_axes_units,
+)
+from napari_metadata.units import AxisUnitEnum
+from napari_metadata.widgets._axis_components import (
     AxisLabels,
     AxisMetadata,
     AxisScales,
     AxisTranslations,
 )
-from napari_metadata._axis_units import AxisUnitEnum
-from napari_metadata._collapsible_containers import (
+from napari_metadata.widgets._containers import (
     CollapsibleSectionContainer,
     HorizontalOnlyOuterScrollArea,
 )
-from napari_metadata._file_metadata_widgets import FileGeneralMetadata
-from napari_metadata._inheritance_widget import InheritanceWidget
-from napari_metadata._model import (
-    resolve_layer,
-    set_axes_labels,
-    set_axes_scales,
-    set_axes_translations,
-    set_axes_units,
-)
-from napari_metadata._protocols import (
+from napari_metadata.widgets._file_components import FileGeneralMetadata
+from napari_metadata.widgets._inheritance import InheritanceWidget
+from napari_metadata.widgets._protocols import (
     AxesMetadataComponentsInstanceAPI,
     AxisComponent,
     MetadataComponent,
diff --git a/tests/test_axis_units.py b/tests/test_axis_units.py
index 5a8b903..a375e1e 100644
--- a/tests/test_axis_units.py
+++ b/tests/test_axis_units.py
@@ -3,7 +3,7 @@
 import pint
 import pytest
 
-from napari_metadata._axis_units import AxisUnitEnum, _UnitConfig
+from napari_metadata.units import AxisUnitEnum, _UnitConfig
 
 
 class TestUnitConfig:
diff --git a/tests/test_file_size.py b/tests/test_file_size.py
index 5cc4e35..62dc809 100644
--- a/tests/test_file_size.py
+++ b/tests/test_file_size.py
@@ -1,4 +1,4 @@
-"""Tests for napari_metadata._file_size."""
+"""Tests for napari_metadata.file_size."""
 
 import os
 from unittest.mock import MagicMock
@@ -6,7 +6,7 @@
 import napari.layers
 import numpy as np
 
-from napari_metadata._file_size import (
+from napari_metadata.file_size import (
     _generate_text_for_size,
     generate_display_size,
 )
diff --git a/tests/test_model.py b/tests/test_model.py
index e04b9ce..1d2abe0 100644
--- a/tests/test_model.py
+++ b/tests/test_model.py
@@ -2,7 +2,7 @@
 import pytest
 from napari.components import ViewerModel
 
-from napari_metadata._model import (
+from napari_metadata.layer_utils import (
     connect_callback_to_layer_name_changed,
     connect_callback_to_layer_selection_events,
     connect_callback_to_list_events,
diff --git a/tests/test_napari.py b/tests/test_napari.py
index 515a358..1a40d46 100644
--- a/tests/test_napari.py
+++ b/tests/test_napari.py
@@ -1,4 +1,4 @@
-from napari_metadata._widget import MetadataWidget
+from napari_metadata.widgets import MetadataWidget
 
 
 def test_add_widget_to_napari(make_napari_viewer):

From 73cbc5e446c89819e9662e156f625fdd12c2f500 Mon Sep 17 00:00:00 2001
From: Tim Monko <timmonko@gmail.com>
Date: Fri, 27 Feb 2026 23:52:31 -0600
Subject: [PATCH 3/5] rename tests

---
 tests/{test_model.py => test_layer_utils.py} | 0
 tests/{test_axis_units.py => test_units.py}  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/{test_model.py => test_layer_utils.py} (100%)
 rename tests/{test_axis_units.py => test_units.py} (100%)

diff --git a/tests/test_model.py b/tests/test_layer_utils.py
similarity index 100%
rename from tests/test_model.py
rename to tests/test_layer_utils.py
diff --git a/tests/test_axis_units.py b/tests/test_units.py
similarity index 100%
rename from tests/test_axis_units.py
rename to tests/test_units.py

From 92d8951e5e4a6afc1588bf9fafa103aec28c3720 Mon Sep 17 00:00:00 2001
From: Tim Monko <timmonko@gmail.com>
Date: Fri, 27 Feb 2026 23:56:41 -0600
Subject: [PATCH 4/5] shorter name for widget components

---
 src/napari_metadata/widgets/{_axis_components.py => _axis.py} | 0
 src/napari_metadata/widgets/{_file_components.py => _file.py} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename src/napari_metadata/widgets/{_axis_components.py => _axis.py} (100%)
 rename src/napari_metadata/widgets/{_file_components.py => _file.py} (100%)

diff --git a/src/napari_metadata/widgets/_axis_components.py b/src/napari_metadata/widgets/_axis.py
similarity index 100%
rename from src/napari_metadata/widgets/_axis_components.py
rename to src/napari_metadata/widgets/_axis.py
diff --git a/src/napari_metadata/widgets/_file_components.py b/src/napari_metadata/widgets/_file.py
similarity index 100%
rename from src/napari_metadata/widgets/_file_components.py
rename to src/napari_metadata/widgets/_file.py

From e35c15a3a62f0ff09db383531b599beb20d71a24 Mon Sep 17 00:00:00 2001
From: Tim Monko <timmonko@gmail.com>
Date: Sat, 28 Feb 2026 00:08:43 -0600
Subject: [PATCH 5/5] fix import widget imports in _main

---
 src/napari_metadata/widgets/_main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/napari_metadata/widgets/_main.py b/src/napari_metadata/widgets/_main.py
index bad4574..5d73585 100644
--- a/src/napari_metadata/widgets/_main.py
+++ b/src/napari_metadata/widgets/_main.py
@@ -30,7 +30,7 @@
     set_axes_units,
 )
 from napari_metadata.units import AxisUnitEnum
-from napari_metadata.widgets._axis_components import (
+from napari_metadata.widgets._axis import (
     AxisLabels,
     AxisMetadata,
     AxisScales,
@@ -40,7 +40,7 @@
     CollapsibleSectionContainer,
     HorizontalOnlyOuterScrollArea,
 )
-from napari_metadata.widgets._file_components import FileGeneralMetadata
+from napari_metadata.widgets._file import FileGeneralMetadata
 from napari_metadata.widgets._inheritance import InheritanceWidget
 from napari_metadata.widgets._protocols import (
     AxesMetadataComponentsInstanceAPI,