diff --git a/.gitignore b/.gitignore
index 5745ec4..2b13fc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,6 @@
 
 planning/*
 
-*.o
 .tup/*
-/luppp
+src/*.o
+luppp
diff --git a/Tupfile b/Tupfile
index 30678da..64ea80e 100644
--- a/Tupfile
+++ b/Tupfile
@@ -1,11 +1,4 @@
 
-# Tup build file for Luppp
-
-CFLAGS += -g -Wall -march=native -msse -mfpmath=sse -ffast-math
-
-INCLUDES  += `pkg-config --cflags jack sndfile cairomm-1.0 ntk ntk_images`
 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++ $(CFLAGS) -c %f $(INCLUDES)  -o %o   |> %B.o
-
-: *.o |> g++ %f $(LDFLAGS) -o %o |> luppp
+: src/*.o |> g++ %f $(LDFLAGS) -o %o |> luppp
diff --git a/src/Tupfile b/src/Tupfile
new file mode 100644
index 0000000..eb0fdb1
--- /dev/null
+++ b/src/Tupfile
@@ -0,0 +1,9 @@
+
+# Tup build file for Luppp
+
+CFLAGS += -g -Wall -march=native -msse -mfpmath=sse -ffast-math
+
+INCLUDES  += `pkg-config --cflags jack sndfile cairomm-1.0 ntk ntk_images`
+
+: foreach *.cxx observer/*.cxx dsp/*.cxx controller/*.cxx |> g++ $(CFLAGS) -c %f $(INCLUDES)  -o %o   |> %B.o
+
diff --git a/waf b/waf
deleted file mode 100755
index 30d8a7f..0000000
Binary files a/waf and /dev/null differ
diff --git a/wscript b/wscript
deleted file mode 100644
index 4bf5018..0000000
--- a/wscript
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /usr/bin/env python
-
-VERSION='5.0.0'
-APPNAME='Luppp'
-
-top = '.'
-out = '.build'
-
-def options(opt):
-  opt.load('compiler_cxx')
-
-def configure(conf):
-  conf.load('compiler_cxx')
-  #conf.env.append_value('CXXFLAGS', ['-g', '-Wall','-Werror','-Wextra']) #'-O2'
-  conf.env.append_value('CXXFLAGS', ['-g', '-Wall']) #,'-march=native','-msse','-mfpmath=sse','-ffast-math']) #'-O2','-Werror'
-  conf.check_cfg(package='ntk',at_least_version='1.3',args='--cflags --libs',uselib_store='NTK')
-  conf.check_cfg(package='jack',at_least_version='0.118',args='--cflags --libs',uselib_store='JACK')
-  #conf.check_cfg(package='lilv-0',at_least_version='1.0',args='--cflags --libs',uselib_store='LILV')
-  conf.check_cfg(package='sndfile',at_least_version='1.0',args='--cflags --libs',uselib_store='SNDFILE')
-
-def build(bld):
-  
-  sources = ['src/gui.cxx',
-             'src/main.cxx',
-             'src/jack.cxx',
-             'src/gtrack.cxx',
-             'src/looper.cxx',
-             'src/looperclip.cxx',
-             'src/trackoutput.cxx',
-             'src/timemanager.cxx',
-             'src/metronome.cxx',
-             
-             'src/logic.cxx',
-             'src/gridlogic.cxx',
-             
-             'src/observer/time.cxx',
-             'src/observer/midi.cxx',
-             
-             'src/controller/apc.cxx',
-             'src/controller/gui.cxx',
-             
-             'src/dsp/dsp_sidechain_gain.cxx',
-             
-             'src/eventhandlergui.cxx',
-             'src/eventhandlerdsp.cxx']
-  
-  bld.program(source = sources,
-              target='luppp5',
-              use='JACK NTK SNDFILE')
-