diff --git a/configure.ac b/configure.ac
index ed540a2a4..bb155c1f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -270,11 +270,6 @@ lib/libiw/Makefile
 lib/luaclient/Makefile
 src/lcddisplay/Makefile
 src/nhttpd/Makefile
-src/nhttpd/web/Makefile
-src/nhttpd/web/images/Makefile
-src/nhttpd/web/scripts/Makefile
-src/nhttpd/web/languages/Makefile
-src/nhttpd/web/styles/Makefile
 src/nhttpd/tuxboxapi/Makefile
 src/nhttpd/yhttpd_core/Makefile
 src/nhttpd/yhttpd_mods/Makefile
@@ -324,6 +319,11 @@ data/pictures/backgrounds/Makefile
 data/pictures/screensaver/Makefile
 data/scripts/Makefile
 data/themes/Makefile
+data/y-web/Makefile
+data/y-web/images/Makefile
+data/y-web/scripts/Makefile
+data/y-web/languages/Makefile
+data/y-web/styles/Makefile
 src/eitd/Makefile
 src/timerd/Makefile
 src/zapit/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index b318e5a1f..1ff743d21 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -9,7 +9,8 @@ SUBDIRS = \
 	neutrino-scripts \
 	pictures \
 	scripts \
-	themes
+	themes \
+	y-web
 
 if BOXTYPE_TRIPLE
 SUBDIRS += lcd
diff --git a/src/nhttpd/web/Makefile.am b/data/y-web/Makefile.am
similarity index 100%
rename from src/nhttpd/web/Makefile.am
rename to data/y-web/Makefile.am
diff --git a/src/nhttpd/web/Y_About.yhtm b/data/y-web/Y_About.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_About.yhtm
rename to data/y-web/Y_About.yhtm
diff --git a/src/nhttpd/web/Y_Baselib.js b/data/y-web/Y_Baselib.js
similarity index 100%
rename from src/nhttpd/web/Y_Baselib.js
rename to data/y-web/Y_Baselib.js
diff --git a/src/nhttpd/web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt
similarity index 100%
rename from src/nhttpd/web/Y_Blocks.txt
rename to data/y-web/Y_Blocks.txt
diff --git a/src/nhttpd/web/Y_Boxcontrol_Bouquet_Editor_Edit.yhtm b/data/y-web/Y_Boxcontrol_Bouquet_Editor_Edit.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Boxcontrol_Bouquet_Editor_Edit.yhtm
rename to data/y-web/Y_Boxcontrol_Bouquet_Editor_Edit.yhtm
diff --git a/src/nhttpd/web/Y_Boxcontrol_Bouquet_Editor_Main.yhtm b/data/y-web/Y_Boxcontrol_Bouquet_Editor_Main.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Boxcontrol_Bouquet_Editor_Main.yhtm
rename to data/y-web/Y_Boxcontrol_Bouquet_Editor_Main.yhtm
diff --git a/src/nhttpd/web/Y_Boxcontrol_Bouquetlist.yhtm b/data/y-web/Y_Boxcontrol_Bouquetlist.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Boxcontrol_Bouquetlist.yhtm
rename to data/y-web/Y_Boxcontrol_Bouquetlist.yhtm
diff --git a/src/nhttpd/web/Y_Boxcontrol_Bouquets.yhtm b/data/y-web/Y_Boxcontrol_Bouquets.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Boxcontrol_Bouquets.yhtm
rename to data/y-web/Y_Boxcontrol_Bouquets.yhtm
diff --git a/src/nhttpd/web/Y_Boxcontrol_Channellist.yhtm b/data/y-web/Y_Boxcontrol_Channellist.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Boxcontrol_Channellist.yhtm
rename to data/y-web/Y_Boxcontrol_Channellist.yhtm
diff --git a/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm b/data/y-web/Y_Boxcontrol_Menue.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Boxcontrol_Menue.yhtm
rename to data/y-web/Y_Boxcontrol_Menue.yhtm
diff --git a/src/nhttpd/web/Y_Boxcontrol_Messages.yhtm b/data/y-web/Y_Boxcontrol_Messages.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Boxcontrol_Messages.yhtm
rename to data/y-web/Y_Boxcontrol_Messages.yhtm
diff --git a/src/nhttpd/web/Y_Dist.css b/data/y-web/Y_Dist.css
similarity index 100%
rename from src/nhttpd/web/Y_Dist.css
rename to data/y-web/Y_Dist.css
diff --git a/src/nhttpd/web/Y_Dyn_Pages.yhtm b/data/y-web/Y_Dyn_Pages.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Dyn_Pages.yhtm
rename to data/y-web/Y_Dyn_Pages.yhtm
diff --git a/src/nhttpd/web/Y_EPG.js b/data/y-web/Y_EPG.js
similarity index 100%
rename from src/nhttpd/web/Y_EPG.js
rename to data/y-web/Y_EPG.js
diff --git a/src/nhttpd/web/Y_EPG_Plus.yhtm b/data/y-web/Y_EPG_Plus.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_EPG_Plus.yhtm
rename to data/y-web/Y_EPG_Plus.yhtm
diff --git a/src/nhttpd/web/Y_Ext_Menue.yhtm b/data/y-web/Y_Ext_Menue.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Ext_Menue.yhtm
rename to data/y-web/Y_Ext_Menue.yhtm
diff --git a/src/nhttpd/web/Y_Ext_Settings.yhtm b/data/y-web/Y_Ext_Settings.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Ext_Settings.yhtm
rename to data/y-web/Y_Ext_Settings.yhtm
diff --git a/src/nhttpd/web/Y_Ext_Uninstall.yhtm b/data/y-web/Y_Ext_Uninstall.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Ext_Uninstall.yhtm
rename to data/y-web/Y_Ext_Uninstall.yhtm
diff --git a/src/nhttpd/web/Y_Ext_Update.js b/data/y-web/Y_Ext_Update.js
similarity index 100%
rename from src/nhttpd/web/Y_Ext_Update.js
rename to data/y-web/Y_Ext_Update.js
diff --git a/src/nhttpd/web/Y_Ext_Update.yhtm b/data/y-web/Y_Ext_Update.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Ext_Update.yhtm
rename to data/y-web/Y_Ext_Update.yhtm
diff --git a/src/nhttpd/web/Y_Ext_Update_refresh.yhtm b/data/y-web/Y_Ext_Update_refresh.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Ext_Update_refresh.yhtm
rename to data/y-web/Y_Ext_Update_refresh.yhtm
diff --git a/src/nhttpd/web/Y_Filemgr.yhtm b/data/y-web/Y_Filemgr.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Filemgr.yhtm
rename to data/y-web/Y_Filemgr.yhtm
diff --git a/src/nhttpd/web/Y_Filemgr_Edit.yhtm b/data/y-web/Y_Filemgr_Edit.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Filemgr_Edit.yhtm
rename to data/y-web/Y_Filemgr_Edit.yhtm
diff --git a/src/nhttpd/web/Y_Filemgr_blocks.txt b/data/y-web/Y_Filemgr_blocks.txt
similarity index 100%
rename from src/nhttpd/web/Y_Filemgr_blocks.txt
rename to data/y-web/Y_Filemgr_blocks.txt
diff --git a/src/nhttpd/web/Y_Flash.js b/data/y-web/Y_Flash.js
similarity index 100%
rename from src/nhttpd/web/Y_Flash.js
rename to data/y-web/Y_Flash.js
diff --git a/src/nhttpd/web/Y_Info_Help.yhtm b/data/y-web/Y_Info_Help.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Info_Help.yhtm
rename to data/y-web/Y_Info_Help.yhtm
diff --git a/src/nhttpd/web/Y_Info_Menue.yhtm b/data/y-web/Y_Info_Menue.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Info_Menue.yhtm
rename to data/y-web/Y_Info_Menue.yhtm
diff --git a/src/nhttpd/web/Y_Info_Updates.yhtm b/data/y-web/Y_Info_Updates.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Info_Updates.yhtm
rename to data/y-web/Y_Info_Updates.yhtm
diff --git a/src/nhttpd/web/Y_Live.js b/data/y-web/Y_Live.js
similarity index 100%
rename from src/nhttpd/web/Y_Live.js
rename to data/y-web/Y_Live.js
diff --git a/src/nhttpd/web/Y_Live.yhtm b/data/y-web/Y_Live.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Live.yhtm
rename to data/y-web/Y_Live.yhtm
diff --git a/src/nhttpd/web/Y_LiveViewFull.yhtm b/data/y-web/Y_LiveViewFull.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_LiveViewFull.yhtm
rename to data/y-web/Y_LiveViewFull.yhtm
diff --git a/src/nhttpd/web/Y_Live_DoubleView.yhtm b/data/y-web/Y_Live_DoubleView.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Live_DoubleView.yhtm
rename to data/y-web/Y_Live_DoubleView.yhtm
diff --git a/src/nhttpd/web/Y_Live_EPG.yhtm b/data/y-web/Y_Live_EPG.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Live_EPG.yhtm
rename to data/y-web/Y_Live_EPG.yhtm
diff --git a/src/nhttpd/web/Y_Live_EPG_Info.yhtm b/data/y-web/Y_Live_EPG_Info.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Live_EPG_Info.yhtm
rename to data/y-web/Y_Live_EPG_Info.yhtm
diff --git a/src/nhttpd/web/Y_Live_Menue.yhtm b/data/y-web/Y_Live_Menue.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Live_Menue.yhtm
rename to data/y-web/Y_Live_Menue.yhtm
diff --git a/src/nhttpd/web/Y_Live_Msg.yhtm b/data/y-web/Y_Live_Msg.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Live_Msg.yhtm
rename to data/y-web/Y_Live_Msg.yhtm
diff --git a/src/nhttpd/web/Y_Live_Record.yhtm b/data/y-web/Y_Live_Record.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Live_Record.yhtm
rename to data/y-web/Y_Live_Record.yhtm
diff --git a/src/nhttpd/web/Y_Live_Transcode.yhtm b/data/y-web/Y_Live_Transcode.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Live_Transcode.yhtm
rename to data/y-web/Y_Live_Transcode.yhtm
diff --git a/src/nhttpd/web/Y_Main.css b/data/y-web/Y_Main.css
similarity index 100%
rename from src/nhttpd/web/Y_Main.css
rename to data/y-web/Y_Main.css
diff --git a/src/nhttpd/web/Y_Menue.yhtm b/data/y-web/Y_Menue.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Menue.yhtm
rename to data/y-web/Y_Menue.yhtm
diff --git a/src/nhttpd/web/Y_Refresh.yhtm b/data/y-web/Y_Refresh.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Refresh.yhtm
rename to data/y-web/Y_Refresh.yhtm
diff --git a/src/nhttpd/web/Y_Settings_Backup.yhtm b/data/y-web/Y_Settings_Backup.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Settings_Backup.yhtm
rename to data/y-web/Y_Settings_Backup.yhtm
diff --git a/src/nhttpd/web/Y_Settings_Live.yhtm b/data/y-web/Y_Settings_Live.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Settings_Live.yhtm
rename to data/y-web/Y_Settings_Live.yhtm
diff --git a/src/nhttpd/web/Y_Settings_Menue.yhtm b/data/y-web/Y_Settings_Menue.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Settings_Menue.yhtm
rename to data/y-web/Y_Settings_Menue.yhtm
diff --git a/src/nhttpd/web/Y_Settings_Timer.yhtm b/data/y-web/Y_Settings_Timer.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Settings_Timer.yhtm
rename to data/y-web/Y_Settings_Timer.yhtm
diff --git a/src/nhttpd/web/Y_Settings_VNC.yhtm b/data/y-web/Y_Settings_VNC.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Settings_VNC.yhtm
rename to data/y-web/Y_Settings_VNC.yhtm
diff --git a/src/nhttpd/web/Y_Settings_automount.yhtm b/data/y-web/Y_Settings_automount.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Settings_automount.yhtm
rename to data/y-web/Y_Settings_automount.yhtm
diff --git a/src/nhttpd/web/Y_Settings_automount_liste.yhtm b/data/y-web/Y_Settings_automount_liste.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Settings_automount_liste.yhtm
rename to data/y-web/Y_Settings_automount_liste.yhtm
diff --git a/src/nhttpd/web/Y_Settings_buttons.yhtm b/data/y-web/Y_Settings_buttons.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Settings_buttons.yhtm
rename to data/y-web/Y_Settings_buttons.yhtm
diff --git a/src/nhttpd/web/Y_Settings_lcd.yhtm b/data/y-web/Y_Settings_lcd.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Settings_lcd.yhtm
rename to data/y-web/Y_Settings_lcd.yhtm
diff --git a/src/nhttpd/web/Y_Settings_mount.yhtm b/data/y-web/Y_Settings_mount.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Settings_mount.yhtm
rename to data/y-web/Y_Settings_mount.yhtm
diff --git a/src/nhttpd/web/Y_Settings_mount_liste.yhtm b/data/y-web/Y_Settings_mount_liste.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Settings_mount_liste.yhtm
rename to data/y-web/Y_Settings_mount_liste.yhtm
diff --git a/src/nhttpd/web/Y_Settings_neutrino_forms.yhtm b/data/y-web/Y_Settings_neutrino_forms.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Settings_neutrino_forms.yhtm
rename to data/y-web/Y_Settings_neutrino_forms.yhtm
diff --git a/src/nhttpd/web/Y_Settings_nhttpd.yhtm b/data/y-web/Y_Settings_nhttpd.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Settings_nhttpd.yhtm
rename to data/y-web/Y_Settings_nhttpd.yhtm
diff --git a/src/nhttpd/web/Y_Settings_personalize.yhtm b/data/y-web/Y_Settings_personalize.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Settings_personalize.yhtm
rename to data/y-web/Y_Settings_personalize.yhtm
diff --git a/src/nhttpd/web/Y_Settings_umount_liste.yhtm b/data/y-web/Y_Settings_umount_liste.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Settings_umount_liste.yhtm
rename to data/y-web/Y_Settings_umount_liste.yhtm
diff --git a/src/nhttpd/web/Y_Settings_video_audio.yhtm b/data/y-web/Y_Settings_video_audio.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Settings_video_audio.yhtm
rename to data/y-web/Y_Settings_video_audio.yhtm
diff --git a/src/nhttpd/web/Y_Settings_wol.yhtm b/data/y-web/Y_Settings_wol.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Settings_wol.yhtm
rename to data/y-web/Y_Settings_wol.yhtm
diff --git a/src/nhttpd/web/Y_Settings_yWeb.yhtm b/data/y-web/Y_Settings_yWeb.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Settings_yWeb.yhtm
rename to data/y-web/Y_Settings_yWeb.yhtm
diff --git a/src/nhttpd/web/Y_Settings_zapit.yhtm b/data/y-web/Y_Settings_zapit.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Settings_zapit.yhtm
rename to data/y-web/Y_Settings_zapit.yhtm
diff --git a/src/nhttpd/web/Y_StreamInfo.yhtm b/data/y-web/Y_StreamInfo.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_StreamInfo.yhtm
rename to data/y-web/Y_StreamInfo.yhtm
diff --git a/src/nhttpd/web/Y_Timer_Edit.yhtm b/data/y-web/Y_Timer_Edit.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Timer_Edit.yhtm
rename to data/y-web/Y_Timer_Edit.yhtm
diff --git a/src/nhttpd/web/Y_Timer_List.yhtm b/data/y-web/Y_Timer_List.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Timer_List.yhtm
rename to data/y-web/Y_Timer_List.yhtm
diff --git a/src/nhttpd/web/Y_Tools_Bootlogo.yhtm b/data/y-web/Y_Tools_Bootlogo.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Tools_Bootlogo.yhtm
rename to data/y-web/Y_Tools_Bootlogo.yhtm
diff --git a/src/nhttpd/web/Y_Tools_Boxcontrol.yhtm b/data/y-web/Y_Tools_Boxcontrol.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Tools_Boxcontrol.yhtm
rename to data/y-web/Y_Tools_Boxcontrol.yhtm
diff --git a/src/nhttpd/web/Y_Tools_Check_Install.yhtm b/data/y-web/Y_Tools_Check_Install.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Tools_Check_Install.yhtm
rename to data/y-web/Y_Tools_Check_Install.yhtm
diff --git a/src/nhttpd/web/Y_Tools_Cmd.yhtm b/data/y-web/Y_Tools_Cmd.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Tools_Cmd.yhtm
rename to data/y-web/Y_Tools_Cmd.yhtm
diff --git a/src/nhttpd/web/Y_Tools_Flash_Menue.yhtm b/data/y-web/Y_Tools_Flash_Menue.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Tools_Flash_Menue.yhtm
rename to data/y-web/Y_Tools_Flash_Menue.yhtm
diff --git a/src/nhttpd/web/Y_Tools_Flash_Upload.yhtm b/data/y-web/Y_Tools_Flash_Upload.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Tools_Flash_Upload.yhtm
rename to data/y-web/Y_Tools_Flash_Upload.yhtm
diff --git a/src/nhttpd/web/Y_Tools_Info_Menue.yhtm b/data/y-web/Y_Tools_Info_Menue.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Tools_Info_Menue.yhtm
rename to data/y-web/Y_Tools_Info_Menue.yhtm
diff --git a/src/nhttpd/web/Y_Tools_Installer.yhtm b/data/y-web/Y_Tools_Installer.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Tools_Installer.yhtm
rename to data/y-web/Y_Tools_Installer.yhtm
diff --git a/src/nhttpd/web/Y_Tools_Menue.yhtm b/data/y-web/Y_Tools_Menue.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Tools_Menue.yhtm
rename to data/y-web/Y_Tools_Menue.yhtm
diff --git a/src/nhttpd/web/Y_Tools_Rcsim.yhtm b/data/y-web/Y_Tools_Rcsim.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Tools_Rcsim.yhtm
rename to data/y-web/Y_Tools_Rcsim.yhtm
diff --git a/src/nhttpd/web/Y_Tools_Screenshot.yhtm b/data/y-web/Y_Tools_Screenshot.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Tools_Screenshot.yhtm
rename to data/y-web/Y_Tools_Screenshot.yhtm
diff --git a/src/nhttpd/web/Y_Tools_Timer_Sync.js b/data/y-web/Y_Tools_Timer_Sync.js
similarity index 100%
rename from src/nhttpd/web/Y_Tools_Timer_Sync.js
rename to data/y-web/Y_Tools_Timer_Sync.js
diff --git a/src/nhttpd/web/Y_Tools_Timer_Sync.yhtm b/data/y-web/Y_Tools_Timer_Sync.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Tools_Timer_Sync.yhtm
rename to data/y-web/Y_Tools_Timer_Sync.yhtm
diff --git a/src/nhttpd/web/Y_Tools_lcshot.yhtm b/data/y-web/Y_Tools_lcshot.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Tools_lcshot.yhtm
rename to data/y-web/Y_Tools_lcshot.yhtm
diff --git a/src/nhttpd/web/Y_Tools_tvshot.yhtm b/data/y-web/Y_Tools_tvshot.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Tools_tvshot.yhtm
rename to data/y-web/Y_Tools_tvshot.yhtm
diff --git a/src/nhttpd/web/Y_User.css b/data/y-web/Y_User.css
similarity index 100%
rename from src/nhttpd/web/Y_User.css
rename to data/y-web/Y_User.css
diff --git a/src/nhttpd/web/Y_VLC.js b/data/y-web/Y_VLC.js
similarity index 100%
rename from src/nhttpd/web/Y_VLC.js
rename to data/y-web/Y_VLC.js
diff --git a/src/nhttpd/web/Y_Version.txt b/data/y-web/Y_Version.txt
similarity index 100%
rename from src/nhttpd/web/Y_Version.txt
rename to data/y-web/Y_Version.txt
diff --git a/src/nhttpd/web/Y_Wait.yhtm b/data/y-web/Y_Wait.yhtm
similarity index 100%
rename from src/nhttpd/web/Y_Wait.yhtm
rename to data/y-web/Y_Wait.yhtm
diff --git a/src/nhttpd/web/Y_blank.htm b/data/y-web/Y_blank.htm
similarity index 100%
rename from src/nhttpd/web/Y_blank.htm
rename to data/y-web/Y_blank.htm
diff --git a/src/nhttpd/web/Y_neutrino_Blocks.txt b/data/y-web/Y_neutrino_Blocks.txt
similarity index 100%
rename from src/nhttpd/web/Y_neutrino_Blocks.txt
rename to data/y-web/Y_neutrino_Blocks.txt
diff --git a/src/nhttpd/web/Y_yweb.js b/data/y-web/Y_yweb.js
similarity index 100%
rename from src/nhttpd/web/Y_yweb.js
rename to data/y-web/Y_yweb.js
diff --git a/src/nhttpd/web/accordion.js b/data/y-web/accordion.js
similarity index 100%
rename from src/nhttpd/web/accordion.js
rename to data/y-web/accordion.js
diff --git a/src/nhttpd/web/channels.js b/data/y-web/channels.js
similarity index 100%
rename from src/nhttpd/web/channels.js
rename to data/y-web/channels.js
diff --git a/src/nhttpd/web/channels.txt b/data/y-web/channels.txt
similarity index 100%
rename from src/nhttpd/web/channels.txt
rename to data/y-web/channels.txt
diff --git a/src/nhttpd/web/effects.js b/data/y-web/effects.js
similarity index 100%
rename from src/nhttpd/web/effects.js
rename to data/y-web/effects.js
diff --git a/src/nhttpd/web/extentions.txt b/data/y-web/extentions.txt
similarity index 100%
rename from src/nhttpd/web/extentions.txt
rename to data/y-web/extentions.txt
diff --git a/src/nhttpd/web/extentions/boxinfo/boxinfo_uninstall.inc b/data/y-web/extentions/boxinfo/boxinfo_uninstall.inc
similarity index 100%
rename from src/nhttpd/web/extentions/boxinfo/boxinfo_uninstall.inc
rename to data/y-web/extentions/boxinfo/boxinfo_uninstall.inc
diff --git a/src/nhttpd/web/extentions/boxinfo/files/httpd/Y_Ext_BoxInfo.yhtm b/data/y-web/extentions/boxinfo/files/httpd/Y_Ext_BoxInfo.yhtm
similarity index 100%
rename from src/nhttpd/web/extentions/boxinfo/files/httpd/Y_Ext_BoxInfo.yhtm
rename to data/y-web/extentions/boxinfo/files/httpd/Y_Ext_BoxInfo.yhtm
diff --git a/src/nhttpd/web/extentions/boxinfo/files/httpd/scripts/Y_Ext_BoxInfo.sh b/data/y-web/extentions/boxinfo/files/httpd/scripts/Y_Ext_BoxInfo.sh
similarity index 100%
rename from src/nhttpd/web/extentions/boxinfo/files/httpd/scripts/Y_Ext_BoxInfo.sh
rename to data/y-web/extentions/boxinfo/files/httpd/scripts/Y_Ext_BoxInfo.sh
diff --git a/src/nhttpd/web/extentions/boxinfo/install.inc b/data/y-web/extentions/boxinfo/install.inc
similarity index 100%
rename from src/nhttpd/web/extentions/boxinfo/install.inc
rename to data/y-web/extentions/boxinfo/install.inc
diff --git a/src/nhttpd/web/extentions/boxinfo/install.sh b/data/y-web/extentions/boxinfo/install.sh
similarity index 100%
rename from src/nhttpd/web/extentions/boxinfo/install.sh
rename to data/y-web/extentions/boxinfo/install.sh
diff --git a/src/nhttpd/web/extentions/boxinfo/uninstall.sh b/data/y-web/extentions/boxinfo/uninstall.sh
similarity index 100%
rename from src/nhttpd/web/extentions/boxinfo/uninstall.sh
rename to data/y-web/extentions/boxinfo/uninstall.sh
diff --git a/src/nhttpd/web/extentions/hddtools/files/httpd/Y_Ext_hddtools.yhtm b/data/y-web/extentions/hddtools/files/httpd/Y_Ext_hddtools.yhtm
similarity index 100%
rename from src/nhttpd/web/extentions/hddtools/files/httpd/Y_Ext_hddtools.yhtm
rename to data/y-web/extentions/hddtools/files/httpd/Y_Ext_hddtools.yhtm
diff --git a/src/nhttpd/web/extentions/hddtools/files/httpd/scripts/Y_Ext_hddtools.sh b/data/y-web/extentions/hddtools/files/httpd/scripts/Y_Ext_hddtools.sh
similarity index 100%
rename from src/nhttpd/web/extentions/hddtools/files/httpd/scripts/Y_Ext_hddtools.sh
rename to data/y-web/extentions/hddtools/files/httpd/scripts/Y_Ext_hddtools.sh
diff --git a/src/nhttpd/web/extentions/hddtools/hddtools_uninstall.inc b/data/y-web/extentions/hddtools/hddtools_uninstall.inc
similarity index 100%
rename from src/nhttpd/web/extentions/hddtools/hddtools_uninstall.inc
rename to data/y-web/extentions/hddtools/hddtools_uninstall.inc
diff --git a/src/nhttpd/web/extentions/hddtools/install.inc b/data/y-web/extentions/hddtools/install.inc
similarity index 100%
rename from src/nhttpd/web/extentions/hddtools/install.inc
rename to data/y-web/extentions/hddtools/install.inc
diff --git a/src/nhttpd/web/extentions/hddtools/install.sh b/data/y-web/extentions/hddtools/install.sh
similarity index 100%
rename from src/nhttpd/web/extentions/hddtools/install.sh
rename to data/y-web/extentions/hddtools/install.sh
diff --git a/src/nhttpd/web/extentions/hddtools/uninstall.sh b/data/y-web/extentions/hddtools/uninstall.sh
similarity index 100%
rename from src/nhttpd/web/extentions/hddtools/uninstall.sh
rename to data/y-web/extentions/hddtools/uninstall.sh
diff --git a/src/nhttpd/web/favicon.ico b/data/y-web/favicon.ico
similarity index 100%
rename from src/nhttpd/web/favicon.ico
rename to data/y-web/favicon.ico
diff --git a/src/nhttpd/web/images/Makefile.am b/data/y-web/images/Makefile.am
similarity index 100%
rename from src/nhttpd/web/images/Makefile.am
rename to data/y-web/images/Makefile.am
diff --git a/src/nhttpd/web/images/accept.png b/data/y-web/images/accept.png
similarity index 100%
rename from src/nhttpd/web/images/accept.png
rename to data/y-web/images/accept.png
diff --git a/src/nhttpd/web/images/alert.gif b/data/y-web/images/alert.gif
similarity index 100%
rename from src/nhttpd/web/images/alert.gif
rename to data/y-web/images/alert.gif
diff --git a/src/nhttpd/web/images/arrowdown.png b/data/y-web/images/arrowdown.png
similarity index 100%
rename from src/nhttpd/web/images/arrowdown.png
rename to data/y-web/images/arrowdown.png
diff --git a/src/nhttpd/web/images/arrowleft.png b/data/y-web/images/arrowleft.png
similarity index 100%
rename from src/nhttpd/web/images/arrowleft.png
rename to data/y-web/images/arrowleft.png
diff --git a/src/nhttpd/web/images/arrowright.png b/data/y-web/images/arrowright.png
similarity index 100%
rename from src/nhttpd/web/images/arrowright.png
rename to data/y-web/images/arrowright.png
diff --git a/src/nhttpd/web/images/arrowup.png b/data/y-web/images/arrowup.png
similarity index 100%
rename from src/nhttpd/web/images/arrowup.png
rename to data/y-web/images/arrowup.png
diff --git a/src/nhttpd/web/images/audiobar.png b/data/y-web/images/audiobar.png
similarity index 100%
rename from src/nhttpd/web/images/audiobar.png
rename to data/y-web/images/audiobar.png
diff --git a/src/nhttpd/web/images/blank.gif b/data/y-web/images/blank.gif
similarity index 100%
rename from src/nhttpd/web/images/blank.gif
rename to data/y-web/images/blank.gif
diff --git a/src/nhttpd/web/images/check_green.png b/data/y-web/images/check_green.png
similarity index 100%
rename from src/nhttpd/web/images/check_green.png
rename to data/y-web/images/check_green.png
diff --git a/src/nhttpd/web/images/chmod.png b/data/y-web/images/chmod.png
similarity index 100%
rename from src/nhttpd/web/images/chmod.png
rename to data/y-web/images/chmod.png
diff --git a/src/nhttpd/web/images/comment.png b/data/y-web/images/comment.png
similarity index 100%
rename from src/nhttpd/web/images/comment.png
rename to data/y-web/images/comment.png
diff --git a/src/nhttpd/web/images/copy.gif b/data/y-web/images/copy.gif
similarity index 100%
rename from src/nhttpd/web/images/copy.gif
rename to data/y-web/images/copy.gif
diff --git a/src/nhttpd/web/images/cross.png b/data/y-web/images/cross.png
similarity index 100%
rename from src/nhttpd/web/images/cross.png
rename to data/y-web/images/cross.png
diff --git a/src/nhttpd/web/images/cut.png b/data/y-web/images/cut.png
similarity index 100%
rename from src/nhttpd/web/images/cut.png
rename to data/y-web/images/cut.png
diff --git a/src/nhttpd/web/images/dir_up.png b/data/y-web/images/dir_up.png
similarity index 100%
rename from src/nhttpd/web/images/dir_up.png
rename to data/y-web/images/dir_up.png
diff --git a/src/nhttpd/web/images/download.png b/data/y-web/images/download.png
similarity index 100%
rename from src/nhttpd/web/images/download.png
rename to data/y-web/images/download.png
diff --git a/src/nhttpd/web/images/elist.png b/data/y-web/images/elist.png
similarity index 100%
rename from src/nhttpd/web/images/elist.png
rename to data/y-web/images/elist.png
diff --git a/src/nhttpd/web/images/epg.png b/data/y-web/images/epg.png
similarity index 100%
rename from src/nhttpd/web/images/epg.png
rename to data/y-web/images/epg.png
diff --git a/src/nhttpd/web/images/exlink.gif b/data/y-web/images/exlink.gif
similarity index 100%
rename from src/nhttpd/web/images/exlink.gif
rename to data/y-web/images/exlink.gif
diff --git a/src/nhttpd/web/images/ext_add.png b/data/y-web/images/ext_add.png
similarity index 100%
rename from src/nhttpd/web/images/ext_add.png
rename to data/y-web/images/ext_add.png
diff --git a/src/nhttpd/web/images/ext_delete.png b/data/y-web/images/ext_delete.png
similarity index 100%
rename from src/nhttpd/web/images/ext_delete.png
rename to data/y-web/images/ext_delete.png
diff --git a/src/nhttpd/web/images/ext_edit.png b/data/y-web/images/ext_edit.png
similarity index 100%
rename from src/nhttpd/web/images/ext_edit.png
rename to data/y-web/images/ext_edit.png
diff --git a/src/nhttpd/web/images/ext_error.png b/data/y-web/images/ext_error.png
similarity index 100%
rename from src/nhttpd/web/images/ext_error.png
rename to data/y-web/images/ext_error.png
diff --git a/src/nhttpd/web/images/ext_ex.png b/data/y-web/images/ext_ex.png
similarity index 100%
rename from src/nhttpd/web/images/ext_ex.png
rename to data/y-web/images/ext_ex.png
diff --git a/src/nhttpd/web/images/ext_menu.png b/data/y-web/images/ext_menu.png
similarity index 100%
rename from src/nhttpd/web/images/ext_menu.png
rename to data/y-web/images/ext_menu.png
diff --git a/src/nhttpd/web/images/ext_mgr.png b/data/y-web/images/ext_mgr.png
similarity index 100%
rename from src/nhttpd/web/images/ext_mgr.png
rename to data/y-web/images/ext_mgr.png
diff --git a/src/nhttpd/web/images/ext_normal.png b/data/y-web/images/ext_normal.png
similarity index 100%
rename from src/nhttpd/web/images/ext_normal.png
rename to data/y-web/images/ext_normal.png
diff --git a/src/nhttpd/web/images/ext_plugin.png b/data/y-web/images/ext_plugin.png
similarity index 100%
rename from src/nhttpd/web/images/ext_plugin.png
rename to data/y-web/images/ext_plugin.png
diff --git a/src/nhttpd/web/images/ext_script.png b/data/y-web/images/ext_script.png
similarity index 100%
rename from src/nhttpd/web/images/ext_script.png
rename to data/y-web/images/ext_script.png
diff --git a/src/nhttpd/web/images/fb.png b/data/y-web/images/fb.png
similarity index 100%
rename from src/nhttpd/web/images/fb.png
rename to data/y-web/images/fb.png
diff --git a/src/nhttpd/web/images/film.png b/data/y-web/images/film.png
similarity index 100%
rename from src/nhttpd/web/images/film.png
rename to data/y-web/images/film.png
diff --git a/src/nhttpd/web/images/flash.png b/data/y-web/images/flash.png
similarity index 100%
rename from src/nhttpd/web/images/flash.png
rename to data/y-web/images/flash.png
diff --git a/src/nhttpd/web/images/folder_add.png b/data/y-web/images/folder_add.png
similarity index 100%
rename from src/nhttpd/web/images/folder_add.png
rename to data/y-web/images/folder_add.png
diff --git a/src/nhttpd/web/images/ftype_file.gif b/data/y-web/images/ftype_file.gif
similarity index 100%
rename from src/nhttpd/web/images/ftype_file.gif
rename to data/y-web/images/ftype_file.gif
diff --git a/src/nhttpd/web/images/ftype_file.png b/data/y-web/images/ftype_file.png
similarity index 100%
rename from src/nhttpd/web/images/ftype_file.png
rename to data/y-web/images/ftype_file.png
diff --git a/src/nhttpd/web/images/ftype_folder.gif b/data/y-web/images/ftype_folder.gif
similarity index 100%
rename from src/nhttpd/web/images/ftype_folder.gif
rename to data/y-web/images/ftype_folder.gif
diff --git a/src/nhttpd/web/images/ftype_folder.png b/data/y-web/images/ftype_folder.png
similarity index 100%
rename from src/nhttpd/web/images/ftype_folder.png
rename to data/y-web/images/ftype_folder.png
diff --git a/src/nhttpd/web/images/ftype_link.gif b/data/y-web/images/ftype_link.gif
similarity index 100%
rename from src/nhttpd/web/images/ftype_link.gif
rename to data/y-web/images/ftype_link.gif
diff --git a/src/nhttpd/web/images/ftype_link.png b/data/y-web/images/ftype_link.png
similarity index 100%
rename from src/nhttpd/web/images/ftype_link.png
rename to data/y-web/images/ftype_link.png
diff --git a/src/nhttpd/web/images/fullscreen.png b/data/y-web/images/fullscreen.png
similarity index 100%
rename from src/nhttpd/web/images/fullscreen.png
rename to data/y-web/images/fullscreen.png
diff --git a/src/nhttpd/web/images/help.gif b/data/y-web/images/help.gif
similarity index 100%
rename from src/nhttpd/web/images/help.gif
rename to data/y-web/images/help.gif
diff --git a/src/nhttpd/web/images/hidden.png b/data/y-web/images/hidden.png
similarity index 100%
rename from src/nhttpd/web/images/hidden.png
rename to data/y-web/images/hidden.png
diff --git a/src/nhttpd/web/images/home.png b/data/y-web/images/home.png
similarity index 100%
rename from src/nhttpd/web/images/home.png
rename to data/y-web/images/home.png
diff --git a/src/nhttpd/web/images/info.png b/data/y-web/images/info.png
similarity index 100%
rename from src/nhttpd/web/images/info.png
rename to data/y-web/images/info.png
diff --git a/src/nhttpd/web/images/inlink.gif b/data/y-web/images/inlink.gif
similarity index 100%
rename from src/nhttpd/web/images/inlink.gif
rename to data/y-web/images/inlink.gif
diff --git a/src/nhttpd/web/images/key.png b/data/y-web/images/key.png
similarity index 100%
rename from src/nhttpd/web/images/key.png
rename to data/y-web/images/key.png
diff --git a/src/nhttpd/web/images/live.png b/data/y-web/images/live.png
similarity index 100%
rename from src/nhttpd/web/images/live.png
rename to data/y-web/images/live.png
diff --git a/src/nhttpd/web/images/live_popup.png b/data/y-web/images/live_popup.png
similarity index 100%
rename from src/nhttpd/web/images/live_popup.png
rename to data/y-web/images/live_popup.png
diff --git a/src/nhttpd/web/images/livelock.png b/data/y-web/images/livelock.png
similarity index 100%
rename from src/nhttpd/web/images/livelock.png
rename to data/y-web/images/livelock.png
diff --git a/src/nhttpd/web/images/liveunlock.png b/data/y-web/images/liveunlock.png
similarity index 100%
rename from src/nhttpd/web/images/liveunlock.png
rename to data/y-web/images/liveunlock.png
diff --git a/src/nhttpd/web/images/lock.png b/data/y-web/images/lock.png
similarity index 100%
rename from src/nhttpd/web/images/lock.png
rename to data/y-web/images/lock.png
diff --git a/src/nhttpd/web/images/modify.png b/data/y-web/images/modify.png
similarity index 100%
rename from src/nhttpd/web/images/modify.png
rename to data/y-web/images/modify.png
diff --git a/src/nhttpd/web/images/new.png b/data/y-web/images/new.png
similarity index 100%
rename from src/nhttpd/web/images/new.png
rename to data/y-web/images/new.png
diff --git a/src/nhttpd/web/images/ok.gif b/data/y-web/images/ok.gif
similarity index 100%
rename from src/nhttpd/web/images/ok.gif
rename to data/y-web/images/ok.gif
diff --git a/src/nhttpd/web/images/package.png b/data/y-web/images/package.png
similarity index 100%
rename from src/nhttpd/web/images/package.png
rename to data/y-web/images/package.png
diff --git a/src/nhttpd/web/images/page_edit.png b/data/y-web/images/page_edit.png
similarity index 100%
rename from src/nhttpd/web/images/page_edit.png
rename to data/y-web/images/page_edit.png
diff --git a/src/nhttpd/web/images/paste.gif b/data/y-web/images/paste.gif
similarity index 100%
rename from src/nhttpd/web/images/paste.gif
rename to data/y-web/images/paste.gif
diff --git a/src/nhttpd/web/images/pause.png b/data/y-web/images/pause.png
similarity index 100%
rename from src/nhttpd/web/images/pause.png
rename to data/y-web/images/pause.png
diff --git a/src/nhttpd/web/images/picture.png b/data/y-web/images/picture.png
similarity index 100%
rename from src/nhttpd/web/images/picture.png
rename to data/y-web/images/picture.png
diff --git a/src/nhttpd/web/images/play.png b/data/y-web/images/play.png
similarity index 100%
rename from src/nhttpd/web/images/play.png
rename to data/y-web/images/play.png
diff --git a/src/nhttpd/web/images/popup.png b/data/y-web/images/popup.png
similarity index 100%
rename from src/nhttpd/web/images/popup.png
rename to data/y-web/images/popup.png
diff --git a/src/nhttpd/web/images/properties.png b/data/y-web/images/properties.png
similarity index 100%
rename from src/nhttpd/web/images/properties.png
rename to data/y-web/images/properties.png
diff --git a/src/nhttpd/web/images/radio.png b/data/y-web/images/radio.png
similarity index 100%
rename from src/nhttpd/web/images/radio.png
rename to data/y-web/images/radio.png
diff --git a/src/nhttpd/web/images/rc_cst_v1.jpg b/data/y-web/images/rc_cst_v1.jpg
similarity index 100%
rename from src/nhttpd/web/images/rc_cst_v1.jpg
rename to data/y-web/images/rc_cst_v1.jpg
diff --git a/src/nhttpd/web/images/rc_cst_v2.png b/data/y-web/images/rc_cst_v2.png
similarity index 100%
rename from src/nhttpd/web/images/rc_cst_v2.png
rename to data/y-web/images/rc_cst_v2.png
diff --git a/src/nhttpd/web/images/rc_cst_v3.png b/data/y-web/images/rc_cst_v3.png
similarity index 100%
rename from src/nhttpd/web/images/rc_cst_v3.png
rename to data/y-web/images/rc_cst_v3.png
diff --git a/src/nhttpd/web/images/rc_cst_v4.png b/data/y-web/images/rc_cst_v4.png
similarity index 100%
rename from src/nhttpd/web/images/rc_cst_v4.png
rename to data/y-web/images/rc_cst_v4.png
diff --git a/src/nhttpd/web/images/rc_cst_v5.png b/data/y-web/images/rc_cst_v5.png
similarity index 100%
rename from src/nhttpd/web/images/rc_cst_v5.png
rename to data/y-web/images/rc_cst_v5.png
diff --git a/src/nhttpd/web/images/rc_cst_v6.png b/data/y-web/images/rc_cst_v6.png
similarity index 100%
rename from src/nhttpd/web/images/rc_cst_v6.png
rename to data/y-web/images/rc_cst_v6.png
diff --git a/src/nhttpd/web/images/rc_dbox_nokia_old.png b/data/y-web/images/rc_dbox_nokia_old.png
similarity index 100%
rename from src/nhttpd/web/images/rc_dbox_nokia_old.png
rename to data/y-web/images/rc_dbox_nokia_old.png
diff --git a/src/nhttpd/web/images/rc_dbox_philips.png b/data/y-web/images/rc_dbox_philips.png
similarity index 100%
rename from src/nhttpd/web/images/rc_dbox_philips.png
rename to data/y-web/images/rc_dbox_philips.png
diff --git a/src/nhttpd/web/images/record.gif b/data/y-web/images/record.gif
similarity index 100%
rename from src/nhttpd/web/images/record.gif
rename to data/y-web/images/record.gif
diff --git a/src/nhttpd/web/images/record.png b/data/y-web/images/record.png
similarity index 100%
rename from src/nhttpd/web/images/record.png
rename to data/y-web/images/record.png
diff --git a/src/nhttpd/web/images/reload.png b/data/y-web/images/reload.png
similarity index 100%
rename from src/nhttpd/web/images/reload.png
rename to data/y-web/images/reload.png
diff --git a/src/nhttpd/web/images/remove.png b/data/y-web/images/remove.png
similarity index 100%
rename from src/nhttpd/web/images/remove.png
rename to data/y-web/images/remove.png
diff --git a/src/nhttpd/web/images/rename.gif b/data/y-web/images/rename.gif
similarity index 100%
rename from src/nhttpd/web/images/rename.gif
rename to data/y-web/images/rename.gif
diff --git a/src/nhttpd/web/images/save.png b/data/y-web/images/save.png
similarity index 100%
rename from src/nhttpd/web/images/save.png
rename to data/y-web/images/save.png
diff --git a/src/nhttpd/web/images/saveall.png b/data/y-web/images/saveall.png
similarity index 100%
rename from src/nhttpd/web/images/saveall.png
rename to data/y-web/images/saveall.png
diff --git a/src/nhttpd/web/images/smallwait.gif b/data/y-web/images/smallwait.gif
similarity index 100%
rename from src/nhttpd/web/images/smallwait.gif
rename to data/y-web/images/smallwait.gif
diff --git a/src/nhttpd/web/images/snapshot.png b/data/y-web/images/snapshot.png
similarity index 100%
rename from src/nhttpd/web/images/snapshot.png
rename to data/y-web/images/snapshot.png
diff --git a/src/nhttpd/web/images/stop.png b/data/y-web/images/stop.png
similarity index 100%
rename from src/nhttpd/web/images/stop.png
rename to data/y-web/images/stop.png
diff --git a/src/nhttpd/web/images/stream.png b/data/y-web/images/stream.png
similarity index 100%
rename from src/nhttpd/web/images/stream.png
rename to data/y-web/images/stream.png
diff --git a/src/nhttpd/web/images/streaminfo.png b/data/y-web/images/streaminfo.png
similarity index 100%
rename from src/nhttpd/web/images/streaminfo.png
rename to data/y-web/images/streaminfo.png
diff --git a/src/nhttpd/web/images/text.png b/data/y-web/images/text.png
similarity index 100%
rename from src/nhttpd/web/images/text.png
rename to data/y-web/images/text.png
diff --git a/src/nhttpd/web/images/time_add.png b/data/y-web/images/time_add.png
similarity index 100%
rename from src/nhttpd/web/images/time_add.png
rename to data/y-web/images/time_add.png
diff --git a/src/nhttpd/web/images/time_down.png b/data/y-web/images/time_down.png
similarity index 100%
rename from src/nhttpd/web/images/time_down.png
rename to data/y-web/images/time_down.png
diff --git a/src/nhttpd/web/images/time_up.png b/data/y-web/images/time_up.png
similarity index 100%
rename from src/nhttpd/web/images/time_up.png
rename to data/y-web/images/time_up.png
diff --git a/src/nhttpd/web/images/timer.gif b/data/y-web/images/timer.gif
similarity index 100%
rename from src/nhttpd/web/images/timer.gif
rename to data/y-web/images/timer.gif
diff --git a/src/nhttpd/web/images/transcode.png b/data/y-web/images/transcode.png
similarity index 100%
rename from src/nhttpd/web/images/transcode.png
rename to data/y-web/images/transcode.png
diff --git a/src/nhttpd/web/images/tux-yweb.png b/data/y-web/images/tux-yweb.png
similarity index 100%
rename from src/nhttpd/web/images/tux-yweb.png
rename to data/y-web/images/tux-yweb.png
diff --git a/src/nhttpd/web/images/udp_switch_off.png b/data/y-web/images/udp_switch_off.png
similarity index 100%
rename from src/nhttpd/web/images/udp_switch_off.png
rename to data/y-web/images/udp_switch_off.png
diff --git a/src/nhttpd/web/images/udp_switch_on.png b/data/y-web/images/udp_switch_on.png
similarity index 100%
rename from src/nhttpd/web/images/udp_switch_on.png
rename to data/y-web/images/udp_switch_on.png
diff --git a/src/nhttpd/web/images/unlock.png b/data/y-web/images/unlock.png
similarity index 100%
rename from src/nhttpd/web/images/unlock.png
rename to data/y-web/images/unlock.png
diff --git a/src/nhttpd/web/images/upload.png b/data/y-web/images/upload.png
similarity index 100%
rename from src/nhttpd/web/images/upload.png
rename to data/y-web/images/upload.png
diff --git a/src/nhttpd/web/images/visible.png b/data/y-web/images/visible.png
similarity index 100%
rename from src/nhttpd/web/images/visible.png
rename to data/y-web/images/visible.png
diff --git a/src/nhttpd/web/images/vlc.png b/data/y-web/images/vlc.png
similarity index 100%
rename from src/nhttpd/web/images/vlc.png
rename to data/y-web/images/vlc.png
diff --git a/src/nhttpd/web/images/volumedown.png b/data/y-web/images/volumedown.png
similarity index 100%
rename from src/nhttpd/web/images/volumedown.png
rename to data/y-web/images/volumedown.png
diff --git a/src/nhttpd/web/images/volumemute.png b/data/y-web/images/volumemute.png
similarity index 100%
rename from src/nhttpd/web/images/volumemute.png
rename to data/y-web/images/volumemute.png
diff --git a/src/nhttpd/web/images/volumeunmute.png b/data/y-web/images/volumeunmute.png
similarity index 100%
rename from src/nhttpd/web/images/volumeunmute.png
rename to data/y-web/images/volumeunmute.png
diff --git a/src/nhttpd/web/images/volumeup.png b/data/y-web/images/volumeup.png
similarity index 100%
rename from src/nhttpd/web/images/volumeup.png
rename to data/y-web/images/volumeup.png
diff --git a/src/nhttpd/web/images/wait.gif b/data/y-web/images/wait.gif
similarity index 100%
rename from src/nhttpd/web/images/wait.gif
rename to data/y-web/images/wait.gif
diff --git a/src/nhttpd/web/images/webtv.png b/data/y-web/images/webtv.png
similarity index 100%
rename from src/nhttpd/web/images/webtv.png
rename to data/y-web/images/webtv.png
diff --git a/src/nhttpd/web/images/wget.png b/data/y-web/images/wget.png
similarity index 100%
rename from src/nhttpd/web/images/wget.png
rename to data/y-web/images/wget.png
diff --git a/src/nhttpd/web/images/work.gif b/data/y-web/images/work.gif
similarity index 100%
rename from src/nhttpd/web/images/work.gif
rename to data/y-web/images/work.gif
diff --git a/src/nhttpd/web/images/x_red.png b/data/y-web/images/x_red.png
similarity index 100%
rename from src/nhttpd/web/images/x_red.png
rename to data/y-web/images/x_red.png
diff --git a/src/nhttpd/web/images/zap.png b/data/y-web/images/zap.png
similarity index 100%
rename from src/nhttpd/web/images/zap.png
rename to data/y-web/images/zap.png
diff --git a/src/nhttpd/web/index.html b/data/y-web/index.html
similarity index 100%
rename from src/nhttpd/web/index.html
rename to data/y-web/index.html
diff --git a/src/nhttpd/web/languages/Czech b/data/y-web/languages/Czech
similarity index 100%
rename from src/nhttpd/web/languages/Czech
rename to data/y-web/languages/Czech
diff --git a/src/nhttpd/web/languages/Deutsch b/data/y-web/languages/Deutsch
similarity index 100%
rename from src/nhttpd/web/languages/Deutsch
rename to data/y-web/languages/Deutsch
diff --git a/src/nhttpd/web/languages/English b/data/y-web/languages/English
similarity index 100%
rename from src/nhttpd/web/languages/English
rename to data/y-web/languages/English
diff --git a/src/nhttpd/web/languages/Makefile.am b/data/y-web/languages/Makefile.am
similarity index 100%
rename from src/nhttpd/web/languages/Makefile.am
rename to data/y-web/languages/Makefile.am
diff --git a/src/nhttpd/web/languages/Polski b/data/y-web/languages/Polski
similarity index 100%
rename from src/nhttpd/web/languages/Polski
rename to data/y-web/languages/Polski
diff --git a/src/nhttpd/web/languages/Portuguese b/data/y-web/languages/Portuguese
similarity index 100%
rename from src/nhttpd/web/languages/Portuguese
rename to data/y-web/languages/Portuguese
diff --git a/src/nhttpd/web/languages/Slovak b/data/y-web/languages/Slovak
similarity index 100%
rename from src/nhttpd/web/languages/Slovak
rename to data/y-web/languages/Slovak
diff --git a/src/nhttpd/web/prototype.js b/data/y-web/prototype.js
similarity index 100%
rename from src/nhttpd/web/prototype.js
rename to data/y-web/prototype.js
diff --git a/src/nhttpd/web/robots.txt b/data/y-web/robots.txt
similarity index 100%
rename from src/nhttpd/web/robots.txt
rename to data/y-web/robots.txt
diff --git a/src/nhttpd/web/scripts/Makefile.am b/data/y-web/scripts/Makefile.am
similarity index 100%
rename from src/nhttpd/web/scripts/Makefile.am
rename to data/y-web/scripts/Makefile.am
diff --git a/src/nhttpd/web/scripts/Y_Live.sh b/data/y-web/scripts/Y_Live.sh
similarity index 100%
rename from src/nhttpd/web/scripts/Y_Live.sh
rename to data/y-web/scripts/Y_Live.sh
diff --git a/src/nhttpd/web/scripts/Y_NAS.sh b/data/y-web/scripts/Y_NAS.sh
similarity index 100%
rename from src/nhttpd/web/scripts/Y_NAS.sh
rename to data/y-web/scripts/Y_NAS.sh
diff --git a/src/nhttpd/web/scripts/Y_Tools.sh b/data/y-web/scripts/Y_Tools.sh
similarity index 100%
rename from src/nhttpd/web/scripts/Y_Tools.sh
rename to data/y-web/scripts/Y_Tools.sh
diff --git a/src/nhttpd/web/scripts/_Y_Globals.sh b/data/y-web/scripts/_Y_Globals.sh
similarity index 100%
rename from src/nhttpd/web/scripts/_Y_Globals.sh
rename to data/y-web/scripts/_Y_Globals.sh
diff --git a/src/nhttpd/web/scripts/_Y_Library.sh b/data/y-web/scripts/_Y_Library.sh
similarity index 100%
rename from src/nhttpd/web/scripts/_Y_Library.sh
rename to data/y-web/scripts/_Y_Library.sh
diff --git a/src/nhttpd/web/scripts/api.sh b/data/y-web/scripts/api.sh
similarity index 100%
rename from src/nhttpd/web/scripts/api.sh
rename to data/y-web/scripts/api.sh
diff --git a/src/nhttpd/web/styles/Makefile.am b/data/y-web/styles/Makefile.am
similarity index 100%
rename from src/nhttpd/web/styles/Makefile.am
rename to data/y-web/styles/Makefile.am
diff --git a/src/nhttpd/web/styles/Y_Dist-GreyBlue.css b/data/y-web/styles/Y_Dist-GreyBlue.css
similarity index 100%
rename from src/nhttpd/web/styles/Y_Dist-GreyBlue.css
rename to data/y-web/styles/Y_Dist-GreyBlue.css
diff --git a/src/nhttpd/web/styles/Y_Dist-Tuxbox.css b/data/y-web/styles/Y_Dist-Tuxbox.css
similarity index 100%
rename from src/nhttpd/web/styles/Y_Dist-Tuxbox.css
rename to data/y-web/styles/Y_Dist-Tuxbox.css
diff --git a/src/nhttpd/web/ywidget.css b/data/y-web/ywidget.css
similarity index 100%
rename from src/nhttpd/web/ywidget.css
rename to data/y-web/ywidget.css
diff --git a/src/nhttpd/web/ywidget.js b/data/y-web/ywidget.js
similarity index 100%
rename from src/nhttpd/web/ywidget.js
rename to data/y-web/ywidget.js
diff --git a/src/nhttpd/Makefile.am b/src/nhttpd/Makefile.am
index 1ea01bff6..3eb0c22a3 100644
--- a/src/nhttpd/Makefile.am
+++ b/src/nhttpd/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = yhttpd_core yhttpd_mods tuxboxapi web
+SUBDIRS = yhttpd_core yhttpd_mods tuxboxapi
 
 AM_CPPFLAGS = -fno-rtti -fno-exceptions -D_FILE_OFFSET_BITS=64