Remove version numbers in packages/ directory

diff --git a/admin/package-update.sh b/admin/package-update.sh
index 95c389a76310b844408a3a31ca312b9d2b71b03b..b1c8b21c75363dbfa5ffd7a1ba16a76c32ca09bd 100755 (executable)
--- a/admin/package-update.sh
+++ b/admin/package-update.sh
@@ -65,8 +65,6 @@ echo "Exporting packages to temporary working directory $TMP_PKGROOT" >> $LOG
 rm -rf $TMP_PKGROOT
 $BZR export $TMP_PKGROOT $REPO_PACKAGES
 
-## Call the `make-package-archive' Lisp function.
-
 ## If second arg is provided, copy in the admin directory and run the
 ## Org daily synch scripts
 if [ -z $FULL ]; then

diff --git a/packages/all-1.0.el b/packages/all.el
similarity index 100%
rename from packages/all-1.0.el
rename to packages/all.el

diff --git a/packages/auctex-11.86/README b/packages/auctex/README
similarity index 100%
rename from packages/auctex-11.86/README
rename to packages/auctex/README

diff --git a/packages/auctex-11.86/auctex-pkg.el b/packages/auctex/auctex-pkg.el
similarity index 100%
rename from packages/auctex-11.86/auctex-pkg.el
rename to packages/auctex/auctex-pkg.el

diff --git a/packages/auctex-11.86/auctex.info b/packages/auctex/auctex.info
similarity index 100%
rename from packages/auctex-11.86/auctex.info
rename to packages/auctex/auctex.info

diff --git a/packages/auctex-11.86/auctex.info-1 b/packages/auctex/auctex.info-1
similarity index 100%
rename from packages/auctex-11.86/auctex.info-1
rename to packages/auctex/auctex.info-1

diff --git a/packages/auctex-11.86/auctex.info-2 b/packages/auctex/auctex.info-2
similarity index 100%
rename from packages/auctex-11.86/auctex.info-2
rename to packages/auctex/auctex.info-2

diff --git a/packages/auctex-11.86/bib-cite.el b/packages/auctex/bib-cite.el
similarity index 100%
rename from packages/auctex-11.86/bib-cite.el
rename to packages/auctex/bib-cite.el

diff --git a/packages/auctex-11.86/context-en.el b/packages/auctex/context-en.el
similarity index 100%
rename from packages/auctex-11.86/context-en.el
rename to packages/auctex/context-en.el

diff --git a/packages/auctex-11.86/context-nl.el b/packages/auctex/context-nl.el
similarity index 100%
rename from packages/auctex-11.86/context-nl.el
rename to packages/auctex/context-nl.el

diff --git a/packages/auctex-11.86/context.el b/packages/auctex/context.el
similarity index 100%
rename from packages/auctex-11.86/context.el
rename to packages/auctex/context.el

diff --git a/packages/auctex-11.86/dir b/packages/auctex/dir
similarity index 100%
rename from packages/auctex-11.86/dir
rename to packages/auctex/dir

diff --git a/packages/auctex-11.86/doc/preview.dvi b/packages/auctex/doc/preview.dvi
similarity index 100%
rename from packages/auctex-11.86/doc/preview.dvi
rename to packages/auctex/doc/preview.dvi

diff --git a/packages/auctex-11.86/doc/tex-ref.pdf b/packages/auctex/doc/tex-ref.pdf
similarity index 100%
rename from packages/auctex-11.86/doc/tex-ref.pdf
rename to packages/auctex/doc/tex-ref.pdf

diff --git a/packages/auctex-11.86/font-latex.el b/packages/auctex/font-latex.el
similarity index 100%
rename from packages/auctex-11.86/font-latex.el
rename to packages/auctex/font-latex.el

diff --git a/packages/auctex-11.86/images/amstex.xpm b/packages/auctex/images/amstex.xpm
similarity index 100%
rename from packages/auctex-11.86/images/amstex.xpm
rename to packages/auctex/images/amstex.xpm

diff --git a/packages/auctex-11.86/images/bibtex.xpm b/packages/auctex/images/bibtex.xpm
similarity index 100%
rename from packages/auctex-11.86/images/bibtex.xpm
rename to packages/auctex/images/bibtex.xpm

diff --git a/packages/auctex-11.86/images/dropdown.xpm b/packages/auctex/images/dropdown.xpm
similarity index 100%
rename from packages/auctex-11.86/images/dropdown.xpm
rename to packages/auctex/images/dropdown.xpm

diff --git a/packages/auctex-11.86/images/dvipdf.xpm b/packages/auctex/images/dvipdf.xpm
similarity index 100%
rename from packages/auctex-11.86/images/dvipdf.xpm
rename to packages/auctex/images/dvipdf.xpm

diff --git a/packages/auctex-11.86/images/dvips.xpm b/packages/auctex/images/dvips.xpm
similarity index 100%
rename from packages/auctex-11.86/images/dvips.xpm
rename to packages/auctex/images/dvips.xpm

diff --git a/packages/auctex-11.86/images/error.xpm b/packages/auctex/images/error.xpm
similarity index 100%
rename from packages/auctex-11.86/images/error.xpm
rename to packages/auctex/images/error.xpm

diff --git a/packages/auctex-11.86/images/exec.xpm b/packages/auctex/images/exec.xpm
similarity index 100%
rename from packages/auctex-11.86/images/exec.xpm
rename to packages/auctex/images/exec.xpm

diff --git a/packages/auctex-11.86/images/execbibtex.xpm b/packages/auctex/images/execbibtex.xpm
similarity index 100%
rename from packages/auctex-11.86/images/execbibtex.xpm
rename to packages/auctex/images/execbibtex.xpm

diff --git a/packages/auctex-11.86/images/execdvips.xpm b/packages/auctex/images/execdvips.xpm
similarity index 100%
rename from packages/auctex-11.86/images/execdvips.xpm
rename to packages/auctex/images/execdvips.xpm

diff --git a/packages/auctex-11.86/images/execerror.xpm b/packages/auctex/images/execerror.xpm
similarity index 100%
rename from packages/auctex-11.86/images/execerror.xpm
rename to packages/auctex/images/execerror.xpm

diff --git a/packages/auctex-11.86/images/execpdftex.xpm b/packages/auctex/images/execpdftex.xpm
similarity index 100%
rename from packages/auctex-11.86/images/execpdftex.xpm
rename to packages/auctex/images/execpdftex.xpm

diff --git a/packages/auctex-11.86/images/exectex.xpm b/packages/auctex/images/exectex.xpm
similarity index 100%
rename from packages/auctex-11.86/images/exectex.xpm
rename to packages/auctex/images/exectex.xpm

diff --git a/packages/auctex-11.86/images/execviewdvi.xpm b/packages/auctex/images/execviewdvi.xpm
similarity index 100%
rename from packages/auctex-11.86/images/execviewdvi.xpm
rename to packages/auctex/images/execviewdvi.xpm

diff --git a/packages/auctex-11.86/images/execviewpdf.xpm b/packages/auctex/images/execviewpdf.xpm
similarity index 100%
rename from packages/auctex-11.86/images/execviewpdf.xpm
rename to packages/auctex/images/execviewpdf.xpm

diff --git a/packages/auctex-11.86/images/execviewps.xpm b/packages/auctex/images/execviewps.xpm
similarity index 100%
rename from packages/auctex-11.86/images/execviewps.xpm
rename to packages/auctex/images/execviewps.xpm

diff --git a/packages/auctex-11.86/images/gv.xpm b/packages/auctex/images/gv.xpm
similarity index 100%
rename from packages/auctex-11.86/images/gv.xpm
rename to packages/auctex/images/gv.xpm

diff --git a/packages/auctex-11.86/images/jumpdvi.xpm b/packages/auctex/images/jumpdvi.xpm
similarity index 100%
rename from packages/auctex-11.86/images/jumpdvi.xpm
rename to packages/auctex/images/jumpdvi.xpm

diff --git a/packages/auctex-11.86/images/ltx-symb-turn-off.xpm b/packages/auctex/images/ltx-symb-turn-off.xpm
similarity index 100%
rename from packages/auctex-11.86/images/ltx-symb-turn-off.xpm
rename to packages/auctex/images/ltx-symb-turn-off.xpm

diff --git a/packages/auctex-11.86/images/ltx-symb-turn-on.xpm b/packages/auctex/images/ltx-symb-turn-on.xpm
similarity index 100%
rename from packages/auctex-11.86/images/ltx-symb-turn-on.xpm
rename to packages/auctex/images/ltx-symb-turn-on.xpm

diff --git a/packages/auctex-11.86/images/pdftex.xpm b/packages/auctex/images/pdftex.xpm
similarity index 100%
rename from packages/auctex-11.86/images/pdftex.xpm
rename to packages/auctex/images/pdftex.xpm

diff --git a/packages/auctex-11.86/images/prverr16.xpm b/packages/auctex/images/prverr16.xpm
similarity index 100%
rename from packages/auctex-11.86/images/prverr16.xpm
rename to packages/auctex/images/prverr16.xpm

diff --git a/packages/auctex-11.86/images/prverr20.xpm b/packages/auctex/images/prverr20.xpm
similarity index 100%
rename from packages/auctex-11.86/images/prverr20.xpm
rename to packages/auctex/images/prverr20.xpm

diff --git a/packages/auctex-11.86/images/prverr24.xbm b/packages/auctex/images/prverr24.xbm
similarity index 100%
rename from packages/auctex-11.86/images/prverr24.xbm
rename to packages/auctex/images/prverr24.xbm

diff --git a/packages/auctex-11.86/images/prverr24.xpm b/packages/auctex/images/prverr24.xpm
similarity index 100%
rename from packages/auctex-11.86/images/prverr24.xpm
rename to packages/auctex/images/prverr24.xpm

diff --git a/packages/auctex-11.86/images/prvtex-cap-up.xpm b/packages/auctex/images/prvtex-cap-up.xpm
similarity index 100%
rename from packages/auctex-11.86/images/prvtex-cap-up.xpm
rename to packages/auctex/images/prvtex-cap-up.xpm

diff --git a/packages/auctex-11.86/images/prvtex12.xbm b/packages/auctex/images/prvtex12.xbm
similarity index 100%
rename from packages/auctex-11.86/images/prvtex12.xbm
rename to packages/auctex/images/prvtex12.xbm

diff --git a/packages/auctex-11.86/images/prvtex12.xpm b/packages/auctex/images/prvtex12.xpm
similarity index 100%
rename from packages/auctex-11.86/images/prvtex12.xpm
rename to packages/auctex/images/prvtex12.xpm

diff --git a/packages/auctex-11.86/images/prvtex16.xbm b/packages/auctex/images/prvtex16.xbm
similarity index 100%
rename from packages/auctex-11.86/images/prvtex16.xbm
rename to packages/auctex/images/prvtex16.xbm

diff --git a/packages/auctex-11.86/images/prvtex16.xpm b/packages/auctex/images/prvtex16.xpm
similarity index 100%
rename from packages/auctex-11.86/images/prvtex16.xpm
rename to packages/auctex/images/prvtex16.xpm

diff --git a/packages/auctex-11.86/images/prvtex20.xpm b/packages/auctex/images/prvtex20.xpm
similarity index 100%
rename from packages/auctex-11.86/images/prvtex20.xpm
rename to packages/auctex/images/prvtex20.xpm

diff --git a/packages/auctex-11.86/images/prvtex24.xbm b/packages/auctex/images/prvtex24.xbm
similarity index 100%
rename from packages/auctex-11.86/images/prvtex24.xbm
rename to packages/auctex/images/prvtex24.xbm

diff --git a/packages/auctex-11.86/images/prvtex24.xpm b/packages/auctex/images/prvtex24.xpm
similarity index 100%
rename from packages/auctex-11.86/images/prvtex24.xpm
rename to packages/auctex/images/prvtex24.xpm

diff --git a/packages/auctex-11.86/images/prvwrk12.xpm b/packages/auctex/images/prvwrk12.xpm
similarity index 100%
rename from packages/auctex-11.86/images/prvwrk12.xpm
rename to packages/auctex/images/prvwrk12.xpm

diff --git a/packages/auctex-11.86/images/prvwrk14.xpm b/packages/auctex/images/prvwrk14.xpm
similarity index 100%
rename from packages/auctex-11.86/images/prvwrk14.xpm
rename to packages/auctex/images/prvwrk14.xpm

diff --git a/packages/auctex-11.86/images/prvwrk16.xpm b/packages/auctex/images/prvwrk16.xpm
similarity index 100%
rename from packages/auctex-11.86/images/prvwrk16.xpm
rename to packages/auctex/images/prvwrk16.xpm

diff --git a/packages/auctex-11.86/images/prvwrk20.xpm b/packages/auctex/images/prvwrk20.xpm
similarity index 100%
rename from packages/auctex-11.86/images/prvwrk20.xpm
rename to packages/auctex/images/prvwrk20.xpm

diff --git a/packages/auctex-11.86/images/prvwrk24.xbm b/packages/auctex/images/prvwrk24.xbm
similarity index 100%
rename from packages/auctex-11.86/images/prvwrk24.xbm
rename to packages/auctex/images/prvwrk24.xbm

diff --git a/packages/auctex-11.86/images/prvwrk24.xpm b/packages/auctex/images/prvwrk24.xpm
similarity index 100%
rename from packages/auctex-11.86/images/prvwrk24.xpm
rename to packages/auctex/images/prvwrk24.xpm

diff --git a/packages/auctex-11.86/images/pspdf.xpm b/packages/auctex/images/pspdf.xpm
similarity index 100%
rename from packages/auctex-11.86/images/pspdf.xpm
rename to packages/auctex/images/pspdf.xpm

diff --git a/packages/auctex-11.86/images/sep.xpm b/packages/auctex/images/sep.xpm
similarity index 100%
rename from packages/auctex-11.86/images/sep.xpm
rename to packages/auctex/images/sep.xpm

diff --git a/packages/auctex-11.86/images/tex.xpm b/packages/auctex/images/tex.xpm
similarity index 100%
rename from packages/auctex-11.86/images/tex.xpm
rename to packages/auctex/images/tex.xpm

diff --git a/packages/auctex-11.86/images/view.xpm b/packages/auctex/images/view.xpm
similarity index 100%
rename from packages/auctex-11.86/images/view.xpm
rename to packages/auctex/images/view.xpm

diff --git a/packages/auctex-11.86/images/viewdvi.xpm b/packages/auctex/images/viewdvi.xpm
similarity index 100%
rename from packages/auctex-11.86/images/viewdvi.xpm
rename to packages/auctex/images/viewdvi.xpm

diff --git a/packages/auctex-11.86/images/viewpdf.xpm b/packages/auctex/images/viewpdf.xpm
similarity index 100%
rename from packages/auctex-11.86/images/viewpdf.xpm
rename to packages/auctex/images/viewpdf.xpm

diff --git a/packages/auctex-11.86/images/viewps.xpm b/packages/auctex/images/viewps.xpm
similarity index 100%
rename from packages/auctex-11.86/images/viewps.xpm
rename to packages/auctex/images/viewps.xpm

diff --git a/packages/auctex-11.86/latex.el b/packages/auctex/latex.el
similarity index 100%
rename from packages/auctex-11.86/latex.el
rename to packages/auctex/latex.el

diff --git a/packages/auctex-11.86/latex/prauctex.cfg b/packages/auctex/latex/prauctex.cfg
similarity index 100%
rename from packages/auctex-11.86/latex/prauctex.cfg
rename to packages/auctex/latex/prauctex.cfg

diff --git a/packages/auctex-11.86/latex/prauctex.def b/packages/auctex/latex/prauctex.def
similarity index 100%
rename from packages/auctex-11.86/latex/prauctex.def
rename to packages/auctex/latex/prauctex.def

diff --git a/packages/auctex-11.86/latex/prcounters.def b/packages/auctex/latex/prcounters.def
similarity index 100%
rename from packages/auctex-11.86/latex/prcounters.def
rename to packages/auctex/latex/prcounters.def

diff --git a/packages/auctex-11.86/latex/preview.sty b/packages/auctex/latex/preview.sty
similarity index 100%
rename from packages/auctex-11.86/latex/preview.sty
rename to packages/auctex/latex/preview.sty

diff --git a/packages/auctex-11.86/latex/prfootnotes.def b/packages/auctex/latex/prfootnotes.def
similarity index 100%
rename from packages/auctex-11.86/latex/prfootnotes.def
rename to packages/auctex/latex/prfootnotes.def

diff --git a/packages/auctex-11.86/latex/prlyx.def b/packages/auctex/latex/prlyx.def
similarity index 100%
rename from packages/auctex-11.86/latex/prlyx.def
rename to packages/auctex/latex/prlyx.def

diff --git a/packages/auctex-11.86/latex/prshowbox.def b/packages/auctex/latex/prshowbox.def
similarity index 100%
rename from packages/auctex-11.86/latex/prshowbox.def
rename to packages/auctex/latex/prshowbox.def

diff --git a/packages/auctex-11.86/latex/prshowlabels.def b/packages/auctex/latex/prshowlabels.def
similarity index 100%
rename from packages/auctex-11.86/latex/prshowlabels.def
rename to packages/auctex/latex/prshowlabels.def

diff --git a/packages/auctex-11.86/latex/prtightpage.def b/packages/auctex/latex/prtightpage.def
similarity index 100%
rename from packages/auctex-11.86/latex/prtightpage.def
rename to packages/auctex/latex/prtightpage.def

diff --git a/packages/auctex-11.86/latex/prtracingall.def b/packages/auctex/latex/prtracingall.def
similarity index 100%
rename from packages/auctex-11.86/latex/prtracingall.def
rename to packages/auctex/latex/prtracingall.def

diff --git a/packages/auctex-11.86/multi-prompt.el b/packages/auctex/multi-prompt.el
similarity index 100%
rename from packages/auctex-11.86/multi-prompt.el
rename to packages/auctex/multi-prompt.el

diff --git a/packages/auctex-11.86/preview-latex.info b/packages/auctex/preview-latex.info
similarity index 100%
rename from packages/auctex-11.86/preview-latex.info
rename to packages/auctex/preview-latex.info

diff --git a/packages/auctex-11.86/preview.el b/packages/auctex/preview.el
similarity index 100%
rename from packages/auctex-11.86/preview.el
rename to packages/auctex/preview.el

diff --git a/packages/auctex-11.86/prv-emacs.el b/packages/auctex/prv-emacs.el
similarity index 100%
rename from packages/auctex-11.86/prv-emacs.el
rename to packages/auctex/prv-emacs.el

diff --git a/packages/auctex-11.86/style/.nosearch b/packages/auctex/style/.nosearch
similarity index 100%
rename from packages/auctex-11.86/style/.nosearch
rename to packages/auctex/style/.nosearch

diff --git a/packages/auctex-11.86/style/CJK.el b/packages/auctex/style/CJK.el
similarity index 100%
rename from packages/auctex-11.86/style/CJK.el
rename to packages/auctex/style/CJK.el

diff --git a/packages/auctex-11.86/style/CJKutf8.el b/packages/auctex/style/CJKutf8.el
similarity index 100%
rename from packages/auctex-11.86/style/CJKutf8.el
rename to packages/auctex/style/CJKutf8.el

diff --git a/packages/auctex-11.86/style/MinionPro.el b/packages/auctex/style/MinionPro.el
similarity index 100%
rename from packages/auctex-11.86/style/MinionPro.el
rename to packages/auctex/style/MinionPro.el

diff --git a/packages/auctex-11.86/style/alltt.el b/packages/auctex/style/alltt.el
similarity index 100%
rename from packages/auctex-11.86/style/alltt.el
rename to packages/auctex/style/alltt.el

diff --git a/packages/auctex-11.86/style/alphanum.el b/packages/auctex/style/alphanum.el
similarity index 100%
rename from packages/auctex-11.86/style/alphanum.el
rename to packages/auctex/style/alphanum.el

diff --git a/packages/auctex-11.86/style/amsart.el b/packages/auctex/style/amsart.el
similarity index 100%
rename from packages/auctex-11.86/style/amsart.el
rename to packages/auctex/style/amsart.el

diff --git a/packages/auctex-11.86/style/amsbook.el b/packages/auctex/style/amsbook.el
similarity index 100%
rename from packages/auctex-11.86/style/amsbook.el
rename to packages/auctex/style/amsbook.el

diff --git a/packages/auctex-11.86/style/amsbsy.el b/packages/auctex/style/amsbsy.el
similarity index 100%
rename from packages/auctex-11.86/style/amsbsy.el
rename to packages/auctex/style/amsbsy.el

diff --git a/packages/auctex-11.86/style/amsmath.el b/packages/auctex/style/amsmath.el
similarity index 100%
rename from packages/auctex-11.86/style/amsmath.el
rename to packages/auctex/style/amsmath.el

diff --git a/packages/auctex-11.86/style/amsopn.el b/packages/auctex/style/amsopn.el
similarity index 100%
rename from packages/auctex-11.86/style/amsopn.el
rename to packages/auctex/style/amsopn.el

diff --git a/packages/auctex-11.86/style/amstex.el b/packages/auctex/style/amstex.el
similarity index 100%
rename from packages/auctex-11.86/style/amstex.el
rename to packages/auctex/style/amstex.el

diff --git a/packages/auctex-11.86/style/amstext.el b/packages/auctex/style/amstext.el
similarity index 100%
rename from packages/auctex-11.86/style/amstext.el
rename to packages/auctex/style/amstext.el

diff --git a/packages/auctex-11.86/style/amsthm.el b/packages/auctex/style/amsthm.el
similarity index 100%
rename from packages/auctex-11.86/style/amsthm.el
rename to packages/auctex/style/amsthm.el

diff --git a/packages/auctex-11.86/style/article.el b/packages/auctex/style/article.el
similarity index 100%
rename from packages/auctex-11.86/style/article.el
rename to packages/auctex/style/article.el

diff --git a/packages/auctex-11.86/style/austrian.el b/packages/auctex/style/austrian.el
similarity index 100%
rename from packages/auctex-11.86/style/austrian.el
rename to packages/auctex/style/austrian.el

diff --git a/packages/auctex-11.86/style/babel.el b/packages/auctex/style/babel.el
similarity index 100%
rename from packages/auctex-11.86/style/babel.el
rename to packages/auctex/style/babel.el

diff --git a/packages/auctex-11.86/style/beamer.el b/packages/auctex/style/beamer.el
similarity index 100%
rename from packages/auctex-11.86/style/beamer.el
rename to packages/auctex/style/beamer.el

diff --git a/packages/auctex-11.86/style/book.el b/packages/auctex/style/book.el
similarity index 100%
rename from packages/auctex-11.86/style/book.el
rename to packages/auctex/style/book.el

diff --git a/packages/auctex-11.86/style/booktabs.el b/packages/auctex/style/booktabs.el
similarity index 100%
rename from packages/auctex-11.86/style/booktabs.el
rename to packages/auctex/style/booktabs.el

diff --git a/packages/auctex-11.86/style/bulgarian.el b/packages/auctex/style/bulgarian.el
similarity index 100%
rename from packages/auctex-11.86/style/bulgarian.el
rename to packages/auctex/style/bulgarian.el

diff --git a/packages/auctex-11.86/style/captcont.el b/packages/auctex/style/captcont.el
similarity index 100%
rename from packages/auctex-11.86/style/captcont.el
rename to packages/auctex/style/captcont.el

diff --git a/packages/auctex-11.86/style/comment.el b/packages/auctex/style/comment.el
similarity index 100%
rename from packages/auctex-11.86/style/comment.el
rename to packages/auctex/style/comment.el

diff --git a/packages/auctex-11.86/style/csquotes.el b/packages/auctex/style/csquotes.el
similarity index 100%
rename from packages/auctex-11.86/style/csquotes.el
rename to packages/auctex/style/csquotes.el

diff --git a/packages/auctex-11.86/style/czech.el b/packages/auctex/style/czech.el
similarity index 100%
rename from packages/auctex-11.86/style/czech.el
rename to packages/auctex/style/czech.el

diff --git a/packages/auctex-11.86/style/danish.el b/packages/auctex/style/danish.el
similarity index 100%
rename from packages/auctex-11.86/style/danish.el
rename to packages/auctex/style/danish.el

diff --git a/packages/auctex-11.86/style/dk-bib.el b/packages/auctex/style/dk-bib.el
similarity index 100%
rename from packages/auctex-11.86/style/dk-bib.el
rename to packages/auctex/style/dk-bib.el

diff --git a/packages/auctex-11.86/style/dk.el b/packages/auctex/style/dk.el
similarity index 100%
rename from packages/auctex-11.86/style/dk.el
rename to packages/auctex/style/dk.el

diff --git a/packages/auctex-11.86/style/doc.el b/packages/auctex/style/doc.el
similarity index 100%
rename from packages/auctex-11.86/style/doc.el
rename to packages/auctex/style/doc.el

diff --git a/packages/auctex-11.86/style/dutch.el b/packages/auctex/style/dutch.el
similarity index 100%
rename from packages/auctex-11.86/style/dutch.el
rename to packages/auctex/style/dutch.el

diff --git a/packages/auctex-11.86/style/emp.el b/packages/auctex/style/emp.el
similarity index 100%
rename from packages/auctex-11.86/style/emp.el
rename to packages/auctex/style/emp.el

diff --git a/packages/auctex-11.86/style/fancyref.el b/packages/auctex/style/fancyref.el
similarity index 100%
rename from packages/auctex-11.86/style/fancyref.el
rename to packages/auctex/style/fancyref.el

diff --git a/packages/auctex-11.86/style/flashcards.el b/packages/auctex/style/flashcards.el
similarity index 100%
rename from packages/auctex-11.86/style/flashcards.el
rename to packages/auctex/style/flashcards.el

diff --git a/packages/auctex-11.86/style/foils.el b/packages/auctex/style/foils.el
similarity index 100%
rename from packages/auctex-11.86/style/foils.el
rename to packages/auctex/style/foils.el

diff --git a/packages/auctex-11.86/style/francais.el b/packages/auctex/style/francais.el
similarity index 100%
rename from packages/auctex-11.86/style/francais.el
rename to packages/auctex/style/francais.el

diff --git a/packages/auctex-11.86/style/frenchb.el b/packages/auctex/style/frenchb.el
similarity index 100%
rename from packages/auctex-11.86/style/frenchb.el
rename to packages/auctex/style/frenchb.el

diff --git a/packages/auctex-11.86/style/german.el b/packages/auctex/style/german.el
similarity index 100%
rename from packages/auctex-11.86/style/german.el
rename to packages/auctex/style/german.el

diff --git a/packages/auctex-11.86/style/graphics.el b/packages/auctex/style/graphics.el
similarity index 100%
rename from packages/auctex-11.86/style/graphics.el
rename to packages/auctex/style/graphics.el

diff --git a/packages/auctex-11.86/style/graphicx.el b/packages/auctex/style/graphicx.el
similarity index 100%
rename from packages/auctex-11.86/style/graphicx.el
rename to packages/auctex/style/graphicx.el

diff --git a/packages/auctex-11.86/style/harvard.el b/packages/auctex/style/harvard.el
similarity index 100%
rename from packages/auctex-11.86/style/harvard.el
rename to packages/auctex/style/harvard.el

diff --git a/packages/auctex-11.86/style/hyperref.el b/packages/auctex/style/hyperref.el
similarity index 100%
rename from packages/auctex-11.86/style/hyperref.el
rename to packages/auctex/style/hyperref.el

diff --git a/packages/auctex-11.86/style/icelandic.el b/packages/auctex/style/icelandic.el
similarity index 100%
rename from packages/auctex-11.86/style/icelandic.el
rename to packages/auctex/style/icelandic.el

diff --git a/packages/auctex-11.86/style/index.el b/packages/auctex/style/index.el
similarity index 100%
rename from packages/auctex-11.86/style/index.el
rename to packages/auctex/style/index.el

diff --git a/packages/auctex-11.86/style/inputenc.el b/packages/auctex/style/inputenc.el
similarity index 100%
rename from packages/auctex-11.86/style/inputenc.el
rename to packages/auctex/style/inputenc.el

diff --git a/packages/auctex-11.86/style/italian.el b/packages/auctex/style/italian.el
similarity index 100%
rename from packages/auctex-11.86/style/italian.el
rename to packages/auctex/style/italian.el

diff --git a/packages/auctex-11.86/style/j-article.el b/packages/auctex/style/j-article.el
similarity index 100%
rename from packages/auctex-11.86/style/j-article.el
rename to packages/auctex/style/j-article.el

diff --git a/packages/auctex-11.86/style/j-book.el b/packages/auctex/style/j-book.el
similarity index 100%
rename from packages/auctex-11.86/style/j-book.el
rename to packages/auctex/style/j-book.el

diff --git a/packages/auctex-11.86/style/j-report.el b/packages/auctex/style/j-report.el
similarity index 100%
rename from packages/auctex-11.86/style/j-report.el
rename to packages/auctex/style/j-report.el

diff --git a/packages/auctex-11.86/style/jarticle.el b/packages/auctex/style/jarticle.el
similarity index 100%
rename from packages/auctex-11.86/style/jarticle.el
rename to packages/auctex/style/jarticle.el

diff --git a/packages/auctex-11.86/style/jbook.el b/packages/auctex/style/jbook.el
similarity index 100%
rename from packages/auctex-11.86/style/jbook.el
rename to packages/auctex/style/jbook.el

diff --git a/packages/auctex-11.86/style/jreport.el b/packages/auctex/style/jreport.el
similarity index 100%
rename from packages/auctex-11.86/style/jreport.el
rename to packages/auctex/style/jreport.el

diff --git a/packages/auctex-11.86/style/jsarticle.el b/packages/auctex/style/jsarticle.el
similarity index 100%
rename from packages/auctex-11.86/style/jsarticle.el
rename to packages/auctex/style/jsarticle.el

diff --git a/packages/auctex-11.86/style/jsbook.el b/packages/auctex/style/jsbook.el
similarity index 100%
rename from packages/auctex-11.86/style/jsbook.el
rename to packages/auctex/style/jsbook.el

diff --git a/packages/auctex-11.86/style/jura.el b/packages/auctex/style/jura.el
similarity index 100%
rename from packages/auctex-11.86/style/jura.el
rename to packages/auctex/style/jura.el

diff --git a/packages/auctex-11.86/style/jurabib.el b/packages/auctex/style/jurabib.el
similarity index 100%
rename from packages/auctex-11.86/style/jurabib.el
rename to packages/auctex/style/jurabib.el

diff --git a/packages/auctex-11.86/style/letter.el b/packages/auctex/style/letter.el
similarity index 100%
rename from packages/auctex-11.86/style/letter.el
rename to packages/auctex/style/letter.el

diff --git a/packages/auctex-11.86/style/listings.el b/packages/auctex/style/listings.el
similarity index 100%
rename from packages/auctex-11.86/style/listings.el
rename to packages/auctex/style/listings.el

diff --git a/packages/auctex-11.86/style/ltx-base.el b/packages/auctex/style/ltx-base.el
similarity index 100%
rename from packages/auctex-11.86/style/ltx-base.el
rename to packages/auctex/style/ltx-base.el

diff --git a/packages/auctex-11.86/style/ltxdoc.el b/packages/auctex/style/ltxdoc.el
similarity index 100%
rename from packages/auctex-11.86/style/ltxdoc.el
rename to packages/auctex/style/ltxdoc.el

diff --git a/packages/auctex-11.86/style/makeidx.el b/packages/auctex/style/makeidx.el
similarity index 100%
rename from packages/auctex-11.86/style/makeidx.el
rename to packages/auctex/style/makeidx.el

diff --git a/packages/auctex-11.86/style/mdwlist.el b/packages/auctex/style/mdwlist.el
similarity index 100%
rename from packages/auctex-11.86/style/mdwlist.el
rename to packages/auctex/style/mdwlist.el

diff --git a/packages/auctex-11.86/style/multido.el b/packages/auctex/style/multido.el
similarity index 100%
rename from packages/auctex-11.86/style/multido.el
rename to packages/auctex/style/multido.el

diff --git a/packages/auctex-11.86/style/multind.el b/packages/auctex/style/multind.el
similarity index 100%
rename from packages/auctex-11.86/style/multind.el
rename to packages/auctex/style/multind.el

diff --git a/packages/auctex-11.86/style/natbib.el b/packages/auctex/style/natbib.el
similarity index 100%
rename from packages/auctex-11.86/style/natbib.el
rename to packages/auctex/style/natbib.el

diff --git a/packages/auctex-11.86/style/naustrian.el b/packages/auctex/style/naustrian.el
similarity index 100%
rename from packages/auctex-11.86/style/naustrian.el
rename to packages/auctex/style/naustrian.el

diff --git a/packages/auctex-11.86/style/ngerman.el b/packages/auctex/style/ngerman.el
similarity index 100%
rename from packages/auctex-11.86/style/ngerman.el
rename to packages/auctex/style/ngerman.el

diff --git a/packages/auctex-11.86/style/nicefrac.el b/packages/auctex/style/nicefrac.el
similarity index 100%
rename from packages/auctex-11.86/style/nicefrac.el
rename to packages/auctex/style/nicefrac.el

diff --git a/packages/auctex-11.86/style/nomencl.el b/packages/auctex/style/nomencl.el
similarity index 100%
rename from packages/auctex-11.86/style/nomencl.el
rename to packages/auctex/style/nomencl.el

diff --git a/packages/auctex-11.86/style/paralist.el b/packages/auctex/style/paralist.el
similarity index 100%
rename from packages/auctex-11.86/style/paralist.el
rename to packages/auctex/style/paralist.el

diff --git a/packages/auctex-11.86/style/pdfsync.el b/packages/auctex/style/pdfsync.el
similarity index 100%
rename from packages/auctex-11.86/style/pdfsync.el
rename to packages/auctex/style/pdfsync.el

diff --git a/packages/auctex-11.86/style/plfonts.el b/packages/auctex/style/plfonts.el
similarity index 100%
rename from packages/auctex-11.86/style/plfonts.el
rename to packages/auctex/style/plfonts.el

diff --git a/packages/auctex-11.86/style/plhb.el b/packages/auctex/style/plhb.el
similarity index 100%
rename from packages/auctex-11.86/style/plhb.el
rename to packages/auctex/style/plhb.el

diff --git a/packages/auctex-11.86/style/polish.el b/packages/auctex/style/polish.el
similarity index 100%
rename from packages/auctex-11.86/style/polish.el
rename to packages/auctex/style/polish.el

diff --git a/packages/auctex-11.86/style/polski.el b/packages/auctex/style/polski.el
similarity index 100%
rename from packages/auctex-11.86/style/polski.el
rename to packages/auctex/style/polski.el

diff --git a/packages/auctex-11.86/style/pst-grad.el b/packages/auctex/style/pst-grad.el
similarity index 100%
rename from packages/auctex-11.86/style/pst-grad.el
rename to packages/auctex/style/pst-grad.el

diff --git a/packages/auctex-11.86/style/pst-node.el b/packages/auctex/style/pst-node.el
similarity index 100%
rename from packages/auctex-11.86/style/pst-node.el
rename to packages/auctex/style/pst-node.el

diff --git a/packages/auctex-11.86/style/pst-plot.el b/packages/auctex/style/pst-plot.el
similarity index 100%
rename from packages/auctex-11.86/style/pst-plot.el
rename to packages/auctex/style/pst-plot.el

diff --git a/packages/auctex-11.86/style/pst-slpe.el b/packages/auctex/style/pst-slpe.el
similarity index 100%
rename from packages/auctex-11.86/style/pst-slpe.el
rename to packages/auctex/style/pst-slpe.el

diff --git a/packages/auctex-11.86/style/pstricks.el b/packages/auctex/style/pstricks.el
similarity index 100%
rename from packages/auctex-11.86/style/pstricks.el
rename to packages/auctex/style/pstricks.el

diff --git a/packages/auctex-11.86/style/report.el b/packages/auctex/style/report.el
similarity index 100%
rename from packages/auctex-11.86/style/report.el
rename to packages/auctex/style/report.el

diff --git a/packages/auctex-11.86/style/ruby.el b/packages/auctex/style/ruby.el
similarity index 100%
rename from packages/auctex-11.86/style/ruby.el
rename to packages/auctex/style/ruby.el

diff --git a/packages/auctex-11.86/style/scrartcl.el b/packages/auctex/style/scrartcl.el
similarity index 100%
rename from packages/auctex-11.86/style/scrartcl.el
rename to packages/auctex/style/scrartcl.el

diff --git a/packages/auctex-11.86/style/scrbase.el b/packages/auctex/style/scrbase.el
similarity index 100%
rename from packages/auctex-11.86/style/scrbase.el
rename to packages/auctex/style/scrbase.el

diff --git a/packages/auctex-11.86/style/scrbook.el b/packages/auctex/style/scrbook.el
similarity index 100%
rename from packages/auctex-11.86/style/scrbook.el
rename to packages/auctex/style/scrbook.el

diff --git a/packages/auctex-11.86/style/scrlttr2.el b/packages/auctex/style/scrlttr2.el
similarity index 100%
rename from packages/auctex-11.86/style/scrlttr2.el
rename to packages/auctex/style/scrlttr2.el

diff --git a/packages/auctex-11.86/style/scrpage2.el b/packages/auctex/style/scrpage2.el
similarity index 100%
rename from packages/auctex-11.86/style/scrpage2.el
rename to packages/auctex/style/scrpage2.el

diff --git a/packages/auctex-11.86/style/scrreprt.el b/packages/auctex/style/scrreprt.el
similarity index 100%
rename from packages/auctex-11.86/style/scrreprt.el
rename to packages/auctex/style/scrreprt.el

diff --git a/packages/auctex-11.86/style/shortvrb.el b/packages/auctex/style/shortvrb.el
similarity index 100%
rename from packages/auctex-11.86/style/shortvrb.el
rename to packages/auctex/style/shortvrb.el

diff --git a/packages/auctex-11.86/style/slides.el b/packages/auctex/style/slides.el
similarity index 100%
rename from packages/auctex-11.86/style/slides.el
rename to packages/auctex/style/slides.el

diff --git a/packages/auctex-11.86/style/slovak.el b/packages/auctex/style/slovak.el
similarity index 100%
rename from packages/auctex-11.86/style/slovak.el
rename to packages/auctex/style/slovak.el

diff --git a/packages/auctex-11.86/style/subfigure.el b/packages/auctex/style/subfigure.el
similarity index 100%
rename from packages/auctex-11.86/style/subfigure.el
rename to packages/auctex/style/subfigure.el

diff --git a/packages/auctex-11.86/style/swedish.el b/packages/auctex/style/swedish.el
similarity index 100%
rename from packages/auctex-11.86/style/swedish.el
rename to packages/auctex/style/swedish.el

diff --git a/packages/auctex-11.86/style/tabularx.el b/packages/auctex/style/tabularx.el
similarity index 100%
rename from packages/auctex-11.86/style/tabularx.el
rename to packages/auctex/style/tabularx.el

diff --git a/packages/auctex-11.86/style/units.el b/packages/auctex/style/units.el
similarity index 100%
rename from packages/auctex-11.86/style/units.el
rename to packages/auctex/style/units.el

diff --git a/packages/auctex-11.86/style/url.el b/packages/auctex/style/url.el
similarity index 100%
rename from packages/auctex-11.86/style/url.el
rename to packages/auctex/style/url.el

diff --git a/packages/auctex-11.86/style/varioref.el b/packages/auctex/style/varioref.el
similarity index 100%
rename from packages/auctex-11.86/style/varioref.el
rename to packages/auctex/style/varioref.el

diff --git a/packages/auctex-11.86/style/verbatim.el b/packages/auctex/style/verbatim.el
similarity index 100%
rename from packages/auctex-11.86/style/verbatim.el
rename to packages/auctex/style/verbatim.el

diff --git a/packages/auctex-11.86/style/virtex.el b/packages/auctex/style/virtex.el
similarity index 100%
rename from packages/auctex-11.86/style/virtex.el
rename to packages/auctex/style/virtex.el

diff --git a/packages/auctex-11.86/tex-bar.el b/packages/auctex/tex-bar.el
similarity index 100%
rename from packages/auctex-11.86/tex-bar.el
rename to packages/auctex/tex-bar.el

diff --git a/packages/auctex-11.86/tex-buf.el b/packages/auctex/tex-buf.el
similarity index 100%
rename from packages/auctex-11.86/tex-buf.el
rename to packages/auctex/tex-buf.el

diff --git a/packages/auctex-11.86/tex-fold.el b/packages/auctex/tex-fold.el
similarity index 100%
rename from packages/auctex-11.86/tex-fold.el
rename to packages/auctex/tex-fold.el

diff --git a/packages/auctex-11.86/tex-font.el b/packages/auctex/tex-font.el
similarity index 100%
rename from packages/auctex-11.86/tex-font.el
rename to packages/auctex/tex-font.el

diff --git a/packages/auctex-11.86/tex-fptex.el b/packages/auctex/tex-fptex.el
similarity index 100%
rename from packages/auctex-11.86/tex-fptex.el
rename to packages/auctex/tex-fptex.el

diff --git a/packages/auctex-11.86/tex-info.el b/packages/auctex/tex-info.el
similarity index 100%
rename from packages/auctex-11.86/tex-info.el
rename to packages/auctex/tex-info.el

diff --git a/packages/auctex-11.86/tex-jp.el b/packages/auctex/tex-jp.el
similarity index 100%
rename from packages/auctex-11.86/tex-jp.el
rename to packages/auctex/tex-jp.el

diff --git a/packages/auctex-11.86/tex-mik.el b/packages/auctex/tex-mik.el
similarity index 100%
rename from packages/auctex-11.86/tex-mik.el
rename to packages/auctex/tex-mik.el

diff --git a/packages/auctex-11.86/tex-site.el b/packages/auctex/tex-site.el
similarity index 100%
rename from packages/auctex-11.86/tex-site.el
rename to packages/auctex/tex-site.el

diff --git a/packages/auctex-11.86/tex-style.el b/packages/auctex/tex-style.el
similarity index 100%
rename from packages/auctex-11.86/tex-style.el
rename to packages/auctex/tex-style.el

diff --git a/packages/auctex-11.86/tex.el b/packages/auctex/tex.el
similarity index 100%
rename from packages/auctex-11.86/tex.el
rename to packages/auctex/tex.el

diff --git a/packages/auctex-11.86/texmathp.el b/packages/auctex/texmathp.el
similarity index 100%
rename from packages/auctex-11.86/texmathp.el
rename to packages/auctex/texmathp.el

diff --git a/packages/auctex-11.86/toolbar-x.el b/packages/auctex/toolbar-x.el
similarity index 100%
rename from packages/auctex-11.86/toolbar-x.el
rename to packages/auctex/toolbar-x.el

diff --git a/packages/company-0.5/README b/packages/company/README
similarity index 100%
rename from packages/company-0.5/README
rename to packages/company/README

diff --git a/packages/company-0.5/company-abbrev.el b/packages/company/company-abbrev.el
similarity index 100%
rename from packages/company-0.5/company-abbrev.el
rename to packages/company/company-abbrev.el

diff --git a/packages/company-0.5/company-clang.el b/packages/company/company-clang.el
similarity index 100%
rename from packages/company-0.5/company-clang.el
rename to packages/company/company-clang.el

diff --git a/packages/company-0.5/company-css.el b/packages/company/company-css.el
similarity index 100%
rename from packages/company-0.5/company-css.el
rename to packages/company/company-css.el

diff --git a/packages/company-0.5/company-dabbrev-code.el b/packages/company/company-dabbrev-code.el
similarity index 100%
rename from packages/company-0.5/company-dabbrev-code.el
rename to packages/company/company-dabbrev-code.el

diff --git a/packages/company-0.5/company-dabbrev.el b/packages/company/company-dabbrev.el
similarity index 100%
rename from packages/company-0.5/company-dabbrev.el
rename to packages/company/company-dabbrev.el

diff --git a/packages/company-0.5/company-eclim.el b/packages/company/company-eclim.el
similarity index 100%
rename from packages/company-0.5/company-eclim.el
rename to packages/company/company-eclim.el

diff --git a/packages/company-0.5/company-elisp.el b/packages/company/company-elisp.el
similarity index 100%
rename from packages/company-0.5/company-elisp.el
rename to packages/company/company-elisp.el

diff --git a/packages/company-0.5/company-etags.el b/packages/company/company-etags.el
similarity index 100%
rename from packages/company-0.5/company-etags.el
rename to packages/company/company-etags.el

diff --git a/packages/company-0.5/company-files.el b/packages/company/company-files.el
similarity index 100%
rename from packages/company-0.5/company-files.el
rename to packages/company/company-files.el

diff --git a/packages/company-0.5/company-gtags.el b/packages/company/company-gtags.el
similarity index 100%
rename from packages/company-0.5/company-gtags.el
rename to packages/company/company-gtags.el

diff --git a/packages/company-0.5/company-ispell.el b/packages/company/company-ispell.el
similarity index 100%
rename from packages/company-0.5/company-ispell.el
rename to packages/company/company-ispell.el

diff --git a/packages/company-0.5/company-keywords.el b/packages/company/company-keywords.el
similarity index 100%
rename from packages/company-0.5/company-keywords.el
rename to packages/company/company-keywords.el

diff --git a/packages/company-0.5/company-nxml.el b/packages/company/company-nxml.el
similarity index 100%
rename from packages/company-0.5/company-nxml.el
rename to packages/company/company-nxml.el

diff --git a/packages/company-0.5/company-oddmuse.el b/packages/company/company-oddmuse.el
similarity index 100%
rename from packages/company-0.5/company-oddmuse.el
rename to packages/company/company-oddmuse.el

diff --git a/packages/company-0.5/company-pkg.el b/packages/company/company-pkg.el
similarity index 100%
rename from packages/company-0.5/company-pkg.el
rename to packages/company/company-pkg.el

diff --git a/packages/company-0.5/company-pysmell.el b/packages/company/company-pysmell.el
similarity index 100%
rename from packages/company-0.5/company-pysmell.el
rename to packages/company/company-pysmell.el

diff --git a/packages/company-0.5/company-ropemacs.el b/packages/company/company-ropemacs.el
similarity index 100%
rename from packages/company-0.5/company-ropemacs.el
rename to packages/company/company-ropemacs.el

diff --git a/packages/company-0.5/company-semantic.el b/packages/company/company-semantic.el
similarity index 100%
rename from packages/company-0.5/company-semantic.el
rename to packages/company/company-semantic.el

diff --git a/packages/company-0.5/company-template.el b/packages/company/company-template.el
similarity index 100%
rename from packages/company-0.5/company-template.el
rename to packages/company/company-template.el

diff --git a/packages/company-0.5/company-tempo.el b/packages/company/company-tempo.el
similarity index 100%
rename from packages/company-0.5/company-tempo.el
rename to packages/company/company-tempo.el

diff --git a/packages/company-0.5/company-xcode.el b/packages/company/company-xcode.el
similarity index 100%
rename from packages/company-0.5/company-xcode.el
rename to packages/company/company-xcode.el

diff --git a/packages/company-0.5/company.el b/packages/company/company.el
similarity index 100%
rename from packages/company-0.5/company.el
rename to packages/company/company.el

diff --git a/packages/debbugs-0.1/ChangeLog b/packages/debbugs/ChangeLog
similarity index 100%
rename from packages/debbugs-0.1/ChangeLog
rename to packages/debbugs/ChangeLog

diff --git a/packages/debbugs-0.1/Debbugs.wsdl b/packages/debbugs/Debbugs.wsdl
similarity index 100%
rename from packages/debbugs-0.1/Debbugs.wsdl
rename to packages/debbugs/Debbugs.wsdl

diff --git a/packages/debbugs-0.1/README b/packages/debbugs/README
similarity index 100%
rename from packages/debbugs-0.1/README
rename to packages/debbugs/README

diff --git a/packages/debbugs-0.1/debbugs-pkg.el b/packages/debbugs/debbugs-pkg.el
similarity index 100%
rename from packages/debbugs-0.1/debbugs-pkg.el
rename to packages/debbugs/debbugs-pkg.el

diff --git a/packages/debbugs-0.1/debbugs.el b/packages/debbugs/debbugs.el
similarity index 100%
rename from packages/debbugs-0.1/debbugs.el
rename to packages/debbugs/debbugs.el

diff --git a/packages/epoch-view-0.0.1.el b/packages/epoch-view.el
similarity index 100%
rename from packages/epoch-view-0.0.1.el
rename to packages/epoch-view.el

diff --git a/packages/js2-mode-20090814.el b/packages/js2-mode.el
similarity index 100%
rename from packages/js2-mode-20090814.el
rename to packages/js2-mode.el

diff --git a/packages/load-dir-0.0.2.el b/packages/load-dir.el
similarity index 100%
rename from packages/load-dir-0.0.2.el
rename to packages/load-dir.el

diff --git a/packages/markchars-0.2.0.el b/packages/markchars.el
similarity index 100%
rename from packages/markchars-0.2.0.el
rename to packages/markchars.el

diff --git a/packages/muse-3.20/README b/packages/muse/README
similarity index 100%
rename from packages/muse-3.20/README
rename to packages/muse/README

diff --git a/packages/muse-3.20/cgi.el b/packages/muse/cgi.el
similarity index 100%
rename from packages/muse-3.20/cgi.el
rename to packages/muse/cgi.el

diff --git a/packages/muse-3.20/dir b/packages/muse/dir
similarity index 100%
rename from packages/muse-3.20/dir
rename to packages/muse/dir

diff --git a/packages/muse-3.20/htmlize-hack.el b/packages/muse/htmlize-hack.el
similarity index 100%
rename from packages/muse-3.20/htmlize-hack.el
rename to packages/muse/htmlize-hack.el

diff --git a/packages/muse-3.20/httpd.el b/packages/muse/httpd.el
similarity index 100%
rename from packages/muse-3.20/httpd.el
rename to packages/muse/httpd.el

diff --git a/packages/muse-3.20/muse-backlink.el b/packages/muse/muse-backlink.el
similarity index 100%
rename from packages/muse-3.20/muse-backlink.el
rename to packages/muse/muse-backlink.el

diff --git a/packages/muse-3.20/muse-blosxom.el b/packages/muse/muse-blosxom.el
similarity index 100%
rename from packages/muse-3.20/muse-blosxom.el
rename to packages/muse/muse-blosxom.el

diff --git a/packages/muse-3.20/muse-book.el b/packages/muse/muse-book.el
similarity index 100%
rename from packages/muse-3.20/muse-book.el
rename to packages/muse/muse-book.el

diff --git a/packages/muse-3.20/muse-colors.el b/packages/muse/muse-colors.el
similarity index 100%
rename from packages/muse-3.20/muse-colors.el
rename to packages/muse/muse-colors.el

diff --git a/packages/muse-3.20/muse-context.el b/packages/muse/muse-context.el
similarity index 100%
rename from packages/muse-3.20/muse-context.el
rename to packages/muse/muse-context.el

diff --git a/packages/muse-3.20/muse-docbook.el b/packages/muse/muse-docbook.el
similarity index 100%
rename from packages/muse-3.20/muse-docbook.el
rename to packages/muse/muse-docbook.el

diff --git a/packages/muse-3.20/muse-groff.el b/packages/muse/muse-groff.el
similarity index 100%
rename from packages/muse-3.20/muse-groff.el
rename to packages/muse/muse-groff.el

diff --git a/packages/muse-3.20/muse-html.el b/packages/muse/muse-html.el
similarity index 100%
rename from packages/muse-3.20/muse-html.el
rename to packages/muse/muse-html.el

diff --git a/packages/muse-3.20/muse-http.el b/packages/muse/muse-http.el
similarity index 100%
rename from packages/muse-3.20/muse-http.el
rename to packages/muse/muse-http.el

diff --git a/packages/muse-3.20/muse-ikiwiki.el b/packages/muse/muse-ikiwiki.el
similarity index 100%
rename from packages/muse-3.20/muse-ikiwiki.el
rename to packages/muse/muse-ikiwiki.el

diff --git a/packages/muse-3.20/muse-import-docbook.el b/packages/muse/muse-import-docbook.el
similarity index 100%
rename from packages/muse-3.20/muse-import-docbook.el
rename to packages/muse/muse-import-docbook.el

diff --git a/packages/muse-3.20/muse-import-latex.el b/packages/muse/muse-import-latex.el
similarity index 100%
rename from packages/muse-3.20/muse-import-latex.el
rename to packages/muse/muse-import-latex.el

diff --git a/packages/muse-3.20/muse-import-xml.el b/packages/muse/muse-import-xml.el
similarity index 100%
rename from packages/muse-3.20/muse-import-xml.el
rename to packages/muse/muse-import-xml.el

diff --git a/packages/muse-3.20/muse-ipc.el b/packages/muse/muse-ipc.el
similarity index 100%
rename from packages/muse-3.20/muse-ipc.el
rename to packages/muse/muse-ipc.el

diff --git a/packages/muse-3.20/muse-journal.el b/packages/muse/muse-journal.el
similarity index 100%
rename from packages/muse-3.20/muse-journal.el
rename to packages/muse/muse-journal.el

diff --git a/packages/muse-3.20/muse-latex.el b/packages/muse/muse-latex.el
similarity index 100%
rename from packages/muse-3.20/muse-latex.el
rename to packages/muse/muse-latex.el

diff --git a/packages/muse-3.20/muse-latex2png.el b/packages/muse/muse-latex2png.el
similarity index 100%
rename from packages/muse-3.20/muse-latex2png.el
rename to packages/muse/muse-latex2png.el

diff --git a/packages/muse-3.20/muse-mode.el b/packages/muse/muse-mode.el
similarity index 100%
rename from packages/muse-3.20/muse-mode.el
rename to packages/muse/muse-mode.el

diff --git a/packages/muse-3.20/muse-pkg.el b/packages/muse/muse-pkg.el
similarity index 100%
rename from packages/muse-3.20/muse-pkg.el
rename to packages/muse/muse-pkg.el

diff --git a/packages/muse-3.20/muse-poem.el b/packages/muse/muse-poem.el
similarity index 100%
rename from packages/muse-3.20/muse-poem.el
rename to packages/muse/muse-poem.el

diff --git a/packages/muse-3.20/muse-project.el b/packages/muse/muse-project.el
similarity index 100%
rename from packages/muse-3.20/muse-project.el
rename to packages/muse/muse-project.el

diff --git a/packages/muse-3.20/muse-protocols.el b/packages/muse/muse-protocols.el
similarity index 100%
rename from packages/muse-3.20/muse-protocols.el
rename to packages/muse/muse-protocols.el

diff --git a/packages/muse-3.20/muse-publish.el b/packages/muse/muse-publish.el
similarity index 100%
rename from packages/muse-3.20/muse-publish.el
rename to packages/muse/muse-publish.el

diff --git a/packages/muse-3.20/muse-regexps.el b/packages/muse/muse-regexps.el
similarity index 100%
rename from packages/muse-3.20/muse-regexps.el
rename to packages/muse/muse-regexps.el

diff --git a/packages/muse-3.20/muse-texinfo.el b/packages/muse/muse-texinfo.el
similarity index 100%
rename from packages/muse-3.20/muse-texinfo.el
rename to packages/muse/muse-texinfo.el

diff --git a/packages/muse-3.20/muse-wiki.el b/packages/muse/muse-wiki.el
similarity index 100%
rename from packages/muse-3.20/muse-wiki.el
rename to packages/muse/muse-wiki.el

diff --git a/packages/muse-3.20/muse-xml-common.el b/packages/muse/muse-xml-common.el
similarity index 100%
rename from packages/muse-3.20/muse-xml-common.el
rename to packages/muse/muse-xml-common.el

diff --git a/packages/muse-3.20/muse-xml.el b/packages/muse/muse-xml.el
similarity index 100%
rename from packages/muse-3.20/muse-xml.el
rename to packages/muse/muse-xml.el

diff --git a/packages/muse-3.20/muse.el b/packages/muse/muse.el
similarity index 100%
rename from packages/muse-3.20/muse.el
rename to packages/muse/muse.el

diff --git a/packages/muse-3.20/muse.info b/packages/muse/muse.info
similarity index 100%
rename from packages/muse-3.20/muse.info
rename to packages/muse/muse.info

diff --git a/packages/rainbow-mode-0.1.el b/packages/rainbow-mode.el
similarity index 100%
rename from packages/rainbow-mode-0.1.el
rename to packages/rainbow-mode.el

diff --git a/packages/uni-confusables-0.1/confusables.txt b/packages/uni-confusables/confusables.txt
similarity index 100%
rename from packages/uni-confusables-0.1/confusables.txt
rename to packages/uni-confusables/confusables.txt

diff --git a/packages/uni-confusables-0.1/gen-confusables.el b/packages/uni-confusables/gen-confusables.el
similarity index 100%
rename from packages/uni-confusables-0.1/gen-confusables.el
rename to packages/uni-confusables/gen-confusables.el

diff --git a/packages/uni-confusables-0.1/uni-confusables-pkg.el b/packages/uni-confusables/uni-confusables-pkg.el
similarity index 100%
rename from packages/uni-confusables-0.1/uni-confusables-pkg.el
rename to packages/uni-confusables/uni-confusables-pkg.el

diff --git a/packages/uni-confusables-0.1/uni-confusables.el b/packages/uni-confusables/uni-confusables.el
similarity index 100%
rename from packages/uni-confusables-0.1/uni-confusables.el
rename to packages/uni-confusables/uni-confusables.el