Repository: Amourspirit/python-types-unopy (language: python)

Issue:
0.4



Discussion / hints:

Fix patch:
diff --git a/README.rst b/README.rst
index cf1b36f54..340cbe0d6 100644
--- a/README.rst
+++ b/README.rst
@@ -7,7 +7,7 @@ This project allow typings for the full `LibreOffice API <https://api.libreoffic
 WHY
 ===
 
-Working with `LibreOffice API <https://api.libreoffice.org/>`_ in a modern IDE such as `Visual Studio Code <https://code.visualstudio.com/>`_
+Working with `LibreOffice API <https://api.libreoffice.org/>`_ in a modern code editor such as `Visual Studio Code <https://code.visualstudio.com/>`_
 there is not type support for `LibreOffice API <https://api.libreoffice.org/>`_ This project solves that Issue.
 
 VERSION
@@ -60,11 +60,20 @@ The solution is to use `TYPE_CHECKING <https://docs.python.org/3/library/typing.
 
 .. code-block:: python
 
+    >>> from __future__ import annotations
     >>> from typing import TYPE_CHECKING
     >>> if TYPE_CHECKING:
     ...     from com.sun.star.sheet import SheetCellRange
     ...
-    # anything inside of TYPE_CHECKING block is ignore at runtime.
+
+Anything imported in the ``TYPE_CHECKING`` block will not be available at runtime.
+For this reason types inside the ``TYPE_CHECKING`` must be wrapped in quotes OR ``from __future__ import annotations`` must be the first line of the module.
+
+Example of wrapping type in quotes.
+
+.. code-block:: python
+
+    def do_work(range: 'SheetCellRange') -> None: ...
 
 Known Issues
 ============
diff --git a/com/sun/star/accessibility/AccessibleEventId.pyi b/com/sun/star/accessibility/AccessibleEventId.pyi
deleted file mode 100644
index ac32b696e..000000000
--- a/com/sun/star/accessibility/AccessibleEventId.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.accessibility.accessible_event_id import *
diff --git a/com/sun/star/_pyi/accessibility/accessible_event_id.pyi b/com/sun/star/accessibility/AccessibleEventId/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/accessibility/accessible_event_id.pyi
rename to com/sun/star/accessibility/AccessibleEventId/__init__.pyi
diff --git a/com/sun/star/accessibility/AccessibleRelationType.pyi b/com/sun/star/accessibility/AccessibleRelationType.pyi
deleted file mode 100644
index d21db8b27..000000000
--- a/com/sun/star/accessibility/AccessibleRelationType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.accessibility.accessible_relation_type import *
diff --git a/com/sun/star/_pyi/accessibility/accessible_relation_type.pyi b/com/sun/star/accessibility/AccessibleRelationType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/accessibility/accessible_relation_type.pyi
rename to com/sun/star/accessibility/AccessibleRelationType/__init__.pyi
diff --git a/com/sun/star/accessibility/AccessibleRole.pyi b/com/sun/star/accessibility/AccessibleRole.pyi
deleted file mode 100644
index 305c75b73..000000000
--- a/com/sun/star/accessibility/AccessibleRole.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.accessibility.accessible_role import *
diff --git a/com/sun/star/_pyi/accessibility/accessible_role.pyi b/com/sun/star/accessibility/AccessibleRole/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/accessibility/accessible_role.pyi
rename to com/sun/star/accessibility/AccessibleRole/__init__.pyi
diff --git a/com/sun/star/accessibility/AccessibleScrollType.pyi b/com/sun/star/accessibility/AccessibleScrollType.pyi
deleted file mode 100644
index 8101ef89a..000000000
--- a/com/sun/star/accessibility/AccessibleScrollType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.accessibility.accessible_scroll_type import *
diff --git a/com/sun/star/_pyi/accessibility/accessible_scroll_type.pyi b/com/sun/star/accessibility/AccessibleScrollType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/accessibility/accessible_scroll_type.pyi
rename to com/sun/star/accessibility/AccessibleScrollType/__init__.pyi
diff --git a/com/sun/star/accessibility/AccessibleStateType.pyi b/com/sun/star/accessibility/AccessibleStateType.pyi
deleted file mode 100644
index 695189e38..000000000
--- a/com/sun/star/accessibility/AccessibleStateType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.accessibility.accessible_state_type import *
diff --git a/com/sun/star/_pyi/accessibility/accessible_state_type.pyi b/com/sun/star/accessibility/AccessibleStateType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/accessibility/accessible_state_type.pyi
rename to com/sun/star/accessibility/AccessibleStateType/__init__.pyi
diff --git a/com/sun/star/accessibility/AccessibleTableModelChangeType.pyi b/com/sun/star/accessibility/AccessibleTableModelChangeType.pyi
deleted file mode 100644
index 066c0f4c8..000000000
--- a/com/sun/star/accessibility/AccessibleTableModelChangeType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.accessibility.accessible_table_model_change_type import *
diff --git a/com/sun/star/_pyi/accessibility/accessible_table_model_change_type.pyi b/com/sun/star/accessibility/AccessibleTableModelChangeType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/accessibility/accessible_table_model_change_type.pyi
rename to com/sun/star/accessibility/AccessibleTableModelChangeType/__init__.pyi
diff --git a/com/sun/star/accessibility/AccessibleTextType.pyi b/com/sun/star/accessibility/AccessibleTextType.pyi
deleted file mode 100644
index d473df84a..000000000
--- a/com/sun/star/accessibility/AccessibleTextType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.accessibility.accessible_text_type import *
diff --git a/com/sun/star/_pyi/accessibility/accessible_text_type.pyi b/com/sun/star/accessibility/AccessibleTextType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/accessibility/accessible_text_type.pyi
rename to com/sun/star/accessibility/AccessibleTextType/__init__.pyi
diff --git a/com/sun/star/animations/AnimationAdditiveMode.pyi b/com/sun/star/animations/AnimationAdditiveMode.pyi
deleted file mode 100644
index d24f320ee..000000000
--- a/com/sun/star/animations/AnimationAdditiveMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.animations.animation_additive_mode import *
diff --git a/com/sun/star/_pyi/animations/animation_additive_mode.pyi b/com/sun/star/animations/AnimationAdditiveMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/animations/animation_additive_mode.pyi
rename to com/sun/star/animations/AnimationAdditiveMode/__init__.pyi
diff --git a/com/sun/star/animations/AnimationCalcMode.pyi b/com/sun/star/animations/AnimationCalcMode.pyi
deleted file mode 100644
index e2e926552..000000000
--- a/com/sun/star/animations/AnimationCalcMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.animations.animation_calc_mode import *
diff --git a/com/sun/star/_pyi/animations/animation_calc_mode.pyi b/com/sun/star/animations/AnimationCalcMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/animations/animation_calc_mode.pyi
rename to com/sun/star/animations/AnimationCalcMode/__init__.pyi
diff --git a/com/sun/star/animations/AnimationColorSpace.pyi b/com/sun/star/animations/AnimationColorSpace.pyi
deleted file mode 100644
index 525bed265..000000000
--- a/com/sun/star/animations/AnimationColorSpace.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.animations.animation_color_space import *
diff --git a/com/sun/star/_pyi/animations/animation_color_space.pyi b/com/sun/star/animations/AnimationColorSpace/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/animations/animation_color_space.pyi
rename to com/sun/star/animations/AnimationColorSpace/__init__.pyi
diff --git a/com/sun/star/animations/AnimationEndSync.pyi b/com/sun/star/animations/AnimationEndSync.pyi
deleted file mode 100644
index c10c339c6..000000000
--- a/com/sun/star/animations/AnimationEndSync.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.animations.animation_end_sync import *
diff --git a/com/sun/star/_pyi/animations/animation_end_sync.pyi b/com/sun/star/animations/AnimationEndSync/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/animations/animation_end_sync.pyi
rename to com/sun/star/animations/AnimationEndSync/__init__.pyi
diff --git a/com/sun/star/animations/AnimationFill.pyi b/com/sun/star/animations/AnimationFill.pyi
deleted file mode 100644
index 9bac77da7..000000000
--- a/com/sun/star/animations/AnimationFill.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.animations.animation_fill import *
diff --git a/com/sun/star/_pyi/animations/animation_fill.pyi b/com/sun/star/animations/AnimationFill/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/animations/animation_fill.pyi
rename to com/sun/star/animations/AnimationFill/__init__.pyi
diff --git a/com/sun/star/animations/AnimationNodeType.pyi b/com/sun/star/animations/AnimationNodeType.pyi
deleted file mode 100644
index 906a4dece..000000000
--- a/com/sun/star/animations/AnimationNodeType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.animations.animation_node_type import *
diff --git a/com/sun/star/_pyi/animations/animation_node_type.pyi b/com/sun/star/animations/AnimationNodeType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/animations/animation_node_type.pyi
rename to com/sun/star/animations/AnimationNodeType/__init__.pyi
diff --git a/com/sun/star/animations/AnimationRestart.pyi b/com/sun/star/animations/AnimationRestart.pyi
deleted file mode 100644
index 57a580222..000000000
--- a/com/sun/star/animations/AnimationRestart.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.animations.animation_restart import *
diff --git a/com/sun/star/_pyi/animations/animation_restart.pyi b/com/sun/star/animations/AnimationRestart/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/animations/animation_restart.pyi
rename to com/sun/star/animations/AnimationRestart/__init__.pyi
diff --git a/com/sun/star/animations/AnimationTransformType.pyi b/com/sun/star/animations/AnimationTransformType.pyi
deleted file mode 100644
index 807a1b4e1..000000000
--- a/com/sun/star/animations/AnimationTransformType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.animations.animation_transform_type import *
diff --git a/com/sun/star/_pyi/animations/animation_transform_type.pyi b/com/sun/star/animations/AnimationTransformType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/animations/animation_transform_type.pyi
rename to com/sun/star/animations/AnimationTransformType/__init__.pyi
diff --git a/com/sun/star/animations/AnimationValueType.pyi b/com/sun/star/animations/AnimationValueType.pyi
deleted file mode 100644
index d81d17ed3..000000000
--- a/com/sun/star/animations/AnimationValueType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.animations.animation_value_type import *
diff --git a/com/sun/star/_pyi/animations/animation_value_type.pyi b/com/sun/star/animations/AnimationValueType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/animations/animation_value_type.pyi
rename to com/sun/star/animations/AnimationValueType/__init__.pyi
diff --git a/com/sun/star/animations/EventTrigger.pyi b/com/sun/star/animations/EventTrigger.pyi
deleted file mode 100644
index b44753e93..000000000
--- a/com/sun/star/animations/EventTrigger.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.animations.event_trigger import *
diff --git a/com/sun/star/_pyi/animations/event_trigger.pyi b/com/sun/star/animations/EventTrigger/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/animations/event_trigger.pyi
rename to com/sun/star/animations/EventTrigger/__init__.pyi
diff --git a/com/sun/star/animations/Timing.pyi b/com/sun/star/animations/Timing.pyi
deleted file mode 100644
index d99d585ef..000000000
--- a/com/sun/star/animations/Timing.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.animations.timing import *
diff --git a/com/sun/star/_pyi/animations/timing.pyi b/com/sun/star/animations/Timing/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/animations/timing.pyi
rename to com/sun/star/animations/Timing/__init__.pyi
diff --git a/com/sun/star/animations/TransitionSubType.pyi b/com/sun/star/animations/TransitionSubType.pyi
deleted file mode 100644
index 77da9baf6..000000000
--- a/com/sun/star/animations/TransitionSubType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.animations.transition_sub_type import *
diff --git a/com/sun/star/_pyi/animations/transition_sub_type.pyi b/com/sun/star/animations/TransitionSubType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/animations/transition_sub_type.pyi
rename to com/sun/star/animations/TransitionSubType/__init__.pyi
diff --git a/com/sun/star/animations/TransitionType.pyi b/com/sun/star/animations/TransitionType.pyi
deleted file mode 100644
index aba05d689..000000000
--- a/com/sun/star/animations/TransitionType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.animations.transition_type import *
diff --git a/com/sun/star/_pyi/animations/transition_type.pyi b/com/sun/star/animations/TransitionType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/animations/transition_type.pyi
rename to com/sun/star/animations/TransitionType/__init__.pyi
diff --git a/com/sun/star/awt/AdjustmentType.pyi b/com/sun/star/awt/AdjustmentType.pyi
deleted file mode 100644
index eb86b5fb6..000000000
--- a/com/sun/star/awt/AdjustmentType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.adjustment_type import *
diff --git a/com/sun/star/_pyi/awt/adjustment_type.pyi b/com/sun/star/awt/AdjustmentType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/adjustment_type.pyi
rename to com/sun/star/awt/AdjustmentType/__init__.pyi
diff --git a/com/sun/star/awt/CharSet.pyi b/com/sun/star/awt/CharSet.pyi
deleted file mode 100644
index 6eaaae5b6..000000000
--- a/com/sun/star/awt/CharSet.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.char_set import *
diff --git a/com/sun/star/_pyi/awt/char_set.pyi b/com/sun/star/awt/CharSet/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/char_set.pyi
rename to com/sun/star/awt/CharSet/__init__.pyi
diff --git a/com/sun/star/awt/Command.pyi b/com/sun/star/awt/Command.pyi
deleted file mode 100644
index b9aa43bfd..000000000
--- a/com/sun/star/awt/Command.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.command import *
diff --git a/com/sun/star/_pyi/awt/command.pyi b/com/sun/star/awt/Command/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/command.pyi
rename to com/sun/star/awt/Command/__init__.pyi
diff --git a/com/sun/star/awt/DeviceCapability.pyi b/com/sun/star/awt/DeviceCapability.pyi
deleted file mode 100644
index 7a43a1e5a..000000000
--- a/com/sun/star/awt/DeviceCapability.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.device_capability import *
diff --git a/com/sun/star/_pyi/awt/device_capability.pyi b/com/sun/star/awt/DeviceCapability/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/device_capability.pyi
rename to com/sun/star/awt/DeviceCapability/__init__.pyi
diff --git a/com/sun/star/awt/FieldUnit.pyi b/com/sun/star/awt/FieldUnit.pyi
deleted file mode 100644
index a7f8b948d..000000000
--- a/com/sun/star/awt/FieldUnit.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.field_unit import *
diff --git a/com/sun/star/_pyi/awt/field_unit.pyi b/com/sun/star/awt/FieldUnit/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/field_unit.pyi
rename to com/sun/star/awt/FieldUnit/__init__.pyi
diff --git a/com/sun/star/awt/FocusChangeReason.pyi b/com/sun/star/awt/FocusChangeReason.pyi
deleted file mode 100644
index d4bfaeaab..000000000
--- a/com/sun/star/awt/FocusChangeReason.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.focus_change_reason import *
diff --git a/com/sun/star/_pyi/awt/focus_change_reason.pyi b/com/sun/star/awt/FocusChangeReason/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/focus_change_reason.pyi
rename to com/sun/star/awt/FocusChangeReason/__init__.pyi
diff --git a/com/sun/star/awt/FontEmphasisMark.pyi b/com/sun/star/awt/FontEmphasisMark.pyi
deleted file mode 100644
index 15f1570ff..000000000
--- a/com/sun/star/awt/FontEmphasisMark.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.font_emphasis_mark import *
diff --git a/com/sun/star/_pyi/awt/font_emphasis_mark.pyi b/com/sun/star/awt/FontEmphasisMark/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/font_emphasis_mark.pyi
rename to com/sun/star/awt/FontEmphasisMark/__init__.pyi
diff --git a/com/sun/star/awt/FontFamily.pyi b/com/sun/star/awt/FontFamily.pyi
deleted file mode 100644
index f4ca4652e..000000000
--- a/com/sun/star/awt/FontFamily.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.font_family import *
diff --git a/com/sun/star/_pyi/awt/font_family.pyi b/com/sun/star/awt/FontFamily/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/font_family.pyi
rename to com/sun/star/awt/FontFamily/__init__.pyi
diff --git a/com/sun/star/awt/FontPitch.pyi b/com/sun/star/awt/FontPitch.pyi
deleted file mode 100644
index 8a3e2bb28..000000000
--- a/com/sun/star/awt/FontPitch.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.font_pitch import *
diff --git a/com/sun/star/_pyi/awt/font_pitch.pyi b/com/sun/star/awt/FontPitch/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/font_pitch.pyi
rename to com/sun/star/awt/FontPitch/__init__.pyi
diff --git a/com/sun/star/awt/FontRelief.pyi b/com/sun/star/awt/FontRelief.pyi
deleted file mode 100644
index 260005880..000000000
--- a/com/sun/star/awt/FontRelief.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.font_relief import *
diff --git a/com/sun/star/_pyi/awt/font_relief.pyi b/com/sun/star/awt/FontRelief/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/font_relief.pyi
rename to com/sun/star/awt/FontRelief/__init__.pyi
diff --git a/com/sun/star/awt/FontSlant.pyi b/com/sun/star/awt/FontSlant.pyi
deleted file mode 100644
index fb64fed87..000000000
--- a/com/sun/star/awt/FontSlant.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.font_slant import *
diff --git a/com/sun/star/_pyi/awt/font_slant.pyi b/com/sun/star/awt/FontSlant/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/font_slant.pyi
rename to com/sun/star/awt/FontSlant/__init__.pyi
diff --git a/com/sun/star/awt/FontStrikeout.pyi b/com/sun/star/awt/FontStrikeout.pyi
deleted file mode 100644
index 59938f22e..000000000
--- a/com/sun/star/awt/FontStrikeout.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.font_strikeout import *
diff --git a/com/sun/star/_pyi/awt/font_strikeout.pyi b/com/sun/star/awt/FontStrikeout/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/font_strikeout.pyi
rename to com/sun/star/awt/FontStrikeout/__init__.pyi
diff --git a/com/sun/star/awt/FontType.pyi b/com/sun/star/awt/FontType.pyi
deleted file mode 100644
index 92d6cc324..000000000
--- a/com/sun/star/awt/FontType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.font_type import *
diff --git a/com/sun/star/_pyi/awt/font_type.pyi b/com/sun/star/awt/FontType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/font_type.pyi
rename to com/sun/star/awt/FontType/__init__.pyi
diff --git a/com/sun/star/awt/FontUnderline.pyi b/com/sun/star/awt/FontUnderline.pyi
deleted file mode 100644
index b868a9fcf..000000000
--- a/com/sun/star/awt/FontUnderline.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.font_underline import *
diff --git a/com/sun/star/_pyi/awt/font_underline.pyi b/com/sun/star/awt/FontUnderline/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/font_underline.pyi
rename to com/sun/star/awt/FontUnderline/__init__.pyi
diff --git a/com/sun/star/awt/FontWeight.pyi b/com/sun/star/awt/FontWeight.pyi
deleted file mode 100644
index dfaa40fb8..000000000
--- a/com/sun/star/awt/FontWeight.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.font_weight import *
diff --git a/com/sun/star/_pyi/awt/font_weight.pyi b/com/sun/star/awt/FontWeight/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/font_weight.pyi
rename to com/sun/star/awt/FontWeight/__init__.pyi
diff --git a/com/sun/star/awt/FontWidth.pyi b/com/sun/star/awt/FontWidth.pyi
deleted file mode 100644
index 7d28fec3e..000000000
--- a/com/sun/star/awt/FontWidth.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.font_width import *
diff --git a/com/sun/star/_pyi/awt/font_width.pyi b/com/sun/star/awt/FontWidth/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/font_width.pyi
rename to com/sun/star/awt/FontWidth/__init__.pyi
diff --git a/com/sun/star/awt/GradientStyle.pyi b/com/sun/star/awt/GradientStyle.pyi
deleted file mode 100644
index 74cc827fe..000000000
--- a/com/sun/star/awt/GradientStyle.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.gradient_style import *
diff --git a/com/sun/star/_pyi/awt/gradient_style.pyi b/com/sun/star/awt/GradientStyle/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/gradient_style.pyi
rename to com/sun/star/awt/GradientStyle/__init__.pyi
diff --git a/com/sun/star/awt/ImageAlign.pyi b/com/sun/star/awt/ImageAlign.pyi
deleted file mode 100644
index d1b0d61a6..000000000
--- a/com/sun/star/awt/ImageAlign.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.image_align import *
diff --git a/com/sun/star/_pyi/awt/image_align.pyi b/com/sun/star/awt/ImageAlign/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/image_align.pyi
rename to com/sun/star/awt/ImageAlign/__init__.pyi
diff --git a/com/sun/star/awt/ImageDrawMode.pyi b/com/sun/star/awt/ImageDrawMode.pyi
deleted file mode 100644
index b7f9a6732..000000000
--- a/com/sun/star/awt/ImageDrawMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.image_draw_mode import *
diff --git a/com/sun/star/_pyi/awt/image_draw_mode.pyi b/com/sun/star/awt/ImageDrawMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/image_draw_mode.pyi
rename to com/sun/star/awt/ImageDrawMode/__init__.pyi
diff --git a/com/sun/star/awt/ImagePosition.pyi b/com/sun/star/awt/ImagePosition.pyi
deleted file mode 100644
index 9b5c4500c..000000000
--- a/com/sun/star/awt/ImagePosition.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.image_position import *
diff --git a/com/sun/star/_pyi/awt/image_position.pyi b/com/sun/star/awt/ImagePosition/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/image_position.pyi
rename to com/sun/star/awt/ImagePosition/__init__.pyi
diff --git a/com/sun/star/awt/ImageScaleMode.pyi b/com/sun/star/awt/ImageScaleMode.pyi
deleted file mode 100644
index c791b3c0d..000000000
--- a/com/sun/star/awt/ImageScaleMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.image_scale_mode import *
diff --git a/com/sun/star/_pyi/awt/image_scale_mode.pyi b/com/sun/star/awt/ImageScaleMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/image_scale_mode.pyi
rename to com/sun/star/awt/ImageScaleMode/__init__.pyi
diff --git a/com/sun/star/awt/ImageStatus.pyi b/com/sun/star/awt/ImageStatus.pyi
deleted file mode 100644
index 735c6ee21..000000000
--- a/com/sun/star/awt/ImageStatus.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.image_status import *
diff --git a/com/sun/star/_pyi/awt/image_status.pyi b/com/sun/star/awt/ImageStatus/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/image_status.pyi
rename to com/sun/star/awt/ImageStatus/__init__.pyi
diff --git a/com/sun/star/awt/InvalidateStyle.pyi b/com/sun/star/awt/InvalidateStyle.pyi
deleted file mode 100644
index 4c72f8cb1..000000000
--- a/com/sun/star/awt/InvalidateStyle.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.invalidate_style import *
diff --git a/com/sun/star/_pyi/awt/invalidate_style.pyi b/com/sun/star/awt/InvalidateStyle/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/invalidate_style.pyi
rename to com/sun/star/awt/InvalidateStyle/__init__.pyi
diff --git a/com/sun/star/awt/Key.pyi b/com/sun/star/awt/Key.pyi
deleted file mode 100644
index b16533eb8..000000000
--- a/com/sun/star/awt/Key.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.key import *
diff --git a/com/sun/star/_pyi/awt/key.pyi b/com/sun/star/awt/Key/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/key.pyi
rename to com/sun/star/awt/Key/__init__.pyi
diff --git a/com/sun/star/awt/KeyFunction.pyi b/com/sun/star/awt/KeyFunction.pyi
deleted file mode 100644
index 880041502..000000000
--- a/com/sun/star/awt/KeyFunction.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.key_function import *
diff --git a/com/sun/star/_pyi/awt/key_function.pyi b/com/sun/star/awt/KeyFunction/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/key_function.pyi
rename to com/sun/star/awt/KeyFunction/__init__.pyi
diff --git a/com/sun/star/awt/KeyGroup.pyi b/com/sun/star/awt/KeyGroup.pyi
deleted file mode 100644
index 9bb21784b..000000000
--- a/com/sun/star/awt/KeyGroup.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.key_group import *
diff --git a/com/sun/star/_pyi/awt/key_group.pyi b/com/sun/star/awt/KeyGroup/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/key_group.pyi
rename to com/sun/star/awt/KeyGroup/__init__.pyi
diff --git a/com/sun/star/awt/KeyModifier.pyi b/com/sun/star/awt/KeyModifier.pyi
deleted file mode 100644
index 15980ffb3..000000000
--- a/com/sun/star/awt/KeyModifier.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.key_modifier import *
diff --git a/com/sun/star/_pyi/awt/key_modifier.pyi b/com/sun/star/awt/KeyModifier/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/key_modifier.pyi
rename to com/sun/star/awt/KeyModifier/__init__.pyi
diff --git a/com/sun/star/awt/LineEndFormat.pyi b/com/sun/star/awt/LineEndFormat.pyi
deleted file mode 100644
index 4d2ab2f27..000000000
--- a/com/sun/star/awt/LineEndFormat.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.line_end_format import *
diff --git a/com/sun/star/_pyi/awt/line_end_format.pyi b/com/sun/star/awt/LineEndFormat/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/line_end_format.pyi
rename to com/sun/star/awt/LineEndFormat/__init__.pyi
diff --git a/com/sun/star/awt/MenuItemStyle.pyi b/com/sun/star/awt/MenuItemStyle.pyi
deleted file mode 100644
index 34fe71c30..000000000
--- a/com/sun/star/awt/MenuItemStyle.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.menu_item_style import *
diff --git a/com/sun/star/_pyi/awt/menu_item_style.pyi b/com/sun/star/awt/MenuItemStyle/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/menu_item_style.pyi
rename to com/sun/star/awt/MenuItemStyle/__init__.pyi
diff --git a/com/sun/star/awt/MenuItemType.pyi b/com/sun/star/awt/MenuItemType.pyi
deleted file mode 100644
index 49ec3ba56..000000000
--- a/com/sun/star/awt/MenuItemType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.menu_item_type import *
diff --git a/com/sun/star/_pyi/awt/menu_item_type.pyi b/com/sun/star/awt/MenuItemType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/menu_item_type.pyi
rename to com/sun/star/awt/MenuItemType/__init__.pyi
diff --git a/com/sun/star/awt/MessageBoxButtons.pyi b/com/sun/star/awt/MessageBoxButtons.pyi
deleted file mode 100644
index d89653578..000000000
--- a/com/sun/star/awt/MessageBoxButtons.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.message_box_buttons import *
diff --git a/com/sun/star/_pyi/awt/message_box_buttons.pyi b/com/sun/star/awt/MessageBoxButtons/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/message_box_buttons.pyi
rename to com/sun/star/awt/MessageBoxButtons/__init__.pyi
diff --git a/com/sun/star/awt/MessageBoxResults.pyi b/com/sun/star/awt/MessageBoxResults.pyi
deleted file mode 100644
index 5c7647265..000000000
--- a/com/sun/star/awt/MessageBoxResults.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.message_box_results import *
diff --git a/com/sun/star/_pyi/awt/message_box_results.pyi b/com/sun/star/awt/MessageBoxResults/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/message_box_results.pyi
rename to com/sun/star/awt/MessageBoxResults/__init__.pyi
diff --git a/com/sun/star/awt/MessageBoxType.pyi b/com/sun/star/awt/MessageBoxType.pyi
deleted file mode 100644
index 89919ea36..000000000
--- a/com/sun/star/awt/MessageBoxType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.message_box_type import *
diff --git a/com/sun/star/_pyi/awt/message_box_type.pyi b/com/sun/star/awt/MessageBoxType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/message_box_type.pyi
rename to com/sun/star/awt/MessageBoxType/__init__.pyi
diff --git a/com/sun/star/awt/MouseButton.pyi b/com/sun/star/awt/MouseButton.pyi
deleted file mode 100644
index 6a71beadb..000000000
--- a/com/sun/star/awt/MouseButton.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.mouse_button import *
diff --git a/com/sun/star/_pyi/awt/mouse_button.pyi b/com/sun/star/awt/MouseButton/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/mouse_button.pyi
rename to com/sun/star/awt/MouseButton/__init__.pyi
diff --git a/com/sun/star/awt/MouseWheelBehavior.pyi b/com/sun/star/awt/MouseWheelBehavior.pyi
deleted file mode 100644
index b1c66f2f5..000000000
--- a/com/sun/star/awt/MouseWheelBehavior.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.mouse_wheel_behavior import *
diff --git a/com/sun/star/_pyi/awt/mouse_wheel_behavior.pyi b/com/sun/star/awt/MouseWheelBehavior/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/mouse_wheel_behavior.pyi
rename to com/sun/star/awt/MouseWheelBehavior/__init__.pyi
diff --git a/com/sun/star/awt/PopupMenuDirection.pyi b/com/sun/star/awt/PopupMenuDirection.pyi
deleted file mode 100644
index 7ddac5c1b..000000000
--- a/com/sun/star/awt/PopupMenuDirection.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.popup_menu_direction import *
diff --git a/com/sun/star/_pyi/awt/popup_menu_direction.pyi b/com/sun/star/awt/PopupMenuDirection/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/popup_menu_direction.pyi
rename to com/sun/star/awt/PopupMenuDirection/__init__.pyi
diff --git a/com/sun/star/awt/PosSize.pyi b/com/sun/star/awt/PosSize.pyi
deleted file mode 100644
index 23aa27928..000000000
--- a/com/sun/star/awt/PosSize.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.pos_size import *
diff --git a/com/sun/star/_pyi/awt/pos_size.pyi b/com/sun/star/awt/PosSize/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/pos_size.pyi
rename to com/sun/star/awt/PosSize/__init__.pyi
diff --git a/com/sun/star/awt/PushButtonType.pyi b/com/sun/star/awt/PushButtonType.pyi
deleted file mode 100644
index 791da246d..000000000
--- a/com/sun/star/awt/PushButtonType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.push_button_type import *
diff --git a/com/sun/star/_pyi/awt/push_button_type.pyi b/com/sun/star/awt/PushButtonType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/push_button_type.pyi
rename to com/sun/star/awt/PushButtonType/__init__.pyi
diff --git a/com/sun/star/awt/RasterOperation.pyi b/com/sun/star/awt/RasterOperation.pyi
deleted file mode 100644
index 94270d089..000000000
--- a/com/sun/star/awt/RasterOperation.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.raster_operation import *
diff --git a/com/sun/star/_pyi/awt/raster_operation.pyi b/com/sun/star/awt/RasterOperation/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/raster_operation.pyi
rename to com/sun/star/awt/RasterOperation/__init__.pyi
diff --git a/com/sun/star/awt/ScrollBarOrientation.pyi b/com/sun/star/awt/ScrollBarOrientation.pyi
deleted file mode 100644
index d499f38c8..000000000
--- a/com/sun/star/awt/ScrollBarOrientation.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.scroll_bar_orientation import *
diff --git a/com/sun/star/_pyi/awt/scroll_bar_orientation.pyi b/com/sun/star/awt/ScrollBarOrientation/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/scroll_bar_orientation.pyi
rename to com/sun/star/awt/ScrollBarOrientation/__init__.pyi
diff --git a/com/sun/star/awt/Style.pyi b/com/sun/star/awt/Style.pyi
deleted file mode 100644
index d86c285c5..000000000
--- a/com/sun/star/awt/Style.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.style import *
diff --git a/com/sun/star/_pyi/awt/style.pyi b/com/sun/star/awt/Style/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/style.pyi
rename to com/sun/star/awt/Style/__init__.pyi
diff --git a/com/sun/star/awt/SystemPointer.pyi b/com/sun/star/awt/SystemPointer.pyi
deleted file mode 100644
index 4555983d2..000000000
--- a/com/sun/star/awt/SystemPointer.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.system_pointer import *
diff --git a/com/sun/star/_pyi/awt/system_pointer.pyi b/com/sun/star/awt/SystemPointer/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/system_pointer.pyi
rename to com/sun/star/awt/SystemPointer/__init__.pyi
diff --git a/com/sun/star/awt/TextAlign.pyi b/com/sun/star/awt/TextAlign.pyi
deleted file mode 100644
index a328389c5..000000000
--- a/com/sun/star/awt/TextAlign.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.text_align import *
diff --git a/com/sun/star/_pyi/awt/text_align.pyi b/com/sun/star/awt/TextAlign/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/text_align.pyi
rename to com/sun/star/awt/TextAlign/__init__.pyi
diff --git a/com/sun/star/awt/VclWindowPeerAttribute.pyi b/com/sun/star/awt/VclWindowPeerAttribute.pyi
deleted file mode 100644
index 22b1e68dc..000000000
--- a/com/sun/star/awt/VclWindowPeerAttribute.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.vcl_window_peer_attribute import *
diff --git a/com/sun/star/_pyi/awt/vcl_window_peer_attribute.pyi b/com/sun/star/awt/VclWindowPeerAttribute/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/vcl_window_peer_attribute.pyi
rename to com/sun/star/awt/VclWindowPeerAttribute/__init__.pyi
diff --git a/com/sun/star/awt/VisualEffect.pyi b/com/sun/star/awt/VisualEffect.pyi
deleted file mode 100644
index f74950c90..000000000
--- a/com/sun/star/awt/VisualEffect.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.visual_effect import *
diff --git a/com/sun/star/_pyi/awt/visual_effect.pyi b/com/sun/star/awt/VisualEffect/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/visual_effect.pyi
rename to com/sun/star/awt/VisualEffect/__init__.pyi
diff --git a/com/sun/star/awt/WindowAttribute.pyi b/com/sun/star/awt/WindowAttribute.pyi
deleted file mode 100644
index 04b993373..000000000
--- a/com/sun/star/awt/WindowAttribute.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.window_attribute import *
diff --git a/com/sun/star/_pyi/awt/window_attribute.pyi b/com/sun/star/awt/WindowAttribute/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/window_attribute.pyi
rename to com/sun/star/awt/WindowAttribute/__init__.pyi
diff --git a/com/sun/star/awt/WindowClass.pyi b/com/sun/star/awt/WindowClass.pyi
deleted file mode 100644
index 9201a4e2d..000000000
--- a/com/sun/star/awt/WindowClass.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.awt.window_class import *
diff --git a/com/sun/star/_pyi/awt/window_class.pyi b/com/sun/star/awt/WindowClass/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/awt/window_class.pyi
rename to com/sun/star/awt/WindowClass/__init__.pyi
diff --git a/com/sun/star/beans/MethodConcept.pyi b/com/sun/star/beans/MethodConcept.pyi
deleted file mode 100644
index 73470014c..000000000
--- a/com/sun/star/beans/MethodConcept.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.beans.method_concept import *
diff --git a/com/sun/star/_pyi/beans/method_concept.pyi b/com/sun/star/beans/MethodConcept/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/beans/method_concept.pyi
rename to com/sun/star/beans/MethodConcept/__init__.pyi
diff --git a/com/sun/star/beans/PropertyAttribute.pyi b/com/sun/star/beans/PropertyAttribute.pyi
deleted file mode 100644
index a4c50bce0..000000000
--- a/com/sun/star/beans/PropertyAttribute.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.beans.property_attribute import *
diff --git a/com/sun/star/_pyi/beans/property_attribute.pyi b/com/sun/star/beans/PropertyAttribute/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/beans/property_attribute.pyi
rename to com/sun/star/beans/PropertyAttribute/__init__.pyi
diff --git a/com/sun/star/beans/PropertyConcept.pyi b/com/sun/star/beans/PropertyConcept.pyi
deleted file mode 100644
index 4a557524d..000000000
--- a/com/sun/star/beans/PropertyConcept.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.beans.property_concept import *
diff --git a/com/sun/star/_pyi/beans/property_concept.pyi b/com/sun/star/beans/PropertyConcept/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/beans/property_concept.pyi
rename to com/sun/star/beans/PropertyConcept/__init__.pyi
diff --git a/com/sun/star/beans/PropertySetInfoChange.pyi b/com/sun/star/beans/PropertySetInfoChange.pyi
deleted file mode 100644
index 48aafc98e..000000000
--- a/com/sun/star/beans/PropertySetInfoChange.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.beans.property_set_info_change import *
diff --git a/com/sun/star/_pyi/beans/property_set_info_change.pyi b/com/sun/star/beans/PropertySetInfoChange/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/beans/property_set_info_change.pyi
rename to com/sun/star/beans/PropertySetInfoChange/__init__.pyi
diff --git a/com/sun/star/beans/PropertyState.pyi b/com/sun/star/beans/PropertyState.pyi
deleted file mode 100644
index 75b2f4b72..000000000
--- a/com/sun/star/beans/PropertyState.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.beans.property_state import *
diff --git a/com/sun/star/_pyi/beans/property_state.pyi b/com/sun/star/beans/PropertyState/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/beans/property_state.pyi
rename to com/sun/star/beans/PropertyState/__init__.pyi
diff --git a/com/sun/star/beans/TolerantPropertySetResultType.pyi b/com/sun/star/beans/TolerantPropertySetResultType.pyi
deleted file mode 100644
index fcb842d82..000000000
--- a/com/sun/star/beans/TolerantPropertySetResultType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.beans.tolerant_property_set_result_type import *
diff --git a/com/sun/star/_pyi/beans/tolerant_property_set_result_type.pyi b/com/sun/star/beans/TolerantPropertySetResultType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/beans/tolerant_property_set_result_type.pyi
rename to com/sun/star/beans/TolerantPropertySetResultType/__init__.pyi
diff --git a/com/sun/star/bridge/ModelDependent.pyi b/com/sun/star/bridge/ModelDependent.pyi
deleted file mode 100644
index 3b0bf1ad8..000000000
--- a/com/sun/star/bridge/ModelDependent.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.bridge.model_dependent import *
diff --git a/com/sun/star/_pyi/bridge/model_dependent.pyi b/com/sun/star/bridge/ModelDependent/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/bridge/model_dependent.pyi
rename to com/sun/star/bridge/ModelDependent/__init__.pyi
diff --git a/com/sun/star/chart/ChartAxisArrangeOrderType.pyi b/com/sun/star/chart/ChartAxisArrangeOrderType.pyi
deleted file mode 100644
index 7af241f72..000000000
--- a/com/sun/star/chart/ChartAxisArrangeOrderType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart.chart_axis_arrange_order_type import *
diff --git a/com/sun/star/_pyi/chart/chart_axis_arrange_order_type.pyi b/com/sun/star/chart/ChartAxisArrangeOrderType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart/chart_axis_arrange_order_type.pyi
rename to com/sun/star/chart/ChartAxisArrangeOrderType/__init__.pyi
diff --git a/com/sun/star/chart/ChartAxisAssign.pyi b/com/sun/star/chart/ChartAxisAssign.pyi
deleted file mode 100644
index 908e85954..000000000
--- a/com/sun/star/chart/ChartAxisAssign.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart.chart_axis_assign import *
diff --git a/com/sun/star/_pyi/chart/chart_axis_assign.pyi b/com/sun/star/chart/ChartAxisAssign/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart/chart_axis_assign.pyi
rename to com/sun/star/chart/ChartAxisAssign/__init__.pyi
diff --git a/com/sun/star/chart/ChartAxisLabelPosition.pyi b/com/sun/star/chart/ChartAxisLabelPosition.pyi
deleted file mode 100644
index 925b6e032..000000000
--- a/com/sun/star/chart/ChartAxisLabelPosition.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart.chart_axis_label_position import *
diff --git a/com/sun/star/_pyi/chart/chart_axis_label_position.pyi b/com/sun/star/chart/ChartAxisLabelPosition/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart/chart_axis_label_position.pyi
rename to com/sun/star/chart/ChartAxisLabelPosition/__init__.pyi
diff --git a/com/sun/star/chart/ChartAxisMarkPosition.pyi b/com/sun/star/chart/ChartAxisMarkPosition.pyi
deleted file mode 100644
index 20c135d9b..000000000
--- a/com/sun/star/chart/ChartAxisMarkPosition.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart.chart_axis_mark_position import *
diff --git a/com/sun/star/_pyi/chart/chart_axis_mark_position.pyi b/com/sun/star/chart/ChartAxisMarkPosition/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart/chart_axis_mark_position.pyi
rename to com/sun/star/chart/ChartAxisMarkPosition/__init__.pyi
diff --git a/com/sun/star/chart/ChartAxisMarks.pyi b/com/sun/star/chart/ChartAxisMarks.pyi
deleted file mode 100644
index e64ea3ee9..000000000
--- a/com/sun/star/chart/ChartAxisMarks.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart.chart_axis_marks import *
diff --git a/com/sun/star/_pyi/chart/chart_axis_marks.pyi b/com/sun/star/chart/ChartAxisMarks/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart/chart_axis_marks.pyi
rename to com/sun/star/chart/ChartAxisMarks/__init__.pyi
diff --git a/com/sun/star/chart/ChartAxisPosition.pyi b/com/sun/star/chart/ChartAxisPosition.pyi
deleted file mode 100644
index ddcff9ee5..000000000
--- a/com/sun/star/chart/ChartAxisPosition.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart.chart_axis_position import *
diff --git a/com/sun/star/_pyi/chart/chart_axis_position.pyi b/com/sun/star/chart/ChartAxisPosition/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart/chart_axis_position.pyi
rename to com/sun/star/chart/ChartAxisPosition/__init__.pyi
diff --git a/com/sun/star/chart/ChartAxisType.pyi b/com/sun/star/chart/ChartAxisType.pyi
deleted file mode 100644
index 447cfabdd..000000000
--- a/com/sun/star/chart/ChartAxisType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart.chart_axis_type import *
diff --git a/com/sun/star/_pyi/chart/chart_axis_type.pyi b/com/sun/star/chart/ChartAxisType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart/chart_axis_type.pyi
rename to com/sun/star/chart/ChartAxisType/__init__.pyi
diff --git a/com/sun/star/chart/ChartDataCaption.pyi b/com/sun/star/chart/ChartDataCaption.pyi
deleted file mode 100644
index 366330b2c..000000000
--- a/com/sun/star/chart/ChartDataCaption.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart.chart_data_caption import *
diff --git a/com/sun/star/_pyi/chart/chart_data_caption.pyi b/com/sun/star/chart/ChartDataCaption/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart/chart_data_caption.pyi
rename to com/sun/star/chart/ChartDataCaption/__init__.pyi
diff --git a/com/sun/star/chart/ChartDataChangeType.pyi b/com/sun/star/chart/ChartDataChangeType.pyi
deleted file mode 100644
index c7ef42d61..000000000
--- a/com/sun/star/chart/ChartDataChangeType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart.chart_data_change_type import *
diff --git a/com/sun/star/_pyi/chart/chart_data_change_type.pyi b/com/sun/star/chart/ChartDataChangeType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart/chart_data_change_type.pyi
rename to com/sun/star/chart/ChartDataChangeType/__init__.pyi
diff --git a/com/sun/star/chart/ChartDataRowSource.pyi b/com/sun/star/chart/ChartDataRowSource.pyi
deleted file mode 100644
index 780c68999..000000000
--- a/com/sun/star/chart/ChartDataRowSource.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart.chart_data_row_source import *
diff --git a/com/sun/star/_pyi/chart/chart_data_row_source.pyi b/com/sun/star/chart/ChartDataRowSource/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart/chart_data_row_source.pyi
rename to com/sun/star/chart/ChartDataRowSource/__init__.pyi
diff --git a/com/sun/star/chart/ChartErrorCategory.pyi b/com/sun/star/chart/ChartErrorCategory.pyi
deleted file mode 100644
index b1b7c5f4a..000000000
--- a/com/sun/star/chart/ChartErrorCategory.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart.chart_error_category import *
diff --git a/com/sun/star/_pyi/chart/chart_error_category.pyi b/com/sun/star/chart/ChartErrorCategory/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart/chart_error_category.pyi
rename to com/sun/star/chart/ChartErrorCategory/__init__.pyi
diff --git a/com/sun/star/chart/ChartErrorIndicatorType.pyi b/com/sun/star/chart/ChartErrorIndicatorType.pyi
deleted file mode 100644
index 842403bd7..000000000
--- a/com/sun/star/chart/ChartErrorIndicatorType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart.chart_error_indicator_type import *
diff --git a/com/sun/star/_pyi/chart/chart_error_indicator_type.pyi b/com/sun/star/chart/ChartErrorIndicatorType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart/chart_error_indicator_type.pyi
rename to com/sun/star/chart/ChartErrorIndicatorType/__init__.pyi
diff --git a/com/sun/star/chart/ChartLegendExpansion.pyi b/com/sun/star/chart/ChartLegendExpansion.pyi
deleted file mode 100644
index a9b67ad7f..000000000
--- a/com/sun/star/chart/ChartLegendExpansion.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart.chart_legend_expansion import *
diff --git a/com/sun/star/_pyi/chart/chart_legend_expansion.pyi b/com/sun/star/chart/ChartLegendExpansion/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart/chart_legend_expansion.pyi
rename to com/sun/star/chart/ChartLegendExpansion/__init__.pyi
diff --git a/com/sun/star/chart/ChartLegendPosition.pyi b/com/sun/star/chart/ChartLegendPosition.pyi
deleted file mode 100644
index 7d0257714..000000000
--- a/com/sun/star/chart/ChartLegendPosition.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart.chart_legend_position import *
diff --git a/com/sun/star/_pyi/chart/chart_legend_position.pyi b/com/sun/star/chart/ChartLegendPosition/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart/chart_legend_position.pyi
rename to com/sun/star/chart/ChartLegendPosition/__init__.pyi
diff --git a/com/sun/star/chart/ChartRegressionCurveType.pyi b/com/sun/star/chart/ChartRegressionCurveType.pyi
deleted file mode 100644
index 43f838095..000000000
--- a/com/sun/star/chart/ChartRegressionCurveType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart.chart_regression_curve_type import *
diff --git a/com/sun/star/_pyi/chart/chart_regression_curve_type.pyi b/com/sun/star/chart/ChartRegressionCurveType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart/chart_regression_curve_type.pyi
rename to com/sun/star/chart/ChartRegressionCurveType/__init__.pyi
diff --git a/com/sun/star/chart/ChartSolidType.pyi b/com/sun/star/chart/ChartSolidType.pyi
deleted file mode 100644
index b826763eb..000000000
--- a/com/sun/star/chart/ChartSolidType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart.chart_solid_type import *
diff --git a/com/sun/star/_pyi/chart/chart_solid_type.pyi b/com/sun/star/chart/ChartSolidType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart/chart_solid_type.pyi
rename to com/sun/star/chart/ChartSolidType/__init__.pyi
diff --git a/com/sun/star/chart/ChartSymbolType.pyi b/com/sun/star/chart/ChartSymbolType.pyi
deleted file mode 100644
index 66934575e..000000000
--- a/com/sun/star/chart/ChartSymbolType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart.chart_symbol_type import *
diff --git a/com/sun/star/_pyi/chart/chart_symbol_type.pyi b/com/sun/star/chart/ChartSymbolType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart/chart_symbol_type.pyi
rename to com/sun/star/chart/ChartSymbolType/__init__.pyi
diff --git a/com/sun/star/chart/DataLabelPlacement.pyi b/com/sun/star/chart/DataLabelPlacement.pyi
deleted file mode 100644
index c7e938482..000000000
--- a/com/sun/star/chart/DataLabelPlacement.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart.data_label_placement import *
diff --git a/com/sun/star/_pyi/chart/data_label_placement.pyi b/com/sun/star/chart/DataLabelPlacement/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart/data_label_placement.pyi
rename to com/sun/star/chart/DataLabelPlacement/__init__.pyi
diff --git a/com/sun/star/chart/ErrorBarStyle.pyi b/com/sun/star/chart/ErrorBarStyle.pyi
deleted file mode 100644
index 7275c3b99..000000000
--- a/com/sun/star/chart/ErrorBarStyle.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart.error_bar_style import *
diff --git a/com/sun/star/_pyi/chart/error_bar_style.pyi b/com/sun/star/chart/ErrorBarStyle/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart/error_bar_style.pyi
rename to com/sun/star/chart/ErrorBarStyle/__init__.pyi
diff --git a/com/sun/star/chart/MissingValueTreatment.pyi b/com/sun/star/chart/MissingValueTreatment.pyi
deleted file mode 100644
index 5e5db2874..000000000
--- a/com/sun/star/chart/MissingValueTreatment.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart.missing_value_treatment import *
diff --git a/com/sun/star/_pyi/chart/missing_value_treatment.pyi b/com/sun/star/chart/MissingValueTreatment/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart/missing_value_treatment.pyi
rename to com/sun/star/chart/MissingValueTreatment/__init__.pyi
diff --git a/com/sun/star/chart/TimeUnit.pyi b/com/sun/star/chart/TimeUnit.pyi
deleted file mode 100644
index 0428b7140..000000000
--- a/com/sun/star/chart/TimeUnit.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart.time_unit import *
diff --git a/com/sun/star/_pyi/chart/time_unit.pyi b/com/sun/star/chart/TimeUnit/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart/time_unit.pyi
rename to com/sun/star/chart/TimeUnit/__init__.pyi
diff --git a/com/sun/star/chart2/AxisOrientation.pyi b/com/sun/star/chart2/AxisOrientation.pyi
deleted file mode 100644
index f349b6e6c..000000000
--- a/com/sun/star/chart2/AxisOrientation.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart2.axis_orientation import *
diff --git a/com/sun/star/_pyi/chart2/axis_orientation.pyi b/com/sun/star/chart2/AxisOrientation/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart2/axis_orientation.pyi
rename to com/sun/star/chart2/AxisOrientation/__init__.pyi
diff --git a/com/sun/star/chart2/AxisType.pyi b/com/sun/star/chart2/AxisType.pyi
deleted file mode 100644
index 35c3b698b..000000000
--- a/com/sun/star/chart2/AxisType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart2.axis_type import *
diff --git a/com/sun/star/_pyi/chart2/axis_type.pyi b/com/sun/star/chart2/AxisType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart2/axis_type.pyi
rename to com/sun/star/chart2/AxisType/__init__.pyi
diff --git a/com/sun/star/chart2/CurveStyle.pyi b/com/sun/star/chart2/CurveStyle.pyi
deleted file mode 100644
index 988ed8ebf..000000000
--- a/com/sun/star/chart2/CurveStyle.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart2.curve_style import *
diff --git a/com/sun/star/_pyi/chart2/curve_style.pyi b/com/sun/star/chart2/CurveStyle/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart2/curve_style.pyi
rename to com/sun/star/chart2/CurveStyle/__init__.pyi
diff --git a/com/sun/star/chart2/DataPointCustomLabelFieldType.pyi b/com/sun/star/chart2/DataPointCustomLabelFieldType.pyi
deleted file mode 100644
index 00e571e9b..000000000
--- a/com/sun/star/chart2/DataPointCustomLabelFieldType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart2.data_point_custom_label_field_type import *
diff --git a/com/sun/star/_pyi/chart2/data_point_custom_label_field_type.pyi b/com/sun/star/chart2/DataPointCustomLabelFieldType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart2/data_point_custom_label_field_type.pyi
rename to com/sun/star/chart2/DataPointCustomLabelFieldType/__init__.pyi
diff --git a/com/sun/star/chart2/DataPointGeometry3D.pyi b/com/sun/star/chart2/DataPointGeometry3D.pyi
deleted file mode 100644
index 0d9163831..000000000
--- a/com/sun/star/chart2/DataPointGeometry3D.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart2.data_point_geometry3_d import *
diff --git a/com/sun/star/_pyi/chart2/data_point_geometry3_d.pyi b/com/sun/star/chart2/DataPointGeometry3D/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart2/data_point_geometry3_d.pyi
rename to com/sun/star/chart2/DataPointGeometry3D/__init__.pyi
diff --git a/com/sun/star/chart2/LegendPosition.pyi b/com/sun/star/chart2/LegendPosition.pyi
deleted file mode 100644
index f1d9fa7e5..000000000
--- a/com/sun/star/chart2/LegendPosition.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart2.legend_position import *
diff --git a/com/sun/star/_pyi/chart2/legend_position.pyi b/com/sun/star/chart2/LegendPosition/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart2/legend_position.pyi
rename to com/sun/star/chart2/LegendPosition/__init__.pyi
diff --git a/com/sun/star/chart2/MovingAverageType.pyi b/com/sun/star/chart2/MovingAverageType.pyi
deleted file mode 100644
index d9cb987df..000000000
--- a/com/sun/star/chart2/MovingAverageType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart2.moving_average_type import *
diff --git a/com/sun/star/_pyi/chart2/moving_average_type.pyi b/com/sun/star/chart2/MovingAverageType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart2/moving_average_type.pyi
rename to com/sun/star/chart2/MovingAverageType/__init__.pyi
diff --git a/com/sun/star/chart2/PieChartOffsetMode.pyi b/com/sun/star/chart2/PieChartOffsetMode.pyi
deleted file mode 100644
index f23919598..000000000
--- a/com/sun/star/chart2/PieChartOffsetMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart2.pie_chart_offset_mode import *
diff --git a/com/sun/star/_pyi/chart2/pie_chart_offset_mode.pyi b/com/sun/star/chart2/PieChartOffsetMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart2/pie_chart_offset_mode.pyi
rename to com/sun/star/chart2/PieChartOffsetMode/__init__.pyi
diff --git a/com/sun/star/chart2/StackingDirection.pyi b/com/sun/star/chart2/StackingDirection.pyi
deleted file mode 100644
index 791219b58..000000000
--- a/com/sun/star/chart2/StackingDirection.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart2.stacking_direction import *
diff --git a/com/sun/star/_pyi/chart2/stacking_direction.pyi b/com/sun/star/chart2/StackingDirection/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart2/stacking_direction.pyi
rename to com/sun/star/chart2/StackingDirection/__init__.pyi
diff --git a/com/sun/star/chart2/SymbolStyle.pyi b/com/sun/star/chart2/SymbolStyle.pyi
deleted file mode 100644
index 09e6abfc4..000000000
--- a/com/sun/star/chart2/SymbolStyle.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart2.symbol_style import *
diff --git a/com/sun/star/_pyi/chart2/symbol_style.pyi b/com/sun/star/chart2/SymbolStyle/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart2/symbol_style.pyi
rename to com/sun/star/chart2/SymbolStyle/__init__.pyi
diff --git a/com/sun/star/chart2/TickmarkStyle.pyi b/com/sun/star/chart2/TickmarkStyle.pyi
deleted file mode 100644
index 4ec6dcff5..000000000
--- a/com/sun/star/chart2/TickmarkStyle.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart2.tickmark_style import *
diff --git a/com/sun/star/_pyi/chart2/tickmark_style.pyi b/com/sun/star/chart2/TickmarkStyle/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart2/tickmark_style.pyi
rename to com/sun/star/chart2/TickmarkStyle/__init__.pyi
diff --git a/com/sun/star/chart2/TransparencyStyle.pyi b/com/sun/star/chart2/TransparencyStyle.pyi
deleted file mode 100644
index 06a3acbe3..000000000
--- a/com/sun/star/chart2/TransparencyStyle.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.chart2.transparency_style import *
diff --git a/com/sun/star/_pyi/chart2/transparency_style.pyi b/com/sun/star/chart2/TransparencyStyle/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart2/transparency_style.pyi
rename to com/sun/star/chart2/TransparencyStyle/__init__.pyi
diff --git a/com/sun/star/chart2/data/LabelOrigin.pyi b/com/sun/star/chart2/data/LabelOrigin.pyi
deleted file mode 100644
index c5647ab30..000000000
--- a/com/sun/star/chart2/data/LabelOrigin.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.chart2.data.label_origin import *
diff --git a/com/sun/star/_pyi/chart2/data/label_origin.pyi b/com/sun/star/chart2/data/LabelOrigin/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/chart2/data/label_origin.pyi
rename to com/sun/star/chart2/data/LabelOrigin/__init__.pyi
diff --git a/com/sun/star/configuration/backend/NodeAttribute.pyi b/com/sun/star/configuration/backend/NodeAttribute.pyi
deleted file mode 100644
index 7a4541925..000000000
--- a/com/sun/star/configuration/backend/NodeAttribute.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.configuration.backend.node_attribute import *
diff --git a/com/sun/star/_pyi/configuration/backend/node_attribute.pyi b/com/sun/star/configuration/backend/NodeAttribute/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/configuration/backend/node_attribute.pyi
rename to com/sun/star/configuration/backend/NodeAttribute/__init__.pyi
diff --git a/com/sun/star/configuration/backend/SchemaAttribute.pyi b/com/sun/star/configuration/backend/SchemaAttribute.pyi
deleted file mode 100644
index cf89da16a..000000000
--- a/com/sun/star/configuration/backend/SchemaAttribute.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.configuration.backend.schema_attribute import *
diff --git a/com/sun/star/_pyi/configuration/backend/schema_attribute.pyi b/com/sun/star/configuration/backend/SchemaAttribute/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/configuration/backend/schema_attribute.pyi
rename to com/sun/star/configuration/backend/SchemaAttribute/__init__.pyi
diff --git a/com/sun/star/datatransfer/clipboard/RenderingCapabilities.pyi b/com/sun/star/datatransfer/clipboard/RenderingCapabilities.pyi
deleted file mode 100644
index 91fd0e389..000000000
--- a/com/sun/star/datatransfer/clipboard/RenderingCapabilities.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.datatransfer.clipboard.rendering_capabilities import *
diff --git a/com/sun/star/_pyi/datatransfer/clipboard/rendering_capabilities.pyi b/com/sun/star/datatransfer/clipboard/RenderingCapabilities/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/datatransfer/clipboard/rendering_capabilities.pyi
rename to com/sun/star/datatransfer/clipboard/RenderingCapabilities/__init__.pyi
diff --git a/com/sun/star/datatransfer/dnd/DNDConstants.pyi b/com/sun/star/datatransfer/dnd/DNDConstants.pyi
deleted file mode 100644
index ae193400f..000000000
--- a/com/sun/star/datatransfer/dnd/DNDConstants.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.datatransfer.dnd.dnd_constants import *
diff --git a/com/sun/star/_pyi/datatransfer/dnd/dnd_constants.pyi b/com/sun/star/datatransfer/dnd/DNDConstants/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/datatransfer/dnd/dnd_constants.pyi
rename to com/sun/star/datatransfer/dnd/DNDConstants/__init__.pyi
diff --git a/com/sun/star/deployment/Prerequisites.pyi b/com/sun/star/deployment/Prerequisites.pyi
deleted file mode 100644
index 8c3a36809..000000000
--- a/com/sun/star/deployment/Prerequisites.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.deployment.prerequisites import *
diff --git a/com/sun/star/_pyi/deployment/prerequisites.pyi b/com/sun/star/deployment/Prerequisites/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/deployment/prerequisites.pyi
rename to com/sun/star/deployment/Prerequisites/__init__.pyi
diff --git a/com/sun/star/document/LinkUpdateModes.pyi b/com/sun/star/document/LinkUpdateModes.pyi
deleted file mode 100644
index 0d934058f..000000000
--- a/com/sun/star/document/LinkUpdateModes.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.document.link_update_modes import *
diff --git a/com/sun/star/_pyi/document/link_update_modes.pyi b/com/sun/star/document/LinkUpdateModes/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/document/link_update_modes.pyi
rename to com/sun/star/document/LinkUpdateModes/__init__.pyi
diff --git a/com/sun/star/document/MacroExecMode.pyi b/com/sun/star/document/MacroExecMode.pyi
deleted file mode 100644
index 6fd9a9b62..000000000
--- a/com/sun/star/document/MacroExecMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.document.macro_exec_mode import *
diff --git a/com/sun/star/_pyi/document/macro_exec_mode.pyi b/com/sun/star/document/MacroExecMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/document/macro_exec_mode.pyi
rename to com/sun/star/document/MacroExecMode/__init__.pyi
diff --git a/com/sun/star/document/PrinterIndependentLayout.pyi b/com/sun/star/document/PrinterIndependentLayout.pyi
deleted file mode 100644
index 93857c2d9..000000000
--- a/com/sun/star/document/PrinterIndependentLayout.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.document.printer_independent_layout import *
diff --git a/com/sun/star/_pyi/document/printer_independent_layout.pyi b/com/sun/star/document/PrinterIndependentLayout/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/document/printer_independent_layout.pyi
rename to com/sun/star/document/PrinterIndependentLayout/__init__.pyi
diff --git a/com/sun/star/document/RedlineDisplayType.pyi b/com/sun/star/document/RedlineDisplayType.pyi
deleted file mode 100644
index db8166185..000000000
--- a/com/sun/star/document/RedlineDisplayType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.document.redline_display_type import *
diff --git a/com/sun/star/_pyi/document/redline_display_type.pyi b/com/sun/star/document/RedlineDisplayType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/document/redline_display_type.pyi
rename to com/sun/star/document/RedlineDisplayType/__init__.pyi
diff --git a/com/sun/star/document/UpdateDocMode.pyi b/com/sun/star/document/UpdateDocMode.pyi
deleted file mode 100644
index 1f0c468da..000000000
--- a/com/sun/star/document/UpdateDocMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.document.update_doc_mode import *
diff --git a/com/sun/star/_pyi/document/update_doc_mode.pyi b/com/sun/star/document/UpdateDocMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/document/update_doc_mode.pyi
rename to com/sun/star/document/UpdateDocMode/__init__.pyi
diff --git a/com/sun/star/drawing/Alignment.pyi b/com/sun/star/drawing/Alignment.pyi
deleted file mode 100644
index bca139abb..000000000
--- a/com/sun/star/drawing/Alignment.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.alignment import *
diff --git a/com/sun/star/_pyi/drawing/alignment.pyi b/com/sun/star/drawing/Alignment/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/alignment.pyi
rename to com/sun/star/drawing/Alignment/__init__.pyi
diff --git a/com/sun/star/drawing/Arrangement.pyi b/com/sun/star/drawing/Arrangement.pyi
deleted file mode 100644
index 897d1fe21..000000000
--- a/com/sun/star/drawing/Arrangement.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.arrangement import *
diff --git a/com/sun/star/_pyi/drawing/arrangement.pyi b/com/sun/star/drawing/Arrangement/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/arrangement.pyi
rename to com/sun/star/drawing/Arrangement/__init__.pyi
diff --git a/com/sun/star/drawing/BarCodeErrorCorrection.pyi b/com/sun/star/drawing/BarCodeErrorCorrection.pyi
deleted file mode 100644
index 0ebad9b88..000000000
--- a/com/sun/star/drawing/BarCodeErrorCorrection.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.bar_code_error_correction import *
diff --git a/com/sun/star/_pyi/drawing/bar_code_error_correction.pyi b/com/sun/star/drawing/BarCodeErrorCorrection/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/bar_code_error_correction.pyi
rename to com/sun/star/drawing/BarCodeErrorCorrection/__init__.pyi
diff --git a/com/sun/star/drawing/BitmapMode.pyi b/com/sun/star/drawing/BitmapMode.pyi
deleted file mode 100644
index f58d15b20..000000000
--- a/com/sun/star/drawing/BitmapMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.bitmap_mode import *
diff --git a/com/sun/star/_pyi/drawing/bitmap_mode.pyi b/com/sun/star/drawing/BitmapMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/bitmap_mode.pyi
rename to com/sun/star/drawing/BitmapMode/__init__.pyi
diff --git a/com/sun/star/drawing/CanvasFeature.pyi b/com/sun/star/drawing/CanvasFeature.pyi
deleted file mode 100644
index d2e605fc7..000000000
--- a/com/sun/star/drawing/CanvasFeature.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.canvas_feature import *
diff --git a/com/sun/star/_pyi/drawing/canvas_feature.pyi b/com/sun/star/drawing/CanvasFeature/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/canvas_feature.pyi
rename to com/sun/star/drawing/CanvasFeature/__init__.pyi
diff --git a/com/sun/star/drawing/CaptionEscapeDirection.pyi b/com/sun/star/drawing/CaptionEscapeDirection.pyi
deleted file mode 100644
index a7573ead6..000000000
--- a/com/sun/star/drawing/CaptionEscapeDirection.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.caption_escape_direction import *
diff --git a/com/sun/star/_pyi/drawing/caption_escape_direction.pyi b/com/sun/star/drawing/CaptionEscapeDirection/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/caption_escape_direction.pyi
rename to com/sun/star/drawing/CaptionEscapeDirection/__init__.pyi
diff --git a/com/sun/star/drawing/CaptionType.pyi b/com/sun/star/drawing/CaptionType.pyi
deleted file mode 100644
index acc6dfc08..000000000
--- a/com/sun/star/drawing/CaptionType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.caption_type import *
diff --git a/com/sun/star/_pyi/drawing/caption_type.pyi b/com/sun/star/drawing/CaptionType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/caption_type.pyi
rename to com/sun/star/drawing/CaptionType/__init__.pyi
diff --git a/com/sun/star/drawing/CircleKind.pyi b/com/sun/star/drawing/CircleKind.pyi
deleted file mode 100644
index 548f78b2f..000000000
--- a/com/sun/star/drawing/CircleKind.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.circle_kind import *
diff --git a/com/sun/star/_pyi/drawing/circle_kind.pyi b/com/sun/star/drawing/CircleKind/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/circle_kind.pyi
rename to com/sun/star/drawing/CircleKind/__init__.pyi
diff --git a/com/sun/star/drawing/ColorMode.pyi b/com/sun/star/drawing/ColorMode.pyi
deleted file mode 100644
index 840f079f9..000000000
--- a/com/sun/star/drawing/ColorMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.color_mode import *
diff --git a/com/sun/star/_pyi/drawing/color_mode.pyi b/com/sun/star/drawing/ColorMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/color_mode.pyi
rename to com/sun/star/drawing/ColorMode/__init__.pyi
diff --git a/com/sun/star/drawing/ConnectionType.pyi b/com/sun/star/drawing/ConnectionType.pyi
deleted file mode 100644
index bb1987ca9..000000000
--- a/com/sun/star/drawing/ConnectionType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.connection_type import *
diff --git a/com/sun/star/_pyi/drawing/connection_type.pyi b/com/sun/star/drawing/ConnectionType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/connection_type.pyi
rename to com/sun/star/drawing/ConnectionType/__init__.pyi
diff --git a/com/sun/star/drawing/ConnectorType.pyi b/com/sun/star/drawing/ConnectorType.pyi
deleted file mode 100644
index 8d795d30e..000000000
--- a/com/sun/star/drawing/ConnectorType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.connector_type import *
diff --git a/com/sun/star/_pyi/drawing/connector_type.pyi b/com/sun/star/drawing/ConnectorType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/connector_type.pyi
rename to com/sun/star/drawing/ConnectorType/__init__.pyi
diff --git a/com/sun/star/drawing/DashStyle.pyi b/com/sun/star/drawing/DashStyle.pyi
deleted file mode 100644
index f774c265b..000000000
--- a/com/sun/star/drawing/DashStyle.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.dash_style import *
diff --git a/com/sun/star/_pyi/drawing/dash_style.pyi b/com/sun/star/drawing/DashStyle/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/dash_style.pyi
rename to com/sun/star/drawing/DashStyle/__init__.pyi
diff --git a/com/sun/star/drawing/DrawViewMode.pyi b/com/sun/star/drawing/DrawViewMode.pyi
deleted file mode 100644
index d3f07c8d4..000000000
--- a/com/sun/star/drawing/DrawViewMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.draw_view_mode import *
diff --git a/com/sun/star/_pyi/drawing/draw_view_mode.pyi b/com/sun/star/drawing/DrawViewMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/draw_view_mode.pyi
rename to com/sun/star/drawing/DrawViewMode/__init__.pyi
diff --git a/com/sun/star/drawing/EnhancedCustomShapeGluePointType.pyi b/com/sun/star/drawing/EnhancedCustomShapeGluePointType.pyi
deleted file mode 100644
index 8b2aac668..000000000
--- a/com/sun/star/drawing/EnhancedCustomShapeGluePointType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.enhanced_custom_shape_glue_point_type import *
diff --git a/com/sun/star/_pyi/drawing/enhanced_custom_shape_glue_point_type.pyi b/com/sun/star/drawing/EnhancedCustomShapeGluePointType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/enhanced_custom_shape_glue_point_type.pyi
rename to com/sun/star/drawing/EnhancedCustomShapeGluePointType/__init__.pyi
diff --git a/com/sun/star/drawing/EnhancedCustomShapeParameterType.pyi b/com/sun/star/drawing/EnhancedCustomShapeParameterType.pyi
deleted file mode 100644
index a7f0aae28..000000000
--- a/com/sun/star/drawing/EnhancedCustomShapeParameterType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.enhanced_custom_shape_parameter_type import *
diff --git a/com/sun/star/_pyi/drawing/enhanced_custom_shape_parameter_type.pyi b/com/sun/star/drawing/EnhancedCustomShapeParameterType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/enhanced_custom_shape_parameter_type.pyi
rename to com/sun/star/drawing/EnhancedCustomShapeParameterType/__init__.pyi
diff --git a/com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.pyi b/com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.pyi
deleted file mode 100644
index 29bea0aec..000000000
--- a/com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.enhanced_custom_shape_segment_command import *
diff --git a/com/sun/star/_pyi/drawing/enhanced_custom_shape_segment_command.pyi b/com/sun/star/drawing/EnhancedCustomShapeSegmentCommand/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/enhanced_custom_shape_segment_command.pyi
rename to com/sun/star/drawing/EnhancedCustomShapeSegmentCommand/__init__.pyi
diff --git a/com/sun/star/drawing/EnhancedCustomShapeTextPathMode.pyi b/com/sun/star/drawing/EnhancedCustomShapeTextPathMode.pyi
deleted file mode 100644
index f5eddaac7..000000000
--- a/com/sun/star/drawing/EnhancedCustomShapeTextPathMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.enhanced_custom_shape_text_path_mode import *
diff --git a/com/sun/star/_pyi/drawing/enhanced_custom_shape_text_path_mode.pyi b/com/sun/star/drawing/EnhancedCustomShapeTextPathMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/enhanced_custom_shape_text_path_mode.pyi
rename to com/sun/star/drawing/EnhancedCustomShapeTextPathMode/__init__.pyi
diff --git a/com/sun/star/drawing/EscapeDirection.pyi b/com/sun/star/drawing/EscapeDirection.pyi
deleted file mode 100644
index 7d3e42bd9..000000000
--- a/com/sun/star/drawing/EscapeDirection.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.escape_direction import *
diff --git a/com/sun/star/_pyi/drawing/escape_direction.pyi b/com/sun/star/drawing/EscapeDirection/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/escape_direction.pyi
rename to com/sun/star/drawing/EscapeDirection/__init__.pyi
diff --git a/com/sun/star/drawing/FillStyle.pyi b/com/sun/star/drawing/FillStyle.pyi
deleted file mode 100644
index 587411ab6..000000000
--- a/com/sun/star/drawing/FillStyle.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.fill_style import *
diff --git a/com/sun/star/_pyi/drawing/fill_style.pyi b/com/sun/star/drawing/FillStyle/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/fill_style.pyi
rename to com/sun/star/drawing/FillStyle/__init__.pyi
diff --git a/com/sun/star/drawing/HatchStyle.pyi b/com/sun/star/drawing/HatchStyle.pyi
deleted file mode 100644
index 926c45cd7..000000000
--- a/com/sun/star/drawing/HatchStyle.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.hatch_style import *
diff --git a/com/sun/star/_pyi/drawing/hatch_style.pyi b/com/sun/star/drawing/HatchStyle/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/hatch_style.pyi
rename to com/sun/star/drawing/HatchStyle/__init__.pyi
diff --git a/com/sun/star/drawing/HorizontalDimensioning.pyi b/com/sun/star/drawing/HorizontalDimensioning.pyi
deleted file mode 100644
index a5d8d2ccb..000000000
--- a/com/sun/star/drawing/HorizontalDimensioning.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.horizontal_dimensioning import *
diff --git a/com/sun/star/_pyi/drawing/horizontal_dimensioning.pyi b/com/sun/star/drawing/HorizontalDimensioning/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/horizontal_dimensioning.pyi
rename to com/sun/star/drawing/HorizontalDimensioning/__init__.pyi
diff --git a/com/sun/star/drawing/LayerType.pyi b/com/sun/star/drawing/LayerType.pyi
deleted file mode 100644
index 10f175610..000000000
--- a/com/sun/star/drawing/LayerType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.layer_type import *
diff --git a/com/sun/star/_pyi/drawing/layer_type.pyi b/com/sun/star/drawing/LayerType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/layer_type.pyi
rename to com/sun/star/drawing/LayerType/__init__.pyi
diff --git a/com/sun/star/drawing/LineCap.pyi b/com/sun/star/drawing/LineCap.pyi
deleted file mode 100644
index 0ed3826c9..000000000
--- a/com/sun/star/drawing/LineCap.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.line_cap import *
diff --git a/com/sun/star/_pyi/drawing/line_cap.pyi b/com/sun/star/drawing/LineCap/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/line_cap.pyi
rename to com/sun/star/drawing/LineCap/__init__.pyi
diff --git a/com/sun/star/drawing/LineEndType.pyi b/com/sun/star/drawing/LineEndType.pyi
deleted file mode 100644
index 85c8b7b95..000000000
--- a/com/sun/star/drawing/LineEndType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.line_end_type import *
diff --git a/com/sun/star/_pyi/drawing/line_end_type.pyi b/com/sun/star/drawing/LineEndType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/line_end_type.pyi
rename to com/sun/star/drawing/LineEndType/__init__.pyi
diff --git a/com/sun/star/drawing/LineJoint.pyi b/com/sun/star/drawing/LineJoint.pyi
deleted file mode 100644
index 51278935b..000000000
--- a/com/sun/star/drawing/LineJoint.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.line_joint import *
diff --git a/com/sun/star/_pyi/drawing/line_joint.pyi b/com/sun/star/drawing/LineJoint/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/line_joint.pyi
rename to com/sun/star/drawing/LineJoint/__init__.pyi
diff --git a/com/sun/star/drawing/LineStyle.pyi b/com/sun/star/drawing/LineStyle.pyi
deleted file mode 100644
index ca0208b24..000000000
--- a/com/sun/star/drawing/LineStyle.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.line_style import *
diff --git a/com/sun/star/_pyi/drawing/line_style.pyi b/com/sun/star/drawing/LineStyle/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/line_style.pyi
rename to com/sun/star/drawing/LineStyle/__init__.pyi
diff --git a/com/sun/star/drawing/MeasureKind.pyi b/com/sun/star/drawing/MeasureKind.pyi
deleted file mode 100644
index cbf2b2b83..000000000
--- a/com/sun/star/drawing/MeasureKind.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.measure_kind import *
diff --git a/com/sun/star/_pyi/drawing/measure_kind.pyi b/com/sun/star/drawing/MeasureKind/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/measure_kind.pyi
rename to com/sun/star/drawing/MeasureKind/__init__.pyi
diff --git a/com/sun/star/drawing/MeasureTextHorzPos.pyi b/com/sun/star/drawing/MeasureTextHorzPos.pyi
deleted file mode 100644
index ebbc9cecf..000000000
--- a/com/sun/star/drawing/MeasureTextHorzPos.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.measure_text_horz_pos import *
diff --git a/com/sun/star/_pyi/drawing/measure_text_horz_pos.pyi b/com/sun/star/drawing/MeasureTextHorzPos/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/measure_text_horz_pos.pyi
rename to com/sun/star/drawing/MeasureTextHorzPos/__init__.pyi
diff --git a/com/sun/star/drawing/MeasureTextVertPos.pyi b/com/sun/star/drawing/MeasureTextVertPos.pyi
deleted file mode 100644
index 687624541..000000000
--- a/com/sun/star/drawing/MeasureTextVertPos.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.measure_text_vert_pos import *
diff --git a/com/sun/star/_pyi/drawing/measure_text_vert_pos.pyi b/com/sun/star/drawing/MeasureTextVertPos/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/measure_text_vert_pos.pyi
rename to com/sun/star/drawing/MeasureTextVertPos/__init__.pyi
diff --git a/com/sun/star/drawing/MirrorAxis.pyi b/com/sun/star/drawing/MirrorAxis.pyi
deleted file mode 100644
index acc80606d..000000000
--- a/com/sun/star/drawing/MirrorAxis.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.mirror_axis import *
diff --git a/com/sun/star/_pyi/drawing/mirror_axis.pyi b/com/sun/star/drawing/MirrorAxis/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/mirror_axis.pyi
rename to com/sun/star/drawing/MirrorAxis/__init__.pyi
diff --git a/com/sun/star/drawing/NormalsKind.pyi b/com/sun/star/drawing/NormalsKind.pyi
deleted file mode 100644
index 2e165e0e8..000000000
--- a/com/sun/star/drawing/NormalsKind.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.normals_kind import *
diff --git a/com/sun/star/_pyi/drawing/normals_kind.pyi b/com/sun/star/drawing/NormalsKind/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/normals_kind.pyi
rename to com/sun/star/drawing/NormalsKind/__init__.pyi
diff --git a/com/sun/star/drawing/PolygonFlags.pyi b/com/sun/star/drawing/PolygonFlags.pyi
deleted file mode 100644
index 914dcf66a..000000000
--- a/com/sun/star/drawing/PolygonFlags.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.polygon_flags import *
diff --git a/com/sun/star/_pyi/drawing/polygon_flags.pyi b/com/sun/star/drawing/PolygonFlags/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/polygon_flags.pyi
rename to com/sun/star/drawing/PolygonFlags/__init__.pyi
diff --git a/com/sun/star/drawing/PolygonKind.pyi b/com/sun/star/drawing/PolygonKind.pyi
deleted file mode 100644
index fc1a00582..000000000
--- a/com/sun/star/drawing/PolygonKind.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.polygon_kind import *
diff --git a/com/sun/star/_pyi/drawing/polygon_kind.pyi b/com/sun/star/drawing/PolygonKind/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/polygon_kind.pyi
rename to com/sun/star/drawing/PolygonKind/__init__.pyi
diff --git a/com/sun/star/drawing/ProjectionMode.pyi b/com/sun/star/drawing/ProjectionMode.pyi
deleted file mode 100644
index 1d1ce1766..000000000
--- a/com/sun/star/drawing/ProjectionMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.projection_mode import *
diff --git a/com/sun/star/_pyi/drawing/projection_mode.pyi b/com/sun/star/drawing/ProjectionMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/projection_mode.pyi
rename to com/sun/star/drawing/ProjectionMode/__init__.pyi
diff --git a/com/sun/star/drawing/RectanglePoint.pyi b/com/sun/star/drawing/RectanglePoint.pyi
deleted file mode 100644
index 146c2711e..000000000
--- a/com/sun/star/drawing/RectanglePoint.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.rectangle_point import *
diff --git a/com/sun/star/_pyi/drawing/rectangle_point.pyi b/com/sun/star/drawing/RectanglePoint/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/rectangle_point.pyi
rename to com/sun/star/drawing/RectanglePoint/__init__.pyi
diff --git a/com/sun/star/drawing/ShadeMode.pyi b/com/sun/star/drawing/ShadeMode.pyi
deleted file mode 100644
index 4844c4205..000000000
--- a/com/sun/star/drawing/ShadeMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.shade_mode import *
diff --git a/com/sun/star/_pyi/drawing/shade_mode.pyi b/com/sun/star/drawing/ShadeMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/shade_mode.pyi
rename to com/sun/star/drawing/ShadeMode/__init__.pyi
diff --git a/com/sun/star/drawing/ShadingPattern.pyi b/com/sun/star/drawing/ShadingPattern.pyi
deleted file mode 100644
index 59da6b08e..000000000
--- a/com/sun/star/drawing/ShadingPattern.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.shading_pattern import *
diff --git a/com/sun/star/_pyi/drawing/shading_pattern.pyi b/com/sun/star/drawing/ShadingPattern/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/shading_pattern.pyi
rename to com/sun/star/drawing/ShadingPattern/__init__.pyi
diff --git a/com/sun/star/drawing/SnapObjectType.pyi b/com/sun/star/drawing/SnapObjectType.pyi
deleted file mode 100644
index 97ac3c4f3..000000000
--- a/com/sun/star/drawing/SnapObjectType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.snap_object_type import *
diff --git a/com/sun/star/_pyi/drawing/snap_object_type.pyi b/com/sun/star/drawing/SnapObjectType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/snap_object_type.pyi
rename to com/sun/star/drawing/SnapObjectType/__init__.pyi
diff --git a/com/sun/star/drawing/TextAdjust.pyi b/com/sun/star/drawing/TextAdjust.pyi
deleted file mode 100644
index 82dbdc4d2..000000000
--- a/com/sun/star/drawing/TextAdjust.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.text_adjust import *
diff --git a/com/sun/star/_pyi/drawing/text_adjust.pyi b/com/sun/star/drawing/TextAdjust/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/text_adjust.pyi
rename to com/sun/star/drawing/TextAdjust/__init__.pyi
diff --git a/com/sun/star/drawing/TextAnimationDirection.pyi b/com/sun/star/drawing/TextAnimationDirection.pyi
deleted file mode 100644
index 5fa455a85..000000000
--- a/com/sun/star/drawing/TextAnimationDirection.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.text_animation_direction import *
diff --git a/com/sun/star/_pyi/drawing/text_animation_direction.pyi b/com/sun/star/drawing/TextAnimationDirection/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/text_animation_direction.pyi
rename to com/sun/star/drawing/TextAnimationDirection/__init__.pyi
diff --git a/com/sun/star/drawing/TextAnimationKind.pyi b/com/sun/star/drawing/TextAnimationKind.pyi
deleted file mode 100644
index 743b0b635..000000000
--- a/com/sun/star/drawing/TextAnimationKind.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.text_animation_kind import *
diff --git a/com/sun/star/_pyi/drawing/text_animation_kind.pyi b/com/sun/star/drawing/TextAnimationKind/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/text_animation_kind.pyi
rename to com/sun/star/drawing/TextAnimationKind/__init__.pyi
diff --git a/com/sun/star/drawing/TextFitToSizeType.pyi b/com/sun/star/drawing/TextFitToSizeType.pyi
deleted file mode 100644
index aff260ca3..000000000
--- a/com/sun/star/drawing/TextFitToSizeType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.text_fit_to_size_type import *
diff --git a/com/sun/star/_pyi/drawing/text_fit_to_size_type.pyi b/com/sun/star/drawing/TextFitToSizeType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/text_fit_to_size_type.pyi
rename to com/sun/star/drawing/TextFitToSizeType/__init__.pyi
diff --git a/com/sun/star/drawing/TextHorizontalAdjust.pyi b/com/sun/star/drawing/TextHorizontalAdjust.pyi
deleted file mode 100644
index 804e6d502..000000000
--- a/com/sun/star/drawing/TextHorizontalAdjust.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.text_horizontal_adjust import *
diff --git a/com/sun/star/_pyi/drawing/text_horizontal_adjust.pyi b/com/sun/star/drawing/TextHorizontalAdjust/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/text_horizontal_adjust.pyi
rename to com/sun/star/drawing/TextHorizontalAdjust/__init__.pyi
diff --git a/com/sun/star/drawing/TextVerticalAdjust.pyi b/com/sun/star/drawing/TextVerticalAdjust.pyi
deleted file mode 100644
index b2f414f5b..000000000
--- a/com/sun/star/drawing/TextVerticalAdjust.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.text_vertical_adjust import *
diff --git a/com/sun/star/_pyi/drawing/text_vertical_adjust.pyi b/com/sun/star/drawing/TextVerticalAdjust/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/text_vertical_adjust.pyi
rename to com/sun/star/drawing/TextVerticalAdjust/__init__.pyi
diff --git a/com/sun/star/drawing/TextureKind.pyi b/com/sun/star/drawing/TextureKind.pyi
deleted file mode 100644
index 86f1e1c8f..000000000
--- a/com/sun/star/drawing/TextureKind.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.texture_kind import *
diff --git a/com/sun/star/_pyi/drawing/texture_kind.pyi b/com/sun/star/drawing/TextureKind/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/texture_kind.pyi
rename to com/sun/star/drawing/TextureKind/__init__.pyi
diff --git a/com/sun/star/drawing/TextureKind2.pyi b/com/sun/star/drawing/TextureKind2.pyi
deleted file mode 100644
index 2dc857cbe..000000000
--- a/com/sun/star/drawing/TextureKind2.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.texture_kind2 import *
diff --git a/com/sun/star/_pyi/drawing/texture_kind2.pyi b/com/sun/star/drawing/TextureKind2/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/texture_kind2.pyi
rename to com/sun/star/drawing/TextureKind2/__init__.pyi
diff --git a/com/sun/star/drawing/TextureMode.pyi b/com/sun/star/drawing/TextureMode.pyi
deleted file mode 100644
index 6599208a2..000000000
--- a/com/sun/star/drawing/TextureMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.texture_mode import *
diff --git a/com/sun/star/_pyi/drawing/texture_mode.pyi b/com/sun/star/drawing/TextureMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/texture_mode.pyi
rename to com/sun/star/drawing/TextureMode/__init__.pyi
diff --git a/com/sun/star/drawing/TextureProjectionMode.pyi b/com/sun/star/drawing/TextureProjectionMode.pyi
deleted file mode 100644
index b342cf25e..000000000
--- a/com/sun/star/drawing/TextureProjectionMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.texture_projection_mode import *
diff --git a/com/sun/star/_pyi/drawing/texture_projection_mode.pyi b/com/sun/star/drawing/TextureProjectionMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/texture_projection_mode.pyi
rename to com/sun/star/drawing/TextureProjectionMode/__init__.pyi
diff --git a/com/sun/star/drawing/VerticalDimensioning.pyi b/com/sun/star/drawing/VerticalDimensioning.pyi
deleted file mode 100644
index c159147a0..000000000
--- a/com/sun/star/drawing/VerticalDimensioning.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.drawing.vertical_dimensioning import *
diff --git a/com/sun/star/_pyi/drawing/vertical_dimensioning.pyi b/com/sun/star/drawing/VerticalDimensioning/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/vertical_dimensioning.pyi
rename to com/sun/star/drawing/VerticalDimensioning/__init__.pyi
diff --git a/com/sun/star/drawing/framework/AnchorBindingMode.pyi b/com/sun/star/drawing/framework/AnchorBindingMode.pyi
deleted file mode 100644
index 4d9844f7d..000000000
--- a/com/sun/star/drawing/framework/AnchorBindingMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.drawing.framework.anchor_binding_mode import *
diff --git a/com/sun/star/_pyi/drawing/framework/anchor_binding_mode.pyi b/com/sun/star/drawing/framework/AnchorBindingMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/framework/anchor_binding_mode.pyi
rename to com/sun/star/drawing/framework/AnchorBindingMode/__init__.pyi
diff --git a/com/sun/star/drawing/framework/BorderType.pyi b/com/sun/star/drawing/framework/BorderType.pyi
deleted file mode 100644
index ecb666bf3..000000000
--- a/com/sun/star/drawing/framework/BorderType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.drawing.framework.border_type import *
diff --git a/com/sun/star/_pyi/drawing/framework/border_type.pyi b/com/sun/star/drawing/framework/BorderType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/framework/border_type.pyi
rename to com/sun/star/drawing/framework/BorderType/__init__.pyi
diff --git a/com/sun/star/drawing/framework/ResourceActivationMode.pyi b/com/sun/star/drawing/framework/ResourceActivationMode.pyi
deleted file mode 100644
index 8ab55131c..000000000
--- a/com/sun/star/drawing/framework/ResourceActivationMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.drawing.framework.resource_activation_mode import *
diff --git a/com/sun/star/_pyi/drawing/framework/resource_activation_mode.pyi b/com/sun/star/drawing/framework/ResourceActivationMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/drawing/framework/resource_activation_mode.pyi
rename to com/sun/star/drawing/framework/ResourceActivationMode/__init__.pyi
diff --git a/com/sun/star/embed/Actions.pyi b/com/sun/star/embed/Actions.pyi
deleted file mode 100644
index aba490020..000000000
--- a/com/sun/star/embed/Actions.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.embed.actions import *
diff --git a/com/sun/star/_pyi/embed/actions.pyi b/com/sun/star/embed/Actions/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/embed/actions.pyi
rename to com/sun/star/embed/Actions/__init__.pyi
diff --git a/com/sun/star/embed/Aspects.pyi b/com/sun/star/embed/Aspects.pyi
deleted file mode 100644
index eb642d6bc..000000000
--- a/com/sun/star/embed/Aspects.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.embed.aspects import *
diff --git a/com/sun/star/_pyi/embed/aspects.pyi b/com/sun/star/embed/Aspects/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/embed/aspects.pyi
rename to com/sun/star/embed/Aspects/__init__.pyi
diff --git a/com/sun/star/embed/ElementModes.pyi b/com/sun/star/embed/ElementModes.pyi
deleted file mode 100644
index f0b71d4d9..000000000
--- a/com/sun/star/embed/ElementModes.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.embed.element_modes import *
diff --git a/com/sun/star/_pyi/embed/element_modes.pyi b/com/sun/star/embed/ElementModes/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/embed/element_modes.pyi
rename to com/sun/star/embed/ElementModes/__init__.pyi
diff --git a/com/sun/star/embed/EmbedMapUnits.pyi b/com/sun/star/embed/EmbedMapUnits.pyi
deleted file mode 100644
index f9a2d1345..000000000
--- a/com/sun/star/embed/EmbedMapUnits.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.embed.embed_map_units import *
diff --git a/com/sun/star/_pyi/embed/embed_map_units.pyi b/com/sun/star/embed/EmbedMapUnits/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/embed/embed_map_units.pyi
rename to com/sun/star/embed/EmbedMapUnits/__init__.pyi
diff --git a/com/sun/star/embed/EmbedMisc.pyi b/com/sun/star/embed/EmbedMisc.pyi
deleted file mode 100644
index 7bfc62231..000000000
--- a/com/sun/star/embed/EmbedMisc.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.embed.embed_misc import *
diff --git a/com/sun/star/_pyi/embed/embed_misc.pyi b/com/sun/star/embed/EmbedMisc/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/embed/embed_misc.pyi
rename to com/sun/star/embed/EmbedMisc/__init__.pyi
diff --git a/com/sun/star/embed/EmbedStates.pyi b/com/sun/star/embed/EmbedStates.pyi
deleted file mode 100644
index a2a97a985..000000000
--- a/com/sun/star/embed/EmbedStates.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.embed.embed_states import *
diff --git a/com/sun/star/_pyi/embed/embed_states.pyi b/com/sun/star/embed/EmbedStates/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/embed/embed_states.pyi
rename to com/sun/star/embed/EmbedStates/__init__.pyi
diff --git a/com/sun/star/embed/EmbedUpdateModes.pyi b/com/sun/star/embed/EmbedUpdateModes.pyi
deleted file mode 100644
index 3f511d71f..000000000
--- a/com/sun/star/embed/EmbedUpdateModes.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.embed.embed_update_modes import *
diff --git a/com/sun/star/_pyi/embed/embed_update_modes.pyi b/com/sun/star/embed/EmbedUpdateModes/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/embed/embed_update_modes.pyi
rename to com/sun/star/embed/EmbedUpdateModes/__init__.pyi
diff --git a/com/sun/star/embed/EmbedVerbs.pyi b/com/sun/star/embed/EmbedVerbs.pyi
deleted file mode 100644
index 715212b0f..000000000
--- a/com/sun/star/embed/EmbedVerbs.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.embed.embed_verbs import *
diff --git a/com/sun/star/_pyi/embed/embed_verbs.pyi b/com/sun/star/embed/EmbedVerbs/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/embed/embed_verbs.pyi
rename to com/sun/star/embed/EmbedVerbs/__init__.pyi
diff --git a/com/sun/star/embed/EntryInitModes.pyi b/com/sun/star/embed/EntryInitModes.pyi
deleted file mode 100644
index e12e4a805..000000000
--- a/com/sun/star/embed/EntryInitModes.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.embed.entry_init_modes import *
diff --git a/com/sun/star/_pyi/embed/entry_init_modes.pyi b/com/sun/star/embed/EntryInitModes/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/embed/entry_init_modes.pyi
rename to com/sun/star/embed/EntryInitModes/__init__.pyi
diff --git a/com/sun/star/embed/StorageFormats.pyi b/com/sun/star/embed/StorageFormats.pyi
deleted file mode 100644
index 6d2ebebf1..000000000
--- a/com/sun/star/embed/StorageFormats.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.embed.storage_formats import *
diff --git a/com/sun/star/_pyi/embed/storage_formats.pyi b/com/sun/star/embed/StorageFormats/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/embed/storage_formats.pyi
rename to com/sun/star/embed/StorageFormats/__init__.pyi
diff --git a/com/sun/star/embed/VerbAttributes.pyi b/com/sun/star/embed/VerbAttributes.pyi
deleted file mode 100644
index d1092a80f..000000000
--- a/com/sun/star/embed/VerbAttributes.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.embed.verb_attributes import *
diff --git a/com/sun/star/_pyi/embed/verb_attributes.pyi b/com/sun/star/embed/VerbAttributes/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/embed/verb_attributes.pyi
rename to com/sun/star/embed/VerbAttributes/__init__.pyi
diff --git a/com/sun/star/form/DataSelectionType.pyi b/com/sun/star/form/DataSelectionType.pyi
deleted file mode 100644
index 51a5ffd6c..000000000
--- a/com/sun/star/form/DataSelectionType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.form.data_selection_type import *
diff --git a/com/sun/star/_pyi/form/data_selection_type.pyi b/com/sun/star/form/DataSelectionType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/form/data_selection_type.pyi
rename to com/sun/star/form/DataSelectionType/__init__.pyi
diff --git a/com/sun/star/form/FormButtonType.pyi b/com/sun/star/form/FormButtonType.pyi
deleted file mode 100644
index 55b503982..000000000
--- a/com/sun/star/form/FormButtonType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.form.form_button_type import *
diff --git a/com/sun/star/_pyi/form/form_button_type.pyi b/com/sun/star/form/FormButtonType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/form/form_button_type.pyi
rename to com/sun/star/form/FormButtonType/__init__.pyi
diff --git a/com/sun/star/form/FormComponentType.pyi b/com/sun/star/form/FormComponentType.pyi
deleted file mode 100644
index 5e1778471..000000000
--- a/com/sun/star/form/FormComponentType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.form.form_component_type import *
diff --git a/com/sun/star/_pyi/form/form_component_type.pyi b/com/sun/star/form/FormComponentType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/form/form_component_type.pyi
rename to com/sun/star/form/FormComponentType/__init__.pyi
diff --git a/com/sun/star/form/FormSubmitEncoding.pyi b/com/sun/star/form/FormSubmitEncoding.pyi
deleted file mode 100644
index edded6cd7..000000000
--- a/com/sun/star/form/FormSubmitEncoding.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.form.form_submit_encoding import *
diff --git a/com/sun/star/_pyi/form/form_submit_encoding.pyi b/com/sun/star/form/FormSubmitEncoding/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/form/form_submit_encoding.pyi
rename to com/sun/star/form/FormSubmitEncoding/__init__.pyi
diff --git a/com/sun/star/form/FormSubmitMethod.pyi b/com/sun/star/form/FormSubmitMethod.pyi
deleted file mode 100644
index d2bdef1dc..000000000
--- a/com/sun/star/form/FormSubmitMethod.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.form.form_submit_method import *
diff --git a/com/sun/star/_pyi/form/form_submit_method.pyi b/com/sun/star/form/FormSubmitMethod/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/form/form_submit_method.pyi
rename to com/sun/star/form/FormSubmitMethod/__init__.pyi
diff --git a/com/sun/star/form/ListSourceType.pyi b/com/sun/star/form/ListSourceType.pyi
deleted file mode 100644
index 860bf5960..000000000
--- a/com/sun/star/form/ListSourceType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.form.list_source_type import *
diff --git a/com/sun/star/_pyi/form/list_source_type.pyi b/com/sun/star/form/ListSourceType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/form/list_source_type.pyi
rename to com/sun/star/form/ListSourceType/__init__.pyi
diff --git a/com/sun/star/form/NavigationBarMode.pyi b/com/sun/star/form/NavigationBarMode.pyi
deleted file mode 100644
index 24b40b19d..000000000
--- a/com/sun/star/form/NavigationBarMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.form.navigation_bar_mode import *
diff --git a/com/sun/star/_pyi/form/navigation_bar_mode.pyi b/com/sun/star/form/NavigationBarMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/form/navigation_bar_mode.pyi
rename to com/sun/star/form/NavigationBarMode/__init__.pyi
diff --git a/com/sun/star/form/TabulatorCycle.pyi b/com/sun/star/form/TabulatorCycle.pyi
deleted file mode 100644
index fbd9cde72..000000000
--- a/com/sun/star/form/TabulatorCycle.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.form.tabulator_cycle import *
diff --git a/com/sun/star/_pyi/form/tabulator_cycle.pyi b/com/sun/star/form/TabulatorCycle/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/form/tabulator_cycle.pyi
rename to com/sun/star/form/TabulatorCycle/__init__.pyi
diff --git a/com/sun/star/form/runtime/FormFeature.pyi b/com/sun/star/form/runtime/FormFeature.pyi
deleted file mode 100644
index 8b5f0de5b..000000000
--- a/com/sun/star/form/runtime/FormFeature.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.form.runtime.form_feature import *
diff --git a/com/sun/star/_pyi/form/runtime/form_feature.pyi b/com/sun/star/form/runtime/FormFeature/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/form/runtime/form_feature.pyi
rename to com/sun/star/form/runtime/FormFeature/__init__.pyi
diff --git a/com/sun/star/frame/CommandGroup.pyi b/com/sun/star/frame/CommandGroup.pyi
deleted file mode 100644
index 4d398715e..000000000
--- a/com/sun/star/frame/CommandGroup.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.frame.command_group import *
diff --git a/com/sun/star/_pyi/frame/command_group.pyi b/com/sun/star/frame/CommandGroup/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/frame/command_group.pyi
rename to com/sun/star/frame/CommandGroup/__init__.pyi
diff --git a/com/sun/star/frame/DispatchResultState.pyi b/com/sun/star/frame/DispatchResultState.pyi
deleted file mode 100644
index 4cd487a68..000000000
--- a/com/sun/star/frame/DispatchResultState.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.frame.dispatch_result_state import *
diff --git a/com/sun/star/_pyi/frame/dispatch_result_state.pyi b/com/sun/star/frame/DispatchResultState/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/frame/dispatch_result_state.pyi
rename to com/sun/star/frame/DispatchResultState/__init__.pyi
diff --git a/com/sun/star/frame/FrameAction.pyi b/com/sun/star/frame/FrameAction.pyi
deleted file mode 100644
index 4df918d0c..000000000
--- a/com/sun/star/frame/FrameAction.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.frame.frame_action import *
diff --git a/com/sun/star/_pyi/frame/frame_action.pyi b/com/sun/star/frame/FrameAction/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/frame/frame_action.pyi
rename to com/sun/star/frame/FrameAction/__init__.pyi
diff --git a/com/sun/star/frame/FrameSearchFlag.pyi b/com/sun/star/frame/FrameSearchFlag.pyi
deleted file mode 100644
index fdb591b3c..000000000
--- a/com/sun/star/frame/FrameSearchFlag.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.frame.frame_search_flag import *
diff --git a/com/sun/star/_pyi/frame/frame_search_flag.pyi b/com/sun/star/frame/FrameSearchFlag/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/frame/frame_search_flag.pyi
rename to com/sun/star/frame/FrameSearchFlag/__init__.pyi
diff --git a/com/sun/star/frame/InfobarType.pyi b/com/sun/star/frame/InfobarType.pyi
deleted file mode 100644
index 90f7b58f0..000000000
--- a/com/sun/star/frame/InfobarType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.frame.infobar_type import *
diff --git a/com/sun/star/_pyi/frame/infobar_type.pyi b/com/sun/star/frame/InfobarType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/frame/infobar_type.pyi
rename to com/sun/star/frame/InfobarType/__init__.pyi
diff --git a/com/sun/star/frame/LayoutManagerEvents.pyi b/com/sun/star/frame/LayoutManagerEvents.pyi
deleted file mode 100644
index 1c86629f4..000000000
--- a/com/sun/star/frame/LayoutManagerEvents.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.frame.layout_manager_events import *
diff --git a/com/sun/star/_pyi/frame/layout_manager_events.pyi b/com/sun/star/frame/LayoutManagerEvents/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/frame/layout_manager_events.pyi
rename to com/sun/star/frame/LayoutManagerEvents/__init__.pyi
diff --git a/com/sun/star/frame/UntitledNumbersConst.pyi b/com/sun/star/frame/UntitledNumbersConst.pyi
deleted file mode 100644
index 1c06d4f80..000000000
--- a/com/sun/star/frame/UntitledNumbersConst.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.frame.untitled_numbers_const import *
diff --git a/com/sun/star/_pyi/frame/untitled_numbers_const.pyi b/com/sun/star/frame/UntitledNumbersConst/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/frame/untitled_numbers_const.pyi
rename to com/sun/star/frame/UntitledNumbersConst/__init__.pyi
diff --git a/com/sun/star/frame/WindowArrange.pyi b/com/sun/star/frame/WindowArrange.pyi
deleted file mode 100644
index 0d5f10842..000000000
--- a/com/sun/star/frame/WindowArrange.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.frame.window_arrange import *
diff --git a/com/sun/star/_pyi/frame/window_arrange.pyi b/com/sun/star/frame/WindowArrange/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/frame/window_arrange.pyi
rename to com/sun/star/frame/WindowArrange/__init__.pyi
diff --git a/com/sun/star/frame/status/ItemState.pyi b/com/sun/star/frame/status/ItemState.pyi
deleted file mode 100644
index 4fb81e1f4..000000000
--- a/com/sun/star/frame/status/ItemState.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.frame.status.item_state import *
diff --git a/com/sun/star/_pyi/frame/status/item_state.pyi b/com/sun/star/frame/status/ItemState/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/frame/status/item_state.pyi
rename to com/sun/star/frame/status/ItemState/__init__.pyi
diff --git a/com/sun/star/gallery/GalleryItemType.pyi b/com/sun/star/gallery/GalleryItemType.pyi
deleted file mode 100644
index 58da2f300..000000000
--- a/com/sun/star/gallery/GalleryItemType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.gallery.gallery_item_type import *
diff --git a/com/sun/star/_pyi/gallery/gallery_item_type.pyi b/com/sun/star/gallery/GalleryItemType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/gallery/gallery_item_type.pyi
rename to com/sun/star/gallery/GalleryItemType/__init__.pyi
diff --git a/com/sun/star/graphic/GraphicColorMode.pyi b/com/sun/star/graphic/GraphicColorMode.pyi
deleted file mode 100644
index ad90d8444..000000000
--- a/com/sun/star/graphic/GraphicColorMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.graphic.graphic_color_mode import *
diff --git a/com/sun/star/_pyi/graphic/graphic_color_mode.pyi b/com/sun/star/graphic/GraphicColorMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/graphic/graphic_color_mode.pyi
rename to com/sun/star/graphic/GraphicColorMode/__init__.pyi
diff --git a/com/sun/star/graphic/GraphicType.pyi b/com/sun/star/graphic/GraphicType.pyi
deleted file mode 100644
index 5128bccb3..000000000
--- a/com/sun/star/graphic/GraphicType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.graphic.graphic_type import *
diff --git a/com/sun/star/_pyi/graphic/graphic_type.pyi b/com/sun/star/graphic/GraphicType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/graphic/graphic_type.pyi
rename to com/sun/star/graphic/GraphicType/__init__.pyi
diff --git a/com/sun/star/i18n/AmPmValue.pyi b/com/sun/star/i18n/AmPmValue.pyi
deleted file mode 100644
index 6bf8d5f42..000000000
--- a/com/sun/star/i18n/AmPmValue.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.am_pm_value import *
diff --git a/com/sun/star/_pyi/i18n/am_pm_value.pyi b/com/sun/star/i18n/AmPmValue/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/am_pm_value.pyi
rename to com/sun/star/i18n/AmPmValue/__init__.pyi
diff --git a/com/sun/star/i18n/BreakType.pyi b/com/sun/star/i18n/BreakType.pyi
deleted file mode 100644
index d98d9598a..000000000
--- a/com/sun/star/i18n/BreakType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.break_type import *
diff --git a/com/sun/star/_pyi/i18n/break_type.pyi b/com/sun/star/i18n/BreakType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/break_type.pyi
rename to com/sun/star/i18n/BreakType/__init__.pyi
diff --git a/com/sun/star/i18n/CTLScriptType.pyi b/com/sun/star/i18n/CTLScriptType.pyi
deleted file mode 100644
index ac79a8016..000000000
--- a/com/sun/star/i18n/CTLScriptType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.ctl_script_type import *
diff --git a/com/sun/star/_pyi/i18n/ctl_script_type.pyi b/com/sun/star/i18n/CTLScriptType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/ctl_script_type.pyi
rename to com/sun/star/i18n/CTLScriptType/__init__.pyi
diff --git a/com/sun/star/i18n/CalendarDisplayCode.pyi b/com/sun/star/i18n/CalendarDisplayCode.pyi
deleted file mode 100644
index 9ad79b9ce..000000000
--- a/com/sun/star/i18n/CalendarDisplayCode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.calendar_display_code import *
diff --git a/com/sun/star/_pyi/i18n/calendar_display_code.pyi b/com/sun/star/i18n/CalendarDisplayCode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/calendar_display_code.pyi
rename to com/sun/star/i18n/CalendarDisplayCode/__init__.pyi
diff --git a/com/sun/star/i18n/CalendarDisplayIndex.pyi b/com/sun/star/i18n/CalendarDisplayIndex.pyi
deleted file mode 100644
index 29fa04276..000000000
--- a/com/sun/star/i18n/CalendarDisplayIndex.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.calendar_display_index import *
diff --git a/com/sun/star/_pyi/i18n/calendar_display_index.pyi b/com/sun/star/i18n/CalendarDisplayIndex/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/calendar_display_index.pyi
rename to com/sun/star/i18n/CalendarDisplayIndex/__init__.pyi
diff --git a/com/sun/star/i18n/CalendarFieldIndex.pyi b/com/sun/star/i18n/CalendarFieldIndex.pyi
deleted file mode 100644
index 6c1ef8e70..000000000
--- a/com/sun/star/i18n/CalendarFieldIndex.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.calendar_field_index import *
diff --git a/com/sun/star/_pyi/i18n/calendar_field_index.pyi b/com/sun/star/i18n/CalendarFieldIndex/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/calendar_field_index.pyi
rename to com/sun/star/i18n/CalendarFieldIndex/__init__.pyi
diff --git a/com/sun/star/i18n/CharType.pyi b/com/sun/star/i18n/CharType.pyi
deleted file mode 100644
index 2005d5f3a..000000000
--- a/com/sun/star/i18n/CharType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.char_type import *
diff --git a/com/sun/star/_pyi/i18n/char_type.pyi b/com/sun/star/i18n/CharType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/char_type.pyi
rename to com/sun/star/i18n/CharType/__init__.pyi
diff --git a/com/sun/star/i18n/CharacterIteratorMode.pyi b/com/sun/star/i18n/CharacterIteratorMode.pyi
deleted file mode 100644
index d6a3c034c..000000000
--- a/com/sun/star/i18n/CharacterIteratorMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.character_iterator_mode import *
diff --git a/com/sun/star/_pyi/i18n/character_iterator_mode.pyi b/com/sun/star/i18n/CharacterIteratorMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/character_iterator_mode.pyi
rename to com/sun/star/i18n/CharacterIteratorMode/__init__.pyi
diff --git a/com/sun/star/i18n/CollatorOptions.pyi b/com/sun/star/i18n/CollatorOptions.pyi
deleted file mode 100644
index 3c0f3f4b3..000000000
--- a/com/sun/star/i18n/CollatorOptions.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.collator_options import *
diff --git a/com/sun/star/_pyi/i18n/collator_options.pyi b/com/sun/star/i18n/CollatorOptions/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/collator_options.pyi
rename to com/sun/star/i18n/CollatorOptions/__init__.pyi
diff --git a/com/sun/star/i18n/DirectionProperty.pyi b/com/sun/star/i18n/DirectionProperty.pyi
deleted file mode 100644
index 15f895b07..000000000
--- a/com/sun/star/i18n/DirectionProperty.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.direction_property import *
diff --git a/com/sun/star/_pyi/i18n/direction_property.pyi b/com/sun/star/i18n/DirectionProperty/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/direction_property.pyi
rename to com/sun/star/i18n/DirectionProperty/__init__.pyi
diff --git a/com/sun/star/i18n/InputSequenceCheckMode.pyi b/com/sun/star/i18n/InputSequenceCheckMode.pyi
deleted file mode 100644
index 17d9fd9f5..000000000
--- a/com/sun/star/i18n/InputSequenceCheckMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.input_sequence_check_mode import *
diff --git a/com/sun/star/_pyi/i18n/input_sequence_check_mode.pyi b/com/sun/star/i18n/InputSequenceCheckMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/input_sequence_check_mode.pyi
rename to com/sun/star/i18n/InputSequenceCheckMode/__init__.pyi
diff --git a/com/sun/star/i18n/KCharacterType.pyi b/com/sun/star/i18n/KCharacterType.pyi
deleted file mode 100644
index bc7f51b96..000000000
--- a/com/sun/star/i18n/KCharacterType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.k_character_type import *
diff --git a/com/sun/star/_pyi/i18n/k_character_type.pyi b/com/sun/star/i18n/KCharacterType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/k_character_type.pyi
rename to com/sun/star/i18n/KCharacterType/__init__.pyi
diff --git a/com/sun/star/i18n/KNumberFormatType.pyi b/com/sun/star/i18n/KNumberFormatType.pyi
deleted file mode 100644
index 4821b4b03..000000000
--- a/com/sun/star/i18n/KNumberFormatType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.k_number_format_type import *
diff --git a/com/sun/star/_pyi/i18n/k_number_format_type.pyi b/com/sun/star/i18n/KNumberFormatType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/k_number_format_type.pyi
rename to com/sun/star/i18n/KNumberFormatType/__init__.pyi
diff --git a/com/sun/star/i18n/KNumberFormatUsage.pyi b/com/sun/star/i18n/KNumberFormatUsage.pyi
deleted file mode 100644
index edd7b44ab..000000000
--- a/com/sun/star/i18n/KNumberFormatUsage.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.k_number_format_usage import *
diff --git a/com/sun/star/_pyi/i18n/k_number_format_usage.pyi b/com/sun/star/i18n/KNumberFormatUsage/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/k_number_format_usage.pyi
rename to com/sun/star/i18n/KNumberFormatUsage/__init__.pyi
diff --git a/com/sun/star/i18n/KParseTokens.pyi b/com/sun/star/i18n/KParseTokens.pyi
deleted file mode 100644
index 4cb73e039..000000000
--- a/com/sun/star/i18n/KParseTokens.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.k_parse_tokens import *
diff --git a/com/sun/star/_pyi/i18n/k_parse_tokens.pyi b/com/sun/star/i18n/KParseTokens/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/k_parse_tokens.pyi
rename to com/sun/star/i18n/KParseTokens/__init__.pyi
diff --git a/com/sun/star/i18n/KParseType.pyi b/com/sun/star/i18n/KParseType.pyi
deleted file mode 100644
index 9206ac018..000000000
--- a/com/sun/star/i18n/KParseType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.k_parse_type import *
diff --git a/com/sun/star/_pyi/i18n/k_parse_type.pyi b/com/sun/star/i18n/KParseType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/k_parse_type.pyi
rename to com/sun/star/i18n/KParseType/__init__.pyi
diff --git a/com/sun/star/i18n/LocaleItem.pyi b/com/sun/star/i18n/LocaleItem.pyi
deleted file mode 100644
index f63cbab2d..000000000
--- a/com/sun/star/i18n/LocaleItem.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.locale_item import *
diff --git a/com/sun/star/_pyi/i18n/locale_item.pyi b/com/sun/star/i18n/LocaleItem/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/locale_item.pyi
rename to com/sun/star/i18n/LocaleItem/__init__.pyi
diff --git a/com/sun/star/i18n/Months.pyi b/com/sun/star/i18n/Months.pyi
deleted file mode 100644
index 04cdddda8..000000000
--- a/com/sun/star/i18n/Months.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.months import *
diff --git a/com/sun/star/_pyi/i18n/months.pyi b/com/sun/star/i18n/Months/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/months.pyi
rename to com/sun/star/i18n/Months/__init__.pyi
diff --git a/com/sun/star/i18n/NativeNumberMode.pyi b/com/sun/star/i18n/NativeNumberMode.pyi
deleted file mode 100644
index 352c3d171..000000000
--- a/com/sun/star/i18n/NativeNumberMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.native_number_mode import *
diff --git a/com/sun/star/_pyi/i18n/native_number_mode.pyi b/com/sun/star/i18n/NativeNumberMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/native_number_mode.pyi
rename to com/sun/star/i18n/NativeNumberMode/__init__.pyi
diff --git a/com/sun/star/i18n/NumberFormatIndex.pyi b/com/sun/star/i18n/NumberFormatIndex.pyi
deleted file mode 100644
index 850b84570..000000000
--- a/com/sun/star/i18n/NumberFormatIndex.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.number_format_index import *
diff --git a/com/sun/star/_pyi/i18n/number_format_index.pyi b/com/sun/star/i18n/NumberFormatIndex/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/number_format_index.pyi
rename to com/sun/star/i18n/NumberFormatIndex/__init__.pyi
diff --git a/com/sun/star/i18n/ScriptDirection.pyi b/com/sun/star/i18n/ScriptDirection.pyi
deleted file mode 100644
index 3e1e8caf4..000000000
--- a/com/sun/star/i18n/ScriptDirection.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.script_direction import *
diff --git a/com/sun/star/_pyi/i18n/script_direction.pyi b/com/sun/star/i18n/ScriptDirection/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/script_direction.pyi
rename to com/sun/star/i18n/ScriptDirection/__init__.pyi
diff --git a/com/sun/star/i18n/ScriptType.pyi b/com/sun/star/i18n/ScriptType.pyi
deleted file mode 100644
index 7c04839d4..000000000
--- a/com/sun/star/i18n/ScriptType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.script_type import *
diff --git a/com/sun/star/_pyi/i18n/script_type.pyi b/com/sun/star/i18n/ScriptType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/script_type.pyi
rename to com/sun/star/i18n/ScriptType/__init__.pyi
diff --git a/com/sun/star/i18n/TextConversionOption.pyi b/com/sun/star/i18n/TextConversionOption.pyi
deleted file mode 100644
index b63a3ad03..000000000
--- a/com/sun/star/i18n/TextConversionOption.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.text_conversion_option import *
diff --git a/com/sun/star/_pyi/i18n/text_conversion_option.pyi b/com/sun/star/i18n/TextConversionOption/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/text_conversion_option.pyi
rename to com/sun/star/i18n/TextConversionOption/__init__.pyi
diff --git a/com/sun/star/i18n/TextConversionType.pyi b/com/sun/star/i18n/TextConversionType.pyi
deleted file mode 100644
index 276d985b6..000000000
--- a/com/sun/star/i18n/TextConversionType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.text_conversion_type import *
diff --git a/com/sun/star/_pyi/i18n/text_conversion_type.pyi b/com/sun/star/i18n/TextConversionType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/text_conversion_type.pyi
rename to com/sun/star/i18n/TextConversionType/__init__.pyi
diff --git a/com/sun/star/i18n/TransliterationModules.pyi b/com/sun/star/i18n/TransliterationModules.pyi
deleted file mode 100644
index b75a02a2f..000000000
--- a/com/sun/star/i18n/TransliterationModules.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.transliteration_modules import *
diff --git a/com/sun/star/_pyi/i18n/transliteration_modules.pyi b/com/sun/star/i18n/TransliterationModules/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/transliteration_modules.pyi
rename to com/sun/star/i18n/TransliterationModules/__init__.pyi
diff --git a/com/sun/star/i18n/TransliterationModulesExtra.pyi b/com/sun/star/i18n/TransliterationModulesExtra.pyi
deleted file mode 100644
index 719a40144..000000000
--- a/com/sun/star/i18n/TransliterationModulesExtra.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.transliteration_modules_extra import *
diff --git a/com/sun/star/_pyi/i18n/transliteration_modules_extra.pyi b/com/sun/star/i18n/TransliterationModulesExtra/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/transliteration_modules_extra.pyi
rename to com/sun/star/i18n/TransliterationModulesExtra/__init__.pyi
diff --git a/com/sun/star/i18n/TransliterationModulesNew.pyi b/com/sun/star/i18n/TransliterationModulesNew.pyi
deleted file mode 100644
index 6aae23072..000000000
--- a/com/sun/star/i18n/TransliterationModulesNew.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.transliteration_modules_new import *
diff --git a/com/sun/star/_pyi/i18n/transliteration_modules_new.pyi b/com/sun/star/i18n/TransliterationModulesNew/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/transliteration_modules_new.pyi
rename to com/sun/star/i18n/TransliterationModulesNew/__init__.pyi
diff --git a/com/sun/star/i18n/TransliterationType.pyi b/com/sun/star/i18n/TransliterationType.pyi
deleted file mode 100644
index a9700db88..000000000
--- a/com/sun/star/i18n/TransliterationType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.transliteration_type import *
diff --git a/com/sun/star/_pyi/i18n/transliteration_type.pyi b/com/sun/star/i18n/TransliterationType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/transliteration_type.pyi
rename to com/sun/star/i18n/TransliterationType/__init__.pyi
diff --git a/com/sun/star/i18n/UnicodeScript.pyi b/com/sun/star/i18n/UnicodeScript.pyi
deleted file mode 100644
index 0547f3856..000000000
--- a/com/sun/star/i18n/UnicodeScript.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.unicode_script import *
diff --git a/com/sun/star/_pyi/i18n/unicode_script.pyi b/com/sun/star/i18n/UnicodeScript/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/unicode_script.pyi
rename to com/sun/star/i18n/UnicodeScript/__init__.pyi
diff --git a/com/sun/star/i18n/UnicodeType.pyi b/com/sun/star/i18n/UnicodeType.pyi
deleted file mode 100644
index 3189e0718..000000000
--- a/com/sun/star/i18n/UnicodeType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.unicode_type import *
diff --git a/com/sun/star/_pyi/i18n/unicode_type.pyi b/com/sun/star/i18n/UnicodeType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/unicode_type.pyi
rename to com/sun/star/i18n/UnicodeType/__init__.pyi
diff --git a/com/sun/star/i18n/Weekdays.pyi b/com/sun/star/i18n/Weekdays.pyi
deleted file mode 100644
index a9bcb46ae..000000000
--- a/com/sun/star/i18n/Weekdays.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.weekdays import *
diff --git a/com/sun/star/_pyi/i18n/weekdays.pyi b/com/sun/star/i18n/Weekdays/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/weekdays.pyi
rename to com/sun/star/i18n/Weekdays/__init__.pyi
diff --git a/com/sun/star/i18n/WordType.pyi b/com/sun/star/i18n/WordType.pyi
deleted file mode 100644
index 62ac49ece..000000000
--- a/com/sun/star/i18n/WordType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.word_type import *
diff --git a/com/sun/star/_pyi/i18n/word_type.pyi b/com/sun/star/i18n/WordType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/word_type.pyi
rename to com/sun/star/i18n/WordType/__init__.pyi
diff --git a/com/sun/star/i18n/reservedWords.pyi b/com/sun/star/i18n/reservedWords.pyi
deleted file mode 100644
index c243ce469..000000000
--- a/com/sun/star/i18n/reservedWords.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.i18n.reserved_words import *
diff --git a/com/sun/star/_pyi/i18n/reserved_words.pyi b/com/sun/star/i18n/reservedWords/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/i18n/reserved_words.pyi
rename to com/sun/star/i18n/reservedWords/__init__.pyi
diff --git a/com/sun/star/inspection/InteractiveSelectionResult.pyi b/com/sun/star/inspection/InteractiveSelectionResult.pyi
deleted file mode 100644
index 02fa5ac92..000000000
--- a/com/sun/star/inspection/InteractiveSelectionResult.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.inspection.interactive_selection_result import *
diff --git a/com/sun/star/_pyi/inspection/interactive_selection_result.pyi b/com/sun/star/inspection/InteractiveSelectionResult/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/inspection/interactive_selection_result.pyi
rename to com/sun/star/inspection/InteractiveSelectionResult/__init__.pyi
diff --git a/com/sun/star/inspection/PropertyControlType.pyi b/com/sun/star/inspection/PropertyControlType.pyi
deleted file mode 100644
index c0c68ba63..000000000
--- a/com/sun/star/inspection/PropertyControlType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.inspection.property_control_type import *
diff --git a/com/sun/star/_pyi/inspection/property_control_type.pyi b/com/sun/star/inspection/PropertyControlType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/inspection/property_control_type.pyi
rename to com/sun/star/inspection/PropertyControlType/__init__.pyi
diff --git a/com/sun/star/inspection/PropertyLineElement.pyi b/com/sun/star/inspection/PropertyLineElement.pyi
deleted file mode 100644
index 11ed690ff..000000000
--- a/com/sun/star/inspection/PropertyLineElement.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.inspection.property_line_element import *
diff --git a/com/sun/star/_pyi/inspection/property_line_element.pyi b/com/sun/star/inspection/PropertyLineElement/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/inspection/property_line_element.pyi
rename to com/sun/star/inspection/PropertyLineElement/__init__.pyi
diff --git a/com/sun/star/lang/SystemDependent.pyi b/com/sun/star/lang/SystemDependent.pyi
deleted file mode 100644
index ab6351f7b..000000000
--- a/com/sun/star/lang/SystemDependent.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.lang.system_dependent import *
diff --git a/com/sun/star/_pyi/lang/system_dependent.pyi b/com/sun/star/lang/SystemDependent/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/lang/system_dependent.pyi
rename to com/sun/star/lang/SystemDependent/__init__.pyi
diff --git a/com/sun/star/linguistic2/ConversionDictionaryType.pyi b/com/sun/star/linguistic2/ConversionDictionaryType.pyi
deleted file mode 100644
index 12e497961..000000000
--- a/com/sun/star/linguistic2/ConversionDictionaryType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.linguistic2.conversion_dictionary_type import *
diff --git a/com/sun/star/_pyi/linguistic2/conversion_dictionary_type.pyi b/com/sun/star/linguistic2/ConversionDictionaryType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/linguistic2/conversion_dictionary_type.pyi
rename to com/sun/star/linguistic2/ConversionDictionaryType/__init__.pyi
diff --git a/com/sun/star/linguistic2/ConversionDirection.pyi b/com/sun/star/linguistic2/ConversionDirection.pyi
deleted file mode 100644
index 0c9c8fa30..000000000
--- a/com/sun/star/linguistic2/ConversionDirection.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.linguistic2.conversion_direction import *
diff --git a/com/sun/star/_pyi/linguistic2/conversion_direction.pyi b/com/sun/star/linguistic2/ConversionDirection/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/linguistic2/conversion_direction.pyi
rename to com/sun/star/linguistic2/ConversionDirection/__init__.pyi
diff --git a/com/sun/star/linguistic2/ConversionPropertyType.pyi b/com/sun/star/linguistic2/ConversionPropertyType.pyi
deleted file mode 100644
index 06e476192..000000000
--- a/com/sun/star/linguistic2/ConversionPropertyType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.linguistic2.conversion_property_type import *
diff --git a/com/sun/star/_pyi/linguistic2/conversion_property_type.pyi b/com/sun/star/linguistic2/ConversionPropertyType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/linguistic2/conversion_property_type.pyi
rename to com/sun/star/linguistic2/ConversionPropertyType/__init__.pyi
diff --git a/com/sun/star/linguistic2/DictionaryEventFlags.pyi b/com/sun/star/linguistic2/DictionaryEventFlags.pyi
deleted file mode 100644
index 6f41293fb..000000000
--- a/com/sun/star/linguistic2/DictionaryEventFlags.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.linguistic2.dictionary_event_flags import *
diff --git a/com/sun/star/_pyi/linguistic2/dictionary_event_flags.pyi b/com/sun/star/linguistic2/DictionaryEventFlags/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/linguistic2/dictionary_event_flags.pyi
rename to com/sun/star/linguistic2/DictionaryEventFlags/__init__.pyi
diff --git a/com/sun/star/linguistic2/DictionaryListEventFlags.pyi b/com/sun/star/linguistic2/DictionaryListEventFlags.pyi
deleted file mode 100644
index 612bf6427..000000000
--- a/com/sun/star/linguistic2/DictionaryListEventFlags.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.linguistic2.dictionary_list_event_flags import *
diff --git a/com/sun/star/_pyi/linguistic2/dictionary_list_event_flags.pyi b/com/sun/star/linguistic2/DictionaryListEventFlags/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/linguistic2/dictionary_list_event_flags.pyi
rename to com/sun/star/linguistic2/DictionaryListEventFlags/__init__.pyi
diff --git a/com/sun/star/linguistic2/DictionaryType.pyi b/com/sun/star/linguistic2/DictionaryType.pyi
deleted file mode 100644
index 26ab27c64..000000000
--- a/com/sun/star/linguistic2/DictionaryType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.linguistic2.dictionary_type import *
diff --git a/com/sun/star/_pyi/linguistic2/dictionary_type.pyi b/com/sun/star/linguistic2/DictionaryType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/linguistic2/dictionary_type.pyi
rename to com/sun/star/linguistic2/DictionaryType/__init__.pyi
diff --git a/com/sun/star/linguistic2/LinguServiceEventFlags.pyi b/com/sun/star/linguistic2/LinguServiceEventFlags.pyi
deleted file mode 100644
index 5da9c426c..000000000
--- a/com/sun/star/linguistic2/LinguServiceEventFlags.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.linguistic2.lingu_service_event_flags import *
diff --git a/com/sun/star/_pyi/linguistic2/lingu_service_event_flags.pyi b/com/sun/star/linguistic2/LinguServiceEventFlags/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/linguistic2/lingu_service_event_flags.pyi
rename to com/sun/star/linguistic2/LinguServiceEventFlags/__init__.pyi
diff --git a/com/sun/star/linguistic2/SpellFailure.pyi b/com/sun/star/linguistic2/SpellFailure.pyi
deleted file mode 100644
index 71799ea26..000000000
--- a/com/sun/star/linguistic2/SpellFailure.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.linguistic2.spell_failure import *
diff --git a/com/sun/star/_pyi/linguistic2/spell_failure.pyi b/com/sun/star/linguistic2/SpellFailure/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/linguistic2/spell_failure.pyi
rename to com/sun/star/linguistic2/SpellFailure/__init__.pyi
diff --git a/com/sun/star/logging/LogLevel.pyi b/com/sun/star/logging/LogLevel.pyi
deleted file mode 100644
index 101f32a0a..000000000
--- a/com/sun/star/logging/LogLevel.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.logging.log_level import *
diff --git a/com/sun/star/_pyi/logging/log_level.pyi b/com/sun/star/logging/LogLevel/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/logging/log_level.pyi
rename to com/sun/star/logging/LogLevel/__init__.pyi
diff --git a/com/sun/star/mail/MailServiceType.pyi b/com/sun/star/mail/MailServiceType.pyi
deleted file mode 100644
index 0ad0843bb..000000000
--- a/com/sun/star/mail/MailServiceType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.mail.mail_service_type import *
diff --git a/com/sun/star/_pyi/mail/mail_service_type.pyi b/com/sun/star/mail/MailServiceType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/mail/mail_service_type.pyi
rename to com/sun/star/mail/MailServiceType/__init__.pyi
diff --git a/com/sun/star/media/ZoomLevel.pyi b/com/sun/star/media/ZoomLevel.pyi
deleted file mode 100644
index cbdb929df..000000000
--- a/com/sun/star/media/ZoomLevel.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.media.zoom_level import *
diff --git a/com/sun/star/_pyi/media/zoom_level.pyi b/com/sun/star/media/ZoomLevel/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/media/zoom_level.pyi
rename to com/sun/star/media/ZoomLevel/__init__.pyi
diff --git a/com/sun/star/mozilla/MozillaProductType.pyi b/com/sun/star/mozilla/MozillaProductType.pyi
deleted file mode 100644
index 39341ac52..000000000
--- a/com/sun/star/mozilla/MozillaProductType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.mozilla.mozilla_product_type import *
diff --git a/com/sun/star/_pyi/mozilla/mozilla_product_type.pyi b/com/sun/star/mozilla/MozillaProductType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/mozilla/mozilla_product_type.pyi
rename to com/sun/star/mozilla/MozillaProductType/__init__.pyi
diff --git a/com/sun/star/packages/zip/ZipConstants.pyi b/com/sun/star/packages/zip/ZipConstants.pyi
deleted file mode 100644
index 9e5ddcbc7..000000000
--- a/com/sun/star/packages/zip/ZipConstants.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.packages.zip.zip_constants import *
diff --git a/com/sun/star/_pyi/packages/zip/zip_constants.pyi b/com/sun/star/packages/zip/ZipConstants/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/packages/zip/zip_constants.pyi
rename to com/sun/star/packages/zip/ZipConstants/__init__.pyi
diff --git a/com/sun/star/presentation/AnimationEffect.pyi b/com/sun/star/presentation/AnimationEffect.pyi
deleted file mode 100644
index caead8c10..000000000
--- a/com/sun/star/presentation/AnimationEffect.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.presentation.animation_effect import *
diff --git a/com/sun/star/_pyi/presentation/animation_effect.pyi b/com/sun/star/presentation/AnimationEffect/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/presentation/animation_effect.pyi
rename to com/sun/star/presentation/AnimationEffect/__init__.pyi
diff --git a/com/sun/star/presentation/AnimationSpeed.pyi b/com/sun/star/presentation/AnimationSpeed.pyi
deleted file mode 100644
index 1e2abfd8f..000000000
--- a/com/sun/star/presentation/AnimationSpeed.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.presentation.animation_speed import *
diff --git a/com/sun/star/_pyi/presentation/animation_speed.pyi b/com/sun/star/presentation/AnimationSpeed/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/presentation/animation_speed.pyi
rename to com/sun/star/presentation/AnimationSpeed/__init__.pyi
diff --git a/com/sun/star/presentation/ClickAction.pyi b/com/sun/star/presentation/ClickAction.pyi
deleted file mode 100644
index 1f12d03ed..000000000
--- a/com/sun/star/presentation/ClickAction.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.presentation.click_action import *
diff --git a/com/sun/star/_pyi/presentation/click_action.pyi b/com/sun/star/presentation/ClickAction/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/presentation/click_action.pyi
rename to com/sun/star/presentation/ClickAction/__init__.pyi
diff --git a/com/sun/star/presentation/EffectCommands.pyi b/com/sun/star/presentation/EffectCommands.pyi
deleted file mode 100644
index fa811feb1..000000000
--- a/com/sun/star/presentation/EffectCommands.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.presentation.effect_commands import *
diff --git a/com/sun/star/_pyi/presentation/effect_commands.pyi b/com/sun/star/presentation/EffectCommands/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/presentation/effect_commands.pyi
rename to com/sun/star/presentation/EffectCommands/__init__.pyi
diff --git a/com/sun/star/presentation/EffectNodeType.pyi b/com/sun/star/presentation/EffectNodeType.pyi
deleted file mode 100644
index bbd0f42ca..000000000
--- a/com/sun/star/presentation/EffectNodeType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.presentation.effect_node_type import *
diff --git a/com/sun/star/_pyi/presentation/effect_node_type.pyi b/com/sun/star/presentation/EffectNodeType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/presentation/effect_node_type.pyi
rename to com/sun/star/presentation/EffectNodeType/__init__.pyi
diff --git a/com/sun/star/presentation/EffectPresetClass.pyi b/com/sun/star/presentation/EffectPresetClass.pyi
deleted file mode 100644
index 8ccef4efe..000000000
--- a/com/sun/star/presentation/EffectPresetClass.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.presentation.effect_preset_class import *
diff --git a/com/sun/star/_pyi/presentation/effect_preset_class.pyi b/com/sun/star/presentation/EffectPresetClass/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/presentation/effect_preset_class.pyi
rename to com/sun/star/presentation/EffectPresetClass/__init__.pyi
diff --git a/com/sun/star/presentation/FadeEffect.pyi b/com/sun/star/presentation/FadeEffect.pyi
deleted file mode 100644
index 8698db8ce..000000000
--- a/com/sun/star/presentation/FadeEffect.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.presentation.fade_effect import *
diff --git a/com/sun/star/_pyi/presentation/fade_effect.pyi b/com/sun/star/presentation/FadeEffect/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/presentation/fade_effect.pyi
rename to com/sun/star/presentation/FadeEffect/__init__.pyi
diff --git a/com/sun/star/presentation/PresentationRange.pyi b/com/sun/star/presentation/PresentationRange.pyi
deleted file mode 100644
index bc7acdb83..000000000
--- a/com/sun/star/presentation/PresentationRange.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.presentation.presentation_range import *
diff --git a/com/sun/star/_pyi/presentation/presentation_range.pyi b/com/sun/star/presentation/PresentationRange/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/presentation/presentation_range.pyi
rename to com/sun/star/presentation/PresentationRange/__init__.pyi
diff --git a/com/sun/star/presentation/ShapeAnimationSubType.pyi b/com/sun/star/presentation/ShapeAnimationSubType.pyi
deleted file mode 100644
index 58754f4b4..000000000
--- a/com/sun/star/presentation/ShapeAnimationSubType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.presentation.shape_animation_sub_type import *
diff --git a/com/sun/star/_pyi/presentation/shape_animation_sub_type.pyi b/com/sun/star/presentation/ShapeAnimationSubType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/presentation/shape_animation_sub_type.pyi
rename to com/sun/star/presentation/ShapeAnimationSubType/__init__.pyi
diff --git a/com/sun/star/presentation/TextAnimationType.pyi b/com/sun/star/presentation/TextAnimationType.pyi
deleted file mode 100644
index f345ca014..000000000
--- a/com/sun/star/presentation/TextAnimationType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.presentation.text_animation_type import *
diff --git a/com/sun/star/_pyi/presentation/text_animation_type.pyi b/com/sun/star/presentation/TextAnimationType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/presentation/text_animation_type.pyi
rename to com/sun/star/presentation/TextAnimationType/__init__.pyi
diff --git a/com/sun/star/rdf/FileFormat.pyi b/com/sun/star/rdf/FileFormat.pyi
deleted file mode 100644
index 7b22a459a..000000000
--- a/com/sun/star/rdf/FileFormat.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rdf.file_format import *
diff --git a/com/sun/star/_pyi/rdf/file_format.pyi b/com/sun/star/rdf/FileFormat/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rdf/file_format.pyi
rename to com/sun/star/rdf/FileFormat/__init__.pyi
diff --git a/com/sun/star/rdf/URIs.pyi b/com/sun/star/rdf/URIs.pyi
deleted file mode 100644
index 67984334a..000000000
--- a/com/sun/star/rdf/URIs.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rdf.ur_is import *
diff --git a/com/sun/star/_pyi/rdf/ur_is.pyi b/com/sun/star/rdf/URIs/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rdf/ur_is.pyi
rename to com/sun/star/rdf/URIs/__init__.pyi
diff --git a/com/sun/star/reflection/FieldAccessMode.pyi b/com/sun/star/reflection/FieldAccessMode.pyi
deleted file mode 100644
index 62a8285ba..000000000
--- a/com/sun/star/reflection/FieldAccessMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.reflection.field_access_mode import *
diff --git a/com/sun/star/_pyi/reflection/field_access_mode.pyi b/com/sun/star/reflection/FieldAccessMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/reflection/field_access_mode.pyi
rename to com/sun/star/reflection/FieldAccessMode/__init__.pyi
diff --git a/com/sun/star/reflection/MethodMode.pyi b/com/sun/star/reflection/MethodMode.pyi
deleted file mode 100644
index e1535933b..000000000
--- a/com/sun/star/reflection/MethodMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.reflection.method_mode import *
diff --git a/com/sun/star/_pyi/reflection/method_mode.pyi b/com/sun/star/reflection/MethodMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/reflection/method_mode.pyi
rename to com/sun/star/reflection/MethodMode/__init__.pyi
diff --git a/com/sun/star/reflection/ParamMode.pyi b/com/sun/star/reflection/ParamMode.pyi
deleted file mode 100644
index df72ca95f..000000000
--- a/com/sun/star/reflection/ParamMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.reflection.param_mode import *
diff --git a/com/sun/star/_pyi/reflection/param_mode.pyi b/com/sun/star/reflection/ParamMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/reflection/param_mode.pyi
rename to com/sun/star/reflection/ParamMode/__init__.pyi
diff --git a/com/sun/star/reflection/TypeDescriptionSearchDepth.pyi b/com/sun/star/reflection/TypeDescriptionSearchDepth.pyi
deleted file mode 100644
index 98a2818dc..000000000
--- a/com/sun/star/reflection/TypeDescriptionSearchDepth.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.reflection.type_description_search_depth import *
diff --git a/com/sun/star/_pyi/reflection/type_description_search_depth.pyi b/com/sun/star/reflection/TypeDescriptionSearchDepth/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/reflection/type_description_search_depth.pyi
rename to com/sun/star/reflection/TypeDescriptionSearchDepth/__init__.pyi
diff --git a/com/sun/star/registry/RegistryKeyType.pyi b/com/sun/star/registry/RegistryKeyType.pyi
deleted file mode 100644
index 87195903c..000000000
--- a/com/sun/star/registry/RegistryKeyType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.registry.registry_key_type import *
diff --git a/com/sun/star/_pyi/registry/registry_key_type.pyi b/com/sun/star/registry/RegistryKeyType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/registry/registry_key_type.pyi
rename to com/sun/star/registry/RegistryKeyType/__init__.pyi
diff --git a/com/sun/star/registry/RegistryValueType.pyi b/com/sun/star/registry/RegistryValueType.pyi
deleted file mode 100644
index d660b663b..000000000
--- a/com/sun/star/registry/RegistryValueType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.registry.registry_value_type import *
diff --git a/com/sun/star/_pyi/registry/registry_value_type.pyi b/com/sun/star/registry/RegistryValueType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/registry/registry_value_type.pyi
rename to com/sun/star/registry/RegistryValueType/__init__.pyi
diff --git a/com/sun/star/rendering/AnimationRepeat.pyi b/com/sun/star/rendering/AnimationRepeat.pyi
deleted file mode 100644
index 59dd060db..000000000
--- a/com/sun/star/rendering/AnimationRepeat.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.animation_repeat import *
diff --git a/com/sun/star/_pyi/rendering/animation_repeat.pyi b/com/sun/star/rendering/AnimationRepeat/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/animation_repeat.pyi
rename to com/sun/star/rendering/AnimationRepeat/__init__.pyi
diff --git a/com/sun/star/rendering/BlendMode.pyi b/com/sun/star/rendering/BlendMode.pyi
deleted file mode 100644
index 98e2546e4..000000000
--- a/com/sun/star/rendering/BlendMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.blend_mode import *
diff --git a/com/sun/star/_pyi/rendering/blend_mode.pyi b/com/sun/star/rendering/BlendMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/blend_mode.pyi
rename to com/sun/star/rendering/BlendMode/__init__.pyi
diff --git a/com/sun/star/rendering/ColorComponentTag.pyi b/com/sun/star/rendering/ColorComponentTag.pyi
deleted file mode 100644
index 2fc47cc99..000000000
--- a/com/sun/star/rendering/ColorComponentTag.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.color_component_tag import *
diff --git a/com/sun/star/_pyi/rendering/color_component_tag.pyi b/com/sun/star/rendering/ColorComponentTag/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/color_component_tag.pyi
rename to com/sun/star/rendering/ColorComponentTag/__init__.pyi
diff --git a/com/sun/star/rendering/ColorSpaceType.pyi b/com/sun/star/rendering/ColorSpaceType.pyi
deleted file mode 100644
index d939c681b..000000000
--- a/com/sun/star/rendering/ColorSpaceType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.color_space_type import *
diff --git a/com/sun/star/_pyi/rendering/color_space_type.pyi b/com/sun/star/rendering/ColorSpaceType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/color_space_type.pyi
rename to com/sun/star/rendering/ColorSpaceType/__init__.pyi
diff --git a/com/sun/star/rendering/CompositeOperation.pyi b/com/sun/star/rendering/CompositeOperation.pyi
deleted file mode 100644
index cbff8a368..000000000
--- a/com/sun/star/rendering/CompositeOperation.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.composite_operation import *
diff --git a/com/sun/star/_pyi/rendering/composite_operation.pyi b/com/sun/star/rendering/CompositeOperation/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/composite_operation.pyi
rename to com/sun/star/rendering/CompositeOperation/__init__.pyi
diff --git a/com/sun/star/rendering/EmphasisMark.pyi b/com/sun/star/rendering/EmphasisMark.pyi
deleted file mode 100644
index 092e82661..000000000
--- a/com/sun/star/rendering/EmphasisMark.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.emphasis_mark import *
diff --git a/com/sun/star/_pyi/rendering/emphasis_mark.pyi b/com/sun/star/rendering/EmphasisMark/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/emphasis_mark.pyi
rename to com/sun/star/rendering/EmphasisMark/__init__.pyi
diff --git a/com/sun/star/rendering/FillRule.pyi b/com/sun/star/rendering/FillRule.pyi
deleted file mode 100644
index 672c56d86..000000000
--- a/com/sun/star/rendering/FillRule.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.fill_rule import *
diff --git a/com/sun/star/_pyi/rendering/fill_rule.pyi b/com/sun/star/rendering/FillRule/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/fill_rule.pyi
rename to com/sun/star/rendering/FillRule/__init__.pyi
diff --git a/com/sun/star/rendering/FloatingPointBitmapFormat.pyi b/com/sun/star/rendering/FloatingPointBitmapFormat.pyi
deleted file mode 100644
index c60063b06..000000000
--- a/com/sun/star/rendering/FloatingPointBitmapFormat.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.floating_point_bitmap_format import *
diff --git a/com/sun/star/_pyi/rendering/floating_point_bitmap_format.pyi b/com/sun/star/rendering/FloatingPointBitmapFormat/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/floating_point_bitmap_format.pyi
rename to com/sun/star/rendering/FloatingPointBitmapFormat/__init__.pyi
diff --git a/com/sun/star/rendering/InterpolationMode.pyi b/com/sun/star/rendering/InterpolationMode.pyi
deleted file mode 100644
index 15741a121..000000000
--- a/com/sun/star/rendering/InterpolationMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.interpolation_mode import *
diff --git a/com/sun/star/_pyi/rendering/interpolation_mode.pyi b/com/sun/star/rendering/InterpolationMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/interpolation_mode.pyi
rename to com/sun/star/rendering/InterpolationMode/__init__.pyi
diff --git a/com/sun/star/rendering/PanoseArmStyle.pyi b/com/sun/star/rendering/PanoseArmStyle.pyi
deleted file mode 100644
index dc9a59e70..000000000
--- a/com/sun/star/rendering/PanoseArmStyle.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.panose_arm_style import *
diff --git a/com/sun/star/_pyi/rendering/panose_arm_style.pyi b/com/sun/star/rendering/PanoseArmStyle/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/panose_arm_style.pyi
rename to com/sun/star/rendering/PanoseArmStyle/__init__.pyi
diff --git a/com/sun/star/rendering/PanoseContrast.pyi b/com/sun/star/rendering/PanoseContrast.pyi
deleted file mode 100644
index c493cad68..000000000
--- a/com/sun/star/rendering/PanoseContrast.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.panose_contrast import *
diff --git a/com/sun/star/_pyi/rendering/panose_contrast.pyi b/com/sun/star/rendering/PanoseContrast/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/panose_contrast.pyi
rename to com/sun/star/rendering/PanoseContrast/__init__.pyi
diff --git a/com/sun/star/rendering/PanoseFamilyTypes.pyi b/com/sun/star/rendering/PanoseFamilyTypes.pyi
deleted file mode 100644
index 5d70f5913..000000000
--- a/com/sun/star/rendering/PanoseFamilyTypes.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.panose_family_types import *
diff --git a/com/sun/star/_pyi/rendering/panose_family_types.pyi b/com/sun/star/rendering/PanoseFamilyTypes/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/panose_family_types.pyi
rename to com/sun/star/rendering/PanoseFamilyTypes/__init__.pyi
diff --git a/com/sun/star/rendering/PanoseLetterForm.pyi b/com/sun/star/rendering/PanoseLetterForm.pyi
deleted file mode 100644
index b0d5e0412..000000000
--- a/com/sun/star/rendering/PanoseLetterForm.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.panose_letter_form import *
diff --git a/com/sun/star/_pyi/rendering/panose_letter_form.pyi b/com/sun/star/rendering/PanoseLetterForm/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/panose_letter_form.pyi
rename to com/sun/star/rendering/PanoseLetterForm/__init__.pyi
diff --git a/com/sun/star/rendering/PanoseMidline.pyi b/com/sun/star/rendering/PanoseMidline.pyi
deleted file mode 100644
index 7138135c8..000000000
--- a/com/sun/star/rendering/PanoseMidline.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.panose_midline import *
diff --git a/com/sun/star/_pyi/rendering/panose_midline.pyi b/com/sun/star/rendering/PanoseMidline/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/panose_midline.pyi
rename to com/sun/star/rendering/PanoseMidline/__init__.pyi
diff --git a/com/sun/star/rendering/PanoseProportion.pyi b/com/sun/star/rendering/PanoseProportion.pyi
deleted file mode 100644
index 257ac9709..000000000
--- a/com/sun/star/rendering/PanoseProportion.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.panose_proportion import *
diff --git a/com/sun/star/_pyi/rendering/panose_proportion.pyi b/com/sun/star/rendering/PanoseProportion/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/panose_proportion.pyi
rename to com/sun/star/rendering/PanoseProportion/__init__.pyi
diff --git a/com/sun/star/rendering/PanoseSerifStyle.pyi b/com/sun/star/rendering/PanoseSerifStyle.pyi
deleted file mode 100644
index 655774bb9..000000000
--- a/com/sun/star/rendering/PanoseSerifStyle.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.panose_serif_style import *
diff --git a/com/sun/star/_pyi/rendering/panose_serif_style.pyi b/com/sun/star/rendering/PanoseSerifStyle/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/panose_serif_style.pyi
rename to com/sun/star/rendering/PanoseSerifStyle/__init__.pyi
diff --git a/com/sun/star/rendering/PanoseStrokeVariation.pyi b/com/sun/star/rendering/PanoseStrokeVariation.pyi
deleted file mode 100644
index 42b0a0927..000000000
--- a/com/sun/star/rendering/PanoseStrokeVariation.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.panose_stroke_variation import *
diff --git a/com/sun/star/_pyi/rendering/panose_stroke_variation.pyi b/com/sun/star/rendering/PanoseStrokeVariation/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/panose_stroke_variation.pyi
rename to com/sun/star/rendering/PanoseStrokeVariation/__init__.pyi
diff --git a/com/sun/star/rendering/PanoseWeight.pyi b/com/sun/star/rendering/PanoseWeight.pyi
deleted file mode 100644
index 74f7088e3..000000000
--- a/com/sun/star/rendering/PanoseWeight.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.panose_weight import *
diff --git a/com/sun/star/_pyi/rendering/panose_weight.pyi b/com/sun/star/rendering/PanoseWeight/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/panose_weight.pyi
rename to com/sun/star/rendering/PanoseWeight/__init__.pyi
diff --git a/com/sun/star/rendering/PanoseXHeight.pyi b/com/sun/star/rendering/PanoseXHeight.pyi
deleted file mode 100644
index 3109d83d2..000000000
--- a/com/sun/star/rendering/PanoseXHeight.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.panose_x_height import *
diff --git a/com/sun/star/_pyi/rendering/panose_x_height.pyi b/com/sun/star/rendering/PanoseXHeight/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/panose_x_height.pyi
rename to com/sun/star/rendering/PanoseXHeight/__init__.pyi
diff --git a/com/sun/star/rendering/PathCapType.pyi b/com/sun/star/rendering/PathCapType.pyi
deleted file mode 100644
index 2f9f685a7..000000000
--- a/com/sun/star/rendering/PathCapType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.path_cap_type import *
diff --git a/com/sun/star/_pyi/rendering/path_cap_type.pyi b/com/sun/star/rendering/PathCapType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/path_cap_type.pyi
rename to com/sun/star/rendering/PathCapType/__init__.pyi
diff --git a/com/sun/star/rendering/PathJoinType.pyi b/com/sun/star/rendering/PathJoinType.pyi
deleted file mode 100644
index 923dd8bc6..000000000
--- a/com/sun/star/rendering/PathJoinType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.path_join_type import *
diff --git a/com/sun/star/_pyi/rendering/path_join_type.pyi b/com/sun/star/rendering/PathJoinType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/path_join_type.pyi
rename to com/sun/star/rendering/PathJoinType/__init__.pyi
diff --git a/com/sun/star/rendering/RenderingIntent.pyi b/com/sun/star/rendering/RenderingIntent.pyi
deleted file mode 100644
index 66fd4588b..000000000
--- a/com/sun/star/rendering/RenderingIntent.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.rendering_intent import *
diff --git a/com/sun/star/_pyi/rendering/rendering_intent.pyi b/com/sun/star/rendering/RenderingIntent/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/rendering_intent.pyi
rename to com/sun/star/rendering/RenderingIntent/__init__.pyi
diff --git a/com/sun/star/rendering/RepaintResult.pyi b/com/sun/star/rendering/RepaintResult.pyi
deleted file mode 100644
index 2dbdfaad3..000000000
--- a/com/sun/star/rendering/RepaintResult.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.repaint_result import *
diff --git a/com/sun/star/_pyi/rendering/repaint_result.pyi b/com/sun/star/rendering/RepaintResult/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/repaint_result.pyi
rename to com/sun/star/rendering/RepaintResult/__init__.pyi
diff --git a/com/sun/star/rendering/TextDirection.pyi b/com/sun/star/rendering/TextDirection.pyi
deleted file mode 100644
index 426d49d8c..000000000
--- a/com/sun/star/rendering/TextDirection.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.text_direction import *
diff --git a/com/sun/star/_pyi/rendering/text_direction.pyi b/com/sun/star/rendering/TextDirection/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/text_direction.pyi
rename to com/sun/star/rendering/TextDirection/__init__.pyi
diff --git a/com/sun/star/rendering/TexturingMode.pyi b/com/sun/star/rendering/TexturingMode.pyi
deleted file mode 100644
index f2eeb2d05..000000000
--- a/com/sun/star/rendering/TexturingMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.rendering.texturing_mode import *
diff --git a/com/sun/star/_pyi/rendering/texturing_mode.pyi b/com/sun/star/rendering/TexturingMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/rendering/texturing_mode.pyi
rename to com/sun/star/rendering/TexturingMode/__init__.pyi
diff --git a/com/sun/star/report/Calculation.pyi b/com/sun/star/report/Calculation.pyi
deleted file mode 100644
index aabd615f3..000000000
--- a/com/sun/star/report/Calculation.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.report.calculation import *
diff --git a/com/sun/star/_pyi/report/calculation.pyi b/com/sun/star/report/Calculation/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/report/calculation.pyi
rename to com/sun/star/report/Calculation/__init__.pyi
diff --git a/com/sun/star/report/ForceNewPage.pyi b/com/sun/star/report/ForceNewPage.pyi
deleted file mode 100644
index bf84c1eb1..000000000
--- a/com/sun/star/report/ForceNewPage.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.report.force_new_page import *
diff --git a/com/sun/star/_pyi/report/force_new_page.pyi b/com/sun/star/report/ForceNewPage/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/report/force_new_page.pyi
rename to com/sun/star/report/ForceNewPage/__init__.pyi
diff --git a/com/sun/star/report/GroupKeepTogether.pyi b/com/sun/star/report/GroupKeepTogether.pyi
deleted file mode 100644
index a895d7e7a..000000000
--- a/com/sun/star/report/GroupKeepTogether.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.report.group_keep_together import *
diff --git a/com/sun/star/_pyi/report/group_keep_together.pyi b/com/sun/star/report/GroupKeepTogether/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/report/group_keep_together.pyi
rename to com/sun/star/report/GroupKeepTogether/__init__.pyi
diff --git a/com/sun/star/report/GroupOn.pyi b/com/sun/star/report/GroupOn.pyi
deleted file mode 100644
index b70dbc005..000000000
--- a/com/sun/star/report/GroupOn.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.report.group_on import *
diff --git a/com/sun/star/_pyi/report/group_on.pyi b/com/sun/star/report/GroupOn/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/report/group_on.pyi
rename to com/sun/star/report/GroupOn/__init__.pyi
diff --git a/com/sun/star/report/KeepTogether.pyi b/com/sun/star/report/KeepTogether.pyi
deleted file mode 100644
index a59300e75..000000000
--- a/com/sun/star/report/KeepTogether.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.report.keep_together import *
diff --git a/com/sun/star/_pyi/report/keep_together.pyi b/com/sun/star/report/KeepTogether/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/report/keep_together.pyi
rename to com/sun/star/report/KeepTogether/__init__.pyi
diff --git a/com/sun/star/report/ReportPrintOption.pyi b/com/sun/star/report/ReportPrintOption.pyi
deleted file mode 100644
index 4e9c7abf1..000000000
--- a/com/sun/star/report/ReportPrintOption.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.report.report_print_option import *
diff --git a/com/sun/star/_pyi/report/report_print_option.pyi b/com/sun/star/report/ReportPrintOption/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/report/report_print_option.pyi
rename to com/sun/star/report/ReportPrintOption/__init__.pyi
diff --git a/com/sun/star/report/SectionPageBreak.pyi b/com/sun/star/report/SectionPageBreak.pyi
deleted file mode 100644
index b80cba2c9..000000000
--- a/com/sun/star/report/SectionPageBreak.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.report.section_page_break import *
diff --git a/com/sun/star/_pyi/report/section_page_break.pyi b/com/sun/star/report/SectionPageBreak/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/report/section_page_break.pyi
rename to com/sun/star/report/SectionPageBreak/__init__.pyi
diff --git a/com/sun/star/scanner/ScanError.pyi b/com/sun/star/scanner/ScanError.pyi
deleted file mode 100644
index 8951c6d84..000000000
--- a/com/sun/star/scanner/ScanError.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.scanner.scan_error import *
diff --git a/com/sun/star/_pyi/scanner/scan_error.pyi b/com/sun/star/scanner/ScanError/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/scanner/scan_error.pyi
rename to com/sun/star/scanner/ScanError/__init__.pyi
diff --git a/com/sun/star/script/FailReason.pyi b/com/sun/star/script/FailReason.pyi
deleted file mode 100644
index f83fb67cc..000000000
--- a/com/sun/star/script/FailReason.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.script.fail_reason import *
diff --git a/com/sun/star/_pyi/script/fail_reason.pyi b/com/sun/star/script/FailReason/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/script/fail_reason.pyi
rename to com/sun/star/script/FailReason/__init__.pyi
diff --git a/com/sun/star/script/FinishReason.pyi b/com/sun/star/script/FinishReason.pyi
deleted file mode 100644
index 775949cb3..000000000
--- a/com/sun/star/script/FinishReason.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.script.finish_reason import *
diff --git a/com/sun/star/_pyi/script/finish_reason.pyi b/com/sun/star/script/FinishReason/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/script/finish_reason.pyi
rename to com/sun/star/script/FinishReason/__init__.pyi
diff --git a/com/sun/star/script/InterruptReason.pyi b/com/sun/star/script/InterruptReason.pyi
deleted file mode 100644
index d15d6ecf6..000000000
--- a/com/sun/star/script/InterruptReason.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.script.interrupt_reason import *
diff --git a/com/sun/star/_pyi/script/interrupt_reason.pyi b/com/sun/star/script/InterruptReason/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/script/interrupt_reason.pyi
rename to com/sun/star/script/InterruptReason/__init__.pyi
diff --git a/com/sun/star/script/MemberType.pyi b/com/sun/star/script/MemberType.pyi
deleted file mode 100644
index 3b5bf9d20..000000000
--- a/com/sun/star/script/MemberType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.script.member_type import *
diff --git a/com/sun/star/_pyi/script/member_type.pyi b/com/sun/star/script/MemberType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/script/member_type.pyi
rename to com/sun/star/script/MemberType/__init__.pyi
diff --git a/com/sun/star/script/ModuleType.pyi b/com/sun/star/script/ModuleType.pyi
deleted file mode 100644
index 59590880b..000000000
--- a/com/sun/star/script/ModuleType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.script.module_type import *
diff --git a/com/sun/star/_pyi/script/module_type.pyi b/com/sun/star/script/ModuleType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/script/module_type.pyi
rename to com/sun/star/script/ModuleType/__init__.pyi
diff --git a/com/sun/star/script/browse/BrowseNodeFactoryViewTypes.pyi b/com/sun/star/script/browse/BrowseNodeFactoryViewTypes.pyi
deleted file mode 100644
index 031646ad9..000000000
--- a/com/sun/star/script/browse/BrowseNodeFactoryViewTypes.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.script.browse.browse_node_factory_view_types import *
diff --git a/com/sun/star/_pyi/script/browse/browse_node_factory_view_types.pyi b/com/sun/star/script/browse/BrowseNodeFactoryViewTypes/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/script/browse/browse_node_factory_view_types.pyi
rename to com/sun/star/script/browse/BrowseNodeFactoryViewTypes/__init__.pyi
diff --git a/com/sun/star/script/browse/BrowseNodeTypes.pyi b/com/sun/star/script/browse/BrowseNodeTypes.pyi
deleted file mode 100644
index b9c876f3d..000000000
--- a/com/sun/star/script/browse/BrowseNodeTypes.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.script.browse.browse_node_types import *
diff --git a/com/sun/star/_pyi/script/browse/browse_node_types.pyi b/com/sun/star/script/browse/BrowseNodeTypes/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/script/browse/browse_node_types.pyi
rename to com/sun/star/script/browse/BrowseNodeTypes/__init__.pyi
diff --git a/com/sun/star/script/provider/ScriptFrameworkErrorType.pyi b/com/sun/star/script/provider/ScriptFrameworkErrorType.pyi
deleted file mode 100644
index 820557c9b..000000000
--- a/com/sun/star/script/provider/ScriptFrameworkErrorType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.script.provider.script_framework_error_type import *
diff --git a/com/sun/star/_pyi/script/provider/script_framework_error_type.pyi b/com/sun/star/script/provider/ScriptFrameworkErrorType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/script/provider/script_framework_error_type.pyi
rename to com/sun/star/script/provider/ScriptFrameworkErrorType/__init__.pyi
diff --git a/com/sun/star/script/vba/VBAEventId.pyi b/com/sun/star/script/vba/VBAEventId.pyi
deleted file mode 100644
index 3191bc996..000000000
--- a/com/sun/star/script/vba/VBAEventId.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.script.vba.vba_event_id import *
diff --git a/com/sun/star/_pyi/script/vba/vba_event_id.pyi b/com/sun/star/script/vba/VBAEventId/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/script/vba/vba_event_id.pyi
rename to com/sun/star/script/vba/VBAEventId/__init__.pyi
diff --git a/com/sun/star/script/vba/VBAScriptEventId.pyi b/com/sun/star/script/vba/VBAScriptEventId.pyi
deleted file mode 100644
index a06236b88..000000000
--- a/com/sun/star/script/vba/VBAScriptEventId.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.script.vba.vba_script_event_id import *
diff --git a/com/sun/star/_pyi/script/vba/vba_script_event_id.pyi b/com/sun/star/script/vba/VBAScriptEventId/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/script/vba/vba_script_event_id.pyi
rename to com/sun/star/script/vba/VBAScriptEventId/__init__.pyi
diff --git a/com/sun/star/sdb/BooleanComparisonMode.pyi b/com/sun/star/sdb/BooleanComparisonMode.pyi
deleted file mode 100644
index b1639b075..000000000
--- a/com/sun/star/sdb/BooleanComparisonMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdb.boolean_comparison_mode import *
diff --git a/com/sun/star/_pyi/sdb/boolean_comparison_mode.pyi b/com/sun/star/sdb/BooleanComparisonMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdb/boolean_comparison_mode.pyi
rename to com/sun/star/sdb/BooleanComparisonMode/__init__.pyi
diff --git a/com/sun/star/sdb/CommandType.pyi b/com/sun/star/sdb/CommandType.pyi
deleted file mode 100644
index 48b9a4ea6..000000000
--- a/com/sun/star/sdb/CommandType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdb.command_type import *
diff --git a/com/sun/star/_pyi/sdb/command_type.pyi b/com/sun/star/sdb/CommandType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdb/command_type.pyi
rename to com/sun/star/sdb/CommandType/__init__.pyi
diff --git a/com/sun/star/sdb/ErrorCondition.pyi b/com/sun/star/sdb/ErrorCondition.pyi
deleted file mode 100644
index 68e820ead..000000000
--- a/com/sun/star/sdb/ErrorCondition.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdb.error_condition import *
diff --git a/com/sun/star/_pyi/sdb/error_condition.pyi b/com/sun/star/sdb/ErrorCondition/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdb/error_condition.pyi
rename to com/sun/star/sdb/ErrorCondition/__init__.pyi
diff --git a/com/sun/star/sdb/RowChangeAction.pyi b/com/sun/star/sdb/RowChangeAction.pyi
deleted file mode 100644
index 91c43bc9f..000000000
--- a/com/sun/star/sdb/RowChangeAction.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdb.row_change_action import *
diff --git a/com/sun/star/_pyi/sdb/row_change_action.pyi b/com/sun/star/sdb/RowChangeAction/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdb/row_change_action.pyi
rename to com/sun/star/sdb/RowChangeAction/__init__.pyi
diff --git a/com/sun/star/sdb/SQLFilterOperator.pyi b/com/sun/star/sdb/SQLFilterOperator.pyi
deleted file mode 100644
index 683914ab5..000000000
--- a/com/sun/star/sdb/SQLFilterOperator.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdb.sql_filter_operator import *
diff --git a/com/sun/star/_pyi/sdb/sql_filter_operator.pyi b/com/sun/star/sdb/SQLFilterOperator/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdb/sql_filter_operator.pyi
rename to com/sun/star/sdb/SQLFilterOperator/__init__.pyi
diff --git a/com/sun/star/sdb/application/CopyTableContinuation.pyi b/com/sun/star/sdb/application/CopyTableContinuation.pyi
deleted file mode 100644
index b0c37ede9..000000000
--- a/com/sun/star/sdb/application/CopyTableContinuation.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.sdb.application.copy_table_continuation import *
diff --git a/com/sun/star/_pyi/sdb/application/copy_table_continuation.pyi b/com/sun/star/sdb/application/CopyTableContinuation/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdb/application/copy_table_continuation.pyi
rename to com/sun/star/sdb/application/CopyTableContinuation/__init__.pyi
diff --git a/com/sun/star/sdb/application/CopyTableOperation.pyi b/com/sun/star/sdb/application/CopyTableOperation.pyi
deleted file mode 100644
index 3c81a70f7..000000000
--- a/com/sun/star/sdb/application/CopyTableOperation.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.sdb.application.copy_table_operation import *
diff --git a/com/sun/star/_pyi/sdb/application/copy_table_operation.pyi b/com/sun/star/sdb/application/CopyTableOperation/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdb/application/copy_table_operation.pyi
rename to com/sun/star/sdb/application/CopyTableOperation/__init__.pyi
diff --git a/com/sun/star/sdb/application/DatabaseObject.pyi b/com/sun/star/sdb/application/DatabaseObject.pyi
deleted file mode 100644
index a81044740..000000000
--- a/com/sun/star/sdb/application/DatabaseObject.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.sdb.application.database_object import *
diff --git a/com/sun/star/_pyi/sdb/application/database_object.pyi b/com/sun/star/sdb/application/DatabaseObject/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdb/application/database_object.pyi
rename to com/sun/star/sdb/application/DatabaseObject/__init__.pyi
diff --git a/com/sun/star/sdb/application/DatabaseObjectContainer.pyi b/com/sun/star/sdb/application/DatabaseObjectContainer.pyi
deleted file mode 100644
index 7c268f691..000000000
--- a/com/sun/star/sdb/application/DatabaseObjectContainer.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.sdb.application.database_object_container import *
diff --git a/com/sun/star/_pyi/sdb/application/database_object_container.pyi b/com/sun/star/sdb/application/DatabaseObjectContainer/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdb/application/database_object_container.pyi
rename to com/sun/star/sdb/application/DatabaseObjectContainer/__init__.pyi
diff --git a/com/sun/star/sdb/tools/CompositionType.pyi b/com/sun/star/sdb/tools/CompositionType.pyi
deleted file mode 100644
index eb9c59310..000000000
--- a/com/sun/star/sdb/tools/CompositionType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.sdb.tools.composition_type import *
diff --git a/com/sun/star/_pyi/sdb/tools/composition_type.pyi b/com/sun/star/sdb/tools/CompositionType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdb/tools/composition_type.pyi
rename to com/sun/star/sdb/tools/CompositionType/__init__.pyi
diff --git a/com/sun/star/sdbc/BestRowScope.pyi b/com/sun/star/sdbc/BestRowScope.pyi
deleted file mode 100644
index 9ab81d87b..000000000
--- a/com/sun/star/sdbc/BestRowScope.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdbc.best_row_scope import *
diff --git a/com/sun/star/_pyi/sdbc/best_row_scope.pyi b/com/sun/star/sdbc/BestRowScope/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdbc/best_row_scope.pyi
rename to com/sun/star/sdbc/BestRowScope/__init__.pyi
diff --git a/com/sun/star/sdbc/BestRowType.pyi b/com/sun/star/sdbc/BestRowType.pyi
deleted file mode 100644
index 7e518bfa7..000000000
--- a/com/sun/star/sdbc/BestRowType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdbc.best_row_type import *
diff --git a/com/sun/star/_pyi/sdbc/best_row_type.pyi b/com/sun/star/sdbc/BestRowType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdbc/best_row_type.pyi
rename to com/sun/star/sdbc/BestRowType/__init__.pyi
diff --git a/com/sun/star/sdbc/ChangeAction.pyi b/com/sun/star/sdbc/ChangeAction.pyi
deleted file mode 100644
index 3c6fed0c4..000000000
--- a/com/sun/star/sdbc/ChangeAction.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdbc.change_action import *
diff --git a/com/sun/star/_pyi/sdbc/change_action.pyi b/com/sun/star/sdbc/ChangeAction/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdbc/change_action.pyi
rename to com/sun/star/sdbc/ChangeAction/__init__.pyi
diff --git a/com/sun/star/sdbc/ColumnSearch.pyi b/com/sun/star/sdbc/ColumnSearch.pyi
deleted file mode 100644
index 185e090a4..000000000
--- a/com/sun/star/sdbc/ColumnSearch.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdbc.column_search import *
diff --git a/com/sun/star/_pyi/sdbc/column_search.pyi b/com/sun/star/sdbc/ColumnSearch/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdbc/column_search.pyi
rename to com/sun/star/sdbc/ColumnSearch/__init__.pyi
diff --git a/com/sun/star/sdbc/ColumnType.pyi b/com/sun/star/sdbc/ColumnType.pyi
deleted file mode 100644
index a5debd94e..000000000
--- a/com/sun/star/sdbc/ColumnType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdbc.column_type import *
diff --git a/com/sun/star/_pyi/sdbc/column_type.pyi b/com/sun/star/sdbc/ColumnType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdbc/column_type.pyi
rename to com/sun/star/sdbc/ColumnType/__init__.pyi
diff --git a/com/sun/star/sdbc/ColumnValue.pyi b/com/sun/star/sdbc/ColumnValue.pyi
deleted file mode 100644
index f91e3fc04..000000000
--- a/com/sun/star/sdbc/ColumnValue.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdbc.column_value import *
diff --git a/com/sun/star/_pyi/sdbc/column_value.pyi b/com/sun/star/sdbc/ColumnValue/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdbc/column_value.pyi
rename to com/sun/star/sdbc/ColumnValue/__init__.pyi
diff --git a/com/sun/star/sdbc/DataType.pyi b/com/sun/star/sdbc/DataType.pyi
deleted file mode 100644
index 44685a26e..000000000
--- a/com/sun/star/sdbc/DataType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdbc.data_type import *
diff --git a/com/sun/star/_pyi/sdbc/data_type.pyi b/com/sun/star/sdbc/DataType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdbc/data_type.pyi
rename to com/sun/star/sdbc/DataType/__init__.pyi
diff --git a/com/sun/star/sdbc/Deferrability.pyi b/com/sun/star/sdbc/Deferrability.pyi
deleted file mode 100644
index e4a0b50ed..000000000
--- a/com/sun/star/sdbc/Deferrability.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdbc.deferrability import *
diff --git a/com/sun/star/_pyi/sdbc/deferrability.pyi b/com/sun/star/sdbc/Deferrability/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdbc/deferrability.pyi
rename to com/sun/star/sdbc/Deferrability/__init__.pyi
diff --git a/com/sun/star/sdbc/FetchDirection.pyi b/com/sun/star/sdbc/FetchDirection.pyi
deleted file mode 100644
index 9f1adbda7..000000000
--- a/com/sun/star/sdbc/FetchDirection.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdbc.fetch_direction import *
diff --git a/com/sun/star/_pyi/sdbc/fetch_direction.pyi b/com/sun/star/sdbc/FetchDirection/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdbc/fetch_direction.pyi
rename to com/sun/star/sdbc/FetchDirection/__init__.pyi
diff --git a/com/sun/star/sdbc/IndexType.pyi b/com/sun/star/sdbc/IndexType.pyi
deleted file mode 100644
index a18dbf8e6..000000000
--- a/com/sun/star/sdbc/IndexType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdbc.index_type import *
diff --git a/com/sun/star/_pyi/sdbc/index_type.pyi b/com/sun/star/sdbc/IndexType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdbc/index_type.pyi
rename to com/sun/star/sdbc/IndexType/__init__.pyi
diff --git a/com/sun/star/sdbc/KeyRule.pyi b/com/sun/star/sdbc/KeyRule.pyi
deleted file mode 100644
index 42add1c7b..000000000
--- a/com/sun/star/sdbc/KeyRule.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdbc.key_rule import *
diff --git a/com/sun/star/_pyi/sdbc/key_rule.pyi b/com/sun/star/sdbc/KeyRule/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdbc/key_rule.pyi
rename to com/sun/star/sdbc/KeyRule/__init__.pyi
diff --git a/com/sun/star/sdbc/ProcedureColumn.pyi b/com/sun/star/sdbc/ProcedureColumn.pyi
deleted file mode 100644
index 70bc228d5..000000000
--- a/com/sun/star/sdbc/ProcedureColumn.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdbc.procedure_column import *
diff --git a/com/sun/star/_pyi/sdbc/procedure_column.pyi b/com/sun/star/sdbc/ProcedureColumn/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdbc/procedure_column.pyi
rename to com/sun/star/sdbc/ProcedureColumn/__init__.pyi
diff --git a/com/sun/star/sdbc/ProcedureResult.pyi b/com/sun/star/sdbc/ProcedureResult.pyi
deleted file mode 100644
index 2259c776c..000000000
--- a/com/sun/star/sdbc/ProcedureResult.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdbc.procedure_result import *
diff --git a/com/sun/star/_pyi/sdbc/procedure_result.pyi b/com/sun/star/sdbc/ProcedureResult/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdbc/procedure_result.pyi
rename to com/sun/star/sdbc/ProcedureResult/__init__.pyi
diff --git a/com/sun/star/sdbc/ResultSetConcurrency.pyi b/com/sun/star/sdbc/ResultSetConcurrency.pyi
deleted file mode 100644
index f06a1ced1..000000000
--- a/com/sun/star/sdbc/ResultSetConcurrency.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdbc.result_set_concurrency import *
diff --git a/com/sun/star/_pyi/sdbc/result_set_concurrency.pyi b/com/sun/star/sdbc/ResultSetConcurrency/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdbc/result_set_concurrency.pyi
rename to com/sun/star/sdbc/ResultSetConcurrency/__init__.pyi
diff --git a/com/sun/star/sdbc/ResultSetType.pyi b/com/sun/star/sdbc/ResultSetType.pyi
deleted file mode 100644
index 91527d0ba..000000000
--- a/com/sun/star/sdbc/ResultSetType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdbc.result_set_type import *
diff --git a/com/sun/star/_pyi/sdbc/result_set_type.pyi b/com/sun/star/sdbc/ResultSetType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdbc/result_set_type.pyi
rename to com/sun/star/sdbc/ResultSetType/__init__.pyi
diff --git a/com/sun/star/sdbc/TransactionIsolation.pyi b/com/sun/star/sdbc/TransactionIsolation.pyi
deleted file mode 100644
index 624e1dfdb..000000000
--- a/com/sun/star/sdbc/TransactionIsolation.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdbc.transaction_isolation import *
diff --git a/com/sun/star/_pyi/sdbc/transaction_isolation.pyi b/com/sun/star/sdbc/TransactionIsolation/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdbc/transaction_isolation.pyi
rename to com/sun/star/sdbc/TransactionIsolation/__init__.pyi
diff --git a/com/sun/star/sdbcx/CheckOption.pyi b/com/sun/star/sdbcx/CheckOption.pyi
deleted file mode 100644
index 73cafbfff..000000000
--- a/com/sun/star/sdbcx/CheckOption.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdbcx.check_option import *
diff --git a/com/sun/star/_pyi/sdbcx/check_option.pyi b/com/sun/star/sdbcx/CheckOption/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdbcx/check_option.pyi
rename to com/sun/star/sdbcx/CheckOption/__init__.pyi
diff --git a/com/sun/star/sdbcx/CompareBookmark.pyi b/com/sun/star/sdbcx/CompareBookmark.pyi
deleted file mode 100644
index 40f54b0e6..000000000
--- a/com/sun/star/sdbcx/CompareBookmark.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdbcx.compare_bookmark import *
diff --git a/com/sun/star/_pyi/sdbcx/compare_bookmark.pyi b/com/sun/star/sdbcx/CompareBookmark/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdbcx/compare_bookmark.pyi
rename to com/sun/star/sdbcx/CompareBookmark/__init__.pyi
diff --git a/com/sun/star/sdbcx/KeyType.pyi b/com/sun/star/sdbcx/KeyType.pyi
deleted file mode 100644
index 885372026..000000000
--- a/com/sun/star/sdbcx/KeyType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdbcx.key_type import *
diff --git a/com/sun/star/_pyi/sdbcx/key_type.pyi b/com/sun/star/sdbcx/KeyType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdbcx/key_type.pyi
rename to com/sun/star/sdbcx/KeyType/__init__.pyi
diff --git a/com/sun/star/sdbcx/Privilege.pyi b/com/sun/star/sdbcx/Privilege.pyi
deleted file mode 100644
index 220e41cd9..000000000
--- a/com/sun/star/sdbcx/Privilege.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdbcx.privilege import *
diff --git a/com/sun/star/_pyi/sdbcx/privilege.pyi b/com/sun/star/sdbcx/Privilege/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdbcx/privilege.pyi
rename to com/sun/star/sdbcx/Privilege/__init__.pyi
diff --git a/com/sun/star/sdbcx/PrivilegeObject.pyi b/com/sun/star/sdbcx/PrivilegeObject.pyi
deleted file mode 100644
index efe6cc660..000000000
--- a/com/sun/star/sdbcx/PrivilegeObject.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sdbcx.privilege_object import *
diff --git a/com/sun/star/_pyi/sdbcx/privilege_object.pyi b/com/sun/star/sdbcx/PrivilegeObject/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sdbcx/privilege_object.pyi
rename to com/sun/star/sdbcx/PrivilegeObject/__init__.pyi
diff --git a/com/sun/star/security/CertificateCharacters.pyi b/com/sun/star/security/CertificateCharacters.pyi
deleted file mode 100644
index fd71e6b31..000000000
--- a/com/sun/star/security/CertificateCharacters.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.security.certificate_characters import *
diff --git a/com/sun/star/_pyi/security/certificate_characters.pyi b/com/sun/star/security/CertificateCharacters/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/security/certificate_characters.pyi
rename to com/sun/star/security/CertificateCharacters/__init__.pyi
diff --git a/com/sun/star/security/CertificateContainerStatus.pyi b/com/sun/star/security/CertificateContainerStatus.pyi
deleted file mode 100644
index 9c837a28c..000000000
--- a/com/sun/star/security/CertificateContainerStatus.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.security.certificate_container_status import *
diff --git a/com/sun/star/_pyi/security/certificate_container_status.pyi b/com/sun/star/security/CertificateContainerStatus/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/security/certificate_container_status.pyi
rename to com/sun/star/security/CertificateContainerStatus/__init__.pyi
diff --git a/com/sun/star/security/CertificateKind.pyi b/com/sun/star/security/CertificateKind.pyi
deleted file mode 100644
index 528d64ea9..000000000
--- a/com/sun/star/security/CertificateKind.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.security.certificate_kind import *
diff --git a/com/sun/star/_pyi/security/certificate_kind.pyi b/com/sun/star/security/CertificateKind/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/security/certificate_kind.pyi
rename to com/sun/star/security/CertificateKind/__init__.pyi
diff --git a/com/sun/star/security/CertificateValidity.pyi b/com/sun/star/security/CertificateValidity.pyi
deleted file mode 100644
index 6ac6db970..000000000
--- a/com/sun/star/security/CertificateValidity.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.security.certificate_validity import *
diff --git a/com/sun/star/_pyi/security/certificate_validity.pyi b/com/sun/star/security/CertificateValidity/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/security/certificate_validity.pyi
rename to com/sun/star/security/CertificateValidity/__init__.pyi
diff --git a/com/sun/star/security/ExtAltNameType.pyi b/com/sun/star/security/ExtAltNameType.pyi
deleted file mode 100644
index 9f5c17552..000000000
--- a/com/sun/star/security/ExtAltNameType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.security.ext_alt_name_type import *
diff --git a/com/sun/star/_pyi/security/ext_alt_name_type.pyi b/com/sun/star/security/ExtAltNameType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/security/ext_alt_name_type.pyi
rename to com/sun/star/security/ExtAltNameType/__init__.pyi
diff --git a/com/sun/star/security/KeyUsage.pyi b/com/sun/star/security/KeyUsage.pyi
deleted file mode 100644
index 11327a897..000000000
--- a/com/sun/star/security/KeyUsage.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.security.key_usage import *
diff --git a/com/sun/star/_pyi/security/key_usage.pyi b/com/sun/star/security/KeyUsage/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/security/key_usage.pyi
rename to com/sun/star/security/KeyUsage/__init__.pyi
diff --git a/com/sun/star/sheet/AddressConvention.pyi b/com/sun/star/sheet/AddressConvention.pyi
deleted file mode 100644
index c5bdd8ff9..000000000
--- a/com/sun/star/sheet/AddressConvention.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.address_convention import *
diff --git a/com/sun/star/_pyi/sheet/address_convention.pyi b/com/sun/star/sheet/AddressConvention/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/address_convention.pyi
rename to com/sun/star/sheet/AddressConvention/__init__.pyi
diff --git a/com/sun/star/sheet/Border.pyi b/com/sun/star/sheet/Border.pyi
deleted file mode 100644
index d5668026f..000000000
--- a/com/sun/star/sheet/Border.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.border import *
diff --git a/com/sun/star/_pyi/sheet/border.pyi b/com/sun/star/sheet/Border/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/border.pyi
rename to com/sun/star/sheet/Border/__init__.pyi
diff --git a/com/sun/star/sheet/CellDeleteMode.pyi b/com/sun/star/sheet/CellDeleteMode.pyi
deleted file mode 100644
index 07aaebcfe..000000000
--- a/com/sun/star/sheet/CellDeleteMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.cell_delete_mode import *
diff --git a/com/sun/star/_pyi/sheet/cell_delete_mode.pyi b/com/sun/star/sheet/CellDeleteMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/cell_delete_mode.pyi
rename to com/sun/star/sheet/CellDeleteMode/__init__.pyi
diff --git a/com/sun/star/sheet/CellFlags.pyi b/com/sun/star/sheet/CellFlags.pyi
deleted file mode 100644
index 3274b0dd5..000000000
--- a/com/sun/star/sheet/CellFlags.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.cell_flags import *
diff --git a/com/sun/star/_pyi/sheet/cell_flags.pyi b/com/sun/star/sheet/CellFlags/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/cell_flags.pyi
rename to com/sun/star/sheet/CellFlags/__init__.pyi
diff --git a/com/sun/star/sheet/CellInsertMode.pyi b/com/sun/star/sheet/CellInsertMode.pyi
deleted file mode 100644
index 131759025..000000000
--- a/com/sun/star/sheet/CellInsertMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.cell_insert_mode import *
diff --git a/com/sun/star/_pyi/sheet/cell_insert_mode.pyi b/com/sun/star/sheet/CellInsertMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/cell_insert_mode.pyi
rename to com/sun/star/sheet/CellInsertMode/__init__.pyi
diff --git a/com/sun/star/sheet/ColorScaleEntryType.pyi b/com/sun/star/sheet/ColorScaleEntryType.pyi
deleted file mode 100644
index 38363cb13..000000000
--- a/com/sun/star/sheet/ColorScaleEntryType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.color_scale_entry_type import *
diff --git a/com/sun/star/_pyi/sheet/color_scale_entry_type.pyi b/com/sun/star/sheet/ColorScaleEntryType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/color_scale_entry_type.pyi
rename to com/sun/star/sheet/ColorScaleEntryType/__init__.pyi
diff --git a/com/sun/star/sheet/ConditionEntryType.pyi b/com/sun/star/sheet/ConditionEntryType.pyi
deleted file mode 100644
index b68362b3a..000000000
--- a/com/sun/star/sheet/ConditionEntryType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.condition_entry_type import *
diff --git a/com/sun/star/_pyi/sheet/condition_entry_type.pyi b/com/sun/star/sheet/ConditionEntryType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/condition_entry_type.pyi
rename to com/sun/star/sheet/ConditionEntryType/__init__.pyi
diff --git a/com/sun/star/sheet/ConditionFormatOperator.pyi b/com/sun/star/sheet/ConditionFormatOperator.pyi
deleted file mode 100644
index 2abec2d9a..000000000
--- a/com/sun/star/sheet/ConditionFormatOperator.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.condition_format_operator import *
diff --git a/com/sun/star/_pyi/sheet/condition_format_operator.pyi b/com/sun/star/sheet/ConditionFormatOperator/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/condition_format_operator.pyi
rename to com/sun/star/sheet/ConditionFormatOperator/__init__.pyi
diff --git a/com/sun/star/sheet/ConditionOperator.pyi b/com/sun/star/sheet/ConditionOperator.pyi
deleted file mode 100644
index 9843bc527..000000000
--- a/com/sun/star/sheet/ConditionOperator.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.condition_operator import *
diff --git a/com/sun/star/_pyi/sheet/condition_operator.pyi b/com/sun/star/sheet/ConditionOperator/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/condition_operator.pyi
rename to com/sun/star/sheet/ConditionOperator/__init__.pyi
diff --git a/com/sun/star/sheet/ConditionOperator2.pyi b/com/sun/star/sheet/ConditionOperator2.pyi
deleted file mode 100644
index 9be848080..000000000
--- a/com/sun/star/sheet/ConditionOperator2.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.condition_operator2 import *
diff --git a/com/sun/star/_pyi/sheet/condition_operator2.pyi b/com/sun/star/sheet/ConditionOperator2/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/condition_operator2.pyi
rename to com/sun/star/sheet/ConditionOperator2/__init__.pyi
diff --git a/com/sun/star/sheet/DDELinkMode.pyi b/com/sun/star/sheet/DDELinkMode.pyi
deleted file mode 100644
index 52d0529ae..000000000
--- a/com/sun/star/sheet/DDELinkMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.dde_link_mode import *
diff --git a/com/sun/star/_pyi/sheet/dde_link_mode.pyi b/com/sun/star/sheet/DDELinkMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/dde_link_mode.pyi
rename to com/sun/star/sheet/DDELinkMode/__init__.pyi
diff --git a/com/sun/star/sheet/DataBarAxis.pyi b/com/sun/star/sheet/DataBarAxis.pyi
deleted file mode 100644
index 3eb8c8b76..000000000
--- a/com/sun/star/sheet/DataBarAxis.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.data_bar_axis import *
diff --git a/com/sun/star/_pyi/sheet/data_bar_axis.pyi b/com/sun/star/sheet/DataBarAxis/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/data_bar_axis.pyi
rename to com/sun/star/sheet/DataBarAxis/__init__.pyi
diff --git a/com/sun/star/sheet/DataBarEntryType.pyi b/com/sun/star/sheet/DataBarEntryType.pyi
deleted file mode 100644
index bfa2941e2..000000000
--- a/com/sun/star/sheet/DataBarEntryType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.data_bar_entry_type import *
diff --git a/com/sun/star/_pyi/sheet/data_bar_entry_type.pyi b/com/sun/star/sheet/DataBarEntryType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/data_bar_entry_type.pyi
rename to com/sun/star/sheet/DataBarEntryType/__init__.pyi
diff --git a/com/sun/star/sheet/DataImportMode.pyi b/com/sun/star/sheet/DataImportMode.pyi
deleted file mode 100644
index e7701d570..000000000
--- a/com/sun/star/sheet/DataImportMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.data_import_mode import *
diff --git a/com/sun/star/_pyi/sheet/data_import_mode.pyi b/com/sun/star/sheet/DataImportMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/data_import_mode.pyi
rename to com/sun/star/sheet/DataImportMode/__init__.pyi
diff --git a/com/sun/star/sheet/DataPilotFieldGroupBy.pyi b/com/sun/star/sheet/DataPilotFieldGroupBy.pyi
deleted file mode 100644
index d8c368646..000000000
--- a/com/sun/star/sheet/DataPilotFieldGroupBy.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.data_pilot_field_group_by import *
diff --git a/com/sun/star/_pyi/sheet/data_pilot_field_group_by.pyi b/com/sun/star/sheet/DataPilotFieldGroupBy/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/data_pilot_field_group_by.pyi
rename to com/sun/star/sheet/DataPilotFieldGroupBy/__init__.pyi
diff --git a/com/sun/star/sheet/DataPilotFieldLayoutMode.pyi b/com/sun/star/sheet/DataPilotFieldLayoutMode.pyi
deleted file mode 100644
index e429d4a79..000000000
--- a/com/sun/star/sheet/DataPilotFieldLayoutMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.data_pilot_field_layout_mode import *
diff --git a/com/sun/star/_pyi/sheet/data_pilot_field_layout_mode.pyi b/com/sun/star/sheet/DataPilotFieldLayoutMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/data_pilot_field_layout_mode.pyi
rename to com/sun/star/sheet/DataPilotFieldLayoutMode/__init__.pyi
diff --git a/com/sun/star/sheet/DataPilotFieldOrientation.pyi b/com/sun/star/sheet/DataPilotFieldOrientation.pyi
deleted file mode 100644
index 44c45b4e5..000000000
--- a/com/sun/star/sheet/DataPilotFieldOrientation.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.data_pilot_field_orientation import *
diff --git a/com/sun/star/_pyi/sheet/data_pilot_field_orientation.pyi b/com/sun/star/sheet/DataPilotFieldOrientation/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/data_pilot_field_orientation.pyi
rename to com/sun/star/sheet/DataPilotFieldOrientation/__init__.pyi
diff --git a/com/sun/star/sheet/DataPilotFieldReferenceItemType.pyi b/com/sun/star/sheet/DataPilotFieldReferenceItemType.pyi
deleted file mode 100644
index 10c08792d..000000000
--- a/com/sun/star/sheet/DataPilotFieldReferenceItemType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.data_pilot_field_reference_item_type import *
diff --git a/com/sun/star/_pyi/sheet/data_pilot_field_reference_item_type.pyi b/com/sun/star/sheet/DataPilotFieldReferenceItemType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/data_pilot_field_reference_item_type.pyi
rename to com/sun/star/sheet/DataPilotFieldReferenceItemType/__init__.pyi
diff --git a/com/sun/star/sheet/DataPilotFieldReferenceType.pyi b/com/sun/star/sheet/DataPilotFieldReferenceType.pyi
deleted file mode 100644
index 6aac1a109..000000000
--- a/com/sun/star/sheet/DataPilotFieldReferenceType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.data_pilot_field_reference_type import *
diff --git a/com/sun/star/_pyi/sheet/data_pilot_field_reference_type.pyi b/com/sun/star/sheet/DataPilotFieldReferenceType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/data_pilot_field_reference_type.pyi
rename to com/sun/star/sheet/DataPilotFieldReferenceType/__init__.pyi
diff --git a/com/sun/star/sheet/DataPilotFieldShowItemsMode.pyi b/com/sun/star/sheet/DataPilotFieldShowItemsMode.pyi
deleted file mode 100644
index 7b971b500..000000000
--- a/com/sun/star/sheet/DataPilotFieldShowItemsMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.data_pilot_field_show_items_mode import *
diff --git a/com/sun/star/_pyi/sheet/data_pilot_field_show_items_mode.pyi b/com/sun/star/sheet/DataPilotFieldShowItemsMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/data_pilot_field_show_items_mode.pyi
rename to com/sun/star/sheet/DataPilotFieldShowItemsMode/__init__.pyi
diff --git a/com/sun/star/sheet/DataPilotFieldSortMode.pyi b/com/sun/star/sheet/DataPilotFieldSortMode.pyi
deleted file mode 100644
index 11a2aa60f..000000000
--- a/com/sun/star/sheet/DataPilotFieldSortMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.data_pilot_field_sort_mode import *
diff --git a/com/sun/star/_pyi/sheet/data_pilot_field_sort_mode.pyi b/com/sun/star/sheet/DataPilotFieldSortMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/data_pilot_field_sort_mode.pyi
rename to com/sun/star/sheet/DataPilotFieldSortMode/__init__.pyi
diff --git a/com/sun/star/sheet/DataPilotOutputRangeType.pyi b/com/sun/star/sheet/DataPilotOutputRangeType.pyi
deleted file mode 100644
index 35fadb371..000000000
--- a/com/sun/star/sheet/DataPilotOutputRangeType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.data_pilot_output_range_type import *
diff --git a/com/sun/star/_pyi/sheet/data_pilot_output_range_type.pyi b/com/sun/star/sheet/DataPilotOutputRangeType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/data_pilot_output_range_type.pyi
rename to com/sun/star/sheet/DataPilotOutputRangeType/__init__.pyi
diff --git a/com/sun/star/sheet/DataPilotTablePositionType.pyi b/com/sun/star/sheet/DataPilotTablePositionType.pyi
deleted file mode 100644
index ba6609480..000000000
--- a/com/sun/star/sheet/DataPilotTablePositionType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.data_pilot_table_position_type import *
diff --git a/com/sun/star/_pyi/sheet/data_pilot_table_position_type.pyi b/com/sun/star/sheet/DataPilotTablePositionType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/data_pilot_table_position_type.pyi
rename to com/sun/star/sheet/DataPilotTablePositionType/__init__.pyi
diff --git a/com/sun/star/sheet/DataResultFlags.pyi b/com/sun/star/sheet/DataResultFlags.pyi
deleted file mode 100644
index c314a87c9..000000000
--- a/com/sun/star/sheet/DataResultFlags.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.data_result_flags import *
diff --git a/com/sun/star/_pyi/sheet/data_result_flags.pyi b/com/sun/star/sheet/DataResultFlags/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/data_result_flags.pyi
rename to com/sun/star/sheet/DataResultFlags/__init__.pyi
diff --git a/com/sun/star/sheet/DateType.pyi b/com/sun/star/sheet/DateType.pyi
deleted file mode 100644
index d347416e4..000000000
--- a/com/sun/star/sheet/DateType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.date_type import *
diff --git a/com/sun/star/_pyi/sheet/date_type.pyi b/com/sun/star/sheet/DateType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/date_type.pyi
rename to com/sun/star/sheet/DateType/__init__.pyi
diff --git a/com/sun/star/sheet/DimensionFlags.pyi b/com/sun/star/sheet/DimensionFlags.pyi
deleted file mode 100644
index db04821cf..000000000
--- a/com/sun/star/sheet/DimensionFlags.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.dimension_flags import *
diff --git a/com/sun/star/_pyi/sheet/dimension_flags.pyi b/com/sun/star/sheet/DimensionFlags/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/dimension_flags.pyi
rename to com/sun/star/sheet/DimensionFlags/__init__.pyi
diff --git a/com/sun/star/sheet/ExternalLinkType.pyi b/com/sun/star/sheet/ExternalLinkType.pyi
deleted file mode 100644
index ae678ff95..000000000
--- a/com/sun/star/sheet/ExternalLinkType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.external_link_type import *
diff --git a/com/sun/star/_pyi/sheet/external_link_type.pyi b/com/sun/star/sheet/ExternalLinkType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/external_link_type.pyi
rename to com/sun/star/sheet/ExternalLinkType/__init__.pyi
diff --git a/com/sun/star/sheet/FillDateMode.pyi b/com/sun/star/sheet/FillDateMode.pyi
deleted file mode 100644
index 6ca4dab39..000000000
--- a/com/sun/star/sheet/FillDateMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.fill_date_mode import *
diff --git a/com/sun/star/_pyi/sheet/fill_date_mode.pyi b/com/sun/star/sheet/FillDateMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/fill_date_mode.pyi
rename to com/sun/star/sheet/FillDateMode/__init__.pyi
diff --git a/com/sun/star/sheet/FillDirection.pyi b/com/sun/star/sheet/FillDirection.pyi
deleted file mode 100644
index aa0674717..000000000
--- a/com/sun/star/sheet/FillDirection.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.fill_direction import *
diff --git a/com/sun/star/_pyi/sheet/fill_direction.pyi b/com/sun/star/sheet/FillDirection/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/fill_direction.pyi
rename to com/sun/star/sheet/FillDirection/__init__.pyi
diff --git a/com/sun/star/sheet/FillMode.pyi b/com/sun/star/sheet/FillMode.pyi
deleted file mode 100644
index 9ee250736..000000000
--- a/com/sun/star/sheet/FillMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.fill_mode import *
diff --git a/com/sun/star/_pyi/sheet/fill_mode.pyi b/com/sun/star/sheet/FillMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/fill_mode.pyi
rename to com/sun/star/sheet/FillMode/__init__.pyi
diff --git a/com/sun/star/sheet/FilterConnection.pyi b/com/sun/star/sheet/FilterConnection.pyi
deleted file mode 100644
index a8cc9c182..000000000
--- a/com/sun/star/sheet/FilterConnection.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.filter_connection import *
diff --git a/com/sun/star/_pyi/sheet/filter_connection.pyi b/com/sun/star/sheet/FilterConnection/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/filter_connection.pyi
rename to com/sun/star/sheet/FilterConnection/__init__.pyi
diff --git a/com/sun/star/sheet/FilterFieldType.pyi b/com/sun/star/sheet/FilterFieldType.pyi
deleted file mode 100644
index 5eb21697c..000000000
--- a/com/sun/star/sheet/FilterFieldType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.filter_field_type import *
diff --git a/com/sun/star/_pyi/sheet/filter_field_type.pyi b/com/sun/star/sheet/FilterFieldType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/filter_field_type.pyi
rename to com/sun/star/sheet/FilterFieldType/__init__.pyi
diff --git a/com/sun/star/sheet/FilterOperator.pyi b/com/sun/star/sheet/FilterOperator.pyi
deleted file mode 100644
index c879fb03f..000000000
--- a/com/sun/star/sheet/FilterOperator.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.filter_operator import *
diff --git a/com/sun/star/_pyi/sheet/filter_operator.pyi b/com/sun/star/sheet/FilterOperator/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/filter_operator.pyi
rename to com/sun/star/sheet/FilterOperator/__init__.pyi
diff --git a/com/sun/star/sheet/FilterOperator2.pyi b/com/sun/star/sheet/FilterOperator2.pyi
deleted file mode 100644
index eb3c80deb..000000000
--- a/com/sun/star/sheet/FilterOperator2.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.filter_operator2 import *
diff --git a/com/sun/star/_pyi/sheet/filter_operator2.pyi b/com/sun/star/sheet/FilterOperator2/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/filter_operator2.pyi
rename to com/sun/star/sheet/FilterOperator2/__init__.pyi
diff --git a/com/sun/star/sheet/FormulaLanguage.pyi b/com/sun/star/sheet/FormulaLanguage.pyi
deleted file mode 100644
index 00eae651c..000000000
--- a/com/sun/star/sheet/FormulaLanguage.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.formula_language import *
diff --git a/com/sun/star/_pyi/sheet/formula_language.pyi b/com/sun/star/sheet/FormulaLanguage/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/formula_language.pyi
rename to com/sun/star/sheet/FormulaLanguage/__init__.pyi
diff --git a/com/sun/star/sheet/FormulaMapGroup.pyi b/com/sun/star/sheet/FormulaMapGroup.pyi
deleted file mode 100644
index 5b4c4a89b..000000000
--- a/com/sun/star/sheet/FormulaMapGroup.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.formula_map_group import *
diff --git a/com/sun/star/_pyi/sheet/formula_map_group.pyi b/com/sun/star/sheet/FormulaMapGroup/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/formula_map_group.pyi
rename to com/sun/star/sheet/FormulaMapGroup/__init__.pyi
diff --git a/com/sun/star/sheet/FormulaMapGroupSpecialOffset.pyi b/com/sun/star/sheet/FormulaMapGroupSpecialOffset.pyi
deleted file mode 100644
index fc8dd53bf..000000000
--- a/com/sun/star/sheet/FormulaMapGroupSpecialOffset.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.formula_map_group_special_offset import *
diff --git a/com/sun/star/_pyi/sheet/formula_map_group_special_offset.pyi b/com/sun/star/sheet/FormulaMapGroupSpecialOffset/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/formula_map_group_special_offset.pyi
rename to com/sun/star/sheet/FormulaMapGroupSpecialOffset/__init__.pyi
diff --git a/com/sun/star/sheet/FormulaResult.pyi b/com/sun/star/sheet/FormulaResult.pyi
deleted file mode 100644
index 4d37a1935..000000000
--- a/com/sun/star/sheet/FormulaResult.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.formula_result import *
diff --git a/com/sun/star/_pyi/sheet/formula_result.pyi b/com/sun/star/sheet/FormulaResult/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/formula_result.pyi
rename to com/sun/star/sheet/FormulaResult/__init__.pyi
diff --git a/com/sun/star/sheet/FunctionCategory.pyi b/com/sun/star/sheet/FunctionCategory.pyi
deleted file mode 100644
index 2ceefc359..000000000
--- a/com/sun/star/sheet/FunctionCategory.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.function_category import *
diff --git a/com/sun/star/_pyi/sheet/function_category.pyi b/com/sun/star/sheet/FunctionCategory/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/function_category.pyi
rename to com/sun/star/sheet/FunctionCategory/__init__.pyi
diff --git a/com/sun/star/sheet/GeneralFunction.pyi b/com/sun/star/sheet/GeneralFunction.pyi
deleted file mode 100644
index 923364139..000000000
--- a/com/sun/star/sheet/GeneralFunction.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.general_function import *
diff --git a/com/sun/star/_pyi/sheet/general_function.pyi b/com/sun/star/sheet/GeneralFunction/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/general_function.pyi
rename to com/sun/star/sheet/GeneralFunction/__init__.pyi
diff --git a/com/sun/star/sheet/GeneralFunction2.pyi b/com/sun/star/sheet/GeneralFunction2.pyi
deleted file mode 100644
index 2747be9c1..000000000
--- a/com/sun/star/sheet/GeneralFunction2.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.general_function2 import *
diff --git a/com/sun/star/_pyi/sheet/general_function2.pyi b/com/sun/star/sheet/GeneralFunction2/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/general_function2.pyi
rename to com/sun/star/sheet/GeneralFunction2/__init__.pyi
diff --git a/com/sun/star/sheet/IconSetFormatEntry.pyi b/com/sun/star/sheet/IconSetFormatEntry.pyi
deleted file mode 100644
index a72aed2af..000000000
--- a/com/sun/star/sheet/IconSetFormatEntry.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.icon_set_format_entry import *
diff --git a/com/sun/star/_pyi/sheet/icon_set_format_entry.pyi b/com/sun/star/sheet/IconSetFormatEntry/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/icon_set_format_entry.pyi
rename to com/sun/star/sheet/IconSetFormatEntry/__init__.pyi
diff --git a/com/sun/star/sheet/IconSetType.pyi b/com/sun/star/sheet/IconSetType.pyi
deleted file mode 100644
index c173f39bf..000000000
--- a/com/sun/star/sheet/IconSetType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.icon_set_type import *
diff --git a/com/sun/star/_pyi/sheet/icon_set_type.pyi b/com/sun/star/sheet/IconSetType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/icon_set_type.pyi
rename to com/sun/star/sheet/IconSetType/__init__.pyi
diff --git a/com/sun/star/sheet/MemberResultFlags.pyi b/com/sun/star/sheet/MemberResultFlags.pyi
deleted file mode 100644
index 0d1ca67bc..000000000
--- a/com/sun/star/sheet/MemberResultFlags.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.member_result_flags import *
diff --git a/com/sun/star/_pyi/sheet/member_result_flags.pyi b/com/sun/star/sheet/MemberResultFlags/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/member_result_flags.pyi
rename to com/sun/star/sheet/MemberResultFlags/__init__.pyi
diff --git a/com/sun/star/sheet/MoveDirection.pyi b/com/sun/star/sheet/MoveDirection.pyi
deleted file mode 100644
index b25fd93d6..000000000
--- a/com/sun/star/sheet/MoveDirection.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.move_direction import *
diff --git a/com/sun/star/_pyi/sheet/move_direction.pyi b/com/sun/star/sheet/MoveDirection/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/move_direction.pyi
rename to com/sun/star/sheet/MoveDirection/__init__.pyi
diff --git a/com/sun/star/sheet/NamedRangeFlag.pyi b/com/sun/star/sheet/NamedRangeFlag.pyi
deleted file mode 100644
index b42adbb3a..000000000
--- a/com/sun/star/sheet/NamedRangeFlag.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.named_range_flag import *
diff --git a/com/sun/star/_pyi/sheet/named_range_flag.pyi b/com/sun/star/sheet/NamedRangeFlag/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/named_range_flag.pyi
rename to com/sun/star/sheet/NamedRangeFlag/__init__.pyi
diff --git a/com/sun/star/sheet/PasteOperation.pyi b/com/sun/star/sheet/PasteOperation.pyi
deleted file mode 100644
index f525680b4..000000000
--- a/com/sun/star/sheet/PasteOperation.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.paste_operation import *
diff --git a/com/sun/star/_pyi/sheet/paste_operation.pyi b/com/sun/star/sheet/PasteOperation/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/paste_operation.pyi
rename to com/sun/star/sheet/PasteOperation/__init__.pyi
diff --git a/com/sun/star/sheet/ReferenceFlags.pyi b/com/sun/star/sheet/ReferenceFlags.pyi
deleted file mode 100644
index cfc59b6fd..000000000
--- a/com/sun/star/sheet/ReferenceFlags.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.reference_flags import *
diff --git a/com/sun/star/_pyi/sheet/reference_flags.pyi b/com/sun/star/sheet/ReferenceFlags/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/reference_flags.pyi
rename to com/sun/star/sheet/ReferenceFlags/__init__.pyi
diff --git a/com/sun/star/sheet/SheetLinkMode.pyi b/com/sun/star/sheet/SheetLinkMode.pyi
deleted file mode 100644
index e7cf44d72..000000000
--- a/com/sun/star/sheet/SheetLinkMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.sheet_link_mode import *
diff --git a/com/sun/star/_pyi/sheet/sheet_link_mode.pyi b/com/sun/star/sheet/SheetLinkMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/sheet_link_mode.pyi
rename to com/sun/star/sheet/SheetLinkMode/__init__.pyi
diff --git a/com/sun/star/sheet/SolverConstraintOperator.pyi b/com/sun/star/sheet/SolverConstraintOperator.pyi
deleted file mode 100644
index 5ce306ff8..000000000
--- a/com/sun/star/sheet/SolverConstraintOperator.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.solver_constraint_operator import *
diff --git a/com/sun/star/_pyi/sheet/solver_constraint_operator.pyi b/com/sun/star/sheet/SolverConstraintOperator/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/solver_constraint_operator.pyi
rename to com/sun/star/sheet/SolverConstraintOperator/__init__.pyi
diff --git a/com/sun/star/sheet/SpreadsheetViewObjectsMode.pyi b/com/sun/star/sheet/SpreadsheetViewObjectsMode.pyi
deleted file mode 100644
index e8d078dee..000000000
--- a/com/sun/star/sheet/SpreadsheetViewObjectsMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.spreadsheet_view_objects_mode import *
diff --git a/com/sun/star/_pyi/sheet/spreadsheet_view_objects_mode.pyi b/com/sun/star/sheet/SpreadsheetViewObjectsMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/spreadsheet_view_objects_mode.pyi
rename to com/sun/star/sheet/SpreadsheetViewObjectsMode/__init__.pyi
diff --git a/com/sun/star/sheet/StatusBarFunction.pyi b/com/sun/star/sheet/StatusBarFunction.pyi
deleted file mode 100644
index 5a1e13eec..000000000
--- a/com/sun/star/sheet/StatusBarFunction.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.status_bar_function import *
diff --git a/com/sun/star/_pyi/sheet/status_bar_function.pyi b/com/sun/star/sheet/StatusBarFunction/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/status_bar_function.pyi
rename to com/sun/star/sheet/StatusBarFunction/__init__.pyi
diff --git a/com/sun/star/sheet/TableOperationMode.pyi b/com/sun/star/sheet/TableOperationMode.pyi
deleted file mode 100644
index 6d6ad56cd..000000000
--- a/com/sun/star/sheet/TableOperationMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.table_operation_mode import *
diff --git a/com/sun/star/_pyi/sheet/table_operation_mode.pyi b/com/sun/star/sheet/TableOperationMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/table_operation_mode.pyi
rename to com/sun/star/sheet/TableOperationMode/__init__.pyi
diff --git a/com/sun/star/sheet/TableValidationVisibility.pyi b/com/sun/star/sheet/TableValidationVisibility.pyi
deleted file mode 100644
index 837f758b2..000000000
--- a/com/sun/star/sheet/TableValidationVisibility.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.table_validation_visibility import *
diff --git a/com/sun/star/_pyi/sheet/table_validation_visibility.pyi b/com/sun/star/sheet/TableValidationVisibility/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/table_validation_visibility.pyi
rename to com/sun/star/sheet/TableValidationVisibility/__init__.pyi
diff --git a/com/sun/star/sheet/ValidationAlertStyle.pyi b/com/sun/star/sheet/ValidationAlertStyle.pyi
deleted file mode 100644
index 1c3f36072..000000000
--- a/com/sun/star/sheet/ValidationAlertStyle.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.validation_alert_style import *
diff --git a/com/sun/star/_pyi/sheet/validation_alert_style.pyi b/com/sun/star/sheet/ValidationAlertStyle/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/validation_alert_style.pyi
rename to com/sun/star/sheet/ValidationAlertStyle/__init__.pyi
diff --git a/com/sun/star/sheet/ValidationType.pyi b/com/sun/star/sheet/ValidationType.pyi
deleted file mode 100644
index 54db67660..000000000
--- a/com/sun/star/sheet/ValidationType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.sheet.validation_type import *
diff --git a/com/sun/star/_pyi/sheet/validation_type.pyi b/com/sun/star/sheet/ValidationType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/sheet/validation_type.pyi
rename to com/sun/star/sheet/ValidationType/__init__.pyi
diff --git a/com/sun/star/smarttags/SmartTagRecognizerMode.pyi b/com/sun/star/smarttags/SmartTagRecognizerMode.pyi
deleted file mode 100644
index 8d2387752..000000000
--- a/com/sun/star/smarttags/SmartTagRecognizerMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.smarttags.smart_tag_recognizer_mode import *
diff --git a/com/sun/star/_pyi/smarttags/smart_tag_recognizer_mode.pyi b/com/sun/star/smarttags/SmartTagRecognizerMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/smarttags/smart_tag_recognizer_mode.pyi
rename to com/sun/star/smarttags/SmartTagRecognizerMode/__init__.pyi
diff --git a/com/sun/star/style/BreakType.pyi b/com/sun/star/style/BreakType.pyi
deleted file mode 100644
index 50d68adc3..000000000
--- a/com/sun/star/style/BreakType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.style.break_type import *
diff --git a/com/sun/star/_pyi/style/break_type.pyi b/com/sun/star/style/BreakType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/style/break_type.pyi
rename to com/sun/star/style/BreakType/__init__.pyi
diff --git a/com/sun/star/style/CaseMap.pyi b/com/sun/star/style/CaseMap.pyi
deleted file mode 100644
index 0a0dbfde2..000000000
--- a/com/sun/star/style/CaseMap.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.style.case_map import *
diff --git a/com/sun/star/_pyi/style/case_map.pyi b/com/sun/star/style/CaseMap/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/style/case_map.pyi
rename to com/sun/star/style/CaseMap/__init__.pyi
diff --git a/com/sun/star/style/FootnoteLineStyle.pyi b/com/sun/star/style/FootnoteLineStyle.pyi
deleted file mode 100644
index 03694e881..000000000
--- a/com/sun/star/style/FootnoteLineStyle.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.style.footnote_line_style import *
diff --git a/com/sun/star/_pyi/style/footnote_line_style.pyi b/com/sun/star/style/FootnoteLineStyle/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/style/footnote_line_style.pyi
rename to com/sun/star/style/FootnoteLineStyle/__init__.pyi
diff --git a/com/sun/star/style/GraphicLocation.pyi b/com/sun/star/style/GraphicLocation.pyi
deleted file mode 100644
index d65fcb343..000000000
--- a/com/sun/star/style/GraphicLocation.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.style.graphic_location import *
diff --git a/com/sun/star/_pyi/style/graphic_location.pyi b/com/sun/star/style/GraphicLocation/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/style/graphic_location.pyi
rename to com/sun/star/style/GraphicLocation/__init__.pyi
diff --git a/com/sun/star/style/HorizontalAlignment.pyi b/com/sun/star/style/HorizontalAlignment.pyi
deleted file mode 100644
index aa2f1de8a..000000000
--- a/com/sun/star/style/HorizontalAlignment.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.style.horizontal_alignment import *
diff --git a/com/sun/star/_pyi/style/horizontal_alignment.pyi b/com/sun/star/style/HorizontalAlignment/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/style/horizontal_alignment.pyi
rename to com/sun/star/style/HorizontalAlignment/__init__.pyi
diff --git a/com/sun/star/style/LineNumberPosition.pyi b/com/sun/star/style/LineNumberPosition.pyi
deleted file mode 100644
index bafb067db..000000000
--- a/com/sun/star/style/LineNumberPosition.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.style.line_number_position import *
diff --git a/com/sun/star/_pyi/style/line_number_position.pyi b/com/sun/star/style/LineNumberPosition/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/style/line_number_position.pyi
rename to com/sun/star/style/LineNumberPosition/__init__.pyi
diff --git a/com/sun/star/style/LineSpacingMode.pyi b/com/sun/star/style/LineSpacingMode.pyi
deleted file mode 100644
index c388ffbe3..000000000
--- a/com/sun/star/style/LineSpacingMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.style.line_spacing_mode import *
diff --git a/com/sun/star/_pyi/style/line_spacing_mode.pyi b/com/sun/star/style/LineSpacingMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/style/line_spacing_mode.pyi
rename to com/sun/star/style/LineSpacingMode/__init__.pyi
diff --git a/com/sun/star/style/NumberingType.pyi b/com/sun/star/style/NumberingType.pyi
deleted file mode 100644
index f68ebf5ba..000000000
--- a/com/sun/star/style/NumberingType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.style.numbering_type import *
diff --git a/com/sun/star/_pyi/style/numbering_type.pyi b/com/sun/star/style/NumberingType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/style/numbering_type.pyi
rename to com/sun/star/style/NumberingType/__init__.pyi
diff --git a/com/sun/star/style/PageStyleLayout.pyi b/com/sun/star/style/PageStyleLayout.pyi
deleted file mode 100644
index 33ea63835..000000000
--- a/com/sun/star/style/PageStyleLayout.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.style.page_style_layout import *
diff --git a/com/sun/star/_pyi/style/page_style_layout.pyi b/com/sun/star/style/PageStyleLayout/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/style/page_style_layout.pyi
rename to com/sun/star/style/PageStyleLayout/__init__.pyi
diff --git a/com/sun/star/style/ParagraphAdjust.pyi b/com/sun/star/style/ParagraphAdjust.pyi
deleted file mode 100644
index d0dcd7a02..000000000
--- a/com/sun/star/style/ParagraphAdjust.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.style.paragraph_adjust import *
diff --git a/com/sun/star/_pyi/style/paragraph_adjust.pyi b/com/sun/star/style/ParagraphAdjust/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/style/paragraph_adjust.pyi
rename to com/sun/star/style/ParagraphAdjust/__init__.pyi
diff --git a/com/sun/star/style/ParagraphStyleCategory.pyi b/com/sun/star/style/ParagraphStyleCategory.pyi
deleted file mode 100644
index e3d152137..000000000
--- a/com/sun/star/style/ParagraphStyleCategory.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.style.paragraph_style_category import *
diff --git a/com/sun/star/_pyi/style/paragraph_style_category.pyi b/com/sun/star/style/ParagraphStyleCategory/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/style/paragraph_style_category.pyi
rename to com/sun/star/style/ParagraphStyleCategory/__init__.pyi
diff --git a/com/sun/star/style/TabAlign.pyi b/com/sun/star/style/TabAlign.pyi
deleted file mode 100644
index 6adcd5634..000000000
--- a/com/sun/star/style/TabAlign.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.style.tab_align import *
diff --git a/com/sun/star/_pyi/style/tab_align.pyi b/com/sun/star/style/TabAlign/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/style/tab_align.pyi
rename to com/sun/star/style/TabAlign/__init__.pyi
diff --git a/com/sun/star/style/VerticalAlignment.pyi b/com/sun/star/style/VerticalAlignment.pyi
deleted file mode 100644
index 73c605d03..000000000
--- a/com/sun/star/style/VerticalAlignment.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.style.vertical_alignment import *
diff --git a/com/sun/star/_pyi/style/vertical_alignment.pyi b/com/sun/star/style/VerticalAlignment/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/style/vertical_alignment.pyi
rename to com/sun/star/style/VerticalAlignment/__init__.pyi
diff --git a/com/sun/star/system/SimpleMailClientFlags.pyi b/com/sun/star/system/SimpleMailClientFlags.pyi
deleted file mode 100644
index 57aa9a6ca..000000000
--- a/com/sun/star/system/SimpleMailClientFlags.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.system.simple_mail_client_flags import *
diff --git a/com/sun/star/_pyi/system/simple_mail_client_flags.pyi b/com/sun/star/system/SimpleMailClientFlags/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/system/simple_mail_client_flags.pyi
rename to com/sun/star/system/SimpleMailClientFlags/__init__.pyi
diff --git a/com/sun/star/system/SystemShellExecuteFlags.pyi b/com/sun/star/system/SystemShellExecuteFlags.pyi
deleted file mode 100644
index 0131e9845..000000000
--- a/com/sun/star/system/SystemShellExecuteFlags.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.system.system_shell_execute_flags import *
diff --git a/com/sun/star/_pyi/system/system_shell_execute_flags.pyi b/com/sun/star/system/SystemShellExecuteFlags/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/system/system_shell_execute_flags.pyi
rename to com/sun/star/system/SystemShellExecuteFlags/__init__.pyi
diff --git a/com/sun/star/table/BorderLineStyle.pyi b/com/sun/star/table/BorderLineStyle.pyi
deleted file mode 100644
index e5d30a298..000000000
--- a/com/sun/star/table/BorderLineStyle.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.table.border_line_style import *
diff --git a/com/sun/star/_pyi/table/border_line_style.pyi b/com/sun/star/table/BorderLineStyle/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/table/border_line_style.pyi
rename to com/sun/star/table/BorderLineStyle/__init__.pyi
diff --git a/com/sun/star/table/CellContentType.pyi b/com/sun/star/table/CellContentType.pyi
deleted file mode 100644
index 3d141189b..000000000
--- a/com/sun/star/table/CellContentType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.table.cell_content_type import *
diff --git a/com/sun/star/_pyi/table/cell_content_type.pyi b/com/sun/star/table/CellContentType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/table/cell_content_type.pyi
rename to com/sun/star/table/CellContentType/__init__.pyi
diff --git a/com/sun/star/table/CellHoriJustify.pyi b/com/sun/star/table/CellHoriJustify.pyi
deleted file mode 100644
index 187b5a9a2..000000000
--- a/com/sun/star/table/CellHoriJustify.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.table.cell_hori_justify import *
diff --git a/com/sun/star/_pyi/table/cell_hori_justify.pyi b/com/sun/star/table/CellHoriJustify/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/table/cell_hori_justify.pyi
rename to com/sun/star/table/CellHoriJustify/__init__.pyi
diff --git a/com/sun/star/table/CellJustifyMethod.pyi b/com/sun/star/table/CellJustifyMethod.pyi
deleted file mode 100644
index e965f1aad..000000000
--- a/com/sun/star/table/CellJustifyMethod.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.table.cell_justify_method import *
diff --git a/com/sun/star/_pyi/table/cell_justify_method.pyi b/com/sun/star/table/CellJustifyMethod/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/table/cell_justify_method.pyi
rename to com/sun/star/table/CellJustifyMethod/__init__.pyi
diff --git a/com/sun/star/table/CellOrientation.pyi b/com/sun/star/table/CellOrientation.pyi
deleted file mode 100644
index 57656f058..000000000
--- a/com/sun/star/table/CellOrientation.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.table.cell_orientation import *
diff --git a/com/sun/star/_pyi/table/cell_orientation.pyi b/com/sun/star/table/CellOrientation/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/table/cell_orientation.pyi
rename to com/sun/star/table/CellOrientation/__init__.pyi
diff --git a/com/sun/star/table/CellVertJustify.pyi b/com/sun/star/table/CellVertJustify.pyi
deleted file mode 100644
index 4034ec337..000000000
--- a/com/sun/star/table/CellVertJustify.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.table.cell_vert_justify import *
diff --git a/com/sun/star/_pyi/table/cell_vert_justify.pyi b/com/sun/star/table/CellVertJustify/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/table/cell_vert_justify.pyi
rename to com/sun/star/table/CellVertJustify/__init__.pyi
diff --git a/com/sun/star/table/CellVertJustify2.pyi b/com/sun/star/table/CellVertJustify2.pyi
deleted file mode 100644
index 05ecc9168..000000000
--- a/com/sun/star/table/CellVertJustify2.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.table.cell_vert_justify2 import *
diff --git a/com/sun/star/_pyi/table/cell_vert_justify2.pyi b/com/sun/star/table/CellVertJustify2/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/table/cell_vert_justify2.pyi
rename to com/sun/star/table/CellVertJustify2/__init__.pyi
diff --git a/com/sun/star/table/ShadowLocation.pyi b/com/sun/star/table/ShadowLocation.pyi
deleted file mode 100644
index e3b7460c4..000000000
--- a/com/sun/star/table/ShadowLocation.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.table.shadow_location import *
diff --git a/com/sun/star/_pyi/table/shadow_location.pyi b/com/sun/star/table/ShadowLocation/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/table/shadow_location.pyi
rename to com/sun/star/table/ShadowLocation/__init__.pyi
diff --git a/com/sun/star/table/TableOrientation.pyi b/com/sun/star/table/TableOrientation.pyi
deleted file mode 100644
index c806451b9..000000000
--- a/com/sun/star/table/TableOrientation.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.table.table_orientation import *
diff --git a/com/sun/star/_pyi/table/table_orientation.pyi b/com/sun/star/table/TableOrientation/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/table/table_orientation.pyi
rename to com/sun/star/table/TableOrientation/__init__.pyi
diff --git a/com/sun/star/table/TableSortFieldType.pyi b/com/sun/star/table/TableSortFieldType.pyi
deleted file mode 100644
index 684d2a375..000000000
--- a/com/sun/star/table/TableSortFieldType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.table.table_sort_field_type import *
diff --git a/com/sun/star/_pyi/table/table_sort_field_type.pyi b/com/sun/star/table/TableSortFieldType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/table/table_sort_field_type.pyi
rename to com/sun/star/table/TableSortFieldType/__init__.pyi
diff --git a/com/sun/star/task/InteractionClassification.pyi b/com/sun/star/task/InteractionClassification.pyi
deleted file mode 100644
index 882fad10a..000000000
--- a/com/sun/star/task/InteractionClassification.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.task.interaction_classification import *
diff --git a/com/sun/star/_pyi/task/interaction_classification.pyi b/com/sun/star/task/InteractionClassification/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/task/interaction_classification.pyi
rename to com/sun/star/task/InteractionClassification/__init__.pyi
diff --git a/com/sun/star/task/PasswordRequestMode.pyi b/com/sun/star/task/PasswordRequestMode.pyi
deleted file mode 100644
index 9e4dfc829..000000000
--- a/com/sun/star/task/PasswordRequestMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.task.password_request_mode import *
diff --git a/com/sun/star/_pyi/task/password_request_mode.pyi b/com/sun/star/task/PasswordRequestMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/task/password_request_mode.pyi
rename to com/sun/star/task/PasswordRequestMode/__init__.pyi
diff --git a/com/sun/star/text/AuthorDisplayFormat.pyi b/com/sun/star/text/AuthorDisplayFormat.pyi
deleted file mode 100644
index 07322786a..000000000
--- a/com/sun/star/text/AuthorDisplayFormat.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.author_display_format import *
diff --git a/com/sun/star/_pyi/text/author_display_format.pyi b/com/sun/star/text/AuthorDisplayFormat/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/author_display_format.pyi
rename to com/sun/star/text/AuthorDisplayFormat/__init__.pyi
diff --git a/com/sun/star/text/BibliographyDataField.pyi b/com/sun/star/text/BibliographyDataField.pyi
deleted file mode 100644
index 5ebd8fd9a..000000000
--- a/com/sun/star/text/BibliographyDataField.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.bibliography_data_field import *
diff --git a/com/sun/star/_pyi/text/bibliography_data_field.pyi b/com/sun/star/text/BibliographyDataField/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/bibliography_data_field.pyi
rename to com/sun/star/text/BibliographyDataField/__init__.pyi
diff --git a/com/sun/star/text/BibliographyDataType.pyi b/com/sun/star/text/BibliographyDataType.pyi
deleted file mode 100644
index 86d51b263..000000000
--- a/com/sun/star/text/BibliographyDataType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.bibliography_data_type import *
diff --git a/com/sun/star/_pyi/text/bibliography_data_type.pyi b/com/sun/star/text/BibliographyDataType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/bibliography_data_type.pyi
rename to com/sun/star/text/BibliographyDataType/__init__.pyi
diff --git a/com/sun/star/text/ChapterFormat.pyi b/com/sun/star/text/ChapterFormat.pyi
deleted file mode 100644
index a70b9b5fe..000000000
--- a/com/sun/star/text/ChapterFormat.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.chapter_format import *
diff --git a/com/sun/star/_pyi/text/chapter_format.pyi b/com/sun/star/text/ChapterFormat/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/chapter_format.pyi
rename to com/sun/star/text/ChapterFormat/__init__.pyi
diff --git a/com/sun/star/text/CharacterCompressionType.pyi b/com/sun/star/text/CharacterCompressionType.pyi
deleted file mode 100644
index 575a8d406..000000000
--- a/com/sun/star/text/CharacterCompressionType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.character_compression_type import *
diff --git a/com/sun/star/_pyi/text/character_compression_type.pyi b/com/sun/star/text/CharacterCompressionType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/character_compression_type.pyi
rename to com/sun/star/text/CharacterCompressionType/__init__.pyi
diff --git a/com/sun/star/text/ColumnSeparatorStyle.pyi b/com/sun/star/text/ColumnSeparatorStyle.pyi
deleted file mode 100644
index 49082b0fe..000000000
--- a/com/sun/star/text/ColumnSeparatorStyle.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.column_separator_style import *
diff --git a/com/sun/star/_pyi/text/column_separator_style.pyi b/com/sun/star/text/ColumnSeparatorStyle/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/column_separator_style.pyi
rename to com/sun/star/text/ColumnSeparatorStyle/__init__.pyi
diff --git a/com/sun/star/text/ControlCharacter.pyi b/com/sun/star/text/ControlCharacter.pyi
deleted file mode 100644
index e47202811..000000000
--- a/com/sun/star/text/ControlCharacter.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.control_character import *
diff --git a/com/sun/star/_pyi/text/control_character.pyi b/com/sun/star/text/ControlCharacter/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/control_character.pyi
rename to com/sun/star/text/ControlCharacter/__init__.pyi
diff --git a/com/sun/star/text/DateDisplayFormat.pyi b/com/sun/star/text/DateDisplayFormat.pyi
deleted file mode 100644
index 8879069a9..000000000
--- a/com/sun/star/text/DateDisplayFormat.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.date_display_format import *
diff --git a/com/sun/star/_pyi/text/date_display_format.pyi b/com/sun/star/text/DateDisplayFormat/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/date_display_format.pyi
rename to com/sun/star/text/DateDisplayFormat/__init__.pyi
diff --git a/com/sun/star/text/DocumentStatistic.pyi b/com/sun/star/text/DocumentStatistic.pyi
deleted file mode 100644
index db15e25a3..000000000
--- a/com/sun/star/text/DocumentStatistic.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.document_statistic import *
diff --git a/com/sun/star/_pyi/text/document_statistic.pyi b/com/sun/star/text/DocumentStatistic/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/document_statistic.pyi
rename to com/sun/star/text/DocumentStatistic/__init__.pyi
diff --git a/com/sun/star/text/FilenameDisplayFormat.pyi b/com/sun/star/text/FilenameDisplayFormat.pyi
deleted file mode 100644
index 393f51213..000000000
--- a/com/sun/star/text/FilenameDisplayFormat.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.filename_display_format import *
diff --git a/com/sun/star/_pyi/text/filename_display_format.pyi b/com/sun/star/text/FilenameDisplayFormat/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/filename_display_format.pyi
rename to com/sun/star/text/FilenameDisplayFormat/__init__.pyi
diff --git a/com/sun/star/text/FontEmphasis.pyi b/com/sun/star/text/FontEmphasis.pyi
deleted file mode 100644
index e02bccda4..000000000
--- a/com/sun/star/text/FontEmphasis.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.font_emphasis import *
diff --git a/com/sun/star/_pyi/text/font_emphasis.pyi b/com/sun/star/text/FontEmphasis/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/font_emphasis.pyi
rename to com/sun/star/text/FontEmphasis/__init__.pyi
diff --git a/com/sun/star/text/FontRelief.pyi b/com/sun/star/text/FontRelief.pyi
deleted file mode 100644
index edfff52dc..000000000
--- a/com/sun/star/text/FontRelief.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.font_relief import *
diff --git a/com/sun/star/_pyi/text/font_relief.pyi b/com/sun/star/text/FontRelief/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/font_relief.pyi
rename to com/sun/star/text/FontRelief/__init__.pyi
diff --git a/com/sun/star/text/FootnoteNumbering.pyi b/com/sun/star/text/FootnoteNumbering.pyi
deleted file mode 100644
index 8b378e392..000000000
--- a/com/sun/star/text/FootnoteNumbering.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.footnote_numbering import *
diff --git a/com/sun/star/_pyi/text/footnote_numbering.pyi b/com/sun/star/text/FootnoteNumbering/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/footnote_numbering.pyi
rename to com/sun/star/text/FootnoteNumbering/__init__.pyi
diff --git a/com/sun/star/text/HoriOrientation.pyi b/com/sun/star/text/HoriOrientation.pyi
deleted file mode 100644
index a4dd87b35..000000000
--- a/com/sun/star/text/HoriOrientation.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.hori_orientation import *
diff --git a/com/sun/star/_pyi/text/hori_orientation.pyi b/com/sun/star/text/HoriOrientation/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/hori_orientation.pyi
rename to com/sun/star/text/HoriOrientation/__init__.pyi
diff --git a/com/sun/star/text/HorizontalAdjust.pyi b/com/sun/star/text/HorizontalAdjust.pyi
deleted file mode 100644
index 800f33d71..000000000
--- a/com/sun/star/text/HorizontalAdjust.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.horizontal_adjust import *
diff --git a/com/sun/star/_pyi/text/horizontal_adjust.pyi b/com/sun/star/text/HorizontalAdjust/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/horizontal_adjust.pyi
rename to com/sun/star/text/HorizontalAdjust/__init__.pyi
diff --git a/com/sun/star/text/LabelFollow.pyi b/com/sun/star/text/LabelFollow.pyi
deleted file mode 100644
index 430f416b5..000000000
--- a/com/sun/star/text/LabelFollow.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.label_follow import *
diff --git a/com/sun/star/_pyi/text/label_follow.pyi b/com/sun/star/text/LabelFollow/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/label_follow.pyi
rename to com/sun/star/text/LabelFollow/__init__.pyi
diff --git a/com/sun/star/text/MailMergeType.pyi b/com/sun/star/text/MailMergeType.pyi
deleted file mode 100644
index ac02fe589..000000000
--- a/com/sun/star/text/MailMergeType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.mail_merge_type import *
diff --git a/com/sun/star/_pyi/text/mail_merge_type.pyi b/com/sun/star/text/MailMergeType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/mail_merge_type.pyi
rename to com/sun/star/text/MailMergeType/__init__.pyi
diff --git a/com/sun/star/text/NotePrintMode.pyi b/com/sun/star/text/NotePrintMode.pyi
deleted file mode 100644
index 1338d64c7..000000000
--- a/com/sun/star/text/NotePrintMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.note_print_mode import *
diff --git a/com/sun/star/_pyi/text/note_print_mode.pyi b/com/sun/star/text/NotePrintMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/note_print_mode.pyi
rename to com/sun/star/text/NotePrintMode/__init__.pyi
diff --git a/com/sun/star/text/PageNumberType.pyi b/com/sun/star/text/PageNumberType.pyi
deleted file mode 100644
index 13a933024..000000000
--- a/com/sun/star/text/PageNumberType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.page_number_type import *
diff --git a/com/sun/star/_pyi/text/page_number_type.pyi b/com/sun/star/text/PageNumberType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/page_number_type.pyi
rename to com/sun/star/text/PageNumberType/__init__.pyi
diff --git a/com/sun/star/text/ParagraphVertAlign.pyi b/com/sun/star/text/ParagraphVertAlign.pyi
deleted file mode 100644
index 658a43d71..000000000
--- a/com/sun/star/text/ParagraphVertAlign.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.paragraph_vert_align import *
diff --git a/com/sun/star/_pyi/text/paragraph_vert_align.pyi b/com/sun/star/text/ParagraphVertAlign/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/paragraph_vert_align.pyi
rename to com/sun/star/text/ParagraphVertAlign/__init__.pyi
diff --git a/com/sun/star/text/PlaceholderType.pyi b/com/sun/star/text/PlaceholderType.pyi
deleted file mode 100644
index 4fa4627d3..000000000
--- a/com/sun/star/text/PlaceholderType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.placeholder_type import *
diff --git a/com/sun/star/_pyi/text/placeholder_type.pyi b/com/sun/star/text/PlaceholderType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/placeholder_type.pyi
rename to com/sun/star/text/PlaceholderType/__init__.pyi
diff --git a/com/sun/star/text/PositionAndSpaceMode.pyi b/com/sun/star/text/PositionAndSpaceMode.pyi
deleted file mode 100644
index 35b64398d..000000000
--- a/com/sun/star/text/PositionAndSpaceMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.position_and_space_mode import *
diff --git a/com/sun/star/_pyi/text/position_and_space_mode.pyi b/com/sun/star/text/PositionAndSpaceMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/position_and_space_mode.pyi
rename to com/sun/star/text/PositionAndSpaceMode/__init__.pyi
diff --git a/com/sun/star/text/PositionLayoutDir.pyi b/com/sun/star/text/PositionLayoutDir.pyi
deleted file mode 100644
index 8ca047c11..000000000
--- a/com/sun/star/text/PositionLayoutDir.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.position_layout_dir import *
diff --git a/com/sun/star/_pyi/text/position_layout_dir.pyi b/com/sun/star/text/PositionLayoutDir/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/position_layout_dir.pyi
rename to com/sun/star/text/PositionLayoutDir/__init__.pyi
diff --git a/com/sun/star/text/ReferenceFieldPart.pyi b/com/sun/star/text/ReferenceFieldPart.pyi
deleted file mode 100644
index 21eef6228..000000000
--- a/com/sun/star/text/ReferenceFieldPart.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.reference_field_part import *
diff --git a/com/sun/star/_pyi/text/reference_field_part.pyi b/com/sun/star/text/ReferenceFieldPart/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/reference_field_part.pyi
rename to com/sun/star/text/ReferenceFieldPart/__init__.pyi
diff --git a/com/sun/star/text/ReferenceFieldSource.pyi b/com/sun/star/text/ReferenceFieldSource.pyi
deleted file mode 100644
index f84b91a91..000000000
--- a/com/sun/star/text/ReferenceFieldSource.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.reference_field_source import *
diff --git a/com/sun/star/_pyi/text/reference_field_source.pyi b/com/sun/star/text/ReferenceFieldSource/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/reference_field_source.pyi
rename to com/sun/star/text/ReferenceFieldSource/__init__.pyi
diff --git a/com/sun/star/text/RelOrientation.pyi b/com/sun/star/text/RelOrientation.pyi
deleted file mode 100644
index b0f3b85ee..000000000
--- a/com/sun/star/text/RelOrientation.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.rel_orientation import *
diff --git a/com/sun/star/_pyi/text/rel_orientation.pyi b/com/sun/star/text/RelOrientation/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/rel_orientation.pyi
rename to com/sun/star/text/RelOrientation/__init__.pyi
diff --git a/com/sun/star/text/RubyAdjust.pyi b/com/sun/star/text/RubyAdjust.pyi
deleted file mode 100644
index 1b5470632..000000000
--- a/com/sun/star/text/RubyAdjust.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.ruby_adjust import *
diff --git a/com/sun/star/_pyi/text/ruby_adjust.pyi b/com/sun/star/text/RubyAdjust/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/ruby_adjust.pyi
rename to com/sun/star/text/RubyAdjust/__init__.pyi
diff --git a/com/sun/star/text/RubyPosition.pyi b/com/sun/star/text/RubyPosition.pyi
deleted file mode 100644
index a0d6c59e0..000000000
--- a/com/sun/star/text/RubyPosition.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.ruby_position import *
diff --git a/com/sun/star/_pyi/text/ruby_position.pyi b/com/sun/star/text/RubyPosition/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/ruby_position.pyi
rename to com/sun/star/text/RubyPosition/__init__.pyi
diff --git a/com/sun/star/text/SetVariableType.pyi b/com/sun/star/text/SetVariableType.pyi
deleted file mode 100644
index 626a48d11..000000000
--- a/com/sun/star/text/SetVariableType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.set_variable_type import *
diff --git a/com/sun/star/_pyi/text/set_variable_type.pyi b/com/sun/star/text/SetVariableType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/set_variable_type.pyi
rename to com/sun/star/text/SetVariableType/__init__.pyi
diff --git a/com/sun/star/text/SizeType.pyi b/com/sun/star/text/SizeType.pyi
deleted file mode 100644
index aee008cdf..000000000
--- a/com/sun/star/text/SizeType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.size_type import *
diff --git a/com/sun/star/_pyi/text/size_type.pyi b/com/sun/star/text/SizeType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/size_type.pyi
rename to com/sun/star/text/SizeType/__init__.pyi
diff --git a/com/sun/star/text/TemplateDisplayFormat.pyi b/com/sun/star/text/TemplateDisplayFormat.pyi
deleted file mode 100644
index 58d8033b7..000000000
--- a/com/sun/star/text/TemplateDisplayFormat.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.template_display_format import *
diff --git a/com/sun/star/_pyi/text/template_display_format.pyi b/com/sun/star/text/TemplateDisplayFormat/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/template_display_format.pyi
rename to com/sun/star/text/TemplateDisplayFormat/__init__.pyi
diff --git a/com/sun/star/text/TextContentAnchorType.pyi b/com/sun/star/text/TextContentAnchorType.pyi
deleted file mode 100644
index fe62bf483..000000000
--- a/com/sun/star/text/TextContentAnchorType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.text_content_anchor_type import *
diff --git a/com/sun/star/_pyi/text/text_content_anchor_type.pyi b/com/sun/star/text/TextContentAnchorType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/text_content_anchor_type.pyi
rename to com/sun/star/text/TextContentAnchorType/__init__.pyi
diff --git a/com/sun/star/text/TextGridMode.pyi b/com/sun/star/text/TextGridMode.pyi
deleted file mode 100644
index b667e9552..000000000
--- a/com/sun/star/text/TextGridMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.text_grid_mode import *
diff --git a/com/sun/star/_pyi/text/text_grid_mode.pyi b/com/sun/star/text/TextGridMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/text_grid_mode.pyi
rename to com/sun/star/text/TextGridMode/__init__.pyi
diff --git a/com/sun/star/text/TextMarkupType.pyi b/com/sun/star/text/TextMarkupType.pyi
deleted file mode 100644
index 22decb199..000000000
--- a/com/sun/star/text/TextMarkupType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.text_markup_type import *
diff --git a/com/sun/star/_pyi/text/text_markup_type.pyi b/com/sun/star/text/TextMarkupType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/text_markup_type.pyi
rename to com/sun/star/text/TextMarkupType/__init__.pyi
diff --git a/com/sun/star/text/TimeDisplayFormat.pyi b/com/sun/star/text/TimeDisplayFormat.pyi
deleted file mode 100644
index 5e3e55cba..000000000
--- a/com/sun/star/text/TimeDisplayFormat.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.time_display_format import *
diff --git a/com/sun/star/_pyi/text/time_display_format.pyi b/com/sun/star/text/TimeDisplayFormat/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/time_display_format.pyi
rename to com/sun/star/text/TimeDisplayFormat/__init__.pyi
diff --git a/com/sun/star/text/UserDataPart.pyi b/com/sun/star/text/UserDataPart.pyi
deleted file mode 100644
index f1678ce46..000000000
--- a/com/sun/star/text/UserDataPart.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.user_data_part import *
diff --git a/com/sun/star/_pyi/text/user_data_part.pyi b/com/sun/star/text/UserDataPart/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/user_data_part.pyi
rename to com/sun/star/text/UserDataPart/__init__.pyi
diff --git a/com/sun/star/text/UserFieldFormat.pyi b/com/sun/star/text/UserFieldFormat.pyi
deleted file mode 100644
index a1d7cea3e..000000000
--- a/com/sun/star/text/UserFieldFormat.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.user_field_format import *
diff --git a/com/sun/star/_pyi/text/user_field_format.pyi b/com/sun/star/text/UserFieldFormat/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/user_field_format.pyi
rename to com/sun/star/text/UserFieldFormat/__init__.pyi
diff --git a/com/sun/star/text/VertOrientation.pyi b/com/sun/star/text/VertOrientation.pyi
deleted file mode 100644
index c54fef7d3..000000000
--- a/com/sun/star/text/VertOrientation.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.vert_orientation import *
diff --git a/com/sun/star/_pyi/text/vert_orientation.pyi b/com/sun/star/text/VertOrientation/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/vert_orientation.pyi
rename to com/sun/star/text/VertOrientation/__init__.pyi
diff --git a/com/sun/star/text/WrapInfluenceOnPosition.pyi b/com/sun/star/text/WrapInfluenceOnPosition.pyi
deleted file mode 100644
index fe8ce44c1..000000000
--- a/com/sun/star/text/WrapInfluenceOnPosition.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.wrap_influence_on_position import *
diff --git a/com/sun/star/_pyi/text/wrap_influence_on_position.pyi b/com/sun/star/text/WrapInfluenceOnPosition/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/wrap_influence_on_position.pyi
rename to com/sun/star/text/WrapInfluenceOnPosition/__init__.pyi
diff --git a/com/sun/star/text/WrapTextMode.pyi b/com/sun/star/text/WrapTextMode.pyi
deleted file mode 100644
index aa4343091..000000000
--- a/com/sun/star/text/WrapTextMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.wrap_text_mode import *
diff --git a/com/sun/star/_pyi/text/wrap_text_mode.pyi b/com/sun/star/text/WrapTextMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/wrap_text_mode.pyi
rename to com/sun/star/text/WrapTextMode/__init__.pyi
diff --git a/com/sun/star/text/WritingMode.pyi b/com/sun/star/text/WritingMode.pyi
deleted file mode 100644
index 080c02818..000000000
--- a/com/sun/star/text/WritingMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.writing_mode import *
diff --git a/com/sun/star/_pyi/text/writing_mode.pyi b/com/sun/star/text/WritingMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/writing_mode.pyi
rename to com/sun/star/text/WritingMode/__init__.pyi
diff --git a/com/sun/star/text/WritingMode2.pyi b/com/sun/star/text/WritingMode2.pyi
deleted file mode 100644
index f2591a4d1..000000000
--- a/com/sun/star/text/WritingMode2.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.text.writing_mode2 import *
diff --git a/com/sun/star/_pyi/text/writing_mode2.pyi b/com/sun/star/text/WritingMode2/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/writing_mode2.pyi
rename to com/sun/star/text/WritingMode2/__init__.pyi
diff --git a/com/sun/star/text/textfield/Type.pyi b/com/sun/star/text/textfield/Type.pyi
deleted file mode 100644
index c01be576b..000000000
--- a/com/sun/star/text/textfield/Type.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.text.textfield.type import *
diff --git a/com/sun/star/_pyi/text/textfield/type.pyi b/com/sun/star/text/textfield/Type/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/text/textfield/type.pyi
rename to com/sun/star/text/textfield/Type/__init__.pyi
diff --git a/com/sun/star/ucb/CommandInfoChange.pyi b/com/sun/star/ucb/CommandInfoChange.pyi
deleted file mode 100644
index 39983926c..000000000
--- a/com/sun/star/ucb/CommandInfoChange.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.command_info_change import *
diff --git a/com/sun/star/_pyi/ucb/command_info_change.pyi b/com/sun/star/ucb/CommandInfoChange/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/command_info_change.pyi
rename to com/sun/star/ucb/CommandInfoChange/__init__.pyi
diff --git a/com/sun/star/ucb/ConnectionMode.pyi b/com/sun/star/ucb/ConnectionMode.pyi
deleted file mode 100644
index aa23c8e00..000000000
--- a/com/sun/star/ucb/ConnectionMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.connection_mode import *
diff --git a/com/sun/star/_pyi/ucb/connection_mode.pyi b/com/sun/star/ucb/ConnectionMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/connection_mode.pyi
rename to com/sun/star/ucb/ConnectionMode/__init__.pyi
diff --git a/com/sun/star/ucb/ContentAction.pyi b/com/sun/star/ucb/ContentAction.pyi
deleted file mode 100644
index b4d79d833..000000000
--- a/com/sun/star/ucb/ContentAction.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.content_action import *
diff --git a/com/sun/star/_pyi/ucb/content_action.pyi b/com/sun/star/ucb/ContentAction/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/content_action.pyi
rename to com/sun/star/ucb/ContentAction/__init__.pyi
diff --git a/com/sun/star/ucb/ContentCreationError.pyi b/com/sun/star/ucb/ContentCreationError.pyi
deleted file mode 100644
index b59f3e9ef..000000000
--- a/com/sun/star/ucb/ContentCreationError.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.content_creation_error import *
diff --git a/com/sun/star/_pyi/ucb/content_creation_error.pyi b/com/sun/star/ucb/ContentCreationError/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/content_creation_error.pyi
rename to com/sun/star/ucb/ContentCreationError/__init__.pyi
diff --git a/com/sun/star/ucb/ContentInfoAttribute.pyi b/com/sun/star/ucb/ContentInfoAttribute.pyi
deleted file mode 100644
index b55c2e33f..000000000
--- a/com/sun/star/ucb/ContentInfoAttribute.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.content_info_attribute import *
diff --git a/com/sun/star/_pyi/ucb/content_info_attribute.pyi b/com/sun/star/ucb/ContentInfoAttribute/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/content_info_attribute.pyi
rename to com/sun/star/ucb/ContentInfoAttribute/__init__.pyi
diff --git a/com/sun/star/ucb/ContentResultSetCapability.pyi b/com/sun/star/ucb/ContentResultSetCapability.pyi
deleted file mode 100644
index 6041a6a53..000000000
--- a/com/sun/star/ucb/ContentResultSetCapability.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.content_result_set_capability import *
diff --git a/com/sun/star/_pyi/ucb/content_result_set_capability.pyi b/com/sun/star/ucb/ContentResultSetCapability/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/content_result_set_capability.pyi
rename to com/sun/star/ucb/ContentResultSetCapability/__init__.pyi
diff --git a/com/sun/star/ucb/DocumentStoreMode.pyi b/com/sun/star/ucb/DocumentStoreMode.pyi
deleted file mode 100644
index 5eb3415a1..000000000
--- a/com/sun/star/ucb/DocumentStoreMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.document_store_mode import *
diff --git a/com/sun/star/_pyi/ucb/document_store_mode.pyi b/com/sun/star/ucb/DocumentStoreMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/document_store_mode.pyi
rename to com/sun/star/ucb/DocumentStoreMode/__init__.pyi
diff --git a/com/sun/star/ucb/Error.pyi b/com/sun/star/ucb/Error.pyi
deleted file mode 100644
index 65f0de651..000000000
--- a/com/sun/star/ucb/Error.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.error import *
diff --git a/com/sun/star/_pyi/ucb/error.pyi b/com/sun/star/ucb/Error/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/error.pyi
rename to com/sun/star/ucb/Error/__init__.pyi
diff --git a/com/sun/star/ucb/FetchError.pyi b/com/sun/star/ucb/FetchError.pyi
deleted file mode 100644
index dbbe611db..000000000
--- a/com/sun/star/ucb/FetchError.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.fetch_error import *
diff --git a/com/sun/star/_pyi/ucb/fetch_error.pyi b/com/sun/star/ucb/FetchError/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/fetch_error.pyi
rename to com/sun/star/ucb/FetchError/__init__.pyi
diff --git a/com/sun/star/ucb/FileSystemNotation.pyi b/com/sun/star/ucb/FileSystemNotation.pyi
deleted file mode 100644
index 342bc518b..000000000
--- a/com/sun/star/ucb/FileSystemNotation.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.file_system_notation import *
diff --git a/com/sun/star/_pyi/ucb/file_system_notation.pyi b/com/sun/star/ucb/FileSystemNotation/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/file_system_notation.pyi
rename to com/sun/star/ucb/FileSystemNotation/__init__.pyi
diff --git a/com/sun/star/ucb/FolderListCommand.pyi b/com/sun/star/ucb/FolderListCommand.pyi
deleted file mode 100644
index 8dbe64c68..000000000
--- a/com/sun/star/ucb/FolderListCommand.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.folder_list_command import *
diff --git a/com/sun/star/_pyi/ucb/folder_list_command.pyi b/com/sun/star/ucb/FolderListCommand/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/folder_list_command.pyi
rename to com/sun/star/ucb/FolderListCommand/__init__.pyi
diff --git a/com/sun/star/ucb/IOErrorCode.pyi b/com/sun/star/ucb/IOErrorCode.pyi
deleted file mode 100644
index 334f8c6dc..000000000
--- a/com/sun/star/ucb/IOErrorCode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.io_error_code import *
diff --git a/com/sun/star/_pyi/ucb/io_error_code.pyi b/com/sun/star/ucb/IOErrorCode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/io_error_code.pyi
rename to com/sun/star/ucb/IOErrorCode/__init__.pyi
diff --git a/com/sun/star/ucb/ListActionType.pyi b/com/sun/star/ucb/ListActionType.pyi
deleted file mode 100644
index 49e7cb567..000000000
--- a/com/sun/star/ucb/ListActionType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.list_action_type import *
diff --git a/com/sun/star/_pyi/ucb/list_action_type.pyi b/com/sun/star/ucb/ListActionType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/list_action_type.pyi
rename to com/sun/star/ucb/ListActionType/__init__.pyi
diff --git a/com/sun/star/ucb/LockDepth.pyi b/com/sun/star/ucb/LockDepth.pyi
deleted file mode 100644
index 88f5e726d..000000000
--- a/com/sun/star/ucb/LockDepth.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.lock_depth import *
diff --git a/com/sun/star/_pyi/ucb/lock_depth.pyi b/com/sun/star/ucb/LockDepth/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/lock_depth.pyi
rename to com/sun/star/ucb/LockDepth/__init__.pyi
diff --git a/com/sun/star/ucb/LockScope.pyi b/com/sun/star/ucb/LockScope.pyi
deleted file mode 100644
index 046de1a85..000000000
--- a/com/sun/star/ucb/LockScope.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.lock_scope import *
diff --git a/com/sun/star/_pyi/ucb/lock_scope.pyi b/com/sun/star/ucb/LockScope/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/lock_scope.pyi
rename to com/sun/star/ucb/LockScope/__init__.pyi
diff --git a/com/sun/star/ucb/LockType.pyi b/com/sun/star/ucb/LockType.pyi
deleted file mode 100644
index 9e9b04b2f..000000000
--- a/com/sun/star/ucb/LockType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.lock_type import *
diff --git a/com/sun/star/_pyi/ucb/lock_type.pyi b/com/sun/star/ucb/LockType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/lock_type.pyi
rename to com/sun/star/ucb/LockType/__init__.pyi
diff --git a/com/sun/star/ucb/NameClash.pyi b/com/sun/star/ucb/NameClash.pyi
deleted file mode 100644
index 7c62607df..000000000
--- a/com/sun/star/ucb/NameClash.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.name_clash import *
diff --git a/com/sun/star/_pyi/ucb/name_clash.pyi b/com/sun/star/ucb/NameClash/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/name_clash.pyi
rename to com/sun/star/ucb/NameClash/__init__.pyi
diff --git a/com/sun/star/ucb/OpenMode.pyi b/com/sun/star/ucb/OpenMode.pyi
deleted file mode 100644
index 12d35f34f..000000000
--- a/com/sun/star/ucb/OpenMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.open_mode import *
diff --git a/com/sun/star/_pyi/ucb/open_mode.pyi b/com/sun/star/ucb/OpenMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/open_mode.pyi
rename to com/sun/star/ucb/OpenMode/__init__.pyi
diff --git a/com/sun/star/ucb/OutgoingMessageState.pyi b/com/sun/star/ucb/OutgoingMessageState.pyi
deleted file mode 100644
index f1248416c..000000000
--- a/com/sun/star/ucb/OutgoingMessageState.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.outgoing_message_state import *
diff --git a/com/sun/star/_pyi/ucb/outgoing_message_state.pyi b/com/sun/star/ucb/OutgoingMessageState/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/outgoing_message_state.pyi
rename to com/sun/star/ucb/OutgoingMessageState/__init__.pyi
diff --git a/com/sun/star/ucb/Priority.pyi b/com/sun/star/ucb/Priority.pyi
deleted file mode 100644
index cd2076fae..000000000
--- a/com/sun/star/ucb/Priority.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.priority import *
diff --git a/com/sun/star/_pyi/ucb/priority.pyi b/com/sun/star/ucb/Priority/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/priority.pyi
rename to com/sun/star/ucb/Priority/__init__.pyi
diff --git a/com/sun/star/ucb/PropertyValueState.pyi b/com/sun/star/ucb/PropertyValueState.pyi
deleted file mode 100644
index 9e82323ec..000000000
--- a/com/sun/star/ucb/PropertyValueState.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.property_value_state import *
diff --git a/com/sun/star/_pyi/ucb/property_value_state.pyi b/com/sun/star/ucb/PropertyValueState/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/property_value_state.pyi
rename to com/sun/star/ucb/PropertyValueState/__init__.pyi
diff --git a/com/sun/star/ucb/RememberAuthentication.pyi b/com/sun/star/ucb/RememberAuthentication.pyi
deleted file mode 100644
index 7e9428262..000000000
--- a/com/sun/star/ucb/RememberAuthentication.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.remember_authentication import *
diff --git a/com/sun/star/_pyi/ucb/remember_authentication.pyi b/com/sun/star/ucb/RememberAuthentication/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/remember_authentication.pyi
rename to com/sun/star/ucb/RememberAuthentication/__init__.pyi
diff --git a/com/sun/star/ucb/RemoteContentProviderChangeAction.pyi b/com/sun/star/ucb/RemoteContentProviderChangeAction.pyi
deleted file mode 100644
index b4fa74599..000000000
--- a/com/sun/star/ucb/RemoteContentProviderChangeAction.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.remote_content_provider_change_action import *
diff --git a/com/sun/star/_pyi/ucb/remote_content_provider_change_action.pyi b/com/sun/star/ucb/RemoteContentProviderChangeAction/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/remote_content_provider_change_action.pyi
rename to com/sun/star/ucb/RemoteContentProviderChangeAction/__init__.pyi
diff --git a/com/sun/star/ucb/RuleAction.pyi b/com/sun/star/ucb/RuleAction.pyi
deleted file mode 100644
index 095fb49e8..000000000
--- a/com/sun/star/ucb/RuleAction.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.rule_action import *
diff --git a/com/sun/star/_pyi/ucb/rule_action.pyi b/com/sun/star/ucb/RuleAction/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/rule_action.pyi
rename to com/sun/star/ucb/RuleAction/__init__.pyi
diff --git a/com/sun/star/ucb/RuleOperator.pyi b/com/sun/star/ucb/RuleOperator.pyi
deleted file mode 100644
index 85b34ef43..000000000
--- a/com/sun/star/ucb/RuleOperator.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.rule_operator import *
diff --git a/com/sun/star/_pyi/ucb/rule_operator.pyi b/com/sun/star/ucb/RuleOperator/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/rule_operator.pyi
rename to com/sun/star/ucb/RuleOperator/__init__.pyi
diff --git a/com/sun/star/ucb/SearchRecursion.pyi b/com/sun/star/ucb/SearchRecursion.pyi
deleted file mode 100644
index 040b3edf9..000000000
--- a/com/sun/star/ucb/SearchRecursion.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.search_recursion import *
diff --git a/com/sun/star/_pyi/ucb/search_recursion.pyi b/com/sun/star/ucb/SearchRecursion/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/search_recursion.pyi
rename to com/sun/star/ucb/SearchRecursion/__init__.pyi
diff --git a/com/sun/star/ucb/SynchronizePolicy.pyi b/com/sun/star/ucb/SynchronizePolicy.pyi
deleted file mode 100644
index dcb5c1713..000000000
--- a/com/sun/star/ucb/SynchronizePolicy.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.synchronize_policy import *
diff --git a/com/sun/star/_pyi/ucb/synchronize_policy.pyi b/com/sun/star/ucb/SynchronizePolicy/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/synchronize_policy.pyi
rename to com/sun/star/ucb/SynchronizePolicy/__init__.pyi
diff --git a/com/sun/star/ucb/TransferCommandOperation.pyi b/com/sun/star/ucb/TransferCommandOperation.pyi
deleted file mode 100644
index e8aff9bf4..000000000
--- a/com/sun/star/ucb/TransferCommandOperation.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.transfer_command_operation import *
diff --git a/com/sun/star/_pyi/ucb/transfer_command_operation.pyi b/com/sun/star/ucb/TransferCommandOperation/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/transfer_command_operation.pyi
rename to com/sun/star/ucb/TransferCommandOperation/__init__.pyi
diff --git a/com/sun/star/ucb/VerificationMode.pyi b/com/sun/star/ucb/VerificationMode.pyi
deleted file mode 100644
index 81a61323f..000000000
--- a/com/sun/star/ucb/VerificationMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.verification_mode import *
diff --git a/com/sun/star/_pyi/ucb/verification_mode.pyi b/com/sun/star/ucb/VerificationMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/verification_mode.pyi
rename to com/sun/star/ucb/VerificationMode/__init__.pyi
diff --git a/com/sun/star/ucb/WebDAVHTTPMethod.pyi b/com/sun/star/ucb/WebDAVHTTPMethod.pyi
deleted file mode 100644
index c866d2331..000000000
--- a/com/sun/star/ucb/WebDAVHTTPMethod.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ucb.web_davhttp_method import *
diff --git a/com/sun/star/_pyi/ucb/web_davhttp_method.pyi b/com/sun/star/ucb/WebDAVHTTPMethod/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ucb/web_davhttp_method.pyi
rename to com/sun/star/ucb/WebDAVHTTPMethod/__init__.pyi
diff --git a/com/sun/star/ui/ActionTriggerSeparatorType.pyi b/com/sun/star/ui/ActionTriggerSeparatorType.pyi
deleted file mode 100644
index 454baa327..000000000
--- a/com/sun/star/ui/ActionTriggerSeparatorType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ui.action_trigger_separator_type import *
diff --git a/com/sun/star/_pyi/ui/action_trigger_separator_type.pyi b/com/sun/star/ui/ActionTriggerSeparatorType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ui/action_trigger_separator_type.pyi
rename to com/sun/star/ui/ActionTriggerSeparatorType/__init__.pyi
diff --git a/com/sun/star/ui/ContextMenuInterceptorAction.pyi b/com/sun/star/ui/ContextMenuInterceptorAction.pyi
deleted file mode 100644
index 7be49a292..000000000
--- a/com/sun/star/ui/ContextMenuInterceptorAction.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ui.context_menu_interceptor_action import *
diff --git a/com/sun/star/_pyi/ui/context_menu_interceptor_action.pyi b/com/sun/star/ui/ContextMenuInterceptorAction/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ui/context_menu_interceptor_action.pyi
rename to com/sun/star/ui/ContextMenuInterceptorAction/__init__.pyi
diff --git a/com/sun/star/ui/DockingArea.pyi b/com/sun/star/ui/DockingArea.pyi
deleted file mode 100644
index da911a210..000000000
--- a/com/sun/star/ui/DockingArea.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ui.docking_area import *
diff --git a/com/sun/star/_pyi/ui/docking_area.pyi b/com/sun/star/ui/DockingArea/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ui/docking_area.pyi
rename to com/sun/star/ui/DockingArea/__init__.pyi
diff --git a/com/sun/star/ui/ImageType.pyi b/com/sun/star/ui/ImageType.pyi
deleted file mode 100644
index 4c3690c0c..000000000
--- a/com/sun/star/ui/ImageType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ui.image_type import *
diff --git a/com/sun/star/_pyi/ui/image_type.pyi b/com/sun/star/ui/ImageType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ui/image_type.pyi
rename to com/sun/star/ui/ImageType/__init__.pyi
diff --git a/com/sun/star/ui/ItemStyle.pyi b/com/sun/star/ui/ItemStyle.pyi
deleted file mode 100644
index 36e9889fd..000000000
--- a/com/sun/star/ui/ItemStyle.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ui.item_style import *
diff --git a/com/sun/star/_pyi/ui/item_style.pyi b/com/sun/star/ui/ItemStyle/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ui/item_style.pyi
rename to com/sun/star/ui/ItemStyle/__init__.pyi
diff --git a/com/sun/star/ui/ItemType.pyi b/com/sun/star/ui/ItemType.pyi
deleted file mode 100644
index f7a16777c..000000000
--- a/com/sun/star/ui/ItemType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ui.item_type import *
diff --git a/com/sun/star/_pyi/ui/item_type.pyi b/com/sun/star/ui/ItemType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ui/item_type.pyi
rename to com/sun/star/ui/ItemType/__init__.pyi
diff --git a/com/sun/star/ui/UIElementType.pyi b/com/sun/star/ui/UIElementType.pyi
deleted file mode 100644
index 9a53e18bc..000000000
--- a/com/sun/star/ui/UIElementType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.ui.ui_element_type import *
diff --git a/com/sun/star/_pyi/ui/ui_element_type.pyi b/com/sun/star/ui/UIElementType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ui/ui_element_type.pyi
rename to com/sun/star/ui/UIElementType/__init__.pyi
diff --git a/com/sun/star/ui/dialogs/CommonFilePickerElementIds.pyi b/com/sun/star/ui/dialogs/CommonFilePickerElementIds.pyi
deleted file mode 100644
index f21266679..000000000
--- a/com/sun/star/ui/dialogs/CommonFilePickerElementIds.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.ui.dialogs.common_file_picker_element_ids import *
diff --git a/com/sun/star/_pyi/ui/dialogs/common_file_picker_element_ids.pyi b/com/sun/star/ui/dialogs/CommonFilePickerElementIds/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ui/dialogs/common_file_picker_element_ids.pyi
rename to com/sun/star/ui/dialogs/CommonFilePickerElementIds/__init__.pyi
diff --git a/com/sun/star/ui/dialogs/ControlActions.pyi b/com/sun/star/ui/dialogs/ControlActions.pyi
deleted file mode 100644
index 8aa25758d..000000000
--- a/com/sun/star/ui/dialogs/ControlActions.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.ui.dialogs.control_actions import *
diff --git a/com/sun/star/_pyi/ui/dialogs/control_actions.pyi b/com/sun/star/ui/dialogs/ControlActions/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ui/dialogs/control_actions.pyi
rename to com/sun/star/ui/dialogs/ControlActions/__init__.pyi
diff --git a/com/sun/star/ui/dialogs/ExecutableDialogResults.pyi b/com/sun/star/ui/dialogs/ExecutableDialogResults.pyi
deleted file mode 100644
index 2cf7cb447..000000000
--- a/com/sun/star/ui/dialogs/ExecutableDialogResults.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.ui.dialogs.executable_dialog_results import *
diff --git a/com/sun/star/_pyi/ui/dialogs/executable_dialog_results.pyi b/com/sun/star/ui/dialogs/ExecutableDialogResults/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ui/dialogs/executable_dialog_results.pyi
rename to com/sun/star/ui/dialogs/ExecutableDialogResults/__init__.pyi
diff --git a/com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.pyi b/com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.pyi
deleted file mode 100644
index 1c7bd4788..000000000
--- a/com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.ui.dialogs.extended_file_picker_element_ids import *
diff --git a/com/sun/star/_pyi/ui/dialogs/extended_file_picker_element_ids.pyi b/com/sun/star/ui/dialogs/ExtendedFilePickerElementIds/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ui/dialogs/extended_file_picker_element_ids.pyi
rename to com/sun/star/ui/dialogs/ExtendedFilePickerElementIds/__init__.pyi
diff --git a/com/sun/star/ui/dialogs/FilePreviewImageFormats.pyi b/com/sun/star/ui/dialogs/FilePreviewImageFormats.pyi
deleted file mode 100644
index ca6cbe3b6..000000000
--- a/com/sun/star/ui/dialogs/FilePreviewImageFormats.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.ui.dialogs.file_preview_image_formats import *
diff --git a/com/sun/star/_pyi/ui/dialogs/file_preview_image_formats.pyi b/com/sun/star/ui/dialogs/FilePreviewImageFormats/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ui/dialogs/file_preview_image_formats.pyi
rename to com/sun/star/ui/dialogs/FilePreviewImageFormats/__init__.pyi
diff --git a/com/sun/star/ui/dialogs/ListboxControlActions.pyi b/com/sun/star/ui/dialogs/ListboxControlActions.pyi
deleted file mode 100644
index 43b069f92..000000000
--- a/com/sun/star/ui/dialogs/ListboxControlActions.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.ui.dialogs.listbox_control_actions import *
diff --git a/com/sun/star/_pyi/ui/dialogs/listbox_control_actions.pyi b/com/sun/star/ui/dialogs/ListboxControlActions/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ui/dialogs/listbox_control_actions.pyi
rename to com/sun/star/ui/dialogs/ListboxControlActions/__init__.pyi
diff --git a/com/sun/star/ui/dialogs/TemplateDescription.pyi b/com/sun/star/ui/dialogs/TemplateDescription.pyi
deleted file mode 100644
index 805da7655..000000000
--- a/com/sun/star/ui/dialogs/TemplateDescription.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.ui.dialogs.template_description import *
diff --git a/com/sun/star/_pyi/ui/dialogs/template_description.pyi b/com/sun/star/ui/dialogs/TemplateDescription/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ui/dialogs/template_description.pyi
rename to com/sun/star/ui/dialogs/TemplateDescription/__init__.pyi
diff --git a/com/sun/star/ui/dialogs/WizardButton.pyi b/com/sun/star/ui/dialogs/WizardButton.pyi
deleted file mode 100644
index 893ff99d3..000000000
--- a/com/sun/star/ui/dialogs/WizardButton.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.ui.dialogs.wizard_button import *
diff --git a/com/sun/star/_pyi/ui/dialogs/wizard_button.pyi b/com/sun/star/ui/dialogs/WizardButton/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ui/dialogs/wizard_button.pyi
rename to com/sun/star/ui/dialogs/WizardButton/__init__.pyi
diff --git a/com/sun/star/ui/dialogs/WizardTravelType.pyi b/com/sun/star/ui/dialogs/WizardTravelType.pyi
deleted file mode 100644
index 8b45da983..000000000
--- a/com/sun/star/ui/dialogs/WizardTravelType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.ui.dialogs.wizard_travel_type import *
diff --git a/com/sun/star/_pyi/ui/dialogs/wizard_travel_type.pyi b/com/sun/star/ui/dialogs/WizardTravelType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/ui/dialogs/wizard_travel_type.pyi
rename to com/sun/star/ui/dialogs/WizardTravelType/__init__.pyi
diff --git a/com/sun/star/uno/TypeClass.pyi b/com/sun/star/uno/TypeClass.pyi
deleted file mode 100644
index 0a8be2158..000000000
--- a/com/sun/star/uno/TypeClass.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.uno.type_class import *
diff --git a/com/sun/star/_pyi/uno/type_class.pyi b/com/sun/star/uno/TypeClass/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/uno/type_class.pyi
rename to com/sun/star/uno/TypeClass/__init__.pyi
diff --git a/com/sun/star/uri/RelativeUriExcessParentSegments.pyi b/com/sun/star/uri/RelativeUriExcessParentSegments.pyi
deleted file mode 100644
index 80448685a..000000000
--- a/com/sun/star/uri/RelativeUriExcessParentSegments.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.uri.relative_uri_excess_parent_segments import *
diff --git a/com/sun/star/_pyi/uri/relative_uri_excess_parent_segments.pyi b/com/sun/star/uri/RelativeUriExcessParentSegments/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/uri/relative_uri_excess_parent_segments.pyi
rename to com/sun/star/uri/RelativeUriExcessParentSegments/__init__.pyi
diff --git a/com/sun/star/util/DataEditorEventType.pyi b/com/sun/star/util/DataEditorEventType.pyi
deleted file mode 100644
index 51d521bdc..000000000
--- a/com/sun/star/util/DataEditorEventType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.util.data_editor_event_type import *
diff --git a/com/sun/star/_pyi/util/data_editor_event_type.pyi b/com/sun/star/util/DataEditorEventType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/util/data_editor_event_type.pyi
rename to com/sun/star/util/DataEditorEventType/__init__.pyi
diff --git a/com/sun/star/util/Endianness.pyi b/com/sun/star/util/Endianness.pyi
deleted file mode 100644
index 54438d8f5..000000000
--- a/com/sun/star/util/Endianness.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.util.endianness import *
diff --git a/com/sun/star/_pyi/util/endianness.pyi b/com/sun/star/util/Endianness/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/util/endianness.pyi
rename to com/sun/star/util/Endianness/__init__.pyi
diff --git a/com/sun/star/util/MeasureUnit.pyi b/com/sun/star/util/MeasureUnit.pyi
deleted file mode 100644
index 6c72e4854..000000000
--- a/com/sun/star/util/MeasureUnit.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.util.measure_unit import *
diff --git a/com/sun/star/_pyi/util/measure_unit.pyi b/com/sun/star/util/MeasureUnit/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/util/measure_unit.pyi
rename to com/sun/star/util/MeasureUnit/__init__.pyi
diff --git a/com/sun/star/util/NumberFormat.pyi b/com/sun/star/util/NumberFormat.pyi
deleted file mode 100644
index ce4d582f9..000000000
--- a/com/sun/star/util/NumberFormat.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.util.number_format import *
diff --git a/com/sun/star/_pyi/util/number_format.pyi b/com/sun/star/util/NumberFormat/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/util/number_format.pyi
rename to com/sun/star/util/NumberFormat/__init__.pyi
diff --git a/com/sun/star/util/SearchAlgorithms.pyi b/com/sun/star/util/SearchAlgorithms.pyi
deleted file mode 100644
index dcf63ee81..000000000
--- a/com/sun/star/util/SearchAlgorithms.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.util.search_algorithms import *
diff --git a/com/sun/star/_pyi/util/search_algorithms.pyi b/com/sun/star/util/SearchAlgorithms/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/util/search_algorithms.pyi
rename to com/sun/star/util/SearchAlgorithms/__init__.pyi
diff --git a/com/sun/star/util/SearchAlgorithms2.pyi b/com/sun/star/util/SearchAlgorithms2.pyi
deleted file mode 100644
index ecf1074f8..000000000
--- a/com/sun/star/util/SearchAlgorithms2.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.util.search_algorithms2 import *
diff --git a/com/sun/star/_pyi/util/search_algorithms2.pyi b/com/sun/star/util/SearchAlgorithms2/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/util/search_algorithms2.pyi
rename to com/sun/star/util/SearchAlgorithms2/__init__.pyi
diff --git a/com/sun/star/util/SearchFlags.pyi b/com/sun/star/util/SearchFlags.pyi
deleted file mode 100644
index 433babc93..000000000
--- a/com/sun/star/util/SearchFlags.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.util.search_flags import *
diff --git a/com/sun/star/_pyi/util/search_flags.pyi b/com/sun/star/util/SearchFlags/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/util/search_flags.pyi
rename to com/sun/star/util/SearchFlags/__init__.pyi
diff --git a/com/sun/star/util/SortFieldType.pyi b/com/sun/star/util/SortFieldType.pyi
deleted file mode 100644
index 6af758706..000000000
--- a/com/sun/star/util/SortFieldType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.util.sort_field_type import *
diff --git a/com/sun/star/_pyi/util/sort_field_type.pyi b/com/sun/star/util/SortFieldType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/util/sort_field_type.pyi
rename to com/sun/star/util/SortFieldType/__init__.pyi
diff --git a/com/sun/star/util/TriState.pyi b/com/sun/star/util/TriState.pyi
deleted file mode 100644
index 78288d298..000000000
--- a/com/sun/star/util/TriState.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.util.tri_state import *
diff --git a/com/sun/star/_pyi/util/tri_state.pyi b/com/sun/star/util/TriState/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/util/tri_state.pyi
rename to com/sun/star/util/TriState/__init__.pyi
diff --git a/com/sun/star/view/DocumentZoomType.pyi b/com/sun/star/view/DocumentZoomType.pyi
deleted file mode 100644
index e47a391c3..000000000
--- a/com/sun/star/view/DocumentZoomType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.view.document_zoom_type import *
diff --git a/com/sun/star/_pyi/view/document_zoom_type.pyi b/com/sun/star/view/DocumentZoomType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/view/document_zoom_type.pyi
rename to com/sun/star/view/DocumentZoomType/__init__.pyi
diff --git a/com/sun/star/view/DuplexMode.pyi b/com/sun/star/view/DuplexMode.pyi
deleted file mode 100644
index 081a25c17..000000000
--- a/com/sun/star/view/DuplexMode.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.view.duplex_mode import *
diff --git a/com/sun/star/_pyi/view/duplex_mode.pyi b/com/sun/star/view/DuplexMode/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/view/duplex_mode.pyi
rename to com/sun/star/view/DuplexMode/__init__.pyi
diff --git a/com/sun/star/view/PaperFormat.pyi b/com/sun/star/view/PaperFormat.pyi
deleted file mode 100644
index 7a81ddd74..000000000
--- a/com/sun/star/view/PaperFormat.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.view.paper_format import *
diff --git a/com/sun/star/_pyi/view/paper_format.pyi b/com/sun/star/view/PaperFormat/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/view/paper_format.pyi
rename to com/sun/star/view/PaperFormat/__init__.pyi
diff --git a/com/sun/star/view/PaperOrientation.pyi b/com/sun/star/view/PaperOrientation.pyi
deleted file mode 100644
index 87bf8e0fd..000000000
--- a/com/sun/star/view/PaperOrientation.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.view.paper_orientation import *
diff --git a/com/sun/star/_pyi/view/paper_orientation.pyi b/com/sun/star/view/PaperOrientation/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/view/paper_orientation.pyi
rename to com/sun/star/view/PaperOrientation/__init__.pyi
diff --git a/com/sun/star/view/PrintableState.pyi b/com/sun/star/view/PrintableState.pyi
deleted file mode 100644
index 35541cee4..000000000
--- a/com/sun/star/view/PrintableState.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.view.printable_state import *
diff --git a/com/sun/star/_pyi/view/printable_state.pyi b/com/sun/star/view/PrintableState/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/view/printable_state.pyi
rename to com/sun/star/view/PrintableState/__init__.pyi
diff --git a/com/sun/star/view/SelectionType.pyi b/com/sun/star/view/SelectionType.pyi
deleted file mode 100644
index 813416418..000000000
--- a/com/sun/star/view/SelectionType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.view.selection_type import *
diff --git a/com/sun/star/_pyi/view/selection_type.pyi b/com/sun/star/view/SelectionType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/view/selection_type.pyi
rename to com/sun/star/view/SelectionType/__init__.pyi
diff --git a/com/sun/star/xml/crypto/CipherID.pyi b/com/sun/star/xml/crypto/CipherID.pyi
deleted file mode 100644
index 77c82798b..000000000
--- a/com/sun/star/xml/crypto/CipherID.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.xml.crypto.cipher_id import *
diff --git a/com/sun/star/_pyi/xml/crypto/cipher_id.pyi b/com/sun/star/xml/crypto/CipherID/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/xml/crypto/cipher_id.pyi
rename to com/sun/star/xml/crypto/CipherID/__init__.pyi
diff --git a/com/sun/star/xml/crypto/DigestID.pyi b/com/sun/star/xml/crypto/DigestID.pyi
deleted file mode 100644
index fdfc5238c..000000000
--- a/com/sun/star/xml/crypto/DigestID.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.xml.crypto.digest_id import *
diff --git a/com/sun/star/_pyi/xml/crypto/digest_id.pyi b/com/sun/star/xml/crypto/DigestID/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/xml/crypto/digest_id.pyi
rename to com/sun/star/xml/crypto/DigestID/__init__.pyi
diff --git a/com/sun/star/xml/crypto/SecurityOperationStatus.pyi b/com/sun/star/xml/crypto/SecurityOperationStatus.pyi
deleted file mode 100644
index a073b90c7..000000000
--- a/com/sun/star/xml/crypto/SecurityOperationStatus.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.xml.crypto.security_operation_status import *
diff --git a/com/sun/star/_pyi/xml/crypto/security_operation_status.pyi b/com/sun/star/xml/crypto/SecurityOperationStatus/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/xml/crypto/security_operation_status.pyi
rename to com/sun/star/xml/crypto/SecurityOperationStatus/__init__.pyi
diff --git a/com/sun/star/xml/crypto/sax/ConstOfSecurityId.pyi b/com/sun/star/xml/crypto/sax/ConstOfSecurityId.pyi
deleted file mode 100644
index ec054e232..000000000
--- a/com/sun/star/xml/crypto/sax/ConstOfSecurityId.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ...._pyi.xml.crypto.sax.const_of_security_id import *
diff --git a/com/sun/star/_pyi/xml/crypto/sax/const_of_security_id.pyi b/com/sun/star/xml/crypto/sax/ConstOfSecurityId/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/xml/crypto/sax/const_of_security_id.pyi
rename to com/sun/star/xml/crypto/sax/ConstOfSecurityId/__init__.pyi
diff --git a/com/sun/star/xml/crypto/sax/ElementMarkPriority.pyi b/com/sun/star/xml/crypto/sax/ElementMarkPriority.pyi
deleted file mode 100644
index 2e8494a8c..000000000
--- a/com/sun/star/xml/crypto/sax/ElementMarkPriority.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ...._pyi.xml.crypto.sax.element_mark_priority import *
diff --git a/com/sun/star/_pyi/xml/crypto/sax/element_mark_priority.pyi b/com/sun/star/xml/crypto/sax/ElementMarkPriority/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/xml/crypto/sax/element_mark_priority.pyi
rename to com/sun/star/xml/crypto/sax/ElementMarkPriority/__init__.pyi
diff --git a/com/sun/star/xml/crypto/sax/ElementMarkType.pyi b/com/sun/star/xml/crypto/sax/ElementMarkType.pyi
deleted file mode 100644
index 407fb3c22..000000000
--- a/com/sun/star/xml/crypto/sax/ElementMarkType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ...._pyi.xml.crypto.sax.element_mark_type import *
diff --git a/com/sun/star/_pyi/xml/crypto/sax/element_mark_type.pyi b/com/sun/star/xml/crypto/sax/ElementMarkType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/xml/crypto/sax/element_mark_type.pyi
rename to com/sun/star/xml/crypto/sax/ElementMarkType/__init__.pyi
diff --git a/com/sun/star/xml/dom/DOMExceptionType.pyi b/com/sun/star/xml/dom/DOMExceptionType.pyi
deleted file mode 100644
index 63b5ffddd..000000000
--- a/com/sun/star/xml/dom/DOMExceptionType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.xml.dom.dom_exception_type import *
diff --git a/com/sun/star/_pyi/xml/dom/dom_exception_type.pyi b/com/sun/star/xml/dom/DOMExceptionType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/xml/dom/dom_exception_type.pyi
rename to com/sun/star/xml/dom/DOMExceptionType/__init__.pyi
diff --git a/com/sun/star/xml/dom/NodeType.pyi b/com/sun/star/xml/dom/NodeType.pyi
deleted file mode 100644
index 4c82f3d14..000000000
--- a/com/sun/star/xml/dom/NodeType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.xml.dom.node_type import *
diff --git a/com/sun/star/_pyi/xml/dom/node_type.pyi b/com/sun/star/xml/dom/NodeType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/xml/dom/node_type.pyi
rename to com/sun/star/xml/dom/NodeType/__init__.pyi
diff --git a/com/sun/star/xml/dom/SAXDocumentBuilderState.pyi b/com/sun/star/xml/dom/SAXDocumentBuilderState.pyi
deleted file mode 100644
index ba6d968a0..000000000
--- a/com/sun/star/xml/dom/SAXDocumentBuilderState.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.xml.dom.sax_document_builder_state import *
diff --git a/com/sun/star/_pyi/xml/dom/sax_document_builder_state.pyi b/com/sun/star/xml/dom/SAXDocumentBuilderState/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/xml/dom/sax_document_builder_state.pyi
rename to com/sun/star/xml/dom/SAXDocumentBuilderState/__init__.pyi
diff --git a/com/sun/star/xml/dom/events/AttrChangeType.pyi b/com/sun/star/xml/dom/events/AttrChangeType.pyi
deleted file mode 100644
index 0b087e2f9..000000000
--- a/com/sun/star/xml/dom/events/AttrChangeType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ...._pyi.xml.dom.events.attr_change_type import *
diff --git a/com/sun/star/_pyi/xml/dom/events/attr_change_type.pyi b/com/sun/star/xml/dom/events/AttrChangeType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/xml/dom/events/attr_change_type.pyi
rename to com/sun/star/xml/dom/events/AttrChangeType/__init__.pyi
diff --git a/com/sun/star/xml/dom/events/EventType.pyi b/com/sun/star/xml/dom/events/EventType.pyi
deleted file mode 100644
index a3f086409..000000000
--- a/com/sun/star/xml/dom/events/EventType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ...._pyi.xml.dom.events.event_type import *
diff --git a/com/sun/star/_pyi/xml/dom/events/event_type.pyi b/com/sun/star/xml/dom/events/EventType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/xml/dom/events/event_type.pyi
rename to com/sun/star/xml/dom/events/EventType/__init__.pyi
diff --git a/com/sun/star/xml/dom/events/PhaseType.pyi b/com/sun/star/xml/dom/events/PhaseType.pyi
deleted file mode 100644
index 63c09b6ad..000000000
--- a/com/sun/star/xml/dom/events/PhaseType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ...._pyi.xml.dom.events.phase_type import *
diff --git a/com/sun/star/_pyi/xml/dom/events/phase_type.pyi b/com/sun/star/xml/dom/events/PhaseType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/xml/dom/events/phase_type.pyi
rename to com/sun/star/xml/dom/events/PhaseType/__init__.pyi
diff --git a/com/sun/star/xml/sax/FastToken.pyi b/com/sun/star/xml/sax/FastToken.pyi
deleted file mode 100644
index f2a72654e..000000000
--- a/com/sun/star/xml/sax/FastToken.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.xml.sax.fast_token import *
diff --git a/com/sun/star/_pyi/xml/sax/fast_token.pyi b/com/sun/star/xml/sax/FastToken/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/xml/sax/fast_token.pyi
rename to com/sun/star/xml/sax/FastToken/__init__.pyi
diff --git a/com/sun/star/xml/xpath/XPathObjectType.pyi b/com/sun/star/xml/xpath/XPathObjectType.pyi
deleted file mode 100644
index 6fb1a7667..000000000
--- a/com/sun/star/xml/xpath/XPathObjectType.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from ..._pyi.xml.xpath.x_path_object_type import *
diff --git a/com/sun/star/_pyi/xml/xpath/x_path_object_type.pyi b/com/sun/star/xml/xpath/XPathObjectType/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/xml/xpath/x_path_object_type.pyi
rename to com/sun/star/xml/xpath/XPathObjectType/__init__.pyi
diff --git a/com/sun/star/xsd/DataTypeClass.pyi b/com/sun/star/xsd/DataTypeClass.pyi
deleted file mode 100644
index ead7f6d24..000000000
--- a/com/sun/star/xsd/DataTypeClass.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.xsd.data_type_class import *
diff --git a/com/sun/star/_pyi/xsd/data_type_class.pyi b/com/sun/star/xsd/DataTypeClass/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/xsd/data_type_class.pyi
rename to com/sun/star/xsd/DataTypeClass/__init__.pyi
diff --git a/com/sun/star/xsd/WhiteSpaceTreatment.pyi b/com/sun/star/xsd/WhiteSpaceTreatment.pyi
deleted file mode 100644
index 41286b7ab..000000000
--- a/com/sun/star/xsd/WhiteSpaceTreatment.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-#
-# Copyright 2022 :Barry-Thomas-Paul: Moss
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http: // www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-from .._pyi.xsd.white_space_treatment import *
diff --git a/com/sun/star/_pyi/xsd/white_space_treatment.pyi b/com/sun/star/xsd/WhiteSpaceTreatment/__init__.pyi
similarity index 100%
rename from com/sun/star/_pyi/xsd/white_space_treatment.pyi
rename to com/sun/star/xsd/WhiteSpaceTreatment/__init__.pyi
diff --git a/setup.py b/setup.py
index 602e50292..5f77c2ae1 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import setup, find_packages
 # from scriptforge_stubs import __version__
 PKG_NAME = 'types-unopy'
-VERSION = "0.3.10"
+VERSION = "0.4.0"
 
 def package_files(directory):
     paths = []


Test patch:
diff --git a/cmds/run_pypi_upload_test.py b/cmds/run_pypi_upload_test.py
index 2e9bb325b..af26e2524 100644
--- a/cmds/run_pypi_upload_test.py
+++ b/cmds/run_pypi_upload_test.py
@@ -4,7 +4,7 @@
 
 def main():
     cmd_str = 'twine upload --repository-url https://test.pypi.org/legacy/ dist/*'
-    res = subprocess.run(cmd_str.split(' '))
+    res = subprocess.run(cmd_str.split())
     if res and res.returncode != 0:
         print(res)