Consolidate imports

doc/callbacks/docs_logging_callback.md

@@ -1,5 +1,5 @@
 # Document Logging Callback
 
-The [`document_logger`](ibex_bluesky_core.callbacks.document_logger) is a callback that the BlueSky RunEngine subscribes to unconditionally. After receiving each document, if they share the same start document (in the same run) then it will write them to the same file. These logs are stored under `C:/instrument/var/logs/bluesky/raw_documents` and are handled by the log rotation.
+The [`DocLoggingCallback`](ibex_bluesky_core.callbacks.DocLoggingCallback) is a callback that the BlueSky RunEngine subscribes to unconditionally. After receiving each document, if they share the same start document (in the same run) then it will write them to the same file. These logs are stored under `C:/instrument/var/logs/bluesky/raw_documents` and are handled by the log rotation.
 
 Each document is stored in a JSON format so can be both machine and human readable. It is in the format `{"type": name, "document": document}` whereby `name` is the type of the document, e.g start, stop, event, descriptor and the `document` is the [document from BlueSky in JSON format](https://blueskyproject.io/bluesky/main/documents.html). As these files are produced per BlueSky run, these will be useful for debugging.

doc/callbacks/file_writing.md

@@ -1,7 +1,7 @@
 # File writing callbacks
 ## Human readable files
 
-A callback ([`HumanReadableFileCallback`](ibex_bluesky_core.callbacks.file_logger.HumanReadableFileCallback))  exists to write all documents to a separate human-readable file which contains the specified fields. 
+A callback ([`HumanReadableFileCallback`](ibex_bluesky_core.callbacks.HumanReadableFileCallback))  exists to write all documents to a separate human-readable file which contains the specified fields. 
 
 This callback will add units and honour precision for each field as well as add some metadata ie. the `uid` of each scan as well as the RB number, which is injected using the {doc}`/preprocessors/rbnumberpp`
 

doc/callbacks/plotting.md

@@ -1,26 +1,26 @@
 # Plotting
 
 Bluesky has good integration with `matplotlib` for data visualization, and data from scans 
-may be easily plotted using the [`LivePlot`](ibex_bluesky_core.callbacks.plotting.LivePlot)  callback.
+may be easily plotted using the [`LivePlot`](ibex_bluesky_core.callbacks.LivePlot)  callback.
 
 `ibex_bluesky_core` provides a thin wrapper over bluesky's default `LivePlot` callback,
 which ensures that plots are promptly displayed in IBEX.
 
-In order to use the wrapper, import [`LivePlot`](ibex_bluesky_core.callbacks.plotting.LivePlot) from [`ibex_bluesky_core`](ibex_bluesky_core) rather than 
+In order to use the wrapper, import [`LivePlot`](ibex_bluesky_core.callbacks.LivePlot) from [`ibex_bluesky_core`](ibex_bluesky_core) rather than 
 `bluesky` directly:
 ```
 from ibex_bluesky_core.callbacks.plotting import LivePlot
 ```
 
 ## Configuration
 
-A range of configuration options for [`LivePlot`](ibex_bluesky_core.callbacks.plotting.LivePlot) are available - see the 
+A range of configuration options for [`LivePlot`](ibex_bluesky_core.callbacks.LivePlot) are available - see the 
 [bluesky `LivePlot` documentation](https://blueskyproject.io/bluesky/main/callbacks.html#bluesky.callbacks.mpl_plotting.LivePlot)
 for more details about available options.
 
-The [`LivePlot`](ibex_bluesky_core.callbacks.plotting.LivePlot) object allows an arbitrary set of matplotlib `Axes` to be passed in, onto
+The [`LivePlot`](ibex_bluesky_core.callbacks.LivePlot) object allows an arbitrary set of matplotlib `Axes` to be passed in, onto
 which it will plot. This can be used to configure properties which are not directly exposed 
-on the [`LivePlot`](ibex_bluesky_core.callbacks.plotting.LivePlot) object, for example log-scaled axes.
+on the [`LivePlot`](ibex_bluesky_core.callbacks.LivePlot) object, for example log-scaled axes.
 
 See the [matplotlib `Axes` documentation](https://matplotlib.org/stable/api/_as_gen/matplotlib.axes.Axes.html) 
 for a full range of options on how to configure an `Axes` object.
@@ -30,7 +30,7 @@ to plot a scan with a logarithmically-scaled y-axis:
 
 ```python
 import matplotlib.pyplot as plt
-from ibex_bluesky_core.callbacks.plotting import LivePlot
+from ibex_bluesky_core.callbacks import LivePlot
 from ibex_bluesky_core.plan_stubs import call_qt_aware
 
 def plan():
@@ -50,7 +50,7 @@ See [docs for `call_qt_aware`](../plan_stubs/matplotlib_helpers.md) for a descri
 `yield from call_qt_aware` rather than calling `matplotlib` functions directly.
 ```
 
-By providing a signal name to the `yerr` argument you can pass uncertainties to [`LivePlot`](ibex_bluesky_core.callbacks.plotting.LivePlot), by not providing anything for this argument means that no errorbars will be drawn. Errorbars are drawn after each point collected, displaying their standard deviation- uncertainty data is collected from Bluesky event documents and errorbars are updated after every new point added.
+By providing a signal name to the `yerr` argument you can pass uncertainties to [`LivePlot`](ibex_bluesky_core.callbacks.LivePlot), by not providing anything for this argument means that no errorbars will be drawn. Errorbars are drawn after each point collected, displaying their standard deviation- uncertainty data is collected from Bluesky event documents and errorbars are updated after every new point added.
 
 The `plot_callback` object can then be subscribed to the run engine, using either:
 - An explicit callback when calling the run engine: `RE(some_plan(), plot_callback)`

doc/dev/troubleshooting.md

@@ -47,9 +47,9 @@ Scientist-facing output files are written to `<isis share>\inst$\NDX<inst>\user\
 default.
 
 Custom file-output paths can be specified by passing extra arguments to 
-{py:obj}`HumanReadableFileCallback<ibex_bluesky_core.callbacks.file_logger.HumanReadableFileCallback>` 
+{py:obj}`HumanReadableFileCallback<ibex_bluesky_core.callbacks.HumanReadableFileCallback>` 
 for the "human-readable" files, or 
-{py:obj}`LiveFitLogger<ibex_bluesky_core.callbacks.fitting.livefit_logger.LiveFitLogger>` 
+{py:obj}`LiveFitLogger<ibex_bluesky_core.callbacks.LiveFitLogger>` 
 for the fit output files. These callbacks may be hidden behind
 {py:obj}`ISISCallbacks<ibex_bluesky_core.callbacks.ISISCallbacks>` which also allows specifying output paths.
 
@@ -62,7 +62,7 @@ Raw documents emitted by bluesky are stored in `C:\Instrument\Var\logs\bluesky\r
 data emitted by bluesky scans. The filenames in this directory correspond to bluesky's scan ID, which is printed to 
 the console at the end of each scan, and is also included as metadata in the scientist-facing output files.
 
-These files are written by {py:obj}`ibex_bluesky_core.callbacks.document_logger.DocLoggingCallback`, which is subscribed
+These files are written by {py:obj}`ibex_bluesky_core.callbacks.DocLoggingCallback`, which is subscribed
 to the run engine by default in {py:obj}`ibex_bluesky_core.run_engine.get_run_engine`.
 
 ```{note}