diff --git a/data/y-web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt
index 414ccd5df..c5915117f 100644
--- a/data/y-web/Y_Blocks.txt
+++ b/data/y-web/Y_Blocks.txt
@@ -642,7 +642,7 @@ end-block~remote
 
 # ------- Remote d-Box Philips/Sagem
 start-block~rc_dbox_philips
-<img src="images/rc_dbox_philips.png" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_dbox_philips.png" usemap="#rc" alt="remote" />
 <map name="rc" id="rc">
   <area shape="poly" href="javascript:rcsim('KEY_RIGHT')" coords="100,117,100,180,67,146,100,116" />
   <area shape="poly" href="javascript:rcsim('KEY_DOWN')" coords="36,181,101,180,66,146" />
@@ -675,7 +675,7 @@ end-block~rc_dbox_philips
 
 # ------- Remote d-Box Nokia old
 start-block~rc_dbox_nokia_old
-<img src="images/rc_dbox_nokia_old.png" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_dbox_nokia_old.png" usemap="#rc" alt="remote" />
 <map name="rc" id="rc">
   <area shape="rect" href="javascript:rcsim('KEY_SETUP')" coords="7,95,45,109" />
   <area shape="circle" href="javascript:rcsim('KEY_7')" coords="60,102,10" />
@@ -708,7 +708,7 @@ end-block~rc_dbox_nokia_old
 
 # ------ Remote CST V1 (HD1 / BSE)
 start-block~rc_cst_v1
-<img src="images/rc_cst_v1.jpg" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_cst_v1.jpg" usemap="#rc" alt="remote" />
 <map name="rc" id="rc">
   <area shape="rect" href="javascript:rcsim('KEY_POWER')" coords="134, 38, 159, 68" />
   <area shape="rect" href="javascript:rcsim('KEY_MUTE')" coords="29, 37, 56, 66" />
@@ -761,7 +761,7 @@ end-block~rc_cst_v1
 
 # ------- Remote CST V2 (NEO)
 start-block~rc_cst_v2
-<img src="images/rc_cst_v2.png" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_cst_v2.png" usemap="#rc" alt="remote" />
 <map name="rc" id="rc">
   <area shape="rect" href="javascript:rcsim('KEY_POWER')" coords="22, 28, 45, 50" />
   <area shape="rect" href="javascript:rcsim('KEY_MUTE')" coords="133, 29, 153, 50" />
@@ -816,14 +816,14 @@ end-block~rc_cst_v2
 # ------ Remote CST V3 (ZEE, NEO2)
 start-block~rc_cst_v3
 {=var-set:rcu=rc_cst_v3=}
-<img src="images/rc_cst_v3.png" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_cst_v3.png" usemap="#rc" alt="remote" />
 {=include-block:Y_Blocks.txt;map_rc_cst_v3_v4=}
 end-block~rc_cst_v3
 
 # ------ Remote CST V4 (NEO TWIN)
 start-block~rc_cst_v4
 {=var-set:rcu=rc_cst_v4=}
-<img src="images/rc_cst_v4.png" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_cst_v4.png" usemap="#rc" alt="remote" />
 {=include-block:Y_Blocks.txt;map_rc_cst_v3_v4=}
 end-block~rc_cst_v4
 
@@ -906,7 +906,7 @@ end-block~map_rc_cst_v3_v4
 
 # ------- Remote CST V5 (TANK)
 start-block~rc_cst_v5
-<img src="images/rc_cst_v5.png" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_cst_v5.png" usemap="#rc" alt="remote" />
 <map name="rc" id="rc">
   <area shape="circle" href="javascript:rcsim('KEY_POWER')" coords="50,42,14" alt="standby" title="{=L:rc.key_power=}" />
 
@@ -969,7 +969,7 @@ end-block~rc_cst_v5
 
 # ------- Remote CST V6 (TRINITY)
 start-block~rc_cst_v6
-<img src="images/rc_cst_v6.png" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_cst_v6.png" usemap="#rc" alt="remote" />
 <map name="rc" id="rc">
   <area shape="circle" coords="94,50,16" alt="standby" href="javascript:rcsim('KEY_POWER')" title="{=L:rc.key_power=}" />
   <area shape="circle" coords="150,68,13" alt="mute" href="javascript:rcsim('KEY_MUTE')" title="{=L:rc.key_mute=}" />
@@ -1035,7 +1035,7 @@ end-block~rc_cst_v6
 
 # ------ Remote AX HD51
 start-block~rc_ax_hd51
-<img src="images/rc_ax_hd51.png" usemap="#rc"/>
+<img src="images/rc/rc_ax_hd51.png" usemap="#rc"/>
 <map name="rc" id="rc">
 <area shape="rect" coords="20,43,49,72" href="javascript:rcsim('KEY_POWER')" />
 <area shape="rect" coords="121,44,148,72" href="javascript:rcsim('KEY_MUTE')" />
@@ -1091,7 +1091,7 @@ end-block~rc_ax_hd51
 
 # ------ Remote Mutant HD51
 start-block~rc_mutant_hd51
-<img src="images/rc_mutant_hd51.png" usemap="#rc"/>
+<img src="images/rc/rc_mutant_hd51.png" usemap="#rc"/>
 <map name="rc" id="rc">
 <area shape="rect" coords="18,24,53,48" href="javascript:rcsim('KEY_POWER')" />
 <area shape="rect" coords="121,21,148,47" href="javascript:rcsim('KEY_MUTE')" />
@@ -1147,7 +1147,7 @@ end-block~rc_mutant_hd51
 
 # ------ Remote WWIO BRE2ZE 4K
 start-block~rc_wwio_bre2ze4k
-<img src="images/rc_wwio_bre2ze4k.png" usemap="#rc"/>
+<img src="images/rc/rc_wwio_bre2ze4k.png" usemap="#rc"/>
 <map name="rc" id="rc">
 <area shape="rect" coords="17,30,43,57" alt="KEY_POWER" href="javascript:rcsim('KEY_POWER')" />
 <area shape="rect" coords="90,36,113,57" alt="KEY_MODE" href="javascript:rcsim('KEY_MODE')" />
@@ -1209,7 +1209,7 @@ end-block~rc_wwio_bre2ze4k
 
 # ------ Remote VU+ Solo 4K, Duo 4K, Duo 4K SE, Ultimo 4K, Zero 4K, Uno 4K, Uno 4K SE
 start-block~rc_vuplus
-<img src="images/rc_vuplus.png" usemap="#rc"/>
+<img src="images/rc/rc_vuplus.png" usemap="#rc"/>
 <map name="rc" id="rc">
 <!-- <area shape="circle" coords="33,28,10" id="113" alt="v1_mute" href="javascript:rcsim('KEY_POWER_TV')" /> -->
 <area shape="circle" coords="142,28,10" id ="116" alt="Power" href="javascript:rcsim('KEY_POWER')" />
@@ -1262,7 +1262,7 @@ end-block~rc_vuplus
 
 # ------ Remote Air Digital Zgemma H7
 start-block~rc_zgemma_h7
-<img src="images/rc_zgemma_h7.png" usemap="#rc"/>
+<img src="images/rc/rc_zgemma_h7.png" usemap="#rc"/>
 <map name="rc" id="rc">
 <area shape="rect" coords="58,46,25,23" alt="KEY_POWER" href="javascript:rcsim('KEY_POWER')" />
 <area shape="rect" coords="134,22,171,46" alt="KEY_MUTE" href="javascript:rcsim('KEY_MUTE')" />
@@ -1319,7 +1319,7 @@ end-block~rc_zgemma_h7
 
 # ------ Remote Mutant HD60, Maxytec Multibox SE 4K
 start-block~rc_mutant_hd60
-<img src="images/rc_mutant_hd60.png" usemap="#rc"/>
+<img src="images/rc/rc_mutant_hd60.png" usemap="#rc"/>
 <map name="rc" id="rc">
 <area shape="circle" coords="31,76,12" href="javascript:rcsim('KEY_POWER')" />
 <area shape="circle" coords="122,76,12" href="javascript:rcsim('KEY_MUTE')" />
@@ -1374,7 +1374,7 @@ end-block~rc_mutant_hd60
 
 # ------ Remote AX HD61
 start-block~rc_ax_hd61
-<img src="images/rc_ax_hd61.png" usemap="#rc"/>
+<img src="images/rc/rc_ax_hd61.png" usemap="#rc"/>
 <map name="rc" id="rc">
 <area shape="circle" coords="37,90,15" href="javascript:rcsim('KEY_POWER')" />
 <area shape="circle" coords="144,90,15" href="javascript:rcsim('KEY_MUTE')" />
diff --git a/data/y-web/images/Makefile.am b/data/y-web/images/Makefile.am
index c2244df37..9c2d6dbed 100644
--- a/data/y-web/images/Makefile.am
+++ b/data/y-web/images/Makefile.am
@@ -1,102 +1,110 @@
-installdir = $(PRIVATE_HTTPDDIR)/images
+imagesdir = $(PRIVATE_HTTPDDIR)/images
 
-install_DATA =	accept.png \
-		alert.gif \
-		arrowdown.png \
-		arrowleft.png \
-		arrowright.png \
-		arrowup.png \
-		audiobar.png \
-		blank.png \
-		check_green.png \
-		comment.png \
-		cross.png \
-		elist.png \
-		exlink.gif \
-		fb.png \
-		hidden.png \
-		info.png \
-		inlink.gif \
-		key.png \
-		live.png \
-		lock.png \
-		modify.png \
-		new.png \
-		ok.gif \
-		popup.png \
-		properties.png \
-		radio.png \
-		record.png \
-		reload.png \
-		remove.png \
-		rename.gif \
-		save.png \
-		saveall.png \
-		snapshot.png \
-		stream.png \
-		streaminfo.png \
-		time_add.png \
-		time_down.png \
-		time_up.png \
-		tux-yweb.png \
-		unlock.png \
-		visible.png \
-		vlc.png \
-		volumedown.png \
-		volumemute.png \
-		volumeunmute.png \
-		volumeup.png \
-		wait.gif \
-		webtv.png \
-		wget.png \
-		x_red.png \
-		zap.png
-
-# remote controls
-install_DATA += rc_cst_v1.jpg \
-		rc_cst_v2.png \
-		rc_cst_v3.png \
-		rc_cst_v4.png \
-		rc_cst_v5.png \
-		rc_cst_v6.png \
-		rc_dbox_nokia_old.png \
-		rc_dbox_philips.png
-
-if ! BOXTYPE_CST
-install_DATA += rc_ax_hd51.png \
-		rc_ax_hd61.png \
-		rc_mutant_hd51.png \
-		rc_wwio_bre2ze4k.png \
-		rc_zgemma_h7.png \
-		rc_osmio4k.png \
-		rc_vuplus.png \
-		rc_mutant_hd60.png
-endif
+images_DATA = \
+	accept.png \
+	alert.gif \
+	arrowdown.png \
+	arrowleft.png \
+	arrowright.png \
+	arrowup.png \
+	audiobar.png \
+	blank.png \
+	check_green.png \
+	comment.png \
+	cross.png \
+	elist.png \
+	exlink.gif \
+	fb.png \
+	hidden.png \
+	info.png \
+	inlink.gif \
+	key.png \
+	live.png \
+	lock.png \
+	modify.png \
+	new.png \
+	ok.gif \
+	popup.png \
+	properties.png \
+	radio.png \
+	record.png \
+	reload.png \
+	remove.png \
+	rename.gif \
+	save.png \
+	saveall.png \
+	snapshot.png \
+	stream.png \
+	streaminfo.png \
+	time_add.png \
+	time_down.png \
+	time_up.png \
+	tux-yweb.png \
+	unlock.png \
+	visible.png \
+	vlc.png \
+	volumedown.png \
+	volumemute.png \
+	volumeunmute.png \
+	volumeup.png \
+	wait.gif \
+	webtv.png \
+	wget.png \
+	x_red.png \
+	zap.png
 
 # file manager
-install_DATA +=	chmod.png \
-		copy.gif \
-		cut.png \
-		dir_up.png \
-		download.png \
-		film.png \
-		folder_add.png \
-		ftype_file.png \
-		ftype_folder.png \
-		ftype_link.png \
-		home.png \
-		package.png \
-		page_edit.png \
-		paste.gif \
-		picture.png \
-		text.png \
-		upload.png \
-		work.gif
+images_DATA += \
+	chmod.png \
+	copy.gif \
+	cut.png \
+	dir_up.png \
+	download.png \
+	film.png \
+	folder_add.png \
+	ftype_file.png \
+	ftype_folder.png \
+	ftype_link.png \
+	home.png \
+	package.png \
+	page_edit.png \
+	paste.gif \
+	picture.png \
+	text.png \
+	upload.png \
+	work.gif
 
 # NI-yWeb
-install_DATA += cancel.png \
-		colored_bar.png \
-		server_add.png \
-		server_delete.png \
-		server_edit.png \
-		server_link.png
+images_DATA += \
+	cancel.png \
+	colored_bar.png \
+	server_add.png \
+	server_delete.png \
+	server_edit.png \
+	server_link.png
+
+# remote controls
+imagesrcdir = $(PRIVATE_HTTPDDIR)/images/rc
+
+imagesrc_DATA += \
+	rc/rc_cst_v1.jpg \
+	rc/rc_cst_v2.png \
+	rc/rc_cst_v3.png \
+	rc/rc_cst_v4.png \
+	rc/rc_cst_v5.png \
+	rc/rc_cst_v6.png \
+	rc/rc_dbox_nokia_old.png \
+	rc/rc_dbox_philips.png
+
+if ! BOXTYPE_CST
+imagesrc_DATA += \
+	rc/rc_ax_hd51.png \
+	rc/rc_ax_hd61.png \
+	rc/rc_mutant_hd51.png \
+	rc/rc_wwio_bre2ze4k.png \
+	rc/rc_zgemma_h7.png \
+	rc/rc_osmio4k.png \
+	rc/rc_vuplus.png \
+	rc/rc_mutant_hd60.png
+endif
+
diff --git a/data/y-web/images/rc_ax_hd51.png b/data/y-web/images/rc/rc_ax_hd51.png
similarity index 100%
rename from data/y-web/images/rc_ax_hd51.png
rename to data/y-web/images/rc/rc_ax_hd51.png
diff --git a/data/y-web/images/rc_ax_hd61.png b/data/y-web/images/rc/rc_ax_hd61.png
similarity index 100%
rename from data/y-web/images/rc_ax_hd61.png
rename to data/y-web/images/rc/rc_ax_hd61.png
diff --git a/data/y-web/images/rc_cst_v1.jpg b/data/y-web/images/rc/rc_cst_v1.jpg
similarity index 100%
rename from data/y-web/images/rc_cst_v1.jpg
rename to data/y-web/images/rc/rc_cst_v1.jpg
diff --git a/data/y-web/images/rc_cst_v2.png b/data/y-web/images/rc/rc_cst_v2.png
similarity index 100%
rename from data/y-web/images/rc_cst_v2.png
rename to data/y-web/images/rc/rc_cst_v2.png
diff --git a/data/y-web/images/rc_cst_v3.png b/data/y-web/images/rc/rc_cst_v3.png
similarity index 100%
rename from data/y-web/images/rc_cst_v3.png
rename to data/y-web/images/rc/rc_cst_v3.png
diff --git a/data/y-web/images/rc_cst_v4.png b/data/y-web/images/rc/rc_cst_v4.png
similarity index 100%
rename from data/y-web/images/rc_cst_v4.png
rename to data/y-web/images/rc/rc_cst_v4.png
diff --git a/data/y-web/images/rc_cst_v5.png b/data/y-web/images/rc/rc_cst_v5.png
similarity index 100%
rename from data/y-web/images/rc_cst_v5.png
rename to data/y-web/images/rc/rc_cst_v5.png
diff --git a/data/y-web/images/rc_cst_v6.png b/data/y-web/images/rc/rc_cst_v6.png
similarity index 100%
rename from data/y-web/images/rc_cst_v6.png
rename to data/y-web/images/rc/rc_cst_v6.png
diff --git a/data/y-web/images/rc_dbox_nokia_old.png b/data/y-web/images/rc/rc_dbox_nokia_old.png
similarity index 100%
rename from data/y-web/images/rc_dbox_nokia_old.png
rename to data/y-web/images/rc/rc_dbox_nokia_old.png
diff --git a/data/y-web/images/rc_dbox_philips.png b/data/y-web/images/rc/rc_dbox_philips.png
similarity index 100%
rename from data/y-web/images/rc_dbox_philips.png
rename to data/y-web/images/rc/rc_dbox_philips.png
diff --git a/data/y-web/images/rc_mutant_hd51.png b/data/y-web/images/rc/rc_mutant_hd51.png
similarity index 100%
rename from data/y-web/images/rc_mutant_hd51.png
rename to data/y-web/images/rc/rc_mutant_hd51.png
diff --git a/data/y-web/images/rc_mutant_hd60.png b/data/y-web/images/rc/rc_mutant_hd60.png
similarity index 100%
rename from data/y-web/images/rc_mutant_hd60.png
rename to data/y-web/images/rc/rc_mutant_hd60.png
diff --git a/data/y-web/images/rc_osmio4k.png b/data/y-web/images/rc/rc_osmio4k.png
similarity index 100%
rename from data/y-web/images/rc_osmio4k.png
rename to data/y-web/images/rc/rc_osmio4k.png
diff --git a/data/y-web/images/rc_vuplus.png b/data/y-web/images/rc/rc_vuplus.png
similarity index 100%
rename from data/y-web/images/rc_vuplus.png
rename to data/y-web/images/rc/rc_vuplus.png
diff --git a/data/y-web/images/rc_wwio_bre2ze4k.png b/data/y-web/images/rc/rc_wwio_bre2ze4k.png
similarity index 100%
rename from data/y-web/images/rc_wwio_bre2ze4k.png
rename to data/y-web/images/rc/rc_wwio_bre2ze4k.png
diff --git a/data/y-web/images/rc_zgemma_h7.png b/data/y-web/images/rc/rc_zgemma_h7.png
similarity index 100%
rename from data/y-web/images/rc_zgemma_h7.png
rename to data/y-web/images/rc/rc_zgemma_h7.png