diff --git a/.gitignore b/.gitignore
index 6a4a812..9faab85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@
 .build*
 
 planning/*
+
+*.o
+.tup/*
diff --git a/Tupfile b/Tupfile
new file mode 100644
index 0000000..21da61b
--- /dev/null
+++ b/Tupfile
@@ -0,0 +1,9 @@
+
+# Tup build file for Luppp
+
+#INCLUDES  += 
+#LDFLAGS   += `pkg-config --libs jack sndfile cairomm-1.0 ntk ntk_images`
+
+: foreach src/*.cxx src/observer/*.cxx src/dsp/*.cxx src/controller/*.cxx |> g++ -Wall -c %f -pthread -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -pthread -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/cairomm-1.0 -I/usr/lib/cairomm-1.0/include -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/ntk -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15  -o %o   |> %B.o
+
+: *.o |> g++ %f -ljack -lpthread -lrt -lsndfile -lcairomm-1.0 -lsigc-2.0 -lntk -lntk_images -lntk -lcairo  -o %o |> lup
diff --git a/src/controller/gui.cxx b/src/controller/guicontroller.cxx
similarity index 97%
rename from src/controller/gui.cxx
rename to src/controller/guicontroller.cxx
index 61f5b39..066b0ae 100644
--- a/src/controller/gui.cxx
+++ b/src/controller/guicontroller.cxx
@@ -1,6 +1,6 @@
 
 
-#include "gui.hxx"
+#include "guicontroller.hxx"
 
 #include <iostream>
 
diff --git a/src/controller/gui.hxx b/src/controller/guicontroller.hxx
similarity index 100%
rename from src/controller/gui.hxx
rename to src/controller/guicontroller.hxx
diff --git a/src/jack.cxx b/src/jack.cxx
index b52675d..9d11c0b 100644
--- a/src/jack.cxx
+++ b/src/jack.cxx
@@ -7,7 +7,7 @@
 
 #include "audiobuffer.hxx"
 #include "eventhandler.hxx"
-#include "controller/gui.hxx"
+#include "controller/guicontroller.hxx"
 
 using namespace std;