diff --git a/offlineimap/head/COPYING b/head/COPYING
similarity index 100%
rename from offlineimap/head/COPYING
rename to head/COPYING
diff --git a/offlineimap/head/COPYRIGHT b/head/COPYRIGHT
similarity index 100%
rename from offlineimap/head/COPYRIGHT
rename to head/COPYRIGHT
diff --git a/offlineimap/head/ChangeLog b/head/ChangeLog
similarity index 100%
rename from offlineimap/head/ChangeLog
rename to head/ChangeLog
diff --git a/offlineimap/head/Makefile b/head/Makefile
similarity index 100%
rename from offlineimap/head/Makefile
rename to head/Makefile
diff --git a/offlineimap/head/README b/head/README
similarity index 100%
rename from offlineimap/head/README
rename to head/README
diff --git a/offlineimap/head/UPGRADING b/head/UPGRADING
similarity index 100%
rename from offlineimap/head/UPGRADING
rename to head/UPGRADING
diff --git a/offlineimap/head/bin/offlineimap b/head/bin/offlineimap
similarity index 100%
rename from offlineimap/head/bin/offlineimap
rename to head/bin/offlineimap
diff --git a/offlineimap/head/debian/changelog b/head/debian/changelog
similarity index 100%
rename from offlineimap/head/debian/changelog
rename to head/debian/changelog
diff --git a/offlineimap/head/debian/control b/head/debian/control
similarity index 100%
rename from offlineimap/head/debian/control
rename to head/debian/control
diff --git a/offlineimap/head/debian/copyright b/head/debian/copyright
similarity index 100%
rename from offlineimap/head/debian/copyright
rename to head/debian/copyright
diff --git a/offlineimap/head/debian/dirs b/head/debian/dirs
similarity index 100%
rename from offlineimap/head/debian/dirs
rename to head/debian/dirs
diff --git a/offlineimap/head/debian/docs b/head/debian/docs
similarity index 100%
rename from offlineimap/head/debian/docs
rename to head/debian/docs
diff --git a/offlineimap/head/debian/rules b/head/debian/rules
similarity index 100%
rename from offlineimap/head/debian/rules
rename to head/debian/rules
diff --git a/offlineimap/head/docs/sgml-common/Makefile.common b/head/docs/sgml-common/Makefile.common
similarity index 100%
rename from offlineimap/head/docs/sgml-common/Makefile.common
rename to head/docs/sgml-common/Makefile.common
diff --git a/offlineimap/head/docs/sgml-common/ps2epsi b/head/docs/sgml-common/ps2epsi
similarity index 100%
rename from offlineimap/head/docs/sgml-common/ps2epsi
rename to head/docs/sgml-common/ps2epsi
diff --git a/offlineimap/head/manual.html b/head/manual.html
similarity index 100%
rename from offlineimap/head/manual.html
rename to head/manual.html
diff --git a/offlineimap/head/manual.pdf b/head/manual.pdf
similarity index 100%
rename from offlineimap/head/manual.pdf
rename to head/manual.pdf
diff --git a/offlineimap/head/manual.ps b/head/manual.ps
similarity index 100%
rename from offlineimap/head/manual.ps
rename to head/manual.ps
diff --git a/offlineimap/head/manual.txt b/head/manual.txt
similarity index 100%
rename from offlineimap/head/manual.txt
rename to head/manual.txt
diff --git a/offlineimap/head/offlineimap.1 b/head/offlineimap.1
similarity index 100%
rename from offlineimap/head/offlineimap.1
rename to head/offlineimap.1
diff --git a/offlineimap/head/offlineimap.conf b/head/offlineimap.conf
similarity index 100%
rename from offlineimap/head/offlineimap.conf
rename to head/offlineimap.conf
diff --git a/offlineimap/head/offlineimap.conf.minimal b/head/offlineimap.conf.minimal
similarity index 100%
rename from offlineimap/head/offlineimap.conf.minimal
rename to head/offlineimap.conf.minimal
diff --git a/offlineimap/head/offlineimap.py b/head/offlineimap.py
similarity index 100%
rename from offlineimap/head/offlineimap.py
rename to head/offlineimap.py
diff --git a/offlineimap/head/offlineimap.sgml b/head/offlineimap.sgml
similarity index 100%
rename from offlineimap/head/offlineimap.sgml
rename to head/offlineimap.sgml
diff --git a/offlineimap/head/offlineimap/CustomConfig.py b/head/offlineimap/CustomConfig.py
similarity index 100%
rename from offlineimap/head/offlineimap/CustomConfig.py
rename to head/offlineimap/CustomConfig.py
diff --git a/offlineimap/head/offlineimap/__init__.py b/head/offlineimap/__init__.py
similarity index 100%
rename from offlineimap/head/offlineimap/__init__.py
rename to head/offlineimap/__init__.py
diff --git a/offlineimap/head/offlineimap/accounts.py b/head/offlineimap/accounts.py
similarity index 100%
rename from offlineimap/head/offlineimap/accounts.py
rename to head/offlineimap/accounts.py
diff --git a/offlineimap/head/offlineimap/folder/Base.py b/head/offlineimap/folder/Base.py
similarity index 100%
rename from offlineimap/head/offlineimap/folder/Base.py
rename to head/offlineimap/folder/Base.py
diff --git a/offlineimap/head/offlineimap/folder/IMAP.py b/head/offlineimap/folder/IMAP.py
similarity index 100%
rename from offlineimap/head/offlineimap/folder/IMAP.py
rename to head/offlineimap/folder/IMAP.py
diff --git a/offlineimap/head/offlineimap/folder/LocalStatus.py b/head/offlineimap/folder/LocalStatus.py
similarity index 100%
rename from offlineimap/head/offlineimap/folder/LocalStatus.py
rename to head/offlineimap/folder/LocalStatus.py
diff --git a/offlineimap/head/offlineimap/folder/Maildir.py b/head/offlineimap/folder/Maildir.py
similarity index 100%
rename from offlineimap/head/offlineimap/folder/Maildir.py
rename to head/offlineimap/folder/Maildir.py
diff --git a/offlineimap/head/offlineimap/folder/__init__.py b/head/offlineimap/folder/__init__.py
similarity index 100%
rename from offlineimap/head/offlineimap/folder/__init__.py
rename to head/offlineimap/folder/__init__.py
diff --git a/offlineimap/head/offlineimap/imaplib.py b/head/offlineimap/imaplib.py
similarity index 100%
rename from offlineimap/head/offlineimap/imaplib.py
rename to head/offlineimap/imaplib.py
diff --git a/offlineimap/head/offlineimap/imapserver.py b/head/offlineimap/imapserver.py
similarity index 100%
rename from offlineimap/head/offlineimap/imapserver.py
rename to head/offlineimap/imapserver.py
diff --git a/offlineimap/head/offlineimap/imaputil.py b/head/offlineimap/imaputil.py
similarity index 100%
rename from offlineimap/head/offlineimap/imaputil.py
rename to head/offlineimap/imaputil.py
diff --git a/offlineimap/head/offlineimap/init.py b/head/offlineimap/init.py
similarity index 100%
rename from offlineimap/head/offlineimap/init.py
rename to head/offlineimap/init.py
diff --git a/offlineimap/head/offlineimap/localeval.py b/head/offlineimap/localeval.py
similarity index 100%
rename from offlineimap/head/offlineimap/localeval.py
rename to head/offlineimap/localeval.py
diff --git a/offlineimap/head/offlineimap/mbnames.py b/head/offlineimap/mbnames.py
similarity index 100%
rename from offlineimap/head/offlineimap/mbnames.py
rename to head/offlineimap/mbnames.py
diff --git a/offlineimap/head/offlineimap/repository/Base.py b/head/offlineimap/repository/Base.py
similarity index 100%
rename from offlineimap/head/offlineimap/repository/Base.py
rename to head/offlineimap/repository/Base.py
diff --git a/offlineimap/head/offlineimap/repository/IMAP.py b/head/offlineimap/repository/IMAP.py
similarity index 100%
rename from offlineimap/head/offlineimap/repository/IMAP.py
rename to head/offlineimap/repository/IMAP.py
diff --git a/offlineimap/head/offlineimap/repository/LocalStatus.py b/head/offlineimap/repository/LocalStatus.py
similarity index 100%
rename from offlineimap/head/offlineimap/repository/LocalStatus.py
rename to head/offlineimap/repository/LocalStatus.py
diff --git a/offlineimap/head/offlineimap/repository/Maildir.py b/head/offlineimap/repository/Maildir.py
similarity index 100%
rename from offlineimap/head/offlineimap/repository/Maildir.py
rename to head/offlineimap/repository/Maildir.py
diff --git a/offlineimap/head/offlineimap/repository/__init__.py b/head/offlineimap/repository/__init__.py
similarity index 100%
rename from offlineimap/head/offlineimap/repository/__init__.py
rename to head/offlineimap/repository/__init__.py
diff --git a/offlineimap/head/offlineimap/syncmaster.py b/head/offlineimap/syncmaster.py
similarity index 100%
rename from offlineimap/head/offlineimap/syncmaster.py
rename to head/offlineimap/syncmaster.py
diff --git a/offlineimap/head/offlineimap/threadutil.py b/head/offlineimap/threadutil.py
similarity index 100%
rename from offlineimap/head/offlineimap/threadutil.py
rename to head/offlineimap/threadutil.py
diff --git a/offlineimap/head/offlineimap/ui/Blinkenlights.py b/head/offlineimap/ui/Blinkenlights.py
similarity index 100%
rename from offlineimap/head/offlineimap/ui/Blinkenlights.py
rename to head/offlineimap/ui/Blinkenlights.py
diff --git a/offlineimap/head/offlineimap/ui/Curses.py b/head/offlineimap/ui/Curses.py
similarity index 100%
rename from offlineimap/head/offlineimap/ui/Curses.py
rename to head/offlineimap/ui/Curses.py
diff --git a/offlineimap/head/offlineimap/ui/Noninteractive.py b/head/offlineimap/ui/Noninteractive.py
similarity index 100%
rename from offlineimap/head/offlineimap/ui/Noninteractive.py
rename to head/offlineimap/ui/Noninteractive.py
diff --git a/offlineimap/head/offlineimap/ui/TTY.py b/head/offlineimap/ui/TTY.py
similarity index 100%
rename from offlineimap/head/offlineimap/ui/TTY.py
rename to head/offlineimap/ui/TTY.py
diff --git a/offlineimap/head/offlineimap/ui/Tk.py b/head/offlineimap/ui/Tk.py
similarity index 100%
rename from offlineimap/head/offlineimap/ui/Tk.py
rename to head/offlineimap/ui/Tk.py
diff --git a/offlineimap/head/offlineimap/ui/UIBase.py b/head/offlineimap/ui/UIBase.py
similarity index 100%
rename from offlineimap/head/offlineimap/ui/UIBase.py
rename to head/offlineimap/ui/UIBase.py
diff --git a/offlineimap/head/offlineimap/ui/__init__.py b/head/offlineimap/ui/__init__.py
similarity index 100%
rename from offlineimap/head/offlineimap/ui/__init__.py
rename to head/offlineimap/ui/__init__.py
diff --git a/offlineimap/head/offlineimap/ui/debuglock.py b/head/offlineimap/ui/debuglock.py
similarity index 100%
rename from offlineimap/head/offlineimap/ui/debuglock.py
rename to head/offlineimap/ui/debuglock.py
diff --git a/offlineimap/head/offlineimap/ui/detector.py b/head/offlineimap/ui/detector.py
similarity index 100%
rename from offlineimap/head/offlineimap/ui/detector.py
rename to head/offlineimap/ui/detector.py
diff --git a/offlineimap/head/offlineimap/version.py b/head/offlineimap/version.py
similarity index 100%
rename from offlineimap/head/offlineimap/version.py
rename to head/offlineimap/version.py
diff --git a/offlineimap/head/setup.py b/head/setup.py
similarity index 100%
rename from offlineimap/head/setup.py
rename to head/setup.py