diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index f82b70509..3eb169625 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -35,7 +35,7 @@ jobs:
         shell: bash
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
         path: hexrdgui
@@ -44,9 +44,13 @@ jobs:
       uses: conda-incubator/setup-miniconda@v2
       with:
         auto-update-conda: true
-        python-version: '3.10'
+        python-version: '3.11'
         auto-activate-base: false
 
+    - name: Install EGL on Linux (PySide6 needs it)
+      if: ${{ matrix.config.name == 'Linux' }}
+      run: sudo apt-get install -y libegl1-mesa-dev
+
     - name: Get version using git describe
       working-directory: hexrdgui
       run: echo "HEXRDGUI_GIT_DESCRIBE=$(git describe --tag)" >> $GITHUB_ENV
@@ -89,34 +93,34 @@ jobs:
 
     - name: Upload InstallOutput.log
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v2-preview
+      uses: actions/upload-artifact@v3
       with:
         name: InstallOutput.log
         path: ${{ github.workspace }}/hexrdgui/packaging/_CPack_Packages/*/InstallOutput.log
 
     - name: Upload WIX log ( Windows only )
       if: ${{ failure() && matrix.config.os == 'windows-latest'}}
-      uses: actions/upload-artifact@v2-preview
+      uses: actions/upload-artifact@v3
       with:
         name: wix.log
         path: ${{ github.workspace }}/hexrdgui/packaging/_CPack_Packages/WIX/wix.log
 
     - name: Upload installer package
-      uses: actions/upload-artifact@v2-preview
+      uses: actions/upload-artifact@v3
       with:
         name: HEXRDGUI-v${{env.VERSION}}.${{ matrix.config.package }}
         path: ${{ github.workspace }}/hexrdgui/packaging/HEXRDGUI-${{env.VERSION}}.${{ matrix.config.package }}
 
     - name: Upload installer package Zip ( Windows only )
       if: ${{ matrix.config.os == 'windows-latest'}}
-      uses: actions/upload-artifact@v2-preview
+      uses: actions/upload-artifact@v3
       with:
         name: HEXRDGUI-v${{env.VERSION}}.zip
         path: ${{ github.workspace }}/hexrdgui/packaging/HEXRDGUI-${{env.VERSION}}.zip
 
     - name: Upload the HEXRDGUI conda package ( PRs only )
       if: github.ref != 'refs/heads/master'
-      uses: actions/upload-artifact@v2-preview
+      uses: actions/upload-artifact@v3
       with:
         name: HEXRDGUI-${{ matrix.config.name }}-${{ env.HEXRDGUI_GIT_DESCRIBE }}.tar.bz2
         path: ${{ github.workspace }}/hexrdgui/packaging/output/**/*.tar.bz2
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ace167e70..d897337d0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        python-version: [3.9, '3.10']
+        python-version: ['3.10', '3.11']
         config:
         - {
             name: "Linux",
@@ -39,25 +39,29 @@ jobs:
         python-version: ${{ matrix.python-version }}
 
     - name: Checkout HEXRD
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: HEXRD/hexrd
         path: hexrd
 
     - name: Checkout HEXRDGUI
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         path: hexrdgui
 
     - name: Checkout examples
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: HEXRD/examples
         path: examples
 
+    - name: Install EGL on Linux (PySide6 needs it)
+      if: ${{ matrix.config.name == 'Linux' }}
+      run: sudo apt-get install -y libegl1-mesa-dev
+
     - name: Set environment variable to work around setuptools/numpy issue
       run: echo 'SETUPTOOLS_USE_DISTUTILS=stdlib' >> $GITHUB_ENV
-      if: ${{ matrix.config.os == 'windows-latest'}}
+      if: ${{ matrix.config.name == 'Windows' }}
 
     - name: Install HEXRD
       run: |
diff --git a/conda.recipe/conda_build_config.yaml b/conda.recipe/conda_build_config.yaml
new file mode 100644
index 000000000..4d978d7db
--- /dev/null
+++ b/conda.recipe/conda_build_config.yaml
@@ -0,0 +1,7 @@
+python:
+  - 3.11
+target_platform:
+  - linux-64               # [linux]
+  - osx-64                 # [osx]
+  - osx-arm64              # [osx]
+  - win-64                 # [win]
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
index 8379d2f0e..b212d8d06 100644
--- a/conda.recipe/meta.yaml
+++ b/conda.recipe/meta.yaml
@@ -8,32 +8,34 @@ source:
 build:
   number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
   entry_points:
-    - hexrdgui = hexrd.ui.main:main
+    - hexrdgui = hexrdgui.main:main
 
 requirements:
   build:
-    - python=3.10
+    - python {{ python }}                    # [build_platform != target_platform]
+    - cross-python_{{ target_platform }}     # [build_platform != target_platform]
+  host:
+    - python {{ python }}
     - setuptools
     - setuptools_scm
 
   run:
     - python
-    - pyside2>=5.15
-    - Pillow
-    - matplotlib
-    - importlib_resources
     - fabio
-    - pyyaml
     - hexrd=={{ hexrd_version }}
+    - matplotlib-base
+    - Pillow
     - pyhdf
-    - silx
+    - pyside6
+    - pyyaml
+    - silx-base
 
-test:
+test:         # [build_platform == target_platform]
   imports:
-    - hexrd.ui
+    - hexrdgui
 
 about:
   home: https://github.com/HEXRD/hexrdgui
   license: BSD
   license_family: BSD
-  summary: "Qt5 PySide2 based HEXRD GUI"
+  summary: "Qt6 PySide6 based HEXRD GUI"
diff --git a/hexrd/__init__.py b/hexrd/__init__.py
deleted file mode 100644
index 69e3be50d..000000000
--- a/hexrd/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/hexrd/ui/__init__.py b/hexrdgui/__init__.py
similarity index 92%
rename from hexrd/ui/__init__.py
rename to hexrdgui/__init__.py
index fe3b4a4f8..85f709310 100644
--- a/hexrd/ui/__init__.py
+++ b/hexrdgui/__init__.py
@@ -1,5 +1,5 @@
-from PySide2.QtCore import QEvent, QObject, Qt
-from PySide2.QtWidgets import QDialog, QPushButton
+from PySide6.QtCore import QEvent, QObject, Qt
+from PySide6.QtWidgets import QDialog, QPushButton
 
 
 class EnterKeyFilter(QObject):
diff --git a/hexrd/ui/about_dialog.py b/hexrdgui/about_dialog.py
similarity index 82%
rename from hexrd/ui/about_dialog.py
rename to hexrdgui/about_dialog.py
index ab0db449f..1fd0ae72e 100644
--- a/hexrd/ui/about_dialog.py
+++ b/hexrdgui/about_dialog.py
@@ -1,15 +1,15 @@
 from importlib.metadata import version
 import sys
 
-from PySide2.QtCore import Qt, QObject, QSize
-from PySide2.QtSvg import QSvgWidget
-from PySide2.QtWidgets import QTreeWidgetItem, QLabel
-from PySide2.QtGui import QPixmap
+from PySide6.QtCore import Qt, QObject, QSize
+from PySide6.QtSvgWidgets import QSvgWidget
+from PySide6.QtWidgets import QTreeWidgetItem, QLabel
+from PySide6.QtGui import QPixmap
 
 import hexrd
 
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.resource_loader import load_resource
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.resource_loader import load_resource
 
 LOGO_HEIGHT = 80
 
@@ -24,7 +24,7 @@ def __init__(self, parent=None):
         self._populate_versions()
 
     def _populate_hexrd_logo(self):
-        data = load_resource(hexrd.ui.resources.icons,
+        data = load_resource(hexrdgui.resources.icons,
                              'hexrd.ico', binary=True)
         pixmap = QPixmap()
         pixmap.loadFromData(data, 'ico')
@@ -36,7 +36,7 @@ def _calculate_size(self, size):
         return QSize(LOGO_HEIGHT/ratio, LOGO_HEIGHT)
 
     def _populate_logos(self):
-        data = load_resource(hexrd.ui.resources.icons, 'llnl_logo.svg',
+        data = load_resource(hexrdgui.resources.icons, 'llnl_logo.svg',
                              binary=True)
 
         self.ui.logos_horizontal_layout.addStretch()
@@ -47,7 +47,7 @@ def _populate_logos(self):
         self.ui.logos_horizontal_layout.addWidget(llnl, stretch=1)
         self.ui.logos_horizontal_layout.addStretch()
 
-        data = load_resource(hexrd.ui.resources.icons,
+        data = load_resource(hexrdgui.resources.icons,
                              'kitware_logo.svg',  binary=True)
 
         kitware = QSvgWidget()
@@ -57,7 +57,7 @@ def _populate_logos(self):
         self.ui.logos_horizontal_layout.addWidget(kitware, stretch=1)
         self.ui.logos_horizontal_layout.addStretch()
 
-        data = load_resource(hexrd.ui.resources.icons,
+        data = load_resource(hexrdgui.resources.icons,
                              'afrl_logo.png',  binary=True)
 
         pixmap = QPixmap()
@@ -78,7 +78,7 @@ def _populate_versions(self):
             "HEXRD",
             "NumPy",
             "SciPy",
-            "PySide2"
+            "PySide6"
         ]
 
         for package in packages:
diff --git a/hexrd/ui/argument_parser.py b/hexrdgui/argument_parser.py
similarity index 100%
rename from hexrd/ui/argument_parser.py
rename to hexrdgui/argument_parser.py
diff --git a/hexrd/ui/async_runner.py b/hexrdgui/async_runner.py
similarity index 85%
rename from hexrd/ui/async_runner.py
rename to hexrdgui/async_runner.py
index 41aded8e4..ff895cd3d 100644
--- a/hexrd/ui/async_runner.py
+++ b/hexrdgui/async_runner.py
@@ -1,8 +1,8 @@
-from PySide2.QtCore import QThreadPool, QTimer
-from PySide2.QtWidgets import QMessageBox
+from PySide6.QtCore import QThreadPool, QTimer
+from PySide6.QtWidgets import QMessageBox
 
-from hexrd.ui.async_worker import AsyncWorker
-from hexrd.ui.progress_dialog import ProgressDialog
+from hexrdgui.async_worker import AsyncWorker
+from hexrdgui.progress_dialog import ProgressDialog
 
 
 class AsyncRunner:
@@ -10,8 +10,6 @@ class AsyncRunner:
     def __init__(self, parent):
         self.parent = parent
 
-        self.thread_pool = QThreadPool(parent)
-
         self.progress_dialog = ProgressDialog(parent)
 
         # Some defaults...
@@ -41,7 +39,7 @@ def run(self, f, *args, **kwargs):
         # have a segmentation fault.
         self.thread_pool.start(worker)
 
-        self.progress_dialog.exec_()
+        self.progress_dialog.exec()
 
     def on_worker_finished(self):
         self.reset_callbacks()
@@ -67,4 +65,8 @@ def on_async_error(self, t):
         msg = f'An ERROR occurred: {exctype}: {value}.'
         msg_box = QMessageBox(QMessageBox.Critical, 'Error', msg)
         msg_box.setDetailedText(traceback)
-        msg_box.exec_()
+        msg_box.exec()
+
+    @property
+    def thread_pool(self):
+        return QThreadPool.globalInstance()
diff --git a/hexrd/ui/async_worker.py b/hexrdgui/async_worker.py
similarity index 97%
rename from hexrd/ui/async_worker.py
rename to hexrdgui/async_worker.py
index 608a5ed81..228a6db91 100644
--- a/hexrd/ui/async_worker.py
+++ b/hexrdgui/async_worker.py
@@ -1,7 +1,7 @@
 # This class was modified from the following example online:
 # https://www.learnpyqt.com/courses/concurrent-execution/multithreading-pyqt-applications-qthreadpool/
 
-from PySide2.QtCore import QObject, QRunnable, Signal, Slot
+from PySide6.QtCore import QObject, QRunnable, Signal, Slot
 
 import inspect
 import traceback
diff --git a/hexrd/ui/azimuthal_overlay_editor.py b/hexrdgui/azimuthal_overlay_editor.py
similarity index 94%
rename from hexrd/ui/azimuthal_overlay_editor.py
rename to hexrdgui/azimuthal_overlay_editor.py
index 1d08be267..676212a08 100644
--- a/hexrd/ui/azimuthal_overlay_editor.py
+++ b/hexrdgui/azimuthal_overlay_editor.py
@@ -1,5 +1,5 @@
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
 
 
 class AzimuthalOverlayEditor:
diff --git a/hexrd/ui/azimuthal_overlay_manager.py b/hexrdgui/azimuthal_overlay_manager.py
similarity index 96%
rename from hexrd/ui/azimuthal_overlay_manager.py
rename to hexrdgui/azimuthal_overlay_manager.py
index 91fa600e6..6e948f621 100644
--- a/hexrd/ui/azimuthal_overlay_manager.py
+++ b/hexrdgui/azimuthal_overlay_manager.py
@@ -1,16 +1,16 @@
 import random
-from PySide2.QtCore import Qt, QItemSelectionModel
-from PySide2.QtWidgets import (
+from PySide6.QtCore import Qt, QItemSelectionModel
+from PySide6.QtWidgets import (
     QCheckBox, QComboBox, QHBoxLayout, QHeaderView, QSizePolicy,
     QTableWidgetItem, QWidget
 )
-from hexrd.ui import utils
+from hexrdgui import utils
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.azimuthal_overlay_editor import AzimuthalOverlayEditor
-from hexrd.ui.azimuthal_overlay_style_picker import AzimuthalOverlayStylePicker
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.azimuthal_overlay_editor import AzimuthalOverlayEditor
+from hexrdgui.azimuthal_overlay_style_picker import AzimuthalOverlayStylePicker
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
 
 import numpy as np
 
@@ -272,7 +272,7 @@ def remove(self):
     def edit_style(self):
         self._style_picker = AzimuthalOverlayStylePicker(self.active_overlay,
                                                          self.ui)
-        self._style_picker.exec_()
+        self._style_picker.exec()
 
     def show_legend(self, value):
         HexrdConfig().show_azimuthal_legend = value
diff --git a/hexrd/ui/azimuthal_overlay_style_picker.py b/hexrdgui/azimuthal_overlay_style_picker.py
similarity index 87%
rename from hexrd/ui/azimuthal_overlay_style_picker.py
rename to hexrdgui/azimuthal_overlay_style_picker.py
index 1d71e7b05..f5b9fc78a 100644
--- a/hexrd/ui/azimuthal_overlay_style_picker.py
+++ b/hexrdgui/azimuthal_overlay_style_picker.py
@@ -1,10 +1,10 @@
-from PySide2.QtCore import QObject
-from PySide2.QtGui import QColor
-from PySide2.QtWidgets import QColorDialog
+from PySide6.QtCore import QObject
+from PySide6.QtGui import QColor
+from PySide6.QtWidgets import QColorDialog
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
 
 
 class AzimuthalOverlayStylePicker(QObject):
@@ -23,9 +23,9 @@ def __init__(self, overlay, parent=None):
         self.setup_connections()
         self.update_gui()
 
-    def exec_(self):
+    def exec(self):
         self.ui.adjustSize()
-        return self.ui.exec_()
+        return self.ui.exec()
 
     def setup_connections(self):
         self.ui.color.pressed.connect(self.pick_color)
@@ -72,7 +72,7 @@ def pick_color(self):
         color = sender.text()
 
         dialog = QColorDialog(QColor(color), self.ui)
-        if dialog.exec_():
+        if dialog.exec():
             sender.setText(dialog.selectedColor().name())
             self.update_button_colors()
             self.update_config()
diff --git a/hexrd/ui/beam_marker_style_editor.py b/hexrdgui/beam_marker_style_editor.py
similarity index 91%
rename from hexrd/ui/beam_marker_style_editor.py
rename to hexrdgui/beam_marker_style_editor.py
index 3905f9647..7698c77e6 100644
--- a/hexrd/ui/beam_marker_style_editor.py
+++ b/hexrdgui/beam_marker_style_editor.py
@@ -2,12 +2,12 @@
 
 from matplotlib.markers import MarkerStyle
 
-from PySide2.QtGui import QColor
-from PySide2.QtWidgets import QColorDialog
+from PySide6.QtGui import QColor
+from PySide6.QtWidgets import QColorDialog
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
 
 
 class BeamMarkerStyleEditor:
@@ -80,7 +80,7 @@ def pick_color(self):
         color = w.text()
 
         dialog = QColorDialog(QColor(color), self.ui)
-        if dialog.exec_():
+        if dialog.exec():
             w.setText(dialog.selectedColor().name())
             self.update_button_colors()
             self.update_config()
diff --git a/hexrd/ui/brightness_contrast_editor.py b/hexrdgui/brightness_contrast_editor.py
similarity index 98%
rename from hexrd/ui/brightness_contrast_editor.py
rename to hexrdgui/brightness_contrast_editor.py
index a240e2eeb..0d7d92414 100644
--- a/hexrd/ui/brightness_contrast_editor.py
+++ b/hexrdgui/brightness_contrast_editor.py
@@ -1,17 +1,17 @@
 import numpy as np
 from scipy.interpolate import interp1d
 
-from PySide2.QtCore import QObject, Signal
-from PySide2.QtWidgets import (
+from PySide6.QtCore import QObject, Signal
+from PySide6.QtWidgets import (
     QDialog, QDialogButtonBox, QMessageBox, QVBoxLayout
 )
 
 from matplotlib.backends.backend_qt5agg import FigureCanvas
 from matplotlib.figure import Figure
 
-from hexrd.ui.range_widget import RangeWidget
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals, reversed_enumerate
+from hexrdgui.range_widget import RangeWidget
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals, reversed_enumerate
 
 
 NUM_INCREMENTS = 1000
@@ -397,7 +397,7 @@ def select_data_range(self):
 
         UiLoader().install_dialog_enter_key_filters(dialog)
 
-        if not dialog.exec_():
+        if not dialog.exec():
             # User canceled
             return
 
diff --git a/hexrd/ui/cal_tree_view.py b/hexrdgui/cal_tree_view.py
similarity index 96%
rename from hexrd/ui/cal_tree_view.py
rename to hexrdgui/cal_tree_view.py
index 65e794ed1..195c97d3a 100644
--- a/hexrd/ui/cal_tree_view.py
+++ b/hexrdgui/cal_tree_view.py
@@ -1,17 +1,17 @@
-from PySide2.QtCore import QObject, QModelIndex, Qt
-from PySide2.QtWidgets import (
+from PySide6.QtCore import QObject, QModelIndex, Qt
+from PySide6.QtWidgets import (
     QCheckBox, QMenu, QMessageBox, QStyledItemDelegate, QTreeView
 )
-from PySide2.QtGui import QCursor
+from PySide6.QtGui import QCursor
 
 import numpy as np
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.tree_views.base_tree_item_model import BaseTreeItemModel
-from hexrd.ui.tree_views.tree_item import TreeItem
-from hexrd.ui.tree_views.value_column_delegate import ValueColumnDelegate
-from hexrd.ui import constants
-from hexrd.ui.utils import is_int
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.tree_views.base_tree_item_model import BaseTreeItemModel
+from hexrdgui.tree_views.tree_item import TreeItem
+from hexrdgui.tree_views.value_column_delegate import ValueColumnDelegate
+from hexrdgui import constants
+from hexrdgui.utils import is_int
 
 # Global constants
 FIXED = 0
@@ -231,7 +231,8 @@ def __init__(self, parent=None):
     def createEditor(self, parent, option, index):
         check = QCheckBox(parent)
 
-        check.toggled.connect(self.statusChanged)
+        # Only indicate the status has changed on user interaction
+        check.clicked.connect(self.statusChanged)
 
         return check
 
@@ -304,7 +305,7 @@ def contextMenuEvent(self, event):
                 menu.addSeparator()
                 check = menu.addAction('Check All')
                 uncheck = menu.addAction('Uncheck All')
-            action = menu.exec_(QCursor.pos())
+            action = menu.exec(QCursor.pos())
 
             if action == collapse:
                 self.collapse_selection(item, index)
diff --git a/hexrd/ui/calibration/__init__.py b/hexrdgui/calibration/__init__.py
similarity index 100%
rename from hexrd/ui/calibration/__init__.py
rename to hexrdgui/calibration/__init__.py
diff --git a/hexrd/ui/calibration/auto/__init__.py b/hexrdgui/calibration/auto/__init__.py
similarity index 100%
rename from hexrd/ui/calibration/auto/__init__.py
rename to hexrdgui/calibration/auto/__init__.py
diff --git a/hexrd/ui/calibration/auto/powder_calibration_dialog.py b/hexrdgui/calibration/auto/powder_calibration_dialog.py
similarity index 96%
rename from hexrd/ui/calibration/auto/powder_calibration_dialog.py
rename to hexrdgui/calibration/auto/powder_calibration_dialog.py
index cb5878e35..f810517da 100644
--- a/hexrd/ui/calibration/auto/powder_calibration_dialog.py
+++ b/hexrdgui/calibration/auto/powder_calibration_dialog.py
@@ -1,10 +1,10 @@
-from PySide2.QtCore import QTimer
-from PySide2.QtWidgets import QMessageBox
+from PySide6.QtCore import QTimer
+from PySide6.QtWidgets import QMessageBox
 
 import numpy as np
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
 
 
 class PowderCalibrationDialog:
@@ -71,8 +71,8 @@ def update_config(self):
         options['pk_type'] = self.peak_fit_type
         options['bg_type'] = self.background_type
 
-    def exec_(self):
-        if not self.ui.exec_():
+    def exec(self):
+        if not self.ui.exec():
             return False
 
         self.update_config()
diff --git a/hexrd/ui/calibration/auto/powder_runner.py b/hexrdgui/calibration/auto/powder_runner.py
similarity index 94%
rename from hexrd/ui/calibration/auto/powder_runner.py
rename to hexrdgui/calibration/auto/powder_runner.py
index fc93f71ca..c4b060b6a 100644
--- a/hexrd/ui/calibration/auto/powder_runner.py
+++ b/hexrdgui/calibration/auto/powder_runner.py
@@ -3,17 +3,17 @@
 
 import numpy as np
 
-from PySide2.QtCore import QObject, QTimer, Qt, Signal
-from PySide2.QtWidgets import QCheckBox, QMessageBox
+from PySide6.QtCore import QObject, QTimer, Qt, Signal
+from PySide6.QtWidgets import QCheckBox, QMessageBox
 
 from hexrd.fitting.calibration import InstrumentCalibrator, PowderCalibrator
-from hexrd.ui.async_runner import AsyncRunner
-from hexrd.ui.constants import ViewType
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.utils import instr_to_internal_dict, masks_applied_to_panel_buffers
+from hexrdgui.async_runner import AsyncRunner
+from hexrdgui.constants import ViewType
+from hexrdgui.create_hedm_instrument import create_hedm_instrument
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.utils import instr_to_internal_dict, masks_applied_to_panel_buffers
 
-from hexrd.ui.calibration.auto import PowderCalibrationDialog
+from hexrdgui.calibration.auto import PowderCalibrationDialog
 
 
 class PowderRunner(QObject):
@@ -31,7 +31,7 @@ def clear(self):
 
         if hasattr(self, '_ask_if_lines_are_acceptable_box'):
             # Remove the box if it is still there...
-            self._ask_if_lines_are_acceptable_box.reject()
+            self._ask_if_lines_are_acceptable_box.hide()
             del self._ask_if_lines_are_acceptable_box
 
     def run(self):
@@ -52,7 +52,7 @@ def validate(self):
 
     def _run(self):
         # First, have the user pick some options
-        if not PowderCalibrationDialog(self.material, self.parent).exec_():
+        if not PowderCalibrationDialog(self.material, self.parent).exec():
             # User canceled...
             return
 
@@ -196,7 +196,7 @@ def update_config(self):
         msg = 'Optimization successful!'
         msg_box = QMessageBox(QMessageBox.Information, 'HEXRD', msg)
         msg_box.setDetailedText(self.results_message)
-        msg_box.exec_()
+        msg_box.exec()
 
         output_dict = instr_to_internal_dict(self.instr)
 
diff --git a/hexrd/ui/calibration/calibration_runner.py b/hexrdgui/calibration/calibration_runner.py
similarity index 96%
rename from hexrd/ui/calibration/calibration_runner.py
rename to hexrdgui/calibration/calibration_runner.py
index ac02a985e..4c0a1151a 100644
--- a/hexrd/ui/calibration/calibration_runner.py
+++ b/hexrdgui/calibration/calibration_runner.py
@@ -6,8 +6,8 @@
 import h5py
 import numpy as np
 
-from PySide2.QtCore import QObject, Signal
-from PySide2.QtWidgets import QFileDialog, QMessageBox
+from PySide6.QtCore import QObject, Signal
+from PySide6.QtWidgets import QFileDialog, QMessageBox
 
 from hexrd.crystallography import hklToStr
 from hexrd.fitting.calibration import (
@@ -15,27 +15,27 @@
 )
 from hexrd.instrument import unwrap_h5_to_dict
 
-from hexrd.ui.calibration.auto import (
+from hexrdgui.calibration.auto import (
     PowderCalibrationDialog,
     save_picks_to_overlay,
 )
-from hexrd.ui.calibration.laue_auto_picker_dialog import LaueAutoPickerDialog
-from hexrd.ui.calibration.pick_based_calibration import run_calibration
-from hexrd.ui.calibration.hkl_picks_tree_view_dialog import (
+from hexrdgui.calibration.laue_auto_picker_dialog import LaueAutoPickerDialog
+from hexrdgui.calibration.pick_based_calibration import run_calibration
+from hexrdgui.calibration.hkl_picks_tree_view_dialog import (
     generate_picks_results, overlays_to_tree_format, HKLPicksTreeViewDialog,
     picks_cartesian_to_angles, tree_format_to_picks,
 )
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui.constants import OverlayType, ViewType
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.line_picker_dialog import LinePickerDialog
-from hexrd.ui.select_item_dialog import SelectItemDialog
-from hexrd.ui.utils import (
+from hexrdgui.create_hedm_instrument import create_hedm_instrument
+from hexrdgui.constants import OverlayType, ViewType
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.line_picker_dialog import LinePickerDialog
+from hexrdgui.select_item_dialog import SelectItemDialog
+from hexrdgui.utils import (
     array_index_in_list, instr_to_internal_dict,
     masks_applied_to_panel_buffers, unique_array_list
 )
-from hexrd.ui.utils.conversions import cart_to_angles
-from hexrd.ui.utils.dicts import ensure_all_keys_match, ndarrays_to_lists
+from hexrdgui.utils.conversions import cart_to_angles
+from hexrdgui.utils.dicts import ensure_all_keys_match, ndarrays_to_lists
 
 
 class CalibrationRunner(QObject):
@@ -85,8 +85,13 @@ def validate(self):
             raise Exception('There are no refinable parameters')
 
     def enable_focus_mode(self, b):
-        HexrdConfig().enable_canvas_focus_mode.emit(b)
-        HexrdConfig().enable_canvas_toolbar.emit(not b)
+        # FIXME: We must avoid using focus mode until we can be sure
+        # that this issue will not happen again: https://github.com/HEXRD/hexrdgui/issues/1556
+        # We *cannot* allow the GUI to remain disabled after calibration.
+
+        # HexrdConfig().enable_canvas_focus_mode.emit(b)
+        # HexrdConfig().enable_canvas_toolbar.emit(not b)
+        pass
 
     def clear_all_overlay_picks(self):
         for overlay in self.active_overlays:
@@ -142,7 +147,7 @@ def pick_this_line(self):
             'parent': self.canvas,
         }
         dialog = SelectItemDialog(**kwargs)
-        if not dialog.exec_():
+        if not dialog.exec():
             # User canceled
             self.restore_state()
             return
@@ -744,7 +749,7 @@ def auto_pick_powder_points(self):
         material = overlay.material
         dialog = PowderCalibrationDialog(material, self.canvas)
         dialog.show_optimization_parameters(False)
-        if not dialog.exec_():
+        if not dialog.exec():
             # User canceled
             self.restore_state()
             return
@@ -806,7 +811,7 @@ def auto_powder_pick_finished(self, auto_picks):
     def auto_pick_laue_points(self):
         overlay = self.active_overlay
         dialog = LaueAutoPickerDialog(overlay, self.canvas)
-        if not dialog.exec_():
+        if not dialog.exec():
             # User canceled
             self.restore_state()
             return
diff --git a/hexrd/ui/calibration/cartesian_plot.py b/hexrdgui/calibration/cartesian_plot.py
similarity index 98%
rename from hexrd/ui/calibration/cartesian_plot.py
rename to hexrdgui/calibration/cartesian_plot.py
index 782815c6f..44533a76b 100644
--- a/hexrd/ui/calibration/cartesian_plot.py
+++ b/hexrdgui/calibration/cartesian_plot.py
@@ -8,11 +8,11 @@
 
 from hexrd.gridutil import cellIndices
 
-from hexrd.ui.constants import ViewType
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.overlays import update_overlay_data
-from hexrd.ui.utils import format_memory_int
+from hexrdgui.constants import ViewType
+from hexrdgui.create_hedm_instrument import create_hedm_instrument
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.overlays import update_overlay_data
+from hexrdgui.utils import format_memory_int
 
 from skimage import transform as tf
 
diff --git a/hexrd/ui/calibration/display_plane.py b/hexrdgui/calibration/display_plane.py
similarity index 100%
rename from hexrd/ui/calibration/display_plane.py
rename to hexrdgui/calibration/display_plane.py
diff --git a/hexrd/ui/calibration/hedm/__init__.py b/hexrdgui/calibration/hedm/__init__.py
similarity index 100%
rename from hexrd/ui/calibration/hedm/__init__.py
rename to hexrdgui/calibration/hedm/__init__.py
diff --git a/hexrd/ui/calibration/hedm/calibration_options_dialog.py b/hexrdgui/calibration/hedm/calibration_options_dialog.py
similarity index 94%
rename from hexrd/ui/calibration/hedm/calibration_options_dialog.py
rename to hexrdgui/calibration/hedm/calibration_options_dialog.py
index 7cb179aa6..d1a94dfde 100644
--- a/hexrd/ui/calibration/hedm/calibration_options_dialog.py
+++ b/hexrdgui/calibration/hedm/calibration_options_dialog.py
@@ -1,9 +1,9 @@
-from PySide2.QtCore import QObject, Signal
+from PySide6.QtCore import QObject, Signal
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.grains_viewer_dialog import GrainsViewerDialog
-from hexrd.ui.reflections_table import ReflectionsTable
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.grains_viewer_dialog import GrainsViewerDialog
+from hexrdgui.reflections_table import ReflectionsTable
+from hexrdgui.ui_loader import UiLoader
 
 
 class HEDMCalibrationOptionsDialog(QObject):
diff --git a/hexrd/ui/calibration/hedm/calibration_results_dialog.py b/hexrdgui/calibration/hedm/calibration_results_dialog.py
similarity index 96%
rename from hexrd/ui/calibration/hedm/calibration_results_dialog.py
rename to hexrdgui/calibration/hedm/calibration_results_dialog.py
index 5ed5b9aad..0d7e92f69 100644
--- a/hexrd/ui/calibration/hedm/calibration_results_dialog.py
+++ b/hexrdgui/calibration/hedm/calibration_results_dialog.py
@@ -1,12 +1,12 @@
-from PySide2.QtCore import Qt
-from PySide2.QtWidgets import QSizePolicy
+from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QSizePolicy
 
 from matplotlib.backends.backend_qt5agg import FigureCanvas
 from matplotlib.figure import Figure
 import numpy as np
 
-from hexrd.ui.navigation_toolbar import NavigationToolbar
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.navigation_toolbar import NavigationToolbar
+from hexrdgui.ui_loader import UiLoader
 
 
 DEFAULT_STYLE = 'rx'
@@ -102,8 +102,8 @@ def setup_canvas(self):
         self.ax = ax
         self.canvas = canvas
 
-    def exec_(self):
-        return self.ui.exec_()
+    def exec(self):
+        return self.ui.exec()
 
     @property
     def selected_detector_key(self):
diff --git a/hexrd/ui/calibration/hedm/calibration_runner.py b/hexrdgui/calibration/hedm/calibration_runner.py
similarity index 98%
rename from hexrd/ui/calibration/hedm/calibration_runner.py
rename to hexrdgui/calibration/hedm/calibration_runner.py
index 61cf60e2b..db158de3c 100644
--- a/hexrd/ui/calibration/hedm/calibration_runner.py
+++ b/hexrdgui/calibration/hedm/calibration_runner.py
@@ -1,21 +1,21 @@
 import numpy as np
 
-from PySide2.QtCore import QObject, Signal
+from PySide6.QtCore import QObject, Signal
 
 from hexrd import constants as cnst, instrument
 from hexrd.fitting import calibration
 from hexrd.transforms import xfcapi
 
-from hexrd.ui.calibration.hedm import (
+from hexrdgui.calibration.hedm import (
     HEDMCalibrationOptionsDialog,
     HEDMCalibrationResultsDialog,
 )
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.indexing.create_config import (
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.indexing.create_config import (
     create_indexing_config, OmegasNotFoundError
 )
-from hexrd.ui.message_box import MessageBox
-from hexrd.ui.utils import instr_to_internal_dict
+from hexrdgui.message_box import MessageBox
+from hexrdgui.utils import instr_to_internal_dict
 
 
 class HEDMCalibrationRunner(QObject):
@@ -164,7 +164,7 @@ def on_pull_spots_finished(self, spots_data_dict):
             'parent': self.parent,
         }
         dialog = HEDMCalibrationResultsDialog(**kwargs)
-        if not dialog.exec_():
+        if not dialog.exec():
             return
 
         # Run optimization
@@ -195,7 +195,7 @@ def on_pull_spots_finished(self, spots_data_dict):
                 'parent': self.parent,
             }
             dialog = HEDMCalibrationResultsDialog(**kwargs)
-            if not dialog.exec_():
+            if not dialog.exec():
                 return
 
             # All done! Update the results.
@@ -278,7 +278,7 @@ def on_pull_spots_finished(self, spots_data_dict):
             'parent': self.parent,
         }
         dialog = HEDMCalibrationResultsDialog(**kwargs)
-        if not dialog.exec_():
+        if not dialog.exec():
             return
 
         # update calibration crystal params
@@ -372,7 +372,7 @@ def update_config(self):
             'parent': self.parent,
         }
         msg_box = MessageBox(**kwargs)
-        msg_box.exec_()
+        msg_box.exec()
 
         # Update rotation series parameters from the results
         for results, overlay in zip(self.results, self.active_overlays):
diff --git a/hexrd/ui/calibration/hkl_picks_tree_view_dialog.py b/hexrdgui/calibration/hkl_picks_tree_view_dialog.py
similarity index 92%
rename from hexrd/ui/calibration/hkl_picks_tree_view_dialog.py
rename to hexrdgui/calibration/hkl_picks_tree_view_dialog.py
index 82ee30fd9..b8cb864a6 100644
--- a/hexrd/ui/calibration/hkl_picks_tree_view_dialog.py
+++ b/hexrdgui/calibration/hkl_picks_tree_view_dialog.py
@@ -6,18 +6,18 @@
 
 from hexrd.crystallography import hklToStr
 
-from PySide2.QtCore import QTimer
-from PySide2.QtWidgets import QFileDialog, QMessageBox
+from PySide6.QtCore import QTimer
+from PySide6.QtWidgets import QFileDialog, QMessageBox
 
 from hexrd.instrument import unwrap_dict_to_h5, unwrap_h5_to_dict
 
-from hexrd.ui.constants import ViewType
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.tree_views.hkl_picks_tree_view import HKLPicksTreeView
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils.conversions import angles_to_cart, cart_to_angles
-from hexrd.ui.utils.dicts import ensure_all_keys_match, ndarrays_to_lists
+from hexrdgui.constants import ViewType
+from hexrdgui.create_hedm_instrument import create_hedm_instrument
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.tree_views.hkl_picks_tree_view import HKLPicksTreeView
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils.conversions import angles_to_cart, cart_to_angles
+from hexrdgui.utils.dicts import ensure_all_keys_match, ndarrays_to_lists
 
 
 class HKLPicksTreeViewDialog:
@@ -53,11 +53,11 @@ def update_gui(self):
     def on_finished(self):
         self.tree_view.clear_artists()
 
-    def exec_(self):
-        return self.ui.exec_()
+    def exec(self):
+        return self.ui.exec()
 
-    def exec_later(self):
-        QTimer.singleShot(0, lambda: self.exec_())
+    def execlater(self):
+        QTimer.singleShot(0, lambda: self.exec())
 
     def export_picks_clicked(self):
         selected_file, selected_filter = QFileDialog.getSaveFileName(
diff --git a/hexrd/ui/calibration/laue_auto_picker_dialog.py b/hexrdgui/calibration/laue_auto_picker_dialog.py
similarity index 94%
rename from hexrd/ui/calibration/laue_auto_picker_dialog.py
rename to hexrdgui/calibration/laue_auto_picker_dialog.py
index 8e498dc0a..6738957fd 100644
--- a/hexrd/ui/calibration/laue_auto_picker_dialog.py
+++ b/hexrdgui/calibration/laue_auto_picker_dialog.py
@@ -1,9 +1,9 @@
-from PySide2.QtWidgets import QMessageBox
+from PySide6.QtWidgets import QMessageBox
 
 import numpy as np
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
 
 
 class LaueAutoPickerDialog:
@@ -57,8 +57,8 @@ def update_config(self):
         options['use_blob_detection'] = self.ui.use_blob_detection.isChecked()
         options['blob_threshold'] = self.ui.blob_threshold.value()
 
-    def exec_(self):
-        if not self.ui.exec_():
+    def exec(self):
+        if not self.ui.exec():
             return False
 
         self.update_config()
diff --git a/hexrd/ui/calibration/panel_buffer_dialog.py b/hexrdgui/calibration/panel_buffer_dialog.py
similarity index 94%
rename from hexrd/ui/calibration/panel_buffer_dialog.py
rename to hexrdgui/calibration/panel_buffer_dialog.py
index 0a804bafd..f0bd0101b 100644
--- a/hexrd/ui/calibration/panel_buffer_dialog.py
+++ b/hexrdgui/calibration/panel_buffer_dialog.py
@@ -1,16 +1,16 @@
 import copy
 import os
 
-from PySide2.QtCore import Signal, QObject
-from PySide2.QtWidgets import QFileDialog, QMessageBox
+from PySide6.QtCore import Signal, QObject, Qt
+from PySide6.QtWidgets import QFileDialog, QMessageBox
 
 import matplotlib.pyplot as plt
 import numpy as np
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
-from hexrd.ui.utils.dialog import add_help_url
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
+from hexrdgui.utils.dialog import add_help_url
 
 CONFIG_MODE_BORDER = 'border'
 CONFIG_MODE_NUMPY = 'numpy'
@@ -29,6 +29,10 @@ def __init__(self, detector, parent=None):
         loader = UiLoader()
         self.ui = loader.load_file('panel_buffer_dialog.ui')
 
+        # Keep the dialog in front
+        flags = self.ui.windowFlags()
+        self.ui.setWindowFlags(flags | Qt.Tool)
+
         add_help_url(self.ui.button_box,
                      'configuration/instrument/#panel-buffer')
 
diff --git a/hexrd/ui/calibration/pick_based_calibration.py b/hexrdgui/calibration/pick_based_calibration.py
similarity index 100%
rename from hexrd/ui/calibration/pick_based_calibration.py
rename to hexrdgui/calibration/pick_based_calibration.py
diff --git a/hexrd/ui/calibration/polar_plot.py b/hexrdgui/calibration/polar_plot.py
similarity index 94%
rename from hexrd/ui/calibration/polar_plot.py
rename to hexrdgui/calibration/polar_plot.py
index 1bb014f7f..3931b35d2 100644
--- a/hexrd/ui/calibration/polar_plot.py
+++ b/hexrdgui/calibration/polar_plot.py
@@ -5,11 +5,11 @@
 
 from .polarview import PolarView
 
-from hexrd.ui.constants import ViewType
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.overlays import update_overlay_data
-from hexrd.ui.calibration.utils.maud_headers import header0, header, block_hdr
+from hexrdgui.constants import ViewType
+from hexrdgui.create_hedm_instrument import create_hedm_instrument
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.overlays import update_overlay_data
+from hexrdgui.calibration.utils.maud_headers import header0, header, block_hdr
 
 
 def polar_viewer():
diff --git a/hexrd/ui/calibration/polarview.py b/hexrdgui/calibration/polarview.py
similarity index 99%
rename from hexrd/ui/calibration/polarview.py
rename to hexrdgui/calibration/polarview.py
index 2e7f7e393..a73ac4ca2 100644
--- a/hexrd/ui/calibration/polarview.py
+++ b/hexrdgui/calibration/polarview.py
@@ -12,8 +12,8 @@
 )
 from hexrd import instrument
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.utils import SnipAlgorithmType, run_snip1d, snip_width_pixels
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.utils import SnipAlgorithmType, run_snip1d, snip_width_pixels
 
 tvec_c = ct.zeros_3
 
diff --git a/hexrd/ui/calibration/raw_iviewer.py b/hexrdgui/calibration/raw_iviewer.py
similarity index 77%
rename from hexrd/ui/calibration/raw_iviewer.py
rename to hexrdgui/calibration/raw_iviewer.py
index c6dcb0065..5a3c5fa87 100644
--- a/hexrd/ui/calibration/raw_iviewer.py
+++ b/hexrdgui/calibration/raw_iviewer.py
@@ -1,7 +1,7 @@
-from hexrd.ui.constants import ViewType
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.overlays import update_overlay_data
+from hexrdgui.constants import ViewType
+from hexrdgui.create_hedm_instrument import create_hedm_instrument
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.overlays import update_overlay_data
 
 
 def raw_iviewer():
diff --git a/hexrd/ui/calibration/stereo_plot.py b/hexrdgui/calibration/stereo_plot.py
similarity index 96%
rename from hexrd/ui/calibration/stereo_plot.py
rename to hexrdgui/calibration/stereo_plot.py
index e6b938e44..d71814a4f 100644
--- a/hexrd/ui/calibration/stereo_plot.py
+++ b/hexrdgui/calibration/stereo_plot.py
@@ -5,13 +5,13 @@
 from hexrd import constants as ct
 from hexrd.rotations import mapAngle
 
-from hexrd.ui.constants import ViewType
-from hexrd.ui.create_hedm_instrument import (
+from hexrdgui.constants import ViewType
+from hexrdgui.create_hedm_instrument import (
     create_hedm_instrument, create_view_hedm_instrument
 )
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.overlays import update_overlay_data
-from hexrd.ui.utils.conversions import angles_to_stereo, cart_to_angles
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.overlays import update_overlay_data
+from hexrdgui.utils.conversions import angles_to_stereo, cart_to_angles
 
 from .polarview import PolarView
 from .stereo_project import stereo_project, stereo_projection_of_polar_view
diff --git a/hexrd/ui/calibration/stereo_project.py b/hexrdgui/calibration/stereo_project.py
similarity index 100%
rename from hexrd/ui/calibration/stereo_project.py
rename to hexrdgui/calibration/stereo_project.py
diff --git a/hexrd/ui/calibration/structureless/__init__.py b/hexrdgui/calibration/structureless/__init__.py
similarity index 100%
rename from hexrd/ui/calibration/structureless/__init__.py
rename to hexrdgui/calibration/structureless/__init__.py
diff --git a/hexrd/ui/calibration/structureless/calibration_dialog.py b/hexrdgui/calibration/structureless/calibration_dialog.py
similarity index 96%
rename from hexrd/ui/calibration/structureless/calibration_dialog.py
rename to hexrdgui/calibration/structureless/calibration_dialog.py
index 9252046a2..7e48da5e6 100644
--- a/hexrd/ui/calibration/structureless/calibration_dialog.py
+++ b/hexrdgui/calibration/structureless/calibration_dialog.py
@@ -1,18 +1,18 @@
 import copy
 import yaml
 
-from PySide2.QtCore import QObject, Qt, Signal
-from PySide2.QtWidgets import QComboBox, QDoubleSpinBox, QMessageBox, QSpinBox
+from PySide6.QtCore import QObject, Qt, Signal
+from PySide6.QtWidgets import QComboBox, QDoubleSpinBox, QMessageBox, QSpinBox
 
-from hexrd.ui import resource_loader
-from hexrd.ui.tree_views.multi_column_dict_tree_view import (
+from hexrdgui import resource_loader
+from hexrdgui.tree_views.multi_column_dict_tree_view import (
     MultiColumnDictTreeItemModel, MultiColumnDictTreeView
 )
-from hexrd.ui.pinhole_correction_editor import PinholeCorrectionEditor
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils.dialog import add_help_url
+from hexrdgui.pinhole_correction_editor import PinholeCorrectionEditor
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils.dialog import add_help_url
 
-import hexrd.ui.resources.calibration
+import hexrdgui.resources.calibration
 
 
 class StructurelessCalibrationDialog(QObject):
@@ -241,7 +241,7 @@ def update_from_calibrator(self, calibrator):
         self.params_dict = calibrator.params
 
     def load_tree_view_mapping(self):
-        module = hexrd.ui.resources.calibration
+        module = hexrdgui.resources.calibration
         filename = 'structureless_params_tree_view.yml'
         text = resource_loader.load_resource(module, filename)
         self.yaml_tree_view = yaml.safe_load(text)
diff --git a/hexrd/ui/calibration/structureless/picks_io.py b/hexrdgui/calibration/structureless/picks_io.py
similarity index 100%
rename from hexrd/ui/calibration/structureless/picks_io.py
rename to hexrdgui/calibration/structureless/picks_io.py
diff --git a/hexrd/ui/calibration/structureless/runner.py b/hexrdgui/calibration/structureless/runner.py
similarity index 96%
rename from hexrd/ui/calibration/structureless/runner.py
rename to hexrdgui/calibration/structureless/runner.py
index 369b41fee..c961b16f7 100644
--- a/hexrd/ui/calibration/structureless/runner.py
+++ b/hexrdgui/calibration/structureless/runner.py
@@ -5,22 +5,22 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
-from PySide2.QtCore import QObject, Signal
-from PySide2.QtWidgets import QFileDialog, QMessageBox
+from PySide6.QtCore import QObject, Signal
+from PySide6.QtWidgets import QFileDialog, QMessageBox
 
 from hexrd.fitting.calibration import StructureLessCalibrator
 
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.line_picker_dialog import LinePickerDialog
-from hexrd.ui.markers import igor_marker
-from hexrd.ui.select_item_dialog import SelectItemDialog
-from hexrd.ui.tree_views import GenericPicksTreeViewDialog
-from hexrd.ui.utils import instr_to_internal_dict
-from hexrd.ui.utils.conversions import angles_to_cart, cart_to_angles
-from hexrd.ui.utils.dialog import add_help_url
-from hexrd.ui.utils.guess_instrument_type import guess_instrument_type
-from hexrd.ui.utils.tth_distortion import apply_tth_distortion_if_needed
+from hexrdgui.create_hedm_instrument import create_hedm_instrument
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.line_picker_dialog import LinePickerDialog
+from hexrdgui.markers import igor_marker
+from hexrdgui.select_item_dialog import SelectItemDialog
+from hexrdgui.tree_views import GenericPicksTreeViewDialog
+from hexrdgui.utils import instr_to_internal_dict
+from hexrdgui.utils.conversions import angles_to_cart, cart_to_angles
+from hexrdgui.utils.dialog import add_help_url
+from hexrdgui.utils.guess_instrument_type import guess_instrument_type
+from hexrdgui.utils.tth_distortion import apply_tth_distortion_if_needed
 
 from .calibration_dialog import StructurelessCalibrationDialog
 from .picks_io import load_picks_from_file, save_picks_to_file
@@ -117,7 +117,7 @@ def choose_pick_method(self):
             'parent': self.canvas,
         }
         dialog = SelectItemDialog(**kwargs)
-        if not dialog.exec_():
+        if not dialog.exec():
             # User canceled
             return
 
diff --git a/hexrd/ui/calibration/utils/__init__.py b/hexrdgui/calibration/utils/__init__.py
similarity index 100%
rename from hexrd/ui/calibration/utils/__init__.py
rename to hexrdgui/calibration/utils/__init__.py
diff --git a/hexrd/ui/calibration/utils/maud_headers.py b/hexrdgui/calibration/utils/maud_headers.py
similarity index 100%
rename from hexrd/ui/calibration/utils/maud_headers.py
rename to hexrdgui/calibration/utils/maud_headers.py
diff --git a/hexrd/ui/calibration/wppf_options_dialog.py b/hexrdgui/calibration/wppf_options_dialog.py
similarity index 97%
rename from hexrd/ui/calibration/wppf_options_dialog.py
rename to hexrdgui/calibration/wppf_options_dialog.py
index 764cdd4ef..03757f75e 100644
--- a/hexrd/ui/calibration/wppf_options_dialog.py
+++ b/hexrdgui/calibration/wppf_options_dialog.py
@@ -4,8 +4,8 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
-from PySide2.QtCore import Qt, QObject, QTimer, Signal
-from PySide2.QtWidgets import (
+from PySide6.QtCore import Qt, QObject, QTimer, Signal
+from PySide6.QtWidgets import (
     QCheckBox, QFileDialog, QHBoxLayout, QMessageBox, QSizePolicy,
     QTableWidgetItem, QWidget
 )
@@ -20,13 +20,13 @@
     _generate_default_parameters_Rietveld,
 )
 
-from hexrd.ui.dynamic_widget import DynamicWidget
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.scientificspinbox import ScientificDoubleSpinBox
-from hexrd.ui.select_items_dialog import SelectItemsDialog
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals, clear_layout, has_nan
-from hexrd.ui.wppf_style_picker import WppfStylePicker
+from hexrdgui.dynamic_widget import DynamicWidget
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.scientificspinbox import ScientificDoubleSpinBox
+from hexrdgui.select_items_dialog import SelectItemsDialog
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals, clear_layout, has_nan
+from hexrdgui.wppf_style_picker import WppfStylePicker
 
 
 inverted_peakshape_dict = {v: k for k, v in peakshape_dict.items()}
@@ -286,7 +286,7 @@ def select_materials(self):
         selected = self.selected_materials
         items = [(name, name in selected) for name in materials]
         dialog = SelectItemsDialog(items, self.ui)
-        if dialog.exec_() and self.selected_materials != dialog.selected_items:
+        if dialog.exec() and self.selected_materials != dialog.selected_items:
             self.selected_materials = dialog.selected_items
             self.update_params()
 
@@ -531,7 +531,7 @@ def display_wppf_plot_toggled(self):
 
     def edit_plot_style(self):
         dialog = WppfStylePicker(self.ui)
-        dialog.ui.exec_()
+        dialog.ui.exec()
 
     def create_label(self, v):
         w = QTableWidgetItem(v)
@@ -921,12 +921,12 @@ def dict_to_param(d):
 
 
 if __name__ == '__main__':
-    from PySide2.QtWidgets import QApplication
+    from PySide6.QtWidgets import QApplication
 
     app = QApplication()
 
     dialog = WppfOptionsDialog()
-    dialog.ui.exec_()
+    dialog.ui.exec()
 
     print(f'{dialog.method=}')
     print(f'{dialog.background_method=}')
diff --git a/hexrd/ui/calibration/wppf_runner.py b/hexrdgui/calibration/wppf_runner.py
similarity index 95%
rename from hexrd/ui/calibration/wppf_runner.py
rename to hexrdgui/calibration/wppf_runner.py
index 8cb94a271..5f4df0168 100644
--- a/hexrd/ui/calibration/wppf_runner.py
+++ b/hexrdgui/calibration/wppf_runner.py
@@ -1,11 +1,11 @@
 import copy
 
-from PySide2.QtCore import QCoreApplication
+from PySide6.QtCore import QCoreApplication
 
 from hexrd.wppf import Rietveld
 
-from hexrd.ui.calibration.wppf_options_dialog import WppfOptionsDialog
-from hexrd.ui.hexrd_config import HexrdConfig
+from hexrdgui.calibration.wppf_options_dialog import WppfOptionsDialog
+from hexrdgui.hexrd_config import HexrdConfig
 
 
 class WppfRunner:
diff --git a/hexrd/ui/calibration_crystal_editor.py b/hexrdgui/calibration_crystal_editor.py
similarity index 94%
rename from hexrd/ui/calibration_crystal_editor.py
rename to hexrdgui/calibration_crystal_editor.py
index 82f7d0845..80764c941 100644
--- a/hexrd/ui/calibration_crystal_editor.py
+++ b/hexrdgui/calibration_crystal_editor.py
@@ -2,21 +2,21 @@
 import numpy as np
 from numpy.linalg import LinAlgError
 
-from PySide2.QtCore import QObject, Signal
-from PySide2.QtWidgets import QFileDialog
+from PySide6.QtCore import QObject, Signal
+from PySide6.QtWidgets import QFileDialog
 
 from hexrd import instrument, matrixutil
 
-from hexrd.ui.calibration_crystal_slider_widget import (
+from hexrdgui.calibration_crystal_slider_widget import (
     CalibrationCrystalSliderWidget,
     WidgetMode as SliderWidgetMode
 )
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.overlays.constants import crystal_refinement_labels
-from hexrd.ui.select_grains_dialog import SelectGrainsDialog
-from hexrd.ui.select_items_widget import SelectItemsWidget
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals, convert_angle_convention
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.overlays.constants import crystal_refinement_labels
+from hexrdgui.select_grains_dialog import SelectGrainsDialog
+from hexrdgui.select_items_widget import SelectItemsWidget
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals, convert_angle_convention
 
 
 class CalibrationCrystalEditor(QObject):
@@ -281,7 +281,7 @@ def update_tab_gui(self):
 
     def load(self):
         dialog = SelectGrainsDialog(1, self.ui)
-        if not dialog.exec_():
+        if not dialog.exec():
             return
 
         self.load_from_grain(dialog.selected_grain)
diff --git a/hexrd/ui/calibration_crystal_slider_widget.py b/hexrdgui/calibration_crystal_slider_widget.py
similarity index 96%
rename from hexrd/ui/calibration_crystal_slider_widget.py
rename to hexrdgui/calibration_crystal_slider_widget.py
index 6e46b4faa..9f690912d 100644
--- a/hexrd/ui/calibration_crystal_slider_widget.py
+++ b/hexrdgui/calibration_crystal_slider_widget.py
@@ -1,10 +1,10 @@
 from enum import IntEnum
 
-from PySide2.QtCore import QObject, Signal
-from PySide2.QtWidgets import QProxyStyle, QStyle
+from PySide6.QtCore import QObject, Signal
+from PySide6.QtWidgets import QProxyStyle, QStyle
 
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
 
 
 class SpinBoxStyle(QProxyStyle):
diff --git a/hexrd/ui/calibration_slider_widget.py b/hexrdgui/calibration_slider_widget.py
similarity index 98%
rename from hexrd/ui/calibration_slider_widget.py
rename to hexrdgui/calibration_slider_widget.py
index b2c4ed4f4..0149db81b 100644
--- a/hexrd/ui/calibration_slider_widget.py
+++ b/hexrdgui/calibration_slider_widget.py
@@ -1,9 +1,9 @@
-from PySide2.QtCore import QObject
+from PySide6.QtCore import QObject
 
 import numpy as np
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
 
 
 class CalibrationSliderWidget(QObject):
diff --git a/hexrd/ui/color_map_editor.py b/hexrdgui/color_map_editor.py
similarity index 96%
rename from hexrd/ui/color_map_editor.py
rename to hexrdgui/color_map_editor.py
index e9a75778b..8dde13c41 100644
--- a/hexrd/ui/color_map_editor.py
+++ b/hexrdgui/color_map_editor.py
@@ -5,12 +5,12 @@
 
 import numpy as np
 
-from hexrd.ui import constants
-from hexrd.ui.brightness_contrast_editor import BrightnessContrastEditor
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.scaling import SCALING_OPTIONS
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
+from hexrdgui import constants
+from hexrdgui.brightness_contrast_editor import BrightnessContrastEditor
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.scaling import SCALING_OPTIONS
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
 
 
 class ColorMapEditor:
@@ -159,7 +159,7 @@ def bc_editor_modified(self):
             self.range_edited()
 
     def update_mins_and_maxes(self):
-        # We can't do this in PySide2 for some reason:
+        # We can't do this in PySide6 for some reason:
         # self.ui.maximum.valueChanged.connect(self.ui.minimum.setMaximum)
         # self.ui.minimum.valueChanged.connect(self.ui.maximum.setMinimum)
         self.ui.maximum.setMinimum(self.ui.minimum.value())
diff --git a/hexrd/ui/config_dialog.py b/hexrdgui/config_dialog.py
similarity index 92%
rename from hexrd/ui/config_dialog.py
rename to hexrdgui/config_dialog.py
index 387c7bacd..b0d63a0fe 100644
--- a/hexrd/ui/config_dialog.py
+++ b/hexrdgui/config_dialog.py
@@ -1,7 +1,7 @@
-from PySide2.QtWidgets import QMessageBox
+from PySide6.QtWidgets import QMessageBox
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
 
 
 class ConfigDialog:
@@ -14,9 +14,9 @@ def __init__(self, parent=None):
     def setup_connections(self):
         self.ui.accepted.connect(self.on_accepted)
 
-    def exec_(self):
+    def exec(self):
         self.update_gui()
-        self.ui.exec_()
+        self.ui.exec()
 
     def update_gui(self):
         self.max_cpus_ui = self.max_cpus_config
diff --git a/hexrd/ui/constants.py b/hexrdgui/constants.py
similarity index 100%
rename from hexrd/ui/constants.py
rename to hexrdgui/constants.py
diff --git a/hexrd/ui/create_hedm_instrument.py b/hexrdgui/create_hedm_instrument.py
similarity index 94%
rename from hexrd/ui/create_hedm_instrument.py
rename to hexrdgui/create_hedm_instrument.py
index d4bfaa613..b1e21b055 100644
--- a/hexrd/ui/create_hedm_instrument.py
+++ b/hexrdgui/create_hedm_instrument.py
@@ -1,8 +1,8 @@
 from hexrd import constants as ct
 from hexrd.instrument import HEDMInstrument
 
-from hexrd.ui.constants import ViewType
-from hexrd.ui.hexrd_config import HexrdConfig
+from hexrdgui.constants import ViewType
+from hexrdgui.hexrd_config import HexrdConfig
 
 
 def create_hedm_instrument():
diff --git a/hexrd/ui/create_polar_mask.py b/hexrdgui/create_polar_mask.py
similarity index 94%
rename from hexrd/ui/create_polar_mask.py
rename to hexrdgui/create_polar_mask.py
index f70723c2f..f7dd875fd 100644
--- a/hexrd/ui/create_polar_mask.py
+++ b/hexrdgui/create_polar_mask.py
@@ -2,11 +2,11 @@
 
 from skimage.draw import polygon
 
-from hexrd.ui.create_hedm_instrument import create_view_hedm_instrument
-from hexrd.ui.calibration.polarview import PolarView
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.utils import add_sample_points
-from hexrd.ui.utils.conversions import pixels_to_angles
+from hexrdgui.create_hedm_instrument import create_view_hedm_instrument
+from hexrdgui.calibration.polarview import PolarView
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.utils import add_sample_points
+from hexrdgui.utils.conversions import pixels_to_angles
 
 
 def convert_raw_to_polar(det, line):
diff --git a/hexrd/ui/create_raw_mask.py b/hexrdgui/create_raw_mask.py
similarity index 90%
rename from hexrd/ui/create_raw_mask.py
rename to hexrdgui/create_raw_mask.py
index ac5b93117..ea185f6aa 100644
--- a/hexrd/ui/create_raw_mask.py
+++ b/hexrdgui/create_raw_mask.py
@@ -2,11 +2,11 @@
 
 from skimage.draw import polygon
 
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.utils import add_sample_points
-from hexrd.ui.utils.conversions import angles_to_pixels
-from hexrd.ui.utils.tth_distortion import apply_tth_distortion_if_needed
+from hexrdgui.create_hedm_instrument import create_hedm_instrument
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.utils import add_sample_points
+from hexrdgui.utils.conversions import angles_to_pixels
+from hexrdgui.utils.tth_distortion import apply_tth_distortion_if_needed
 
 
 def apply_threshold_mask():
diff --git a/hexrd/ui/dev-guide.md b/hexrdgui/dev-guide.md
similarity index 94%
rename from hexrd/ui/dev-guide.md
rename to hexrdgui/dev-guide.md
index cef5fd51d..4f413655a 100644
--- a/hexrd/ui/dev-guide.md
+++ b/hexrdgui/dev-guide.md
@@ -60,7 +60,7 @@ when more generic categories are needed.
 UI Files
 --------
 
-One nice feature of PySide2 is that UI files can be loaded at runtime.
+One nice feature of PySide6 is that UI files can be loaded at runtime.
 However, this comes with a few complications. Namely, there is no
 `setupUi()` function that can be called. This means that the object
 that owns the widget does not need to be the type of the widget.
@@ -68,7 +68,7 @@ that owns the widget does not need to be the type of the widget.
 The design of the classes that contain widgets in this source code
 are usually as follows:
 ```
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.ui_loader import UiLoader
 
 class SomeWidget:
 
@@ -88,9 +88,9 @@ If your class needs to emit signals, two things must be done:
 
 A UI class that emits signals needs to be set up like the following:
 ```
-from PySide2.QtCore import Signal, QObject
+from PySide6.QtCore import Signal, QObject
 
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.ui_loader import UiLoader
 
 class SomeWidget(QObject):
 
@@ -109,7 +109,7 @@ class SomeWidget(QObject):
 For updating the GUI with internal config, the design pattern we typically
 use is as follows:
 ```
-from hexrd.ui.utils import block_signals
+from hexrdgui.utils import block_signals
 
 ...
 
@@ -134,11 +134,11 @@ is so that if an exception is raised, they will be unblocked automatically.
 Resources
 ---------
 
-Resources are placed within the `hexrd.ui.resources` directory, and they
+Resources are placed within the `hexrdgui.resources` directory, and they
 can be loaded like so:
 ```
-from hexrd.ui import resource_loader
-text = resource_loader.load_resource(hexrd.ui.resources.some_path,
+from hexrdgui import resource_loader
+text = resource_loader.load_resource(hexrdgui.resources.some_path,
                                      'file_name')
 ```
 
@@ -216,7 +216,7 @@ progress(int) # Emitted only if a progress callback was used, and it
 
 The `AsyncWorker` is used like the following:
 ```
-thread_pool = QThreadPool() # Probably should be a member variable
+thread_pool = QThreadPool.globalInstance()
 worker = AsyncWorker(func_to_call)
 thread_pool.start(worker)
 
diff --git a/hexrd/ui/dynamic_widget.py b/hexrdgui/dynamic_widget.py
similarity index 94%
rename from hexrd/ui/dynamic_widget.py
rename to hexrdgui/dynamic_widget.py
index bbcdc59fb..75f209666 100644
--- a/hexrd/ui/dynamic_widget.py
+++ b/hexrdgui/dynamic_widget.py
@@ -1,7 +1,7 @@
-from PySide2.QtCore import QObject, Signal
-from PySide2.QtWidgets import QCheckBox, QDoubleSpinBox, QLabel, QSpinBox
+from PySide6.QtCore import QObject, Signal
+from PySide6.QtWidgets import QCheckBox, QDoubleSpinBox, QLabel, QSpinBox
 
-from hexrd.ui.scientificspinbox import ScientificDoubleSpinBox
+from hexrdgui.scientificspinbox import ScientificDoubleSpinBox
 
 
 class DynamicWidget(QObject):
diff --git a/hexrd/ui/edit_colormap_list_dialog.py b/hexrdgui/edit_colormap_list_dialog.py
similarity index 96%
rename from hexrd/ui/edit_colormap_list_dialog.py
rename to hexrdgui/edit_colormap_list_dialog.py
index c5b52342a..20299d7c0 100644
--- a/hexrd/ui/edit_colormap_list_dialog.py
+++ b/hexrdgui/edit_colormap_list_dialog.py
@@ -1,8 +1,8 @@
-from PySide2.QtCore import QObject, Qt
+from PySide6.QtCore import QObject, Qt
 
-from hexrd.ui import constants
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui import constants
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
 
 
 class EditColormapListDialog(QObject):
diff --git a/hexrd/ui/fiber_pick_utils.py b/hexrdgui/fiber_pick_utils.py
similarity index 100%
rename from hexrd/ui/fiber_pick_utils.py
rename to hexrdgui/fiber_pick_utils.py
diff --git a/hexrd/ui/fix_pdb.py b/hexrdgui/fix_pdb.py
similarity index 100%
rename from hexrd/ui/fix_pdb.py
rename to hexrdgui/fix_pdb.py
diff --git a/hexrd/ui/grains_viewer_dialog.py b/hexrdgui/grains_viewer_dialog.py
similarity index 91%
rename from hexrd/ui/grains_viewer_dialog.py
rename to hexrdgui/grains_viewer_dialog.py
index 5e9f47240..71721052b 100644
--- a/hexrd/ui/grains_viewer_dialog.py
+++ b/hexrdgui/grains_viewer_dialog.py
@@ -1,8 +1,8 @@
-from PySide2.QtWidgets import QDialog, QVBoxLayout
+from PySide6.QtWidgets import QDialog, QVBoxLayout
 
-from hexrd.ui.indexing.grains_table_model import GrainsTableModel
-from hexrd.ui.plot_grains import plot_grains
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.indexing.grains_table_model import GrainsTableModel
+from hexrdgui.plot_grains import plot_grains
+from hexrdgui.ui_loader import UiLoader
 
 
 class GrainsViewerWidget:
diff --git a/hexrd/ui/hand_drawn_mask_dialog.py b/hexrdgui/hand_drawn_mask_dialog.py
similarity index 90%
rename from hexrd/ui/hand_drawn_mask_dialog.py
rename to hexrdgui/hand_drawn_mask_dialog.py
index deb27164e..82357cabd 100644
--- a/hexrd/ui/hand_drawn_mask_dialog.py
+++ b/hexrdgui/hand_drawn_mask_dialog.py
@@ -1,4 +1,4 @@
-from PySide2.QtCore import QObject, Signal, Qt
+from PySide6.QtCore import QObject, Signal, Qt
 
 from itertools import cycle
 
@@ -6,10 +6,10 @@
 
 import matplotlib.pyplot as plt
 from matplotlib.widgets import Cursor
-from hexrd.ui.hexrd_config import HexrdConfig
+from hexrdgui.hexrd_config import HexrdConfig
 
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import add_sample_points
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import add_sample_points
 
 # TODO: How to handle image mode? Mode has changed byt the time the signal has been emitted.
 
@@ -34,6 +34,10 @@ def __init__(self, canvas, parent):
         self.dets = []
         self.det = None
 
+        self.bp_id = None
+        self.enter_id = None
+        self.exit_id = None
+
         prop_cycle = plt.rcParams['axes.prop_cycle']
         self.color_cycler = cycle(prop_cycle.by_key()['color'])
 
@@ -47,6 +51,9 @@ def setup_connections(self):
         self.ui.rejected.connect(self.rejected)
 
     def setup_canvas_connections(self):
+        # Ensure previous canvas connections are disconnected
+        self.disconnect_canvas_connections()
+
         self.bp_id = self.canvas.mpl_connect('button_press_event',
                                             self.button_pressed)
         self.enter_id = self.canvas.mpl_connect('axes_enter_event',
@@ -54,6 +61,19 @@ def setup_canvas_connections(self):
         self.exit_id = self.canvas.mpl_connect('axes_leave_event',
                                             self.axes_exited)
 
+    def disconnect_canvas_connections(self):
+        if self.bp_id:
+            self.canvas.mpl_disconnect(self.bp_id)
+            self.bp_id = None
+
+        if self.enter_id:
+            self.canvas.mpl_disconnect(self.enter_id)
+            self.enter_id = None
+
+        if self.exit_id:
+            self.canvas.mpl_disconnect(self.exit_id)
+            self.exit_id = None
+
     def move_dialog_to_left(self):
         # This moves the dialog to the left border of the parent
         ph = self.ui.parent().geometry().height()
@@ -75,13 +95,8 @@ def clear(self):
         self.linebuilder = None
         self.cursor = None
 
-        self.canvas.mpl_disconnect(self.bp_id)
-        self.canvas.mpl_disconnect(self.enter_id)
-        self.canvas.mpl_disconnect(self.exit_id)
+        self.disconnect_canvas_connections()
 
-        self.bp_id = None
-        self.enter_id = None
-        self.exit_id = None
         self.dets.clear()
         self.canvas.draw()
 
diff --git a/hexrd/ui/hand_picked_fibers_widget.py b/hexrdgui/hand_picked_fibers_widget.py
similarity index 97%
rename from hexrd/ui/hand_picked_fibers_widget.py
rename to hexrdgui/hand_picked_fibers_widget.py
index 50f9849f4..c0f0bb39a 100644
--- a/hexrd/ui/hand_picked_fibers_widget.py
+++ b/hexrdgui/hand_picked_fibers_widget.py
@@ -1,14 +1,14 @@
 import numpy as np
 
-from PySide2.QtCore import QItemSelectionModel, QObject, Qt, Signal
-from PySide2.QtWidgets import QTableWidgetItem
+from PySide6.QtCore import QItemSelectionModel, QObject, Qt, Signal
+from PySide6.QtWidgets import QTableWidgetItem
 
 from hexrd.rotations import quatOfExpMap
 
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui.fiber_pick_utils import _angles_from_orientation, _pick_to_fiber
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
+from hexrdgui.create_hedm_instrument import create_hedm_instrument
+from hexrdgui.fiber_pick_utils import _angles_from_orientation, _pick_to_fiber
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
 
 
 class HandPickedFibersWidget(QObject):
diff --git a/hexrd/ui/hexrd_config.py b/hexrdgui/hexrd_config.py
similarity index 98%
rename from hexrd/ui/hexrd_config.py
rename to hexrdgui/hexrd_config.py
index 29d8a6924..b498cbb36 100644
--- a/hexrd/ui/hexrd_config.py
+++ b/hexrdgui/hexrd_config.py
@@ -4,7 +4,7 @@
 from pathlib import Path
 import sys
 
-from PySide2.QtCore import Signal, QCoreApplication, QObject, QSettings, QTimer
+from PySide6.QtCore import Signal, QCoreApplication, QObject, QSettings, QTimer
 
 import h5py
 import matplotlib
@@ -18,15 +18,15 @@
 from hexrd.rotations import RotMatEuler
 from hexrd.valunits import valWUnit
 
-from hexrd.ui import constants
-from hexrd.ui import overlays
-from hexrd.ui import resource_loader
-from hexrd.ui import utils
-from hexrd.ui.singletons import QSingleton
+from hexrdgui import constants
+from hexrdgui import overlays
+from hexrdgui import resource_loader
+from hexrdgui import utils
+from hexrdgui.singletons import QSingleton
 
-import hexrd.ui.resources.calibration
-import hexrd.ui.resources.indexing
-import hexrd.ui.resources.materials
+import hexrdgui.resources.calibration
+import hexrdgui.resources.indexing
+import hexrdgui.resources.materials
 
 
 # This is a singleton class that contains the configuration
@@ -246,7 +246,7 @@ class HexrdConfig(QObject, metaclass=QSingleton):
 
     def __init__(self):
         # Should this have a parent?
-        super(HexrdConfig, self).__init__(None)
+        super().__init__(None)
         self.config = {}
         self.default_config = {}
         self.gui_yaml_dict = None
@@ -555,14 +555,26 @@ def recurse(cur, config):
 
         recurse(v, config)
 
+    @property
+    def _q_settings_version(self):
+        # Keep track of a QSettings version so we can ignore versions
+        # that we might not be able to load.
+        return 1
+
     def save_settings(self):
         settings = QSettings()
+        settings.setValue('settings_version', self._q_settings_version)
 
         state = self.state_to_persist()
         self._save_state_to_settings(state, settings)
 
     def load_settings(self):
         settings = QSettings()
+        if settings.value('settings_version') != self._q_settings_version:
+            # The QSettings version is different (probably PySide6 is
+            # trying to load a PySide2 QSettings, which has issues)
+            # Ignore the settings, as there may be compatibility issues.
+            return
 
         state = self._load_state_from_settings(settings)
         self.load_from_state(state)
@@ -663,36 +675,36 @@ def set_images_dir(self, images_dir):
         self.images_dir = images_dir
 
     def load_gui_yaml_dict(self):
-        text = resource_loader.load_resource(hexrd.ui.resources.calibration,
+        text = resource_loader.load_resource(hexrdgui.resources.calibration,
                                              'yaml_to_gui.yml')
         self.gui_yaml_dict = yaml.load(text, Loader=yaml.FullLoader)
 
     def load_calibration_flags_order(self):
-        text = resource_loader.load_resource(hexrd.ui.resources.calibration,
+        text = resource_loader.load_resource(hexrdgui.resources.calibration,
                                              'calibration_flags_order.yml')
         self.calibration_flags_order = yaml.load(text, Loader=yaml.FullLoader)
 
     def load_default_config(self):
-        text = resource_loader.load_resource(hexrd.ui.resources.calibration,
+        text = resource_loader.load_resource(hexrdgui.resources.calibration,
                                              'default_instrument_config.yml')
         self.default_config['instrument'] = yaml.load(text,
                                                       Loader=yaml.FullLoader)
 
-        text = resource_loader.load_resource(hexrd.ui.resources.indexing,
+        text = resource_loader.load_resource(hexrdgui.resources.indexing,
                                              'default_indexing_config.yml')
         self.default_config['indexing'] = yaml.load(text,
                                                     Loader=yaml.FullLoader)
 
-        yml = resource_loader.load_resource(hexrd.ui.resources.materials,
+        yml = resource_loader.load_resource(hexrdgui.resources.materials,
                                             'materials_panel_defaults.yml')
         self.default_config['materials'] = yaml.load(yml,
                                                      Loader=yaml.FullLoader)
 
-        text = resource_loader.load_resource(hexrd.ui.resources.calibration,
+        text = resource_loader.load_resource(hexrdgui.resources.calibration,
                                              'default_image_config.yml')
         self.default_config['image'] = yaml.load(text, Loader=yaml.FullLoader)
 
-        text = resource_loader.load_resource(hexrd.ui.resources.calibration,
+        text = resource_loader.load_resource(hexrdgui.resources.calibration,
                                              'default_calibration_config.yml')
         self.default_config['calibration'] = yaml.load(text,
                                                        Loader=yaml.FullLoader)
@@ -812,7 +824,7 @@ def intensity_corrected_images_dict(self):
             return images_dict
 
         # Some methods require an instrument. Go ahead and create one.
-        from hexrd.ui.create_hedm_instrument import create_hedm_instrument
+        from hexrdgui.create_hedm_instrument import create_hedm_instrument
         instr = create_hedm_instrument()
 
         if HexrdConfig().apply_pixel_solid_angle_correction:
@@ -862,7 +874,7 @@ def images_dict(self):
     def raw_masks_dict(self):
         """Get a masks dict"""
         # We must ensure that we are using raw masks
-        from hexrd.ui.create_raw_mask import rebuild_raw_masks
+        from hexrdgui.create_raw_mask import rebuild_raw_masks
         prev_masks = copy.deepcopy(self.masks)
         try:
             rebuild_raw_masks()
@@ -896,7 +908,7 @@ def masked_images_dict(self):
 
     def create_masked_images_dict(self, fill_value=0):
         """Get an images dict where masks have been applied"""
-        from hexrd.ui.create_hedm_instrument import create_hedm_instrument
+        from hexrdgui.create_hedm_instrument import create_hedm_instrument
 
         images_dict = self.images_dict
         instr = create_hedm_instrument()
@@ -1013,7 +1025,7 @@ def read_file(f):
         return self.config['instrument']
 
     def save_instrument_config(self, output_file):
-        from hexrd.ui.create_hedm_instrument import create_hedm_instrument
+        from hexrdgui.create_hedm_instrument import create_hedm_instrument
 
         styles = {
             '.yml': 'yaml',
@@ -1563,14 +1575,14 @@ def rename_detector(self, old_name, new_name):
 
     @property
     def available_default_materials(self):
-        module = hexrd.ui.resources.materials
+        module = hexrdgui.resources.materials
         with resource_loader.path(module, 'materials.h5') as file_path:
             with h5py.File(file_path) as f:
                 return list(f.keys())
 
     # This section is for materials configuration
     def load_default_material(self, name):
-        module = hexrd.ui.resources.materials
+        module = hexrdgui.resources.materials
         materials = self.materials
         with resource_loader.path(module, 'materials.h5') as file_path:
             materials[name] = Material(name, file_path)
@@ -2120,7 +2132,7 @@ def custom_polar_tth_distortion_object_serialized(self):
     def custom_polar_tth_distortion_object_serialized(self, v):
         obj = None
         if v is not None:
-            from hexrd.ui.polar_distortion_object import PolarDistortionObject
+            from hexrdgui.polar_distortion_object import PolarDistortionObject
             active = v['active']
             obj = PolarDistortionObject.deserialize(v['serialized'])
 
diff --git a/hexrd/ui/hidden_bar_tab_widget.py b/hexrdgui/hidden_bar_tab_widget.py
similarity index 90%
rename from hexrd/ui/hidden_bar_tab_widget.py
rename to hexrdgui/hidden_bar_tab_widget.py
index 0a04d8040..6a49b2b15 100644
--- a/hexrd/ui/hidden_bar_tab_widget.py
+++ b/hexrdgui/hidden_bar_tab_widget.py
@@ -1,5 +1,5 @@
-from PySide2.QtCore import QTimer
-from PySide2.QtWidgets import QTabWidget
+from PySide6.QtCore import QTimer
+from PySide6.QtWidgets import QTabWidget
 
 
 class HiddenBarTabWidget(QTabWidget):
diff --git a/hexrd/ui/image_calculator.py b/hexrdgui/image_calculator.py
similarity index 100%
rename from hexrd/ui/image_calculator.py
rename to hexrdgui/image_calculator.py
diff --git a/hexrd/ui/image_calculator_dialog.py b/hexrdgui/image_calculator_dialog.py
similarity index 94%
rename from hexrd/ui/image_calculator_dialog.py
rename to hexrdgui/image_calculator_dialog.py
index bf332d2f0..4b61e7bc4 100644
--- a/hexrd/ui/image_calculator_dialog.py
+++ b/hexrdgui/image_calculator_dialog.py
@@ -1,14 +1,14 @@
 from pathlib import Path
 
-from PySide2.QtCore import QCoreApplication, QObject, Signal
-from PySide2.QtWidgets import QFileDialog, QInputDialog, QMessageBox
+from PySide6.QtCore import QCoreApplication, QObject, Signal
+from PySide6.QtWidgets import QFileDialog, QInputDialog, QMessageBox
 
 from hexrd import imageseries
 
-from hexrd.ui.image_calculator import IMAGE_CALCULATOR_OPERATIONS
-from hexrd.ui.image_file_manager import ImageFileManager
-from hexrd.ui.progress_dialog import ProgressDialog
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.image_calculator import IMAGE_CALCULATOR_OPERATIONS
+from hexrdgui.image_file_manager import ImageFileManager
+from hexrdgui.progress_dialog import ProgressDialog
+from hexrdgui.ui_loader import UiLoader
 
 
 class ImageCalculatorDialog(QObject):
diff --git a/hexrd/ui/image_canvas.py b/hexrdgui/image_canvas.py
similarity index 98%
rename from hexrd/ui/image_canvas.py
rename to hexrdgui/image_canvas.py
index a65e308f0..4b2fd5fa9 100644
--- a/hexrd/ui/image_canvas.py
+++ b/hexrdgui/image_canvas.py
@@ -1,8 +1,8 @@
 import copy
 import math
 
-from PySide2.QtCore import QThreadPool, QTimer, Signal, Qt
-from PySide2.QtWidgets import QFileDialog, QMessageBox
+from PySide6.QtCore import QThreadPool, QTimer, Signal, Qt
+from PySide6.QtWidgets import QFileDialog, QMessageBox
 
 from matplotlib.backends.backend_qt5agg import FigureCanvas
 
@@ -14,16 +14,16 @@
 
 import numpy as np
 
-from hexrd.ui.async_worker import AsyncWorker
-from hexrd.ui.calibration.cartesian_plot import cartesian_viewer
-from hexrd.ui.calibration.polar_plot import polar_viewer
-from hexrd.ui.calibration.raw_iviewer import raw_iviewer
-from hexrd.ui.calibration.stereo_plot import stereo_viewer
-from hexrd.ui.constants import OverlayType, PolarXAxisType, ViewType
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.snip_viewer_dialog import SnipViewerDialog
-from hexrd.ui import utils
-from hexrd.ui.utils.conversions import (
+from hexrdgui.async_worker import AsyncWorker
+from hexrdgui.calibration.cartesian_plot import cartesian_viewer
+from hexrdgui.calibration.polar_plot import polar_viewer
+from hexrdgui.calibration.raw_iviewer import raw_iviewer
+from hexrdgui.calibration.stereo_plot import stereo_viewer
+from hexrdgui.constants import OverlayType, PolarXAxisType, ViewType
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.snip_viewer_dialog import SnipViewerDialog
+from hexrdgui import utils
+from hexrdgui.utils.conversions import (
     angles_to_stereo, cart_to_angles, cart_to_pixels, q_to_tth, tth_to_q,
 )
 
@@ -65,9 +65,6 @@ def __init__(self, parent=None, image_names=None):
         )
         self.polar_res_config = HexrdConfig().config['image']['polar'].copy()
 
-        # Set up our async stuff
-        self.thread_pool = QThreadPool(parent)
-
         if image_names is not None:
             self.load_images(image_names)
 
@@ -103,6 +100,10 @@ def setup_connections(self):
         HexrdConfig().beam_energy_modified.connect(
             self.on_beam_energy_modified)
 
+    @property
+    def thread_pool(self):
+        return QThreadPool.globalInstance()
+
     def __del__(self):
         # This is so that the figure can be cleaned up
         plt.close(self.figure)
diff --git a/hexrd/ui/image_file_manager.py b/hexrdgui/image_file_manager.py
similarity index 96%
rename from hexrd/ui/image_file_manager.py
rename to hexrdgui/image_file_manager.py
index b0326948c..de9073143 100644
--- a/hexrd/ui/image_file_manager.py
+++ b/hexrdgui/image_file_manager.py
@@ -5,14 +5,14 @@
 import yaml
 import h5py
 
-from PySide2.QtWidgets import QMessageBox
+from PySide6.QtWidgets import QMessageBox
 
 from hexrd import imageseries
 
-from hexrd.ui import constants
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.load_hdf5_dialog import LoadHDF5Dialog
-from hexrd.ui.singletons import Singleton
+from hexrdgui import constants
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.load_hdf5_dialog import LoadHDF5Dialog
+from hexrdgui.singletons import Singleton
 
 
 class ImageFileManager(metaclass=Singleton):
@@ -172,7 +172,7 @@ def hdf5_path_exists(self, f):
     def path_prompt(self, f):
         path_dialog = LoadHDF5Dialog(f)
         if path_dialog.paths:
-            path_dialog.ui.exec_()
+            path_dialog.ui.exec()
             group, data, remember = path_dialog.results()
             self.path = [group, data]
             self.remember = remember
diff --git a/hexrd/ui/image_load_manager.py b/hexrdgui/image_load_manager.py
similarity index 96%
rename from hexrd/ui/image_load_manager.py
rename to hexrdgui/image_load_manager.py
index 2c82df3f7..10beca8bc 100644
--- a/hexrd/ui/image_load_manager.py
+++ b/hexrdgui/image_load_manager.py
@@ -7,18 +7,18 @@
 
 import numpy as np
 
-from PySide2.QtCore import QObject, QThreadPool, Signal
-from PySide2.QtWidgets import QMessageBox
+from PySide6.QtCore import QObject, QThreadPool, Signal
+from PySide6.QtWidgets import QMessageBox
 
 from hexrd import imageseries
 from hexrd.imageseries.omega import OmegaImageSeries
 
-from hexrd.ui.async_worker import AsyncWorker
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.image_file_manager import ImageFileManager
-from hexrd.ui.progress_dialog import ProgressDialog
-from hexrd.ui.constants import *
-from hexrd.ui.singletons import QSingleton
+from hexrdgui.async_worker import AsyncWorker
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.image_file_manager import ImageFileManager
+from hexrdgui.progress_dialog import ProgressDialog
+from hexrdgui.constants import *
+from hexrdgui.singletons import QSingleton
 
 
 class NoEmptyFramesException(Exception):
@@ -37,9 +37,13 @@ class ImageLoadManager(QObject, metaclass=QSingleton):
     enable_transforms = Signal()
 
     def __init__(self):
-        super(ImageLoadManager, self).__init__(None)
+        super().__init__(None)
         self.transformed_images = False
 
+    @property
+    def thread_pool(self):
+        return QThreadPool.globalInstance()
+
     def load_images(self, fnames):
         files = self.explict_selection(fnames)
         manual = False
@@ -123,6 +127,9 @@ def match_selected_files(self, fnames, search):
         return files
 
     def read_data(self, files=None, data=None, ui_parent=None, **kwargs):
+        # Make sure this is reset to zero when data is being read
+        HexrdConfig().current_imageseries_idx = 0
+
         # When this is pressed read in a complete set of data for all detectors.
         # Run the imageseries processing in a background thread and display a
         # loading dialog
@@ -140,7 +147,6 @@ def begin_processing(self, postprocess=False):
         self.live_update_status.emit(False)
 
         # Create threads and loading dialog
-        thread_pool = QThreadPool(self.ui_parent)
         progress_dialog = ProgressDialog(self.ui_parent)
         progress_dialog.setWindowTitle('Loading Processed Imageseries')
         self.progress_text.connect(progress_dialog.setLabelText)
@@ -148,13 +154,13 @@ def begin_processing(self, postprocess=False):
 
         # Start processing in background
         worker = AsyncWorker(self.process_ims, postprocess)
-        thread_pool.start(worker)
+        self.thread_pool.start(worker)
 
         worker.signals.progress.connect(progress_dialog.setValue)
         # On completion load imageseries nd close loading dialog
         worker.signals.result.connect(self.finish_processing_ims)
         worker.signals.finished.connect(progress_dialog.accept)
-        progress_dialog.exec_()
+        progress_dialog.exec()
 
     def set_state(self, state=None):
         if state is None:
diff --git a/hexrd/ui/image_mode_widget.py b/hexrdgui/image_mode_widget.py
similarity index 98%
rename from hexrd/ui/image_mode_widget.py
rename to hexrdgui/image_mode_widget.py
index 77a37bd4c..deb71b343 100644
--- a/hexrd/ui/image_mode_widget.py
+++ b/hexrdgui/image_mode_widget.py
@@ -2,14 +2,14 @@
 import multiprocessing
 import numpy as np
 
-from PySide2.QtCore import QObject, QTimer, Signal
-
-from hexrd.ui.azimuthal_overlay_manager import AzimuthalOverlayManager
-from hexrd.ui.constants import PolarXAxisType, ViewType
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
+from PySide6.QtCore import QObject, QTimer, Signal
+
+from hexrdgui.azimuthal_overlay_manager import AzimuthalOverlayManager
+from hexrdgui.constants import PolarXAxisType, ViewType
+from hexrdgui.create_hedm_instrument import create_hedm_instrument
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
 
 TAB_INDEX_TO_VIEW_MODE = {
     0: ViewType.raw,
diff --git a/hexrd/ui/image_series_toolbar.py b/hexrdgui/image_series_toolbar.py
similarity index 94%
rename from hexrd/ui/image_series_toolbar.py
rename to hexrdgui/image_series_toolbar.py
index d5be6ee34..4052fbb0f 100644
--- a/hexrd/ui/image_series_toolbar.py
+++ b/hexrdgui/image_series_toolbar.py
@@ -1,11 +1,11 @@
 from pathlib import Path
-from PySide2.QtCore import Qt
-from PySide2.QtWidgets import QGridLayout, QLabel, QSlider, QSpinBox, QWidget
-from PySide2.QtGui import QPixmap
-from hexrd.ui import resource_loader
+from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QGridLayout, QLabel, QSlider, QSpinBox, QWidget
+from PySide6.QtGui import QPixmap
+from hexrdgui import resource_loader
 
-import hexrd.ui.resources.icons
-from hexrd.ui.hexrd_config import HexrdConfig
+import hexrdgui.resources.icons
+from hexrdgui.hexrd_config import HexrdConfig
 
 
 class ImageSeriesInfoToolbar(QWidget):
@@ -28,7 +28,7 @@ def setup_connections(self):
     def create_widget(self):
         self.widget = QWidget(self.parent())
 
-        data = resource_loader.load_resource(hexrd.ui.resources.icons,
+        data = resource_loader.load_resource(hexrdgui.resources.icons,
                                              'file.svg', binary=True)
         pixmap = QPixmap()
         pixmap.loadFromData(data, 'svg')
diff --git a/hexrd/ui/image_stack_dialog.py b/hexrdgui/image_stack_dialog.py
similarity index 98%
rename from hexrd/ui/image_stack_dialog.py
rename to hexrdgui/image_stack_dialog.py
index b9d20ebce..e1df5644c 100644
--- a/hexrd/ui/image_stack_dialog.py
+++ b/hexrdgui/image_stack_dialog.py
@@ -3,14 +3,14 @@
 import numpy as np
 from pathlib import Path
 
-from PySide2.QtCore import QObject, Signal, Qt
-from PySide2.QtWidgets import QFileDialog, QMessageBox, QTableWidgetItem, QTreeWidgetItem, QAbstractItemView
-
-from hexrd.ui.constants import MAXIMUM_OMEGA_RANGE
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.image_file_manager import ImageFileManager
-from hexrd.ui.utils.dialog import add_help_url
+from PySide6.QtCore import QObject, Signal, Qt
+from PySide6.QtWidgets import QFileDialog, QMessageBox, QTableWidgetItem, QTreeWidgetItem, QAbstractItemView
+
+from hexrdgui.constants import MAXIMUM_OMEGA_RANGE
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.image_file_manager import ImageFileManager
+from hexrdgui.utils.dialog import add_help_url
 
 
 class ImageStackDialog(QObject):
diff --git a/hexrd/ui/image_tab_widget.py b/hexrdgui/image_tab_widget.py
similarity index 96%
rename from hexrd/ui/image_tab_widget.py
rename to hexrdgui/image_tab_widget.py
index dbc7cf05f..0be2f2d14 100644
--- a/hexrd/ui/image_tab_widget.py
+++ b/hexrdgui/image_tab_widget.py
@@ -1,15 +1,15 @@
-from PySide2.QtCore import Signal, Slot, Qt
-from PySide2.QtWidgets import QMessageBox, QTabWidget, QHBoxLayout
+from PySide6.QtCore import Signal, Slot, Qt
+from PySide6.QtWidgets import QMessageBox, QTabWidget, QHBoxLayout
 
 import numpy as np
 
-from hexrd.ui.constants import PAN, ViewType, ZOOM
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.image_canvas import ImageCanvas
-from hexrd.ui.image_series_toolbar import ImageSeriesToolbar, ImageSeriesInfoToolbar
-from hexrd.ui.navigation_toolbar import NavigationToolbar
-from hexrd.ui.utils.conversions import stereo_to_angles, tth_to_q
-from hexrd.ui import utils
+from hexrdgui.constants import PAN, ViewType, ZOOM
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.image_canvas import ImageCanvas
+from hexrdgui.image_series_toolbar import ImageSeriesToolbar, ImageSeriesInfoToolbar
+from hexrdgui.navigation_toolbar import NavigationToolbar
+from hexrdgui.utils.conversions import stereo_to_angles, tth_to_q
+from hexrdgui import utils
 
 
 class ImageTabWidget(QTabWidget):
@@ -434,7 +434,7 @@ def export_to_maud(self, filename):
 
 if __name__ == '__main__':
     import sys
-    from PySide2.QtWidgets import QApplication
+    from PySide6.QtWidgets import QApplication
 
     app = QApplication(sys.argv)
 
diff --git a/hexrd/ui/indexing/README.md b/hexrdgui/indexing/README.md
similarity index 100%
rename from hexrd/ui/indexing/README.md
rename to hexrdgui/indexing/README.md
diff --git a/hexrd/ui/indexing/__init__.py b/hexrdgui/indexing/__init__.py
similarity index 100%
rename from hexrd/ui/indexing/__init__.py
rename to hexrdgui/indexing/__init__.py
diff --git a/hexrd/ui/indexing/create_config.py b/hexrdgui/indexing/create_config.py
similarity index 96%
rename from hexrd/ui/indexing/create_config.py
rename to hexrdgui/indexing/create_config.py
index 5224e1af3..5327b301f 100644
--- a/hexrd/ui/indexing/create_config.py
+++ b/hexrdgui/indexing/create_config.py
@@ -7,8 +7,8 @@
 from hexrd.config.material import MaterialConfig
 from hexrd.config.instrument import Instrument as InstrumentConfig
 
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui.hexrd_config import HexrdConfig
+from hexrdgui.create_hedm_instrument import create_hedm_instrument
+from hexrdgui.hexrd_config import HexrdConfig
 
 
 def get_indexing_material():
diff --git a/hexrd/ui/indexing/fit_grains_options_dialog.py b/hexrdgui/indexing/fit_grains_options_dialog.py
similarity index 96%
rename from hexrd/ui/indexing/fit_grains_options_dialog.py
rename to hexrdgui/indexing/fit_grains_options_dialog.py
index 7ddd227e0..986f8cd95 100644
--- a/hexrd/ui/indexing/fit_grains_options_dialog.py
+++ b/hexrdgui/indexing/fit_grains_options_dialog.py
@@ -1,24 +1,24 @@
 from pathlib import Path
 
-from PySide2.QtCore import (
+from PySide6.QtCore import (
     QItemSelectionModel, QModelIndex, QObject, Qt, Signal)
-from PySide2.QtWidgets import (
+from PySide6.QtWidgets import (
     QDialogButtonBox, QFileDialog, QHeaderView, QMessageBox
 )
 
 import numpy as np
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.indexing.grains_table_model import GrainsTableModel
-from hexrd.ui.plot_grains import plot_grains
-from hexrd.ui.reflections_table import ReflectionsTable
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
-from hexrd.ui.utils.dialog import add_help_url
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.indexing.grains_table_model import GrainsTableModel
+from hexrdgui.plot_grains import plot_grains
+from hexrdgui.reflections_table import ReflectionsTable
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
+from hexrdgui.utils.dialog import add_help_url
 
-from hexrd.ui.indexing.fit_grains_tolerances_model import (
+from hexrdgui.indexing.fit_grains_tolerances_model import (
     FitGrainsToleranceModel)
-from hexrd.ui.indexing.utils import hkls_missing_in_list
+from hexrdgui.indexing.utils import hkls_missing_in_list
 
 
 class FitGrainsOptionsDialog(QObject):
diff --git a/hexrd/ui/indexing/fit_grains_results_dialog.py b/hexrdgui/indexing/fit_grains_results_dialog.py
similarity index 97%
rename from hexrd/ui/indexing/fit_grains_results_dialog.py
rename to hexrdgui/indexing/fit_grains_results_dialog.py
index 084b66a9c..4207da796 100644
--- a/hexrd/ui/indexing/fit_grains_results_dialog.py
+++ b/hexrdgui/indexing/fit_grains_results_dialog.py
@@ -12,20 +12,20 @@
 from matplotlib.backends.backend_qt5agg import FigureCanvas
 from matplotlib.figure import Figure
 
-from PySide2.QtCore import QObject, QTimer, Qt, Signal
-from PySide2.QtWidgets import QFileDialog, QMenu, QMessageBox, QSizePolicy
+from PySide6.QtCore import QObject, QTimer, Qt, Signal
+from PySide6.QtWidgets import QFileDialog, QMenu, QMessageBox, QSizePolicy
 
 from hexrd.matrixutil import vecMVToSymm
 from hexrd.rotations import rotMatOfExpMap
 
-from hexrd.ui import constants
-from hexrd.ui.async_runner import AsyncRunner
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.indexing.grains_table_model import GrainsTableModel
-from hexrd.ui.navigation_toolbar import NavigationToolbar
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
-from hexrd.ui.utils.dialog import add_help_url
+from hexrdgui import constants
+from hexrdgui.async_runner import AsyncRunner
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.indexing.grains_table_model import GrainsTableModel
+from hexrdgui.navigation_toolbar import NavigationToolbar
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
+from hexrdgui.utils.dialog import add_help_url
 
 
 COORDS_SLICE = slice(6, 9)
@@ -753,8 +753,8 @@ def on_export_workflow_clicked(self):
         self.async_runner.run(self._save_workflow_files, selected_directory)
 
 if __name__ == '__main__':
-    from PySide2.QtCore import QCoreApplication
-    from PySide2.QtWidgets import QApplication
+    from PySide6.QtCore import QCoreApplication
+    from PySide6.QtWidgets import QApplication
 
     # User specifies grains.out file
     if (len(sys.argv) < 2):
@@ -778,4 +778,4 @@ def on_export_workflow_clicked(self):
     dialog.ui.resize(1200, 800)
     dialog.finished.connect(app.quit)
     dialog.show()
-    app.exec_()
+    app.exec()
diff --git a/hexrd/ui/indexing/fit_grains_select_dialog.py b/hexrdgui/indexing/fit_grains_select_dialog.py
similarity index 94%
rename from hexrd/ui/indexing/fit_grains_select_dialog.py
rename to hexrdgui/indexing/fit_grains_select_dialog.py
index 342692f1b..5abc06e4b 100644
--- a/hexrd/ui/indexing/fit_grains_select_dialog.py
+++ b/hexrdgui/indexing/fit_grains_select_dialog.py
@@ -2,13 +2,13 @@
 
 import numpy as np
 
-from PySide2.QtCore import QObject, Signal
-from PySide2.QtWidgets import QFileDialog, QMessageBox
+from PySide6.QtCore import QObject, Signal
+from PySide6.QtWidgets import QFileDialog, QMessageBox
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.indexing.utils import generate_grains_table
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.indexing.utils import generate_grains_table
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
 
 
 class FitGrainsSelectDialog(QObject):
diff --git a/hexrd/ui/indexing/fit_grains_tolerances_model.py b/hexrdgui/indexing/fit_grains_tolerances_model.py
similarity index 98%
rename from hexrd/ui/indexing/fit_grains_tolerances_model.py
rename to hexrdgui/indexing/fit_grains_tolerances_model.py
index a3ffa7f90..b406b4cf9 100644
--- a/hexrd/ui/indexing/fit_grains_tolerances_model.py
+++ b/hexrdgui/indexing/fit_grains_tolerances_model.py
@@ -1,4 +1,4 @@
-from PySide2.QtCore import QAbstractTableModel, QModelIndex, Qt, Signal
+from PySide6.QtCore import QAbstractTableModel, QModelIndex, Qt, Signal
 
 
 class FitGrainsToleranceModel(QAbstractTableModel):
diff --git a/hexrd/ui/indexing/fit_grains_tree_view_dialog.py b/hexrdgui/indexing/fit_grains_tree_view_dialog.py
similarity index 71%
rename from hexrd/ui/indexing/fit_grains_tree_view_dialog.py
rename to hexrdgui/indexing/fit_grains_tree_view_dialog.py
index db0dbaf5b..05f3b89dd 100644
--- a/hexrd/ui/indexing/fit_grains_tree_view_dialog.py
+++ b/hexrdgui/indexing/fit_grains_tree_view_dialog.py
@@ -1,5 +1,5 @@
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.tree_views.dict_tree_view import DictTreeViewDialog
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.tree_views.dict_tree_view import DictTreeViewDialog
 
 
 class FitGrainsTreeViewDialog(DictTreeViewDialog):
diff --git a/hexrd/ui/indexing/grains_table_model.py b/hexrdgui/indexing/grains_table_model.py
similarity index 98%
rename from hexrd/ui/indexing/grains_table_model.py
rename to hexrdgui/indexing/grains_table_model.py
index 79168e54d..cb0cfb5b9 100644
--- a/hexrd/ui/indexing/grains_table_model.py
+++ b/hexrdgui/indexing/grains_table_model.py
@@ -1,6 +1,6 @@
 import numpy as np
 
-from PySide2.QtCore import QAbstractTableModel, QModelIndex, Qt, Signal
+from PySide6.QtCore import QAbstractTableModel, QModelIndex, Qt, Signal
 
 
 class GrainsTableModel(QAbstractTableModel):
diff --git a/hexrd/ui/indexing/grains_table_view.py b/hexrdgui/indexing/grains_table_view.py
similarity index 94%
rename from hexrd/ui/indexing/grains_table_view.py
rename to hexrdgui/indexing/grains_table_view.py
index e08422c54..b5aeced39 100644
--- a/hexrd/ui/indexing/grains_table_view.py
+++ b/hexrdgui/indexing/grains_table_view.py
@@ -1,14 +1,14 @@
 import numpy as np
 
-from PySide2.QtCore import QSortFilterProxyModel, Qt, Signal
-from PySide2.QtGui import QCursor
-from PySide2.QtWidgets import QMenu, QMessageBox, QTableView
+from PySide6.QtCore import QSortFilterProxyModel, Qt, Signal
+from PySide6.QtGui import QCursor
+from PySide6.QtWidgets import QMenu, QMessageBox, QTableView
 
-from hexrd.ui.async_runner import AsyncRunner
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.indexing.create_config import create_indexing_config
-from hexrd.ui.indexing.view_spots_dialog import ViewSpotsDialog
-from hexrd.ui.table_selector_widget import TableSingleRowSelectorDialog
+from hexrdgui.async_runner import AsyncRunner
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.indexing.create_config import create_indexing_config
+from hexrdgui.indexing.view_spots_dialog import ViewSpotsDialog
+from hexrdgui.table_selector_widget import TableSingleRowSelectorDialog
 
 
 # Sortable columns are grain id, completeness, chi^2, and t_vec_c
@@ -55,7 +55,7 @@ def add_actions(d):
         if not actions:
             return super().contextMenuEvent(event)
 
-        action_chosen = menu.exec_(QCursor.pos())
+        action_chosen = menu.exec(QCursor.pos())
 
         if action_chosen is None:
             # No action chosen
@@ -157,7 +157,7 @@ def select_tolerance_id(self):
         dialog.table.horizontal_headers = headers
         dialog.setWindowTitle('Select tolerances to use')
 
-        if not dialog.exec_():
+        if not dialog.exec():
             return False
 
         self.selected_tol_id = dialog.selected_row
diff --git a/hexrd/ui/indexing/indexing_results_dialog.py b/hexrdgui/indexing/indexing_results_dialog.py
similarity index 95%
rename from hexrd/ui/indexing/indexing_results_dialog.py
rename to hexrdgui/indexing/indexing_results_dialog.py
index 143b5bf9c..b81e8de47 100644
--- a/hexrd/ui/indexing/indexing_results_dialog.py
+++ b/hexrdgui/indexing/indexing_results_dialog.py
@@ -4,19 +4,19 @@
 from matplotlib.figure import Figure
 import numpy as np
 
-from PySide2.QtCore import Signal, QObject, Qt, QTimer
-from PySide2.QtWidgets import QSizePolicy
+from PySide6.QtCore import Signal, QObject, Qt, QTimer
+from PySide6.QtWidgets import QSizePolicy
 
 from hexrd.transforms import xfcapi
 
-from hexrd.ui.color_map_editor import ColorMapEditor
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui.grains_viewer_dialog import GrainsViewerDialog
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.navigation_toolbar import NavigationToolbar
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
-from hexrd.ui.utils.dialog import add_help_url
+from hexrdgui.color_map_editor import ColorMapEditor
+from hexrdgui.create_hedm_instrument import create_hedm_instrument
+from hexrdgui.grains_viewer_dialog import GrainsViewerDialog
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.navigation_toolbar import NavigationToolbar
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
+from hexrdgui.utils.dialog import add_help_url
 
 
 class IndexingResultsDialog(QObject):
@@ -78,9 +78,9 @@ def show_all_grains_toggled(self):
         self.update_enable_states()
         self.update_spots()
 
-    def exec_(self):
+    def exec(self):
         self.update_plot()
-        self.ui.exec_()
+        self.ui.exec()
 
     def show(self):
         self.update_plot()
diff --git a/hexrd/ui/indexing/indexing_tree_view_dialog.py b/hexrdgui/indexing/indexing_tree_view_dialog.py
similarity index 77%
rename from hexrd/ui/indexing/indexing_tree_view_dialog.py
rename to hexrdgui/indexing/indexing_tree_view_dialog.py
index bb1ebb92f..e2821431e 100644
--- a/hexrd/ui/indexing/indexing_tree_view_dialog.py
+++ b/hexrdgui/indexing/indexing_tree_view_dialog.py
@@ -1,11 +1,11 @@
 import yaml
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.resource_loader import load_resource
-from hexrd.ui.tree_views.dict_tree_view import DictTreeViewDialog
-from hexrd.ui.utils import lazy_property
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.resource_loader import load_resource
+from hexrdgui.tree_views.dict_tree_view import DictTreeViewDialog
+from hexrdgui.utils import lazy_property
 
-import hexrd.ui.resources.indexing as indexing_resources
+import hexrdgui.resources.indexing as indexing_resources
 
 
 class IndexingTreeViewDialog(DictTreeViewDialog):
diff --git a/hexrd/ui/indexing/ome_maps_select_dialog.py b/hexrdgui/indexing/ome_maps_select_dialog.py
similarity index 94%
rename from hexrd/ui/indexing/ome_maps_select_dialog.py
rename to hexrdgui/indexing/ome_maps_select_dialog.py
index 6a95ed1c0..9228ba8c1 100644
--- a/hexrd/ui/indexing/ome_maps_select_dialog.py
+++ b/hexrdgui/indexing/ome_maps_select_dialog.py
@@ -1,13 +1,13 @@
 import os
 
-from PySide2.QtCore import Signal, QObject
-from PySide2.QtWidgets import QFileDialog, QMessageBox
-
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.reflections_table import ReflectionsTable
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
-from hexrd.ui.utils.dialog import add_help_url
+from PySide6.QtCore import Signal, QObject
+from PySide6.QtWidgets import QFileDialog, QMessageBox
+
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.reflections_table import ReflectionsTable
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
+from hexrdgui.utils.dialog import add_help_url
 
 
 class OmeMapsSelectDialog(QObject):
diff --git a/hexrd/ui/indexing/ome_maps_viewer_dialog.py b/hexrdgui/indexing/ome_maps_viewer_dialog.py
similarity index 97%
rename from hexrd/ui/indexing/ome_maps_viewer_dialog.py
rename to hexrdgui/indexing/ome_maps_viewer_dialog.py
index 645aff3d1..0a3c34a83 100644
--- a/hexrd/ui/indexing/ome_maps_viewer_dialog.py
+++ b/hexrdgui/indexing/ome_maps_viewer_dialog.py
@@ -6,8 +6,8 @@
 import numpy as np
 import yaml
 
-from PySide2.QtCore import Signal, QObject, QTimer, Qt
-from PySide2.QtWidgets import (
+from PySide6.QtCore import Signal, QObject, QTimer, Qt
+from PySide6.QtWidgets import (
     QCheckBox, QComboBox, QDoubleSpinBox, QFileDialog, QMessageBox,
     QSizePolicy, QSpinBox
 )
@@ -18,19 +18,19 @@
 )
 from hexrd.imageutil import find_peaks_2d
 
-from hexrd.ui import resource_loader
+from hexrdgui import resource_loader
 
-from hexrd.ui.color_map_editor import ColorMapEditor
-from hexrd.ui.hand_picked_fibers_widget import HandPickedFibersWidget
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.navigation_toolbar import NavigationToolbar
-from hexrd.ui.select_items_widget import SelectItemsWidget
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
-from hexrd.ui.utils.dialog import add_help_url
+from hexrdgui.color_map_editor import ColorMapEditor
+from hexrdgui.hand_picked_fibers_widget import HandPickedFibersWidget
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.navigation_toolbar import NavigationToolbar
+from hexrdgui.select_items_widget import SelectItemsWidget
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
+from hexrdgui.utils.dialog import add_help_url
 
-import hexrd.ui.constants
-import hexrd.ui.resources.indexing
+import hexrdgui.constants
+import hexrdgui.resources.indexing
 
 
 DEFAULT_FWHM = filter_stdev_DFLT * sigma_to_fwhm
@@ -247,7 +247,7 @@ def validate(self):
             raise ValidationException(msg)
 
     def setup_widget_paths(self):
-        text = resource_loader.load_resource(hexrd.ui.resources.indexing,
+        text = resource_loader.load_resource(hexrdgui.resources.indexing,
                                              'gui_config_maps.yml')
         self.gui_config_maps = yaml.load(text, Loader=yaml.FullLoader)
 
diff --git a/hexrd/ui/indexing/run.py b/hexrdgui/indexing/run.py
similarity index 94%
rename from hexrd/ui/indexing/run.py
rename to hexrdgui/indexing/run.py
index 9e69a2e99..329ad3fe5 100644
--- a/hexrd/ui/indexing/run.py
+++ b/hexrdgui/indexing/run.py
@@ -2,8 +2,8 @@
 
 import numpy as np
 
-from PySide2.QtCore import QObject, QThreadPool, Qt, Signal
-from PySide2.QtWidgets import QMessageBox
+from PySide6.QtCore import QObject, QThreadPool, Qt, Signal
+from PySide6.QtWidgets import QMessageBox
 
 from hexrd import indexer, instrument
 from hexrd.cli.find_orientations import write_scored_orientations
@@ -15,20 +15,20 @@
 from hexrd.fitgrains import fit_grains
 from hexrd.xrdutil import EtaOmeMaps
 
-from hexrd.ui.async_worker import AsyncWorker
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.indexing.create_config import (
+from hexrdgui.async_worker import AsyncWorker
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.indexing.create_config import (
     create_indexing_config, get_indexing_material
 )
-from hexrd.ui.indexing.fit_grains_options_dialog import FitGrainsOptionsDialog
-from hexrd.ui.indexing.fit_grains_results_dialog import FitGrainsResultsDialog
-from hexrd.ui.indexing.fit_grains_select_dialog import FitGrainsSelectDialog
-from hexrd.ui.indexing.indexing_results_dialog import IndexingResultsDialog
-from hexrd.ui.indexing.ome_maps_select_dialog import OmeMapsSelectDialog
-from hexrd.ui.indexing.ome_maps_viewer_dialog import OmeMapsViewerDialog
-from hexrd.ui.indexing.utils import generate_grains_table, hkls_missing_in_list
-from hexrd.ui.progress_dialog import ProgressDialog
-from hexrd.ui.utils import format_big_int
+from hexrdgui.indexing.fit_grains_options_dialog import FitGrainsOptionsDialog
+from hexrdgui.indexing.fit_grains_results_dialog import FitGrainsResultsDialog
+from hexrdgui.indexing.fit_grains_select_dialog import FitGrainsSelectDialog
+from hexrdgui.indexing.indexing_results_dialog import IndexingResultsDialog
+from hexrdgui.indexing.ome_maps_select_dialog import OmeMapsSelectDialog
+from hexrdgui.indexing.ome_maps_viewer_dialog import OmeMapsViewerDialog
+from hexrdgui.indexing.utils import generate_grains_table, hkls_missing_in_list
+from hexrdgui.progress_dialog import ProgressDialog
+from hexrdgui.utils import format_big_int
 
 
 class Runner(QObject):
@@ -40,7 +40,6 @@ def __init__(self, parent=None):
         super().__init__(parent)
         self.parent = parent
 
-        self.thread_pool = QThreadPool(self.parent)
         self.progress_dialog = ProgressDialog(self.parent)
         self.clear_cancel_tracker()
 
@@ -50,6 +49,10 @@ def setup_connections(self):
         self.progress_text.connect(self.progress_dialog.setLabelText)
         self.accept_progress_signal.connect(self.progress_dialog.accept)
 
+    @property
+    def thread_pool(self):
+        return QThreadPool.globalInstance()
+
     def update_progress_text(self, text):
         self.progress_text.emit(text)
 
@@ -67,7 +70,7 @@ def on_async_error(self, t):
         msg = f'An ERROR occurred: {exctype}: {value}.'
         msg_box = QMessageBox(QMessageBox.Critical, 'Error', msg)
         msg_box.setDetailedText(traceback)
-        msg_box.exec_()
+        msg_box.exec()
 
     def reset_cancel_tracker(self):
         self.cancel_tracker = CancelTracker()
@@ -178,7 +181,7 @@ def ome_maps_selected(self):
             worker.signals.result.connect(self.ome_maps_loaded)
             worker.signals.error.connect(self.on_async_error)
             worker.signals.finished.connect(self.accept_progress)
-            self.progress_dialog.exec_()
+            self.progress_dialog.exec()
 
     def run_eta_ome_maps(self, config):
         self.ome_maps = generate_eta_ome_maps(config, save=False)
@@ -239,7 +242,7 @@ def ome_maps_viewed(self):
             worker.signals.result.connect(self.orientation_fibers_generated)
             worker.signals.error.connect(self.on_async_error)
 
-        self.progress_dialog.exec_()
+        self.progress_dialog.exec()
 
     def generate_orientation_fibers(self, config):
         # Generate the orientation fibers
@@ -321,9 +324,13 @@ def indexer_finished(self):
         worker = AsyncWorker(self.run_cluster_functions)
         self.thread_pool.start(worker)
 
-        worker.signals.result.connect(self.confirm_indexing_results,
-                                      Qt.QueuedConnection)
-        worker.signals.finished.connect(self.accept_progress)
+        def on_finished():
+            # Since this is a QueuedConnection, we must accept the progress
+            # before proceeding.
+            self.accept_progress()
+            self.confirm_indexing_results()
+
+        worker.signals.result.connect(on_finished, Qt.QueuedConnection)
         worker.signals.error.connect(self.on_async_error)
 
     @property
@@ -520,7 +527,7 @@ def fit_grains_options_accepted(self):
 
         self.progress_dialog.cancel_visible = True
         self.progress_dialog.cancel_clicked.connect(self.on_cancel_clicked)
-        self.progress_dialog.exec_()
+        self.progress_dialog.exec()
 
     def run_fit_grains(self):
         cfg = create_indexing_config()
diff --git a/hexrd/ui/indexing/spot_montage.py b/hexrdgui/indexing/spot_montage.py
similarity index 100%
rename from hexrd/ui/indexing/spot_montage.py
rename to hexrdgui/indexing/spot_montage.py
diff --git a/hexrd/ui/indexing/utils.py b/hexrdgui/indexing/utils.py
similarity index 100%
rename from hexrd/ui/indexing/utils.py
rename to hexrdgui/indexing/utils.py
diff --git a/hexrd/ui/indexing/view_spots_dialog.py b/hexrdgui/indexing/view_spots_dialog.py
similarity index 96%
rename from hexrd/ui/indexing/view_spots_dialog.py
rename to hexrdgui/indexing/view_spots_dialog.py
index 65864396c..0fb4eab91 100644
--- a/hexrd/ui/indexing/view_spots_dialog.py
+++ b/hexrdgui/indexing/view_spots_dialog.py
@@ -1,5 +1,5 @@
-from PySide2.QtCore import Qt
-from PySide2.QtWidgets import QSizePolicy
+from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QSizePolicy
 
 from matplotlib.backends.backend_qt5agg import FigureCanvas
 from matplotlib.figure import Figure
@@ -7,13 +7,13 @@
 
 from hexrd.instrument import centers_of_edge_vec
 
-from hexrd.ui.indexing.spot_montage import (
+from hexrdgui.indexing.spot_montage import (
     create_labels, extract_hkls_from_spots_data, montage, SPOTS_DATA_MAP
 )
-from hexrd.ui.navigation_toolbar import NavigationToolbar
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
-from hexrd.ui.utils.dialog import add_help_url
+from hexrdgui.navigation_toolbar import NavigationToolbar
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
+from hexrdgui.utils.dialog import add_help_url
 
 
 class ViewSpotsDialog:
@@ -322,7 +322,7 @@ def _find_data(all_spots, grain_id, det_key, gvec_id, peak_id):
     import pickle
     import sys
 
-    from PySide2.QtWidgets import QApplication
+    from PySide6.QtWidgets import QApplication
 
     if len(sys.argv) < 2:
         sys.exit('Usage: <script> <spots.pkl>')
@@ -339,4 +339,4 @@ def _find_data(all_spots, grain_id, det_key, gvec_id, peak_id):
 
     dialog.ui.finished.connect(app.quit)
     dialog.ui.show()
-    app.exec_()
+    app.exec()
diff --git a/hexrd/ui/input_dialog.py b/hexrdgui/input_dialog.py
similarity index 91%
rename from hexrd/ui/input_dialog.py
rename to hexrdgui/input_dialog.py
index cf8ce4dbf..ea21c028a 100644
--- a/hexrd/ui/input_dialog.py
+++ b/hexrdgui/input_dialog.py
@@ -1,8 +1,8 @@
-from PySide2.QtWidgets import (
+from PySide6.QtWidgets import (
     QComboBox, QDialog, QDialogButtonBox, QLabel, QVBoxLayout
 )
 
-from hexrd.ui.utils.dialog import add_help_url
+from hexrdgui.utils.dialog import add_help_url
 
 
 class InputDialog(QDialog):
@@ -35,7 +35,7 @@ def getItem(cls, parent, title, label, items, current=0, editable=True,
         if help_url:
             add_help_url(button_box, help_url)
 
-        if not dialog.exec_():
+        if not dialog.exec():
             return None, False
 
         name = combo_box.currentText()
diff --git a/hexrd/ui/instrument_form_view_widget.py b/hexrdgui/instrument_form_view_widget.py
similarity index 98%
rename from hexrd/ui/instrument_form_view_widget.py
rename to hexrdgui/instrument_form_view_widget.py
index f7c6dd39d..af085053e 100644
--- a/hexrd/ui/instrument_form_view_widget.py
+++ b/hexrdgui/instrument_form_view_widget.py
@@ -1,6 +1,6 @@
-from PySide2.QtCore import QObject, Qt, QTimer, Signal
-from PySide2.QtGui import QFocusEvent, QKeyEvent
-from PySide2.QtWidgets import (
+from PySide6.QtCore import QObject, Qt, QTimer, Signal
+from PySide6.QtGui import QFocusEvent, QKeyEvent
+from PySide6.QtWidgets import (
     QComboBox, QLineEdit, QMessageBox, QPushButton
 )
 
@@ -9,12 +9,12 @@
 from hexrd.instrument import calc_angles_from_beam_vec, calc_beam_vec
 from hexrd.transforms import xfcapi
 
-from hexrd.ui import constants
-from hexrd.ui.calibration.panel_buffer_dialog import PanelBufferDialog
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
-from hexrd.ui.xray_energy_selection_dialog import XRayEnergySelectionDialog
+from hexrdgui import constants
+from hexrdgui.calibration.panel_buffer_dialog import PanelBufferDialog
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
+from hexrdgui.xray_energy_selection_dialog import XRayEnergySelectionDialog
 
 
 class InstrumentFormViewWidget(QObject):
@@ -118,7 +118,7 @@ def on_energy_wavelength_changed(self):
 
     def open_xray_energies_dialog(self):
         dialog = XRayEnergySelectionDialog(self.ui)
-        if not dialog.exec_():
+        if not dialog.exec():
             return
 
         # The table has units in eV. Convert to keV.
diff --git a/hexrd/ui/interactive_template.py b/hexrdgui/interactive_template.py
similarity index 99%
rename from hexrd/ui/interactive_template.py
rename to hexrdgui/interactive_template.py
index 9b49d9665..9ea592a6a 100644
--- a/hexrd/ui/interactive_template.py
+++ b/hexrdgui/interactive_template.py
@@ -6,11 +6,11 @@
 
 from skimage.draw import polygon
 
-from hexrd.ui.constants import (
+from hexrdgui.constants import (
     KEY_ROTATE_ANGLE_FINE, KEY_TRANSLATE_DELTA, ViewType
 )
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.utils import has_nan
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.utils import has_nan
 
 
 class InteractiveTemplate:
diff --git a/hexrd/ui/laue_overlay_editor.py b/hexrdgui/laue_overlay_editor.py
similarity index 95%
rename from hexrd/ui/laue_overlay_editor.py
rename to hexrdgui/laue_overlay_editor.py
index 6e31a50a8..5ec575e5f 100644
--- a/hexrd/ui/laue_overlay_editor.py
+++ b/hexrdgui/laue_overlay_editor.py
@@ -1,15 +1,15 @@
 import copy
 import numpy as np
 
-from PySide2.QtWidgets import QCheckBox, QComboBox, QDoubleSpinBox
+from PySide6.QtWidgets import QCheckBox, QComboBox, QDoubleSpinBox
 
 from hexrd.rotations import angles_from_rmat_xyz, rotMatOfExpMap
 
-from hexrd.ui.calibration_crystal_editor import CalibrationCrystalEditor
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.overlays.laue_overlay import LaueLabelType, LaueRangeShape
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals, convert_angle_convention
+from hexrdgui.calibration_crystal_editor import CalibrationCrystalEditor
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.overlays.laue_overlay import LaueLabelType, LaueRangeShape
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals, convert_angle_convention
 
 
 class LaueOverlayEditor:
diff --git a/hexrd/ui/line_picker_dialog.py b/hexrdgui/line_picker_dialog.py
similarity index 98%
rename from hexrd/ui/line_picker_dialog.py
rename to hexrdgui/line_picker_dialog.py
index b24e7a932..e955cdc3c 100644
--- a/hexrd/ui/line_picker_dialog.py
+++ b/hexrdgui/line_picker_dialog.py
@@ -1,4 +1,4 @@
-from PySide2.QtCore import Qt, QObject, Signal
+from PySide6.QtCore import Qt, QObject, Signal
 
 from itertools import cycle
 
@@ -6,10 +6,10 @@
 
 import matplotlib.pyplot as plt
 
-from hexrd.ui.constants import ViewType
-from hexrd.ui.markers import igor_marker
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.zoom_canvas import ZoomCanvas
+from hexrdgui.constants import ViewType
+from hexrdgui.markers import igor_marker
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.zoom_canvas import ZoomCanvas
 
 
 class LinePickerDialog(QObject):
diff --git a/hexrd/ui/list_editor.py b/hexrdgui/list_editor.py
similarity index 96%
rename from hexrd/ui/list_editor.py
rename to hexrdgui/list_editor.py
index f746c6e05..4659d0f9a 100644
--- a/hexrd/ui/list_editor.py
+++ b/hexrdgui/list_editor.py
@@ -1,8 +1,8 @@
-from PySide2.QtCore import QItemSelectionModel, QObject, Signal
-from PySide2.QtWidgets import QDialog, QTableWidgetItem, QVBoxLayout
+from PySide6.QtCore import QItemSelectionModel, QObject, Signal
+from PySide6.QtWidgets import QDialog, QTableWidgetItem, QVBoxLayout
 
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals, unique_name
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals, unique_name
 
 
 class ListEditor(QObject):
@@ -226,7 +226,7 @@ def items(self):
 if __name__ == '__main__':
     import sys
 
-    from PySide2.QtWidgets import QApplication
+    from PySide6.QtWidgets import QApplication
 
     app = QApplication(sys.argv)
 
@@ -263,4 +263,4 @@ def item_renamed(old_name, new_name):
     dialog.finished.connect(dialog_finished)
     dialog.finished.connect(app.quit)
     dialog.show()
-    app.exec_()
+    app.exec()
diff --git a/hexrd/ui/llnl_import_tool_dialog.py b/hexrdgui/llnl_import_tool_dialog.py
similarity index 96%
rename from hexrd/ui/llnl_import_tool_dialog.py
rename to hexrdgui/llnl_import_tool_dialog.py
index a04abe92b..1b0a67ba9 100644
--- a/hexrd/ui/llnl_import_tool_dialog.py
+++ b/hexrdgui/llnl_import_tool_dialog.py
@@ -5,28 +5,28 @@
 import h5py
 from pathlib import Path
 
-from PySide2.QtCore import QObject, Signal, Qt
-from PySide2.QtWidgets import QColorDialog, QFileDialog, QMessageBox
-from PySide2.QtGui import QColor
+from PySide6.QtCore import QObject, Signal, Qt
+from PySide6.QtWidgets import QColorDialog, QFileDialog, QMessageBox
+from PySide6.QtGui import QColor
 
 from hexrd import resources as hexrd_resources
 from hexrd.instrument import HEDMInstrument
 from hexrd.rotations import (
     angleAxisOfRotMat, make_rmat_euler, angles_from_rmat_zxz)
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.image_file_manager import ImageFileManager
-from hexrd.ui.image_load_manager import ImageLoadManager
-from hexrd.ui.interactive_template import InteractiveTemplate
-from hexrd.ui import resource_loader
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.constants import (
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.image_file_manager import ImageFileManager
+from hexrdgui.image_load_manager import ImageLoadManager
+from hexrdgui.interactive_template import InteractiveTemplate
+from hexrdgui import resource_loader
+from hexrdgui.create_hedm_instrument import create_hedm_instrument
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.constants import (
     UI_TRANS_INDEX_ROTATE_90, YAML_EXTS, LLNLTransform, ViewType)
-import hexrd.ui.resources.calibration
+import hexrdgui.resources.calibration
 
-from hexrd.ui.utils import instr_to_internal_dict, block_signals
-from hexrd.ui.utils.dialog import add_help_url
+from hexrdgui.utils import instr_to_internal_dict, block_signals
+from hexrdgui.utils.dialog import add_help_url
 
 
 class LLNLImportToolDialog(QObject):
@@ -191,7 +191,7 @@ def load_instrument_config(self):
         HexrdConfig().save_instrument_config(self.config_file)
         fname = f'default_{self.instrument.lower()}_config.yml'
         with resource_loader.resource_path(
-                hexrd.ui.resources.calibration, fname) as f:
+                hexrdgui.resources.calibration, fname) as f:
             for overlay in HexrdConfig().overlays:
                 overlay.visible = False
             HexrdConfig().load_instrument_config(f, import_raw=True)
@@ -369,7 +369,7 @@ def pick_line_color(self):
         color = sender.text()
 
         dialog = QColorDialog(QColor(color), self.ui)
-        if dialog.exec_():
+        if dialog.exec():
             sender.setText(dialog.selectedColor().name())
             lc = self.ui.line_color
             lc.setStyleSheet('QPushButton {background-color: %s}' % lc.text())
diff --git a/hexrd/ui/load_hdf5_dialog.py b/hexrdgui/load_hdf5_dialog.py
similarity index 93%
rename from hexrd/ui/load_hdf5_dialog.py
rename to hexrdgui/load_hdf5_dialog.py
index 31445f87d..f508e06c7 100644
--- a/hexrd/ui/load_hdf5_dialog.py
+++ b/hexrdgui/load_hdf5_dialog.py
@@ -1,9 +1,9 @@
 import h5py
 import os
 
-from PySide2.QtWidgets import QDialog, QListWidgetItem, QMessageBox
+from PySide6.QtWidgets import QDialog, QListWidgetItem, QMessageBox
 
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.ui_loader import UiLoader
 
 class LoadHDF5Dialog:
 
diff --git a/hexrd/ui/load_images_dialog.py b/hexrdgui/load_images_dialog.py
similarity index 96%
rename from hexrd/ui/load_images_dialog.py
rename to hexrdgui/load_images_dialog.py
index b07fe4275..8b1d173f5 100644
--- a/hexrd/ui/load_images_dialog.py
+++ b/hexrdgui/load_images_dialog.py
@@ -2,10 +2,10 @@
 import re
 import os
 
-from PySide2.QtWidgets import QMessageBox, QTableWidgetItem, QComboBox
+from PySide6.QtWidgets import QMessageBox, QTableWidgetItem, QComboBox
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
 
 
 class LoadImagesDialog:
@@ -39,10 +39,10 @@ def setup_connections(self):
         self.ui.regex_line_edit.textChanged.connect(self.update_combo_state)
         self.ui.regex_line_edit.textChanged.connect(self.update_table)
 
-    def exec_(self):
+    def exec(self):
         # Loop until canceled or validation succeeds
         while True:
-            if self.ui.exec_():
+            if self.ui.exec():
                 # Perform some validation before returning
                 detectors, image_files = self.results()
                 if Counter(detectors) != Counter(self.detectors):
diff --git a/hexrd/ui/main.py b/hexrdgui/main.py
similarity index 76%
rename from hexrd/ui/main.py
rename to hexrdgui/main.py
index c25c533fd..75d54d3cd 100644
--- a/hexrd/ui/main.py
+++ b/hexrdgui/main.py
@@ -1,15 +1,15 @@
 import signal
 import sys
 
-from PySide2.QtCore import QCoreApplication, Qt
-from PySide2.QtGui import QIcon, QPixmap
-from PySide2.QtWidgets import QApplication
+from PySide6.QtCore import QCoreApplication, Qt
+from PySide6.QtGui import QIcon, QPixmap
+from PySide6.QtWidgets import QApplication
 
-from hexrd.ui import resource_loader
-from hexrd.ui.argument_parser import ArgumentParser
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.main_window import MainWindow
-import hexrd.ui.resources.icons
+from hexrdgui import resource_loader
+from hexrdgui.argument_parser import ArgumentParser
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.main_window import MainWindow
+import hexrdgui.resources.icons
 
 
 def main():
@@ -31,7 +31,7 @@ def main():
     # Apply parsed arguments to the HexrdConfig() object
     apply_parsed_args_to_hexrd_config(parsed_args)
 
-    data = resource_loader.load_resource(hexrd.ui.resources.icons,
+    data = resource_loader.load_resource(hexrdgui.resources.icons,
                                          'hexrd.ico', binary=True)
     pixmap = QPixmap()
     pixmap.loadFromData(data, 'ico')
@@ -46,7 +46,7 @@ def main():
         # Load the entrypoint file
         window.load_entrypoint_file(parsed_args.state_file)
 
-    sys.exit(app.exec_())
+    sys.exit(app.exec())
 
 
 def apply_parsed_args_to_hexrd_config(parsed_args):
diff --git a/hexrd/ui/main_window.py b/hexrdgui/main_window.py
similarity index 94%
rename from hexrd/ui/main_window.py
rename to hexrdgui/main_window.py
index 3e5a81dad..1174aa662 100644
--- a/hexrd/ui/main_window.py
+++ b/hexrdgui/main_window.py
@@ -4,78 +4,78 @@
 import tempfile
 
 import h5py
-from hexrd.ui.edit_colormap_list_dialog import EditColormapListDialog
+from hexrdgui.edit_colormap_list_dialog import EditColormapListDialog
 import numpy as np
 from skimage import measure
 
-from PySide2.QtCore import (
+from PySide6.QtCore import (
     QEvent, QObject, Qt, QThreadPool, Signal, QTimer, QUrl
 )
-from PySide2.QtGui import QDesktopServices
-from PySide2.QtWidgets import (
+from PySide6.QtGui import QDesktopServices
+from PySide6.QtWidgets import (
     QApplication, QDockWidget, QFileDialog, QMainWindow, QMessageBox
 )
 
-from hexrd.ui.about_dialog import AboutDialog
-from hexrd.ui.async_runner import AsyncRunner
-from hexrd.ui.beam_marker_style_editor import BeamMarkerStyleEditor
-from hexrd.ui.calibration_slider_widget import CalibrationSliderWidget
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui.color_map_editor import ColorMapEditor
-from hexrd.ui.config_dialog import ConfigDialog
-from hexrd.ui.progress_dialog import ProgressDialog
-from hexrd.ui.cal_tree_view import CalTreeView
-from hexrd.ui.hand_drawn_mask_dialog import HandDrawnMaskDialog
-from hexrd.ui.image_stack_dialog import ImageStackDialog
-from hexrd.ui.indexing.run import FitGrainsRunner, IndexingRunner
-from hexrd.ui.indexing.fit_grains_results_dialog import FitGrainsResultsDialog
-from hexrd.ui.input_dialog import InputDialog
-from hexrd.ui.instrument_form_view_widget import InstrumentFormViewWidget
-from hexrd.ui.calibration.calibration_runner import CalibrationRunner
-from hexrd.ui.calibration.auto.powder_runner import PowderRunner
-from hexrd.ui.calibration.hedm.calibration_runner import HEDMCalibrationRunner
-from hexrd.ui.calibration.hkl_picks_tree_view_dialog import (
+from hexrdgui.about_dialog import AboutDialog
+from hexrdgui.async_runner import AsyncRunner
+from hexrdgui.beam_marker_style_editor import BeamMarkerStyleEditor
+from hexrdgui.calibration_slider_widget import CalibrationSliderWidget
+from hexrdgui.create_hedm_instrument import create_hedm_instrument
+from hexrdgui.color_map_editor import ColorMapEditor
+from hexrdgui.config_dialog import ConfigDialog
+from hexrdgui.progress_dialog import ProgressDialog
+from hexrdgui.cal_tree_view import CalTreeView
+from hexrdgui.hand_drawn_mask_dialog import HandDrawnMaskDialog
+from hexrdgui.image_stack_dialog import ImageStackDialog
+from hexrdgui.indexing.run import FitGrainsRunner, IndexingRunner
+from hexrdgui.indexing.fit_grains_results_dialog import FitGrainsResultsDialog
+from hexrdgui.input_dialog import InputDialog
+from hexrdgui.instrument_form_view_widget import InstrumentFormViewWidget
+from hexrdgui.calibration.calibration_runner import CalibrationRunner
+from hexrdgui.calibration.auto.powder_runner import PowderRunner
+from hexrdgui.calibration.hedm.calibration_runner import HEDMCalibrationRunner
+from hexrdgui.calibration.hkl_picks_tree_view_dialog import (
     HKLPicksTreeViewDialog, overlays_to_tree_format, tree_format_to_picks,
 )
-from hexrd.ui.calibration.structureless import StructurelessCalibrationRunner
-from hexrd.ui.calibration.wppf_runner import WppfRunner
-from hexrd.ui.create_polar_mask import (
+from hexrdgui.calibration.structureless import StructurelessCalibrationRunner
+from hexrdgui.calibration.wppf_runner import WppfRunner
+from hexrdgui.create_polar_mask import (
     create_polar_mask_from_raw, rebuild_polar_masks
 )
-from hexrd.ui.create_raw_mask import (
+from hexrdgui.create_raw_mask import (
     convert_polar_to_raw, create_raw_mask, rebuild_raw_masks)
-from hexrd.ui.constants import ViewType, DOCUMENTATION_URL
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.image_calculator_dialog import ImageCalculatorDialog
-from hexrd.ui.image_file_manager import ImageFileManager
-from hexrd.ui.image_load_manager import ImageLoadManager
-from hexrd.ui.llnl_import_tool_dialog import LLNLImportToolDialog
-from hexrd.ui.load_images_dialog import LoadImagesDialog
-from hexrd.ui.simple_image_series_dialog import SimpleImageSeriesDialog
-from hexrd.ui.pinhole_mask_dialog import PinholeMaskDialog
-from hexrd.ui.pinhole_panel_buffer import generate_pinhole_panel_buffer
-from hexrd.ui.polarization_options_dialog import (
+from hexrdgui.constants import ViewType, DOCUMENTATION_URL
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.image_calculator_dialog import ImageCalculatorDialog
+from hexrdgui.image_file_manager import ImageFileManager
+from hexrdgui.image_load_manager import ImageLoadManager
+from hexrdgui.llnl_import_tool_dialog import LLNLImportToolDialog
+from hexrdgui.load_images_dialog import LoadImagesDialog
+from hexrdgui.simple_image_series_dialog import SimpleImageSeriesDialog
+from hexrdgui.pinhole_mask_dialog import PinholeMaskDialog
+from hexrdgui.pinhole_panel_buffer import generate_pinhole_panel_buffer
+from hexrdgui.polarization_options_dialog import (
     PolarizationOptionsDialog
 )
-from hexrd.ui.mask_manager_dialog import MaskManagerDialog
-from hexrd.ui.mask_regions_dialog import MaskRegionsDialog
-from hexrd.ui.materials_panel import MaterialsPanel
-from hexrd.ui.messages_widget import MessagesWidget
-from hexrd.ui.refinements_editor import RefinementsEditor
-from hexrd.ui.save_images_dialog import SaveImagesDialog
-from hexrd.ui.threshold_mask_dialog import ThresholdMaskDialog
-from hexrd.ui.transform_dialog import TransformDialog
-from hexrd.ui.indexing.indexing_tree_view_dialog import IndexingTreeViewDialog
-from hexrd.ui.indexing.fit_grains_tree_view_dialog import (
+from hexrdgui.mask_manager_dialog import MaskManagerDialog
+from hexrdgui.mask_regions_dialog import MaskRegionsDialog
+from hexrdgui.materials_panel import MaterialsPanel
+from hexrdgui.messages_widget import MessagesWidget
+from hexrdgui.refinements_editor import RefinementsEditor
+from hexrdgui.save_images_dialog import SaveImagesDialog
+from hexrdgui.threshold_mask_dialog import ThresholdMaskDialog
+from hexrdgui.transform_dialog import TransformDialog
+from hexrdgui.indexing.indexing_tree_view_dialog import IndexingTreeViewDialog
+from hexrdgui.indexing.fit_grains_tree_view_dialog import (
     FitGrainsTreeViewDialog
 )
-from hexrd.ui.image_mode_widget import ImageModeWidget
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals, unique_name
-from hexrd.ui.utils.dialog import add_help_url
-from hexrd.ui.zoom_canvas_dialog import ZoomCanvasDialog
-from hexrd.ui.rerun_clustering_dialog import RerunClusteringDialog
-from hexrd.ui import state
+from hexrdgui.image_mode_widget import ImageModeWidget
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals, unique_name
+from hexrdgui.utils.dialog import add_help_url
+from hexrdgui.zoom_canvas_dialog import ZoomCanvasDialog
+from hexrdgui.rerun_clustering_dialog import RerunClusteringDialog
+from hexrdgui import state
 
 
 class MainWindow(QObject):
@@ -96,7 +96,6 @@ def __init__(self, parent=None, image_files=None):
         self.ui = loader.load_file('main_window.ui', parent)
         self.confirm_application_close = True
 
-        self.thread_pool = QThreadPool(self)
         self.progress_dialog = ProgressDialog(self.ui)
         self.progress_dialog.setWindowTitle('Calibration Running')
 
@@ -518,7 +517,7 @@ def open_image_files(self):
 
             dialog = LoadImagesDialog(files, manual, self.ui)
 
-            if dialog.exec_():
+            if dialog.exec():
                 detector_names, image_files = dialog.results()
                 image_files = [img for f in files for img in f]
                 files = [[] for det in HexrdConfig().detector_names]
@@ -550,7 +549,7 @@ def on_action_save_imageseries_triggered(self):
             QMessageBox.warning(self.ui, 'HEXRD', msg)
             return
 
-        SaveImagesDialog(self.ui).exec_()
+        SaveImagesDialog(self.ui).exec()
 
     def on_action_save_materials_triggered(self):
         selected_file, selected_filter = QFileDialog.getSaveFileName(
@@ -670,7 +669,7 @@ def on_action_run_indexing_triggered(self):
         self._indexing_runner.run()
 
     def on_action_rerun_clustering(self):
-        RerunClusteringDialog(self._indexing_runner, self.ui).exec_()
+        RerunClusteringDialog(self._indexing_runner, self.ui).exec()
 
     def on_action_run_fit_grains_triggered(self):
         kwargs = {
@@ -908,7 +907,7 @@ def on_action_edit_reset_instrument_config(self):
 
     def edit_refinements(self):
         w = self._refinements_editor = RefinementsEditor(self.ui)
-        if not w.ui.exec_():
+        if not w.ui.exec():
             return
 
         # Update the UI in case settings have changed
@@ -1220,7 +1219,7 @@ def polar_mouse_info_labels(self, info):
         return labels
 
     def on_action_transform_detectors_triggered(self):
-        _ = TransformDialog(self.ui).exec_()
+        _ = TransformDialog(self.ui).exec()
 
     def open_image_calculator(self):
         if dialog := getattr(self, '_image_calculator_dialog', None):
@@ -1242,7 +1241,7 @@ def on_accepted():
         dialog.accepted.connect(on_accepted)
 
     def on_action_edit_config_triggered(self):
-        ConfigDialog(self.ui).exec_()
+        ConfigDialog(self.ui).exec()
 
     def update_enable_states(self):
         has_images = HexrdConfig().has_images
@@ -1474,7 +1473,7 @@ def apply_polarization_correction_toggled(self, b):
 
         # Get the user to first select the Lorentz polarization options
         d = PolarizationOptionsDialog(self.ui)
-        if not d.exec_():
+        if not d.exec():
             # Canceled... uncheck the action.
             action = self.ui.action_apply_polarization_correction
             action.setChecked(False)
@@ -1503,7 +1502,7 @@ def on_image_view_loaded(self, images):
 
     def on_action_about_triggered(self):
         dialog = AboutDialog(self.ui)
-        dialog.ui.exec_()
+        dialog.ui.exec()
 
     def on_action_documentation_triggered(self):
         QDesktopServices.openUrl(QUrl(DOCUMENTATION_URL))
@@ -1517,3 +1516,7 @@ def on_action_edit_defaults_toggled(self):
 
     def on_action_edit_apply_threshold_triggered(self):
         self.threshold_mask_dialog.show()
+
+    @property
+    def thread_pool(self):
+        return QThreadPool.globalInstance()
diff --git a/hexrd/ui/markers.py b/hexrdgui/markers.py
similarity index 100%
rename from hexrd/ui/markers.py
rename to hexrdgui/markers.py
diff --git a/hexrd/ui/mask_manager_dialog.py b/hexrdgui/mask_manager_dialog.py
similarity index 96%
rename from hexrd/ui/mask_manager_dialog.py
rename to hexrdgui/mask_manager_dialog.py
index 6052baee4..59a3ede20 100644
--- a/hexrd/ui/mask_manager_dialog.py
+++ b/hexrdgui/mask_manager_dialog.py
@@ -1,25 +1,25 @@
 import copy
 import math
-from hexrd.ui.create_polar_mask import rebuild_polar_masks
-from hexrd.ui.create_raw_mask import rebuild_raw_masks
+from hexrdgui.create_polar_mask import rebuild_polar_masks
+from hexrdgui.create_raw_mask import rebuild_raw_masks
 import os
 import numpy as np
 import h5py
 
-from PySide2.QtCore import QObject, Signal, Qt
-from PySide2.QtWidgets import (
+from PySide6.QtCore import QObject, Signal, Qt
+from PySide6.QtWidgets import (
     QCheckBox, QComboBox, QDialog, QDialogButtonBox, QFileDialog, QMenu,
     QMessageBox, QPushButton, QTableWidgetItem, QVBoxLayout
 )
-from PySide2.QtGui import QCursor
+from PySide6.QtGui import QCursor
 
 from hexrd.instrument import unwrap_dict_to_h5, unwrap_h5_to_dict
 from hexrd.utils.compatibility import h5py_read_string
 
-from hexrd.ui.utils import block_signals, unique_name
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.constants import ViewType
+from hexrdgui.utils import block_signals, unique_name
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.constants import ViewType
 
 import matplotlib.pyplot as plt
 
@@ -210,7 +210,7 @@ def context_menu_event(self, event):
         if index.row() >= 0:
             menu = QMenu(self.ui.masks_table)
             export = menu.addAction('Export Mask')
-            action = menu.exec_(QCursor.pos())
+            action = menu.exec(QCursor.pos())
             if action == export:
                 selection = self.ui.masks_table.item(index.row(), 0).text()
                 data = HexrdConfig().raw_mask_coords[selection]
@@ -354,7 +354,7 @@ def masks_to_panel_buffer(self):
             button_box.rejected.connect(dialog.reject)
             layout.addWidget(button_box)
 
-            if not dialog.exec_():
+            if not dialog.exec():
                 # canceled
                 return
 
diff --git a/hexrd/ui/mask_regions_dialog.py b/hexrdgui/mask_regions_dialog.py
similarity index 96%
rename from hexrd/ui/mask_regions_dialog.py
rename to hexrdgui/mask_regions_dialog.py
index 04ee239af..c1ced72ff 100644
--- a/hexrd/ui/mask_regions_dialog.py
+++ b/hexrdgui/mask_regions_dialog.py
@@ -1,13 +1,13 @@
-from PySide2.QtCore import QObject, Signal, Qt
-
-from hexrd.ui.create_raw_mask import convert_polar_to_raw, create_raw_mask
-from hexrd.ui.create_polar_mask import create_polar_mask_from_raw
-from hexrd.ui.interactive_template import InteractiveTemplate
-from hexrd.ui.utils import unique_name
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.constants import KEY_ROTATE_ANGLE_COARSE, ViewType
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import add_sample_points
+from PySide6.QtCore import QObject, Signal, Qt
+
+from hexrdgui.create_raw_mask import convert_polar_to_raw, create_raw_mask
+from hexrdgui.create_polar_mask import create_polar_mask_from_raw
+from hexrdgui.interactive_template import InteractiveTemplate
+from hexrdgui.utils import unique_name
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.constants import KEY_ROTATE_ANGLE_COARSE, ViewType
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import add_sample_points
 
 from matplotlib import patches
 
diff --git a/hexrd/ui/material_editor_widget.py b/hexrdgui/material_editor_widget.py
similarity index 98%
rename from hexrd/ui/material_editor_widget.py
rename to hexrdgui/material_editor_widget.py
index 74c89872f..ce056c184 100644
--- a/hexrd/ui/material_editor_widget.py
+++ b/hexrdgui/material_editor_widget.py
@@ -1,14 +1,14 @@
-from PySide2.QtCore import Signal, QObject
-from PySide2.QtWidgets import QMessageBox
+from PySide6.QtCore import Signal, QObject
+from PySide6.QtWidgets import QMessageBox
 
 import numpy as np
 
 from hexrd import spacegroup
 from hexrd.material import _angstroms
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals, set_combobox_enabled_items
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals, set_combobox_enabled_items
 
 
 class MaterialEditorWidget(QObject):
diff --git a/hexrd/ui/material_list_editor.py b/hexrdgui/material_list_editor.py
similarity index 92%
rename from hexrd/ui/material_list_editor.py
rename to hexrdgui/material_list_editor.py
index b3dc85119..82219c039 100644
--- a/hexrd/ui/material_list_editor.py
+++ b/hexrdgui/material_list_editor.py
@@ -1,12 +1,12 @@
 from pathlib import Path
 
-from PySide2.QtWidgets import QFileDialog, QInputDialog, QMessageBox
+from PySide6.QtWidgets import QFileDialog, QInputDialog, QMessageBox
 
 from hexrd.material import Material
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.list_editor import ListEditor
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.list_editor import ListEditor
+from hexrdgui.ui_loader import UiLoader
 
 
 class MaterialListEditor:
@@ -105,7 +105,7 @@ def import_from_defaults(self):
 if __name__ == '__main__':
     import sys
 
-    from PySide2.QtWidgets import QApplication
+    from PySide6.QtWidgets import QApplication
 
     app = QApplication(sys.argv)
 
@@ -113,4 +113,4 @@ def import_from_defaults(self):
 
     dialog.ui.finished.connect(app.quit)
     dialog.ui.show()
-    app.exec_()
+    app.exec()
diff --git a/hexrd/ui/material_properties_editor.py b/hexrdgui/material_properties_editor.py
similarity index 93%
rename from hexrd/ui/material_properties_editor.py
rename to hexrdgui/material_properties_editor.py
index 1dad39dc2..90bfcc977 100644
--- a/hexrd/ui/material_properties_editor.py
+++ b/hexrdgui/material_properties_editor.py
@@ -4,10 +4,10 @@
 
 from hexrd.unitcell import _StiffnessDict
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.matrix_editor import MatrixEditor
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import apply_symmetric_constraint, block_signals, compose
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.matrix_editor import MatrixEditor
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import apply_symmetric_constraint, block_signals, compose
 
 
 class MaterialPropertiesEditor:
@@ -42,8 +42,8 @@ def material(self):
     @property
     def elastic_tensor_type(self):
         type_map = {
-            'Stiffness': 'stiffness',
-            'Compliance': 'compliance',
+            'Stiffness (GPa)': 'stiffness',
+            'Compliance (TPa⁻¹)': 'compliance',
         }
         return type_map[self.ui.elastic_tensor_type.currentText()]
 
diff --git a/hexrd/ui/material_site_editor.py b/hexrdgui/material_site_editor.py
similarity index 97%
rename from hexrd/ui/material_site_editor.py
rename to hexrdgui/material_site_editor.py
index 20dfa4494..2f46f7887 100644
--- a/hexrd/ui/material_site_editor.py
+++ b/hexrdgui/material_site_editor.py
@@ -2,19 +2,19 @@
 
 import numpy as np
 
-from PySide2.QtCore import QItemSelectionModel, QObject, Signal
-from PySide2.QtWidgets import (
+from PySide6.QtCore import QItemSelectionModel, QObject, Signal
+from PySide6.QtWidgets import (
     QComboBox, QLineEdit, QSizePolicy, QTableWidgetItem
 )
 
 from hexrd.constants import chargestate
 from hexrd.material import Material
 
-from hexrd.ui.periodic_table_dialog import PeriodicTableDialog
-from hexrd.ui.scientificspinbox import ScientificDoubleSpinBox
-from hexrd.ui.thermal_factor_editor import ThermalFactorEditor
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
+from hexrdgui.periodic_table_dialog import PeriodicTableDialog
+from hexrdgui.scientificspinbox import ScientificDoubleSpinBox
+from hexrdgui.thermal_factor_editor import ThermalFactorEditor
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
 
 
 COLUMNS = {
@@ -70,7 +70,7 @@ def setup_connections(self):
 
     def select_atom_types(self):
         dialog = PeriodicTableDialog(self.atom_types, self.ui)
-        if not dialog.exec_():
+        if not dialog.exec():
             return
 
         self.atom_types = dialog.selected_atoms
@@ -452,7 +452,7 @@ def textFromValue(self, value):
 
     def open_editor(self):
         original = copy.deepcopy(self.editor.value)
-        if not self.editor.exec_():
+        if not self.editor.exec():
             self.editor.value = original
             return
 
diff --git a/hexrd/ui/material_structure_editor.py b/hexrdgui/material_structure_editor.py
similarity index 97%
rename from hexrd/ui/material_structure_editor.py
rename to hexrdgui/material_structure_editor.py
index b99b2e1bb..460586cd8 100644
--- a/hexrd/ui/material_structure_editor.py
+++ b/hexrdgui/material_structure_editor.py
@@ -3,17 +3,17 @@
 
 import numpy as np
 
-from PySide2.QtCore import Qt, QItemSelectionModel, QObject, Signal
-from PySide2.QtWidgets import (
+from PySide6.QtCore import Qt, QItemSelectionModel, QObject, Signal
+from PySide6.QtWidgets import (
     QLineEdit, QItemEditorFactory, QStyledItemDelegate, QTableWidgetItem
 )
 
 from hexrd.constants import ptable, ptableinverse
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.material_site_editor import MaterialSiteEditor
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.material_site_editor import MaterialSiteEditor
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
 
 
 DEFAULT_SITE = {
diff --git a/hexrd/ui/materials_panel.py b/hexrdgui/materials_panel.py
similarity index 94%
rename from hexrd/ui/materials_panel.py
rename to hexrdgui/materials_panel.py
index e524f1815..63b1f6aca 100644
--- a/hexrd/ui/materials_panel.py
+++ b/hexrdgui/materials_panel.py
@@ -1,21 +1,21 @@
 import math
 
-from PySide2.QtCore import QObject, Qt
-from PySide2.QtGui import QFocusEvent, QKeyEvent
-from PySide2.QtWidgets import QComboBox
+from PySide6.QtCore import QObject, Qt
+from PySide6.QtGui import QFocusEvent, QKeyEvent
+from PySide6.QtWidgets import QComboBox
 
 from hexrd.material import _angstroms
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.reflections_table import ReflectionsTable
-from hexrd.ui.material_editor_widget import MaterialEditorWidget
-from hexrd.ui.material_list_editor import MaterialListEditor
-from hexrd.ui.material_properties_editor import MaterialPropertiesEditor
-from hexrd.ui.material_structure_editor import MaterialStructureEditor
-from hexrd.ui.overlay_manager import OverlayManager
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
-from hexrd.ui.utils.dialog import add_help_url
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.reflections_table import ReflectionsTable
+from hexrdgui.material_editor_widget import MaterialEditorWidget
+from hexrdgui.material_list_editor import MaterialListEditor
+from hexrdgui.material_properties_editor import MaterialPropertiesEditor
+from hexrdgui.material_structure_editor import MaterialStructureEditor
+from hexrdgui.overlay_manager import OverlayManager
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
+from hexrdgui.utils.dialog import add_help_url
 
 
 class MaterialsPanel(QObject):
diff --git a/hexrd/ui/matrix_editor.py b/hexrdgui/matrix_editor.py
similarity index 96%
rename from hexrd/ui/matrix_editor.py
rename to hexrdgui/matrix_editor.py
index e79c53f80..bdbccb089 100644
--- a/hexrd/ui/matrix_editor.py
+++ b/hexrdgui/matrix_editor.py
@@ -1,10 +1,10 @@
 import numpy as np
 
-from PySide2.QtCore import Signal
-from PySide2.QtWidgets import QGridLayout, QWidget
+from PySide6.QtCore import Signal
+from PySide6.QtWidgets import QGridLayout, QWidget
 
-from hexrd.ui.scientificspinbox import ScientificDoubleSpinBox
-from hexrd.ui.utils import block_signals
+from hexrdgui.scientificspinbox import ScientificDoubleSpinBox
+from hexrdgui.utils import block_signals
 
 DEFAULT_ENABLED_STYLE_SHEET = 'background-color: white'
 DEFAULT_DISABLED_STYLE_SHEET = 'background-color: #F0F0F0'
@@ -211,7 +211,7 @@ def apply_constraints(self):
 if __name__ == '__main__':
     import sys
 
-    from PySide2.QtWidgets import QApplication, QDialog, QVBoxLayout
+    from PySide6.QtWidgets import QApplication, QDialog, QVBoxLayout
 
     if len(sys.argv) < 2:
         sys.exit('Usage: <script> <matrix_size>')
@@ -240,4 +240,4 @@ def on_data_modified():
     dialog.finished.connect(app.quit)
     dialog.show()
 
-    app.exec_()
+    app.exec()
diff --git a/hexrd/ui/message_box.py b/hexrdgui/message_box.py
similarity index 92%
rename from hexrd/ui/message_box.py
rename to hexrdgui/message_box.py
index b0dc3e7f6..8fac1db9f 100644
--- a/hexrd/ui/message_box.py
+++ b/hexrdgui/message_box.py
@@ -1,6 +1,6 @@
-from PySide2.QtCore import Qt
+from PySide6.QtCore import Qt
 
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.ui_loader import UiLoader
 
 
 class MessageBox:
@@ -15,8 +15,8 @@ def __init__(self, title, message, details='', parent=None):
         self.message = message
         self.details = details
 
-    def exec_(self):
-        return self.ui.exec_()
+    def exec(self):
+        return self.ui.exec()
 
     def show(self):
         return self.ui.show()
@@ -59,7 +59,7 @@ def align_details_hcenter(self):
 if __name__ == '__main__':
     import sys
 
-    from PySide2.QtWidgets import QApplication
+    from PySide6.QtWidgets import QApplication
 
     app = QApplication(sys.argv)
 
@@ -86,4 +86,4 @@ def align_details_hcenter(self):
     dialog = MessageBox(**kwargs)
     dialog.align_details_hcenter()
     dialog.ui.show()
-    app.exec_()
+    app.exec()
diff --git a/hexrd/ui/messages_widget.py b/hexrdgui/messages_widget.py
similarity index 96%
rename from hexrd/ui/messages_widget.py
rename to hexrdgui/messages_widget.py
index d5eb8865e..34b61d421 100644
--- a/hexrd/ui/messages_widget.py
+++ b/hexrdgui/messages_widget.py
@@ -1,13 +1,13 @@
 from contextlib import contextmanager
 import sys
 
-from PySide2.QtCore import QObject, Qt, Signal
-from PySide2.QtGui import QColor, QTextCursor
-from PySide2.QtWidgets import QApplication
+from PySide6.QtCore import QObject, Qt, Signal
+from PySide6.QtGui import QColor, QTextCursor
+from PySide6.QtWidgets import QApplication
 
-from hexrd.ui.fix_pdb import fix_pdb
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.fix_pdb import fix_pdb
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
 
 
 STDOUT_COLOR = 'green'
diff --git a/hexrd/ui/navigation_toolbar.py b/hexrdgui/navigation_toolbar.py
similarity index 97%
rename from hexrd/ui/navigation_toolbar.py
rename to hexrdgui/navigation_toolbar.py
index 83b6a3984..f017b4d27 100644
--- a/hexrd/ui/navigation_toolbar.py
+++ b/hexrdgui/navigation_toolbar.py
@@ -1,7 +1,7 @@
 from matplotlib import rc_context
 from matplotlib.backends.backend_qt5agg import NavigationToolbar2QT
 
-from hexrd.ui.utils import wrap_with_callbacks
+from hexrdgui.utils import wrap_with_callbacks
 
 
 class NavigationToolbar(NavigationToolbar2QT):
diff --git a/hexrd/ui/overlay_editor.py b/hexrdgui/overlay_editor.py
similarity index 90%
rename from hexrd/ui/overlay_editor.py
rename to hexrdgui/overlay_editor.py
index 7b80d6508..f3939c725 100644
--- a/hexrd/ui/overlay_editor.py
+++ b/hexrdgui/overlay_editor.py
@@ -1,7 +1,7 @@
-from hexrd.ui.laue_overlay_editor import LaueOverlayEditor
-from hexrd.ui.powder_overlay_editor import PowderOverlayEditor
-from hexrd.ui.rotation_series_overlay_editor import RotationSeriesOverlayEditor
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.laue_overlay_editor import LaueOverlayEditor
+from hexrdgui.powder_overlay_editor import PowderOverlayEditor
+from hexrdgui.rotation_series_overlay_editor import RotationSeriesOverlayEditor
+from hexrdgui.ui_loader import UiLoader
 
 
 class OverlayEditor:
diff --git a/hexrd/ui/overlay_manager.py b/hexrdgui/overlay_manager.py
similarity index 95%
rename from hexrd/ui/overlay_manager.py
rename to hexrdgui/overlay_manager.py
index 254c8dce0..5679fdf95 100644
--- a/hexrd/ui/overlay_manager.py
+++ b/hexrdgui/overlay_manager.py
@@ -1,16 +1,16 @@
-from PySide2.QtCore import Qt, QItemSelectionModel
-from PySide2.QtWidgets import (
+from PySide6.QtCore import Qt, QItemSelectionModel
+from PySide6.QtWidgets import (
     QCheckBox, QComboBox, QHBoxLayout, QHeaderView, QSizePolicy,
     QTableWidgetItem, QWidget
 )
 
-from hexrd.ui.constants import OverlayType
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.overlay_editor import OverlayEditor
-from hexrd.ui.overlay_style_picker import OverlayStylePicker
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
-from hexrd.ui.utils.dialog import add_help_url
+from hexrdgui.constants import OverlayType
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.overlay_editor import OverlayEditor
+from hexrdgui.overlay_style_picker import OverlayStylePicker
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
+from hexrdgui.utils.dialog import add_help_url
 
 
 COLUMNS = {
@@ -292,4 +292,4 @@ def remove(self):
 
     def edit_style(self):
         self._style_picker = OverlayStylePicker(self.active_overlay, self.ui)
-        self._style_picker.exec_()
+        self._style_picker.exec()
diff --git a/hexrd/ui/overlay_style_picker.py b/hexrdgui/overlay_style_picker.py
similarity index 95%
rename from hexrd/ui/overlay_style_picker.py
rename to hexrdgui/overlay_style_picker.py
index bd6b20e39..307f9d1d3 100644
--- a/hexrd/ui/overlay_style_picker.py
+++ b/hexrdgui/overlay_style_picker.py
@@ -2,14 +2,14 @@
 
 from matplotlib.font_manager import weight_dict
 
-from PySide2.QtCore import QObject
-from PySide2.QtGui import QColor
-from PySide2.QtWidgets import QColorDialog
+from PySide6.QtCore import QObject
+from PySide6.QtGui import QColor
+from PySide6.QtWidgets import QColorDialog
 
-from hexrd.ui.constants import OverlayType
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
+from hexrdgui.constants import OverlayType
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
 
 
 class OverlayStylePicker(QObject):
@@ -31,9 +31,9 @@ def __init__(self, overlay, parent=None):
         self.setup_connections()
         self.update_gui()
 
-    def exec_(self):
+    def exec(self):
         self.ui.adjustSize()
-        return self.ui.exec_()
+        return self.ui.exec()
 
     def setup_connections(self):
         self.ui.data_color.pressed.connect(self.pick_color)
@@ -168,7 +168,7 @@ def pick_color(self):
         color = sender.text()
 
         dialog = QColorDialog(QColor(color), self.ui)
-        if dialog.exec_():
+        if dialog.exec():
             sender.setText(dialog.selectedColor().name())
             self.update_button_colors()
             self.update_config()
diff --git a/hexrd/ui/overlays/__init__.py b/hexrdgui/overlays/__init__.py
similarity index 95%
rename from hexrd/ui/overlays/__init__.py
rename to hexrdgui/overlays/__init__.py
index c1500f6e2..460ca8b2d 100644
--- a/hexrd/ui/overlays/__init__.py
+++ b/hexrdgui/overlays/__init__.py
@@ -1,4 +1,4 @@
-from hexrd.ui.constants import OverlayType
+from hexrdgui.constants import OverlayType
 
 from . import compatibility
 from .laue_overlay import LaueOverlay
@@ -38,7 +38,7 @@ def from_dict(d):
 
 
 def update_overlay_data(instr, display_mode):
-    from hexrd.ui.hexrd_config import HexrdConfig
+    from hexrdgui.hexrd_config import HexrdConfig
 
     def flag_update(overlay):
         overlay.instrument = instr
diff --git a/hexrd/ui/overlays/compatibility.py b/hexrdgui/overlays/compatibility.py
similarity index 100%
rename from hexrd/ui/overlays/compatibility.py
rename to hexrdgui/overlays/compatibility.py
diff --git a/hexrd/ui/overlays/constants.py b/hexrdgui/overlays/constants.py
similarity index 100%
rename from hexrd/ui/overlays/constants.py
rename to hexrdgui/overlays/constants.py
diff --git a/hexrd/ui/overlays/laue_overlay.py b/hexrdgui/overlays/laue_overlay.py
similarity index 97%
rename from hexrd/ui/overlays/laue_overlay.py
rename to hexrdgui/overlays/laue_overlay.py
index 46cd47428..8168ff909 100644
--- a/hexrd/ui/overlays/laue_overlay.py
+++ b/hexrdgui/overlays/laue_overlay.py
@@ -7,16 +7,16 @@
 from hexrd.transforms import xfcapi
 from hexrd.utils.decorators import numba_njit_if_available
 
-from hexrd.ui.constants import OverlayType, ViewType
-from hexrd.ui.overlays.constants import (
+from hexrdgui.constants import OverlayType, ViewType
+from hexrdgui.overlays.constants import (
     crystal_refinement_labels, default_crystal_params,
     default_crystal_refinements
 )
-from hexrd.ui.overlays.overlay import Overlay
-from hexrd.ui.utils.conversions import (
+from hexrdgui.overlays.overlay import Overlay
+from hexrdgui.utils.conversions import (
     angles_to_cart, angles_to_stereo, cart_to_angles
 )
-from hexrd.ui.utils.tth_distortion import apply_tth_distortion_if_needed
+from hexrdgui.utils.tth_distortion import apply_tth_distortion_if_needed
 
 
 class LaueOverlay(Overlay):
@@ -147,7 +147,7 @@ def has_picks_data(self):
     @property
     def calibration_picks_polar(self):
         # Convert from cartesian to polar
-        from hexrd.ui.hexrd_config import HexrdConfig
+        from hexrdgui.hexrd_config import HexrdConfig
 
         eta_period = HexrdConfig().polar_res_eta_period
 
@@ -177,7 +177,7 @@ def calibration_picks_polar(self, picks):
         self.calibration_picks = picks
 
     def generate_overlay(self):
-        from hexrd.ui.hexrd_config import HexrdConfig
+        from hexrdgui.hexrd_config import HexrdConfig
 
         instr = self.instrument
         display_mode = self.display_mode
@@ -356,7 +356,7 @@ def rectangular_range_data(self, spots, display_mode, panel):
         return results
 
     def ellipsoidal_range_data(self, spots, display_mode, panel):
-        from hexrd.ui.hexrd_config import HexrdConfig
+        from hexrdgui.hexrd_config import HexrdConfig
 
         num_points = 300
         a = self.tth_width / 2
diff --git a/hexrd/ui/overlays/overlay.py b/hexrdgui/overlays/overlay.py
similarity index 95%
rename from hexrd/ui/overlays/overlay.py
rename to hexrdgui/overlays/overlay.py
index daaceda6a..c173cd315 100644
--- a/hexrd/ui/overlays/overlay.py
+++ b/hexrdgui/overlays/overlay.py
@@ -3,8 +3,8 @@
 
 import numpy as np
 
-from hexrd.ui.constants import OverlayType, ViewType
-from hexrd.ui.utils import array_index_in_list
+from hexrdgui.constants import OverlayType, ViewType
+from hexrdgui.utils import array_index_in_list
 
 
 class Overlay(ABC):
@@ -110,7 +110,7 @@ def __init__(self, material_name, name=None, refinements=None,
         self.setup_connections()
 
     def setup_connections(self):
-        from hexrd.ui.image_load_manager import ImageLoadManager
+        from hexrdgui.image_load_manager import ImageLoadManager
 
         ImageLoadManager().new_images_loaded.connect(self.on_new_images_loaded)
 
@@ -142,7 +142,7 @@ def _non_unique_name(self):
         return f'{self.material_name} {self.type.value}'
 
     def _generate_unique_name(self):
-        from hexrd.ui.hexrd_config import HexrdConfig
+        from hexrdgui.hexrd_config import HexrdConfig
 
         name = self._non_unique_name
         index = 1
@@ -160,7 +160,7 @@ def _generate_unique_name(self):
 
     @staticmethod
     def from_name(name):
-        from hexrd.ui.hexrd_config import HexrdConfig
+        from hexrdgui.hexrd_config import HexrdConfig
 
         for overlay in HexrdConfig().overlays:
             if overlay.name == name:
@@ -188,7 +188,7 @@ def material_name(self, v):
 
     @property
     def material(self):
-        from hexrd.ui.hexrd_config import HexrdConfig
+        from hexrdgui.hexrd_config import HexrdConfig
         return HexrdConfig().material(self.material_name)
 
     @property
@@ -197,7 +197,7 @@ def plane_data(self):
 
     @property
     def eta_period(self):
-        from hexrd.ui.hexrd_config import HexrdConfig
+        from hexrdgui.hexrd_config import HexrdConfig
         return HexrdConfig().polar_res_eta_period
 
     @property
diff --git a/hexrd/ui/overlays/powder_overlay.py b/hexrdgui/overlays/powder_overlay.py
similarity index 98%
rename from hexrd/ui/overlays/powder_overlay.py
rename to hexrdgui/overlays/powder_overlay.py
index d455b5306..58fa3db14 100644
--- a/hexrd/ui/overlays/powder_overlay.py
+++ b/hexrdgui/overlays/powder_overlay.py
@@ -7,10 +7,10 @@
 
 from hexrd.transforms import xfcapi
 
-from hexrd.ui.constants import OverlayType, ViewType
-from hexrd.ui.overlays.overlay import Overlay
-from hexrd.ui.polar_distortion_object import PolarDistortionObject
-from hexrd.ui.utils.conversions import (
+from hexrdgui.constants import OverlayType, ViewType
+from hexrdgui.overlays.overlay import Overlay
+from hexrdgui.polar_distortion_object import PolarDistortionObject
+from hexrdgui.utils.conversions import (
     angles_to_cart, angles_to_stereo, cart_to_angles
 )
 
@@ -149,7 +149,7 @@ def has_picks_data(self):
     @property
     def calibration_picks_polar(self):
         # Convert from cartesian to polar
-        from hexrd.ui.hexrd_config import HexrdConfig
+        from hexrdgui.hexrd_config import HexrdConfig
 
         eta_period = HexrdConfig().polar_res_eta_period
 
@@ -237,7 +237,7 @@ def generate_overlay(self):
         return point_groups
 
     def generate_ring_points(self, instr, tths, etas, panel, display_mode):
-        from hexrd.ui.hexrd_config import HexrdConfig
+        from hexrdgui.hexrd_config import HexrdConfig
 
         ring_pts = []
         skipped_tth = []
diff --git a/hexrd/ui/overlays/rotation_series_overlay.py b/hexrdgui/overlays/rotation_series_overlay.py
similarity index 96%
rename from hexrd/ui/overlays/rotation_series_overlay.py
rename to hexrdgui/overlays/rotation_series_overlay.py
index c09601c53..b282488e2 100644
--- a/hexrd/ui/overlays/rotation_series_overlay.py
+++ b/hexrdgui/overlays/rotation_series_overlay.py
@@ -3,13 +3,13 @@
 from hexrd.findorientations import _process_omegas
 from hexrd.transforms.xfcapi import mapAngle
 
-from hexrd.ui.constants import OverlayType, ViewType
-from hexrd.ui.overlays.constants import (
+from hexrdgui.constants import OverlayType, ViewType
+from hexrdgui.overlays.constants import (
     crystal_refinement_labels, default_crystal_params,
     default_crystal_refinements,
 )
-from hexrd.ui.overlays.overlay import Overlay
-from hexrd.ui.utils.conversions import angles_to_stereo
+from hexrdgui.overlays.overlay import Overlay
+from hexrdgui.utils.conversions import angles_to_stereo
 
 
 class RotationSeriesOverlay(Overlay):
@@ -109,7 +109,7 @@ def ome_period(self, v):
 
     @property
     def aggregated(self):
-        from hexrd.ui.hexrd_config import HexrdConfig
+        from hexrdgui.hexrd_config import HexrdConfig
 
         # Even though we may have aggregated set to be True, do not
         # aggregate unless the conditions are right.
@@ -199,7 +199,7 @@ def generate_overlay(self):
             DESCRIPTION.
 
         """
-        from hexrd.ui.hexrd_config import HexrdConfig
+        from hexrdgui.hexrd_config import HexrdConfig
 
         instr = self.instrument
         display_mode = self.display_mode
@@ -285,7 +285,7 @@ def range_data(self, spots, display_mode, panel):
         return self.rectangular_range_data(spots, display_mode, panel)
 
     def rectangular_range_data(self, spots, display_mode, panel):
-        from hexrd.ui.hexrd_config import HexrdConfig
+        from hexrdgui.hexrd_config import HexrdConfig
 
         range_corners = self.range_corners(spots)
         if display_mode == ViewType.polar:
@@ -351,7 +351,7 @@ def on_new_images_loaded(self):
         self.sync_omegas()
 
     def sync_omegas(self):
-        from hexrd.ui.hexrd_config import HexrdConfig
+        from hexrdgui.hexrd_config import HexrdConfig
 
         ims_dict = HexrdConfig().omega_imageseries_dict
         if ims_dict is None:
diff --git a/hexrd/ui/periodic_table_dialog.py b/hexrdgui/periodic_table_dialog.py
similarity index 92%
rename from hexrd/ui/periodic_table_dialog.py
rename to hexrdgui/periodic_table_dialog.py
index aedc15b04..f03bebaca 100644
--- a/hexrd/ui/periodic_table_dialog.py
+++ b/hexrdgui/periodic_table_dialog.py
@@ -1,10 +1,10 @@
-from PySide2.QtWidgets import (
+from PySide6.QtWidgets import (
     QDialog, QDialogButtonBox, QMessageBox, QPushButton, QVBoxLayout
 )
 
 from silx.gui.widgets.PeriodicTable import PeriodicTable
 
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.ui_loader import UiLoader
 
 
 class PeriodicTableDialog(QDialog):
@@ -55,11 +55,11 @@ def clear_selection(self):
 
 
 if __name__ == '__main__':
-    from PySide2.QtWidgets import QApplication
+    from PySide6.QtWidgets import QApplication
 
     app = QApplication()
 
     dialog = PeriodicTableDialog(['H', 'Ni', 'Ta'])
-    dialog.exec_()
+    dialog.exec()
 
     print(f'{dialog.selected_atoms=}')
diff --git a/hexrd/ui/pinhole_correction_editor.py b/hexrdgui/pinhole_correction_editor.py
similarity index 97%
rename from hexrd/ui/pinhole_correction_editor.py
rename to hexrdgui/pinhole_correction_editor.py
index 62aea6cec..ad15c2d07 100644
--- a/hexrd/ui/pinhole_correction_editor.py
+++ b/hexrdgui/pinhole_correction_editor.py
@@ -1,8 +1,8 @@
 import h5py
 import numpy as np
 
-from PySide2.QtCore import QObject, QTimer, Signal
-from PySide2.QtWidgets import (
+from PySide6.QtCore import QObject, QTimer, Signal
+from PySide6.QtWidgets import (
     QCheckBox, QComboBox, QDoubleSpinBox, QMessageBox, QSpinBox
 )
 
@@ -11,15 +11,15 @@
     JHEPinholeDistortion, RyggPinholeDistortion, SampleLayerDistortion,
 )
 
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.pinhole_panel_buffer import generate_pinhole_panel_buffer
-from hexrd.ui.polar_distortion_object import PolarDistortionObject
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
+from hexrdgui.create_hedm_instrument import create_hedm_instrument
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.pinhole_panel_buffer import generate_pinhole_panel_buffer
+from hexrdgui.polar_distortion_object import PolarDistortionObject
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
 
-from hexrd.ui import resource_loader
-import hexrd.ui.resources.materials
+from hexrdgui import resource_loader
+import hexrdgui.resources.materials
 
 
 class PinholeCorrectionEditor(QObject):
@@ -350,7 +350,7 @@ def rygg_absorption_length(self, v):
         self.auto_select_rygg_absorption_length()
 
     def load_pinhole_materials(self):
-        module = hexrd.ui.resources.materials
+        module = hexrdgui.resources.materials
 
         # Use a high dmin since we do not care about the HKLs here.
         # We only care about the absorption length.
diff --git a/hexrd/ui/pinhole_mask_dialog.py b/hexrdgui/pinhole_mask_dialog.py
similarity index 89%
rename from hexrd/ui/pinhole_mask_dialog.py
rename to hexrdgui/pinhole_mask_dialog.py
index 209af722f..de1db184f 100644
--- a/hexrd/ui/pinhole_mask_dialog.py
+++ b/hexrdgui/pinhole_mask_dialog.py
@@ -1,8 +1,8 @@
-from PySide2.QtCore import QObject, Signal
-from PySide2.QtWidgets import QDialogButtonBox
+from PySide6.QtCore import QObject, Signal
+from PySide6.QtWidgets import QDialogButtonBox
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
 
 
 class PinholeMaskDialog(QObject):
diff --git a/hexrd/ui/pinhole_panel_buffer.py b/hexrdgui/pinhole_panel_buffer.py
similarity index 100%
rename from hexrd/ui/pinhole_panel_buffer.py
rename to hexrdgui/pinhole_panel_buffer.py
diff --git a/hexrd/ui/plot_grains.py b/hexrdgui/plot_grains.py
similarity index 76%
rename from hexrd/ui/plot_grains.py
rename to hexrdgui/plot_grains.py
index 4a5cfd625..b8268b368 100644
--- a/hexrd/ui/plot_grains.py
+++ b/hexrdgui/plot_grains.py
@@ -1,13 +1,13 @@
-from PySide2.QtWidgets import QFileDialog
+from PySide6.QtWidgets import QFileDialog
 
 from hexrd.xrdutil import EtaOmeMaps
 
-from hexrd.ui.hexrd_config import HexrdConfig
+from hexrdgui.hexrd_config import HexrdConfig
 
 
 def plot_grains(grains_table, ome_maps=None, parent=None):
     # Avoid a circular import
-    from hexrd.ui.indexing.indexing_results_dialog import IndexingResultsDialog
+    from hexrdgui.indexing.indexing_results_dialog import IndexingResultsDialog
 
     if ome_maps is None:
         selected_file, selected_filter = QFileDialog.getOpenFileName(
@@ -21,4 +21,4 @@ def plot_grains(grains_table, ome_maps=None, parent=None):
 
     dialog = IndexingResultsDialog(ome_maps, grains_table, parent)
     dialog.plot_grains_mode = True
-    dialog.exec_()
+    dialog.exec()
diff --git a/hexrd/ui/polar_distortion_object.py b/hexrdgui/polar_distortion_object.py
similarity index 100%
rename from hexrd/ui/polar_distortion_object.py
rename to hexrdgui/polar_distortion_object.py
diff --git a/hexrd/ui/polarization_options_dialog.py b/hexrdgui/polarization_options_dialog.py
similarity index 89%
rename from hexrd/ui/polarization_options_dialog.py
rename to hexrdgui/polarization_options_dialog.py
index 275710491..331f8848c 100644
--- a/hexrd/ui/polarization_options_dialog.py
+++ b/hexrdgui/polarization_options_dialog.py
@@ -1,6 +1,6 @@
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
 
 
 class PolarizationOptionsDialog:
@@ -18,8 +18,8 @@ def setup_connections(self):
         self.ui.horizontal.valueChanged.connect(self.horizontal_modified)
         self.ui.vertical.valueChanged.connect(self.vertical_modified)
 
-    def exec_(self):
-        return self.ui.exec_()
+    def exec(self):
+        return self.ui.exec()
 
     def accept(self):
         # When the dialog is accepted, save the settings in HexrdConfig.
diff --git a/hexrd/ui/powder_overlay_editor.py b/hexrdgui/powder_overlay_editor.py
similarity index 96%
rename from hexrd/ui/powder_overlay_editor.py
rename to hexrdgui/powder_overlay_editor.py
index 5ecd9ec89..8083b5984 100644
--- a/hexrd/ui/powder_overlay_editor.py
+++ b/hexrdgui/powder_overlay_editor.py
@@ -2,18 +2,18 @@
 
 import numpy as np
 
-from PySide2.QtWidgets import (
+from PySide6.QtWidgets import (
     QCheckBox, QComboBox, QDoubleSpinBox, QMessageBox, QSpinBox
 )
 
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.pinhole_correction_editor import PinholeCorrectionEditor
-from hexrd.ui.pinhole_panel_buffer import generate_pinhole_panel_buffer
-from hexrd.ui.reflections_table import ReflectionsTable
-from hexrd.ui.select_items_widget import SelectItemsWidget
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
+from hexrdgui.create_hedm_instrument import create_hedm_instrument
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.pinhole_correction_editor import PinholeCorrectionEditor
+from hexrdgui.pinhole_panel_buffer import generate_pinhole_panel_buffer
+from hexrdgui.reflections_table import ReflectionsTable
+from hexrdgui.select_items_widget import SelectItemsWidget
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
 
 
 class PowderOverlayEditor:
diff --git a/hexrd/ui/progress_dialog.py b/hexrdgui/progress_dialog.py
similarity index 91%
rename from hexrd/ui/progress_dialog.py
rename to hexrdgui/progress_dialog.py
index 5d6ab4b7a..e5b033054 100644
--- a/hexrd/ui/progress_dialog.py
+++ b/hexrdgui/progress_dialog.py
@@ -1,7 +1,7 @@
-from PySide2.QtCore import QEvent, QObject, QTimer, Qt, Signal
+from PySide6.QtCore import QEvent, QObject, QTimer, Qt, Signal
 
-from hexrd.ui.messages_widget import MessagesWidget
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.messages_widget import MessagesWidget
+from hexrdgui.ui_loader import UiLoader
 
 
 class ProgressDialog(QObject):
@@ -86,12 +86,12 @@ def reset_messages(self):
         # Shrink the dialog to the size of the contents
         self.shrink_later()
 
-    def exec_(self):
+    def exec(self):
         self.reset_messages()
-        self.ui.exec_()
+        self.ui.exec()
 
-    def exec_later(self):
-        QTimer.singleShot(0, lambda: self.exec_())
+    def execlater(self):
+        QTimer.singleShot(0, lambda: self.exec())
 
     @property
     def cancel_visible(self):
diff --git a/hexrd/ui/range_widget.py b/hexrdgui/range_widget.py
similarity index 95%
rename from hexrd/ui/range_widget.py
rename to hexrdgui/range_widget.py
index a0f6a1c5d..31c5824d0 100644
--- a/hexrd/ui/range_widget.py
+++ b/hexrdgui/range_widget.py
@@ -1,4 +1,4 @@
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.ui_loader import UiLoader
 
 
 class RangeWidget:
diff --git a/hexrd/ui/ranges_table_editor.py b/hexrdgui/ranges_table_editor.py
similarity index 95%
rename from hexrd/ui/ranges_table_editor.py
rename to hexrdgui/ranges_table_editor.py
index e7650fcc3..4258e243e 100644
--- a/hexrd/ui/ranges_table_editor.py
+++ b/hexrdgui/ranges_table_editor.py
@@ -1,12 +1,12 @@
 import copy
 import numpy as np
 
-from PySide2.QtCore import QItemSelectionModel, QObject, Signal
-from PySide2.QtWidgets import QSizePolicy
+from PySide6.QtCore import QItemSelectionModel, QObject, Signal
+from PySide6.QtWidgets import QSizePolicy
 
-from hexrd.ui.scientificspinbox import ScientificDoubleSpinBox
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
+from hexrdgui.scientificspinbox import ScientificDoubleSpinBox
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
 
 
 class RangesTableEditor(QObject):
diff --git a/hexrd/ui/refinements_editor.py b/hexrdgui/refinements_editor.py
similarity index 97%
rename from hexrd/ui/refinements_editor.py
rename to hexrdgui/refinements_editor.py
index 6d63fa74a..c06d52d0a 100644
--- a/hexrd/ui/refinements_editor.py
+++ b/hexrdgui/refinements_editor.py
@@ -2,12 +2,12 @@
 
 import numpy as np
 
-from hexrd.ui.constants import OverlayType
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.tree_views.multi_column_dict_tree_view import (
+from hexrdgui.constants import OverlayType
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.tree_views.multi_column_dict_tree_view import (
     MultiColumnDictTreeView)
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import convert_angle_convention
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import convert_angle_convention
 
 
 class RefinementsEditor:
diff --git a/hexrd/ui/reflections_selection_helper.py b/hexrdgui/reflections_selection_helper.py
similarity index 93%
rename from hexrd/ui/reflections_selection_helper.py
rename to hexrdgui/reflections_selection_helper.py
index 21f7c619f..c6c8ebf32 100644
--- a/hexrd/ui/reflections_selection_helper.py
+++ b/hexrdgui/reflections_selection_helper.py
@@ -1,7 +1,7 @@
-from PySide2.QtCore import QObject, Qt, Signal
-from PySide2.QtWidgets import QDialogButtonBox
+from PySide6.QtCore import QObject, Qt, Signal
+from PySide6.QtWidgets import QDialogButtonBox
 
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.ui_loader import UiLoader
 
 
 class ReflectionsSelectionHelper(QObject):
diff --git a/hexrd/ui/reflections_table.py b/hexrdgui/reflections_table.py
similarity index 97%
rename from hexrd/ui/reflections_table.py
rename to hexrdgui/reflections_table.py
index 1e303e287..6f1a40751 100644
--- a/hexrd/ui/reflections_table.py
+++ b/hexrdgui/reflections_table.py
@@ -3,16 +3,16 @@
 
 import numpy as np
 
-from PySide2.QtCore import Qt, QItemSelectionModel
-from PySide2.QtWidgets import QTableWidgetItem
+from PySide6.QtCore import Qt, QItemSelectionModel
+from PySide6.QtWidgets import QTableWidgetItem
 
 from hexrd.crystallography import hklToStr
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.reflections_selection_helper import ReflectionsSelectionHelper
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals, exclusions_off, tth_max_off
-from hexrd.ui.utils.dialog import add_help_url
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.reflections_selection_helper import ReflectionsSelectionHelper
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals, exclusions_off, tth_max_off
+from hexrdgui.utils.dialog import add_help_url
 
 
 class COLUMNS:
diff --git a/hexrd/ui/reorder_pairs_widget.py b/hexrdgui/reorder_pairs_widget.py
similarity index 93%
rename from hexrd/ui/reorder_pairs_widget.py
rename to hexrdgui/reorder_pairs_widget.py
index cd2ce5ed6..8aff40d48 100644
--- a/hexrd/ui/reorder_pairs_widget.py
+++ b/hexrdgui/reorder_pairs_widget.py
@@ -1,9 +1,9 @@
 import copy
 
-from PySide2.QtCore import QObject, Qt, Signal
-from PySide2.QtWidgets import QComboBox, QHBoxLayout, QSizePolicy, QWidget
+from PySide6.QtCore import QObject, Qt, Signal
+from PySide6.QtWidgets import QComboBox, QHBoxLayout, QSizePolicy, QWidget
 
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.ui_loader import UiLoader
 
 
 class ReorderPairsWidget(QObject):
@@ -101,7 +101,7 @@ def item_edited(self, i, j, new_value):
 
 if __name__ == '__main__':
     # Make an example to test out
-    from PySide2.QtWidgets import QApplication, QDialog, QVBoxLayout
+    from PySide6.QtWidgets import QApplication, QDialog, QVBoxLayout
 
     app = QApplication()
 
@@ -124,4 +124,4 @@ def items_reordered():
         print(f'Items reordered: {widget.items}')
 
     widget.items_reordered.connect(items_reordered)
-    dialog.exec_()
+    dialog.exec()
diff --git a/hexrd/ui/rerun_clustering_dialog.py b/hexrdgui/rerun_clustering_dialog.py
similarity index 78%
rename from hexrd/ui/rerun_clustering_dialog.py
rename to hexrdgui/rerun_clustering_dialog.py
index 71b611244..dc9d10d68 100644
--- a/hexrd/ui/rerun_clustering_dialog.py
+++ b/hexrdgui/rerun_clustering_dialog.py
@@ -1,13 +1,13 @@
 import numpy as np
 from pathlib import Path
 
-from PySide2.QtWidgets import QDialog, QFileDialog
-from PySide2.QtCore import Qt
+from PySide6.QtWidgets import QDialog, QFileDialog
+from PySide6.QtCore import Qt
 
-from hexrd.ui.async_worker import AsyncWorker
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils.dialog import add_help_url
+from hexrdgui.async_worker import AsyncWorker
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils.dialog import add_help_url
 
 
 class RerunClusteringDialog(QDialog):
@@ -83,16 +83,25 @@ def accept(self):
         runner.is_rerunning_clustering = True
         worker = AsyncWorker(runner.run_cluster)
         runner.thread_pool.start(worker)
-        worker.signals.result.connect(
-            runner.confirm_indexing_results, Qt.QueuedConnection)
-        runner.indexing_results_rejected.connect(
-            self.exec_, Qt.QueuedConnection)
-        worker.signals.finished.connect(runner.accept_progress)
+
+        def on_finished():
+            # Since this is a QueuedConnection, we need to accept progress here
+            runner.accept_progress()
+            runner.confirm_indexing_results()
+
+        def on_rejected():
+            # Since this is a QueuedConnection, we need to accept progress here
+            runner.accept_progress()
+            self.exec()
+
+        worker.signals.result.connect(on_finished, Qt.QueuedConnection)
+        runner.indexing_results_rejected.connect(on_rejected,
+            Qt.QueuedConnection)
         worker.signals.error.connect(runner.on_async_error)
-        runner.progress_dialog.exec_()
+        runner.progress_dialog.exec()
 
         super().accept()
 
-    def exec_(self):
+    def exec(self):
         self.setup_gui()
-        self.ui.exec_()
+        self.ui.exec()
diff --git a/hexrd/ui/resource_loader.py b/hexrdgui/resource_loader.py
similarity index 93%
rename from hexrd/ui/resource_loader.py
rename to hexrdgui/resource_loader.py
index 3400cc8f5..b62da66fd 100644
--- a/hexrd/ui/resource_loader.py
+++ b/hexrdgui/resource_loader.py
@@ -15,7 +15,7 @@ def load_resource(module, name, binary=False):
 
 
 def resource_path(module, name):
-    return importlib_resources.path(module, name)
+    return path(module, name)
 
 
 def module_contents(module):
diff --git a/hexrd/ui/resources/calibration/__init__.py b/hexrdgui/resources/calibration/__init__.py
similarity index 100%
rename from hexrd/ui/resources/calibration/__init__.py
rename to hexrdgui/resources/calibration/__init__.py
diff --git a/hexrd/ui/resources/calibration/calibration_flags_order.yml b/hexrdgui/resources/calibration/calibration_flags_order.yml
similarity index 100%
rename from hexrd/ui/resources/calibration/calibration_flags_order.yml
rename to hexrdgui/resources/calibration/calibration_flags_order.yml
diff --git a/hexrd/ui/resources/calibration/default_calibration_config.yml b/hexrdgui/resources/calibration/default_calibration_config.yml
similarity index 100%
rename from hexrd/ui/resources/calibration/default_calibration_config.yml
rename to hexrdgui/resources/calibration/default_calibration_config.yml
diff --git a/hexrd/ui/resources/calibration/default_image_config.yml b/hexrdgui/resources/calibration/default_image_config.yml
similarity index 100%
rename from hexrd/ui/resources/calibration/default_image_config.yml
rename to hexrdgui/resources/calibration/default_image_config.yml
diff --git a/hexrd/ui/resources/calibration/default_instrument_config.yml b/hexrdgui/resources/calibration/default_instrument_config.yml
similarity index 100%
rename from hexrd/ui/resources/calibration/default_instrument_config.yml
rename to hexrdgui/resources/calibration/default_instrument_config.yml
diff --git a/hexrd/ui/resources/calibration/default_pxrdip_config.yml b/hexrdgui/resources/calibration/default_pxrdip_config.yml
similarity index 100%
rename from hexrd/ui/resources/calibration/default_pxrdip_config.yml
rename to hexrdgui/resources/calibration/default_pxrdip_config.yml
diff --git a/hexrd/ui/resources/calibration/default_tardis_config.yml b/hexrdgui/resources/calibration/default_tardis_config.yml
similarity index 93%
rename from hexrd/ui/resources/calibration/default_tardis_config.yml
rename to hexrdgui/resources/calibration/default_tardis_config.yml
index 07eb91352..67fd8759c 100644
--- a/hexrd/ui/resources/calibration/default_tardis_config.yml
+++ b/hexrdgui/resources/calibration/default_tardis_config.yml
@@ -7,7 +7,6 @@ detectors:
       columns: 1250
       rows: 750
       size: [0.1, 0.1]
-    buffer: [0.2, 0.2]
     transform:
       tilt: [-1.57079633e+00, 0.0, 0.0]
       translation: [0.0, -11.565, -25.08]
diff --git a/hexrd/ui/resources/calibration/structureless_params_tree_view.yml b/hexrdgui/resources/calibration/structureless_params_tree_view.yml
similarity index 100%
rename from hexrd/ui/resources/calibration/structureless_params_tree_view.yml
rename to hexrdgui/resources/calibration/structureless_params_tree_view.yml
diff --git a/hexrd/ui/resources/calibration/yaml_to_gui.yml b/hexrdgui/resources/calibration/yaml_to_gui.yml
similarity index 100%
rename from hexrd/ui/resources/calibration/yaml_to_gui.yml
rename to hexrdgui/resources/calibration/yaml_to_gui.yml
diff --git a/hexrd/ui/resources/icons/__init__.py b/hexrdgui/resources/icons/__init__.py
similarity index 100%
rename from hexrd/ui/resources/icons/__init__.py
rename to hexrdgui/resources/icons/__init__.py
diff --git a/hexrd/ui/resources/icons/afrl_logo.png b/hexrdgui/resources/icons/afrl_logo.png
similarity index 100%
rename from hexrd/ui/resources/icons/afrl_logo.png
rename to hexrdgui/resources/icons/afrl_logo.png
diff --git a/hexrd/ui/resources/icons/afrl_logo.svg b/hexrdgui/resources/icons/afrl_logo.svg
similarity index 100%
rename from hexrd/ui/resources/icons/afrl_logo.svg
rename to hexrdgui/resources/icons/afrl_logo.svg
diff --git a/hexrd/ui/resources/icons/file.svg b/hexrdgui/resources/icons/file.svg
similarity index 100%
rename from hexrd/ui/resources/icons/file.svg
rename to hexrdgui/resources/icons/file.svg
diff --git a/hexrd/ui/resources/icons/hexrd.ico b/hexrdgui/resources/icons/hexrd.ico
similarity index 100%
rename from hexrd/ui/resources/icons/hexrd.ico
rename to hexrdgui/resources/icons/hexrd.ico
diff --git a/hexrd/ui/resources/icons/kitware_logo.svg b/hexrdgui/resources/icons/kitware_logo.svg
similarity index 100%
rename from hexrd/ui/resources/icons/kitware_logo.svg
rename to hexrdgui/resources/icons/kitware_logo.svg
diff --git a/hexrd/ui/resources/icons/llnl_logo.svg b/hexrdgui/resources/icons/llnl_logo.svg
similarity index 100%
rename from hexrd/ui/resources/icons/llnl_logo.svg
rename to hexrdgui/resources/icons/llnl_logo.svg
diff --git a/hexrd/ui/resources/indexing/__init__.py b/hexrdgui/resources/indexing/__init__.py
similarity index 100%
rename from hexrd/ui/resources/indexing/__init__.py
rename to hexrdgui/resources/indexing/__init__.py
diff --git a/hexrd/ui/resources/indexing/default_indexing_config.yml b/hexrdgui/resources/indexing/default_indexing_config.yml
similarity index 100%
rename from hexrd/ui/resources/indexing/default_indexing_config.yml
rename to hexrdgui/resources/indexing/default_indexing_config.yml
diff --git a/hexrd/ui/resources/indexing/gui_config_maps.yml b/hexrdgui/resources/indexing/gui_config_maps.yml
similarity index 100%
rename from hexrd/ui/resources/indexing/gui_config_maps.yml
rename to hexrdgui/resources/indexing/gui_config_maps.yml
diff --git a/hexrd/ui/resources/indexing/seed_search_method_defaults.yml b/hexrdgui/resources/indexing/seed_search_method_defaults.yml
similarity index 100%
rename from hexrd/ui/resources/indexing/seed_search_method_defaults.yml
rename to hexrdgui/resources/indexing/seed_search_method_defaults.yml
diff --git a/hexrd/ui/resources/materials/__init__.py b/hexrdgui/resources/materials/__init__.py
similarity index 100%
rename from hexrd/ui/resources/materials/__init__.py
rename to hexrdgui/resources/materials/__init__.py
diff --git a/hexrd/ui/resources/materials/materials.h5 b/hexrdgui/resources/materials/materials.h5
similarity index 100%
rename from hexrd/ui/resources/materials/materials.h5
rename to hexrdgui/resources/materials/materials.h5
diff --git a/hexrd/ui/resources/materials/materials_panel_defaults.yml b/hexrdgui/resources/materials/materials_panel_defaults.yml
similarity index 100%
rename from hexrd/ui/resources/materials/materials_panel_defaults.yml
rename to hexrdgui/resources/materials/materials_panel_defaults.yml
diff --git a/hexrd/ui/resources/materials/pinhole_materials.h5 b/hexrdgui/resources/materials/pinhole_materials.h5
similarity index 100%
rename from hexrd/ui/resources/materials/pinhole_materials.h5
rename to hexrdgui/resources/materials/pinhole_materials.h5
diff --git a/hexrd/ui/resources/ui/__init__.py b/hexrdgui/resources/ui/__init__.py
similarity index 100%
rename from hexrd/ui/resources/ui/__init__.py
rename to hexrdgui/resources/ui/__init__.py
diff --git a/hexrd/ui/resources/ui/about_dialog.ui b/hexrdgui/resources/ui/about_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/about_dialog.ui
rename to hexrdgui/resources/ui/about_dialog.ui
diff --git a/hexrd/ui/resources/ui/azimuthal_overlay_editor.ui b/hexrdgui/resources/ui/azimuthal_overlay_editor.ui
similarity index 100%
rename from hexrd/ui/resources/ui/azimuthal_overlay_editor.ui
rename to hexrdgui/resources/ui/azimuthal_overlay_editor.ui
diff --git a/hexrd/ui/resources/ui/azimuthal_overlay_manager.ui b/hexrdgui/resources/ui/azimuthal_overlay_manager.ui
similarity index 100%
rename from hexrd/ui/resources/ui/azimuthal_overlay_manager.ui
rename to hexrdgui/resources/ui/azimuthal_overlay_manager.ui
diff --git a/hexrd/ui/resources/ui/azimuthal_overlay_style_picker.ui b/hexrdgui/resources/ui/azimuthal_overlay_style_picker.ui
similarity index 100%
rename from hexrd/ui/resources/ui/azimuthal_overlay_style_picker.ui
rename to hexrdgui/resources/ui/azimuthal_overlay_style_picker.ui
diff --git a/hexrd/ui/resources/ui/beam_marker_style_editor.ui b/hexrdgui/resources/ui/beam_marker_style_editor.ui
similarity index 100%
rename from hexrd/ui/resources/ui/beam_marker_style_editor.ui
rename to hexrdgui/resources/ui/beam_marker_style_editor.ui
diff --git a/hexrd/ui/resources/ui/brightness_contrast_editor.ui b/hexrdgui/resources/ui/brightness_contrast_editor.ui
similarity index 100%
rename from hexrd/ui/resources/ui/brightness_contrast_editor.ui
rename to hexrdgui/resources/ui/brightness_contrast_editor.ui
diff --git a/hexrd/ui/resources/ui/calibration_crystal_editor.ui b/hexrdgui/resources/ui/calibration_crystal_editor.ui
similarity index 100%
rename from hexrd/ui/resources/ui/calibration_crystal_editor.ui
rename to hexrdgui/resources/ui/calibration_crystal_editor.ui
diff --git a/hexrd/ui/resources/ui/calibration_crystal_slider_widget.ui b/hexrdgui/resources/ui/calibration_crystal_slider_widget.ui
similarity index 100%
rename from hexrd/ui/resources/ui/calibration_crystal_slider_widget.ui
rename to hexrdgui/resources/ui/calibration_crystal_slider_widget.ui
diff --git a/hexrd/ui/resources/ui/calibration_slider_widget.ui b/hexrdgui/resources/ui/calibration_slider_widget.ui
similarity index 100%
rename from hexrd/ui/resources/ui/calibration_slider_widget.ui
rename to hexrdgui/resources/ui/calibration_slider_widget.ui
diff --git a/hexrd/ui/resources/ui/color_map_editor.ui b/hexrdgui/resources/ui/color_map_editor.ui
similarity index 99%
rename from hexrd/ui/resources/ui/color_map_editor.ui
rename to hexrdgui/resources/ui/color_map_editor.ui
index ed8885675..40374a939 100644
--- a/hexrd/ui/resources/ui/color_map_editor.ui
+++ b/hexrdgui/resources/ui/color_map_editor.ui
@@ -236,7 +236,7 @@
   <customwidget>
    <class>ScientificDoubleSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>hexrd/ui/scientificspinbox</header>
+   <header>hexrdgui/scientificspinbox</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/hexrd/ui/resources/ui/config_dialog.ui b/hexrdgui/resources/ui/config_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/config_dialog.ui
rename to hexrdgui/resources/ui/config_dialog.ui
diff --git a/hexrd/ui/resources/ui/edit_colormaps_dialog.ui b/hexrdgui/resources/ui/edit_colormaps_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/edit_colormaps_dialog.ui
rename to hexrdgui/resources/ui/edit_colormaps_dialog.ui
diff --git a/hexrd/ui/resources/ui/fit_grains_options_dialog.ui b/hexrdgui/resources/ui/fit_grains_options_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/fit_grains_options_dialog.ui
rename to hexrdgui/resources/ui/fit_grains_options_dialog.ui
diff --git a/hexrd/ui/resources/ui/fit_grains_results_dialog.ui b/hexrdgui/resources/ui/fit_grains_results_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/fit_grains_results_dialog.ui
rename to hexrdgui/resources/ui/fit_grains_results_dialog.ui
diff --git a/hexrd/ui/resources/ui/fit_grains_select_dialog.ui b/hexrdgui/resources/ui/fit_grains_select_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/fit_grains_select_dialog.ui
rename to hexrdgui/resources/ui/fit_grains_select_dialog.ui
diff --git a/hexrd/ui/resources/ui/grains_viewer_widget.ui b/hexrdgui/resources/ui/grains_viewer_widget.ui
similarity index 100%
rename from hexrd/ui/resources/ui/grains_viewer_widget.ui
rename to hexrdgui/resources/ui/grains_viewer_widget.ui
diff --git a/hexrd/ui/resources/ui/hand_drawn_mask_dialog.ui b/hexrdgui/resources/ui/hand_drawn_mask_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/hand_drawn_mask_dialog.ui
rename to hexrdgui/resources/ui/hand_drawn_mask_dialog.ui
diff --git a/hexrd/ui/resources/ui/hand_picked_fibers_widget.ui b/hexrdgui/resources/ui/hand_picked_fibers_widget.ui
similarity index 100%
rename from hexrd/ui/resources/ui/hand_picked_fibers_widget.ui
rename to hexrdgui/resources/ui/hand_picked_fibers_widget.ui
diff --git a/hexrd/ui/resources/ui/hedm_calibration_options_dialog.ui b/hexrdgui/resources/ui/hedm_calibration_options_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/hedm_calibration_options_dialog.ui
rename to hexrdgui/resources/ui/hedm_calibration_options_dialog.ui
diff --git a/hexrd/ui/resources/ui/hedm_calibration_results_dialog.ui b/hexrdgui/resources/ui/hedm_calibration_results_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/hedm_calibration_results_dialog.ui
rename to hexrdgui/resources/ui/hedm_calibration_results_dialog.ui
diff --git a/hexrd/ui/resources/ui/hkl_picks_tree_view_dialog.ui b/hexrdgui/resources/ui/hkl_picks_tree_view_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/hkl_picks_tree_view_dialog.ui
rename to hexrdgui/resources/ui/hkl_picks_tree_view_dialog.ui
diff --git a/hexrd/ui/resources/ui/image_calculator_dialog.ui b/hexrdgui/resources/ui/image_calculator_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/image_calculator_dialog.ui
rename to hexrdgui/resources/ui/image_calculator_dialog.ui
diff --git a/hexrd/ui/resources/ui/image_mode_widget.ui b/hexrdgui/resources/ui/image_mode_widget.ui
similarity index 100%
rename from hexrd/ui/resources/ui/image_mode_widget.ui
rename to hexrdgui/resources/ui/image_mode_widget.ui
diff --git a/hexrd/ui/resources/ui/image_stack_dialog.ui b/hexrdgui/resources/ui/image_stack_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/image_stack_dialog.ui
rename to hexrdgui/resources/ui/image_stack_dialog.ui
diff --git a/hexrd/ui/resources/ui/indexing_results_dialog.ui b/hexrdgui/resources/ui/indexing_results_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/indexing_results_dialog.ui
rename to hexrdgui/resources/ui/indexing_results_dialog.ui
diff --git a/hexrd/ui/resources/ui/instrument_form_view_widget.ui b/hexrdgui/resources/ui/instrument_form_view_widget.ui
similarity index 100%
rename from hexrd/ui/resources/ui/instrument_form_view_widget.ui
rename to hexrdgui/resources/ui/instrument_form_view_widget.ui
diff --git a/hexrd/ui/resources/ui/laue_auto_picker_dialog.ui b/hexrdgui/resources/ui/laue_auto_picker_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/laue_auto_picker_dialog.ui
rename to hexrdgui/resources/ui/laue_auto_picker_dialog.ui
diff --git a/hexrd/ui/resources/ui/laue_overlay_editor.ui b/hexrdgui/resources/ui/laue_overlay_editor.ui
similarity index 100%
rename from hexrd/ui/resources/ui/laue_overlay_editor.ui
rename to hexrdgui/resources/ui/laue_overlay_editor.ui
diff --git a/hexrd/ui/resources/ui/line_picker_dialog.ui b/hexrdgui/resources/ui/line_picker_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/line_picker_dialog.ui
rename to hexrdgui/resources/ui/line_picker_dialog.ui
diff --git a/hexrd/ui/resources/ui/list_editor.ui b/hexrdgui/resources/ui/list_editor.ui
similarity index 100%
rename from hexrd/ui/resources/ui/list_editor.ui
rename to hexrdgui/resources/ui/list_editor.ui
diff --git a/hexrd/ui/resources/ui/llnl_import_tool_dialog.ui b/hexrdgui/resources/ui/llnl_import_tool_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/llnl_import_tool_dialog.ui
rename to hexrdgui/resources/ui/llnl_import_tool_dialog.ui
diff --git a/hexrd/ui/resources/ui/load_hdf5_dialog.ui b/hexrdgui/resources/ui/load_hdf5_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/load_hdf5_dialog.ui
rename to hexrdgui/resources/ui/load_hdf5_dialog.ui
diff --git a/hexrd/ui/resources/ui/load_images_dialog.ui b/hexrdgui/resources/ui/load_images_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/load_images_dialog.ui
rename to hexrdgui/resources/ui/load_images_dialog.ui
diff --git a/hexrd/ui/resources/ui/main_window.ui b/hexrdgui/resources/ui/main_window.ui
similarity index 100%
rename from hexrd/ui/resources/ui/main_window.ui
rename to hexrdgui/resources/ui/main_window.ui
diff --git a/hexrd/ui/resources/ui/mask_manager_dialog.ui b/hexrdgui/resources/ui/mask_manager_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/mask_manager_dialog.ui
rename to hexrdgui/resources/ui/mask_manager_dialog.ui
diff --git a/hexrd/ui/resources/ui/mask_regions_dialog.ui b/hexrdgui/resources/ui/mask_regions_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/mask_regions_dialog.ui
rename to hexrdgui/resources/ui/mask_regions_dialog.ui
diff --git a/hexrd/ui/resources/ui/material_editor_widget.ui b/hexrdgui/resources/ui/material_editor_widget.ui
similarity index 100%
rename from hexrd/ui/resources/ui/material_editor_widget.ui
rename to hexrdgui/resources/ui/material_editor_widget.ui
diff --git a/hexrd/ui/resources/ui/material_list_editor.ui b/hexrdgui/resources/ui/material_list_editor.ui
similarity index 100%
rename from hexrd/ui/resources/ui/material_list_editor.ui
rename to hexrdgui/resources/ui/material_list_editor.ui
diff --git a/hexrd/ui/resources/ui/material_properties_editor.ui b/hexrdgui/resources/ui/material_properties_editor.ui
similarity index 98%
rename from hexrd/ui/resources/ui/material_properties_editor.ui
rename to hexrdgui/resources/ui/material_properties_editor.ui
index ce6cfcf59..1a35101f2 100644
--- a/hexrd/ui/resources/ui/material_properties_editor.ui
+++ b/hexrdgui/resources/ui/material_properties_editor.ui
@@ -66,12 +66,12 @@
     <widget class="QComboBox" name="elastic_tensor_type">
      <item>
       <property name="text">
-       <string>Stiffness</string>
+       <string>Stiffness (GPa)</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>Compliance</string>
+       <string>Compliance (TPa⁻¹)</string>
       </property>
      </item>
     </widget>
diff --git a/hexrd/ui/resources/ui/material_site_editor.ui b/hexrdgui/resources/ui/material_site_editor.ui
similarity index 100%
rename from hexrd/ui/resources/ui/material_site_editor.ui
rename to hexrdgui/resources/ui/material_site_editor.ui
diff --git a/hexrd/ui/resources/ui/material_structure_editor.ui b/hexrdgui/resources/ui/material_structure_editor.ui
similarity index 100%
rename from hexrd/ui/resources/ui/material_structure_editor.ui
rename to hexrdgui/resources/ui/material_structure_editor.ui
diff --git a/hexrd/ui/resources/ui/materials_panel.ui b/hexrdgui/resources/ui/materials_panel.ui
similarity index 100%
rename from hexrd/ui/resources/ui/materials_panel.ui
rename to hexrdgui/resources/ui/materials_panel.ui
diff --git a/hexrd/ui/resources/ui/message_box.ui b/hexrdgui/resources/ui/message_box.ui
similarity index 100%
rename from hexrd/ui/resources/ui/message_box.ui
rename to hexrdgui/resources/ui/message_box.ui
diff --git a/hexrd/ui/resources/ui/messages_widget.ui b/hexrdgui/resources/ui/messages_widget.ui
similarity index 100%
rename from hexrd/ui/resources/ui/messages_widget.ui
rename to hexrdgui/resources/ui/messages_widget.ui
diff --git a/hexrd/ui/resources/ui/ome_maps_select_dialog.ui b/hexrdgui/resources/ui/ome_maps_select_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/ome_maps_select_dialog.ui
rename to hexrdgui/resources/ui/ome_maps_select_dialog.ui
diff --git a/hexrd/ui/resources/ui/ome_maps_viewer_dialog.ui b/hexrdgui/resources/ui/ome_maps_viewer_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/ome_maps_viewer_dialog.ui
rename to hexrdgui/resources/ui/ome_maps_viewer_dialog.ui
diff --git a/hexrd/ui/resources/ui/overlay_editor.ui b/hexrdgui/resources/ui/overlay_editor.ui
similarity index 100%
rename from hexrd/ui/resources/ui/overlay_editor.ui
rename to hexrdgui/resources/ui/overlay_editor.ui
diff --git a/hexrd/ui/resources/ui/overlay_manager.ui b/hexrdgui/resources/ui/overlay_manager.ui
similarity index 100%
rename from hexrd/ui/resources/ui/overlay_manager.ui
rename to hexrdgui/resources/ui/overlay_manager.ui
diff --git a/hexrd/ui/resources/ui/overlay_style_picker.ui b/hexrdgui/resources/ui/overlay_style_picker.ui
similarity index 100%
rename from hexrd/ui/resources/ui/overlay_style_picker.ui
rename to hexrdgui/resources/ui/overlay_style_picker.ui
diff --git a/hexrd/ui/resources/ui/panel_buffer_dialog.ui b/hexrdgui/resources/ui/panel_buffer_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/panel_buffer_dialog.ui
rename to hexrdgui/resources/ui/panel_buffer_dialog.ui
diff --git a/hexrd/ui/resources/ui/pinhole_correction_editor.ui b/hexrdgui/resources/ui/pinhole_correction_editor.ui
similarity index 100%
rename from hexrd/ui/resources/ui/pinhole_correction_editor.ui
rename to hexrdgui/resources/ui/pinhole_correction_editor.ui
diff --git a/hexrd/ui/resources/ui/pinhole_mask_dialog.ui b/hexrdgui/resources/ui/pinhole_mask_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/pinhole_mask_dialog.ui
rename to hexrdgui/resources/ui/pinhole_mask_dialog.ui
diff --git a/hexrd/ui/resources/ui/polarization_options_dialog.ui b/hexrdgui/resources/ui/polarization_options_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/polarization_options_dialog.ui
rename to hexrdgui/resources/ui/polarization_options_dialog.ui
diff --git a/hexrd/ui/resources/ui/powder_calibration_dialog.ui b/hexrdgui/resources/ui/powder_calibration_dialog.ui
similarity index 99%
rename from hexrd/ui/resources/ui/powder_calibration_dialog.ui
rename to hexrdgui/resources/ui/powder_calibration_dialog.ui
index bc07b4e79..0dc92c67e 100644
--- a/hexrd/ui/resources/ui/powder_calibration_dialog.ui
+++ b/hexrdgui/resources/ui/powder_calibration_dialog.ui
@@ -6,10 +6,13 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>744</width>
+    <width>750</width>
     <height>479</height>
    </rect>
   </property>
+  <property name="windowTitle">
+   <string>Fast Powder Calibration</string>
+  </property>
   <layout class="QGridLayout" name="gridLayout_3">
    <item row="3" column="0" colspan="3">
     <widget class="QGroupBox" name="optimization_parameters_group">
diff --git a/hexrd/ui/resources/ui/powder_overlay_editor.ui b/hexrdgui/resources/ui/powder_overlay_editor.ui
similarity index 100%
rename from hexrd/ui/resources/ui/powder_overlay_editor.ui
rename to hexrdgui/resources/ui/powder_overlay_editor.ui
diff --git a/hexrd/ui/resources/ui/progress_dialog.ui b/hexrdgui/resources/ui/progress_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/progress_dialog.ui
rename to hexrdgui/resources/ui/progress_dialog.ui
diff --git a/hexrd/ui/resources/ui/range_widget.ui b/hexrdgui/resources/ui/range_widget.ui
similarity index 100%
rename from hexrd/ui/resources/ui/range_widget.ui
rename to hexrdgui/resources/ui/range_widget.ui
diff --git a/hexrd/ui/resources/ui/ranges_table_editor.ui b/hexrdgui/resources/ui/ranges_table_editor.ui
similarity index 100%
rename from hexrd/ui/resources/ui/ranges_table_editor.ui
rename to hexrdgui/resources/ui/ranges_table_editor.ui
diff --git a/hexrd/ui/resources/ui/refinements_editor.ui b/hexrdgui/resources/ui/refinements_editor.ui
similarity index 100%
rename from hexrd/ui/resources/ui/refinements_editor.ui
rename to hexrdgui/resources/ui/refinements_editor.ui
diff --git a/hexrd/ui/resources/ui/reflections_selection_helper.ui b/hexrdgui/resources/ui/reflections_selection_helper.ui
similarity index 100%
rename from hexrd/ui/resources/ui/reflections_selection_helper.ui
rename to hexrdgui/resources/ui/reflections_selection_helper.ui
diff --git a/hexrd/ui/resources/ui/reflections_table.ui b/hexrdgui/resources/ui/reflections_table.ui
similarity index 100%
rename from hexrd/ui/resources/ui/reflections_table.ui
rename to hexrdgui/resources/ui/reflections_table.ui
diff --git a/hexrd/ui/resources/ui/reorder_pairs_widget.ui b/hexrdgui/resources/ui/reorder_pairs_widget.ui
similarity index 100%
rename from hexrd/ui/resources/ui/reorder_pairs_widget.ui
rename to hexrdgui/resources/ui/reorder_pairs_widget.ui
diff --git a/hexrd/ui/resources/ui/rerun_clustering_dialog.ui b/hexrdgui/resources/ui/rerun_clustering_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/rerun_clustering_dialog.ui
rename to hexrdgui/resources/ui/rerun_clustering_dialog.ui
diff --git a/hexrd/ui/resources/ui/rotation_series_overlay_editor.ui b/hexrdgui/resources/ui/rotation_series_overlay_editor.ui
similarity index 100%
rename from hexrd/ui/resources/ui/rotation_series_overlay_editor.ui
rename to hexrdgui/resources/ui/rotation_series_overlay_editor.ui
diff --git a/hexrd/ui/resources/ui/save_images_dialog.ui b/hexrdgui/resources/ui/save_images_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/save_images_dialog.ui
rename to hexrdgui/resources/ui/save_images_dialog.ui
diff --git a/hexrd/ui/resources/ui/select_grains_dialog.ui b/hexrdgui/resources/ui/select_grains_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/select_grains_dialog.ui
rename to hexrdgui/resources/ui/select_grains_dialog.ui
diff --git a/hexrd/ui/resources/ui/select_item_dialog.ui b/hexrdgui/resources/ui/select_item_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/select_item_dialog.ui
rename to hexrdgui/resources/ui/select_item_dialog.ui
diff --git a/hexrd/ui/resources/ui/select_items_widget.ui b/hexrdgui/resources/ui/select_items_widget.ui
similarity index 100%
rename from hexrd/ui/resources/ui/select_items_widget.ui
rename to hexrdgui/resources/ui/select_items_widget.ui
diff --git a/hexrd/ui/resources/ui/simple_image_series_dialog.ui b/hexrdgui/resources/ui/simple_image_series_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/simple_image_series_dialog.ui
rename to hexrdgui/resources/ui/simple_image_series_dialog.ui
diff --git a/hexrd/ui/resources/ui/snip_viewer_dialog.ui b/hexrdgui/resources/ui/snip_viewer_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/snip_viewer_dialog.ui
rename to hexrdgui/resources/ui/snip_viewer_dialog.ui
diff --git a/hexrd/ui/resources/ui/structureless_calibration_dialog.ui b/hexrdgui/resources/ui/structureless_calibration_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/structureless_calibration_dialog.ui
rename to hexrdgui/resources/ui/structureless_calibration_dialog.ui
diff --git a/hexrd/ui/resources/ui/thermal_factor_editor.ui b/hexrdgui/resources/ui/thermal_factor_editor.ui
similarity index 100%
rename from hexrd/ui/resources/ui/thermal_factor_editor.ui
rename to hexrdgui/resources/ui/thermal_factor_editor.ui
diff --git a/hexrd/ui/resources/ui/threshold_mask_dialog.ui b/hexrdgui/resources/ui/threshold_mask_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/threshold_mask_dialog.ui
rename to hexrdgui/resources/ui/threshold_mask_dialog.ui
diff --git a/hexrd/ui/resources/ui/transforms_dialog.ui b/hexrdgui/resources/ui/transforms_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/transforms_dialog.ui
rename to hexrdgui/resources/ui/transforms_dialog.ui
diff --git a/hexrd/ui/resources/ui/view_spots_dialog.ui b/hexrdgui/resources/ui/view_spots_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/view_spots_dialog.ui
rename to hexrdgui/resources/ui/view_spots_dialog.ui
diff --git a/hexrd/ui/resources/ui/wppf_options_dialog.ui b/hexrdgui/resources/ui/wppf_options_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/wppf_options_dialog.ui
rename to hexrdgui/resources/ui/wppf_options_dialog.ui
diff --git a/hexrd/ui/resources/ui/wppf_style_picker.ui b/hexrdgui/resources/ui/wppf_style_picker.ui
similarity index 100%
rename from hexrd/ui/resources/ui/wppf_style_picker.ui
rename to hexrdgui/resources/ui/wppf_style_picker.ui
diff --git a/hexrd/ui/resources/ui/zoom_canvas_dialog.ui b/hexrdgui/resources/ui/zoom_canvas_dialog.ui
similarity index 100%
rename from hexrd/ui/resources/ui/zoom_canvas_dialog.ui
rename to hexrdgui/resources/ui/zoom_canvas_dialog.ui
diff --git a/hexrd/ui/rotation_series_overlay_editor.py b/hexrdgui/rotation_series_overlay_editor.py
similarity index 95%
rename from hexrd/ui/rotation_series_overlay_editor.py
rename to hexrdgui/rotation_series_overlay_editor.py
index 006e6b7c0..017e76eda 100644
--- a/hexrd/ui/rotation_series_overlay_editor.py
+++ b/hexrdgui/rotation_series_overlay_editor.py
@@ -2,15 +2,15 @@
 
 import numpy as np
 
-from PySide2.QtWidgets import QCheckBox, QDoubleSpinBox, QInputDialog
-
-from hexrd.ui.calibration_crystal_editor import CalibrationCrystalEditor
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.image_load_manager import ImageLoadManager
-from hexrd.ui.ranges_table_editor import RangesTableEditor
-from hexrd.ui.reflections_table import ReflectionsTable
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
+from PySide6.QtWidgets import QCheckBox, QDoubleSpinBox, QInputDialog
+
+from hexrdgui.calibration_crystal_editor import CalibrationCrystalEditor
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.image_load_manager import ImageLoadManager
+from hexrdgui.ranges_table_editor import RangesTableEditor
+from hexrdgui.reflections_table import ReflectionsTable
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
 
 
 class RotationSeriesOverlayEditor:
diff --git a/hexrd/ui/save_images_dialog.py b/hexrdgui/save_images_dialog.py
similarity index 80%
rename from hexrd/ui/save_images_dialog.py
rename to hexrdgui/save_images_dialog.py
index 3af2a7dff..358eea053 100644
--- a/hexrd/ui/save_images_dialog.py
+++ b/hexrdgui/save_images_dialog.py
@@ -1,11 +1,12 @@
-from PySide2.QtCore import QThreadPool
-from PySide2.QtWidgets import QFileDialog, QInputDialog
+from pathlib import Path
+from PySide6.QtCore import QThreadPool
+from PySide6.QtWidgets import QFileDialog, QInputDialog
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.image_load_manager import ImageLoadManager
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.progress_dialog import ProgressDialog
-from hexrd.ui.async_worker import AsyncWorker
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.image_load_manager import ImageLoadManager
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.progress_dialog import ProgressDialog
+from hexrdgui.async_worker import AsyncWorker
 
 
 class SaveImagesDialog:
@@ -15,7 +16,6 @@ def __init__(self, parent=None, ):
         self.ui = loader.load_file('save_images_dialog.ui', parent)
 
         self.parent_dir = HexrdConfig().working_dir
-        self.thread_pool = QThreadPool()
         self.progress_dialog = ProgressDialog(self.ui)
 
         self.setup_gui()
@@ -33,14 +33,19 @@ def setup_connections(self):
         self.ui.single_detector.toggled.connect(self.ui.detectors.setEnabled)
         self.ui.change_directory.clicked.connect(self.change_directory)
 
+    @property
+    def parent_dir(self):
+        if (Path(HexrdConfig().images_dir).exists()):
+            return HexrdConfig().images_dir
+        return str(Path.cwd())
+
     def change_directory(self):
         caption = 'Select directory for images'
         new_dir = QFileDialog.getExistingDirectory(
             self.ui, caption, dir=self.parent_dir)
 
         if new_dir:
-            HexrdConfig().working_dir = new_dir
-            self.parent_dir = new_dir
+            HexrdConfig().set_images_dir(new_dir)
             self.ui.pwd.setText(self.parent_dir)
             self.ui.pwd.setToolTip(self.parent_dir)
 
@@ -87,8 +92,12 @@ def save_images(self):
             self.progress_dialog.setWindowTitle(f'Saving {filename}')
             self.progress_dialog.setRange(0, 0)
             worker.signals.finished.connect(self.progress_dialog.accept)
-            self.progress_dialog.exec_()
+            self.progress_dialog.exec()
 
-    def exec_(self):
-        if self.ui.exec_():
+    def exec(self):
+        if self.ui.exec():
             self.save_images()
+
+    @property
+    def thread_pool(self):
+        return QThreadPool.globalInstance()
diff --git a/hexrd/ui/scaling.py b/hexrdgui/scaling.py
similarity index 100%
rename from hexrd/ui/scaling.py
rename to hexrdgui/scaling.py
diff --git a/hexrd/ui/scientificspinbox.py b/hexrdgui/scientificspinbox.py
similarity index 86%
rename from hexrd/ui/scientificspinbox.py
rename to hexrdgui/scientificspinbox.py
index c0386698c..9f14ed2e9 100644
--- a/hexrd/ui/scientificspinbox.py
+++ b/hexrdgui/scientificspinbox.py
@@ -2,8 +2,8 @@
 import re
 import math
 
-from PySide2.QtGui import QValidator
-from PySide2.QtWidgets import QDoubleSpinBox
+from PySide6.QtGui import QValidator
+from PySide6.QtWidgets import QDoubleSpinBox
 #
 # Derived from https://gist.github.com/jdreaver/0be2e44981159d0854f5
 #
@@ -58,8 +58,8 @@ def clean_text(func):
     """
     @wraps(func)
     def wrapped(self, text, *args, **kwargs):
-        text = remove_prefix(text, self.prefix())
-        text = remove_suffix(text, self.suffix())
+        text = text.removeprefix(self.prefix())
+        text = text.removesuffix(self.suffix())
         text = text.strip()
         return func(self, text, *args, **kwargs)
     return wrapped
@@ -141,17 +141,3 @@ def is_nan(self, b):
         else:
             # Reset the range so we can have values that are not nan
             self.reset_range()
-
-
-def remove_prefix(text, prefix):
-    # This can be replaced with str.removeprefix() in python >=3.9
-    if prefix and text.startswith(prefix):
-        return text[len(prefix):]
-    return text
-
-
-def remove_suffix(text, suffix):
-    # This can be replaced with str.removesuffix() in python >=3.9
-    if suffix and text.endswith(suffix):
-        return text[:-len(suffix)]
-    return text
diff --git a/hexrd/ui/select_grains_dialog.py b/hexrdgui/select_grains_dialog.py
similarity index 95%
rename from hexrd/ui/select_grains_dialog.py
rename to hexrdgui/select_grains_dialog.py
index 79ce427f4..325a72738 100644
--- a/hexrd/ui/select_grains_dialog.py
+++ b/hexrdgui/select_grains_dialog.py
@@ -2,14 +2,14 @@
 
 import numpy as np
 
-from PySide2.QtCore import Signal, QItemSelectionModel, QObject
-from PySide2.QtWidgets import QDialogButtonBox, QFileDialog, QMessageBox
+from PySide6.QtCore import Signal, QItemSelectionModel, QObject
+from PySide6.QtWidgets import QDialogButtonBox, QFileDialog, QMessageBox
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.indexing.grains_table_model import GrainsTableModel
-from hexrd.ui.plot_grains import plot_grains
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import set_combobox_enabled_items
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.indexing.grains_table_model import GrainsTableModel
+from hexrdgui.plot_grains import plot_grains
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import set_combobox_enabled_items
 
 
 class SelectGrainsDialog(QObject):
@@ -90,8 +90,8 @@ def setup_methods(self):
         enable_list = list(methods_and_enable.values())
         set_combobox_enabled_items(self.ui.method, enable_list)
 
-    def exec_(self):
-        return self.ui.exec_()
+    def exec(self):
+        return self.ui.exec()
 
     def on_accepted(self):
         self.update_config()
diff --git a/hexrd/ui/select_item_dialog.py b/hexrdgui/select_item_dialog.py
similarity index 90%
rename from hexrd/ui/select_item_dialog.py
rename to hexrdgui/select_item_dialog.py
index ececde293..8e4509868 100644
--- a/hexrd/ui/select_item_dialog.py
+++ b/hexrdgui/select_item_dialog.py
@@ -1,7 +1,7 @@
-from PySide2.QtCore import QObject, Signal
+from PySide6.QtCore import QObject, Signal
 
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import set_combobox_enabled_items
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import set_combobox_enabled_items
 
 
 class SelectItemDialog(QObject):
@@ -26,8 +26,8 @@ def __init__(self, options, disable_list=None, window_title=None,
 
         self.setup_connections()
 
-    def exec_(self):
-        return self.ui.exec_()
+    def exec(self):
+        return self.ui.exec()
 
     def setup_connections(self):
         self.ui.button_box.accepted.connect(self.on_accepted)
diff --git a/hexrd/ui/select_items_dialog.py b/hexrdgui/select_items_dialog.py
similarity index 84%
rename from hexrd/ui/select_items_dialog.py
rename to hexrdgui/select_items_dialog.py
index cd57d10df..bbeb96d11 100644
--- a/hexrd/ui/select_items_dialog.py
+++ b/hexrdgui/select_items_dialog.py
@@ -1,7 +1,7 @@
-from PySide2.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout
+from PySide6.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout
 
-from hexrd.ui.select_items_widget import SelectItemsWidget
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.select_items_widget import SelectItemsWidget
+from hexrdgui.ui_loader import UiLoader
 
 
 class SelectItemsDialog(QDialog):
@@ -31,7 +31,7 @@ def selected_items(self):
 
 
 if __name__ == '__main__':
-    from PySide2.QtWidgets import QApplication
+    from PySide6.QtWidgets import QApplication
 
     app = QApplication()
 
@@ -48,5 +48,5 @@ def selection_changed():
         print(f'Selection changed: {dialog.selected_items}')
 
     dialog.select_items_widget.selection_changed.connect(selection_changed)
-    if dialog.exec_():
+    if dialog.exec():
         print(f'{dialog.selected_items=}')
diff --git a/hexrd/ui/select_items_widget.py b/hexrdgui/select_items_widget.py
similarity index 93%
rename from hexrd/ui/select_items_widget.py
rename to hexrdgui/select_items_widget.py
index 7f191e443..fcd09d52c 100644
--- a/hexrd/ui/select_items_widget.py
+++ b/hexrdgui/select_items_widget.py
@@ -1,9 +1,9 @@
 import copy
 
-from PySide2.QtCore import QObject, Qt, Signal
-from PySide2.QtWidgets import QCheckBox, QHBoxLayout, QTableWidgetItem, QWidget
+from PySide6.QtCore import QObject, Qt, Signal
+from PySide6.QtWidgets import QCheckBox, QHBoxLayout, QTableWidgetItem, QWidget
 
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.ui_loader import UiLoader
 
 
 COLUMNS = {
diff --git a/hexrd/ui/simple_image_series_dialog.py b/hexrdgui/simple_image_series_dialog.py
similarity index 97%
rename from hexrd/ui/simple_image_series_dialog.py
rename to hexrdgui/simple_image_series_dialog.py
index 573211151..fccb98acd 100644
--- a/hexrd/ui/simple_image_series_dialog.py
+++ b/hexrdgui/simple_image_series_dialog.py
@@ -3,19 +3,19 @@
 import numpy as np
 from pathlib import Path
 
-from PySide2.QtGui import QCursor
-from PySide2.QtCore import QObject, Qt, QPersistentModelIndex, QDir, Signal
-from PySide2.QtWidgets import QTableWidgetItem, QFileDialog, QMenu, QMessageBox
+from PySide6.QtGui import QCursor
+from PySide6.QtCore import QObject, Qt, QPersistentModelIndex, QDir, Signal
+from PySide6.QtWidgets import QTableWidgetItem, QFileDialog, QMenu, QMessageBox
 
-from hexrd.ui.constants import (
+from hexrdgui.constants import (
     MAXIMUM_OMEGA_RANGE, UI_DARK_INDEX_FILE, UI_DARK_INDEX_NONE,
     UI_AGG_INDEX_NONE, UI_TRANS_INDEX_NONE, YAML_EXTS)
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.image_file_manager import ImageFileManager
-from hexrd.ui.image_load_manager import ImageLoadManager
-from hexrd.ui.load_images_dialog import LoadImagesDialog
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils.dialog import add_help_url
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.image_file_manager import ImageFileManager
+from hexrdgui.image_load_manager import ImageLoadManager
+from hexrdgui.load_images_dialog import LoadImagesDialog
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils.dialog import add_help_url
 
 """
     This panel is in charge of loading file(s) for the experiment. It is built
@@ -362,7 +362,7 @@ def find_images(self, fnames):
 
         if manual:
             dialog = LoadImagesDialog(self.files, manual, self.ui.parent())
-            if not dialog.exec_():
+            if not dialog.exec():
                 self.reset_data()
                 return
 
@@ -456,7 +456,7 @@ def contextMenuEvent(self, event):
         # Allow user to delete selected file(s)
         menu = QMenu(self.ui)
         remove = menu.addAction('Remove Selected Files')
-        action = menu.exec_(QCursor.pos())
+        action = menu.exec(QCursor.pos())
 
         # Re-selects the current row if context menu is called on disabled cell
         i = self.ui.file_options.indexAt(event)
diff --git a/hexrd/ui/singletons.py b/hexrdgui/singletons.py
similarity index 94%
rename from hexrd/ui/singletons.py
rename to hexrdgui/singletons.py
index 4b453caa1..4885f65ab 100644
--- a/hexrd/ui/singletons.py
+++ b/hexrdgui/singletons.py
@@ -1,4 +1,4 @@
-from PySide2.QtCore import QObject
+from PySide6.QtCore import QObject
 
 
 class Singleton(type):
diff --git a/hexrd/ui/snip_viewer_dialog.py b/hexrdgui/snip_viewer_dialog.py
similarity index 93%
rename from hexrd/ui/snip_viewer_dialog.py
rename to hexrdgui/snip_viewer_dialog.py
index 0f54d067c..7e73dad49 100644
--- a/hexrd/ui/snip_viewer_dialog.py
+++ b/hexrdgui/snip_viewer_dialog.py
@@ -5,13 +5,13 @@
 from matplotlib.figure import Figure
 import numpy as np
 
-from PySide2.QtCore import Qt
-from PySide2.QtWidgets import QFileDialog, QSizePolicy
+from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QFileDialog, QSizePolicy
 
-from hexrd.ui.color_map_editor import ColorMapEditor
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.navigation_toolbar import NavigationToolbar
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.color_map_editor import ColorMapEditor
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.navigation_toolbar import NavigationToolbar
+from hexrdgui.ui_loader import UiLoader
 
 
 class SnipViewerDialog:
diff --git a/hexrd/ui/state.py b/hexrdgui/state.py
similarity index 95%
rename from hexrd/ui/state.py
rename to hexrdgui/state.py
index 351f94912..d9becc6b1 100644
--- a/hexrd/ui/state.py
+++ b/hexrdgui/state.py
@@ -1,4 +1,4 @@
-from PySide2.QtCore import QTimer
+from PySide6.QtCore import QTimer
 
 import h5py
 import numpy as np
@@ -6,10 +6,10 @@
 
 from hexrd import imageseries
 
-import hexrd.ui
-from hexrd.ui import state_compatibility
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.image_load_manager import ImageLoadManager
+import hexrdgui
+from hexrdgui import state_compatibility
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.image_load_manager import ImageLoadManager
 
 CONFIG_PREFIX = "config"
 CONFIG_YAML_PATH = f'{CONFIG_PREFIX}/yaml'
@@ -34,7 +34,7 @@ def include(self, node):
     def hexrd_ui_constants_overlaytype(self, node):
         value = self.construct_sequence(node)
 
-        return hexrd.ui.constants.OverlayType(value[0])
+        return hexrdgui.constants.OverlayType(value[0])
 
     def python_tuple(self, node):
         value = self.construct_sequence(node)
@@ -44,7 +44,7 @@ def python_tuple(self, node):
 
 H5StateLoader.add_constructor(u'!include', H5StateLoader.include)
 H5StateLoader.add_constructor(
-    u'tag:yaml.org,2002:python/object/apply:hexrd.ui.constants.OverlayType',
+    u'tag:yaml.org,2002:python/object/apply:hexrdgui.constants.OverlayType',
     H5StateLoader.hexrd_ui_constants_overlaytype)
 H5StateLoader.add_constructor(
     u'tag:yaml.org,2002:python/tuple', H5StateLoader.python_tuple)
diff --git a/hexrd/ui/state_compatibility.py b/hexrdgui/state_compatibility.py
similarity index 92%
rename from hexrd/ui/state_compatibility.py
rename to hexrdgui/state_compatibility.py
index 2785b97aa..b625ba647 100644
--- a/hexrd/ui/state_compatibility.py
+++ b/hexrdgui/state_compatibility.py
@@ -1,6 +1,6 @@
 import h5py
 
-from hexrd.ui.hexrd_config import HexrdConfig
+from hexrdgui.hexrd_config import HexrdConfig
 
 
 def update_if_needed(file_path):
@@ -22,7 +22,7 @@ def fix_issue_1227(file_path):
     logger = HexrdConfig().logger
     logger.warning('State file found to contain issue #1227. Fixing it up...')
 
-    from hexrd.ui.state import _load_config, _save_config
+    from hexrdgui.state import _load_config, _save_config
 
     with h5py.File(file_path, 'a') as f:
 
diff --git a/hexrd/ui/table_selector_widget.py b/hexrdgui/table_selector_widget.py
similarity index 94%
rename from hexrd/ui/table_selector_widget.py
rename to hexrdgui/table_selector_widget.py
index 6634786f6..9750d7518 100644
--- a/hexrd/ui/table_selector_widget.py
+++ b/hexrdgui/table_selector_widget.py
@@ -1,11 +1,11 @@
 import numpy as np
 
-from PySide2.QtCore import Signal, Qt
-from PySide2.QtWidgets import (
+from PySide6.QtCore import Signal, Qt
+from PySide6.QtWidgets import (
     QDialog, QDialogButtonBox, QTableWidget, QTableWidgetItem, QVBoxLayout
 )
 
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.ui_loader import UiLoader
 
 
 class TableSelectorWidget(QTableWidget):
@@ -142,7 +142,7 @@ def selected_columns(self):
 class TableRowSelectorDialog(TableSelectorDialog):
     def set_options(self):
         super().set_options()
-        self.table.setSelectionBehavior(self.table.SelectRows)
+        self.table.setSelectionBehavior(QTableWidget.SelectRows)
 
         self.table.verticalHeader().hide()
         self.table.horizontalHeader().setStretchLastSection(True)
@@ -156,7 +156,7 @@ def on_selection_changed(self):
 class TableSingleRowSelectorDialog(TableRowSelectorDialog):
     def set_options(self):
         super().set_options()
-        self.table.setSelectionMode(self.table.SingleSelection)
+        self.table.setSelectionMode(QTableWidget.SingleSelection)
 
     @property
     def selected_row(self):
@@ -169,7 +169,7 @@ def selected_row(self):
 if __name__ == '__main__':
     import sys
 
-    from PySide2.QtWidgets import QApplication
+    from PySide6.QtWidgets import QApplication
 
     app = QApplication(sys.argv)
 
@@ -185,4 +185,4 @@ def selected_rows():
     dialog.finished.connect(selected_rows)
     dialog.finished.connect(app.quit)
     dialog.show()
-    app.exec_()
+    app.exec()
diff --git a/hexrd/ui/thermal_factor_editor.py b/hexrdgui/thermal_factor_editor.py
similarity index 91%
rename from hexrd/ui/thermal_factor_editor.py
rename to hexrdgui/thermal_factor_editor.py
index 66d7c8a02..075e46058 100644
--- a/hexrd/ui/thermal_factor_editor.py
+++ b/hexrdgui/thermal_factor_editor.py
@@ -1,8 +1,8 @@
 import numpy as np
 
-from hexrd.ui.matrix_editor import MatrixEditor
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import apply_symmetric_constraint
+from hexrdgui.matrix_editor import MatrixEditor
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import apply_symmetric_constraint
 
 
 class ThermalFactorEditor:
@@ -29,8 +29,8 @@ def update_tab_widget(self):
         tab = getattr(self.ui, f'{prefix}_tab')
         self.ui.tab_widget.setCurrentWidget(tab)
 
-    def exec_(self):
-        return self.ui.exec_()
+    def exec(self):
+        return self.ui.exec()
 
     @property
     def value(self):
diff --git a/hexrd/ui/threshold_mask_dialog.py b/hexrdgui/threshold_mask_dialog.py
similarity index 87%
rename from hexrd/ui/threshold_mask_dialog.py
rename to hexrdgui/threshold_mask_dialog.py
index 5dd9d097a..b2788ceac 100644
--- a/hexrd/ui/threshold_mask_dialog.py
+++ b/hexrdgui/threshold_mask_dialog.py
@@ -3,12 +3,12 @@
 
 import numpy as np
 
-from PySide2.QtCore import QObject, Qt, Signal
-from PySide2.QtWidgets import QDialogButtonBox
-from hexrd.ui.create_raw_mask import apply_threshold_mask
-from hexrd.ui.hexrd_config import HexrdConfig
+from PySide6.QtCore import QObject, Qt, Signal
+from PySide6.QtWidgets import QDialogButtonBox
+from hexrdgui.create_raw_mask import apply_threshold_mask
+from hexrdgui.hexrd_config import HexrdConfig
 
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.ui_loader import UiLoader
 
 MAX_ROWS = 2
 
diff --git a/hexrd/ui/transform_dialog.py b/hexrdgui/transform_dialog.py
similarity index 90%
rename from hexrd/ui/transform_dialog.py
rename to hexrdgui/transform_dialog.py
index 5b390c0b7..ed21243bf 100644
--- a/hexrd/ui/transform_dialog.py
+++ b/hexrdgui/transform_dialog.py
@@ -1,8 +1,8 @@
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.image_load_manager import ImageLoadManager
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.image_load_manager import ImageLoadManager
+from hexrdgui.ui_loader import UiLoader
 
-from PySide2.QtWidgets import QComboBox, QHBoxLayout, QLabel, QSpacerItem
+from PySide6.QtWidgets import QComboBox, QHBoxLayout, QLabel, QSpacerItem
 
 class TransformDialog:
 
@@ -42,8 +42,8 @@ def setup_connections(self):
         self.ui.update_each.clicked.connect(self.toggle_options)
         self.ui.accepted.connect(self.apply_transforms)
 
-    def exec_(self):
-        return self.ui.exec_()
+    def exec(self):
+        return self.ui.exec()
 
     def toggle_options(self):
         enabled = self.ui.update_all.isChecked()
diff --git a/hexrd/ui/tree_views/__init__.py b/hexrdgui/tree_views/__init__.py
similarity index 100%
rename from hexrd/ui/tree_views/__init__.py
rename to hexrdgui/tree_views/__init__.py
diff --git a/hexrd/ui/tree_views/base_dict_tree_item_model.py b/hexrdgui/tree_views/base_dict_tree_item_model.py
similarity index 97%
rename from hexrd/ui/tree_views/base_dict_tree_item_model.py
rename to hexrdgui/tree_views/base_dict_tree_item_model.py
index 60e24aad4..f87b48157 100644
--- a/hexrd/ui/tree_views/base_dict_tree_item_model.py
+++ b/hexrdgui/tree_views/base_dict_tree_item_model.py
@@ -1,12 +1,12 @@
 from functools import partial
 
-from PySide2.QtCore import QItemSelection, QModelIndex, Qt, Signal
-from PySide2.QtGui import QCursor
-from PySide2.QtWidgets import QMenu, QMessageBox, QTreeView
+from PySide6.QtCore import QItemSelection, QModelIndex, Qt, Signal
+from PySide6.QtGui import QCursor
+from PySide6.QtWidgets import QMenu, QMessageBox, QTreeView
 
-from hexrd.ui.tree_views.base_tree_item_model import BaseTreeItemModel
-from hexrd.ui.tree_views.tree_item import TreeItem
-from hexrd.ui.utils import is_int
+from hexrdgui.tree_views.base_tree_item_model import BaseTreeItemModel
+from hexrdgui.tree_views.tree_item import TreeItem
+from hexrdgui.utils import is_int
 
 
 # Global constants
@@ -390,7 +390,7 @@ def change_combo_item(old, new, value):
             return super().contextMenuEvent(event)
 
         # Open up the context menu
-        action_chosen = menu.exec_(QCursor.pos())
+        action_chosen = menu.exec(QCursor.pos())
 
         if action_chosen is None:
             # No action chosen
diff --git a/hexrd/ui/tree_views/base_tree_item_model.py b/hexrdgui/tree_views/base_tree_item_model.py
similarity index 95%
rename from hexrd/ui/tree_views/base_tree_item_model.py
rename to hexrdgui/tree_views/base_tree_item_model.py
index e4851729a..9341af59b 100644
--- a/hexrd/ui/tree_views/base_tree_item_model.py
+++ b/hexrdgui/tree_views/base_tree_item_model.py
@@ -1,6 +1,6 @@
-from PySide2.QtCore import QAbstractItemModel, QModelIndex, Qt
+from PySide6.QtCore import QAbstractItemModel, QModelIndex, Qt
 
-from hexrd.ui.tree_views.tree_item import TreeItem
+from hexrdgui.tree_views.tree_item import TreeItem
 
 KEY_COL = 0
 
diff --git a/hexrd/ui/tree_views/dict_tree_view.py b/hexrdgui/tree_views/dict_tree_view.py
similarity index 91%
rename from hexrd/ui/tree_views/dict_tree_view.py
rename to hexrdgui/tree_views/dict_tree_view.py
index 24b0953d6..6504603e8 100644
--- a/hexrd/ui/tree_views/dict_tree_view.py
+++ b/hexrdgui/tree_views/dict_tree_view.py
@@ -1,10 +1,10 @@
-from PySide2.QtWidgets import QDialog, QVBoxLayout
+from PySide6.QtWidgets import QDialog, QVBoxLayout
 
-from hexrd.ui.tree_views.base_dict_tree_item_model import (
+from hexrdgui.tree_views.base_dict_tree_item_model import (
     BaseTreeItemModel, BaseDictTreeItemModel, BaseDictTreeView
 )
-from hexrd.ui.tree_views.tree_item import TreeItem
-from hexrd.ui.tree_views.value_column_delegate import ValueColumnDelegate
+from hexrdgui.tree_views.tree_item import TreeItem
+from hexrdgui.tree_views.value_column_delegate import ValueColumnDelegate
 
 
 # Global constants
diff --git a/hexrd/ui/tree_views/generic_picks_tree_view.py b/hexrdgui/tree_views/generic_picks_tree_view.py
similarity index 97%
rename from hexrd/ui/tree_views/generic_picks_tree_view.py
rename to hexrdgui/tree_views/generic_picks_tree_view.py
index ea85e18d9..7a4a701c6 100644
--- a/hexrd/ui/tree_views/generic_picks_tree_view.py
+++ b/hexrdgui/tree_views/generic_picks_tree_view.py
@@ -3,20 +3,20 @@
 
 import matplotlib.pyplot as plt
 
-from PySide2.QtCore import Qt, Signal
-from PySide2.QtGui import QCursor
-from PySide2.QtWidgets import (
+from PySide6.QtCore import Qt, Signal
+from PySide6.QtGui import QCursor
+from PySide6.QtWidgets import (
     QCheckBox, QDialog, QDialogButtonBox, QMenu, QVBoxLayout
 )
 
-from hexrd.ui.constants import ViewType
-from hexrd.ui.line_picker_dialog import LinePickerDialog
-from hexrd.ui.markers import igor_marker
-from hexrd.ui.tree_views.base_dict_tree_item_model import (
+from hexrdgui.constants import ViewType
+from hexrdgui.line_picker_dialog import LinePickerDialog
+from hexrdgui.markers import igor_marker
+from hexrdgui.tree_views.base_dict_tree_item_model import (
     BaseTreeItemModel, BaseDictTreeItemModel, BaseDictTreeView
 )
-from hexrd.ui.tree_views.tree_item import TreeItem
-from hexrd.ui.tree_views.value_column_delegate import ValueColumnDelegate
+from hexrdgui.tree_views.tree_item import TreeItem
+from hexrdgui.tree_views.value_column_delegate import ValueColumnDelegate
 
 # Global constants
 KEY_COL = BaseTreeItemModel.KEY_COL
@@ -387,7 +387,7 @@ def hand_pick_item():
             return
 
         # Open up the context menu
-        action_chosen = menu.exec_(QCursor.pos())
+        action_chosen = menu.exec(QCursor.pos())
 
         if action_chosen is None:
             # No action chosen
diff --git a/hexrd/ui/tree_views/hkl_picks_tree_view.py b/hexrdgui/tree_views/hkl_picks_tree_view.py
similarity index 92%
rename from hexrd/ui/tree_views/hkl_picks_tree_view.py
rename to hexrdgui/tree_views/hkl_picks_tree_view.py
index 560623b34..ea880f376 100644
--- a/hexrd/ui/tree_views/hkl_picks_tree_view.py
+++ b/hexrdgui/tree_views/hkl_picks_tree_view.py
@@ -1,15 +1,15 @@
 import numpy as np
 
-from PySide2.QtGui import QCursor
-from PySide2.QtWidgets import QMenu
+from PySide6.QtGui import QCursor
+from PySide6.QtWidgets import QMenu
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.overlays import Overlay
-from hexrd.ui.tree_views.base_dict_tree_item_model import BaseTreeItemModel
-from hexrd.ui.tree_views.generic_picks_tree_view import (
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.overlays import Overlay
+from hexrdgui.tree_views.base_dict_tree_item_model import BaseTreeItemModel
+from hexrdgui.tree_views.generic_picks_tree_view import (
     GenericPicksTreeView, TreeItem
 )
-from hexrd.ui.utils import hkl_str_to_array
+from hexrdgui.utils import hkl_str_to_array
 
 # Global constants
 KEY_COL = BaseTreeItemModel.KEY_COL
@@ -133,7 +133,7 @@ def hand_pick_item():
             return
 
         # Open up the context menu
-        action_chosen = menu.exec_(QCursor.pos())
+        action_chosen = menu.exec(QCursor.pos())
 
         if action_chosen is None:
             # No action chosen
diff --git a/hexrd/ui/tree_views/multi_column_dict_tree_view.py b/hexrdgui/tree_views/multi_column_dict_tree_view.py
similarity index 94%
rename from hexrd/ui/tree_views/multi_column_dict_tree_view.py
rename to hexrdgui/tree_views/multi_column_dict_tree_view.py
index 0ddc83b6d..e8e7523eb 100644
--- a/hexrd/ui/tree_views/multi_column_dict_tree_view.py
+++ b/hexrdgui/tree_views/multi_column_dict_tree_view.py
@@ -1,15 +1,15 @@
-from PySide2.QtCore import Signal, QModelIndex, Qt
-from PySide2.QtGui import QCursor
-from PySide2.QtWidgets import (
+from PySide6.QtCore import Signal, QModelIndex, Qt
+from PySide6.QtGui import QCursor
+from PySide6.QtWidgets import (
     QCheckBox, QDialog, QItemEditorFactory, QMenu, QStyledItemDelegate,
     QVBoxLayout
 )
 
-from hexrd.ui.scientificspinbox import ScientificDoubleSpinBox
-from hexrd.ui.tree_views.base_dict_tree_item_model import (
+from hexrdgui.scientificspinbox import ScientificDoubleSpinBox
+from hexrdgui.tree_views.base_dict_tree_item_model import (
     BaseDictTreeItemModel, BaseTreeItemModel, BaseDictTreeView
 )
-from hexrd.ui.tree_views.tree_item import TreeItem
+from hexrdgui.tree_views.tree_item import TreeItem
 
 # Global constants
 KEY_COL = BaseTreeItemModel.KEY_COL
@@ -170,7 +170,7 @@ def uncheck_selection():
             return
 
         # Open up the context menu
-        action_chosen = menu.exec_(QCursor.pos())
+        action_chosen = menu.exec(QCursor.pos())
 
         if action_chosen is None:
             # No action chosen
@@ -281,7 +281,7 @@ def __init__(self, delegate, parent=None):
     def createEditor(self, user_type, parent):
         # Normally in Qt, we'd use QVariant (like QVariant::Double) to compare
         # with the user_type integer. However, QVariant is not available in
-        # PySide2, making us use roundabout methods to get the integer like
+        # PySide6, making us use roundabout methods to get the integer like
         # below.
         def utype(w):
             return w.staticMetaObject.userProperty().userType()
@@ -291,7 +291,8 @@ def utype(w):
         if user_type == bool_type:
             cb = QCheckBox(parent)
             # Force an update when the check state changes
-            cb.toggled.connect(self.delegate.state_changed)
+            # Only indicate the status has changed on user interaction
+            cb.clicked.connect(self.delegate.state_changed)
             return cb
         if user_type == float_type:
             return ScientificDoubleSpinBox(parent)
@@ -303,7 +304,7 @@ def utype(w):
     import json
     import sys
 
-    from PySide2.QtWidgets import QApplication
+    from PySide6.QtWidgets import QApplication
 
     app = QApplication(sys.argv)
 
@@ -349,4 +350,4 @@ def utype(w):
 
     dialog.finished.connect(app.quit)
     dialog.show()
-    app.exec_()
+    app.exec()
diff --git a/hexrd/ui/tree_views/tree_item.py b/hexrdgui/tree_views/tree_item.py
similarity index 100%
rename from hexrd/ui/tree_views/tree_item.py
rename to hexrdgui/tree_views/tree_item.py
diff --git a/hexrd/ui/tree_views/value_column_delegate.py b/hexrdgui/tree_views/value_column_delegate.py
similarity index 87%
rename from hexrd/ui/tree_views/value_column_delegate.py
rename to hexrdgui/tree_views/value_column_delegate.py
index 5eb53485c..a9ce8583e 100644
--- a/hexrd/ui/tree_views/value_column_delegate.py
+++ b/hexrdgui/tree_views/value_column_delegate.py
@@ -1,16 +1,16 @@
-from PySide2.QtWidgets import (
+from PySide6.QtWidgets import (
     QItemEditorFactory,
     QPushButton,
     QStyledItemDelegate,
 )
 
-from PySide2.QtCore import QEvent, Qt
+from PySide6.QtCore import QEvent, Qt
 
-from hexrd.ui.scientificspinbox import ScientificDoubleSpinBox
-from hexrd.ui.calibration.panel_buffer_dialog import PanelBufferDialog
-from hexrd.ui.tree_views.base_tree_item_model import BaseTreeItemModel
-from hexrd.ui import constants
-from hexrd.ui.utils import EventBlocker
+from hexrdgui.scientificspinbox import ScientificDoubleSpinBox
+from hexrdgui.calibration.panel_buffer_dialog import PanelBufferDialog
+from hexrdgui.tree_views.base_tree_item_model import BaseTreeItemModel
+from hexrdgui import constants
+from hexrdgui.utils import EventBlocker
 
 BUTTON_LABEL = 'Configure Panel Buffer'
 
@@ -78,7 +78,7 @@ def __init__(self, parent=None):
     def createEditor(self, user_type, parent):
         # Normally in Qt, we'd use QVariant (like QVariant::Double) to compare
         # with the user_type integer. However, QVariant is not available in
-        # PySide2, making us use roundabout methods to get the integer like
+        # PySide6, making us use roundabout methods to get the integer like
         # below.
         float_type = (
             ScientificDoubleSpinBox.staticMetaObject.userProperty().userType()
diff --git a/hexrd/ui/ui_loader.py b/hexrdgui/ui_loader.py
similarity index 80%
rename from hexrd/ui/ui_loader.py
rename to hexrdgui/ui_loader.py
index 890211322..eb8655bf8 100644
--- a/hexrd/ui/ui_loader.py
+++ b/hexrdgui/ui_loader.py
@@ -1,12 +1,12 @@
-from PySide2.QtCore import QBuffer, QByteArray
-from PySide2.QtUiTools import QUiLoader
-from PySide2.QtWidgets import QDialog, QDialogButtonBox, QPushButton
+from PySide6.QtCore import QBuffer, QByteArray
+from PySide6.QtUiTools import QUiLoader
+from PySide6.QtWidgets import QDialog, QDialogButtonBox, QPushButton
 
-from hexrd.ui import enter_key_filter, resource_loader
+from hexrdgui import enter_key_filter, resource_loader
 
-from hexrd.ui.singletons import QSingleton
+from hexrdgui.singletons import QSingleton
 
-import hexrd.ui.resources.ui
+import hexrdgui.resources.ui
 
 
 class UiLoader(QUiLoader, metaclass=QSingleton):
@@ -17,11 +17,11 @@ def __init__(self, parent=None):
 
     def register_custom_widgets(self):
         # Import these here to avoid circular imports
-        from hexrd.ui.hidden_bar_tab_widget import HiddenBarTabWidget
-        from hexrd.ui.indexing.grains_table_view import GrainsTableView
-        from hexrd.ui.image_canvas import ImageCanvas
-        from hexrd.ui.image_tab_widget import ImageTabWidget
-        from hexrd.ui.scientificspinbox import ScientificDoubleSpinBox
+        from hexrdgui.hidden_bar_tab_widget import HiddenBarTabWidget
+        from hexrdgui.indexing.grains_table_view import GrainsTableView
+        from hexrdgui.image_canvas import ImageCanvas
+        from hexrdgui.image_tab_widget import ImageTabWidget
+        from hexrdgui.scientificspinbox import ScientificDoubleSpinBox
 
         register_list = [
             GrainsTableView,
@@ -42,7 +42,7 @@ def load_file(self, file_name, parent=None):
         :param file_name: The name of the ui file to load (must be located
                           in hexrd.resources.ui).
         """
-        text = resource_loader.load_resource(hexrd.ui.resources.ui, file_name)
+        text = resource_loader.load_resource(hexrdgui.resources.ui, file_name)
         return self.load_string(text, parent)
 
     def load_string(self, string, parent=None):
diff --git a/hexrd/ui/utils/__init__.py b/hexrdgui/utils/__init__.py
similarity index 98%
rename from hexrd/ui/utils/__init__.py
rename to hexrdgui/utils/__init__.py
index 72b7ff52b..b354fc0c5 100644
--- a/hexrd/ui/utils/__init__.py
+++ b/hexrdgui/utils/__init__.py
@@ -10,8 +10,8 @@
 import matplotlib.transforms as mtransforms
 import numpy as np
 
-from PySide2.QtCore import QObject, QSignalBlocker
-from PySide2.QtWidgets import QLayout
+from PySide6.QtCore import QObject, QSignalBlocker
+from PySide6.QtWidgets import QLayout
 
 from hexrd import imageutil
 from hexrd.imageseries.omega import OmegaImageSeries
@@ -125,7 +125,7 @@ def coords2index(im, x, y):
 
 def snip_width_pixels():
 
-    from hexrd.ui.hexrd_config import HexrdConfig
+    from hexrdgui.hexrd_config import HexrdConfig
 
     pixel_size_tth = HexrdConfig().polar_pixel_size_tth
     snip_width_deg = HexrdConfig().polar_snip1d_width
@@ -137,7 +137,7 @@ def snip_width_pixels():
 
 def run_snip1d(img):
 
-    from hexrd.ui.hexrd_config import HexrdConfig
+    from hexrdgui.hexrd_config import HexrdConfig
 
     snip_width = snip_width_pixels()
     numiter = HexrdConfig().polar_snip1d_numiter
@@ -274,7 +274,7 @@ def has_nan(x):
 
 
 def instr_to_internal_dict(instr, calibration_dict=None, convert_tilts=True):
-    from hexrd.ui.hexrd_config import HexrdConfig
+    from hexrdgui.hexrd_config import HexrdConfig
 
     # Convert an HEDMInstrument object into an internal dict we can
     # use for HexrdConfig.
@@ -513,7 +513,7 @@ def masks_applied_to_panel_buffers(instr):
     # This is useful, for instance, for auto point picking, where
     # we want the masked regions to be avoided.
 
-    from hexrd.ui.hexrd_config import HexrdConfig
+    from hexrdgui.hexrd_config import HexrdConfig
 
     panel_buffers = {k: copy.deepcopy(v.panel_buffer)
                      for k, v in instr.detectors.items()}
diff --git a/hexrd/ui/utils/conversions.py b/hexrdgui/utils/conversions.py
similarity index 98%
rename from hexrd/ui/utils/conversions.py
rename to hexrdgui/utils/conversions.py
index 583b9787f..facd80a0e 100644
--- a/hexrd/ui/utils/conversions.py
+++ b/hexrdgui/utils/conversions.py
@@ -4,7 +4,7 @@
 
 from hexrd.transforms.xfcapi import mapAngle
 
-from hexrd.ui.constants import KEV_TO_WAVELENGTH
+from hexrdgui.constants import KEV_TO_WAVELENGTH
 
 from .stereo2angle import ij2ang as stereo_ij2ang, ang2ij as ang2stereo_ij
 
diff --git a/hexrd/ui/utils/dialog.py b/hexrdgui/utils/dialog.py
similarity index 88%
rename from hexrd/ui/utils/dialog.py
rename to hexrdgui/utils/dialog.py
index ee22ac215..de85e5853 100644
--- a/hexrd/ui/utils/dialog.py
+++ b/hexrdgui/utils/dialog.py
@@ -1,5 +1,5 @@
-from PySide2.QtGui import QDesktopServices
-from PySide2.QtWidgets import QDialogButtonBox
+from PySide6.QtGui import QDesktopServices
+from PySide6.QtWidgets import QDialogButtonBox
 
 
 def open_url(url):
diff --git a/hexrd/ui/utils/dicts.py b/hexrdgui/utils/dicts.py
similarity index 100%
rename from hexrd/ui/utils/dicts.py
rename to hexrdgui/utils/dicts.py
diff --git a/hexrd/ui/utils/guess_instrument_type.py b/hexrdgui/utils/guess_instrument_type.py
similarity index 77%
rename from hexrd/ui/utils/guess_instrument_type.py
rename to hexrdgui/utils/guess_instrument_type.py
index a22a64971..7a224a49d 100644
--- a/hexrd/ui/utils/guess_instrument_type.py
+++ b/hexrdgui/utils/guess_instrument_type.py
@@ -1,4 +1,4 @@
-from hexrd.ui.constants import KNOWN_DETECTOR_NAMES
+from hexrdgui.constants import KNOWN_DETECTOR_NAMES
 
 
 def guess_instrument_type(detectors):
diff --git a/hexrd/ui/utils/stereo2angle.py b/hexrdgui/utils/stereo2angle.py
similarity index 100%
rename from hexrd/ui/utils/stereo2angle.py
rename to hexrdgui/utils/stereo2angle.py
diff --git a/hexrd/ui/utils/tth_distortion.py b/hexrdgui/utils/tth_distortion.py
similarity index 97%
rename from hexrd/ui/utils/tth_distortion.py
rename to hexrdgui/utils/tth_distortion.py
index 856ba9f63..29208527d 100644
--- a/hexrd/ui/utils/tth_distortion.py
+++ b/hexrdgui/utils/tth_distortion.py
@@ -3,7 +3,7 @@
 
 
 def apply_tth_distortion_if_needed(ang_crds, in_degrees=False, reverse=False):
-    from hexrd.ui.hexrd_config import HexrdConfig
+    from hexrdgui.hexrd_config import HexrdConfig
 
     # The ang_crds is a numpy array of angular coordinates
     # in_degrees indicates whether the polar data is in degrees or not
diff --git a/hexrd/ui/wppf_style_picker.py b/hexrdgui/wppf_style_picker.py
similarity index 90%
rename from hexrd/ui/wppf_style_picker.py
rename to hexrdgui/wppf_style_picker.py
index e2765bf04..68a2829cb 100644
--- a/hexrd/ui/wppf_style_picker.py
+++ b/hexrdgui/wppf_style_picker.py
@@ -1,14 +1,14 @@
 import copy
 
-from PySide2.QtCore import QObject
-from PySide2.QtGui import QColor
-from PySide2.QtWidgets import QColorDialog
+from PySide6.QtCore import QObject
+from PySide6.QtGui import QColor
+from PySide6.QtWidgets import QColorDialog
 
-from hexrd.ui import enter_key_filter
+from hexrdgui import enter_key_filter
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
 
 
 class WppfStylePicker(QObject):
@@ -93,7 +93,7 @@ def pick_color(self):
         color = sender.text()
 
         dialog = QColorDialog(QColor(color), self.ui)
-        if dialog.exec_():
+        if dialog.exec():
             sender.setText(dialog.selectedColor().name())
             self.update_button_colors()
             self.update_config()
diff --git a/hexrd/ui/xray_energy_selection_dialog.py b/hexrdgui/xray_energy_selection_dialog.py
similarity index 91%
rename from hexrd/ui/xray_energy_selection_dialog.py
rename to hexrdgui/xray_energy_selection_dialog.py
index c51616e65..ee955a647 100644
--- a/hexrd/ui/xray_energy_selection_dialog.py
+++ b/hexrdgui/xray_energy_selection_dialog.py
@@ -5,16 +5,16 @@
 import h5py
 import numpy as np
 
-from PySide2.QtWidgets import QDialogButtonBox, QMessageBox
+from PySide6.QtWidgets import QDialogButtonBox, QMessageBox
 
 from hexrd.instrument import unwrap_h5_to_dict
 import hexrd.resources
 from hexrd.utils.decorators import memoize
 
-from hexrd.ui.resource_loader import load_resource
-from hexrd.ui.tree_views.dict_tree_view import DictTreeViewDialog
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils.dialog import add_help_url
+from hexrdgui.resource_loader import load_resource
+from hexrdgui.tree_views.dict_tree_view import DictTreeViewDialog
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils.dialog import add_help_url
 
 
 class XRayEnergySelectionDialog(DictTreeViewDialog):
@@ -128,7 +128,7 @@ def sort(x):
 if __name__ == '__main__':
     import sys
 
-    from PySide2.QtWidgets import QApplication
+    from PySide6.QtWidgets import QApplication
 
     app = QApplication(sys.argv)
 
@@ -140,4 +140,4 @@ def finished():
 
     dialog.accepted.connect(finished)
     dialog.show()
-    app.exec_()
+    app.exec()
diff --git a/hexrd/ui/zoom_canvas.py b/hexrdgui/zoom_canvas.py
similarity index 99%
rename from hexrd/ui/zoom_canvas.py
rename to hexrdgui/zoom_canvas.py
index c1c89e3c8..4e2a67191 100644
--- a/hexrd/ui/zoom_canvas.py
+++ b/hexrdgui/zoom_canvas.py
@@ -1,5 +1,5 @@
-from PySide2.QtCore import Signal, QTimer
-from PySide2.QtWidgets import QSizePolicy
+from PySide6.QtCore import Signal, QTimer
+from PySide6.QtWidgets import QSizePolicy
 
 from matplotlib.backends.backend_qt5agg import FigureCanvas
 
@@ -8,7 +8,7 @@
 
 import numpy as np
 
-from hexrd.ui.constants import ViewType
+from hexrdgui.constants import ViewType
 
 
 class ZoomCanvas(FigureCanvas):
diff --git a/hexrd/ui/zoom_canvas_dialog.py b/hexrdgui/zoom_canvas_dialog.py
similarity index 96%
rename from hexrd/ui/zoom_canvas_dialog.py
rename to hexrdgui/zoom_canvas_dialog.py
index aa0ef51f9..d8660e0cf 100644
--- a/hexrd/ui/zoom_canvas_dialog.py
+++ b/hexrdgui/zoom_canvas_dialog.py
@@ -1,6 +1,6 @@
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.zoom_canvas import ZoomCanvas
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.zoom_canvas import ZoomCanvas
 
 
 class ZoomCanvasDialog:
diff --git a/packaging/CPackConfig.cmake b/packaging/CPackConfig.cmake
index dc5a40a50..ca371c28e 100644
--- a/packaging/CPackConfig.cmake
+++ b/packaging/CPackConfig.cmake
@@ -5,7 +5,7 @@ set(CPACK_CMAKE_GENERATOR "Unix Makefiles")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "hexrdgui")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "description.txt")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Qt5 PySide2 based HEXRD GUI")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Qt6 PySide6 based HEXRD GUI")
 set(CPACK_PACKAGE_EXECUTABLES "hexrdgui" "HEXRDGUI")
 set(CPACK_PACKAGE_NAME "HEXRDGUI")
 set(CPACK_PACKAGE_VENDOR "Kitware")
@@ -35,7 +35,7 @@ elseif(WIN32)
   set(CPACK_WIX_PROPERTY_ARPCONTACT "hexrd@kitware.com")
 
   set(CPACK_WIX_PROPERTY_ARPCOMMENTS
-    "Qt5 PySide2 based HEXRD GUI."
+    "Qt6 PySide6 based HEXRD GUI."
     )
 
   set(CPACK_WIX_PRODUCT_ICON
diff --git a/packaging/description.txt b/packaging/description.txt
index db4a39feb..57e6cc370 100644
--- a/packaging/description.txt
+++ b/packaging/description.txt
@@ -1 +1 @@
-Qt5 PySide2 based HEXRD GUI
+Qt6 PySide6 based HEXRD GUI
diff --git a/packaging/environment.yml b/packaging/environment.yml
index fc80c2aac..56b167a88 100644
--- a/packaging/environment.yml
+++ b/packaging/environment.yml
@@ -3,7 +3,7 @@ channels:
   - conda-forge
   - nodefaults
 dependencies:
-  - python=3.8
+  - python=3.11
   - coloredlogs
   - conda
   - cmake
diff --git a/packaging/hexrd.ico b/packaging/hexrd.ico
index 379cd3539..6c4d9f1ed 120000
--- a/packaging/hexrd.ico
+++ b/packaging/hexrd.ico
@@ -1 +1 @@
-../hexrd/ui/resources/icons/hexrd.ico
\ No newline at end of file
+../hexrdgui/resources/icons/hexrd.ico
\ No newline at end of file
diff --git a/packaging/package.py b/packaging/package.py
index 1a87c499c..b50658485 100644
--- a/packaging/package.py
+++ b/packaging/package.py
@@ -102,8 +102,8 @@ def build_conda_pack(base_path, tmp, hexrd_package_channel, hexrdgui_output_fold
     # First build the hexrdgui package
     recipe_path = str(base_path / '..' / 'conda.recipe')
     config = Config()
-    config.channel = ['cjh1', 'conda-forge']
-    config.channel_urls = ['cjh1', 'conda-forge']
+    config.channel = ['conda-forge']
+    config.channel_urls = ['conda-forge']
     config.override_channels = True
 
     if hexrdgui_output_folder is not None:
@@ -127,7 +127,6 @@ def build_conda_pack(base_path, tmp, hexrd_package_channel, hexrdgui_output_fold
     hexrd_version = results['hexrd'][-1]['version']
     config.variant['hexrd_version'] = hexrd_version
 
-    config.CONDA_PY = '38'
     config.CONDA_SOLVER = 'libmamba'
     logger.info('Building hexrdgui conda package.')
     CondaBuild.build(recipe_path, config=config)
@@ -160,7 +159,6 @@ def build_conda_pack(base_path, tmp, hexrd_package_channel, hexrdgui_output_fold
         '--override-channels',
         '--channel', hexrdgui_output_folder_uri,
         '--channel', hexrd_package_channel,
-        '--channel', 'cjh1',
         '--channel', 'conda-forge',
         f'hexrd=={hexrd_version}',
         'hexrdgui'
diff --git a/packaging/windows/hexrdgui-script.py b/packaging/windows/hexrdgui-script.py
index 800c895d7..e889927e2 100644
--- a/packaging/windows/hexrdgui-script.py
+++ b/packaging/windows/hexrdgui-script.py
@@ -10,7 +10,7 @@
 os.chdir(bin_path)
 os.environ['PATH'] = '%s;%s' % (os.environ['PATH'],  bin_path)
 
-from hexrd.ui.main import main
+from hexrdgui.main import main
 
 if __name__ == '__main__':
     sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
diff --git a/setup.py b/setup.py
index d408fb9db..fc69a3876 100644
--- a/setup.py
+++ b/setup.py
@@ -3,22 +3,15 @@
 from setuptools import setup, find_packages, Extension
 
 install_reqs = [
-    'Pillow',
-    'matplotlib',
-    'importlib-resources',
+    'hexrd',
     'fabio>=0.11',
+    'matplotlib',
+    'Pillow',
+    'pyside6',
     'pyyaml',
-    'hexrd',
-    'silx'
+    'silx',
 ]
 
-# This is a hack to get around the fact that pyside2 on conda-forge doesn't install
-# dist info so setuptools can't find it, even though its there, which results in
-# pkg_resources.DistributionNotFound, even though the package is available. So we
-# only added it if we aren't building with conda.
-if os.environ.get('CONDA_BUILD') != '1':
-    install_reqs.append('pyside2>=5.15')
-
 setup(
     name='hexrdgui',
     use_scm_version=True,
@@ -36,16 +29,16 @@
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10'
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
     ],
     packages=find_packages(),
-    package_data={'hexrd': ['ui/resources/**/*']},
-    python_requires='>=3.9',
+    package_data={'hexrdgui': ['resources/**/*']},
+    python_requires='>=3.10',
     install_requires=install_reqs,
     entry_points={
         'gui_scripts': [
-            'hexrdgui = hexrd.ui.main:main'
+            'hexrdgui = hexrdgui.main:main'
         ]
     }
 )
diff --git a/tests/conftest.py b/tests/conftest.py
index 36d0cdca4..be5602aac 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -3,9 +3,9 @@
 
 import pytest
 
-from PySide2.QtCore import QSettings
+from PySide6.QtCore import QSettings
 
-from hexrd.ui.main_window import MainWindow
+from hexrdgui.main_window import MainWindow
 
 
 @pytest.fixture
diff --git a/tests/test_hedm.py b/tests/test_hedm.py
index a98d79f2b..e48870a75 100644
--- a/tests/test_hedm.py
+++ b/tests/test_hedm.py
@@ -1,8 +1,8 @@
 import numpy as np
 
-from PySide2.QtCore import Qt
+from PySide6.QtCore import Qt
 
-from hexrd.ui.hexrd_config import HexrdConfig
+from hexrdgui.hexrd_config import HexrdConfig
 
 from utils import select_files_when_asked
 
diff --git a/tests/utils.py b/tests/utils.py
index eb996333e..a80b1518d 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -2,7 +2,7 @@
 
 from _pytest.monkeypatch import MonkeyPatch
 
-from PySide2.QtWidgets import QFileDialog
+from PySide6.QtWidgets import QFileDialog
 
 monkeypatch = MonkeyPatch()