diff --git a/astroquery/besancon/__init__.py b/astroquery/besancon/__init__.py
new file mode 100644
index 0000000000..d80dd8d276
--- /dev/null
+++ b/astroquery/besancon/__init__.py
@@ -0,0 +1 @@
+from besancon import *
diff --git a/astroquery/besancon/besancon.py b/astroquery/besancon/besancon.py
index 72ccef8f11..a584104c19 100644
--- a/astroquery/besancon/besancon.py
+++ b/astroquery/besancon/besancon.py
@@ -11,7 +11,7 @@
 import socket
 import time
 import copy
-from astrodata.utils import progressbar
+from astroquery.utils import progressbar
 import sys
 import re
 
diff --git a/docs/astrodata/besancon.rst b/docs/astroquery/besancon.rst
similarity index 96%
rename from docs/astrodata/besancon.rst
rename to docs/astroquery/besancon.rst
index 280826e249..47976b95d3 100644
--- a/docs/astrodata/besancon.rst
+++ b/docs/astroquery/besancon.rst
@@ -1,7 +1,7 @@
-.. _astrodata.besancon:
+.. _astroquery.besancon:
 
 *****************************************
-Besancon Queries (`astrodata.besancon`)
+Besancon Queries (`astroquery.besancon`)
 *****************************************
 
 Getting started
@@ -10,7 +10,7 @@ Getting started
 The following example illustrates an Besancon catalog/image query.  The API describes the
 relevant keyword arguments (of which there are many) ::
 
-    >>> from astrodata import besancon
+    >>> from astroquery import besancon
     >>> besancon_model = besancon.request_besancon('your@email.net',10.5,0.0)
     >>> import astropy.io.ascii as asciitable
     >>> from astropy.io.ascii import besancon as besancon_reader
@@ -68,5 +68,5 @@ A successful run should look something like this::
 Reference/API
 =============
 
-.. automodapi:: astrodata.besancon
+.. automodapi:: astroquery.besancon
     :no-inheritance-diagram:
diff --git a/docs/astroquery/index.rst b/docs/astroquery/index.rst
index ea1e1ef56a..5c511cf878 100644
--- a/docs/astroquery/index.rst
+++ b/docs/astroquery/index.rst
@@ -9,3 +9,6 @@ This is the documentation for the affiliated package.
   irsa.rst
   ukidss.rst
   magpis.rst
+  nrao.rst
+  simbad.rst
+  besancon.rst