diff --git a/docs/source/SKAAlarmHandler.rst b/docs/source/SKAAlarmHandler.rst
deleted file mode 100644
index d2fb79e6792e540a8d6672e9e5c7bbeb1353a6b5..0000000000000000000000000000000000000000
--- a/docs/source/SKAAlarmHandler.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-.. LMC Base Classes documentation master file, created by
-   sphinx-quickstart on Fri Jan 11 10:03:42 2019.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-SKA AlarmHandler
-============================================
-
-.. toctree::
-   :maxdepth: 2
-
-.. automodule:: SKAAlarmHandler.SKAAlarmHandler
-    :members: SKAAlarmHandler
\ No newline at end of file
diff --git a/docs/source/SKABaseDevice.rst b/docs/source/SKABaseDevice.rst
deleted file mode 100644
index ffc4606e026a66c9b17711fb22ab7aea3dfbff24..0000000000000000000000000000000000000000
--- a/docs/source/SKABaseDevice.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. LMC Base Classes documentation master file, created by
-   sphinx-quickstart on Fri Jan 11 10:03:42 2019.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-SKA BaseDevice
-============================================
-
-.. toctree::
-   :maxdepth: 2
-
-.. automodule:: SKABaseDevice.SKABaseDevice
-   :members: __all__
-
diff --git a/docs/source/SKACapability.rst b/docs/source/SKACapability.rst
deleted file mode 100644
index 664fbb724034221e60edf57a637ed5ae94da7b9e..0000000000000000000000000000000000000000
--- a/docs/source/SKACapability.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. LMC Base Classes documentation master file, created by
-   sphinx-quickstart on Fri Jan 11 10:03:42 2019.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-SKA Capability
-============================================
-
-.. toctree::
-   :maxdepth: 2
-
-.. automodule:: SKACapability.SKACapability
-   :members: SKACapability
-
diff --git a/docs/source/SKALogger.rst b/docs/source/SKALogger.rst
deleted file mode 100644
index 0a403da01a0cd04e6b2df8f42da686db1d64d8d7..0000000000000000000000000000000000000000
--- a/docs/source/SKALogger.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. LMC Base Classes documentation master file, created by
-   sphinx-quickstart on Fri Jan 11 10:03:42 2019.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-SKA Logger
-============================================
-
-.. toctree::
-   :maxdepth: 2
-
-.. automodule:: SKALogger.SKALogger
-   :members: SKALogger
-
diff --git a/docs/source/SKAMaster.rst b/docs/source/SKAMaster.rst
deleted file mode 100644
index 23c1951fbebe2d5ba4ca1dbfbdcc4dcb19c1bec2..0000000000000000000000000000000000000000
--- a/docs/source/SKAMaster.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. LMC Base Classes documentation master file, created by
-   sphinx-quickstart on Fri Jan 11 10:03:42 2019.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-SKA Master
-============================================
-
-.. toctree::
-   :maxdepth: 2
-
-.. automodule:: SKAMaster.SKAMaster
-   :members: SKAMaster
-
diff --git a/docs/source/SKAObsDevice.rst b/docs/source/SKAObsDevice.rst
deleted file mode 100644
index f679938cfbc090902561201e1b954508ef1ba959..0000000000000000000000000000000000000000
--- a/docs/source/SKAObsDevice.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. LMC Base Classes documentation master file, created by
-   sphinx-quickstart on Fri Jan 11 10:03:42 2019.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-SKA ObsDevice
-============================================
-
-.. toctree::
-   :maxdepth: 2
-
-.. automodule:: SKAObsDevice.SKAObsDevice
-   :members:
-
diff --git a/docs/source/SKASubarray.rst b/docs/source/SKASubarray.rst
deleted file mode 100644
index ada9fef9a11ebb4df72f57d5da6a1868501b616f..0000000000000000000000000000000000000000
--- a/docs/source/SKASubarray.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. LMC Base Classes documentation master file, created by
-   sphinx-quickstart on Fri Jan 11 10:03:42 2019.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-SKA Subarray
-============================================
-
-.. toctree::
-   :maxdepth: 2
-
-.. automodule:: SKASubarray.SKASubarray
-   :members: SKASubarray
-
diff --git a/docs/source/SKATelState.rst b/docs/source/SKATelState.rst
deleted file mode 100644
index 7843a841a3d43aa12f7ff365b6fa03081e80688c..0000000000000000000000000000000000000000
--- a/docs/source/SKATelState.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. LMC Base Classes documentation master file, created by
-   sphinx-quickstart on Fri Jan 11 10:03:42 2019.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-SKA TelState
-============================================
-
-.. toctree::
-   :maxdepth: 2
-
-.. automodule:: SKATelState.SKATelState
-   :members: SKATelState
-
diff --git a/docs/source/index.rst b/docs/source/index.rst
index bbdc4ab84aff49684940c4f561f038e512cd938b..94096a360aa1d27524d351df0d72f5cdf4378396 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -12,7 +12,7 @@ Welcome to LMC Base Classes documentation!
 
 .. automodule:: SKABaseDevice.SKABaseDeviceModule
 
-.. autoclass:: SKABaseDevice
+.. autoclass:: SKABaseDevice.SKABaseDeviceModule.SKABaseDevice
    :members:
 
 Indices and tables