diff --git a/apidoc/conf.py b/doc/conf.py
similarity index 100%
rename from apidoc/conf.py
rename to doc/conf.py
diff --git a/apidoc/fsl.data.atlases.rst b/doc/fsl.data.atlases.rst
similarity index 100%
rename from apidoc/fsl.data.atlases.rst
rename to doc/fsl.data.atlases.rst
diff --git a/apidoc/fsl.data.constants.rst b/doc/fsl.data.constants.rst
similarity index 100%
rename from apidoc/fsl.data.constants.rst
rename to doc/fsl.data.constants.rst
diff --git a/apidoc/fsl.data.featimage.rst b/doc/fsl.data.featimage.rst
similarity index 100%
rename from apidoc/fsl.data.featimage.rst
rename to doc/fsl.data.featimage.rst
diff --git a/apidoc/fsl.data.featresults.rst b/doc/fsl.data.featresults.rst
similarity index 100%
rename from apidoc/fsl.data.featresults.rst
rename to doc/fsl.data.featresults.rst
diff --git a/apidoc/fsl.data.image.rst b/doc/fsl.data.image.rst
similarity index 100%
rename from apidoc/fsl.data.image.rst
rename to doc/fsl.data.image.rst
diff --git a/apidoc/fsl.data.model.rst b/doc/fsl.data.model.rst
similarity index 100%
rename from apidoc/fsl.data.model.rst
rename to doc/fsl.data.model.rst
diff --git a/apidoc/fsl.data.rst b/doc/fsl.data.rst
similarity index 100%
rename from apidoc/fsl.data.rst
rename to doc/fsl.data.rst
diff --git a/apidoc/fsl.data.strings.rst b/doc/fsl.data.strings.rst
similarity index 100%
rename from apidoc/fsl.data.strings.rst
rename to doc/fsl.data.strings.rst
diff --git a/apidoc/fsl.rst b/doc/fsl.rst
similarity index 100%
rename from apidoc/fsl.rst
rename to doc/fsl.rst
diff --git a/apidoc/fsl.utils.colourbarbitmap.rst b/doc/fsl.utils.colourbarbitmap.rst
similarity index 100%
rename from apidoc/fsl.utils.colourbarbitmap.rst
rename to doc/fsl.utils.colourbarbitmap.rst
diff --git a/apidoc/fsl.utils.dialog.rst b/doc/fsl.utils.dialog.rst
similarity index 100%
rename from apidoc/fsl.utils.dialog.rst
rename to doc/fsl.utils.dialog.rst
diff --git a/apidoc/fsl.utils.layout.rst b/doc/fsl.utils.layout.rst
similarity index 100%
rename from apidoc/fsl.utils.layout.rst
rename to doc/fsl.utils.layout.rst
diff --git a/apidoc/fsl.utils.memoize.rst b/doc/fsl.utils.memoize.rst
similarity index 100%
rename from apidoc/fsl.utils.memoize.rst
rename to doc/fsl.utils.memoize.rst
diff --git a/apidoc/fsl.utils.notifier.rst b/doc/fsl.utils.notifier.rst
similarity index 100%
rename from apidoc/fsl.utils.notifier.rst
rename to doc/fsl.utils.notifier.rst
diff --git a/apidoc/fsl.utils.rst b/doc/fsl.utils.rst
similarity index 100%
rename from apidoc/fsl.utils.rst
rename to doc/fsl.utils.rst
diff --git a/apidoc/fsl.utils.runwindow.rst b/doc/fsl.utils.runwindow.rst
similarity index 100%
rename from apidoc/fsl.utils.runwindow.rst
rename to doc/fsl.utils.runwindow.rst
diff --git a/apidoc/fsl.utils.settings.rst b/doc/fsl.utils.settings.rst
similarity index 100%
rename from apidoc/fsl.utils.settings.rst
rename to doc/fsl.utils.settings.rst
diff --git a/apidoc/fsl.utils.status.rst b/doc/fsl.utils.status.rst
similarity index 100%
rename from apidoc/fsl.utils.status.rst
rename to doc/fsl.utils.status.rst
diff --git a/apidoc/fsl.utils.textbitmap.rst b/doc/fsl.utils.textbitmap.rst
similarity index 100%
rename from apidoc/fsl.utils.textbitmap.rst
rename to doc/fsl.utils.textbitmap.rst
diff --git a/apidoc/fsl.utils.transform.rst b/doc/fsl.utils.transform.rst
similarity index 100%
rename from apidoc/fsl.utils.transform.rst
rename to doc/fsl.utils.transform.rst
diff --git a/apidoc/fsl.utils.typedict.rst b/doc/fsl.utils.typedict.rst
similarity index 100%
rename from apidoc/fsl.utils.typedict.rst
rename to doc/fsl.utils.typedict.rst
diff --git a/apidoc/fsl.utils.webpage.rst b/doc/fsl.utils.webpage.rst
similarity index 100%
rename from apidoc/fsl.utils.webpage.rst
rename to doc/fsl.utils.webpage.rst
diff --git a/apidoc/fsl.version.rst b/doc/fsl.version.rst
similarity index 100%
rename from apidoc/fsl.version.rst
rename to doc/fsl.version.rst
diff --git a/apidoc/images/atlasinfopanel.png b/doc/images/atlasinfopanel.png
similarity index 100%
rename from apidoc/images/atlasinfopanel.png
rename to doc/images/atlasinfopanel.png
diff --git a/apidoc/images/atlasoverlaypanel.png b/doc/images/atlasoverlaypanel.png
similarity index 100%
rename from apidoc/images/atlasoverlaypanel.png
rename to doc/images/atlasoverlaypanel.png
diff --git a/apidoc/images/atlaspanel_overlay_names.png b/doc/images/atlaspanel_overlay_names.png
similarity index 100%
rename from apidoc/images/atlaspanel_overlay_names.png
rename to doc/images/atlaspanel_overlay_names.png
diff --git a/apidoc/images/canvassettingspanel.png b/doc/images/canvassettingspanel.png
similarity index 100%
rename from apidoc/images/canvassettingspanel.png
rename to doc/images/canvassettingspanel.png
diff --git a/apidoc/images/clusterpanel.png b/doc/images/clusterpanel.png
similarity index 100%
rename from apidoc/images/clusterpanel.png
rename to doc/images/clusterpanel.png
diff --git a/apidoc/images/colourbarbitmap.png b/doc/images/colourbarbitmap.png
similarity index 100%
rename from apidoc/images/colourbarbitmap.png
rename to doc/images/colourbarbitmap.png
diff --git a/apidoc/images/editor.png b/doc/images/editor.png
similarity index 100%
rename from apidoc/images/editor.png
rename to doc/images/editor.png
diff --git a/apidoc/images/fsldirdialog.png b/doc/images/fsldirdialog.png
similarity index 100%
rename from apidoc/images/fsldirdialog.png
rename to doc/images/fsldirdialog.png
diff --git a/apidoc/images/fsleyes.png b/doc/images/fsleyes.png
similarity index 100%
rename from apidoc/images/fsleyes.png
rename to doc/images/fsleyes.png
diff --git a/apidoc/images/fsleyes_architecture.png b/doc/images/fsleyes_architecture.png
similarity index 100%
rename from apidoc/images/fsleyes_architecture.png
rename to doc/images/fsleyes_architecture.png
diff --git a/apidoc/images/fsleyes_architecture.xcf b/doc/images/fsleyes_architecture.xcf
similarity index 100%
rename from apidoc/images/fsleyes_architecture.xcf
rename to doc/images/fsleyes_architecture.xcf
diff --git a/apidoc/images/fsleyestoolbar.png b/doc/images/fsleyestoolbar.png
similarity index 100%
rename from apidoc/images/fsleyestoolbar.png
rename to doc/images/fsleyestoolbar.png
diff --git a/apidoc/images/histogramcontrolpanel.png b/doc/images/histogramcontrolpanel.png
similarity index 100%
rename from apidoc/images/histogramcontrolpanel.png
rename to doc/images/histogramcontrolpanel.png
diff --git a/apidoc/images/histogramlistpanel.png b/doc/images/histogramlistpanel.png
similarity index 100%
rename from apidoc/images/histogramlistpanel.png
rename to doc/images/histogramlistpanel.png
diff --git a/apidoc/images/histogrampanel.png b/doc/images/histogrampanel.png
similarity index 100%
rename from apidoc/images/histogrampanel.png
rename to doc/images/histogrampanel.png
diff --git a/apidoc/images/lightboxpanel.png b/doc/images/lightboxpanel.png
similarity index 100%
rename from apidoc/images/lightboxpanel.png
rename to doc/images/lightboxpanel.png
diff --git a/apidoc/images/lightboxtoolbar.png b/doc/images/lightboxtoolbar.png
similarity index 100%
rename from apidoc/images/lightboxtoolbar.png
rename to doc/images/lightboxtoolbar.png
diff --git a/apidoc/images/locationpanel.png b/doc/images/locationpanel.png
similarity index 100%
rename from apidoc/images/locationpanel.png
rename to doc/images/locationpanel.png
diff --git a/apidoc/images/lookuptablepanel.png b/doc/images/lookuptablepanel.png
similarity index 100%
rename from apidoc/images/lookuptablepanel.png
rename to doc/images/lookuptablepanel.png
diff --git a/apidoc/images/orthoedittoolbar.png b/doc/images/orthoedittoolbar.png
similarity index 100%
rename from apidoc/images/orthoedittoolbar.png
rename to doc/images/orthoedittoolbar.png
diff --git a/apidoc/images/orthopanel.png b/doc/images/orthopanel.png
similarity index 100%
rename from apidoc/images/orthopanel.png
rename to doc/images/orthopanel.png
diff --git a/apidoc/images/orthotoolbar.png b/doc/images/orthotoolbar.png
similarity index 100%
rename from apidoc/images/orthotoolbar.png
rename to doc/images/orthotoolbar.png
diff --git a/apidoc/images/overlaydisplaypanel.png b/doc/images/overlaydisplaypanel.png
similarity index 100%
rename from apidoc/images/overlaydisplaypanel.png
rename to doc/images/overlaydisplaypanel.png
diff --git a/apidoc/images/overlaydisplaytoolbar.png b/doc/images/overlaydisplaytoolbar.png
similarity index 100%
rename from apidoc/images/overlaydisplaytoolbar.png
rename to doc/images/overlaydisplaytoolbar.png
diff --git a/apidoc/images/overlayinfopanel.png b/doc/images/overlayinfopanel.png
similarity index 100%
rename from apidoc/images/overlayinfopanel.png
rename to doc/images/overlayinfopanel.png
diff --git a/apidoc/images/overlaylistpanel.png b/doc/images/overlaylistpanel.png
similarity index 100%
rename from apidoc/images/overlaylistpanel.png
rename to doc/images/overlaylistpanel.png
diff --git a/apidoc/images/simplemessagedialog.png b/doc/images/simplemessagedialog.png
similarity index 100%
rename from apidoc/images/simplemessagedialog.png
rename to doc/images/simplemessagedialog.png
diff --git a/apidoc/images/texteditdialog.png b/doc/images/texteditdialog.png
similarity index 100%
rename from apidoc/images/texteditdialog.png
rename to doc/images/texteditdialog.png
diff --git a/apidoc/images/timeseriescontrolpanel.png b/doc/images/timeseriescontrolpanel.png
similarity index 100%
rename from apidoc/images/timeseriescontrolpanel.png
rename to doc/images/timeseriescontrolpanel.png
diff --git a/apidoc/images/timeserieslistpanel.png b/doc/images/timeserieslistpanel.png
similarity index 100%
rename from apidoc/images/timeserieslistpanel.png
rename to doc/images/timeserieslistpanel.png
diff --git a/apidoc/images/timeseriespanel.png b/doc/images/timeseriespanel.png
similarity index 100%
rename from apidoc/images/timeseriespanel.png
rename to doc/images/timeseriespanel.png
diff --git a/apidoc/images/x11_slicecanvas_show_bug.png b/doc/images/x11_slicecanvas_show_bug.png
similarity index 100%
rename from apidoc/images/x11_slicecanvas_show_bug.png
rename to doc/images/x11_slicecanvas_show_bug.png
diff --git a/apidoc/index.rst b/doc/index.rst
similarity index 100%
rename from apidoc/index.rst
rename to doc/index.rst
diff --git a/setup.py b/setup.py
index 143ca2945fc595ce7beb9327dbfcbe8a223c8b6c..b51d54995282a151d5f6a1f07d434d47521e7c55 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@ setup(
 
     version=version['__version__'],
 
-    description='Front end to FSL tools',
+    description='FSL Python library',
 
     url='https://git.fmrib.ox.ac.uk/paulmc/fslpy',
 
@@ -46,7 +46,7 @@ setup(
         'Programming Language :: Python :: 2.7',
         'Topic :: Software Development :: Libraries :: Python Modules'],
 
-    packages=find_packages(exclude=('apidoc', 'doc')),
+    packages=find_packages(exclude=('doc')),
 
     install_requires=[
         'pyopengl>=3.1.0',
@@ -56,20 +56,4 @@ setup(
         'matplotlib>=1.3.1',
         'nibabel>=1.3.0',
         'Pillow>=2.5.3'],
-
-    package_data={
-        'fsl' : [
-            'fsleyes/splash.png',
-            'fsleyes/icons/*.png',
-            'fsleyes/gl/gl14/*prog',
-            'fsleyes/gl/gl21/*glsl',
-            'fsleyes/colourmaps/*cmap',
-            'fsleyes/luts/*lut',
-            'fsleyes/colourmaps/README',
-            'fsleyes/colourmaps/order.txt',
-            'fsleyes/luts/order.txt',
-        ]
-    },
-
-    entry_points={'console_scripts' : ['fslpy = fsl:main']}
 )