diff --git a/src/sandbox/Keymap.cpp b/src/Keymap.cpp
similarity index 100%
rename from src/sandbox/Keymap.cpp
rename to src/Keymap.cpp
diff --git a/src/sandbox/Keymap.h b/src/Keymap.h
similarity index 100%
rename from src/sandbox/Keymap.h
rename to src/Keymap.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 5d8da27b6..9d4e032ff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,10 @@
 bin_PROGRAMS = task
 task_SOURCES = Config.cpp Date.cpp Record.cpp T.cpp TDB.cpp Att.cpp Mod.cpp    \
                Filter.cpp Sequence.cpp Table.cpp Grid.cpp Timer.cpp            \
-               Duration.cpp StringTable.cpp Location.cpp color.cpp parse.cpp   \
-               task.cpp command.cpp edit.cpp report.cpp util.cpp text.cpp      \
-               rules.cpp import.cpp Config.h Date.h Record.h T.h TDB.h Att.h   \
-               Mod.h Filter.h Sequence.h Table.h Grid.h Timer.h Duration.h     \
-               StringTable.h Location.h color.h task.h
+               Duration.cpp StringTable.cpp Location.cpp Subst.cpp Keymap.cpp  \
+               color.cpp parse.cpp task.cpp command.cpp edit.cpp report.cpp    \
+               util.cpp text.cpp rules.cpp import.cpp Config.h Date.h Record.h \
+               T.h TDB.h Att.h Mod.h Filter.h Sequence.h Table.h Grid.h        \
+               Timer.h Duration.h StringTable.h Location.h Subst.h Keymap.h    \
+               color.h task.h
 
diff --git a/src/sandbox/Subst.cpp b/src/Subst.cpp
similarity index 100%
rename from src/sandbox/Subst.cpp
rename to src/Subst.cpp
diff --git a/src/sandbox/Subst.h b/src/Subst.h
similarity index 100%
rename from src/sandbox/Subst.h
rename to src/Subst.h
diff --git a/src/sandbox/Makefile b/src/sandbox/Makefile
index d9f5139d0..233b7de33 100644
--- a/src/sandbox/Makefile
+++ b/src/sandbox/Makefile
@@ -3,8 +3,8 @@ CFLAGS  = -I. -I.. -Wall -pedantic -ggdb3 -fno-rtti -fno-stack-check
 LFLAGS  = 
 LIBS    = 
 OBJECTS = main.o Context.o TDB.o T.o ../Sequence.o ../Filter.o ../Att.o      \
-          Keymap.o ../Record.o ../Mod.o ../StringTable.o ../util.o ../text.o \
-          ../Date.o ../Config.o ../Location.o Subst.o
+          ../Keymap.o ../Record.o ../Mod.o ../StringTable.o ../util.o        \
+          ../text.o ../Date.o ../Config.o ../Location.o ../Subst.o
 
 all: $(PROJECT)