diff --git a/src/bitvis.cpp b/src/bitvis/bitvis.cpp
similarity index 100%
rename from src/bitvis.cpp
rename to src/bitvis/bitvis.cpp
diff --git a/src/bitvis.h b/src/bitvis/bitvis.h
similarity index 100%
rename from src/bitvis.h
rename to src/bitvis/bitvis.h
diff --git a/src/clientmessage.h b/src/bitvis/clientmessage.h
similarity index 100%
rename from src/clientmessage.h
rename to src/bitvis/clientmessage.h
diff --git a/src/fft.cpp b/src/bitvis/fft.cpp
similarity index 100%
rename from src/fft.cpp
rename to src/bitvis/fft.cpp
diff --git a/src/fft.h b/src/bitvis/fft.h
similarity index 100%
rename from src/fft.h
rename to src/bitvis/fft.h
diff --git a/src/jackclient.cpp b/src/bitvis/jackclient.cpp
similarity index 100%
rename from src/jackclient.cpp
rename to src/bitvis/jackclient.cpp
diff --git a/src/jackclient.h b/src/bitvis/jackclient.h
similarity index 100%
rename from src/jackclient.h
rename to src/bitvis/jackclient.h
diff --git a/src/main.cpp b/src/bitvis/main.cpp
similarity index 100%
rename from src/main.cpp
rename to src/bitvis/main.cpp
diff --git a/src/mpdclient.cpp b/src/bitvis/mpdclient.cpp
similarity index 100%
rename from src/mpdclient.cpp
rename to src/bitvis/mpdclient.cpp
diff --git a/src/mpdclient.h b/src/bitvis/mpdclient.h
similarity index 100%
rename from src/mpdclient.h
rename to src/bitvis/mpdclient.h
diff --git a/wscript b/wscript
index 1e75604..caaacea 100644
--- a/wscript
+++ b/wscript
@@ -33,18 +33,18 @@ def configure(conf):
   conf.write_config_header('config.h')
 
 def build(bld):
-  bld.program(source='src/main.cpp\
-                      src/bitvis.cpp\
-                      src/jackclient.cpp\
-                      src/mpdclient.cpp\
+  bld.program(source='src/bitvis/main.cpp\
+                      src/bitvis/bitvis.cpp\
+                      src/bitvis/jackclient.cpp\
+                      src/bitvis/mpdclient.cpp\
+                      src/bitvis/fft.cpp\
                       src/util/log.cpp\
                       src/util/misc.cpp\
                       src/util/mutex.cpp\
                       src/util/timeutils.cpp\
                       src/util/condition.cpp\
                       src/util/tcpsocket.cpp\
-                      src/util/thread.cpp\
-                      src/fft.cpp',
+                      src/util/thread.cpp',
               use=['m','pthread','rt', 'jack', 'fftw3', 'fftw3f', 'samplerate'],
               includes='./src',
               cxxflags='-Wall -g -DUTILNAMESPACE=BitVisUtil',