diff --git a/Makefile b/Makefile
index 52f80fc..1c9bbc0 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ endif
 # uncomment this line to print each playback event to the console (not RT safe)
 # CXXFLAGS+= -DDEBUG_EVENTS
 
-SRCS:=$(wildcard *.C gui/*.fl gui/*.C)
+SRCS:=$(wildcard src/*.C src/gui/*.fl src/gui/*.C)
 
 SRCS:=$(SRCS:.fl=.C)
 SRCS:=$(sort $(SRCS))
diff --git a/canvas.C b/src/canvas.C
similarity index 100%
rename from canvas.C
rename to src/canvas.C
diff --git a/canvas.H b/src/canvas.H
similarity index 100%
rename from canvas.H
rename to src/canvas.H
diff --git a/common.h b/src/common.h
similarity index 100%
rename from common.h
rename to src/common.h
diff --git a/config.h b/src/config.h
similarity index 100%
rename from config.h
rename to src/config.h
diff --git a/const.h b/src/const.h
similarity index 100%
rename from const.h
rename to src/const.h
diff --git a/dash.H b/src/dash.H
similarity index 100%
rename from dash.H
rename to src/dash.H
diff --git a/debug.C b/src/debug.C
similarity index 100%
rename from debug.C
rename to src/debug.C
diff --git a/debug.h b/src/debug.h
similarity index 100%
rename from debug.h
rename to src/debug.h
diff --git a/event.C b/src/event.C
similarity index 100%
rename from event.C
rename to src/event.C
diff --git a/event.H b/src/event.H
similarity index 100%
rename from event.H
rename to src/event.H
diff --git a/event_list.C b/src/event_list.C
similarity index 100%
rename from event_list.C
rename to src/event_list.C
diff --git a/event_list.H b/src/event_list.H
similarity index 100%
rename from event_list.H
rename to src/event_list.H
diff --git a/grid.C b/src/grid.C
similarity index 100%
rename from grid.C
rename to src/grid.C
diff --git a/grid.H b/src/grid.H
similarity index 100%
rename from grid.H
rename to src/grid.H
diff --git a/gui/Makefile b/src/gui/Makefile
similarity index 100%
rename from gui/Makefile
rename to src/gui/Makefile
diff --git a/gui/draw.C b/src/gui/draw.C
similarity index 100%
rename from gui/draw.C
rename to src/gui/draw.C
diff --git a/gui/draw.H b/src/gui/draw.H
similarity index 100%
rename from gui/draw.H
rename to src/gui/draw.H
diff --git a/gui/event_edit.fl b/src/gui/event_edit.fl
similarity index 100%
rename from gui/event_edit.fl
rename to src/gui/event_edit.fl
diff --git a/gui/input.C b/src/gui/input.C
similarity index 100%
rename from gui/input.C
rename to src/gui/input.C
diff --git a/gui/input.H b/src/gui/input.H
similarity index 100%
rename from gui/input.H
rename to src/gui/input.H
diff --git a/gui/ui.fl b/src/gui/ui.fl
similarity index 100%
rename from gui/ui.fl
rename to src/gui/ui.fl
diff --git a/gui/widgets.fl b/src/gui/widgets.fl
similarity index 100%
rename from gui/widgets.fl
rename to src/gui/widgets.fl
diff --git a/instrument.C b/src/instrument.C
similarity index 100%
rename from instrument.C
rename to src/instrument.C
diff --git a/instrument.H b/src/instrument.H
similarity index 100%
rename from instrument.H
rename to src/instrument.H
diff --git a/jack.C b/src/jack.C
similarity index 100%
rename from jack.C
rename to src/jack.C
diff --git a/jack.H b/src/jack.H
similarity index 100%
rename from jack.H
rename to src/jack.H
diff --git a/lash.C b/src/lash.C
similarity index 100%
rename from lash.C
rename to src/lash.C
diff --git a/lash.H b/src/lash.H
similarity index 100%
rename from lash.H
rename to src/lash.H
diff --git a/main.C b/src/main.C
similarity index 100%
rename from main.C
rename to src/main.C
diff --git a/mapping.C b/src/mapping.C
similarity index 100%
rename from mapping.C
rename to src/mapping.C
diff --git a/mapping.H b/src/mapping.H
similarity index 100%
rename from mapping.H
rename to src/mapping.H
diff --git a/midievent.C b/src/midievent.C
similarity index 100%
rename from midievent.C
rename to src/midievent.C
diff --git a/midievent.H b/src/midievent.H
similarity index 100%
rename from midievent.H
rename to src/midievent.H
diff --git a/non.H b/src/non.H
similarity index 100%
rename from non.H
rename to src/non.H
diff --git a/pattern.C b/src/pattern.C
similarity index 100%
rename from pattern.C
rename to src/pattern.C
diff --git a/pattern.H b/src/pattern.H
similarity index 100%
rename from pattern.H
rename to src/pattern.H
diff --git a/phrase.C b/src/phrase.C
similarity index 100%
rename from phrase.C
rename to src/phrase.C
diff --git a/phrase.H b/src/phrase.H
similarity index 100%
rename from phrase.H
rename to src/phrase.H
diff --git a/scale.C b/src/scale.C
similarity index 100%
rename from scale.C
rename to src/scale.C
diff --git a/scale.H b/src/scale.H
similarity index 100%
rename from scale.H
rename to src/scale.H
diff --git a/sequence.C b/src/sequence.C
similarity index 100%
rename from sequence.C
rename to src/sequence.C
diff --git a/sequence.H b/src/sequence.H
similarity index 100%
rename from sequence.H
rename to src/sequence.H
diff --git a/smf.C b/src/smf.C
similarity index 100%
rename from smf.C
rename to src/smf.C
diff --git a/smf.H b/src/smf.H
similarity index 100%
rename from smf.H
rename to src/smf.H
diff --git a/transport.C b/src/transport.C
similarity index 100%
rename from transport.C
rename to src/transport.C
diff --git a/transport.H b/src/transport.H
similarity index 100%
rename from transport.H
rename to src/transport.H