diff --git a/Makefile b/Makefile
index 6f5f3efe..60b52552 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,7 @@ SRCS += pvr.c autorec.c ffmuxer.c
 
 SRCS += epg.c epg_xmltv.c
 
+VPATH += dvb
 SRCS += dvb.c dvb_support.c dvb_dvr.c dvb_muxconfig.c dvb_fe.c dvb_tables.c \
 	diseqc.c
 
@@ -41,7 +42,7 @@ JSSRCS += tvheadend.js extensions.js acleditor.js cwceditor.js \
 
 CSSSRCS += ext.css
 
-PROGPATH = $(HTS_BUILD_ROOT)/tvheadend_newui
+PROGPATH = $(HTS_BUILD_ROOT)/tvheadend
 PROG = tvheadend
 MAN  = tvheadend.1
 CFLAGS += -g -Wall -Werror -O2 -mmmx
diff --git a/channels.c b/channels.c
index a1b3015d..b36dd3fd 100644
--- a/channels.c
+++ b/channels.c
@@ -32,7 +32,6 @@
 #include <libhts/htscfg.h>
 
 #include "tvhead.h"
-#include "dvb.h"
 #include "v4l.h"
 #include "iptv_input.h"
 #include "psi.h"
diff --git a/diseqc.c b/dvb/diseqc.c
similarity index 100%
rename from diseqc.c
rename to dvb/diseqc.c
diff --git a/dvb.c b/dvb/dvb.c
similarity index 100%
rename from dvb.c
rename to dvb/dvb.c
diff --git a/dvb.h b/dvb/dvb.h
similarity index 100%
rename from dvb.h
rename to dvb/dvb.h
diff --git a/dvb_dvr.c b/dvb/dvb_dvr.c
similarity index 100%
rename from dvb_dvr.c
rename to dvb/dvb_dvr.c
diff --git a/dvb_dvr.h b/dvb/dvb_dvr.h
similarity index 100%
rename from dvb_dvr.h
rename to dvb/dvb_dvr.h
diff --git a/dvb_fe.c b/dvb/dvb_fe.c
similarity index 100%
rename from dvb_fe.c
rename to dvb/dvb_fe.c
diff --git a/dvb_muxconfig.c b/dvb/dvb_muxconfig.c
similarity index 100%
rename from dvb_muxconfig.c
rename to dvb/dvb_muxconfig.c
diff --git a/dvb_muxconfig.h b/dvb/dvb_muxconfig.h
similarity index 100%
rename from dvb_muxconfig.h
rename to dvb/dvb_muxconfig.h
diff --git a/dvb_support.c b/dvb/dvb_support.c
similarity index 100%
rename from dvb_support.c
rename to dvb/dvb_support.c
diff --git a/dvb_support.h b/dvb/dvb_support.h
similarity index 100%
rename from dvb_support.h
rename to dvb/dvb_support.h
diff --git a/dvb_tables.c b/dvb/dvb_tables.c
similarity index 100%
rename from dvb_tables.c
rename to dvb/dvb_tables.c
diff --git a/htsclient.c b/htsclient.c
index cde651a0..ef90a721 100644
--- a/htsclient.c
+++ b/htsclient.c
@@ -36,7 +36,6 @@
 #include "epg.h"
 #include "teletext.h"
 #include "dispatch.h"
-#include "dvb.h"
 #include "buffer.h"
 #include "tsmux.h"
 #include "tcp.h"
diff --git a/main.c b/main.c
index b4c279f2..719a97b4 100644
--- a/main.c
+++ b/main.c
@@ -37,7 +37,7 @@
 #include <libavformat/avformat.h>
 
 #include "tvhead.h"
-#include "dvb.h"
+#include "dvb/dvb.h"
 #include "v4l.h"
 #include "channels.h"
 #include "htsclient.h"
diff --git a/psi.c b/psi.c
index c228622e..ebd49e68 100644
--- a/psi.c
+++ b/psi.c
@@ -28,7 +28,7 @@
 #include "tvhead.h"
 #include "psi.h"
 #include "transports.h"
-#include "dvb_support.h"
+#include "dvb/dvb_support.h"
 #include "tsdemux.h"
 #include "parsers.h"
 
diff --git a/rtsp.c b/rtsp.c
index 26889e74..1f53f511 100644
--- a/rtsp.c
+++ b/rtsp.c
@@ -35,7 +35,6 @@
 #include "epg.h"
 #include "teletext.h"
 #include "dispatch.h"
-#include "dvb.h"
 #include "rtp.h"
 #include "tsmux.h"
 #include "tcp.h"
diff --git a/subscriptions.c b/subscriptions.c
index 5b65d529..91bd0bc6 100644
--- a/subscriptions.c
+++ b/subscriptions.c
@@ -38,13 +38,11 @@
 
 #include "tvhead.h"
 #include "dispatch.h"
-#include "dvb_dvr.h"
 #include "teletext.h"
 #include "transports.h"
 #include "subscriptions.h"
 
 #include "v4l.h"
-#include "dvb_dvr.h"
 #include "iptv_input.h"
 #include "psi.h"
 
diff --git a/transports.c b/transports.c
index b29dfd0c..f5f1fdac 100644
--- a/transports.c
+++ b/transports.c
@@ -38,15 +38,12 @@
 
 #include "tvhead.h"
 #include "dispatch.h"
-#include "dvb_dvr.h"
-#include "dvb_support.h"
 #include "teletext.h"
 #include "transports.h"
 #include "subscriptions.h"
 #include "tsdemux.h"
 
 #include "v4l.h"
-#include "dvb_dvr.h"
 #include "iptv_input.h"
 #include "psi.h"
 #include "buffer.h"
diff --git a/webui/extjs.c b/webui/extjs.c
index 93c78b6e..8665723d 100644
--- a/webui/extjs.c
+++ b/webui/extjs.c
@@ -33,9 +33,9 @@
 #include "access.h"
 #include "dtable.h"
 
-#include "dvb.h"
-#include "dvb_support.h"
-#include "dvb_muxconfig.h"
+#include "dvb/dvb.h"
+#include "dvb/dvb_support.h"
+#include "dvb/dvb_muxconfig.h"
 #include "transports.h"
 
 extern const char *htsversion;