diff --git a/main/CHANGELOG.txt b/CHANGELOG.txt
similarity index 100%
rename from main/CHANGELOG.txt
rename to CHANGELOG.txt
diff --git a/main/COPYRIGHT.txt b/COPYRIGHT.txt
similarity index 100%
rename from main/COPYRIGHT.txt
rename to COPYRIGHT.txt
diff --git a/main/GPL2.txt b/GPL2.txt
similarity index 100%
rename from main/GPL2.txt
rename to GPL2.txt
diff --git a/main/GPL3.txt b/GPL3.txt
similarity index 100%
rename from main/GPL3.txt
rename to GPL3.txt
diff --git a/main/INSTALL.txt b/INSTALL.txt
similarity index 100%
rename from main/INSTALL.txt
rename to INSTALL.txt
diff --git a/main/ISSUES.txt b/ISSUES.txt
similarity index 100%
rename from main/ISSUES.txt
rename to ISSUES.txt
diff --git a/main/LICENSE.txt b/LICENSE.txt
similarity index 100%
rename from main/LICENSE.txt
rename to LICENSE.txt
diff --git a/main/NSIS_Installer.nsi b/NSIS_Installer.nsi
similarity index 100%
rename from main/NSIS_Installer.nsi
rename to NSIS_Installer.nsi
diff --git a/main/PKG-INFO b/PKG-INFO
similarity index 100%
rename from main/PKG-INFO
rename to PKG-INFO
diff --git a/main/README.txt b/README.txt
similarity index 100%
rename from main/README.txt
rename to README.txt
diff --git a/main/SABnzbd.py b/SABnzbd.py
similarity index 100%
rename from main/SABnzbd.py
rename to SABnzbd.py
diff --git a/main/SABnzbdDelegate.py b/SABnzbdDelegate.py
similarity index 100%
rename from main/SABnzbdDelegate.py
rename to SABnzbdDelegate.py
diff --git a/main/Sample-PostProc.cmd b/Sample-PostProc.cmd
similarity index 100%
rename from main/Sample-PostProc.cmd
rename to Sample-PostProc.cmd
diff --git a/main/Sample-PostProc.sh b/Sample-PostProc.sh
similarity index 100%
rename from main/Sample-PostProc.sh
rename to Sample-PostProc.sh
diff --git a/main/cherrypy.zip b/cherrypy.zip
similarity index 100%
rename from main/cherrypy.zip
rename to cherrypy.zip
diff --git a/main/interfaces/Classic/README.TXT b/interfaces/Classic/README.TXT
similarity index 100%
rename from main/interfaces/Classic/README.TXT
rename to interfaces/Classic/README.TXT
diff --git a/main/interfaces/Classic/templates/config.tmpl b/interfaces/Classic/templates/config.tmpl
similarity index 100%
rename from main/interfaces/Classic/templates/config.tmpl
rename to interfaces/Classic/templates/config.tmpl
diff --git a/main/interfaces/Classic/templates/config_cat.tmpl b/interfaces/Classic/templates/config_cat.tmpl
similarity index 100%
rename from main/interfaces/Classic/templates/config_cat.tmpl
rename to interfaces/Classic/templates/config_cat.tmpl
diff --git a/main/interfaces/Classic/templates/config_directories.tmpl b/interfaces/Classic/templates/config_directories.tmpl
similarity index 100%
rename from main/interfaces/Classic/templates/config_directories.tmpl
rename to interfaces/Classic/templates/config_directories.tmpl
diff --git a/main/interfaces/Classic/templates/config_email.tmpl b/interfaces/Classic/templates/config_email.tmpl
similarity index 100%
rename from main/interfaces/Classic/templates/config_email.tmpl
rename to interfaces/Classic/templates/config_email.tmpl
diff --git a/main/interfaces/Classic/templates/config_general.tmpl b/interfaces/Classic/templates/config_general.tmpl
similarity index 100%
rename from main/interfaces/Classic/templates/config_general.tmpl
rename to interfaces/Classic/templates/config_general.tmpl
diff --git a/main/interfaces/Classic/templates/config_newzbin.tmpl b/interfaces/Classic/templates/config_newzbin.tmpl
similarity index 100%
rename from main/interfaces/Classic/templates/config_newzbin.tmpl
rename to interfaces/Classic/templates/config_newzbin.tmpl
diff --git a/main/interfaces/Classic/templates/config_rss.tmpl b/interfaces/Classic/templates/config_rss.tmpl
similarity index 100%
rename from main/interfaces/Classic/templates/config_rss.tmpl
rename to interfaces/Classic/templates/config_rss.tmpl
diff --git a/main/interfaces/Classic/templates/config_scheduling.tmpl b/interfaces/Classic/templates/config_scheduling.tmpl
similarity index 100%
rename from main/interfaces/Classic/templates/config_scheduling.tmpl
rename to interfaces/Classic/templates/config_scheduling.tmpl
diff --git a/main/interfaces/Classic/templates/config_server.tmpl b/interfaces/Classic/templates/config_server.tmpl
similarity index 100%
rename from main/interfaces/Classic/templates/config_server.tmpl
rename to interfaces/Classic/templates/config_server.tmpl
diff --git a/main/interfaces/Classic/templates/config_sorting.tmpl b/interfaces/Classic/templates/config_sorting.tmpl
similarity index 100%
rename from main/interfaces/Classic/templates/config_sorting.tmpl
rename to interfaces/Classic/templates/config_sorting.tmpl
diff --git a/main/interfaces/Classic/templates/config_switches.tmpl b/interfaces/Classic/templates/config_switches.tmpl
similarity index 100%
rename from main/interfaces/Classic/templates/config_switches.tmpl
rename to interfaces/Classic/templates/config_switches.tmpl
diff --git a/main/interfaces/Classic/templates/connection_info.tmpl b/interfaces/Classic/templates/connection_info.tmpl
similarity index 100%
rename from main/interfaces/Classic/templates/connection_info.tmpl
rename to interfaces/Classic/templates/connection_info.tmpl
diff --git a/main/interfaces/Classic/templates/history.tmpl b/interfaces/Classic/templates/history.tmpl
similarity index 100%
rename from main/interfaces/Classic/templates/history.tmpl
rename to interfaces/Classic/templates/history.tmpl
diff --git a/main/interfaces/Classic/templates/inc_bottom.tmpl b/interfaces/Classic/templates/inc_bottom.tmpl
similarity index 100%
rename from main/interfaces/Classic/templates/inc_bottom.tmpl
rename to interfaces/Classic/templates/inc_bottom.tmpl
diff --git a/main/interfaces/Classic/templates/inc_cmenu.tmpl b/interfaces/Classic/templates/inc_cmenu.tmpl
similarity index 100%
rename from main/interfaces/Classic/templates/inc_cmenu.tmpl
rename to interfaces/Classic/templates/inc_cmenu.tmpl
diff --git a/main/interfaces/Classic/templates/inc_top.tmpl b/interfaces/Classic/templates/inc_top.tmpl
similarity index 100%
rename from main/interfaces/Classic/templates/inc_top.tmpl
rename to interfaces/Classic/templates/inc_top.tmpl
diff --git a/main/interfaces/Classic/templates/main.tmpl b/interfaces/Classic/templates/main.tmpl
similarity index 100%
rename from main/interfaces/Classic/templates/main.tmpl
rename to interfaces/Classic/templates/main.tmpl
diff --git a/main/interfaces/Classic/templates/nzo.tmpl b/interfaces/Classic/templates/nzo.tmpl
similarity index 100%
rename from main/interfaces/Classic/templates/nzo.tmpl
rename to interfaces/Classic/templates/nzo.tmpl
diff --git a/main/interfaces/Classic/templates/queue.tmpl b/interfaces/Classic/templates/queue.tmpl
similarity index 100%
rename from main/interfaces/Classic/templates/queue.tmpl
rename to interfaces/Classic/templates/queue.tmpl
diff --git a/main/interfaces/Classic/templates/static/images/favicon.ico b/interfaces/Classic/templates/static/images/favicon.ico
similarity index 100%
rename from main/interfaces/Classic/templates/static/images/favicon.ico
rename to interfaces/Classic/templates/static/images/favicon.ico
diff --git a/main/interfaces/Classic/templates/static/javascript/dropdown.js b/interfaces/Classic/templates/static/javascript/dropdown.js
similarity index 100%
rename from main/interfaces/Classic/templates/static/javascript/dropdown.js
rename to interfaces/Classic/templates/static/javascript/dropdown.js
diff --git a/main/interfaces/Classic/templates/static/placeholder.txt b/interfaces/Classic/templates/static/placeholder.txt
similarity index 100%
rename from main/interfaces/Classic/templates/static/placeholder.txt
rename to interfaces/Classic/templates/static/placeholder.txt
diff --git a/main/interfaces/Classic/templates/static/stylesheets/colorschemes/black.css b/interfaces/Classic/templates/static/stylesheets/colorschemes/black.css
similarity index 100%
rename from main/interfaces/Classic/templates/static/stylesheets/colorschemes/black.css
rename to interfaces/Classic/templates/static/stylesheets/colorschemes/black.css
diff --git a/main/interfaces/Classic/templates/static/stylesheets/colorschemes/classic.css b/interfaces/Classic/templates/static/stylesheets/colorschemes/classic.css
similarity index 100%
rename from main/interfaces/Classic/templates/static/stylesheets/colorschemes/classic.css
rename to interfaces/Classic/templates/static/stylesheets/colorschemes/classic.css
diff --git a/main/interfaces/Classic/templates/static/stylesheets/colorschemes/darkblue.css b/interfaces/Classic/templates/static/stylesheets/colorschemes/darkblue.css
similarity index 100%
rename from main/interfaces/Classic/templates/static/stylesheets/colorschemes/darkblue.css
rename to interfaces/Classic/templates/static/stylesheets/colorschemes/darkblue.css
diff --git a/main/interfaces/Classic/templates/static/stylesheets/colorschemes/green.css b/interfaces/Classic/templates/static/stylesheets/colorschemes/green.css
similarity index 100%
rename from main/interfaces/Classic/templates/static/stylesheets/colorschemes/green.css
rename to interfaces/Classic/templates/static/stylesheets/colorschemes/green.css
diff --git a/main/interfaces/Classic/templates/static/stylesheets/colorschemes/lightblue.css b/interfaces/Classic/templates/static/stylesheets/colorschemes/lightblue.css
similarity index 100%
rename from main/interfaces/Classic/templates/static/stylesheets/colorschemes/lightblue.css
rename to interfaces/Classic/templates/static/stylesheets/colorschemes/lightblue.css
diff --git a/main/interfaces/Classic/templates/static/stylesheets/colorschemes/red.css b/interfaces/Classic/templates/static/stylesheets/colorschemes/red.css
similarity index 100%
rename from main/interfaces/Classic/templates/static/stylesheets/colorschemes/red.css
rename to interfaces/Classic/templates/static/stylesheets/colorschemes/red.css
diff --git a/main/interfaces/Classic/templates/static/stylesheets/colorschemes/white-black.css b/interfaces/Classic/templates/static/stylesheets/colorschemes/white-black.css
similarity index 100%
rename from main/interfaces/Classic/templates/static/stylesheets/colorschemes/white-black.css
rename to interfaces/Classic/templates/static/stylesheets/colorschemes/white-black.css
diff --git a/main/interfaces/Classic/templates/static/stylesheets/default.css b/interfaces/Classic/templates/static/stylesheets/default.css
similarity index 100%
rename from main/interfaces/Classic/templates/static/stylesheets/default.css
rename to interfaces/Classic/templates/static/stylesheets/default.css
diff --git a/main/interfaces/Classic/templates/static/stylesheets/defaultcolors.css b/interfaces/Classic/templates/static/stylesheets/defaultcolors.css
similarity index 100%
rename from main/interfaces/Classic/templates/static/stylesheets/defaultcolors.css
rename to interfaces/Classic/templates/static/stylesheets/defaultcolors.css
diff --git a/main/interfaces/Concept/README.txt b/interfaces/Concept/README.txt
similarity index 100%
rename from main/interfaces/Concept/README.txt
rename to interfaces/Concept/README.txt
diff --git a/main/interfaces/Concept/licenses/LICENSE-BSD.txt b/interfaces/Concept/licenses/LICENSE-BSD.txt
similarity index 100%
rename from main/interfaces/Concept/licenses/LICENSE-BSD.txt
rename to interfaces/Concept/licenses/LICENSE-BSD.txt
diff --git a/main/interfaces/Concept/licenses/LICENSE-CC.txt b/interfaces/Concept/licenses/LICENSE-CC.txt
similarity index 100%
rename from main/interfaces/Concept/licenses/LICENSE-CC.txt
rename to interfaces/Concept/licenses/LICENSE-CC.txt
diff --git a/main/interfaces/Concept/licenses/LICENSE-GPL.txt b/interfaces/Concept/licenses/LICENSE-GPL.txt
similarity index 100%
rename from main/interfaces/Concept/licenses/LICENSE-GPL.txt
rename to interfaces/Concept/licenses/LICENSE-GPL.txt
diff --git a/main/interfaces/Concept/licenses/LICENSE-MIT.txt b/interfaces/Concept/licenses/LICENSE-MIT.txt
similarity index 100%
rename from main/interfaces/Concept/licenses/LICENSE-MIT.txt
rename to interfaces/Concept/licenses/LICENSE-MIT.txt
diff --git a/main/interfaces/Concept/templates/main.tmpl b/interfaces/Concept/templates/main.tmpl
similarity index 100%
rename from main/interfaces/Concept/templates/main.tmpl
rename to interfaces/Concept/templates/main.tmpl
diff --git a/main/interfaces/Concept/templates/static/images/darkness/ui-bg_flat_30_cccccc_40x100.png b/interfaces/Concept/templates/static/images/darkness/ui-bg_flat_30_cccccc_40x100.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/darkness/ui-bg_flat_30_cccccc_40x100.png
rename to interfaces/Concept/templates/static/images/darkness/ui-bg_flat_30_cccccc_40x100.png
diff --git a/main/interfaces/Concept/templates/static/images/darkness/ui-bg_flat_50_5c5c5c_40x100.png b/interfaces/Concept/templates/static/images/darkness/ui-bg_flat_50_5c5c5c_40x100.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/darkness/ui-bg_flat_50_5c5c5c_40x100.png
rename to interfaces/Concept/templates/static/images/darkness/ui-bg_flat_50_5c5c5c_40x100.png
diff --git a/main/interfaces/Concept/templates/static/images/darkness/ui-bg_glass_20_555555_1x400.png b/interfaces/Concept/templates/static/images/darkness/ui-bg_glass_20_555555_1x400.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/darkness/ui-bg_glass_20_555555_1x400.png
rename to interfaces/Concept/templates/static/images/darkness/ui-bg_glass_20_555555_1x400.png
diff --git a/main/interfaces/Concept/templates/static/images/darkness/ui-bg_glass_40_0078a3_1x400.png b/interfaces/Concept/templates/static/images/darkness/ui-bg_glass_40_0078a3_1x400.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/darkness/ui-bg_glass_40_0078a3_1x400.png
rename to interfaces/Concept/templates/static/images/darkness/ui-bg_glass_40_0078a3_1x400.png
diff --git a/main/interfaces/Concept/templates/static/images/darkness/ui-bg_glass_40_ffc73d_1x400.png b/interfaces/Concept/templates/static/images/darkness/ui-bg_glass_40_ffc73d_1x400.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/darkness/ui-bg_glass_40_ffc73d_1x400.png
rename to interfaces/Concept/templates/static/images/darkness/ui-bg_glass_40_ffc73d_1x400.png
diff --git a/main/interfaces/Concept/templates/static/images/darkness/ui-bg_gloss-wave_25_333333_500x100.png b/interfaces/Concept/templates/static/images/darkness/ui-bg_gloss-wave_25_333333_500x100.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/darkness/ui-bg_gloss-wave_25_333333_500x100.png
rename to interfaces/Concept/templates/static/images/darkness/ui-bg_gloss-wave_25_333333_500x100.png
diff --git a/main/interfaces/Concept/templates/static/images/darkness/ui-bg_highlight-soft_80_eeeeee_1x100.png b/interfaces/Concept/templates/static/images/darkness/ui-bg_highlight-soft_80_eeeeee_1x100.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/darkness/ui-bg_highlight-soft_80_eeeeee_1x100.png
rename to interfaces/Concept/templates/static/images/darkness/ui-bg_highlight-soft_80_eeeeee_1x100.png
diff --git a/main/interfaces/Concept/templates/static/images/darkness/ui-bg_inset-soft_25_000000_1x100.png b/interfaces/Concept/templates/static/images/darkness/ui-bg_inset-soft_25_000000_1x100.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/darkness/ui-bg_inset-soft_25_000000_1x100.png
rename to interfaces/Concept/templates/static/images/darkness/ui-bg_inset-soft_25_000000_1x100.png
diff --git a/main/interfaces/Concept/templates/static/images/darkness/ui-bg_inset-soft_30_f58400_1x100.png b/interfaces/Concept/templates/static/images/darkness/ui-bg_inset-soft_30_f58400_1x100.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/darkness/ui-bg_inset-soft_30_f58400_1x100.png
rename to interfaces/Concept/templates/static/images/darkness/ui-bg_inset-soft_30_f58400_1x100.png
diff --git a/main/interfaces/Concept/templates/static/images/darkness/ui-icons_222222_256x240.png b/interfaces/Concept/templates/static/images/darkness/ui-icons_222222_256x240.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/darkness/ui-icons_222222_256x240.png
rename to interfaces/Concept/templates/static/images/darkness/ui-icons_222222_256x240.png
diff --git a/main/interfaces/Concept/templates/static/images/darkness/ui-icons_4b8e0b_256x240.png b/interfaces/Concept/templates/static/images/darkness/ui-icons_4b8e0b_256x240.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/darkness/ui-icons_4b8e0b_256x240.png
rename to interfaces/Concept/templates/static/images/darkness/ui-icons_4b8e0b_256x240.png
diff --git a/main/interfaces/Concept/templates/static/images/darkness/ui-icons_a83300_256x240.png b/interfaces/Concept/templates/static/images/darkness/ui-icons_a83300_256x240.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/darkness/ui-icons_a83300_256x240.png
rename to interfaces/Concept/templates/static/images/darkness/ui-icons_a83300_256x240.png
diff --git a/main/interfaces/Concept/templates/static/images/darkness/ui-icons_cccccc_256x240.png b/interfaces/Concept/templates/static/images/darkness/ui-icons_cccccc_256x240.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/darkness/ui-icons_cccccc_256x240.png
rename to interfaces/Concept/templates/static/images/darkness/ui-icons_cccccc_256x240.png
diff --git a/main/interfaces/Concept/templates/static/images/darkness/ui-icons_ffffff_256x240.png b/interfaces/Concept/templates/static/images/darkness/ui-icons_ffffff_256x240.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/darkness/ui-icons_ffffff_256x240.png
rename to interfaces/Concept/templates/static/images/darkness/ui-icons_ffffff_256x240.png
diff --git a/main/interfaces/Concept/templates/static/images/logo.png b/interfaces/Concept/templates/static/images/logo.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/logo.png
rename to interfaces/Concept/templates/static/images/logo.png
diff --git a/main/interfaces/Concept/templates/static/images/redmond/ui-bg_flat_0_aaaaaa_40x100.png b/interfaces/Concept/templates/static/images/redmond/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/redmond/ui-bg_flat_0_aaaaaa_40x100.png
rename to interfaces/Concept/templates/static/images/redmond/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/main/interfaces/Concept/templates/static/images/redmond/ui-bg_flat_55_fbec88_40x100.png b/interfaces/Concept/templates/static/images/redmond/ui-bg_flat_55_fbec88_40x100.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/redmond/ui-bg_flat_55_fbec88_40x100.png
rename to interfaces/Concept/templates/static/images/redmond/ui-bg_flat_55_fbec88_40x100.png
diff --git a/main/interfaces/Concept/templates/static/images/redmond/ui-bg_glass_75_d0e5f5_1x400.png b/interfaces/Concept/templates/static/images/redmond/ui-bg_glass_75_d0e5f5_1x400.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/redmond/ui-bg_glass_75_d0e5f5_1x400.png
rename to interfaces/Concept/templates/static/images/redmond/ui-bg_glass_75_d0e5f5_1x400.png
diff --git a/main/interfaces/Concept/templates/static/images/redmond/ui-bg_glass_85_dfeffc_1x400.png b/interfaces/Concept/templates/static/images/redmond/ui-bg_glass_85_dfeffc_1x400.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/redmond/ui-bg_glass_85_dfeffc_1x400.png
rename to interfaces/Concept/templates/static/images/redmond/ui-bg_glass_85_dfeffc_1x400.png
diff --git a/main/interfaces/Concept/templates/static/images/redmond/ui-bg_glass_95_fef1ec_1x400.png b/interfaces/Concept/templates/static/images/redmond/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/redmond/ui-bg_glass_95_fef1ec_1x400.png
rename to interfaces/Concept/templates/static/images/redmond/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/main/interfaces/Concept/templates/static/images/redmond/ui-bg_gloss-wave_55_5c9ccc_500x100.png b/interfaces/Concept/templates/static/images/redmond/ui-bg_gloss-wave_55_5c9ccc_500x100.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/redmond/ui-bg_gloss-wave_55_5c9ccc_500x100.png
rename to interfaces/Concept/templates/static/images/redmond/ui-bg_gloss-wave_55_5c9ccc_500x100.png
diff --git a/main/interfaces/Concept/templates/static/images/redmond/ui-bg_inset-hard_100_f5f8f9_1x100.png b/interfaces/Concept/templates/static/images/redmond/ui-bg_inset-hard_100_f5f8f9_1x100.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/redmond/ui-bg_inset-hard_100_f5f8f9_1x100.png
rename to interfaces/Concept/templates/static/images/redmond/ui-bg_inset-hard_100_f5f8f9_1x100.png
diff --git a/main/interfaces/Concept/templates/static/images/redmond/ui-bg_inset-hard_100_fcfdfd_1x100.png b/interfaces/Concept/templates/static/images/redmond/ui-bg_inset-hard_100_fcfdfd_1x100.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/redmond/ui-bg_inset-hard_100_fcfdfd_1x100.png
rename to interfaces/Concept/templates/static/images/redmond/ui-bg_inset-hard_100_fcfdfd_1x100.png
diff --git a/main/interfaces/Concept/templates/static/images/redmond/ui-icons_217bc0_256x240.png b/interfaces/Concept/templates/static/images/redmond/ui-icons_217bc0_256x240.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/redmond/ui-icons_217bc0_256x240.png
rename to interfaces/Concept/templates/static/images/redmond/ui-icons_217bc0_256x240.png
diff --git a/main/interfaces/Concept/templates/static/images/redmond/ui-icons_2e83ff_256x240.png b/interfaces/Concept/templates/static/images/redmond/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/redmond/ui-icons_2e83ff_256x240.png
rename to interfaces/Concept/templates/static/images/redmond/ui-icons_2e83ff_256x240.png
diff --git a/main/interfaces/Concept/templates/static/images/redmond/ui-icons_469bdd_256x240.png b/interfaces/Concept/templates/static/images/redmond/ui-icons_469bdd_256x240.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/redmond/ui-icons_469bdd_256x240.png
rename to interfaces/Concept/templates/static/images/redmond/ui-icons_469bdd_256x240.png
diff --git a/main/interfaces/Concept/templates/static/images/redmond/ui-icons_6da8d5_256x240.png b/interfaces/Concept/templates/static/images/redmond/ui-icons_6da8d5_256x240.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/redmond/ui-icons_6da8d5_256x240.png
rename to interfaces/Concept/templates/static/images/redmond/ui-icons_6da8d5_256x240.png
diff --git a/main/interfaces/Concept/templates/static/images/redmond/ui-icons_cd0a0a_256x240.png b/interfaces/Concept/templates/static/images/redmond/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/redmond/ui-icons_cd0a0a_256x240.png
rename to interfaces/Concept/templates/static/images/redmond/ui-icons_cd0a0a_256x240.png
diff --git a/main/interfaces/Concept/templates/static/images/redmond/ui-icons_d8e7f3_256x240.png b/interfaces/Concept/templates/static/images/redmond/ui-icons_d8e7f3_256x240.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/redmond/ui-icons_d8e7f3_256x240.png
rename to interfaces/Concept/templates/static/images/redmond/ui-icons_d8e7f3_256x240.png
diff --git a/main/interfaces/Concept/templates/static/images/redmond/ui-icons_f9bd01_256x240.png b/interfaces/Concept/templates/static/images/redmond/ui-icons_f9bd01_256x240.png
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/redmond/ui-icons_f9bd01_256x240.png
rename to interfaces/Concept/templates/static/images/redmond/ui-icons_f9bd01_256x240.png
diff --git a/main/interfaces/Concept/templates/static/images/sabnzbdplus.ico b/interfaces/Concept/templates/static/images/sabnzbdplus.ico
similarity index 100%
rename from main/interfaces/Concept/templates/static/images/sabnzbdplus.ico
rename to interfaces/Concept/templates/static/images/sabnzbdplus.ico
diff --git a/main/interfaces/Concept/templates/static/javascripts/concept.js b/interfaces/Concept/templates/static/javascripts/concept.js
similarity index 100%
rename from main/interfaces/Concept/templates/static/javascripts/concept.js
rename to interfaces/Concept/templates/static/javascripts/concept.js
diff --git a/main/interfaces/Concept/templates/static/javascripts/lib.js b/interfaces/Concept/templates/static/javascripts/lib.js
similarity index 100%
rename from main/interfaces/Concept/templates/static/javascripts/lib.js
rename to interfaces/Concept/templates/static/javascripts/lib.js
diff --git a/main/interfaces/Concept/templates/static/stylesheets/colorschemes/darkness.css b/interfaces/Concept/templates/static/stylesheets/colorschemes/darkness.css
similarity index 100%
rename from main/interfaces/Concept/templates/static/stylesheets/colorschemes/darkness.css
rename to interfaces/Concept/templates/static/stylesheets/colorschemes/darkness.css
diff --git a/main/interfaces/Concept/templates/static/stylesheets/colorschemes/redmond.css b/interfaces/Concept/templates/static/stylesheets/colorschemes/redmond.css
similarity index 100%
rename from main/interfaces/Concept/templates/static/stylesheets/colorschemes/redmond.css
rename to interfaces/Concept/templates/static/stylesheets/colorschemes/redmond.css
diff --git a/main/interfaces/Concept/templates/static/stylesheets/concept.css b/interfaces/Concept/templates/static/stylesheets/concept.css
similarity index 100%
rename from main/interfaces/Concept/templates/static/stylesheets/concept.css
rename to interfaces/Concept/templates/static/stylesheets/concept.css
diff --git a/main/interfaces/Concept/templates/static/stylesheets/ui.jqgrid.css b/interfaces/Concept/templates/static/stylesheets/ui.jqgrid.css
similarity index 100%
rename from main/interfaces/Concept/templates/static/stylesheets/ui.jqgrid.css
rename to interfaces/Concept/templates/static/stylesheets/ui.jqgrid.css
diff --git a/main/interfaces/Mobile/README.txt b/interfaces/Mobile/README.txt
similarity index 100%
rename from main/interfaces/Mobile/README.txt
rename to interfaces/Mobile/README.txt
diff --git a/main/interfaces/Mobile/language/de-de.txt b/interfaces/Mobile/language/de-de.txt
similarity index 100%
rename from main/interfaces/Mobile/language/de-de.txt
rename to interfaces/Mobile/language/de-de.txt
diff --git a/main/interfaces/Mobile/language/fr-fr.txt b/interfaces/Mobile/language/fr-fr.txt
similarity index 100%
rename from main/interfaces/Mobile/language/fr-fr.txt
rename to interfaces/Mobile/language/fr-fr.txt
diff --git a/main/interfaces/Mobile/language/nl-du.txt b/interfaces/Mobile/language/nl-du.txt
similarity index 100%
rename from main/interfaces/Mobile/language/nl-du.txt
rename to interfaces/Mobile/language/nl-du.txt
diff --git a/main/interfaces/Mobile/language/sv-se.txt b/interfaces/Mobile/language/sv-se.txt
similarity index 100%
rename from main/interfaces/Mobile/language/sv-se.txt
rename to interfaces/Mobile/language/sv-se.txt
diff --git a/main/interfaces/Mobile/language/us-en.txt b/interfaces/Mobile/language/us-en.txt
similarity index 100%
rename from main/interfaces/Mobile/language/us-en.txt
rename to interfaces/Mobile/language/us-en.txt
diff --git a/main/interfaces/Mobile/licenses/LICENSE-BSD.txt b/interfaces/Mobile/licenses/LICENSE-BSD.txt
similarity index 100%
rename from main/interfaces/Mobile/licenses/LICENSE-BSD.txt
rename to interfaces/Mobile/licenses/LICENSE-BSD.txt
diff --git a/main/interfaces/Mobile/licenses/LICENSE-CC.txt b/interfaces/Mobile/licenses/LICENSE-CC.txt
similarity index 100%
rename from main/interfaces/Mobile/licenses/LICENSE-CC.txt
rename to interfaces/Mobile/licenses/LICENSE-CC.txt
diff --git a/main/interfaces/Mobile/licenses/LICENSE-GPL.txt b/interfaces/Mobile/licenses/LICENSE-GPL.txt
similarity index 100%
rename from main/interfaces/Mobile/licenses/LICENSE-GPL.txt
rename to interfaces/Mobile/licenses/LICENSE-GPL.txt
diff --git a/main/interfaces/Mobile/licenses/LICENSE-MIT.txt b/interfaces/Mobile/licenses/LICENSE-MIT.txt
similarity index 100%
rename from main/interfaces/Mobile/licenses/LICENSE-MIT.txt
rename to interfaces/Mobile/licenses/LICENSE-MIT.txt
diff --git a/main/interfaces/Mobile/templates/main.tmpl b/interfaces/Mobile/templates/main.tmpl
similarity index 100%
rename from main/interfaces/Mobile/templates/main.tmpl
rename to interfaces/Mobile/templates/main.tmpl
diff --git a/main/interfaces/Mobile/templates/static/images/dark/back_button.png b/interfaces/Mobile/templates/static/images/dark/back_button.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/dark/back_button.png
rename to interfaces/Mobile/templates/static/images/dark/back_button.png
diff --git a/main/interfaces/Mobile/templates/static/images/dark/back_button_clicked.png b/interfaces/Mobile/templates/static/images/dark/back_button_clicked.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/dark/back_button_clicked.png
rename to interfaces/Mobile/templates/static/images/dark/back_button_clicked.png
diff --git a/main/interfaces/Mobile/templates/static/images/dark/button.png b/interfaces/Mobile/templates/static/images/dark/button.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/dark/button.png
rename to interfaces/Mobile/templates/static/images/dark/button.png
diff --git a/main/interfaces/Mobile/templates/static/images/dark/button_clicked.png b/interfaces/Mobile/templates/static/images/dark/button_clicked.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/dark/button_clicked.png
rename to interfaces/Mobile/templates/static/images/dark/button_clicked.png
diff --git a/main/interfaces/Mobile/templates/static/images/dark/chevron.png b/interfaces/Mobile/templates/static/images/dark/chevron.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/dark/chevron.png
rename to interfaces/Mobile/templates/static/images/dark/chevron.png
diff --git a/main/interfaces/Mobile/templates/static/images/dark/chevron_circle.png b/interfaces/Mobile/templates/static/images/dark/chevron_circle.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/dark/chevron_circle.png
rename to interfaces/Mobile/templates/static/images/dark/chevron_circle.png
diff --git a/main/interfaces/Mobile/templates/static/images/dark/grayButton.png b/interfaces/Mobile/templates/static/images/dark/grayButton.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/dark/grayButton.png
rename to interfaces/Mobile/templates/static/images/dark/grayButton.png
diff --git a/main/interfaces/Mobile/templates/static/images/dark/loading.gif b/interfaces/Mobile/templates/static/images/dark/loading.gif
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/dark/loading.gif
rename to interfaces/Mobile/templates/static/images/dark/loading.gif
diff --git a/main/interfaces/Mobile/templates/static/images/dark/on_off.png b/interfaces/Mobile/templates/static/images/dark/on_off.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/dark/on_off.png
rename to interfaces/Mobile/templates/static/images/dark/on_off.png
diff --git a/main/interfaces/Mobile/templates/static/images/dark/rowhead.png b/interfaces/Mobile/templates/static/images/dark/rowhead.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/dark/rowhead.png
rename to interfaces/Mobile/templates/static/images/dark/rowhead.png
diff --git a/main/interfaces/Mobile/templates/static/images/dark/toggle.png b/interfaces/Mobile/templates/static/images/dark/toggle.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/dark/toggle.png
rename to interfaces/Mobile/templates/static/images/dark/toggle.png
diff --git a/main/interfaces/Mobile/templates/static/images/dark/toggleOn.png b/interfaces/Mobile/templates/static/images/dark/toggleOn.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/dark/toggleOn.png
rename to interfaces/Mobile/templates/static/images/dark/toggleOn.png
diff --git a/main/interfaces/Mobile/templates/static/images/dark/toolbar.png b/interfaces/Mobile/templates/static/images/dark/toolbar.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/dark/toolbar.png
rename to interfaces/Mobile/templates/static/images/dark/toolbar.png
diff --git a/main/interfaces/Mobile/templates/static/images/dark/whiteButton.png b/interfaces/Mobile/templates/static/images/dark/whiteButton.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/dark/whiteButton.png
rename to interfaces/Mobile/templates/static/images/dark/whiteButton.png
diff --git a/main/interfaces/Mobile/templates/static/images/light/backButton.png b/interfaces/Mobile/templates/static/images/light/backButton.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/light/backButton.png
rename to interfaces/Mobile/templates/static/images/light/backButton.png
diff --git a/main/interfaces/Mobile/templates/static/images/light/blueButton.png b/interfaces/Mobile/templates/static/images/light/blueButton.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/light/blueButton.png
rename to interfaces/Mobile/templates/static/images/light/blueButton.png
diff --git a/main/interfaces/Mobile/templates/static/images/light/cancel.png b/interfaces/Mobile/templates/static/images/light/cancel.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/light/cancel.png
rename to interfaces/Mobile/templates/static/images/light/cancel.png
diff --git a/main/interfaces/Mobile/templates/static/images/light/chevron.png b/interfaces/Mobile/templates/static/images/light/chevron.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/light/chevron.png
rename to interfaces/Mobile/templates/static/images/light/chevron.png
diff --git a/main/interfaces/Mobile/templates/static/images/light/grayButton.png b/interfaces/Mobile/templates/static/images/light/grayButton.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/light/grayButton.png
rename to interfaces/Mobile/templates/static/images/light/grayButton.png
diff --git a/main/interfaces/Mobile/templates/static/images/light/listArrowSel.png b/interfaces/Mobile/templates/static/images/light/listArrowSel.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/light/listArrowSel.png
rename to interfaces/Mobile/templates/static/images/light/listArrowSel.png
diff --git a/main/interfaces/Mobile/templates/static/images/light/listGroup.png b/interfaces/Mobile/templates/static/images/light/listGroup.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/light/listGroup.png
rename to interfaces/Mobile/templates/static/images/light/listGroup.png
diff --git a/main/interfaces/Mobile/templates/static/images/light/loading.gif b/interfaces/Mobile/templates/static/images/light/loading.gif
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/light/loading.gif
rename to interfaces/Mobile/templates/static/images/light/loading.gif
diff --git a/main/interfaces/Mobile/templates/static/images/light/on_off.png b/interfaces/Mobile/templates/static/images/light/on_off.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/light/on_off.png
rename to interfaces/Mobile/templates/static/images/light/on_off.png
diff --git a/main/interfaces/Mobile/templates/static/images/light/pinstripes.png b/interfaces/Mobile/templates/static/images/light/pinstripes.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/light/pinstripes.png
rename to interfaces/Mobile/templates/static/images/light/pinstripes.png
diff --git a/main/interfaces/Mobile/templates/static/images/light/selection.png b/interfaces/Mobile/templates/static/images/light/selection.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/light/selection.png
rename to interfaces/Mobile/templates/static/images/light/selection.png
diff --git a/main/interfaces/Mobile/templates/static/images/light/thumb.png b/interfaces/Mobile/templates/static/images/light/thumb.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/light/thumb.png
rename to interfaces/Mobile/templates/static/images/light/thumb.png
diff --git a/main/interfaces/Mobile/templates/static/images/light/toggle.png b/interfaces/Mobile/templates/static/images/light/toggle.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/light/toggle.png
rename to interfaces/Mobile/templates/static/images/light/toggle.png
diff --git a/main/interfaces/Mobile/templates/static/images/light/toggleOn.png b/interfaces/Mobile/templates/static/images/light/toggleOn.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/light/toggleOn.png
rename to interfaces/Mobile/templates/static/images/light/toggleOn.png
diff --git a/main/interfaces/Mobile/templates/static/images/light/toolButton.png b/interfaces/Mobile/templates/static/images/light/toolButton.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/light/toolButton.png
rename to interfaces/Mobile/templates/static/images/light/toolButton.png
diff --git a/main/interfaces/Mobile/templates/static/images/light/toolbar.png b/interfaces/Mobile/templates/static/images/light/toolbar.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/light/toolbar.png
rename to interfaces/Mobile/templates/static/images/light/toolbar.png
diff --git a/main/interfaces/Mobile/templates/static/images/light/whiteButton.png b/interfaces/Mobile/templates/static/images/light/whiteButton.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/light/whiteButton.png
rename to interfaces/Mobile/templates/static/images/light/whiteButton.png
diff --git a/main/interfaces/Mobile/templates/static/images/sab.png b/interfaces/Mobile/templates/static/images/sab.png
similarity index 100%
rename from main/interfaces/Mobile/templates/static/images/sab.png
rename to interfaces/Mobile/templates/static/images/sab.png
diff --git a/main/interfaces/Mobile/templates/static/javascripts/mobile.js b/interfaces/Mobile/templates/static/javascripts/mobile.js
similarity index 100%
rename from main/interfaces/Mobile/templates/static/javascripts/mobile.js
rename to interfaces/Mobile/templates/static/javascripts/mobile.js
diff --git a/main/interfaces/Mobile/templates/static/stylesheets/colorschemes/dark.css b/interfaces/Mobile/templates/static/stylesheets/colorschemes/dark.css
similarity index 100%
rename from main/interfaces/Mobile/templates/static/stylesheets/colorschemes/dark.css
rename to interfaces/Mobile/templates/static/stylesheets/colorschemes/dark.css
diff --git a/main/interfaces/Mobile/templates/static/stylesheets/colorschemes/light.css b/interfaces/Mobile/templates/static/stylesheets/colorschemes/light.css
similarity index 100%
rename from main/interfaces/Mobile/templates/static/stylesheets/colorschemes/light.css
rename to interfaces/Mobile/templates/static/stylesheets/colorschemes/light.css
diff --git a/main/interfaces/Mobile/templates/static/stylesheets/jqtouch.css b/interfaces/Mobile/templates/static/stylesheets/jqtouch.css
similarity index 100%
rename from main/interfaces/Mobile/templates/static/stylesheets/jqtouch.css
rename to interfaces/Mobile/templates/static/stylesheets/jqtouch.css
diff --git a/main/interfaces/Plush/README.txt b/interfaces/Plush/README.txt
similarity index 100%
rename from main/interfaces/Plush/README.txt
rename to interfaces/Plush/README.txt
diff --git a/main/interfaces/Plush/language/de-de.txt b/interfaces/Plush/language/de-de.txt
similarity index 100%
rename from main/interfaces/Plush/language/de-de.txt
rename to interfaces/Plush/language/de-de.txt
diff --git a/main/interfaces/Plush/language/fr-fr.txt b/interfaces/Plush/language/fr-fr.txt
similarity index 100%
rename from main/interfaces/Plush/language/fr-fr.txt
rename to interfaces/Plush/language/fr-fr.txt
diff --git a/main/interfaces/Plush/language/nl-du.txt b/interfaces/Plush/language/nl-du.txt
similarity index 100%
rename from main/interfaces/Plush/language/nl-du.txt
rename to interfaces/Plush/language/nl-du.txt
diff --git a/main/interfaces/Plush/language/sv-se.txt b/interfaces/Plush/language/sv-se.txt
similarity index 100%
rename from main/interfaces/Plush/language/sv-se.txt
rename to interfaces/Plush/language/sv-se.txt
diff --git a/main/interfaces/Plush/language/us-en.txt b/interfaces/Plush/language/us-en.txt
similarity index 100%
rename from main/interfaces/Plush/language/us-en.txt
rename to interfaces/Plush/language/us-en.txt
diff --git a/main/interfaces/Plush/licenses/LICENSE-BSD.txt b/interfaces/Plush/licenses/LICENSE-BSD.txt
similarity index 100%
rename from main/interfaces/Plush/licenses/LICENSE-BSD.txt
rename to interfaces/Plush/licenses/LICENSE-BSD.txt
diff --git a/main/interfaces/Plush/licenses/LICENSE-CC.txt b/interfaces/Plush/licenses/LICENSE-CC.txt
similarity index 100%
rename from main/interfaces/Plush/licenses/LICENSE-CC.txt
rename to interfaces/Plush/licenses/LICENSE-CC.txt
diff --git a/main/interfaces/Plush/licenses/LICENSE-GPL.txt b/interfaces/Plush/licenses/LICENSE-GPL.txt
similarity index 100%
rename from main/interfaces/Plush/licenses/LICENSE-GPL.txt
rename to interfaces/Plush/licenses/LICENSE-GPL.txt
diff --git a/main/interfaces/Plush/licenses/LICENSE-GPL3.txt b/interfaces/Plush/licenses/LICENSE-GPL3.txt
similarity index 100%
rename from main/interfaces/Plush/licenses/LICENSE-GPL3.txt
rename to interfaces/Plush/licenses/LICENSE-GPL3.txt
diff --git a/main/interfaces/Plush/licenses/LICENSE-LGPL.txt b/interfaces/Plush/licenses/LICENSE-LGPL.txt
similarity index 100%
rename from main/interfaces/Plush/licenses/LICENSE-LGPL.txt
rename to interfaces/Plush/licenses/LICENSE-LGPL.txt
diff --git a/main/interfaces/Plush/licenses/LICENSE-MIT.txt b/interfaces/Plush/licenses/LICENSE-MIT.txt
similarity index 100%
rename from main/interfaces/Plush/licenses/LICENSE-MIT.txt
rename to interfaces/Plush/licenses/LICENSE-MIT.txt
diff --git a/main/interfaces/Plush/licenses/LICENSE-WebToolkit.txt b/interfaces/Plush/licenses/LICENSE-WebToolkit.txt
similarity index 100%
rename from main/interfaces/Plush/licenses/LICENSE-WebToolkit.txt
rename to interfaces/Plush/licenses/LICENSE-WebToolkit.txt
diff --git a/main/interfaces/Plush/templates/config.tmpl b/interfaces/Plush/templates/config.tmpl
similarity index 100%
rename from main/interfaces/Plush/templates/config.tmpl
rename to interfaces/Plush/templates/config.tmpl
diff --git a/main/interfaces/Plush/templates/config_cat.tmpl b/interfaces/Plush/templates/config_cat.tmpl
similarity index 100%
rename from main/interfaces/Plush/templates/config_cat.tmpl
rename to interfaces/Plush/templates/config_cat.tmpl
diff --git a/main/interfaces/Plush/templates/config_directories.tmpl b/interfaces/Plush/templates/config_directories.tmpl
similarity index 100%
rename from main/interfaces/Plush/templates/config_directories.tmpl
rename to interfaces/Plush/templates/config_directories.tmpl
diff --git a/main/interfaces/Plush/templates/config_email.tmpl b/interfaces/Plush/templates/config_email.tmpl
similarity index 100%
rename from main/interfaces/Plush/templates/config_email.tmpl
rename to interfaces/Plush/templates/config_email.tmpl
diff --git a/main/interfaces/Plush/templates/config_general.tmpl b/interfaces/Plush/templates/config_general.tmpl
similarity index 100%
rename from main/interfaces/Plush/templates/config_general.tmpl
rename to interfaces/Plush/templates/config_general.tmpl
diff --git a/main/interfaces/Plush/templates/config_inc_footer.tmpl b/interfaces/Plush/templates/config_inc_footer.tmpl
similarity index 100%
rename from main/interfaces/Plush/templates/config_inc_footer.tmpl
rename to interfaces/Plush/templates/config_inc_footer.tmpl
diff --git a/main/interfaces/Plush/templates/config_inc_header.tmpl b/interfaces/Plush/templates/config_inc_header.tmpl
similarity index 100%
rename from main/interfaces/Plush/templates/config_inc_header.tmpl
rename to interfaces/Plush/templates/config_inc_header.tmpl
diff --git a/main/interfaces/Plush/templates/config_newzbin.tmpl b/interfaces/Plush/templates/config_newzbin.tmpl
similarity index 100%
rename from main/interfaces/Plush/templates/config_newzbin.tmpl
rename to interfaces/Plush/templates/config_newzbin.tmpl
diff --git a/main/interfaces/Plush/templates/config_rss.tmpl b/interfaces/Plush/templates/config_rss.tmpl
similarity index 100%
rename from main/interfaces/Plush/templates/config_rss.tmpl
rename to interfaces/Plush/templates/config_rss.tmpl
diff --git a/main/interfaces/Plush/templates/config_scheduling.tmpl b/interfaces/Plush/templates/config_scheduling.tmpl
similarity index 100%
rename from main/interfaces/Plush/templates/config_scheduling.tmpl
rename to interfaces/Plush/templates/config_scheduling.tmpl
diff --git a/main/interfaces/Plush/templates/config_server.tmpl b/interfaces/Plush/templates/config_server.tmpl
similarity index 100%
rename from main/interfaces/Plush/templates/config_server.tmpl
rename to interfaces/Plush/templates/config_server.tmpl
diff --git a/main/interfaces/Plush/templates/config_sorting.tmpl b/interfaces/Plush/templates/config_sorting.tmpl
similarity index 100%
rename from main/interfaces/Plush/templates/config_sorting.tmpl
rename to interfaces/Plush/templates/config_sorting.tmpl
diff --git a/main/interfaces/Plush/templates/config_switches.tmpl b/interfaces/Plush/templates/config_switches.tmpl
similarity index 100%
rename from main/interfaces/Plush/templates/config_switches.tmpl
rename to interfaces/Plush/templates/config_switches.tmpl
diff --git a/main/interfaces/Plush/templates/connection_info.tmpl b/interfaces/Plush/templates/connection_info.tmpl
similarity index 100%
rename from main/interfaces/Plush/templates/connection_info.tmpl
rename to interfaces/Plush/templates/connection_info.tmpl
diff --git a/main/interfaces/Plush/templates/history.tmpl b/interfaces/Plush/templates/history.tmpl
similarity index 100%
rename from main/interfaces/Plush/templates/history.tmpl
rename to interfaces/Plush/templates/history.tmpl
diff --git a/main/interfaces/Plush/templates/main.tmpl b/interfaces/Plush/templates/main.tmpl
similarity index 100%
rename from main/interfaces/Plush/templates/main.tmpl
rename to interfaces/Plush/templates/main.tmpl
diff --git a/main/interfaces/Plush/templates/nzo.tmpl b/interfaces/Plush/templates/nzo.tmpl
similarity index 100%
rename from main/interfaces/Plush/templates/nzo.tmpl
rename to interfaces/Plush/templates/nzo.tmpl
diff --git a/main/interfaces/Plush/templates/queue.tmpl b/interfaces/Plush/templates/queue.tmpl
similarity index 100%
rename from main/interfaces/Plush/templates/queue.tmpl
rename to interfaces/Plush/templates/queue.tmpl
diff --git a/main/interfaces/Plush/templates/static/images/plush-default-split.tar.gz b/interfaces/Plush/templates/static/images/plush-default-split.tar.gz
similarity index 100%
rename from main/interfaces/Plush/templates/static/images/plush-default-split.tar.gz
rename to interfaces/Plush/templates/static/images/plush-default-split.tar.gz
diff --git a/main/interfaces/Plush/templates/static/images/plush-default/sabnzbdplus.ico b/interfaces/Plush/templates/static/images/plush-default/sabnzbdplus.ico
similarity index 100%
rename from main/interfaces/Plush/templates/static/images/plush-default/sabnzbdplus.ico
rename to interfaces/Plush/templates/static/images/plush-default/sabnzbdplus.ico
diff --git a/main/interfaces/Plush/templates/static/images/plush-default/spinner.gif b/interfaces/Plush/templates/static/images/plush-default/spinner.gif
similarity index 100%
rename from main/interfaces/Plush/templates/static/images/plush-default/spinner.gif
rename to interfaces/Plush/templates/static/images/plush-default/spinner.gif
diff --git a/main/interfaces/Plush/templates/static/images/plush-default/sprite-config.png b/interfaces/Plush/templates/static/images/plush-default/sprite-config.png
similarity index 100%
rename from main/interfaces/Plush/templates/static/images/plush-default/sprite-config.png
rename to interfaces/Plush/templates/static/images/plush-default/sprite-config.png
diff --git a/main/interfaces/Plush/templates/static/images/plush-default/sprite-jq-colorbox.png b/interfaces/Plush/templates/static/images/plush-default/sprite-jq-colorbox.png
similarity index 100%
rename from main/interfaces/Plush/templates/static/images/plush-default/sprite-jq-colorbox.png
rename to interfaces/Plush/templates/static/images/plush-default/sprite-jq-colorbox.png
diff --git a/main/interfaces/Plush/templates/static/images/plush-default/sprite-main.png b/interfaces/Plush/templates/static/images/plush-default/sprite-main.png
similarity index 100%
rename from main/interfaces/Plush/templates/static/images/plush-default/sprite-main.png
rename to interfaces/Plush/templates/static/images/plush-default/sprite-main.png
diff --git a/main/interfaces/Plush/templates/static/images/plush-default/sprite-tilex.png b/interfaces/Plush/templates/static/images/plush-default/sprite-tilex.png
similarity index 100%
rename from main/interfaces/Plush/templates/static/images/plush-default/sprite-tilex.png
rename to interfaces/Plush/templates/static/images/plush-default/sprite-tilex.png
diff --git a/main/interfaces/Plush/templates/static/images/plush-default/sprite-tiley.png b/interfaces/Plush/templates/static/images/plush-default/sprite-tiley.png
similarity index 100%
rename from main/interfaces/Plush/templates/static/images/plush-default/sprite-tiley.png
rename to interfaces/Plush/templates/static/images/plush-default/sprite-tiley.png
diff --git a/main/interfaces/Plush/templates/static/images/plush-default/viewmag.png b/interfaces/Plush/templates/static/images/plush-default/viewmag.png
similarity index 100%
rename from main/interfaces/Plush/templates/static/images/plush-default/viewmag.png
rename to interfaces/Plush/templates/static/images/plush-default/viewmag.png
diff --git a/main/interfaces/Plush/templates/static/javascripts/config.js b/interfaces/Plush/templates/static/javascripts/config.js
similarity index 100%
rename from main/interfaces/Plush/templates/static/javascripts/config.js
rename to interfaces/Plush/templates/static/javascripts/config.js
diff --git a/main/interfaces/Plush/templates/static/javascripts/lib.js b/interfaces/Plush/templates/static/javascripts/lib.js
similarity index 100%
rename from main/interfaces/Plush/templates/static/javascripts/lib.js
rename to interfaces/Plush/templates/static/javascripts/lib.js
diff --git a/main/interfaces/Plush/templates/static/javascripts/plush.js b/interfaces/Plush/templates/static/javascripts/plush.js
similarity index 100%
rename from main/interfaces/Plush/templates/static/javascripts/plush.js
rename to interfaces/Plush/templates/static/javascripts/plush.js
diff --git a/main/interfaces/Plush/templates/static/stylesheets/plush-default.css b/interfaces/Plush/templates/static/stylesheets/plush-default.css
similarity index 100%
rename from main/interfaces/Plush/templates/static/stylesheets/plush-default.css
rename to interfaces/Plush/templates/static/stylesheets/plush-default.css
diff --git a/main/interfaces/smpl/CreativeCommons2-5.txt b/interfaces/smpl/CreativeCommons2-5.txt
similarity index 100%
rename from main/interfaces/smpl/CreativeCommons2-5.txt
rename to interfaces/smpl/CreativeCommons2-5.txt
diff --git a/main/interfaces/smpl/CreativeCommons3-0.txt b/interfaces/smpl/CreativeCommons3-0.txt
similarity index 100%
rename from main/interfaces/smpl/CreativeCommons3-0.txt
rename to interfaces/smpl/CreativeCommons3-0.txt
diff --git a/main/interfaces/smpl/GPL2.txt b/interfaces/smpl/GPL2.txt
similarity index 100%
rename from main/interfaces/smpl/GPL2.txt
rename to interfaces/smpl/GPL2.txt
diff --git a/main/interfaces/smpl/GPL3.txt b/interfaces/smpl/GPL3.txt
similarity index 100%
rename from main/interfaces/smpl/GPL3.txt
rename to interfaces/smpl/GPL3.txt
diff --git a/main/interfaces/smpl/LICENCE-silk_icons.txt b/interfaces/smpl/LICENCE-silk_icons.txt
similarity index 100%
rename from main/interfaces/smpl/LICENCE-silk_icons.txt
rename to interfaces/smpl/LICENCE-silk_icons.txt
diff --git a/main/interfaces/smpl/LICENSE.txt b/interfaces/smpl/LICENSE.txt
similarity index 100%
rename from main/interfaces/smpl/LICENSE.txt
rename to interfaces/smpl/LICENSE.txt
diff --git a/main/interfaces/smpl/License-ExCanvas.txt b/interfaces/smpl/License-ExCanvas.txt
similarity index 100%
rename from main/interfaces/smpl/License-ExCanvas.txt
rename to interfaces/smpl/License-ExCanvas.txt
diff --git a/main/interfaces/smpl/License-MochiKit.txt b/interfaces/smpl/License-MochiKit.txt
similarity index 100%
rename from main/interfaces/smpl/License-MochiKit.txt
rename to interfaces/smpl/License-MochiKit.txt
diff --git a/main/interfaces/smpl/License-Nuvola.txt b/interfaces/smpl/License-Nuvola.txt
similarity index 100%
rename from main/interfaces/smpl/License-Nuvola.txt
rename to interfaces/smpl/License-Nuvola.txt
diff --git a/main/interfaces/smpl/License-PlotKit.txt b/interfaces/smpl/License-PlotKit.txt
similarity index 100%
rename from main/interfaces/smpl/License-PlotKit.txt
rename to interfaces/smpl/License-PlotKit.txt
diff --git a/main/interfaces/smpl/License-getElementPosition.txt b/interfaces/smpl/License-getElementPosition.txt
similarity index 100%
rename from main/interfaces/smpl/License-getElementPosition.txt
rename to interfaces/smpl/License-getElementPosition.txt
diff --git a/main/interfaces/smpl/README.txt b/interfaces/smpl/README.txt
similarity index 100%
rename from main/interfaces/smpl/README.txt
rename to interfaces/smpl/README.txt
diff --git a/main/interfaces/smpl/language/de-de.txt b/interfaces/smpl/language/de-de.txt
similarity index 100%
rename from main/interfaces/smpl/language/de-de.txt
rename to interfaces/smpl/language/de-de.txt
diff --git a/main/interfaces/smpl/language/fr-fr.txt b/interfaces/smpl/language/fr-fr.txt
similarity index 100%
rename from main/interfaces/smpl/language/fr-fr.txt
rename to interfaces/smpl/language/fr-fr.txt
diff --git a/main/interfaces/smpl/language/nl-du.txt b/interfaces/smpl/language/nl-du.txt
similarity index 100%
rename from main/interfaces/smpl/language/nl-du.txt
rename to interfaces/smpl/language/nl-du.txt
diff --git a/main/interfaces/smpl/language/sv-se.txt b/interfaces/smpl/language/sv-se.txt
similarity index 100%
rename from main/interfaces/smpl/language/sv-se.txt
rename to interfaces/smpl/language/sv-se.txt
diff --git a/main/interfaces/smpl/language/us-en.txt b/interfaces/smpl/language/us-en.txt
similarity index 100%
rename from main/interfaces/smpl/language/us-en.txt
rename to interfaces/smpl/language/us-en.txt
diff --git a/main/interfaces/smpl/templates/config.tmpl b/interfaces/smpl/templates/config.tmpl
similarity index 100%
rename from main/interfaces/smpl/templates/config.tmpl
rename to interfaces/smpl/templates/config.tmpl
diff --git a/main/interfaces/smpl/templates/config_cat.tmpl b/interfaces/smpl/templates/config_cat.tmpl
similarity index 100%
rename from main/interfaces/smpl/templates/config_cat.tmpl
rename to interfaces/smpl/templates/config_cat.tmpl
diff --git a/main/interfaces/smpl/templates/config_directories.tmpl b/interfaces/smpl/templates/config_directories.tmpl
similarity index 100%
rename from main/interfaces/smpl/templates/config_directories.tmpl
rename to interfaces/smpl/templates/config_directories.tmpl
diff --git a/main/interfaces/smpl/templates/config_email.tmpl b/interfaces/smpl/templates/config_email.tmpl
similarity index 100%
rename from main/interfaces/smpl/templates/config_email.tmpl
rename to interfaces/smpl/templates/config_email.tmpl
diff --git a/main/interfaces/smpl/templates/config_general.tmpl b/interfaces/smpl/templates/config_general.tmpl
similarity index 100%
rename from main/interfaces/smpl/templates/config_general.tmpl
rename to interfaces/smpl/templates/config_general.tmpl
diff --git a/main/interfaces/smpl/templates/config_newzbin.tmpl b/interfaces/smpl/templates/config_newzbin.tmpl
similarity index 100%
rename from main/interfaces/smpl/templates/config_newzbin.tmpl
rename to interfaces/smpl/templates/config_newzbin.tmpl
diff --git a/main/interfaces/smpl/templates/config_rss.tmpl b/interfaces/smpl/templates/config_rss.tmpl
similarity index 100%
rename from main/interfaces/smpl/templates/config_rss.tmpl
rename to interfaces/smpl/templates/config_rss.tmpl
diff --git a/main/interfaces/smpl/templates/config_scheduling.tmpl b/interfaces/smpl/templates/config_scheduling.tmpl
similarity index 100%
rename from main/interfaces/smpl/templates/config_scheduling.tmpl
rename to interfaces/smpl/templates/config_scheduling.tmpl
diff --git a/main/interfaces/smpl/templates/config_server.tmpl b/interfaces/smpl/templates/config_server.tmpl
similarity index 100%
rename from main/interfaces/smpl/templates/config_server.tmpl
rename to interfaces/smpl/templates/config_server.tmpl
diff --git a/main/interfaces/smpl/templates/config_sorting.tmpl b/interfaces/smpl/templates/config_sorting.tmpl
similarity index 100%
rename from main/interfaces/smpl/templates/config_sorting.tmpl
rename to interfaces/smpl/templates/config_sorting.tmpl
diff --git a/main/interfaces/smpl/templates/config_switches.tmpl b/interfaces/smpl/templates/config_switches.tmpl
similarity index 100%
rename from main/interfaces/smpl/templates/config_switches.tmpl
rename to interfaces/smpl/templates/config_switches.tmpl
diff --git a/main/interfaces/smpl/templates/connection_info.tmpl b/interfaces/smpl/templates/connection_info.tmpl
similarity index 100%
rename from main/interfaces/smpl/templates/connection_info.tmpl
rename to interfaces/smpl/templates/connection_info.tmpl
diff --git a/main/interfaces/smpl/templates/history.tmpl b/interfaces/smpl/templates/history.tmpl
similarity index 100%
rename from main/interfaces/smpl/templates/history.tmpl
rename to interfaces/smpl/templates/history.tmpl
diff --git a/main/interfaces/smpl/templates/main.tmpl b/interfaces/smpl/templates/main.tmpl
similarity index 100%
rename from main/interfaces/smpl/templates/main.tmpl
rename to interfaces/smpl/templates/main.tmpl
diff --git a/main/interfaces/smpl/templates/nzo.tmpl b/interfaces/smpl/templates/nzo.tmpl
similarity index 100%
rename from main/interfaces/smpl/templates/nzo.tmpl
rename to interfaces/smpl/templates/nzo.tmpl
diff --git a/main/interfaces/smpl/templates/queue.tmpl b/interfaces/smpl/templates/queue.tmpl
similarity index 100%
rename from main/interfaces/smpl/templates/queue.tmpl
rename to interfaces/smpl/templates/queue.tmpl
diff --git a/main/interfaces/smpl/templates/static/MochiKit/MochiKit.js b/interfaces/smpl/templates/static/MochiKit/MochiKit.js
similarity index 100%
rename from main/interfaces/smpl/templates/static/MochiKit/MochiKit.js
rename to interfaces/smpl/templates/static/MochiKit/MochiKit.js
diff --git a/main/interfaces/smpl/templates/static/MochiKit/__package__.js b/interfaces/smpl/templates/static/MochiKit/__package__.js
similarity index 100%
rename from main/interfaces/smpl/templates/static/MochiKit/__package__.js
rename to interfaces/smpl/templates/static/MochiKit/__package__.js
diff --git a/main/interfaces/smpl/templates/static/PlotKit/PlotKit.js b/interfaces/smpl/templates/static/PlotKit/PlotKit.js
similarity index 100%
rename from main/interfaces/smpl/templates/static/PlotKit/PlotKit.js
rename to interfaces/smpl/templates/static/PlotKit/PlotKit.js
diff --git a/main/interfaces/smpl/templates/static/excanvas/excanvas.js b/interfaces/smpl/templates/static/excanvas/excanvas.js
similarity index 100%
rename from main/interfaces/smpl/templates/static/excanvas/excanvas.js
rename to interfaces/smpl/templates/static/excanvas/excanvas.js
diff --git a/main/interfaces/smpl/templates/static/feed-icon-14x14.png b/interfaces/smpl/templates/static/feed-icon-14x14.png
similarity index 100%
rename from main/interfaces/smpl/templates/static/feed-icon-14x14.png
rename to interfaces/smpl/templates/static/feed-icon-14x14.png
diff --git a/main/interfaces/smpl/templates/static/images/browser.png b/interfaces/smpl/templates/static/images/browser.png
similarity index 100%
rename from main/interfaces/smpl/templates/static/images/browser.png
rename to interfaces/smpl/templates/static/images/browser.png
diff --git a/main/interfaces/smpl/templates/static/images/bullet_arrow_down.png b/interfaces/smpl/templates/static/images/bullet_arrow_down.png
similarity index 100%
rename from main/interfaces/smpl/templates/static/images/bullet_arrow_down.png
rename to interfaces/smpl/templates/static/images/bullet_arrow_down.png
diff --git a/main/interfaces/smpl/templates/static/images/control_pause.png b/interfaces/smpl/templates/static/images/control_pause.png
similarity index 100%
rename from main/interfaces/smpl/templates/static/images/control_pause.png
rename to interfaces/smpl/templates/static/images/control_pause.png
diff --git a/main/interfaces/smpl/templates/static/images/control_play.png b/interfaces/smpl/templates/static/images/control_play.png
similarity index 100%
rename from main/interfaces/smpl/templates/static/images/control_play.png
rename to interfaces/smpl/templates/static/images/control_play.png
diff --git a/main/interfaces/smpl/templates/static/images/down.gif b/interfaces/smpl/templates/static/images/down.gif
similarity index 100%
rename from main/interfaces/smpl/templates/static/images/down.gif
rename to interfaces/smpl/templates/static/images/down.gif
diff --git a/main/interfaces/smpl/templates/static/images/drive.png b/interfaces/smpl/templates/static/images/drive.png
similarity index 100%
rename from main/interfaces/smpl/templates/static/images/drive.png
rename to interfaces/smpl/templates/static/images/drive.png
diff --git a/main/interfaces/smpl/templates/static/images/drive_go.png b/interfaces/smpl/templates/static/images/drive_go.png
similarity index 100%
rename from main/interfaces/smpl/templates/static/images/drive_go.png
rename to interfaces/smpl/templates/static/images/drive_go.png
diff --git a/main/interfaces/smpl/templates/static/images/favicon.ico b/interfaces/smpl/templates/static/images/favicon.ico
similarity index 100%
rename from main/interfaces/smpl/templates/static/images/favicon.ico
rename to interfaces/smpl/templates/static/images/favicon.ico
diff --git a/main/interfaces/smpl/templates/static/images/key_enter.png b/interfaces/smpl/templates/static/images/key_enter.png
similarity index 100%
rename from main/interfaces/smpl/templates/static/images/key_enter.png
rename to interfaces/smpl/templates/static/images/key_enter.png
diff --git a/main/interfaces/smpl/templates/static/images/messagebox_critical.png b/interfaces/smpl/templates/static/images/messagebox_critical.png
similarity index 100%
rename from main/interfaces/smpl/templates/static/images/messagebox_critical.png
rename to interfaces/smpl/templates/static/images/messagebox_critical.png
diff --git a/main/interfaces/smpl/templates/static/images/newzbin.png b/interfaces/smpl/templates/static/images/newzbin.png
similarity index 100%
rename from main/interfaces/smpl/templates/static/images/newzbin.png
rename to interfaces/smpl/templates/static/images/newzbin.png
diff --git a/main/interfaces/smpl/templates/static/images/nuvola/kgpg.png b/interfaces/smpl/templates/static/images/nuvola/kgpg.png
similarity index 100%
rename from main/interfaces/smpl/templates/static/images/nuvola/kgpg.png
rename to interfaces/smpl/templates/static/images/nuvola/kgpg.png
diff --git a/main/interfaces/smpl/templates/static/images/up.gif b/interfaces/smpl/templates/static/images/up.gif
similarity index 100%
rename from main/interfaces/smpl/templates/static/images/up.gif
rename to interfaces/smpl/templates/static/images/up.gif
diff --git a/main/interfaces/smpl/templates/static/sabnzbd_small4.png b/interfaces/smpl/templates/static/sabnzbd_small4.png
similarity index 100%
rename from main/interfaces/smpl/templates/static/sabnzbd_small4.png
rename to interfaces/smpl/templates/static/sabnzbd_small4.png
diff --git a/main/interfaces/smpl/templates/static/stylesheets/colorschemes/black.css b/interfaces/smpl/templates/static/stylesheets/colorschemes/black.css
similarity index 100%
rename from main/interfaces/smpl/templates/static/stylesheets/colorschemes/black.css
rename to interfaces/smpl/templates/static/stylesheets/colorschemes/black.css
diff --git a/main/interfaces/smpl/templates/static/stylesheets/colorschemes/white.css b/interfaces/smpl/templates/static/stylesheets/colorschemes/white.css
similarity index 100%
rename from main/interfaces/smpl/templates/static/stylesheets/colorschemes/white.css
rename to interfaces/smpl/templates/static/stylesheets/colorschemes/white.css
diff --git a/main/interfaces/smpl/templates/static/stylesheets/smpl.css b/interfaces/smpl/templates/static/stylesheets/smpl.css
similarity index 100%
rename from main/interfaces/smpl/templates/static/stylesheets/smpl.css
rename to interfaces/smpl/templates/static/stylesheets/smpl.css
diff --git a/main/interfaces/wizard/README.TXT b/interfaces/wizard/README.TXT
similarity index 100%
rename from main/interfaces/wizard/README.TXT
rename to interfaces/wizard/README.TXT
diff --git a/main/interfaces/wizard/five.html b/interfaces/wizard/five.html
similarity index 100%
rename from main/interfaces/wizard/five.html
rename to interfaces/wizard/five.html
diff --git a/main/interfaces/wizard/four.html b/interfaces/wizard/four.html
similarity index 100%
rename from main/interfaces/wizard/four.html
rename to interfaces/wizard/four.html
diff --git a/main/interfaces/wizard/inc_bottom.tmpl b/interfaces/wizard/inc_bottom.tmpl
similarity index 100%
rename from main/interfaces/wizard/inc_bottom.tmpl
rename to interfaces/wizard/inc_bottom.tmpl
diff --git a/main/interfaces/wizard/inc_top.tmpl b/interfaces/wizard/inc_top.tmpl
similarity index 100%
rename from main/interfaces/wizard/inc_top.tmpl
rename to interfaces/wizard/inc_top.tmpl
diff --git a/main/interfaces/wizard/index.html b/interfaces/wizard/index.html
similarity index 100%
rename from main/interfaces/wizard/index.html
rename to interfaces/wizard/index.html
diff --git a/main/interfaces/wizard/language/de-de.txt b/interfaces/wizard/language/de-de.txt
similarity index 100%
rename from main/interfaces/wizard/language/de-de.txt
rename to interfaces/wizard/language/de-de.txt
diff --git a/main/interfaces/wizard/language/fr-fr.txt b/interfaces/wizard/language/fr-fr.txt
similarity index 100%
rename from main/interfaces/wizard/language/fr-fr.txt
rename to interfaces/wizard/language/fr-fr.txt
diff --git a/main/interfaces/wizard/language/nl-du.txt b/interfaces/wizard/language/nl-du.txt
similarity index 100%
rename from main/interfaces/wizard/language/nl-du.txt
rename to interfaces/wizard/language/nl-du.txt
diff --git a/main/interfaces/wizard/language/sv-se.txt b/interfaces/wizard/language/sv-se.txt
similarity index 100%
rename from main/interfaces/wizard/language/sv-se.txt
rename to interfaces/wizard/language/sv-se.txt
diff --git a/main/interfaces/wizard/language/us-en.txt b/interfaces/wizard/language/us-en.txt
similarity index 100%
rename from main/interfaces/wizard/language/us-en.txt
rename to interfaces/wizard/language/us-en.txt
diff --git a/main/interfaces/wizard/one.html b/interfaces/wizard/one.html
similarity index 100%
rename from main/interfaces/wizard/one.html
rename to interfaces/wizard/one.html
diff --git a/main/interfaces/wizard/static/images/classic-th.png b/interfaces/wizard/static/images/classic-th.png
similarity index 100%
rename from main/interfaces/wizard/static/images/classic-th.png
rename to interfaces/wizard/static/images/classic-th.png
diff --git a/main/interfaces/wizard/static/images/classic.png b/interfaces/wizard/static/images/classic.png
similarity index 100%
rename from main/interfaces/wizard/static/images/classic.png
rename to interfaces/wizard/static/images/classic.png
diff --git a/main/interfaces/wizard/static/images/favicon.ico b/interfaces/wizard/static/images/favicon.ico
similarity index 100%
rename from main/interfaces/wizard/static/images/favicon.ico
rename to interfaces/wizard/static/images/favicon.ico
diff --git a/main/interfaces/wizard/static/images/flags/de-de.png b/interfaces/wizard/static/images/flags/de-de.png
similarity index 100%
rename from main/interfaces/wizard/static/images/flags/de-de.png
rename to interfaces/wizard/static/images/flags/de-de.png
diff --git a/main/interfaces/wizard/static/images/flags/fr-fr.png b/interfaces/wizard/static/images/flags/fr-fr.png
similarity index 100%
rename from main/interfaces/wizard/static/images/flags/fr-fr.png
rename to interfaces/wizard/static/images/flags/fr-fr.png
diff --git a/main/interfaces/wizard/static/images/flags/nl-du.png b/interfaces/wizard/static/images/flags/nl-du.png
similarity index 100%
rename from main/interfaces/wizard/static/images/flags/nl-du.png
rename to interfaces/wizard/static/images/flags/nl-du.png
diff --git a/main/interfaces/wizard/static/images/flags/sv-se.png b/interfaces/wizard/static/images/flags/sv-se.png
similarity index 100%
rename from main/interfaces/wizard/static/images/flags/sv-se.png
rename to interfaces/wizard/static/images/flags/sv-se.png
diff --git a/main/interfaces/wizard/static/images/flags/us-en.png b/interfaces/wizard/static/images/flags/us-en.png
similarity index 100%
rename from main/interfaces/wizard/static/images/flags/us-en.png
rename to interfaces/wizard/static/images/flags/us-en.png
diff --git a/main/interfaces/wizard/static/images/icon_sab.png b/interfaces/wizard/static/images/icon_sab.png
similarity index 100%
rename from main/interfaces/wizard/static/images/icon_sab.png
rename to interfaces/wizard/static/images/icon_sab.png
diff --git a/main/interfaces/wizard/static/images/plush-th.png b/interfaces/wizard/static/images/plush-th.png
similarity index 100%
rename from main/interfaces/wizard/static/images/plush-th.png
rename to interfaces/wizard/static/images/plush-th.png
diff --git a/main/interfaces/wizard/static/images/plush.png b/interfaces/wizard/static/images/plush.png
similarity index 100%
rename from main/interfaces/wizard/static/images/plush.png
rename to interfaces/wizard/static/images/plush.png
diff --git a/main/interfaces/wizard/static/images/smpl-th.png b/interfaces/wizard/static/images/smpl-th.png
similarity index 100%
rename from main/interfaces/wizard/static/images/smpl-th.png
rename to interfaces/wizard/static/images/smpl-th.png
diff --git a/main/interfaces/wizard/static/images/smpl.png b/interfaces/wizard/static/images/smpl.png
similarity index 100%
rename from main/interfaces/wizard/static/images/smpl.png
rename to interfaces/wizard/static/images/smpl.png
diff --git a/main/interfaces/wizard/static/javascript/checkserver.js b/interfaces/wizard/static/javascript/checkserver.js
similarity index 100%
rename from main/interfaces/wizard/static/javascript/checkserver.js
rename to interfaces/wizard/static/javascript/checkserver.js
diff --git a/main/interfaces/wizard/static/javascript/jquery.js b/interfaces/wizard/static/javascript/jquery.js
similarity index 100%
rename from main/interfaces/wizard/static/javascript/jquery.js
rename to interfaces/wizard/static/javascript/jquery.js
diff --git a/main/interfaces/wizard/static/javascript/pagetwo.js b/interfaces/wizard/static/javascript/pagetwo.js
similarity index 100%
rename from main/interfaces/wizard/static/javascript/pagetwo.js
rename to interfaces/wizard/static/javascript/pagetwo.js
diff --git a/main/interfaces/wizard/static/javascript/restart.js b/interfaces/wizard/static/javascript/restart.js
similarity index 100%
rename from main/interfaces/wizard/static/javascript/restart.js
rename to interfaces/wizard/static/javascript/restart.js
diff --git a/main/interfaces/wizard/static/style.css b/interfaces/wizard/static/style.css
similarity index 100%
rename from main/interfaces/wizard/static/style.css
rename to interfaces/wizard/static/style.css
diff --git a/main/interfaces/wizard/three.html b/interfaces/wizard/three.html
similarity index 100%
rename from main/interfaces/wizard/three.html
rename to interfaces/wizard/three.html
diff --git a/main/interfaces/wizard/two.html b/interfaces/wizard/two.html
similarity index 100%
rename from main/interfaces/wizard/two.html
rename to interfaces/wizard/two.html
diff --git a/main/language/de-de.txt b/language/de-de.txt
similarity index 100%
rename from main/language/de-de.txt
rename to language/de-de.txt
diff --git a/main/language/email-de-de.tmpl b/language/email-de-de.tmpl
similarity index 100%
rename from main/language/email-de-de.tmpl
rename to language/email-de-de.tmpl
diff --git a/main/language/email-fr-fr.tmpl b/language/email-fr-fr.tmpl
similarity index 100%
rename from main/language/email-fr-fr.tmpl
rename to language/email-fr-fr.tmpl
diff --git a/main/language/email-nl-du.tmpl b/language/email-nl-du.tmpl
similarity index 100%
rename from main/language/email-nl-du.tmpl
rename to language/email-nl-du.tmpl
diff --git a/main/language/email-sv-se.tmpl b/language/email-sv-se.tmpl
similarity index 100%
rename from main/language/email-sv-se.tmpl
rename to language/email-sv-se.tmpl
diff --git a/main/language/email-us-en.tmpl b/language/email-us-en.tmpl
similarity index 100%
rename from main/language/email-us-en.tmpl
rename to language/email-us-en.tmpl
diff --git a/main/language/fr-fr.txt b/language/fr-fr.txt
similarity index 100%
rename from main/language/fr-fr.txt
rename to language/fr-fr.txt
diff --git a/main/language/nl-du.txt b/language/nl-du.txt
similarity index 100%
rename from main/language/nl-du.txt
rename to language/nl-du.txt
diff --git a/main/language/rss-de-de.tmpl b/language/rss-de-de.tmpl
similarity index 100%
rename from main/language/rss-de-de.tmpl
rename to language/rss-de-de.tmpl
diff --git a/main/language/rss-fr-fr.tmpl b/language/rss-fr-fr.tmpl
similarity index 100%
rename from main/language/rss-fr-fr.tmpl
rename to language/rss-fr-fr.tmpl
diff --git a/main/language/rss-nl-nl.tmpl b/language/rss-nl-nl.tmpl
similarity index 100%
rename from main/language/rss-nl-nl.tmpl
rename to language/rss-nl-nl.tmpl
diff --git a/main/language/rss-sv-se.tmpl b/language/rss-sv-se.tmpl
similarity index 100%
rename from main/language/rss-sv-se.tmpl
rename to language/rss-sv-se.tmpl
diff --git a/main/language/rss-us-en.tmpl b/language/rss-us-en.tmpl
similarity index 100%
rename from main/language/rss-us-en.tmpl
rename to language/rss-us-en.tmpl
diff --git a/main/language/sv-se.txt b/language/sv-se.txt
similarity index 100%
rename from main/language/sv-se.txt
rename to language/sv-se.txt
diff --git a/main/language/us-en.txt b/language/us-en.txt
similarity index 100%
rename from main/language/us-en.txt
rename to language/us-en.txt
diff --git a/main/licenses/License-CherryPy.txt b/licenses/License-CherryPy.txt
similarity index 100%
rename from main/licenses/License-CherryPy.txt
rename to licenses/License-CherryPy.txt
diff --git a/main/licenses/License-configobj.txt b/licenses/License-configobj.txt
similarity index 100%
rename from main/licenses/License-configobj.txt
rename to licenses/License-configobj.txt
diff --git a/main/licenses/License-feedparser.txt b/licenses/License-feedparser.txt
similarity index 100%
rename from main/licenses/License-feedparser.txt
rename to licenses/License-feedparser.txt
diff --git a/main/licenses/License-json.txt b/licenses/License-json.txt
similarity index 100%
rename from main/licenses/License-json.txt
rename to licenses/License-json.txt
diff --git a/main/licenses/License-kronos.txt b/licenses/License-kronos.txt
similarity index 100%
rename from main/licenses/License-kronos.txt
rename to licenses/License-kronos.txt
diff --git a/main/licenses/License-listquote.txt b/licenses/License-listquote.txt
similarity index 100%
rename from main/licenses/License-listquote.txt
rename to licenses/License-listquote.txt
diff --git a/main/licenses/License-pynewsleecher.txt b/licenses/License-pynewsleecher.txt
similarity index 100%
rename from main/licenses/License-pynewsleecher.txt
rename to licenses/License-pynewsleecher.txt
diff --git a/main/licenses/License-rarfile.txt b/licenses/License-rarfile.txt
similarity index 100%
rename from main/licenses/License-rarfile.txt
rename to licenses/License-rarfile.txt
diff --git a/main/licenses/License-rsslib.txt b/licenses/License-rsslib.txt
similarity index 100%
rename from main/licenses/License-rsslib.txt
rename to licenses/License-rsslib.txt
diff --git a/main/licenses/License-ssmtplib.txt b/licenses/License-ssmtplib.txt
similarity index 100%
rename from main/licenses/License-ssmtplib.txt
rename to licenses/License-ssmtplib.txt
diff --git a/main/licenses/Python/LICENSE-BerkeleyDB.txt b/licenses/Python/LICENSE-BerkeleyDB.txt
similarity index 100%
rename from main/licenses/Python/LICENSE-BerkeleyDB.txt
rename to licenses/Python/LICENSE-BerkeleyDB.txt
diff --git a/main/licenses/Python/LICENSE-OpenSSL.txt b/licenses/Python/LICENSE-OpenSSL.txt
similarity index 100%
rename from main/licenses/Python/LICENSE-OpenSSL.txt
rename to licenses/Python/LICENSE-OpenSSL.txt
diff --git a/main/licenses/Python/LICENSE-Python.txt b/licenses/Python/LICENSE-Python.txt
similarity index 100%
rename from main/licenses/Python/LICENSE-Python.txt
rename to licenses/Python/LICENSE-Python.txt
diff --git a/main/licenses/Python/LICENSE-TclTk.txt b/licenses/Python/LICENSE-TclTk.txt
similarity index 100%
rename from main/licenses/Python/LICENSE-TclTk.txt
rename to licenses/Python/LICENSE-TclTk.txt
diff --git a/main/licenses/Python/LICENSE.txt b/licenses/Python/LICENSE.txt
similarity index 100%
rename from main/licenses/Python/LICENSE.txt
rename to licenses/Python/LICENSE.txt
diff --git a/main/nzb.ico b/nzb.ico
similarity index 100%
rename from main/nzb.ico
rename to nzb.ico
diff --git a/main/osx/par2/LICENSE b/osx/par2/LICENSE
similarity index 100%
rename from main/osx/par2/LICENSE
rename to osx/par2/LICENSE
diff --git a/main/osx/par2/par2-classic b/osx/par2/par2-classic
similarity index 100%
rename from main/osx/par2/par2-classic
rename to osx/par2/par2-classic
diff --git a/main/osx/par2/par2-sl b/osx/par2/par2-sl
similarity index 100%
rename from main/osx/par2/par2-sl
rename to osx/par2/par2-sl
diff --git a/main/osx/resources/Credits.rtf b/osx/resources/Credits.rtf
similarity index 100%
rename from main/osx/resources/Credits.rtf
rename to osx/resources/Credits.rtf
diff --git a/main/osx/resources/InfoPlist.strings b/osx/resources/InfoPlist.strings
similarity index 100%
rename from main/osx/resources/InfoPlist.strings
rename to osx/resources/InfoPlist.strings
diff --git a/main/osx/resources/MainMenu.nib/classes.nib b/osx/resources/MainMenu.nib/classes.nib
similarity index 100%
rename from main/osx/resources/MainMenu.nib/classes.nib
rename to osx/resources/MainMenu.nib/classes.nib
diff --git a/main/osx/resources/MainMenu.nib/info.nib b/osx/resources/MainMenu.nib/info.nib
similarity index 100%
rename from main/osx/resources/MainMenu.nib/info.nib
rename to osx/resources/MainMenu.nib/info.nib
diff --git a/main/osx/resources/MainMenu.nib/objects.nib b/osx/resources/MainMenu.nib/objects.nib
similarity index 100%
rename from main/osx/resources/MainMenu.nib/objects.nib
rename to osx/resources/MainMenu.nib/objects.nib
diff --git a/main/osx/resources/nzbfile.icns b/osx/resources/nzbfile.icns
similarity index 100%
rename from main/osx/resources/nzbfile.icns
rename to osx/resources/nzbfile.icns
diff --git a/main/osx/resources/sab_clicked.png b/osx/resources/sab_clicked.png
similarity index 100%
rename from main/osx/resources/sab_clicked.png
rename to osx/resources/sab_clicked.png
diff --git a/main/osx/resources/sab_idle.png b/osx/resources/sab_idle.png
similarity index 100%
rename from main/osx/resources/sab_idle.png
rename to osx/resources/sab_idle.png
diff --git a/main/osx/resources/sab_pause.png b/osx/resources/sab_pause.png
similarity index 100%
rename from main/osx/resources/sab_pause.png
rename to osx/resources/sab_pause.png
diff --git a/main/osx/resources/sabnzbdplus.icns b/osx/resources/sabnzbdplus.icns
similarity index 100%
rename from main/osx/resources/sabnzbdplus.icns
rename to osx/resources/sabnzbdplus.icns
diff --git a/main/osx/resources/update b/osx/resources/update
similarity index 100%
rename from main/osx/resources/update
rename to osx/resources/update
diff --git a/main/osx/unrar/unrar b/osx/unrar/unrar
similarity index 100%
rename from main/osx/unrar/unrar
rename to osx/unrar/unrar
diff --git a/main/package.py b/package.py
similarity index 100%
rename from main/package.py
rename to package.py
diff --git a/main/sabnzbd-template.sparseimage.zip b/sabnzbd-template.sparseimage.zip
similarity index 100%
rename from main/sabnzbd-template.sparseimage.zip
rename to sabnzbd-template.sparseimage.zip
diff --git a/main/sabnzbd.ico b/sabnzbd.ico
similarity index 100%
rename from main/sabnzbd.ico
rename to sabnzbd.ico
diff --git a/main/sabnzbd/__init__.py b/sabnzbd/__init__.py
similarity index 100%
rename from main/sabnzbd/__init__.py
rename to sabnzbd/__init__.py
diff --git a/main/sabnzbd/articlecache.py b/sabnzbd/articlecache.py
similarity index 100%
rename from main/sabnzbd/articlecache.py
rename to sabnzbd/articlecache.py
diff --git a/main/sabnzbd/assembler.py b/sabnzbd/assembler.py
similarity index 100%
rename from main/sabnzbd/assembler.py
rename to sabnzbd/assembler.py
diff --git a/main/sabnzbd/bpsmeter.py b/sabnzbd/bpsmeter.py
similarity index 100%
rename from main/sabnzbd/bpsmeter.py
rename to sabnzbd/bpsmeter.py
diff --git a/main/sabnzbd/cfg.py b/sabnzbd/cfg.py
similarity index 100%
rename from main/sabnzbd/cfg.py
rename to sabnzbd/cfg.py
diff --git a/main/sabnzbd/codecs.py b/sabnzbd/codecs.py
similarity index 100%
rename from main/sabnzbd/codecs.py
rename to sabnzbd/codecs.py
diff --git a/main/sabnzbd/config.py b/sabnzbd/config.py
similarity index 100%
rename from main/sabnzbd/config.py
rename to sabnzbd/config.py
diff --git a/main/sabnzbd/constants.py b/sabnzbd/constants.py
similarity index 100%
rename from main/sabnzbd/constants.py
rename to sabnzbd/constants.py
diff --git a/main/sabnzbd/database.py b/sabnzbd/database.py
similarity index 100%
rename from main/sabnzbd/database.py
rename to sabnzbd/database.py
diff --git a/main/sabnzbd/decoder.py b/sabnzbd/decoder.py
similarity index 100%
rename from main/sabnzbd/decoder.py
rename to sabnzbd/decoder.py
diff --git a/main/sabnzbd/decorators.py b/sabnzbd/decorators.py
similarity index 100%
rename from main/sabnzbd/decorators.py
rename to sabnzbd/decorators.py
diff --git a/main/sabnzbd/dirscanner.py b/sabnzbd/dirscanner.py
similarity index 100%
rename from main/sabnzbd/dirscanner.py
rename to sabnzbd/dirscanner.py
diff --git a/main/sabnzbd/downloader.py b/sabnzbd/downloader.py
similarity index 100%
rename from main/sabnzbd/downloader.py
rename to sabnzbd/downloader.py
diff --git a/main/sabnzbd/emailer.py b/sabnzbd/emailer.py
similarity index 100%
rename from main/sabnzbd/emailer.py
rename to sabnzbd/emailer.py
diff --git a/main/sabnzbd/interface.py b/sabnzbd/interface.py
similarity index 100%
rename from main/sabnzbd/interface.py
rename to sabnzbd/interface.py
diff --git a/main/sabnzbd/lang.py b/sabnzbd/lang.py
similarity index 100%
rename from main/sabnzbd/lang.py
rename to sabnzbd/lang.py
diff --git a/main/sabnzbd/misc.py b/sabnzbd/misc.py
similarity index 100%
rename from main/sabnzbd/misc.py
rename to sabnzbd/misc.py
diff --git a/main/sabnzbd/newsunpack.py b/sabnzbd/newsunpack.py
similarity index 100%
rename from main/sabnzbd/newsunpack.py
rename to sabnzbd/newsunpack.py
diff --git a/main/sabnzbd/newswrapper.py b/sabnzbd/newswrapper.py
similarity index 100%
rename from main/sabnzbd/newswrapper.py
rename to sabnzbd/newswrapper.py
diff --git a/main/sabnzbd/newzbin.py b/sabnzbd/newzbin.py
similarity index 100%
rename from main/sabnzbd/newzbin.py
rename to sabnzbd/newzbin.py
diff --git a/main/sabnzbd/nzbqueue.py b/sabnzbd/nzbqueue.py
similarity index 100%
rename from main/sabnzbd/nzbqueue.py
rename to sabnzbd/nzbqueue.py
diff --git a/main/sabnzbd/nzbstuff.py b/sabnzbd/nzbstuff.py
similarity index 100%
rename from main/sabnzbd/nzbstuff.py
rename to sabnzbd/nzbstuff.py
diff --git a/main/sabnzbd/postproc.py b/sabnzbd/postproc.py
similarity index 100%
rename from main/sabnzbd/postproc.py
rename to sabnzbd/postproc.py
diff --git a/main/sabnzbd/rss.py b/sabnzbd/rss.py
similarity index 100%
rename from main/sabnzbd/rss.py
rename to sabnzbd/rss.py
diff --git a/main/sabnzbd/scheduler.py b/sabnzbd/scheduler.py
similarity index 100%
rename from main/sabnzbd/scheduler.py
rename to sabnzbd/scheduler.py
diff --git a/main/sabnzbd/trylist.py b/sabnzbd/trylist.py
similarity index 100%
rename from main/sabnzbd/trylist.py
rename to sabnzbd/trylist.py
diff --git a/main/sabnzbd/tvsort.py b/sabnzbd/tvsort.py
similarity index 100%
rename from main/sabnzbd/tvsort.py
rename to sabnzbd/tvsort.py
diff --git a/main/sabnzbd/urlgrabber.py b/sabnzbd/urlgrabber.py
similarity index 100%
rename from main/sabnzbd/urlgrabber.py
rename to sabnzbd/urlgrabber.py
diff --git a/main/sabnzbd/utils/__init__.py b/sabnzbd/utils/__init__.py
similarity index 100%
rename from main/sabnzbd/utils/__init__.py
rename to sabnzbd/utils/__init__.py
diff --git a/main/sabnzbd/utils/certgen.py b/sabnzbd/utils/certgen.py
similarity index 100%
rename from main/sabnzbd/utils/certgen.py
rename to sabnzbd/utils/certgen.py
diff --git a/main/sabnzbd/utils/configobj.py b/sabnzbd/utils/configobj.py
similarity index 100%
rename from main/sabnzbd/utils/configobj.py
rename to sabnzbd/utils/configobj.py
diff --git a/main/sabnzbd/utils/feedparser.py b/sabnzbd/utils/feedparser.py
similarity index 100%
rename from main/sabnzbd/utils/feedparser.py
rename to sabnzbd/utils/feedparser.py
diff --git a/main/sabnzbd/utils/json.py b/sabnzbd/utils/json.py
similarity index 100%
rename from main/sabnzbd/utils/json.py
rename to sabnzbd/utils/json.py
diff --git a/main/sabnzbd/utils/kronos.py b/sabnzbd/utils/kronos.py
similarity index 100%
rename from main/sabnzbd/utils/kronos.py
rename to sabnzbd/utils/kronos.py
diff --git a/main/sabnzbd/utils/listquote.py b/sabnzbd/utils/listquote.py
similarity index 100%
rename from main/sabnzbd/utils/listquote.py
rename to sabnzbd/utils/listquote.py
diff --git a/main/sabnzbd/utils/osx.py b/sabnzbd/utils/osx.py
similarity index 100%
rename from main/sabnzbd/utils/osx.py
rename to sabnzbd/utils/osx.py
diff --git a/main/sabnzbd/utils/rarfile.py b/sabnzbd/utils/rarfile.py
similarity index 100%
rename from main/sabnzbd/utils/rarfile.py
rename to sabnzbd/utils/rarfile.py
diff --git a/main/sabnzbd/utils/rsslib.py b/sabnzbd/utils/rsslib.py
similarity index 100%
rename from main/sabnzbd/utils/rsslib.py
rename to sabnzbd/utils/rsslib.py
diff --git a/main/sabnzbd/utils/servertests.py b/sabnzbd/utils/servertests.py
similarity index 100%
rename from main/sabnzbd/utils/servertests.py
rename to sabnzbd/utils/servertests.py
diff --git a/main/sabnzbd/utils/ssmtplib.py b/sabnzbd/utils/ssmtplib.py
similarity index 100%
rename from main/sabnzbd/utils/ssmtplib.py
rename to sabnzbd/utils/ssmtplib.py
diff --git a/main/sabnzbd/utils/upload.py b/sabnzbd/utils/upload.py
similarity index 100%
rename from main/sabnzbd/utils/upload.py
rename to sabnzbd/utils/upload.py
diff --git a/main/sabnzbd/version.py b/sabnzbd/version.py
similarity index 100%
rename from main/sabnzbd/version.py
rename to sabnzbd/version.py
diff --git a/main/sabnzbd/wizard.py b/sabnzbd/wizard.py
similarity index 100%
rename from main/sabnzbd/wizard.py
rename to sabnzbd/wizard.py
diff --git a/main/setup.py b/setup.py
similarity index 100%
rename from main/setup.py
rename to setup.py
diff --git a/main/win/nsis/Include/registerExtension.nsh b/win/nsis/Include/registerExtension.nsh
similarity index 100%
rename from main/win/nsis/Include/registerExtension.nsh
rename to win/nsis/Include/registerExtension.nsh
diff --git a/main/win/nsis/Plugins/KillProc.dll b/win/nsis/Plugins/KillProc.dll
similarity index 100%
rename from main/win/nsis/Plugins/KillProc.dll
rename to win/nsis/Plugins/KillProc.dll
diff --git a/main/win/nsis/Plugins/KillProc.txt b/win/nsis/Plugins/KillProc.txt
similarity index 100%
rename from main/win/nsis/Plugins/KillProc.txt
rename to win/nsis/Plugins/KillProc.txt
diff --git a/main/win/par2/COPYING b/win/par2/COPYING
similarity index 100%
rename from main/win/par2/COPYING
rename to win/par2/COPYING
diff --git a/main/win/par2/README_FIRST.txt b/win/par2/README_FIRST.txt
similarity index 100%
rename from main/win/par2/README_FIRST.txt
rename to win/par2/README_FIRST.txt
diff --git a/main/win/par2/par2-classic.exe b/win/par2/par2-classic.exe
similarity index 100%
rename from main/win/par2/par2-classic.exe
rename to win/par2/par2-classic.exe
diff --git a/main/win/par2/par2.exe b/win/par2/par2.exe
similarity index 100%
rename from main/win/par2/par2.exe
rename to win/par2/par2.exe
diff --git a/main/win/par2/x64/COPYING b/win/par2/x64/COPYING
similarity index 100%
rename from main/win/par2/x64/COPYING
rename to win/par2/x64/COPYING
diff --git a/main/win/par2/x64/README_FIRST.txt b/win/par2/x64/README_FIRST.txt
similarity index 100%
rename from main/win/par2/x64/README_FIRST.txt
rename to win/par2/x64/README_FIRST.txt
diff --git a/main/win/par2/x64/par2.exe b/win/par2/x64/par2.exe
similarity index 100%
rename from main/win/par2/x64/par2.exe
rename to win/par2/x64/par2.exe
diff --git a/main/win/unrar/UnRAR.exe b/win/unrar/UnRAR.exe
similarity index 100%
rename from main/win/unrar/UnRAR.exe
rename to win/unrar/UnRAR.exe
diff --git a/main/win/unrar/license.txt b/win/unrar/license.txt
similarity index 100%
rename from main/win/unrar/license.txt
rename to win/unrar/license.txt
diff --git a/main/win/unrar/x64/UnRAR.exe b/win/unrar/x64/UnRAR.exe
similarity index 100%
rename from main/win/unrar/x64/UnRAR.exe
rename to win/unrar/x64/UnRAR.exe
diff --git a/main/win/unrar/x64/license.txt b/win/unrar/x64/license.txt
similarity index 100%
rename from main/win/unrar/x64/license.txt
rename to win/unrar/x64/license.txt
diff --git a/main/win/unzip/LICENSE b/win/unzip/LICENSE
similarity index 100%
rename from main/win/unzip/LICENSE
rename to win/unzip/LICENSE
diff --git a/main/win/unzip/README b/win/unzip/README
similarity index 100%
rename from main/win/unzip/README
rename to win/unzip/README
diff --git a/main/win/unzip/README.NT b/win/unzip/README.NT
similarity index 100%
rename from main/win/unzip/README.NT
rename to win/unzip/README.NT
diff --git a/main/win/unzip/WHERE b/win/unzip/WHERE
similarity index 100%
rename from main/win/unzip/WHERE
rename to win/unzip/WHERE
diff --git a/main/win/unzip/unzip.exe b/win/unzip/unzip.exe
similarity index 100%
rename from main/win/unzip/unzip.exe
rename to win/unzip/unzip.exe