diff --git a/grauph/src/engine/events/Event.cpp b/grauph/src/engine/Event.cpp
similarity index 100%
rename from grauph/src/engine/events/Event.cpp
rename to grauph/src/engine/Event.cpp
diff --git a/grauph/src/engine/events/Event.h b/grauph/src/engine/Event.h
similarity index 100%
rename from grauph/src/engine/events/Event.h
rename to grauph/src/engine/Event.h
diff --git a/grauph/src/engine/Makefile.am b/grauph/src/engine/Makefile.am
index 4317674f..ae0b3e53 100644
--- a/grauph/src/engine/Makefile.am
+++ b/grauph/src/engine/Makefile.am
@@ -3,6 +3,8 @@ DIST_SUBDIRS = events
 
 AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/engine/events -fno-exceptions -fno-rtti
 
+MAINTAINERCLEANFILES = Makefile.in
+
 common_SOURCES = \
 	util.h \
 	tuning.h \
@@ -218,7 +220,7 @@ libom_la_SOURCES = $(common_SOURCES)
 
 
 #
-# Statically linked stand-alone engine
+# Stand-alone engine
 #
 if BUILD_ENGINE
 
diff --git a/grauph/src/engine/events/QueuedEvent.h b/grauph/src/engine/QueuedEvent.h
similarity index 100%
rename from grauph/src/engine/events/QueuedEvent.h
rename to grauph/src/engine/QueuedEvent.h
diff --git a/grauph/src/engine/events/Makefile.am b/grauph/src/engine/events/Makefile.am
index 9a882a4f..5b29e12b 100644
--- a/grauph/src/engine/events/Makefile.am
+++ b/grauph/src/engine/events/Makefile.am
@@ -1,3 +1,5 @@
+MAINTAINERCLEANFILES = Makefile.in
+
 EXTRA_DIST = \
 	events/RegisterClientEvent.h \
 	events/RegisterClientEvent.cpp \