diff --git a/Makefile.am b/Makefile.am
index 270eb48ed..c0941967a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,9 +69,9 @@ mpd_headers = \
 	src/decoder/_ogg_common.h \
 	src/input_plugin.h \
 	src/input_stream.h \
-	src/input_file.h \
-	src/input_curl.h \
-	src/input_mms.h \
+	src/input/file_input_plugin.h \
+	src/input/curl_input_plugin.h \
+	src/input/mms_input_plugin.h \
 	src/icy_metadata.h \
 	src/client.h \
 	src/listen.h \
@@ -138,7 +138,7 @@ mpd_headers = \
 	src/archive_api.h \
 	src/archive_internal.h \
 	src/archive_list.h \
-	src/input_archive.h
+	src/input/archive_input_plugin.h
 
 src_mpd_SOURCES = \
 	$(mpd_headers) \
@@ -257,7 +257,7 @@ if ENABLE_ARCHIVE
 ARCHIVE_SRC += \
 	src/archive_api.c \
 	src/archive_list.c \
-	src/input_archive.c
+	src/input/archive_input_plugin.c
 endif
 
 
@@ -408,14 +408,14 @@ INPUT_LIBS = \
 
 INPUT_SRC = \
 	src/input_stream.c \
-	src/input_file.c
+	src/input/file_input_plugin.c
 
 if HAVE_CURL
-INPUT_SRC += src/input_curl.c src/icy_metadata.c
+INPUT_SRC += src/input/curl_input_plugin.c src/icy_metadata.c
 endif
 
 if ENABLE_MMS
-INPUT_SRC += src/input_mms.c
+INPUT_SRC += src/input/mms_input_plugin.c
 endif
 
 
diff --git a/src/input_archive.c b/src/input/archive_input_plugin.c
similarity index 98%
rename from src/input_archive.c
rename to src/input/archive_input_plugin.c
index 22ebde8d4..31f873aa2 100644
--- a/src/input_archive.c
+++ b/src/input/archive_input_plugin.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "input_archive.h"
+#include "input/archive_input_plugin.h"
 #include "archive_api.h"
 #include "archive_list.h"
 #include "input_plugin.h"
diff --git a/src/input_archive.h b/src/input/archive_input_plugin.h
similarity index 100%
rename from src/input_archive.h
rename to src/input/archive_input_plugin.h
diff --git a/src/input_curl.c b/src/input/curl_input_plugin.c
similarity index 99%
rename from src/input_curl.c
rename to src/input/curl_input_plugin.c
index 337e438af..b6d444a8a 100644
--- a/src/input_curl.c
+++ b/src/input/curl_input_plugin.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "input_curl.h"
+#include "input/curl_input_plugin.h"
 #include "input_plugin.h"
 #include "conf.h"
 #include "config.h"
diff --git a/src/input_curl.h b/src/input/curl_input_plugin.h
similarity index 100%
rename from src/input_curl.h
rename to src/input/curl_input_plugin.h
diff --git a/src/input_file.c b/src/input/file_input_plugin.c
similarity index 98%
rename from src/input_file.c
rename to src/input/file_input_plugin.c
index 5334d453e..c857bbd65 100644
--- a/src/input_file.c
+++ b/src/input/file_input_plugin.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "input_file.h"
+#include "input/file_input_plugin.h"
 #include "input_plugin.h"
 
 #include <sys/stat.h>
diff --git a/src/input_file.h b/src/input/file_input_plugin.h
similarity index 100%
rename from src/input_file.h
rename to src/input/file_input_plugin.h
diff --git a/src/input_mms.c b/src/input/mms_input_plugin.c
similarity index 98%
rename from src/input_mms.c
rename to src/input/mms_input_plugin.c
index 34dce5b6e..d449d058a 100644
--- a/src/input_mms.c
+++ b/src/input/mms_input_plugin.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "input_mms.h"
+#include "input/mms_input_plugin.h"
 #include "input_plugin.h"
 
 #include <glib.h>
diff --git a/src/input_mms.h b/src/input/mms_input_plugin.h
similarity index 100%
rename from src/input_mms.h
rename to src/input/mms_input_plugin.h
diff --git a/src/input_stream.c b/src/input_stream.c
index 794dd1980..73c7acc2a 100644
--- a/src/input_stream.c
+++ b/src/input_stream.c
@@ -19,18 +19,18 @@
 #include "input_plugin.h"
 #include "config.h"
 
-#include "input_file.h"
+#include "input/file_input_plugin.h"
 
 #ifdef ENABLE_ARCHIVE
-#include "input_archive.h"
+#include "input/archive_input_plugin.h"
 #endif
 
 #ifdef HAVE_CURL
-#include "input_curl.h"
+#include "input/curl_input_plugin.h"
 #endif
 
 #ifdef ENABLE_MMS
-#include "input_mms.h"
+#include "input/mms_input_plugin.h"
 #endif
 
 #include <glib.h>