diff --git a/README b/README.txt
similarity index 100%
rename from README
rename to README.txt
diff --git a/doc/COPYING b/docs/COPYING
similarity index 100%
rename from doc/COPYING
rename to docs/COPYING
diff --git a/doc/ChangeLog b/docs/ChangeLog
similarity index 100%
rename from doc/ChangeLog
rename to docs/ChangeLog
diff --git a/doc/README.txt b/docs/README.txt
similarity index 100%
rename from doc/README.txt
rename to docs/README.txt
diff --git a/doc/README_Windows.txt b/docs/README_Windows.txt
similarity index 100%
rename from doc/README_Windows.txt
rename to docs/README_Windows.txt
diff --git a/doc/api_changes.txt b/docs/api_changes.txt
similarity index 100%
rename from doc/api_changes.txt
rename to docs/api_changes.txt
diff --git a/doc/attic/ipnb_google_soc.lyx b/docs/attic/ipnb_google_soc.lyx
similarity index 100%
rename from doc/attic/ipnb_google_soc.lyx
rename to docs/attic/ipnb_google_soc.lyx
diff --git a/doc/attic/nbexample.py b/docs/attic/nbexample.py
similarity index 100%
rename from doc/attic/nbexample.py
rename to docs/attic/nbexample.py
diff --git a/doc/attic/nbexample_latex.py b/docs/attic/nbexample_latex.py
similarity index 100%
rename from doc/attic/nbexample_latex.py
rename to docs/attic/nbexample_latex.py
diff --git a/doc/attic/nbexample_output.py b/docs/attic/nbexample_output.py
similarity index 100%
rename from doc/attic/nbexample_output.py
rename to docs/attic/nbexample_output.py
diff --git a/doc/attic/new_design.lyx b/docs/attic/new_design.lyx
similarity index 100%
rename from doc/attic/new_design.lyx
rename to docs/attic/new_design.lyx
diff --git a/doc/do_sphinx.py b/docs/do_sphinx.py
similarity index 100%
rename from doc/do_sphinx.py
rename to docs/do_sphinx.py
diff --git a/doc/examples/example-demo.py b/docs/examples/example-demo.py
similarity index 100%
rename from doc/examples/example-demo.py
rename to docs/examples/example-demo.py
diff --git a/doc/examples/example-embed-short.py b/docs/examples/example-embed-short.py
similarity index 100%
rename from doc/examples/example-embed-short.py
rename to docs/examples/example-embed-short.py
diff --git a/doc/examples/example-embed.py b/docs/examples/example-embed.py
similarity index 100%
rename from doc/examples/example-embed.py
rename to docs/examples/example-embed.py
diff --git a/doc/examples/example-gnuplot.py b/docs/examples/example-gnuplot.py
similarity index 100%
rename from doc/examples/example-gnuplot.py
rename to docs/examples/example-gnuplot.py
diff --git a/doc/examples/extension.py b/docs/examples/extension.py
similarity index 100%
rename from doc/examples/extension.py
rename to docs/examples/extension.py
diff --git a/doc/examples/ipy.vim b/docs/examples/ipy.vim
similarity index 100%
rename from doc/examples/ipy.vim
rename to docs/examples/ipy.vim
diff --git a/doc/examples/ipython_here_shell_extension.reg b/docs/examples/ipython_here_shell_extension.reg
similarity index 100%
rename from doc/examples/ipython_here_shell_extension.reg
rename to docs/examples/ipython_here_shell_extension.reg
diff --git a/doc/examples/leo_bridge_demo.leo b/docs/examples/leo_bridge_demo.leo
similarity index 100%
rename from doc/examples/leo_bridge_demo.leo
rename to docs/examples/leo_bridge_demo.leo
diff --git a/doc/examples/seteditor.py b/docs/examples/seteditor.py
similarity index 100%
rename from doc/examples/seteditor.py
rename to docs/examples/seteditor.py
diff --git a/doc/ipython.1 b/docs/ipython.1
similarity index 100%
rename from doc/ipython.1
rename to docs/ipython.1
diff --git a/doc/ipython.el b/docs/ipython.el
similarity index 100%
rename from doc/ipython.el
rename to docs/ipython.el
diff --git a/doc/pycolor.1 b/docs/pycolor.1
similarity index 100%
rename from doc/pycolor.1
rename to docs/pycolor.1
diff --git a/doc/pycon.ico b/docs/pycon.ico
similarity index 100%
rename from doc/pycon.ico
rename to docs/pycon.ico
Binary files a/doc/pycon.ico and b/docs/pycon.ico differ
diff --git a/doc/source/conf.py b/docs/source/conf.py
similarity index 100%
rename from doc/source/conf.py
rename to docs/source/conf.py
diff --git a/doc/source/ipython.rst b/docs/source/ipython.rst
similarity index 100%
rename from doc/source/ipython.rst
rename to docs/source/ipython.rst
diff --git a/doc/update_version.sh b/docs/update_version.sh
similarity index 100%
rename from doc/update_version.sh
rename to docs/update_version.sh