diff --git a/configure.ac b/configure.ac
index 900f8f21a..8b7fe6969 100644
--- a/configure.ac
+++ b/configure.ac
@@ -236,19 +236,19 @@ fi
 
 
 if test "$BOXTYPE" = "coolstream"; then
-if test -e ${srcdir}/lib/libcoolstream/nevis_ir.h; then
+if test -e ${srcdir}/lib/hardware/coolstream/hd1/libcoolstream/nevis_ir.h; then
 	AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H,1,[Define to 1 if you have the <nevis_ir.h> header file.])
 fi
-HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream -I$(top_srcdir)/src/zapit/include/private'
+HWLIB_CFLAGS='-I$(top_srcdir)/lib/hardware/coolstream/hd1/libcoolstream -I$(top_srcdir)/src/zapit/include/private'
 
 if test "$BOXMODEL" = "hd2"; then
-if test -e ${srcdir}/lib/libcoolstream2/cs_ir_generic.h; then
+if test -e ${srcdir}/lib/hardware/coolstream/hd2/libcoolstream/cs_ir_generic.h; then
 	AC_DEFINE(HAVE_COOLSTREAM_CS_IR_GENERIC_H,1,[Define to 1 if you have the <cs_ir_generic.h> header file.])
 fi
-if test -e ${srcdir}/lib/libcoolstream2/cs_frontpanel.h; then
+if test -e ${srcdir}/lib/hardware/coolstream/hd2/libcoolstream/cs_frontpanel.h; then
 	AC_DEFINE(HAVE_COOLSTREAM_CS_FRONTPANEL_H,1,[Define to 1 if you have the <cs_frontpanel.h> header file.])
 fi
-HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2 -I$(top_srcdir)/src/zapit/include/private'
+HWLIB_CFLAGS='-I$(top_srcdir)/lib/hardware/coolstream/hd2/libcoolstream -I$(top_srcdir)/src/zapit/include/private'
 fi
 HWLIB_CFLAGS="$HWLIB_CFLAGS "'-I$(top_srcdir)/lib/hardware/coolstream'
 fi
diff --git a/lib/hardware/coolstream/Makefile.am b/lib/hardware/coolstream/Makefile.am
index 359ce20b2..d460837c3 100644
--- a/lib/hardware/coolstream/Makefile.am
+++ b/lib/hardware/coolstream/Makefile.am
@@ -3,9 +3,9 @@ noinst_LIBRARIES = libhwcaps.a
 AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
 
 if BOXMODEL_CS_HD2
-AM_CPPFLAGS = -I$(top_srcdir)/lib/libcoolstream2
+AM_CPPFLAGS = -I$(top_srcdir)/lib/hardware/coolstream/hd2/libcoolstream
 else
-AM_CPPFLAGS = -I$(top_srcdir)/lib/libcoolstream
+AM_CPPFLAGS = -I$(top_srcdir)/lib/hardware/coolstream/hd1/libcoolstream
 endif
 
 libhwcaps_a_SOURCES = \
diff --git a/lib/libcoolstream/audio_cs.h b/lib/hardware/coolstream/hd1/libcoolstream/audio_cs.h
similarity index 100%
rename from lib/libcoolstream/audio_cs.h
rename to lib/hardware/coolstream/hd1/libcoolstream/audio_cs.h
diff --git a/lib/libcoolstream/ca_cs.h b/lib/hardware/coolstream/hd1/libcoolstream/ca_cs.h
similarity index 100%
rename from lib/libcoolstream/ca_cs.h
rename to lib/hardware/coolstream/hd1/libcoolstream/ca_cs.h
diff --git a/lib/libcoolstream/cnxtfb.h b/lib/hardware/coolstream/hd1/libcoolstream/cnxtfb.h
similarity index 100%
rename from lib/libcoolstream/cnxtfb.h
rename to lib/hardware/coolstream/hd1/libcoolstream/cnxtfb.h
diff --git a/lib/libcoolstream/control.h b/lib/hardware/coolstream/hd1/libcoolstream/control.h
similarity index 100%
rename from lib/libcoolstream/control.h
rename to lib/hardware/coolstream/hd1/libcoolstream/control.h
diff --git a/lib/libcoolstream/cs_api.h b/lib/hardware/coolstream/hd1/libcoolstream/cs_api.h
similarity index 100%
rename from lib/libcoolstream/cs_api.h
rename to lib/hardware/coolstream/hd1/libcoolstream/cs_api.h
diff --git a/lib/libcoolstream/cs_frontpanel.h b/lib/hardware/coolstream/hd1/libcoolstream/cs_frontpanel.h
similarity index 100%
rename from lib/libcoolstream/cs_frontpanel.h
rename to lib/hardware/coolstream/hd1/libcoolstream/cs_frontpanel.h
diff --git a/lib/libcoolstream/cs_types.h b/lib/hardware/coolstream/hd1/libcoolstream/cs_types.h
similarity index 100%
rename from lib/libcoolstream/cs_types.h
rename to lib/hardware/coolstream/hd1/libcoolstream/cs_types.h
diff --git a/lib/libcoolstream/cs_vfd.h b/lib/hardware/coolstream/hd1/libcoolstream/cs_vfd.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/libcoolstream/cs_vfd.h
rename to lib/hardware/coolstream/hd1/libcoolstream/cs_vfd.h
diff --git a/lib/libcoolstream/dmx_cs.h b/lib/hardware/coolstream/hd1/libcoolstream/dmx_cs.h
similarity index 100%
rename from lib/libcoolstream/dmx_cs.h
rename to lib/hardware/coolstream/hd1/libcoolstream/dmx_cs.h
diff --git a/lib/libcoolstream/mmi.h b/lib/hardware/coolstream/hd1/libcoolstream/mmi.h
similarity index 100%
rename from lib/libcoolstream/mmi.h
rename to lib/hardware/coolstream/hd1/libcoolstream/mmi.h
diff --git a/lib/libcoolstream/nevis_ir.h b/lib/hardware/coolstream/hd1/libcoolstream/nevis_ir.h
similarity index 100%
rename from lib/libcoolstream/nevis_ir.h
rename to lib/hardware/coolstream/hd1/libcoolstream/nevis_ir.h
diff --git a/lib/libcoolstream/playback.h b/lib/hardware/coolstream/hd1/libcoolstream/playback.h
similarity index 100%
rename from lib/libcoolstream/playback.h
rename to lib/hardware/coolstream/hd1/libcoolstream/playback.h
diff --git a/lib/libcoolstream/playback_cs.h b/lib/hardware/coolstream/hd1/libcoolstream/playback_cs.h
similarity index 100%
rename from lib/libcoolstream/playback_cs.h
rename to lib/hardware/coolstream/hd1/libcoolstream/playback_cs.h
diff --git a/lib/libcoolstream/pwrmngr.h b/lib/hardware/coolstream/hd1/libcoolstream/pwrmngr.h
similarity index 100%
rename from lib/libcoolstream/pwrmngr.h
rename to lib/hardware/coolstream/hd1/libcoolstream/pwrmngr.h
diff --git a/lib/libcoolstream/record_cs.h b/lib/hardware/coolstream/hd1/libcoolstream/record_cs.h
similarity index 100%
rename from lib/libcoolstream/record_cs.h
rename to lib/hardware/coolstream/hd1/libcoolstream/record_cs.h
diff --git a/lib/libcoolstream/tsrouter.h b/lib/hardware/coolstream/hd1/libcoolstream/tsrouter.h
similarity index 100%
rename from lib/libcoolstream/tsrouter.h
rename to lib/hardware/coolstream/hd1/libcoolstream/tsrouter.h
diff --git a/lib/libcoolstream/video_cs.h b/lib/hardware/coolstream/hd1/libcoolstream/video_cs.h
similarity index 100%
rename from lib/libcoolstream/video_cs.h
rename to lib/hardware/coolstream/hd1/libcoolstream/video_cs.h
diff --git a/lib/libcoolstream2/audio_cs.h b/lib/hardware/coolstream/hd2/libcoolstream/audio_cs.h
similarity index 100%
rename from lib/libcoolstream2/audio_cs.h
rename to lib/hardware/coolstream/hd2/libcoolstream/audio_cs.h
diff --git a/lib/libcoolstream2/ca_cs.h b/lib/hardware/coolstream/hd2/libcoolstream/ca_cs.h
similarity index 100%
rename from lib/libcoolstream2/ca_cs.h
rename to lib/hardware/coolstream/hd2/libcoolstream/ca_cs.h
diff --git a/lib/libcoolstream2/cnxtfb.h b/lib/hardware/coolstream/hd2/libcoolstream/cnxtfb.h
similarity index 100%
rename from lib/libcoolstream2/cnxtfb.h
rename to lib/hardware/coolstream/hd2/libcoolstream/cnxtfb.h
diff --git a/lib/libcoolstream2/control.h b/lib/hardware/coolstream/hd2/libcoolstream/control.h
similarity index 100%
rename from lib/libcoolstream2/control.h
rename to lib/hardware/coolstream/hd2/libcoolstream/control.h
diff --git a/lib/libcoolstream2/cs_api.h b/lib/hardware/coolstream/hd2/libcoolstream/cs_api.h
similarity index 100%
rename from lib/libcoolstream2/cs_api.h
rename to lib/hardware/coolstream/hd2/libcoolstream/cs_api.h
diff --git a/lib/libcoolstream2/cs_frontpanel.h b/lib/hardware/coolstream/hd2/libcoolstream/cs_frontpanel.h
similarity index 100%
rename from lib/libcoolstream2/cs_frontpanel.h
rename to lib/hardware/coolstream/hd2/libcoolstream/cs_frontpanel.h
diff --git a/lib/libcoolstream2/cs_ir_generic.h b/lib/hardware/coolstream/hd2/libcoolstream/cs_ir_generic.h
similarity index 100%
rename from lib/libcoolstream2/cs_ir_generic.h
rename to lib/hardware/coolstream/hd2/libcoolstream/cs_ir_generic.h
diff --git a/lib/libcoolstream2/cs_types.h b/lib/hardware/coolstream/hd2/libcoolstream/cs_types.h
similarity index 100%
rename from lib/libcoolstream2/cs_types.h
rename to lib/hardware/coolstream/hd2/libcoolstream/cs_types.h
diff --git a/lib/libcoolstream2/cs_vfd.h b/lib/hardware/coolstream/hd2/libcoolstream/cs_vfd.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/libcoolstream2/cs_vfd.h
rename to lib/hardware/coolstream/hd2/libcoolstream/cs_vfd.h
diff --git a/lib/libcoolstream2/dmx_cs.h b/lib/hardware/coolstream/hd2/libcoolstream/dmx_cs.h
similarity index 100%
rename from lib/libcoolstream2/dmx_cs.h
rename to lib/hardware/coolstream/hd2/libcoolstream/dmx_cs.h
diff --git a/lib/libcoolstream2/mmi.h b/lib/hardware/coolstream/hd2/libcoolstream/mmi.h
similarity index 100%
rename from lib/libcoolstream2/mmi.h
rename to lib/hardware/coolstream/hd2/libcoolstream/mmi.h
diff --git a/lib/libcoolstream2/nevis_ir.h b/lib/hardware/coolstream/hd2/libcoolstream/nevis_ir.h
similarity index 100%
rename from lib/libcoolstream2/nevis_ir.h
rename to lib/hardware/coolstream/hd2/libcoolstream/nevis_ir.h
diff --git a/lib/libcoolstream2/playback.h b/lib/hardware/coolstream/hd2/libcoolstream/playback.h
similarity index 100%
rename from lib/libcoolstream2/playback.h
rename to lib/hardware/coolstream/hd2/libcoolstream/playback.h
diff --git a/lib/libcoolstream2/playback_cs.h b/lib/hardware/coolstream/hd2/libcoolstream/playback_cs.h
similarity index 100%
rename from lib/libcoolstream2/playback_cs.h
rename to lib/hardware/coolstream/hd2/libcoolstream/playback_cs.h
diff --git a/lib/libcoolstream2/pwrmngr.h b/lib/hardware/coolstream/hd2/libcoolstream/pwrmngr.h
similarity index 100%
rename from lib/libcoolstream2/pwrmngr.h
rename to lib/hardware/coolstream/hd2/libcoolstream/pwrmngr.h
diff --git a/lib/libcoolstream2/record_cs.h b/lib/hardware/coolstream/hd2/libcoolstream/record_cs.h
similarity index 100%
rename from lib/libcoolstream2/record_cs.h
rename to lib/hardware/coolstream/hd2/libcoolstream/record_cs.h
diff --git a/lib/libcoolstream2/tsrouter.h b/lib/hardware/coolstream/hd2/libcoolstream/tsrouter.h
similarity index 100%
rename from lib/libcoolstream2/tsrouter.h
rename to lib/hardware/coolstream/hd2/libcoolstream/tsrouter.h
diff --git a/lib/libcoolstream2/video_cs.h b/lib/hardware/coolstream/hd2/libcoolstream/video_cs.h
similarity index 100%
rename from lib/libcoolstream2/video_cs.h
rename to lib/hardware/coolstream/hd2/libcoolstream/video_cs.h
diff --git a/lib/libcoolstream/.svnignore b/lib/libcoolstream/.svnignore
deleted file mode 100644
index 3694ff0e6..000000000
--- a/lib/libcoolstream/.svnignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile.in
-.libs
-.deps
-*.la
-*.lo