diff --git a/openflexure_microscope/plugins/default/__init__.py b/openflexure_microscope/plugins/default/__init__.py
index f42b093e..e69de29b 100644
--- a/openflexure_microscope/plugins/default/__init__.py
+++ b/openflexure_microscope/plugins/default/__init__.py
@@ -1 +0,0 @@
-from .plugin import Plugin
\ No newline at end of file
diff --git a/openflexure_microscope/plugins/default/autofocus/__init__.py b/openflexure_microscope/plugins/default/autofocus/__init__.py
new file mode 100644
index 00000000..b88ad3f3
--- /dev/null
+++ b/openflexure_microscope/plugins/default/autofocus/__init__.py
@@ -0,0 +1 @@
+from .plugin import AutofocusPlugin
\ No newline at end of file
diff --git a/openflexure_microscope/plugins/default/api.py b/openflexure_microscope/plugins/default/autofocus/api.py
similarity index 63%
rename from openflexure_microscope/plugins/default/api.py
rename to openflexure_microscope/plugins/default/autofocus/api.py
index a97acf11..3f08ff58 100644
--- a/openflexure_microscope/plugins/default/api.py
+++ b/openflexure_microscope/plugins/default/autofocus/api.py
@@ -7,20 +7,6 @@ from flask import request, Response, escape, jsonify
 
 import logging
 
-
-class IdentifyAPI(MicroscopeViewPlugin):
-    """
-    A simple example API plugin, attached through the main microscope plugin.
-    """
-    def get(self):
-        """
-        Default plugin to return a plaintext representation of the camera and stage objects.
-
-        .. :quickref: Default plugin; Identify hardware
-        """
-        data = self.microscope.plugin.default.identify()  # Call a method from our plugin, using the full route
-        return Response(escape(data))
-
 class MeasureSharpnessAPI(MicroscopeViewPlugin):
     def post(self):
         payload = JsonPayload(request)
diff --git a/openflexure_microscope/plugins/default/focus_utils.py b/openflexure_microscope/plugins/default/autofocus/focus_utils.py
similarity index 100%
rename from openflexure_microscope/plugins/default/focus_utils.py
rename to openflexure_microscope/plugins/default/autofocus/focus_utils.py
diff --git a/openflexure_microscope/plugins/default/plugin.py b/openflexure_microscope/plugins/default/autofocus/plugin.py
similarity index 79%
rename from openflexure_microscope/plugins/default/plugin.py
rename to openflexure_microscope/plugins/default/autofocus/plugin.py
index f32e1d7d..1d0ec19c 100644
--- a/openflexure_microscope/plugins/default/plugin.py
+++ b/openflexure_microscope/plugins/default/autofocus/plugin.py
@@ -5,28 +5,19 @@ from openflexure_microscope.plugins import MicroscopePlugin
 from openflexure_microscope.utilities import set_properties
 
 from .focus_utils import sharpness_sum_lap2
-from .api import IdentifyAPI, MeasureSharpnessAPI, AutofocusAPI
+from .api import MeasureSharpnessAPI, AutofocusAPI
 
 
-class Plugin(MicroscopePlugin):
+class AutofocusPlugin(MicroscopePlugin):
     """
-    A set of default plugins
+    Basic autofocus plugin
     """
 
     api_views = {
-        '/identify': IdentifyAPI,
         '/measure_sharpness': MeasureSharpnessAPI,
         '/autofocus': AutofocusAPI,
     }
 
-    def identify(self):
-        """
-        Demonstrate access to Microscope.camera, and Microscope.stage
-        """
-
-        response = "My parent camera is {}, and my parent stage is {}.".format(self.microscope.camera, self.microscope.stage)
-        return response
-
     def autofocus(self, dz, settle=0.5, metric_fn=sharpness_sum_lap2):
         """Perform a simple autofocus routine.
         The stage is moved to z positions (relative to current position) in dz,