From 6ab0fa69ce363d5502a3fe65e088ea79c808174b Mon Sep 17 00:00:00 2001
From: gentlegiantJGC <gentlegiantJGC@users.noreply.github.com>
Date: Tue, 7 May 2024 15:30:13 +0100
Subject: [PATCH] Move and rename plugins

---
 .../amulet_team_3d_viewer/_plugin.py            | 10 +++++-----
 .../amulet_team_3d_viewer/_view_3d/_view.py     |  2 +-
 .../amulet_team_3d_viewer/plugin.json           |  2 +-
 .../amulet_team_home_page/_plugin.py            | 10 +++++-----
 .../amulet_team_home_page/home/__init__.py      |  2 +-
 .../amulet_team_home_page/plugin.json           |  2 +-
 .../amulet_team_main_window/__init__.py         | 12 +++++++++++-
 .../{application => _application}/__init__.py   |  0
 .../_application/tab_engine.py                  |  0
 .../_application/widget.py                      |  0
 .../windows/__init__.py                         |  0
 .../_application/windows/layout.py              |  2 +-
 .../windows/main_window/__init__.py             |  8 ++++----
 .../windows/main_window/main_window.py          |  4 ++--
 .../windows/main_window/main_window.ui          |  2 +-
 .../_application/windows/main_window/toolbar.py |  0
 .../_application/windows/sub_window/__init__.py |  4 ++--
 .../windows/sub_window/sub_window.py            |  4 ++--
 .../windows/sub_window/sub_window.ui            |  2 +-
 .../_application/windows/tab_engine_imp.py      |  6 +++---
 .../_application/windows/window_proxy.py        |  2 +-
 .../windows_}/__init__.py                       |  0
 .../windows_/main_window/__init__.py            |  0
 .../windows_/main_window/_main_window.py        |  2 +-
 .../windows_/sub_window/__init__.py             |  0
 .../windows_/sub_window/_sub_window.py          |  2 +-
 .../amulet_team_main_window/_plugin.py          | 10 ++--------
 .../amulet_team_main_window2/__init__.py        | 11 -----------
 .../amulet_team_main_window2/_plugin.py         | 11 -----------
 .../amulet_team_main_window/__init__.py         |  1 +
 .../amulet_team_main_window/_plugin.py          | 16 ++++++++++++++++
 .../amulet_team_main_window/api.py              | 17 +++++++++--------
 .../application}/__init__.py                    |  0
 .../application}/windows/__init__.py            |  0
 .../application/windows/main_window/__init__.py |  2 +-
 .../windows/main_window/_landing_window.py      |  2 +-
 .../windows/main_window/_landing_window.ui      |  0
 .../application/windows/main_window/_view.py    |  0
 .../amulet_team_main_window/models}/__init__.py |  0
 .../amulet_team_main_window/models/view.py      |  0
 .../amulet_team_main_window}/plugin.json        |  3 +--
 .../amulet_team_vault/__init__.py               |  0
 .../amulet_team_vault/_plugin.py                |  0
 .../amulet_team_vault/plugin.json               |  0
 44 files changed, 75 insertions(+), 76 deletions(-)
 rename src/builtin_plugins/amulet_team_main_window/{application => _application}/__init__.py (100%)
 rename src/builtin_plugins/{amulet_team_main_window2 => amulet_team_main_window}/_application/tab_engine.py (100%)
 rename src/builtin_plugins/{amulet_team_main_window2 => amulet_team_main_window}/_application/widget.py (100%)
 rename src/builtin_plugins/amulet_team_main_window/{application => _application}/windows/__init__.py (100%)
 rename src/builtin_plugins/{amulet_team_main_window2 => amulet_team_main_window}/_application/windows/layout.py (79%)
 rename src/builtin_plugins/{amulet_team_main_window2 => amulet_team_main_window}/_application/windows/main_window/__init__.py (94%)
 rename src/builtin_plugins/{amulet_team_main_window2 => amulet_team_main_window}/_application/windows/main_window/main_window.py (96%)
 rename src/builtin_plugins/{amulet_team_main_window2 => amulet_team_main_window}/_application/windows/main_window/main_window.ui (96%)
 rename src/builtin_plugins/{amulet_team_main_window2 => amulet_team_main_window}/_application/windows/main_window/toolbar.py (100%)
 rename src/builtin_plugins/{amulet_team_main_window2 => amulet_team_main_window}/_application/windows/sub_window/__init__.py (83%)
 rename src/builtin_plugins/{amulet_team_main_window2 => amulet_team_main_window}/_application/windows/sub_window/sub_window.py (91%)
 rename src/builtin_plugins/{amulet_team_main_window2 => amulet_team_main_window}/_application/windows/sub_window/sub_window.ui (90%)
 rename src/builtin_plugins/{amulet_team_main_window2 => amulet_team_main_window}/_application/windows/tab_engine_imp.py (88%)
 rename src/builtin_plugins/{amulet_team_main_window2 => amulet_team_main_window}/_application/windows/window_proxy.py (82%)
 rename src/builtin_plugins/amulet_team_main_window/{models => _application/windows_}/__init__.py (100%)
 rename src/builtin_plugins/{amulet_team_main_window2 => amulet_team_main_window}/_application/windows_/main_window/__init__.py (100%)
 rename src/builtin_plugins/{amulet_team_main_window2 => amulet_team_main_window}/_application/windows_/main_window/_main_window.py (97%)
 rename src/builtin_plugins/{amulet_team_main_window2 => amulet_team_main_window}/_application/windows_/sub_window/__init__.py (100%)
 rename src/builtin_plugins/{amulet_team_main_window2 => amulet_team_main_window}/_application/windows_/sub_window/_sub_window.py (93%)
 delete mode 100644 src/builtin_plugins/amulet_team_main_window2/__init__.py
 delete mode 100644 src/builtin_plugins/amulet_team_main_window2/_plugin.py
 create mode 100644 src/builtin_plugins_/amulet_team_main_window/__init__.py
 create mode 100644 src/builtin_plugins_/amulet_team_main_window/_plugin.py
 rename src/{builtin_plugins => builtin_plugins_}/amulet_team_main_window/api.py (86%)
 rename src/{builtin_plugins/amulet_team_main_window2/_application => builtin_plugins_/amulet_team_main_window/application}/__init__.py (100%)
 rename src/{builtin_plugins/amulet_team_main_window2/_application => builtin_plugins_/amulet_team_main_window/application}/windows/__init__.py (100%)
 rename src/{builtin_plugins => builtin_plugins_}/amulet_team_main_window/application/windows/main_window/__init__.py (99%)
 rename src/{builtin_plugins => builtin_plugins_}/amulet_team_main_window/application/windows/main_window/_landing_window.py (98%)
 rename src/{builtin_plugins => builtin_plugins_}/amulet_team_main_window/application/windows/main_window/_landing_window.ui (100%)
 rename src/{builtin_plugins => builtin_plugins_}/amulet_team_main_window/application/windows/main_window/_view.py (100%)
 rename src/{builtin_plugins/amulet_team_main_window2/_application/windows_ => builtin_plugins_/amulet_team_main_window/models}/__init__.py (100%)
 rename src/{builtin_plugins => builtin_plugins_}/amulet_team_main_window/models/view.py (100%)
 rename src/{builtin_plugins/amulet_team_main_window2 => builtin_plugins_/amulet_team_main_window}/plugin.json (81%)
 rename src/{builtin_plugins => builtin_plugins_}/amulet_team_vault/__init__.py (100%)
 rename src/{builtin_plugins => builtin_plugins_}/amulet_team_vault/_plugin.py (100%)
 rename src/{builtin_plugins => builtin_plugins_}/amulet_team_vault/plugin.json (100%)

diff --git a/src/builtin_plugins/amulet_team_3d_viewer/_plugin.py b/src/builtin_plugins/amulet_team_3d_viewer/_plugin.py
index 6929255d..e5452991 100644
--- a/src/builtin_plugins/amulet_team_3d_viewer/_plugin.py
+++ b/src/builtin_plugins/amulet_team_3d_viewer/_plugin.py
@@ -9,7 +9,7 @@
 from amulet_editor.models.plugin import PluginV1
 
 import amulet_team_locale
-import amulet_team_main_window2
+import amulet_team_main_window
 import tablericons
 
 import amulet_team_3d_viewer
@@ -18,11 +18,11 @@
 
 # Qt only weekly references this. We must hold a strong reference to stop it getting garbage collected
 _translator: Optional[ATranslator] = None
-view_3d_button: Optional[amulet_team_main_window2.ButtonProxy] = None
+view_3d_button: Optional[amulet_team_main_window.ButtonProxy] = None
 
 
 def _set_view_3d_layout():
-    amulet_team_main_window2.get_main_window().set_layout(View3D)
+    amulet_team_main_window.get_main_window().set_layout(View3D)
 
 
 def load_plugin():
@@ -32,9 +32,9 @@ def load_plugin():
         _locale_changed()
         QCoreApplication.installTranslator(_translator)
         amulet_team_locale.locale_changed.connect(_locale_changed)
-        amulet_team_main_window2.register_widget(View3D)
+        amulet_team_main_window.register_widget(View3D)
 
-        view_3d_button = amulet_team_main_window2.add_toolbar_button(sticky=True)
+        view_3d_button = amulet_team_main_window.add_toolbar_button(sticky=True)
         view_3d_button.set_icon(tablericons.three_d_cube_sphere)
         view_3d_button.set_name("3D Editor")
         view_3d_button.set_callback(_set_view_3d_layout)
diff --git a/src/builtin_plugins/amulet_team_3d_viewer/_view_3d/_view.py b/src/builtin_plugins/amulet_team_3d_viewer/_view_3d/_view.py
index 0ef7076c..89f188f9 100644
--- a/src/builtin_plugins/amulet_team_3d_viewer/_view_3d/_view.py
+++ b/src/builtin_plugins/amulet_team_3d_viewer/_view_3d/_view.py
@@ -5,7 +5,7 @@
 from PySide6.QtCore import Qt
 from PySide6.QtWidgets import QWidget, QVBoxLayout
 
-from amulet_team_main_window2 import Widget
+from amulet_team_main_window import Widget
 
 from ._renderer import FirstPersonCanvas
 
diff --git a/src/builtin_plugins/amulet_team_3d_viewer/plugin.json b/src/builtin_plugins/amulet_team_3d_viewer/plugin.json
index f8b79eed..76103209 100644
--- a/src/builtin_plugins/amulet_team_3d_viewer/plugin.json
+++ b/src/builtin_plugins/amulet_team_3d_viewer/plugin.json
@@ -17,7 +17,7 @@
 		],
 		"plugin": [
 			"amulet_team_locale~=1.0",
-			"amulet_team_main_window2~=1.0",
+			"amulet_team_main_window~=1.0",
 			"amulet_team_home_page~=1.0",
 			"amulet_team_resource_pack~=1.0",
 			"tablericons~=1.0",
diff --git a/src/builtin_plugins/amulet_team_home_page/_plugin.py b/src/builtin_plugins/amulet_team_home_page/_plugin.py
index 8ea9bd58..595df466 100644
--- a/src/builtin_plugins/amulet_team_home_page/_plugin.py
+++ b/src/builtin_plugins/amulet_team_home_page/_plugin.py
@@ -7,7 +7,7 @@
 from amulet_editor.models.plugin import PluginV1
 
 import amulet_team_locale
-import amulet_team_main_window2
+import amulet_team_main_window
 import tablericons
 
 import amulet_team_home_page
@@ -17,11 +17,11 @@
 # Qt only weekly references this. We must hold a strong reference to stop it getting garbage collected
 _translator: ATranslator | None = None
 
-home_button: amulet_team_main_window2.ButtonProxy | None = None
+home_button: amulet_team_main_window.ButtonProxy | None = None
 
 
 def _set_home_layout() -> None:
-    amulet_team_main_window2.get_main_window().set_layout(HomeWidget)
+    amulet_team_main_window.get_main_window().set_layout(HomeWidget)
 
 
 def load_plugin() -> None:
@@ -31,10 +31,10 @@ def load_plugin() -> None:
     QCoreApplication.installTranslator(_translator)
     amulet_team_locale.locale_changed.connect(_locale_changed)
 
-    amulet_team_main_window2.register_widget(HomeWidget)
+    amulet_team_main_window.register_widget(HomeWidget)
 
     # Set up the button
-    home_button = amulet_team_main_window2.add_toolbar_button(sticky=True)
+    home_button = amulet_team_main_window.add_toolbar_button(sticky=True)
     home_button.set_icon(tablericons.home)
     home_button.set_name("Home")
     home_button.set_callback(_set_home_layout)
diff --git a/src/builtin_plugins/amulet_team_home_page/home/__init__.py b/src/builtin_plugins/amulet_team_home_page/home/__init__.py
index 78e6371d..6e9f768b 100644
--- a/src/builtin_plugins/amulet_team_home_page/home/__init__.py
+++ b/src/builtin_plugins/amulet_team_home_page/home/__init__.py
@@ -8,7 +8,7 @@
 from .home import HomePage
 from .open_world import OpenWorldPage
 
-from amulet_team_main_window2 import Widget
+from amulet_team_main_window import Widget
 from amulet_team_locale import set_locale
 
 
diff --git a/src/builtin_plugins/amulet_team_home_page/plugin.json b/src/builtin_plugins/amulet_team_home_page/plugin.json
index f0cf805a..51d083e7 100644
--- a/src/builtin_plugins/amulet_team_home_page/plugin.json
+++ b/src/builtin_plugins/amulet_team_home_page/plugin.json
@@ -10,7 +10,7 @@
 		],
 		"plugin": [
 			"amulet_team_locale~=1.0",
-			"amulet_team_main_window2~=1.0",
+			"amulet_team_main_window~=1.0",
 			"tablericons~=1.0"
 		]
 	},
diff --git a/src/builtin_plugins/amulet_team_main_window/__init__.py b/src/builtin_plugins/amulet_team_main_window/__init__.py
index a5ca1e06..4c17db1e 100644
--- a/src/builtin_plugins/amulet_team_main_window/__init__.py
+++ b/src/builtin_plugins/amulet_team_main_window/__init__.py
@@ -1 +1,11 @@
-# from ._plugin import plugin
+from ._plugin import plugin  # Private plugin initialisation
+
+# Public functions and classes
+from ._application.widget import Widget, register_widget, unregister_widget
+from ._application.windows.window_proxy import AbstractWindowProxy
+from ._application.windows.main_window import (
+    AmuletMainWindowProxy,
+    get_main_window,
+    add_toolbar_button,
+)
+from ._application.windows.main_window.toolbar import ButtonProxy
diff --git a/src/builtin_plugins/amulet_team_main_window/application/__init__.py b/src/builtin_plugins/amulet_team_main_window/_application/__init__.py
similarity index 100%
rename from src/builtin_plugins/amulet_team_main_window/application/__init__.py
rename to src/builtin_plugins/amulet_team_main_window/_application/__init__.py
diff --git a/src/builtin_plugins/amulet_team_main_window2/_application/tab_engine.py b/src/builtin_plugins/amulet_team_main_window/_application/tab_engine.py
similarity index 100%
rename from src/builtin_plugins/amulet_team_main_window2/_application/tab_engine.py
rename to src/builtin_plugins/amulet_team_main_window/_application/tab_engine.py
diff --git a/src/builtin_plugins/amulet_team_main_window2/_application/widget.py b/src/builtin_plugins/amulet_team_main_window/_application/widget.py
similarity index 100%
rename from src/builtin_plugins/amulet_team_main_window2/_application/widget.py
rename to src/builtin_plugins/amulet_team_main_window/_application/widget.py
diff --git a/src/builtin_plugins/amulet_team_main_window/application/windows/__init__.py b/src/builtin_plugins/amulet_team_main_window/_application/windows/__init__.py
similarity index 100%
rename from src/builtin_plugins/amulet_team_main_window/application/windows/__init__.py
rename to src/builtin_plugins/amulet_team_main_window/_application/windows/__init__.py
diff --git a/src/builtin_plugins/amulet_team_main_window2/_application/windows/layout.py b/src/builtin_plugins/amulet_team_main_window/_application/windows/layout.py
similarity index 79%
rename from src/builtin_plugins/amulet_team_main_window2/_application/windows/layout.py
rename to src/builtin_plugins/amulet_team_main_window/_application/windows/layout.py
index b8225a9f..a4d039dd 100644
--- a/src/builtin_plugins/amulet_team_main_window2/_application/windows/layout.py
+++ b/src/builtin_plugins/amulet_team_main_window/_application/windows/layout.py
@@ -4,7 +4,7 @@
 
 from PySide6.QtCore import Qt
 
-from amulet_team_main_window2._application.widget import Widget
+from amulet_team_main_window._application.widget import Widget
 
 
 class Layout(NamedTuple):
diff --git a/src/builtin_plugins/amulet_team_main_window2/_application/windows/main_window/__init__.py b/src/builtin_plugins/amulet_team_main_window/_application/windows/main_window/__init__.py
similarity index 94%
rename from src/builtin_plugins/amulet_team_main_window2/_application/windows/main_window/__init__.py
rename to src/builtin_plugins/amulet_team_main_window/_application/windows/main_window/__init__.py
index 877b427d..5fea518f 100644
--- a/src/builtin_plugins/amulet_team_main_window2/_application/windows/main_window/__init__.py
+++ b/src/builtin_plugins/amulet_team_main_window/_application/windows/main_window/__init__.py
@@ -12,12 +12,12 @@
 
 from amulet_team_inspector import show_inspector
 
-from amulet_team_main_window2._application.widget import Widget, is_registered_widget
-from amulet_team_main_window2._application.windows.window_proxy import (
+from amulet_team_main_window._application.widget import Widget, is_registered_widget
+from amulet_team_main_window._application.windows.window_proxy import (
     AbstractWindowProxy,
 )
-from amulet_team_main_window2._application.windows.layout import Layout
-from amulet_team_main_window2._application.windows.tab_engine_imp import (
+from amulet_team_main_window._application.windows.layout import Layout
+from amulet_team_main_window._application.windows.tab_engine_imp import (
     StackedTabWidget,
 )
 
diff --git a/src/builtin_plugins/amulet_team_main_window2/_application/windows/main_window/main_window.py b/src/builtin_plugins/amulet_team_main_window/_application/windows/main_window/main_window.py
similarity index 96%
rename from src/builtin_plugins/amulet_team_main_window2/_application/windows/main_window/main_window.py
rename to src/builtin_plugins/amulet_team_main_window/_application/windows/main_window/main_window.py
index 5f6cec7b..5063c4d9 100644
--- a/src/builtin_plugins/amulet_team_main_window2/_application/windows/main_window/main_window.py
+++ b/src/builtin_plugins/amulet_team_main_window/_application/windows/main_window/main_window.py
@@ -17,14 +17,14 @@
     QWidget,
 )
 from .toolbar import ToolBar
-from amulet_team_main_window2._application.tab_engine import RecursiveSplitter
+from amulet_team_main_window._application.tab_engine import RecursiveSplitter
 
 
 class Ui_AmuletMainWindow(QMainWindow):
     def __init__(
         self, parent: QWidget | None = None, flags: Qt.WindowType = Qt.WindowType.Window
     ) -> None:
-        super().__init__(parent, f)
+        super().__init__(parent, flags)
         if not self.objectName():
             self.setObjectName("AmuletMainWindow")
         self.resize(1129, 792)
diff --git a/src/builtin_plugins/amulet_team_main_window2/_application/windows/main_window/main_window.ui b/src/builtin_plugins/amulet_team_main_window/_application/windows/main_window/main_window.ui
similarity index 96%
rename from src/builtin_plugins/amulet_team_main_window2/_application/windows/main_window/main_window.ui
rename to src/builtin_plugins/amulet_team_main_window/_application/windows/main_window/main_window.ui
index 6fd51ba9..c4717ead 100644
--- a/src/builtin_plugins/amulet_team_main_window2/_application/windows/main_window/main_window.ui
+++ b/src/builtin_plugins/amulet_team_main_window/_application/windows/main_window/main_window.ui
@@ -80,7 +80,7 @@
   <customwidget>
    <class>RecursiveSplitter</class>
    <extends>QFrame</extends>
-   <header>amulet_team_main_window2._application.tab_engine</header>
+   <header>amulet_team_main_window._application.tab_engine</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/builtin_plugins/amulet_team_main_window2/_application/windows/main_window/toolbar.py b/src/builtin_plugins/amulet_team_main_window/_application/windows/main_window/toolbar.py
similarity index 100%
rename from src/builtin_plugins/amulet_team_main_window2/_application/windows/main_window/toolbar.py
rename to src/builtin_plugins/amulet_team_main_window/_application/windows/main_window/toolbar.py
diff --git a/src/builtin_plugins/amulet_team_main_window2/_application/windows/sub_window/__init__.py b/src/builtin_plugins/amulet_team_main_window/_application/windows/sub_window/__init__.py
similarity index 83%
rename from src/builtin_plugins/amulet_team_main_window2/_application/windows/sub_window/__init__.py
rename to src/builtin_plugins/amulet_team_main_window/_application/windows/sub_window/__init__.py
index 2d6bd855..4bafc442 100644
--- a/src/builtin_plugins/amulet_team_main_window2/_application/windows/sub_window/__init__.py
+++ b/src/builtin_plugins/amulet_team_main_window/_application/windows/sub_window/__init__.py
@@ -2,8 +2,8 @@
 
 from PySide6.QtGui import QCloseEvent
 
-from amulet_team_main_window2._application.widget import Widget
-from amulet_team_main_window2._application.windows.window_proxy import (
+from amulet_team_main_window._application.widget import Widget
+from amulet_team_main_window._application.windows.window_proxy import (
     AbstractWindowProxy,
 )
 from .sub_window import Ui_AmuletSubWindow
diff --git a/src/builtin_plugins/amulet_team_main_window2/_application/windows/sub_window/sub_window.py b/src/builtin_plugins/amulet_team_main_window/_application/windows/sub_window/sub_window.py
similarity index 91%
rename from src/builtin_plugins/amulet_team_main_window2/_application/windows/sub_window/sub_window.py
rename to src/builtin_plugins/amulet_team_main_window/_application/windows/sub_window/sub_window.py
index b46d7c94..f74fb0c5 100644
--- a/src/builtin_plugins/amulet_team_main_window2/_application/windows/sub_window/sub_window.py
+++ b/src/builtin_plugins/amulet_team_main_window/_application/windows/sub_window/sub_window.py
@@ -8,14 +8,14 @@
 ################################################################################
 from PySide6.QtCore import QCoreApplication, QMetaObject, Qt, QEvent
 from PySide6.QtWidgets import QMainWindow, QWidget
-from amulet_team_main_window2._application.tab_engine import RecursiveSplitter
+from amulet_team_main_window._application.tab_engine import RecursiveSplitter
 
 
 class Ui_AmuletSubWindow(QMainWindow):
     def __init__(
         self, parent: QWidget | None = None, flags: Qt.WindowType = Qt.WindowType.Window
     ) -> None:
-        super().__init__(parent, f)
+        super().__init__(parent, flags)
         if not self.objectName():
             self.setObjectName("AmuletSubWindow")
         self.resize(1129, 792)
diff --git a/src/builtin_plugins/amulet_team_main_window2/_application/windows/sub_window/sub_window.ui b/src/builtin_plugins/amulet_team_main_window/_application/windows/sub_window/sub_window.ui
similarity index 90%
rename from src/builtin_plugins/amulet_team_main_window2/_application/windows/sub_window/sub_window.ui
rename to src/builtin_plugins/amulet_team_main_window/_application/windows/sub_window/sub_window.ui
index e3bd8036..b350318b 100644
--- a/src/builtin_plugins/amulet_team_main_window2/_application/windows/sub_window/sub_window.ui
+++ b/src/builtin_plugins/amulet_team_main_window/_application/windows/sub_window/sub_window.ui
@@ -19,7 +19,7 @@
   <customwidget>
    <class>RecursiveSplitter</class>
    <extends>QFrame</extends>
-   <header>amulet_team_main_window2._application.tab_engine</header>
+   <header>amulet_team_main_window._application.tab_engine</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/builtin_plugins/amulet_team_main_window2/_application/windows/tab_engine_imp.py b/src/builtin_plugins/amulet_team_main_window/_application/windows/tab_engine_imp.py
similarity index 88%
rename from src/builtin_plugins/amulet_team_main_window2/_application/windows/tab_engine_imp.py
rename to src/builtin_plugins/amulet_team_main_window/_application/windows/tab_engine_imp.py
index e3121bf5..bcdacdf6 100644
--- a/src/builtin_plugins/amulet_team_main_window2/_application/windows/tab_engine_imp.py
+++ b/src/builtin_plugins/amulet_team_main_window/_application/windows/tab_engine_imp.py
@@ -3,15 +3,15 @@
 from PySide6.QtWidgets import QWidget
 from PySide6.QtGui import QMouseEvent
 
-from amulet_team_main_window2._application.tab_engine import (
+from amulet_team_main_window._application.tab_engine import (
     AbstractTabContainer,
     AbstractTabBar,
     AbstractTabContainerWidget,
     AbstractStackedTabWidget,
     TabPage,
 )
-import amulet_team_main_window2._application.windows.main_window as main_window
-import amulet_team_main_window2._application.windows.sub_window as sub_window
+import amulet_team_main_window._application.windows.main_window as main_window
+import amulet_team_main_window._application.windows.sub_window as sub_window
 
 
 class TabContainerWidget(AbstractTabContainerWidget):
diff --git a/src/builtin_plugins/amulet_team_main_window2/_application/windows/window_proxy.py b/src/builtin_plugins/amulet_team_main_window/_application/windows/window_proxy.py
similarity index 82%
rename from src/builtin_plugins/amulet_team_main_window2/_application/windows/window_proxy.py
rename to src/builtin_plugins/amulet_team_main_window/_application/windows/window_proxy.py
index 85518ba9..83482f42 100644
--- a/src/builtin_plugins/amulet_team_main_window2/_application/windows/window_proxy.py
+++ b/src/builtin_plugins/amulet_team_main_window/_application/windows/window_proxy.py
@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from typing import Union, Type
 
-from amulet_team_main_window2._application.widget import Widget
+from amulet_team_main_window._application.widget import Widget
 from .layout import Layout
 
 
diff --git a/src/builtin_plugins/amulet_team_main_window/models/__init__.py b/src/builtin_plugins/amulet_team_main_window/_application/windows_/__init__.py
similarity index 100%
rename from src/builtin_plugins/amulet_team_main_window/models/__init__.py
rename to src/builtin_plugins/amulet_team_main_window/_application/windows_/__init__.py
diff --git a/src/builtin_plugins/amulet_team_main_window2/_application/windows_/main_window/__init__.py b/src/builtin_plugins/amulet_team_main_window/_application/windows_/main_window/__init__.py
similarity index 100%
rename from src/builtin_plugins/amulet_team_main_window2/_application/windows_/main_window/__init__.py
rename to src/builtin_plugins/amulet_team_main_window/_application/windows_/main_window/__init__.py
diff --git a/src/builtin_plugins/amulet_team_main_window2/_application/windows_/main_window/_main_window.py b/src/builtin_plugins/amulet_team_main_window/_application/windows_/main_window/_main_window.py
similarity index 97%
rename from src/builtin_plugins/amulet_team_main_window2/_application/windows_/main_window/_main_window.py
rename to src/builtin_plugins/amulet_team_main_window/_application/windows_/main_window/_main_window.py
index ee40818b..8b0c277c 100644
--- a/src/builtin_plugins/amulet_team_main_window2/_application/windows_/main_window/_main_window.py
+++ b/src/builtin_plugins/amulet_team_main_window/_application/windows_/main_window/_main_window.py
@@ -10,7 +10,7 @@
 
 from amulet_team_inspector import show_inspector
 
-from amulet_team_main_window2._application.tab_engine import (
+from amulet_team_main_window._application.tab_engine import (
     TabEngineStackedTabWidget,
     RecursiveSplitter,
     TabPage,
diff --git a/src/builtin_plugins/amulet_team_main_window2/_application/windows_/sub_window/__init__.py b/src/builtin_plugins/amulet_team_main_window/_application/windows_/sub_window/__init__.py
similarity index 100%
rename from src/builtin_plugins/amulet_team_main_window2/_application/windows_/sub_window/__init__.py
rename to src/builtin_plugins/amulet_team_main_window/_application/windows_/sub_window/__init__.py
diff --git a/src/builtin_plugins/amulet_team_main_window2/_application/windows_/sub_window/_sub_window.py b/src/builtin_plugins/amulet_team_main_window/_application/windows_/sub_window/_sub_window.py
similarity index 93%
rename from src/builtin_plugins/amulet_team_main_window2/_application/windows_/sub_window/_sub_window.py
rename to src/builtin_plugins/amulet_team_main_window/_application/windows_/sub_window/_sub_window.py
index bb74565e..b48d0e1d 100644
--- a/src/builtin_plugins/amulet_team_main_window2/_application/windows_/sub_window/_sub_window.py
+++ b/src/builtin_plugins/amulet_team_main_window/_application/windows_/sub_window/_sub_window.py
@@ -3,7 +3,7 @@
 from PySide6.QtCore import QCoreApplication, QMetaObject, QEvent
 from PySide6.QtWidgets import QMainWindow
 
-import amulet_team_main_window2._application.tab_engine as tab_engine
+import amulet_team_main_window._application.tab_engine as tab_engine
 
 
 class AmuletSubWindow(QMainWindow):
diff --git a/src/builtin_plugins/amulet_team_main_window/_plugin.py b/src/builtin_plugins/amulet_team_main_window/_plugin.py
index 4c2ee153..2e82f778 100644
--- a/src/builtin_plugins/amulet_team_main_window/_plugin.py
+++ b/src/builtin_plugins/amulet_team_main_window/_plugin.py
@@ -1,17 +1,11 @@
 from __future__ import annotations
-from typing import Optional
 
-from amulet_team_main_window.application.windows.main_window import AmuletMainWindow
+from ._application.windows.main_window import AmuletMainWindow
 from amulet_editor.models.plugin import PluginV1
 
 
-window: Optional[AmuletMainWindow] = None
-
-
 def load_plugin() -> None:
-    global window
-    window = AmuletMainWindow()
-    window.showMaximized()
+    AmuletMainWindow.instance().showMaximized()
 
 
 plugin = PluginV1(load_plugin)
diff --git a/src/builtin_plugins/amulet_team_main_window2/__init__.py b/src/builtin_plugins/amulet_team_main_window2/__init__.py
deleted file mode 100644
index 4c17db1e..00000000
--- a/src/builtin_plugins/amulet_team_main_window2/__init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from ._plugin import plugin  # Private plugin initialisation
-
-# Public functions and classes
-from ._application.widget import Widget, register_widget, unregister_widget
-from ._application.windows.window_proxy import AbstractWindowProxy
-from ._application.windows.main_window import (
-    AmuletMainWindowProxy,
-    get_main_window,
-    add_toolbar_button,
-)
-from ._application.windows.main_window.toolbar import ButtonProxy
diff --git a/src/builtin_plugins/amulet_team_main_window2/_plugin.py b/src/builtin_plugins/amulet_team_main_window2/_plugin.py
deleted file mode 100644
index de4d13c2..00000000
--- a/src/builtin_plugins/amulet_team_main_window2/_plugin.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from __future__ import annotations
-
-from ._application.windows.main_window import AmuletMainWindow
-from amulet_editor.models.plugin import PluginV1
-
-
-def load_plugin():
-    AmuletMainWindow.instance().showMaximized()
-
-
-plugin = PluginV1(load_plugin)
diff --git a/src/builtin_plugins_/amulet_team_main_window/__init__.py b/src/builtin_plugins_/amulet_team_main_window/__init__.py
new file mode 100644
index 00000000..a5ca1e06
--- /dev/null
+++ b/src/builtin_plugins_/amulet_team_main_window/__init__.py
@@ -0,0 +1 @@
+# from ._plugin import plugin
diff --git a/src/builtin_plugins_/amulet_team_main_window/_plugin.py b/src/builtin_plugins_/amulet_team_main_window/_plugin.py
new file mode 100644
index 00000000..daa838ab
--- /dev/null
+++ b/src/builtin_plugins_/amulet_team_main_window/_plugin.py
@@ -0,0 +1,16 @@
+from __future__ import annotations
+
+from amulet_team_main_window.application.windows.main_window import AmuletMainWindow
+from amulet_editor.models.plugin import PluginV1
+
+
+window: AmuletMainWindow | None = None
+
+
+def load_plugin() -> None:
+    global window
+    window = AmuletMainWindow()
+    window.showMaximized()
+
+
+plugin = PluginV1(load_plugin)
diff --git a/src/builtin_plugins/amulet_team_main_window/api.py b/src/builtin_plugins_/amulet_team_main_window/api.py
similarity index 86%
rename from src/builtin_plugins/amulet_team_main_window/api.py
rename to src/builtin_plugins_/amulet_team_main_window/api.py
index 6e711327..c5634874 100644
--- a/src/builtin_plugins/amulet_team_main_window/api.py
+++ b/src/builtin_plugins_/amulet_team_main_window/api.py
@@ -9,26 +9,27 @@
 
 
 def get_windows() -> tuple[AmuletMainWindow, ...]:
-    return (_plugin.window,)
+    return (get_active_window(),)
 
 
 def get_active_window() -> AmuletMainWindow:
+    assert _plugin.window is not None
     return _plugin.window
 
 
-def register_view(view_cls: Type[View], icon: str, name: str):
+def register_view(view_cls: Type[View], icon: str, name: str) -> None:
     for window in get_windows():
         window.register_view(view_cls, icon, name)
 
 
-def unregister_view(view_cls: Type[View]):
+def unregister_view(view_cls: Type[View]) -> None:
     for window in get_windows():
         window.unregister_view(view_cls)
 
 
 def add_toolbar_button(
-    uid: UID, icon_path: str, name: str, callback: Callable[[], None] = None
-):
+    uid: UID, icon_path: str, name: str, callback: Callable[[], None] = lambda: None
+) -> None:
     """
     Add an icon to the toolbar for all windows.
 
@@ -43,8 +44,8 @@ def add_toolbar_button(
 
 
 def add_static_toolbar_button(
-    uid: UID, icon_path: str, name: str, callback: Callable[[], None] = None
-):
+    uid: UID, icon_path: str, name: str, callback: Callable[[], None] = lambda: None
+) -> None:
     """
     Add a static icon to the toolbar for all windows.
     These should be reserved for special cases.
@@ -60,7 +61,7 @@ def add_static_toolbar_button(
         window.add_static_toolbar_button(uid, icon_path, name, callback)
 
 
-def remove_toolbar_button(uid: UID):
+def remove_toolbar_button(uid: UID) -> None:
     """
     Remove a toolbar button from all windows.
 
diff --git a/src/builtin_plugins/amulet_team_main_window2/_application/__init__.py b/src/builtin_plugins_/amulet_team_main_window/application/__init__.py
similarity index 100%
rename from src/builtin_plugins/amulet_team_main_window2/_application/__init__.py
rename to src/builtin_plugins_/amulet_team_main_window/application/__init__.py
diff --git a/src/builtin_plugins/amulet_team_main_window2/_application/windows/__init__.py b/src/builtin_plugins_/amulet_team_main_window/application/windows/__init__.py
similarity index 100%
rename from src/builtin_plugins/amulet_team_main_window2/_application/windows/__init__.py
rename to src/builtin_plugins_/amulet_team_main_window/application/windows/__init__.py
diff --git a/src/builtin_plugins/amulet_team_main_window/application/windows/main_window/__init__.py b/src/builtin_plugins_/amulet_team_main_window/application/windows/main_window/__init__.py
similarity index 99%
rename from src/builtin_plugins/amulet_team_main_window/application/windows/main_window/__init__.py
rename to src/builtin_plugins_/amulet_team_main_window/application/windows/main_window/__init__.py
index 9ccada12..b6d96228 100644
--- a/src/builtin_plugins/amulet_team_main_window/application/windows/main_window/__init__.py
+++ b/src/builtin_plugins_/amulet_team_main_window/application/windows/main_window/__init__.py
@@ -106,7 +106,7 @@ def add_toolbar_button(
         self._toolbar.add_dynamic_button(uid, icon_path, name, callback)
 
     def add_static_toolbar_button(
-        self, uid: UID, icon_path: str, name: str, callback: Callable[[], None] = None
+        self, uid: UID, icon_path: str, name: str, callback: Callable[[], None] | None = None
     ):
         """
         Add a static icon to the toolbar for this window only.
diff --git a/src/builtin_plugins/amulet_team_main_window/application/windows/main_window/_landing_window.py b/src/builtin_plugins_/amulet_team_main_window/application/windows/main_window/_landing_window.py
similarity index 98%
rename from src/builtin_plugins/amulet_team_main_window/application/windows/main_window/_landing_window.py
rename to src/builtin_plugins_/amulet_team_main_window/application/windows/main_window/_landing_window.py
index 7b8df0fa..183e0748 100644
--- a/src/builtin_plugins/amulet_team_main_window/application/windows/main_window/_landing_window.py
+++ b/src/builtin_plugins_/amulet_team_main_window/application/windows/main_window/_landing_window.py
@@ -16,7 +16,7 @@ class Ui_AmuletLandingWindow(QMainWindow):
     def __init__(
         self, parent: QWidget | None = None, flags: Qt.WindowType = Qt.WindowType.Window
     ) -> None:
-        super().__init__(parent, f)
+        super().__init__(parent, flags)
         if not self.objectName():
             self.setObjectName("AmuletLandingWindow")
         self.resize(800, 600)
diff --git a/src/builtin_plugins/amulet_team_main_window/application/windows/main_window/_landing_window.ui b/src/builtin_plugins_/amulet_team_main_window/application/windows/main_window/_landing_window.ui
similarity index 100%
rename from src/builtin_plugins/amulet_team_main_window/application/windows/main_window/_landing_window.ui
rename to src/builtin_plugins_/amulet_team_main_window/application/windows/main_window/_landing_window.ui
diff --git a/src/builtin_plugins/amulet_team_main_window/application/windows/main_window/_view.py b/src/builtin_plugins_/amulet_team_main_window/application/windows/main_window/_view.py
similarity index 100%
rename from src/builtin_plugins/amulet_team_main_window/application/windows/main_window/_view.py
rename to src/builtin_plugins_/amulet_team_main_window/application/windows/main_window/_view.py
diff --git a/src/builtin_plugins/amulet_team_main_window2/_application/windows_/__init__.py b/src/builtin_plugins_/amulet_team_main_window/models/__init__.py
similarity index 100%
rename from src/builtin_plugins/amulet_team_main_window2/_application/windows_/__init__.py
rename to src/builtin_plugins_/amulet_team_main_window/models/__init__.py
diff --git a/src/builtin_plugins/amulet_team_main_window/models/view.py b/src/builtin_plugins_/amulet_team_main_window/models/view.py
similarity index 100%
rename from src/builtin_plugins/amulet_team_main_window/models/view.py
rename to src/builtin_plugins_/amulet_team_main_window/models/view.py
diff --git a/src/builtin_plugins/amulet_team_main_window2/plugin.json b/src/builtin_plugins_/amulet_team_main_window/plugin.json
similarity index 81%
rename from src/builtin_plugins/amulet_team_main_window2/plugin.json
rename to src/builtin_plugins_/amulet_team_main_window/plugin.json
index 9d4a871c..d95ae73e 100644
--- a/src/builtin_plugins/amulet_team_main_window2/plugin.json
+++ b/src/builtin_plugins_/amulet_team_main_window/plugin.json
@@ -1,11 +1,10 @@
 {
-	"identifier": "amulet_team_main_window2",
+	"identifier": "amulet_team_main_window_old",
 	"version": "1.0.0",
 	"name": "Amulet Main Window",
 	"depends": {
 		"python": "~=3.9",
 		"library": [
-			"shiboken6~=6.2",
 			"PySide6_Essentials~=6.2",
 			"amulet_editor~=1.0a0"
 		],
diff --git a/src/builtin_plugins/amulet_team_vault/__init__.py b/src/builtin_plugins_/amulet_team_vault/__init__.py
similarity index 100%
rename from src/builtin_plugins/amulet_team_vault/__init__.py
rename to src/builtin_plugins_/amulet_team_vault/__init__.py
diff --git a/src/builtin_plugins/amulet_team_vault/_plugin.py b/src/builtin_plugins_/amulet_team_vault/_plugin.py
similarity index 100%
rename from src/builtin_plugins/amulet_team_vault/_plugin.py
rename to src/builtin_plugins_/amulet_team_vault/_plugin.py
diff --git a/src/builtin_plugins/amulet_team_vault/plugin.json b/src/builtin_plugins_/amulet_team_vault/plugin.json
similarity index 100%
rename from src/builtin_plugins/amulet_team_vault/plugin.json
rename to src/builtin_plugins_/amulet_team_vault/plugin.json