Merge branch 'master' of github.com:krebscode/painload

126 files changed, 105 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index 4e8a8e65..188e6ca2 100644
--- a/Makefile
+++ b/Makefile
@@ -4,16 +4,16 @@ DIST = debian
 all: select-target
 
 infest:
-	make -C modules/infest
+	make -C infest
 
 install-core:
 	core/$(DIST)
 
 noise:
-	make -C modules/noise infest
+	make -C noise infest
 streams:
-	make -C modules/streams
+	make -C streams
 monitoring:
-	make -C modules/Monitoring debian
+	make -C Monitoring debian
 zoneminder:
-	make -C modules/zoneminder fix it so hard
+	make -C zoneminder fix it so hard
diff --git a/modules/Monitoring/Makefile b/Monitoring/Makefile
index cc1d8903..cc1d8903 100644
--- a/