diff --git a/docs/conf.py b/docs/source/conf.py
similarity index 96%
rename from docs/conf.py
rename to docs/source/conf.py
index a3937bb05..37928ae21 100644
--- a/docs/conf.py
+++ b/docs/source/conf.py
@@ -201,12 +201,12 @@
 
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
-    'python': ('https://docs.python.org/', None),
+    'python': ('https://docs.python.org/3/', None),
     'astropy': ('http://docs.astropy.org/en/stable/', None),
     'astroplan': ('https://astroplan.readthedocs.io/en/latest/', None),
-    'NumPy': ('http://docs.scipy.org/doc/numpy/', None),
-    'SciPy': ('http://docs.scipy.org/doc/scipy/reference', None),
-    'matplotlib': ('http://matplotlib.org', None),
+    'NumPy': ('https://docs.scipy.org/doc/numpy/', None),
+    'SciPy': ('https://docs.scipy.org/doc/scipy/reference', None),
+    'matplotlib': ('https://matplotlib.org', None),
 }
 
 
diff --git a/docs/source/index.rst b/docs/source/index.rst
index e6f428f9a..d278f8aef 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -10,7 +10,7 @@ PANOPTES Utilities
    :maxdepth: 1
    :caption: Contents:
 
-   panoptes_utils
+   panoptes.utils
 
 .. 	mdinclude:: README.md
 
diff --git a/docs/source/panoptes.utils.tests.data.rst b/docs/source/panoptes.utils.tests.data.rst
deleted file mode 100644
index b2a255d80..000000000
--- a/docs/source/panoptes.utils.tests.data.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-panoptes.utils.tests.data package
-=================================
-
-Module contents
----------------
-
-.. automodule:: panoptes.utils.tests.data
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/docs/source/panoptes.utils.tests.rst b/docs/source/panoptes.utils.tests.rst
deleted file mode 100644
index 3e810de28..000000000
--- a/docs/source/panoptes.utils.tests.rst
+++ /dev/null
@@ -1,126 +0,0 @@
-panoptes.utils.tests package
-============================
-
-Subpackages
------------
-
-.. toctree::
-
-    panoptes.utils.tests.data
-    panoptes.utils.tests.serial_handlers
-
-Submodules
-----------
-
-panoptes.utils.tests.test\_config\_server module
-------------------------------------------------
-
-.. automodule:: panoptes.utils.tests.test_config_server
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-panoptes.utils.tests.test\_database module
-------------------------------------------
-
-.. automodule:: panoptes.utils.tests.test_database
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-panoptes.utils.tests.test\_fits\_utils module
----------------------------------------------
-
-.. automodule:: panoptes.utils.tests.test_fits_utils
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-panoptes.utils.tests.test\_focus\_utils module
-----------------------------------------------
-
-.. automodule:: panoptes.utils.tests.test_focus_utils
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-panoptes.utils.tests.test\_horizon module
------------------------------------------
-
-.. automodule:: panoptes.utils.tests.test_horizon
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-panoptes.utils.tests.test\_image\_utils module
-----------------------------------------------
-
-.. automodule:: panoptes.utils.tests.test_image_utils
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-panoptes.utils.tests.test\_logger module
-----------------------------------------
-
-.. automodule:: panoptes.utils.tests.test_logger
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-panoptes.utils.tests.test\_messaging module
--------------------------------------------
-
-.. automodule:: panoptes.utils.tests.test_messaging
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-panoptes.utils.tests.test\_polar\_alignment module
---------------------------------------------------
-
-.. automodule:: panoptes.utils.tests.test_polar_alignment
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-panoptes.utils.tests.test\_rs232 module
----------------------------------------
-
-.. automodule:: panoptes.utils.tests.test_rs232
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-panoptes.utils.tests.test\_serializers module
----------------------------------------------
-
-.. automodule:: panoptes.utils.tests.test_serializers
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-panoptes.utils.tests.test\_theskyx\_utils module
-------------------------------------------------
-
-.. automodule:: panoptes.utils.tests.test_theskyx_utils
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-panoptes.utils.tests.test\_utils module
----------------------------------------
-
-.. automodule:: panoptes.utils.tests.test_utils
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: panoptes.utils.tests
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/docs/source/panoptes.utils.tests.serial_handlers.rst b/docs/source/panoptes.utils.tests.serial_handlers.rst
deleted file mode 100644
index 2d8e0359a..000000000
--- a/docs/source/panoptes.utils.tests.serial_handlers.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-panoptes.utils.tests.serial\_handlers package
-=============================================
-
-Submodules
-----------
-
-panoptes.utils.tests.serial\_handlers.protocol\_arduinosimulator module
------------------------------------------------------------------------
-
-.. automodule:: panoptes.utils.tests.serial_handlers.protocol_arduinosimulator
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-panoptes.utils.tests.serial\_handlers.protocol\_buffers module
---------------------------------------------------------------
-
-.. automodule:: panoptes.utils.tests.serial_handlers.protocol_buffers
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-panoptes.utils.tests.serial\_handlers.protocol\_hooked module
--------------------------------------------------------------
-
-.. automodule:: panoptes.utils.tests.serial_handlers.protocol_hooked
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-panoptes.utils.tests.serial\_handlers.protocol\_no\_op module
--------------------------------------------------------------
-
-.. automodule:: panoptes.utils.tests.serial_handlers.protocol_no_op
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: panoptes.utils.tests.serial_handlers
-    :members:
-    :undoc-members:
-    :show-inheritance: