diff --git a/osx/Info.plist b/packaging/osx/Info.plist
similarity index 100%
rename from osx/Info.plist
rename to packaging/osx/Info.plist
diff --git a/osx/README.rst b/packaging/osx/README.rst
similarity index 100%
rename from osx/README.rst
rename to packaging/osx/README.rst
diff --git a/osx/deluge b/packaging/osx/deluge
similarity index 100%
rename from osx/deluge
rename to packaging/osx/deluge
diff --git a/osx/deluge-console b/packaging/osx/deluge-console
similarity index 100%
rename from osx/deluge-console
rename to packaging/osx/deluge-console
diff --git a/osx/deluge-web b/packaging/osx/deluge-web
similarity index 100%
rename from osx/deluge-web
rename to packaging/osx/deluge-web
diff --git a/osx/deluge.bundle b/packaging/osx/deluge.bundle
similarity index 100%
rename from osx/deluge.bundle
rename to packaging/osx/deluge.bundle
diff --git a/osx/deluge.icns b/packaging/osx/deluge.icns
similarity index 100%
rename from osx/deluge.icns
rename to packaging/osx/deluge.icns
diff --git a/osx/deluge.modules b/packaging/osx/deluge.modules
similarity index 100%
rename from osx/deluge.modules
rename to packaging/osx/deluge.modules
diff --git a/osx/deluged b/packaging/osx/deluged
similarity index 100%
rename from osx/deluged
rename to packaging/osx/deluged
diff --git a/osx/gtkrc b/packaging/osx/gtkrc
similarity index 100%
rename from osx/gtkrc
rename to packaging/osx/gtkrc
diff --git a/osx/jhbuildrc-custom b/packaging/osx/jhbuildrc-custom
similarity index 100%
rename from osx/jhbuildrc-custom
rename to packaging/osx/jhbuildrc-custom
diff --git a/osx/make-app b/packaging/osx/make-app
similarity index 100%
rename from osx/make-app
rename to packaging/osx/make-app
diff --git a/osx/torrent.icns b/packaging/osx/torrent.icns
similarity index 100%
rename from osx/torrent.icns
rename to packaging/osx/torrent.icns
diff --git a/win32/DelugeStart Theme/etc/gtk-2.0/gtkrc b/packaging/win32/DelugeStart Theme/etc/gtk-2.0/gtkrc
similarity index 100%
rename from win32/DelugeStart Theme/etc/gtk-2.0/gtkrc
rename to packaging/win32/DelugeStart Theme/etc/gtk-2.0/gtkrc
diff --git a/win32/DelugeStart Theme/lib/gtk-2.0/2.10.0/engines/libmurrine.dll b/packaging/win32/DelugeStart Theme/lib/gtk-2.0/2.10.0/engines/libmurrine.dll
similarity index 100%
rename from win32/DelugeStart Theme/lib/gtk-2.0/2.10.0/engines/libmurrine.dll
rename to packaging/win32/DelugeStart Theme/lib/gtk-2.0/2.10.0/engines/libmurrine.dll
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/check1.png b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/check1.png
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/check1.png
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/check1.png
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/check2.png b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/check2.png
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/check2.png
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/check2.png
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/check3.png b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/check3.png
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/check3.png
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/check3.png
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/check4.png b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/check4.png
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/check4.png
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/check4.png
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/check5.png b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/check5.png
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/check5.png
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/check5.png
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/checklight.png b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/checklight.png
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/checklight.png
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/checklight.png
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/option1.png b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/option1.png
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/option1.png
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/option1.png
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/option2.png b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/option2.png
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/option2.png
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/option2.png
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/option3.png b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/option3.png
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/option3.png
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/option3.png
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/option4.png b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/option4.png
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/option4.png
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Check-Radio/option4.png
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Icons/close.png b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Icons/close.png
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Icons/close.png
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Icons/close.png
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/scroll-thumb-horiz.png b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/scroll-thumb-horiz.png
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/scroll-thumb-horiz.png
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/scroll-thumb-horiz.png
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/scroll-thumb-vert.png b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/scroll-thumb-vert.png
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/scroll-thumb-vert.png
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/scroll-thumb-vert.png
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-horiz-insens.png b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-horiz-insens.png
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-horiz-insens.png
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-horiz-insens.png
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-horiz-prelight.png b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-horiz-prelight.png
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-horiz-prelight.png
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-horiz-prelight.png
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-horiz.png b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-horiz.png
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-horiz.png
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-horiz.png
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-vert-insens.png b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-vert-insens.png
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-vert-insens.png
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-vert-insens.png
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-vert-prelight.png b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-vert-prelight.png
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-vert-prelight.png
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-vert-prelight.png
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-vert.png b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-vert.png
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-vert.png
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/slider-vert.png
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/trough-scrollbar-vert.png b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/trough-scrollbar-vert.png
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/trough-scrollbar-vert.png
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/Scrollbars/trough-scrollbar-vert.png
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/gtkrc b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/gtkrc
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/gtkrc
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/gtkrc
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/styles/checkradiobutton b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/styles/checkradiobutton
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/styles/checkradiobutton
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/styles/checkradiobutton
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/styles/menu-menubar b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/styles/menu-menubar
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/styles/menu-menubar
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/styles/menu-menubar
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/styles/notebook b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/styles/notebook
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/styles/notebook
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/styles/notebook
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/styles/scrollbar b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/styles/scrollbar
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/styles/scrollbar
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/styles/scrollbar
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/styles/tooltips b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/styles/tooltips
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/styles/tooltips
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/gtk-2.0/styles/tooltips
diff --git a/win32/DelugeStart Theme/share/themes/DelugeStart/index.theme b/packaging/win32/DelugeStart Theme/share/themes/DelugeStart/index.theme
similarity index 100%
rename from win32/DelugeStart Theme/share/themes/DelugeStart/index.theme
rename to packaging/win32/DelugeStart Theme/share/themes/DelugeStart/index.theme
diff --git a/win32/Win32 README.txt b/packaging/win32/Win32 README.txt
similarity index 100%
rename from win32/Win32 README.txt
rename to packaging/win32/Win32 README.txt
diff --git a/win32/deluge-bbfreeze.py b/packaging/win32/deluge-bbfreeze.py
similarity index 100%
rename from win32/deluge-bbfreeze.py
rename to packaging/win32/deluge-bbfreeze.py
diff --git a/win32/deluge-win32-installer.nsi b/packaging/win32/deluge-win32-installer.nsi
similarity index 100%
rename from win32/deluge-win32-installer.nsi
rename to packaging/win32/deluge-win32-installer.nsi
diff --git a/win32/deluge.ico b/packaging/win32/deluge.ico
similarity index 100%
rename from win32/deluge.ico
rename to packaging/win32/deluge.ico
diff --git a/win32/icon.py b/packaging/win32/icon.py
similarity index 100%
rename from win32/icon.py
rename to packaging/win32/icon.py
diff --git a/win32/installer-side.bmp b/packaging/win32/installer-side.bmp
similarity index 100%
rename from win32/installer-side.bmp
rename to packaging/win32/installer-side.bmp
diff --git a/win32/installer-top.bmp b/packaging/win32/installer-top.bmp
similarity index 100%
rename from win32/installer-top.bmp
rename to packaging/win32/installer-top.bmp