From 44355ab1bd1c23dd2c5e102b7c63dffdf189ff1b Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Wed, 22 Oct 2025 11:50:18 -0700
Subject: [PATCH] Sub-Directories: `kinds`, `parameters`

Gets otherwise out of hand.
---
 src/__init__.py                               |  0
 src/pals/__init__.py                          | 20 +++----------------
 src/pals/{ => kinds}/BaseElement.py           |  0
 src/pals/{ => kinds}/BeamLine.py              |  0
 src/pals/{ => kinds}/Drift.py                 |  0
 src/pals/{ => kinds}/Quadrupole.py            |  2 +-
 src/pals/{ => kinds}/ThickElement.py          |  0
 src/pals/kinds/__init__.py                    |  9 +++++++++
 .../MagneticMultipoleParameters.py            |  0
 src/pals/parameters/__init__.py               |  5 +++++
 10 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 src/__init__.py
 rename src/pals/{ => kinds}/BaseElement.py (100%)
 rename src/pals/{ => kinds}/BeamLine.py (100%)
 rename src/pals/{ => kinds}/Drift.py (100%)
 rename src/pals/{ => kinds}/Quadrupole.py (81%)
 rename src/pals/{ => kinds}/ThickElement.py (100%)
 create mode 100644 src/pals/kinds/__init__.py
 rename src/pals/{ => parameters}/MagneticMultipoleParameters.py (100%)
 create mode 100644 src/pals/parameters/__init__.py

diff --git a/src/__init__.py b/src/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/pals/__init__.py b/src/pals/__init__.py
index 1433652..6db4d7d 100644
--- a/src/pals/__init__.py
+++ b/src/pals/__init__.py
@@ -1,22 +1,8 @@
 """Top-level package for PALS.
 
 Re-export commonly used classes from submodules so callers can use
-simpler import statements like `from pals import Drift` instead of
-`from pals.Drift import Drift`.
+simpler import statements like `from pals import Drift`.
 """
 
-from .BaseElement import BaseElement
-from .BeamLine import BeamLine
-from .Drift import Drift
-from .MagneticMultipoleParameters import MagneticMultipoleParameters
-from .Quadrupole import Quadrupole
-from .ThickElement import ThickElement
-
-__all__ = [
-    "BaseElement",
-    "BeamLine",
-    "Drift",
-    "MagneticMultipoleParameters",
-    "Quadrupole",
-    "ThickElement",
-]
+from .kinds import *  # noqa
+from .parameters import *  # noqa
diff --git a/src/pals/BaseElement.py b/src/pals/kinds/BaseElement.py
similarity index 100%
rename from src/pals/BaseElement.py
rename to src/pals/kinds/BaseElement.py
diff --git a/src/pals/BeamLine.py b/src/pals/kinds/BeamLine.py
similarity index 100%
rename from src/pals/BeamLine.py
rename to src/pals/kinds/BeamLine.py
diff --git a/src/pals/Drift.py b/src/pals/kinds/Drift.py
similarity index 100%
rename from src/pals/Drift.py
rename to src/pals/kinds/Drift.py
diff --git a/src/pals/Quadrupole.py b/src/pals/kinds/Quadrupole.py
similarity index 81%
rename from src/pals/Quadrupole.py
rename to src/pals/kinds/Quadrupole.py
index 127b63e..5702369 100644
--- a/src/pals/Quadrupole.py
+++ b/src/pals/kinds/Quadrupole.py
@@ -1,7 +1,7 @@
 from typing import Literal
 
 from .ThickElement import ThickElement
-from .MagneticMultipoleParameters import MagneticMultipoleParameters
+from ..parameters import MagneticMultipoleParameters
 
 
 class Quadrupole(ThickElement):
diff --git a/src/pals/ThickElement.py b/src/pals/kinds/ThickElement.py
similarity index 100%
rename from src/pals/ThickElement.py
rename to src/pals/kinds/ThickElement.py
diff --git a/src/pals/kinds/__init__.py b/src/pals/kinds/__init__.py
new file mode 100644
index 0000000..8b8b26b
--- /dev/null
+++ b/src/pals/kinds/__init__.py
@@ -0,0 +1,9 @@
+"""Re-export commonly used classes from submodules so callers can use
+simpler import statements like `from pals import Drift`.
+"""
+
+from .BaseElement import BaseElement  # noqa: F401
+from .BeamLine import BeamLine  # noqa: F401
+from .Drift import Drift  # noqa: F401
+from .Quadrupole import Quadrupole  # noqa: F401
+from .ThickElement import ThickElement  # noqa: F401
diff --git a/src/pals/MagneticMultipoleParameters.py b/src/pals/parameters/MagneticMultipoleParameters.py
similarity index 100%
rename from src/pals/MagneticMultipoleParameters.py
rename to src/pals/parameters/MagneticMultipoleParameters.py
diff --git a/src/pals/parameters/__init__.py b/src/pals/parameters/__init__.py
new file mode 100644
index 0000000..9a4d433
--- /dev/null
+++ b/src/pals/parameters/__init__.py
@@ -0,0 +1,5 @@
+"""Re-export commonly used classes from submodules so callers can use
+simpler import statements like `from pals import MagneticMultipoleParameters`.
+"""
+
+from .MagneticMultipoleParameters import MagneticMultipoleParameters  # noqa: F401