diff --git a/SConstruct b/SConstruct
index c3dc528..6712962 100644
--- a/SConstruct
+++ b/SConstruct
@@ -37,18 +37,14 @@ env.Append(CCFLAGS = ['-O2', '-Wall'])
 if DEBUG:
     env.Append(CCFLAGS = ['-g'])
 
-sources = [Glob('*.cc')]
-if not os.path.exists('ag_lua.cc'):
-    sources.append('ag_lua.cc')
-if not os.path.exists('sdl_keymap.cc'):
-    sources.append('sdl_keymap.cc')
+sources = [Glob('src/*.cc'), 'ag_lua.cc', 'sdl_keymap.cc']
 for sd in subdirs:
     sources += [Glob(sd + '/*.c'), Glob(sd + '/*.cc')]
 
 def F2C(target, source, env):
     f = open(str(target[0]), 'w')
     for s in source:
-        c_name = re.sub(r'\W', '_', str(s))
+        c_name = re.sub(r'\W', '_', str(s).split('/')[-1])
         f.write('unsigned char %s[] = {' % c_name)
         src = open(str(s), 'r')
         s_len = 0
@@ -76,7 +72,7 @@ def bt(cmd):
 env.Append(BUILDERS = {'SDLKeymap' : Builder(action = SDLKeymap)})
 env.Append(BUILDERS = {'F2C' : Builder(action = F2C)})
 
-env.F2C('ag_lua.cc', 'ag.lua')
+env.F2C('ag_lua.cc', 'src/ag.lua')
 env.SDLKeymap('sdl_keymap.cc', 'gen-sdl-keymap.pl')
 env.Program(target, sources)
 
diff --git a/AV.cc b/src/AV.cc
similarity index 100%
rename from AV.cc
rename to src/AV.cc
diff --git a/AV.h b/src/AV.h
similarity index 100%
rename from AV.h
rename to src/AV.h
diff --git a/Engine.cc b/src/Engine.cc
similarity index 100%
rename from Engine.cc
rename to src/Engine.cc
diff --git a/Engine.h b/src/Engine.h
similarity index 100%
rename from Engine.h
rename to src/Engine.h
diff --git a/Engine_Object.cc b/src/Engine_Object.cc
similarity index 100%
rename from Engine_Object.cc
rename to src/Engine_Object.cc
diff --git a/IDSet.h b/src/IDSet.h
similarity index 100%
rename from IDSet.h
rename to src/IDSet.h
diff --git a/ag.cc b/src/ag.cc
similarity index 100%
rename from ag.cc
rename to src/ag.cc
diff --git a/ag.h b/src/ag.h
similarity index 100%
rename from ag.h
rename to src/ag.h
diff --git a/ag.lua b/src/ag.lua
similarity index 100%
rename from ag.lua
rename to src/ag.lua
diff --git a/ag_lua.h b/src/ag_lua.h
similarity index 100%
rename from ag_lua.h
rename to src/ag_lua.h
diff --git a/anaglym.cc b/src/anaglym.cc
similarity index 100%
rename from anaglym.cc
rename to src/anaglym.cc
diff --git a/anaglym.h b/src/anaglym.h
similarity index 100%
rename from anaglym.h
rename to src/anaglym.h
diff --git a/sdl_keymap.h b/src/sdl_keymap.h
similarity index 100%
rename from sdl_keymap.h
rename to src/sdl_keymap.h