diff --git a/Makefile.in b/Makefile.in
index c896d33d3..d048a1aac 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -54,7 +54,7 @@ localedir = @localedir@
 #
 
 MACROS = -DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" -DBINDIR=L\"$(bindir)\" -DDOCDIR=L\"$(docdir)\"
-CXXFLAGS = @CXXFLAGS@ $(MACROS) $(EXTRA_CXXFLAGS)
+CXXFLAGS = @CXXFLAGS@ -iquote. -iquote./src/ $(MACROS) $(EXTRA_CXXFLAGS)
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -72,52 +72,47 @@ HAVE_GETTEXT=@HAVE_GETTEXT@
 
 HAVE_DOXYGEN=@HAVE_DOXYGEN@
 
-#
-#Additional .cpp files used by common.o. These also have a corresponding
-#.h file.
-#
-
-COMMON_FILES := util.cpp fallback.cpp
-
-
 #
 # All objects that the system needs to build fish, except fish.o
 #
 
-FISH_OBJS := function.o builtin.o complete.o env.o exec.o expand.o		\
-	highlight.o history.o kill.o parser.o proc.o reader.o sanity.o		\
-	tokenizer.o wildcard.o wgetopt.o wutil.o input.o output.o intern.o	\
-	env_universal_common.o input_common.o event.o		\
-	signal.o io.o parse_util.o common.o screen.o path.o autoload.o		\
-	parser_keywords.o iothread.o color.o postfork.o	\
-	builtin_test.o parse_tree.o parse_productions.o parse_execution.o \
-	pager.o utf8.o fish_version.o wcstringutil.o
+FISH_OBJS := obj/function.o obj/builtin.o obj/complete.o obj/env.o obj/exec.o \
+	obj/expand.o obj/highlight.o obj/history.o obj/kill.o obj/parser.o \
+	obj/proc.o obj/reader.o obj/sanity.o obj/tokenizer.o obj/wildcard.o \
+	obj/wgetopt.o obj/wutil.o obj/input.o obj/output.o obj/intern.o \
+	obj/env_universal_common.o obj/input_common.o obj/event.o obj/signal.o \
+	obj/io.o obj/parse_util.o obj/common.o obj/screen.o obj/path.o \
+	obj/autoload.o obj/parser_keywords.o obj/iothread.o obj/color.o \
+	obj/postfork.o obj/builtin_test.o obj/parse_tree.o obj/parse_productions.o \
+	obj/parse_execution.o obj/pager.o obj/utf8.o obj/fish_version.o \
+	obj/wcstringutil.o
 
-FISH_INDENT_OBJS := fish_indent.o print_help.o $(FISH_OBJS) 
+FISH_INDENT_OBJS := obj/fish_indent.o obj/print_help.o $(FISH_OBJS) 
 
 #
 # Additional files used by builtin.o
 #
 
-BUILTIN_FILES := builtin_set.cpp builtin_commandline.cpp	\
-	builtin_ulimit.cpp builtin_complete.cpp builtin_jobs.cpp	\
-	builtin_set_color.cpp builtin_printf.cpp
+BUILTIN_FILES := src/builtin_set.cpp src/builtin_commandline.cpp	\
+	src/builtin_ulimit.cpp src/builtin_complete.cpp	\
+	src/builtin_jobs.cpp src/builtin_set_color.cpp	\
+	src/builtin_printf.cpp
 
 
 #
 # All objects that the system needs to build fish_tests
 #
 
-FISH_TESTS_OBJS := $(FISH_OBJS) fish_tests.o
+FISH_TESTS_OBJS := $(FISH_OBJS) obj/fish_tests.o
 
 
 #
 # All objects needed to build mimedb
 #
 
-MIME_OBJS := mimedb.o print_help.o xdgmimealias.o xdgmime.o				\
-	xdgmimeglob.o xdgmimeint.o xdgmimemagic.o xdgmimeparent.o wutil.o	\
-	common.o fish_version.o
+MIME_OBJS := obj/mimedb.o obj/print_help.o obj/xdgmimealias.o obj/xdgmime.o \
+	obj/xdgmimeglob.o obj/xdgmimeint.o obj/xdgmimemagic.o obj/xdgmimeparent.o \
+	obj/wutil.o	obj/common.o obj/fish_version.o
 
 
 #
@@ -227,7 +222,7 @@ all: $(PROGRAMS) $(user_doc) $(share_man) $(TRANSLATIONS) fish.pc
 FISH-BUILD-VERSION-FILE: FORCE
 	@./build_tools/git_version_gen.sh
 -include FISH-BUILD-VERSION-FILE
-CPPFLAGS += -DFISH_BUILD_VERSION=\"$(FISH_BUILD_VERSION)\"
+CXXFLAGS += -DFISH_BUILD_VERSION=\"$(FISH_BUILD_VERSION)\"
 .PHONY: FORCE
 fish_version.o: FISH-BUILD-VERSION-FILE
 
@@ -480,8 +475,6 @@ messages.pot: *.cpp *.h share/completions/*.fish share/functions/*.fish
 
 builtin.o: $(BUILTIN_FILES)
 
-common.o: $(COMMON_FILES)
-
 
 #
 # Generate the internal help functions by making doxygen create
@@ -760,12 +753,24 @@ uninstall-translations:
 # The build rules for all the commands
 #
 
+#
+# How basic files get compiled
+#
+obj/%.o: src/%.cpp | obj
+	$(CXX) $(CXXFLAGS) -c $< -o $@
+	
+#
+# obj directory
+#
+obj:
+	mkdir obj
+
 #
 # Build the fish program.
 #
 
-fish: $(FISH_OBJS) fish.o
-	$(CXX) $(CXXFLAGS) $(LDFLAGS_FISH) $(FISH_OBJS) fish.o $(LIBS) -o $@
+fish: $(FISH_OBJS) obj/fish.o
+	$(CXX) $(CXXFLAGS) $(LDFLAGS_FISH) $(FISH_OBJS) obj/fish.o $(LIBS) -o $@
 
 
 #
@@ -804,7 +809,7 @@ key_reader: $(FISH_OBJS) key_reader.o
 # Update dependencies
 #
 depend:
-	makedepend -fMakefile.in -Y *.cpp
+	makedepend -fMakefile.in -Y src/*.cpp
 	./config.status
 .PHONY: depend
 
@@ -831,7 +836,7 @@ distclean: clean
 # deleted we won't be able to regenerate them
 
 clean:
-	rm -f *.o doc.h doc.tmp doc_src/*.doxygen doc_src/*.cpp doc_src/*.o doc_src/commands.hdr
+	rm -f obj/*.o *.o doc.h doc.tmp doc_src/*.doxygen doc_src/*.cpp doc_src/*.o doc_src/commands.hdr
 	rm -f tests/tmp.err tests/tmp.out tests/tmp.status tests/foo.txt
 	rm -f $(PROGRAMS) fish_tests key_reader
 	rm -f command_list.txt command_list_toc.txt toc.txt
@@ -842,183 +847,261 @@ clean:
 		rm -rf doc user_doc share/man; \
 	fi
 	rm -f po/*.gmo
+	rm -rf obj
 .PHONY: clean
 
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-autoload.o: config.h autoload.h common.h util.h lru.h wutil.h signal.h env.h
-autoload.o: exec.h proc.h io.h parse_tree.h tokenizer.h parse_constants.h
-builtin.o: config.h signal.h fallback.h util.h wutil.h common.h builtin.h
-builtin.o: io.h function.h event.h env.h complete.h proc.h parse_tree.h
-builtin.o: tokenizer.h parse_constants.h parser.h reader.h highlight.h
-builtin.o: color.h wgetopt.h sanity.h wildcard.h expand.h input_common.h
-builtin.o: input.h intern.h exec.h parse_util.h autoload.h lru.h
-builtin.o: parser_keywords.h path.h history.h wcstringutil.h builtin_set.cpp
-builtin.o: builtin_commandline.cpp builtin_complete.cpp builtin_ulimit.cpp
-builtin.o: builtin_jobs.cpp builtin_set_color.cpp output.h screen.h
-builtin.o: builtin_printf.cpp
-builtin_commandline.o: config.h signal.h fallback.h util.h wutil.h common.h
-builtin_commandline.o: builtin.h io.h wgetopt.h reader.h complete.h
-builtin_commandline.o: highlight.h env.h color.h parse_constants.h proc.h
-builtin_commandline.o: parse_tree.h tokenizer.h parser.h event.h function.h
-builtin_commandline.o: input_common.h input.h parse_util.h autoload.h lru.h
-builtin_complete.o: config.h signal.h fallback.h util.h wutil.h common.h
-builtin_complete.o: builtin.h io.h complete.h wgetopt.h parser.h proc.h
-builtin_complete.o: parse_tree.h tokenizer.h parse_constants.h event.h
-builtin_complete.o: function.h env.h reader.h highlight.h color.h
-builtin_jobs.o: config.h fallback.h signal.h util.h wutil.h common.h
-builtin_jobs.o: builtin.h io.h proc.h parse_tree.h tokenizer.h
-builtin_jobs.o: parse_constants.h parser.h event.h function.h env.h wgetopt.h
-builtin_printf.o: common.h util.h
-builtin_set.o: config.h signal.h fallback.h util.h wutil.h common.h builtin.h
-builtin_set.o: io.h env.h expand.h parse_constants.h wgetopt.h proc.h
-builtin_set.o: parse_tree.h tokenizer.h parser.h event.h function.h
-builtin_set_color.o: config.h builtin.h util.h io.h common.h color.h output.h
-builtin_set_color.o: fallback.h signal.h screen.h highlight.h env.h
-builtin_test.o: config.h common.h util.h builtin.h io.h wutil.h proc.h
-builtin_test.o: signal.h parse_tree.h tokenizer.h parse_constants.h
-builtin_ulimit.o: config.h fallback.h signal.h util.h builtin.h io.h common.h
-builtin_ulimit.o: wgetopt.h
-color.o: color.h config.h common.h util.h fallback.h signal.h
-common.o: config.h fallback.h signal.h util.h wutil.h common.h expand.h
-common.o: parse_constants.h proc.h io.h parse_tree.h tokenizer.h wildcard.h
-common.o: complete.h parser.h event.h function.h env.h util.cpp fallback.cpp
-complete.o: config.h signal.h fallback.h util.h tokenizer.h common.h
-complete.o: wildcard.h expand.h parse_constants.h complete.h proc.h io.h
-complete.o: parse_tree.h parser.h event.h function.h env.h builtin.h exec.h
-complete.o: reader.h highlight.h color.h history.h wutil.h intern.h
-complete.o: parse_util.h autoload.h lru.h parser_keywords.h path.h iothread.h
-env.o: config.h signal.h fallback.h util.h wutil.h common.h proc.h io.h
-env.o: parse_tree.h tokenizer.h parse_constants.h env.h sanity.h expand.h
-env.o: history.h reader.h complete.h highlight.h color.h parser.h event.h
-env.o: function.h env_universal_common.h input.h input_common.h path.h
-env.o: fish_version.h
-env_universal_common.o: config.h env_universal_common.h wutil.h common.h
-env_universal_common.o: util.h env.h fallback.h signal.h utf8.h path.h
-env_universal_common.o: iothread.h
-event.o: config.h signal.h fallback.h util.h wutil.h common.h function.h
-event.o: event.h env.h input_common.h proc.h io.h parse_tree.h tokenizer.h
-event.o: parse_constants.h parser.h
-exec.o: config.h signal.h fallback.h util.h iothread.h postfork.h common.h
-exec.o: proc.h io.h parse_tree.h tokenizer.h parse_constants.h wutil.h exec.h
-exec.o: parser.h event.h function.h env.h builtin.h wildcard.h expand.h
-exec.o: complete.h sanity.h parse_util.h autoload.h lru.h
-expand.o: config.h signal.h fallback.h util.h common.h wutil.h env.h proc.h
-expand.o: io.h parse_tree.h tokenizer.h parse_constants.h parser.h event.h
-expand.o: function.h expand.h wildcard.h complete.h exec.h iothread.h
-expand.o: parse_util.h autoload.h lru.h
-fallback.o: config.h fallback.h signal.h util.h
-fish.o: config.h signal.h fallback.h util.h common.h reader.h io.h complete.h
-fish.o: highlight.h env.h color.h parse_constants.h builtin.h function.h
-fish.o: event.h wutil.h sanity.h proc.h parse_tree.h tokenizer.h parser.h
-fish.o: expand.h intern.h exec.h output.h screen.h history.h path.h input.h
-fish.o: input_common.h fish_version.h
-fish_indent.o: config.h wutil.h common.h util.h output.h fallback.h signal.h
-fish_indent.o: screen.h highlight.h env.h color.h input.h input_common.h
-fish_indent.o: parse_tree.h tokenizer.h parse_constants.h print_help.h
-fish_indent.o: fish_version.h
-fish_tests.o: config.h signal.h fallback.h util.h common.h proc.h io.h
-fish_tests.o: parse_tree.h tokenizer.h parse_constants.h reader.h complete.h
-fish_tests.o: highlight.h env.h color.h builtin.h function.h event.h
-fish_tests.o: autoload.h lru.h wutil.h expand.h parser.h output.h screen.h
-fish_tests.o: exec.h path.h history.h iothread.h postfork.h parse_util.h
-fish_tests.o: pager.h input.h input_common.h utf8.h env_universal_common.h
-fish_tests.o: wcstringutil.h
-fish_version.o: fish_version.h
-function.o: config.h signal.h wutil.h common.h util.h fallback.h function.h
-function.o: event.h env.h proc.h io.h parse_tree.h tokenizer.h
-function.o: parse_constants.h parser.h intern.h reader.h complete.h
-function.o: highlight.h color.h parse_util.h autoload.h lru.h
-function.o: parser_keywords.h expand.h
-highlight.o: config.h signal.h fallback.h util.h wutil.h common.h highlight.h
-highlight.o: env.h color.h tokenizer.h proc.h io.h parse_tree.h
-highlight.o: parse_constants.h parser.h event.h function.h parse_util.h
-highlight.o: autoload.h lru.h parser_keywords.h builtin.h expand.h sanity.h
-highlight.o: complete.h output.h screen.h wildcard.h path.h history.h
-history.o: config.h fallback.h signal.h util.h sanity.h tokenizer.h common.h
-history.o: reader.h io.h complete.h highlight.h env.h color.h
-history.o: parse_constants.h parse_tree.h wutil.h history.h intern.h path.h
-history.o: autoload.h lru.h iothread.h
-input.o: config.h signal.h fallback.h util.h wutil.h common.h reader.h io.h
-input.o: complete.h highlight.h env.h color.h parse_constants.h proc.h
-input.o: parse_tree.h tokenizer.h sanity.h input_common.h input.h parser.h
-input.o: event.h function.h expand.h output.h screen.h intern.h
-input_common.o: config.h fallback.h signal.h util.h common.h wutil.h
-input_common.o: input_common.h env_universal_common.h env.h iothread.h
-intern.o: config.h fallback.h signal.h util.h wutil.h common.h intern.h
-io.o: config.h fallback.h signal.h util.h wutil.h common.h exec.h proc.h io.h
-io.o: parse_tree.h tokenizer.h parse_constants.h
-iothread.o: config.h iothread.h common.h util.h signal.h
-key_reader.o: config.h common.h util.h fallback.h signal.h input_common.h
-kill.o: config.h signal.h fallback.h util.h wutil.h common.h kill.h proc.h
-kill.o: io.h parse_tree.h tokenizer.h parse_constants.h sanity.h env.h exec.h
-kill.o: path.h
-mimedb.o: config.h xdgmime.h fallback.h signal.h util.h print_help.h
-mimedb.o: fish_version.h
-output.o: config.h signal.h fallback.h util.h wutil.h common.h expand.h
-output.o: parse_constants.h output.h screen.h highlight.h env.h color.h
-pager.o: config.h pager.h complete.h util.h common.h screen.h highlight.h
-pager.o: env.h color.h reader.h io.h parse_constants.h input_common.h wutil.h
-parse_execution.o: parse_execution.h config.h util.h parse_tree.h common.h
-parse_execution.o: tokenizer.h parse_constants.h proc.h signal.h io.h
-parse_execution.o: parse_util.h autoload.h lru.h complete.h wildcard.h
-parse_execution.o: expand.h builtin.h parser.h event.h function.h env.h
-parse_execution.o: reader.h highlight.h color.h wutil.h exec.h path.h
-parse_productions.o: parse_productions.h parse_tree.h config.h util.h
-parse_productions.o: common.h tokenizer.h parse_constants.h
-parse_tree.o: parse_productions.h parse_tree.h config.h util.h common.h
-parse_tree.o: tokenizer.h parse_constants.h fallback.h signal.h wutil.h
-parse_tree.o: proc.h io.h expand.h
-parse_util.o: config.h fallback.h signal.h util.h wutil.h common.h
-parse_util.o: tokenizer.h parse_util.h autoload.h lru.h parse_tree.h
-parse_util.o: parse_constants.h expand.h intern.h exec.h proc.h io.h env.h
-parse_util.o: wildcard.h complete.h parser.h event.h function.h builtin.h
-parser.o: config.h fallback.h signal.h util.h common.h wutil.h proc.h io.h
-parser.o: parse_tree.h tokenizer.h parse_constants.h parser.h event.h
-parser.o: function.h env.h parser_keywords.h exec.h wildcard.h expand.h
-parser.o: complete.h builtin.h reader.h highlight.h color.h sanity.h intern.h
-parser.o: parse_util.h autoload.h lru.h path.h parse_execution.h
-parser_keywords.o: config.h fallback.h signal.h common.h util.h
-parser_keywords.o: parser_keywords.h
-path.o: config.h fallback.h signal.h util.h common.h env.h wutil.h path.h
-path.o: expand.h parse_constants.h
-postfork.o: signal.h postfork.h config.h common.h util.h proc.h io.h
-postfork.o: parse_tree.h tokenizer.h parse_constants.h wutil.h iothread.h
-postfork.o: exec.h
-print_help.o: print_help.h
-proc.o: config.h signal.h fallback.h util.h wutil.h common.h proc.h io.h
-proc.o: parse_tree.h tokenizer.h parse_constants.h reader.h complete.h
-proc.o: highlight.h env.h color.h sanity.h parser.h event.h function.h
-proc.o: output.h screen.h
-reader.o: config.h signal.h fallback.h util.h wutil.h common.h highlight.h
-reader.o: env.h color.h reader.h io.h complete.h parse_constants.h proc.h
-reader.o: parse_tree.h tokenizer.h parser.h event.h function.h history.h
-reader.o: sanity.h exec.h expand.h kill.h input_common.h input.h output.h
-reader.o: screen.h iothread.h intern.h path.h parse_util.h autoload.h lru.h
-reader.o: parser_keywords.h pager.h
-sanity.o: config.h signal.h fallback.h util.h common.h sanity.h proc.h io.h
-sanity.o: parse_tree.h tokenizer.h parse_constants.h history.h wutil.h
-sanity.o: reader.h complete.h highlight.h env.h color.h kill.h
-screen.o: config.h fallback.h signal.h common.h util.h wutil.h output.h
-screen.o: screen.h highlight.h env.h color.h pager.h complete.h reader.h io.h
-screen.o: parse_constants.h
-signal.o: config.h signal.h common.h util.h fallback.h wutil.h event.h
-signal.o: reader.h io.h complete.h highlight.h env.h color.h
-signal.o: parse_constants.h proc.h parse_tree.h tokenizer.h
-tokenizer.o: config.h fallback.h signal.h util.h wutil.h common.h tokenizer.h
-utf8.o: utf8.h
-util.o: config.h fallback.h signal.h util.h common.h wutil.h
-wcstringutil.o: config.h wcstringutil.h common.h util.h
-wgetopt.o: config.h wgetopt.h wutil.h common.h util.h fallback.h signal.h
-wildcard.o: config.h fallback.h signal.h util.h wutil.h common.h complete.h
-wildcard.o: wildcard.h expand.h parse_constants.h reader.h io.h highlight.h
-wildcard.o: env.h color.h exec.h proc.h parse_tree.h tokenizer.h
-wutil.o: config.h fallback.h signal.h util.h common.h wutil.h
-xdgmime.o: xdgmime.h xdgmimeint.h xdgmimeglob.h xdgmimemagic.h xdgmimealias.h
-xdgmime.o: xdgmimeparent.h
-xdgmimealias.o: xdgmimealias.h xdgmime.h xdgmimeint.h
-xdgmimeglob.o: xdgmimeglob.h xdgmime.h xdgmimeint.h
-xdgmimeint.o: xdgmimeint.h xdgmime.h
-xdgmimemagic.o: xdgmimemagic.h xdgmime.h xdgmimeint.h
-xdgmimeparent.o: xdgmimeparent.h xdgmime.h xdgmimeint.h
+src/autoload.o: config.h src/autoload.h src/common.h src/util.h src/lru.h
+src/autoload.o: src/wutil.h src/signal.h src/env.h src/exec.h src/proc.h
+src/autoload.o: src/io.h src/parse_tree.h src/tokenizer.h
+src/autoload.o: src/parse_constants.h
+src/builtin.o: config.h src/signal.h src/fallback.h src/util.h src/wutil.h
+src/builtin.o: src/common.h src/builtin.h src/io.h src/function.h src/event.h
+src/builtin.o: src/env.h src/complete.h src/proc.h src/parse_tree.h
+src/builtin.o: src/tokenizer.h src/parse_constants.h src/parser.h
+src/builtin.o: src/reader.h src/highlight.h src/color.h src/wgetopt.h
+src/builtin.o: src/sanity.h src/wildcard.h src/expand.h src/input_common.h
+src/builtin.o: src/input.h src/intern.h src/exec.h src/parse_util.h
+src/builtin.o: src/autoload.h src/lru.h src/parser_keywords.h src/path.h
+src/builtin.o: src/history.h src/wcstringutil.h src/builtin_set.cpp
+src/builtin.o: src/builtin_commandline.cpp src/builtin_complete.cpp
+src/builtin.o: src/builtin_ulimit.cpp src/builtin_jobs.cpp
+src/builtin.o: src/builtin_set_color.cpp src/output.h src/screen.h
+src/builtin.o: src/builtin_printf.cpp
+src/builtin_commandline.o: config.h src/signal.h src/fallback.h src/util.h
+src/builtin_commandline.o: src/wutil.h src/common.h src/builtin.h src/io.h
+src/builtin_commandline.o: src/wgetopt.h src/reader.h src/complete.h
+src/builtin_commandline.o: src/highlight.h src/env.h src/color.h
+src/builtin_commandline.o: src/parse_constants.h src/proc.h src/parse_tree.h
+src/builtin_commandline.o: src/tokenizer.h src/parser.h src/event.h
+src/builtin_commandline.o: src/function.h src/input_common.h src/input.h
+src/builtin_commandline.o: src/parse_util.h src/autoload.h src/lru.h
+src/builtin_complete.o: config.h src/signal.h src/fallback.h src/util.h
+src/builtin_complete.o: src/wutil.h src/common.h src/builtin.h src/io.h
+src/builtin_complete.o: src/complete.h src/wgetopt.h src/parser.h src/proc.h
+src/builtin_complete.o: src/parse_tree.h src/tokenizer.h
+src/builtin_complete.o: src/parse_constants.h src/event.h src/function.h
+src/builtin_complete.o: src/env.h src/reader.h src/highlight.h src/color.h
+src/builtin_jobs.o: config.h src/fallback.h src/signal.h src/util.h
+src/builtin_jobs.o: src/wutil.h src/common.h src/builtin.h src/io.h
+src/builtin_jobs.o: src/proc.h src/parse_tree.h src/tokenizer.h
+src/builtin_jobs.o: src/parse_constants.h src/parser.h src/event.h
+src/builtin_jobs.o: src/function.h src/env.h src/wgetopt.h
+src/builtin_printf.o: src/common.h src/util.h
+src/builtin_set.o: config.h src/signal.h src/fallback.h src/util.h
+src/builtin_set.o: src/wutil.h src/common.h src/builtin.h src/io.h src/env.h
+src/builtin_set.o: src/expand.h src/parse_constants.h src/wgetopt.h
+src/builtin_set.o: src/proc.h src/parse_tree.h src/tokenizer.h src/parser.h
+src/builtin_set.o: src/event.h src/function.h
+src/builtin_set_color.o: config.h src/builtin.h src/util.h src/io.h
+src/builtin_set_color.o: src/common.h src/color.h src/output.h src/fallback.h
+src/builtin_set_color.o: src/signal.h src/screen.h src/highlight.h src/env.h
+src/builtin_test.o: config.h src/common.h src/util.h src/builtin.h src/io.h
+src/builtin_test.o: src/wutil.h src/proc.h src/signal.h src/parse_tree.h
+src/builtin_test.o: src/tokenizer.h src/parse_constants.h
+src/builtin_ulimit.o: config.h src/fallback.h src/signal.h src/util.h
+src/builtin_ulimit.o: src/builtin.h src/io.h src/common.h src/wgetopt.h
+src/color.o: src/color.h config.h src/common.h src/util.h src/fallback.h
+src/color.o: src/signal.h
+src/common.o: config.h src/fallback.h src/signal.h src/util.h src/wutil.h
+src/common.o: src/common.h src/expand.h src/parse_constants.h src/proc.h
+src/common.o: src/io.h src/parse_tree.h src/tokenizer.h src/wildcard.h
+src/common.o: src/complete.h src/parser.h src/event.h src/function.h
+src/common.o: src/env.h src/util.cpp src/fallback.cpp
+src/complete.o: config.h src/signal.h src/fallback.h src/util.h
+src/complete.o: src/tokenizer.h src/common.h src/wildcard.h src/expand.h
+src/complete.o: src/parse_constants.h src/complete.h src/proc.h src/io.h
+src/complete.o: src/parse_tree.h src/parser.h src/event.h src/function.h
+src/complete.o: src/env.h src/builtin.h src/exec.h src/reader.h
+src/complete.o: src/highlight.h src/color.h src/history.h src/wutil.h
+src/complete.o: src/intern.h src/parse_util.h src/autoload.h src/lru.h
+src/complete.o: src/parser_keywords.h src/path.h src/iothread.h
+src/env.o: config.h src/signal.h src/fallback.h src/util.h src/wutil.h
+src/env.o: src/common.h src/proc.h src/io.h src/parse_tree.h src/tokenizer.h
+src/env.o: src/parse_constants.h src/env.h src/sanity.h src/expand.h
+src/env.o: src/history.h src/reader.h src/complete.h src/highlight.h
+src/env.o: src/color.h src/parser.h src/event.h src/function.h
+src/env.o: src/env_universal_common.h src/input.h src/input_common.h
+src/env.o: src/path.h src/fish_version.h
+src/env_universal_common.o: config.h src/env_universal_common.h src/wutil.h
+src/env_universal_common.o: src/common.h src/util.h src/env.h src/fallback.h
+src/env_universal_common.o: src/signal.h src/utf8.h src/path.h src/iothread.h
+src/event.o: config.h src/signal.h src/fallback.h src/util.h src/wutil.h
+src/event.o: src/common.h src/function.h src/event.h src/env.h
+src/event.o: src/input_common.h src/proc.h src/io.h src/parse_tree.h
+src/event.o: src/tokenizer.h src/parse_constants.h src/parser.h
+src/exec.o: config.h src/signal.h src/fallback.h src/util.h src/iothread.h
+src/exec.o: src/postfork.h src/common.h src/proc.h src/io.h src/parse_tree.h
+src/exec.o: src/tokenizer.h src/parse_constants.h src/wutil.h src/exec.h
+src/exec.o: src/parser.h src/event.h src/function.h src/env.h src/builtin.h
+src/exec.o: src/wildcard.h src/expand.h src/complete.h src/sanity.h
+src/exec.o: src/parse_util.h src/autoload.h src/lru.h
+src/expand.o: config.h src/signal.h src/fallback.h src/util.h src/common.h
+src/expand.o: src/wutil.h src/env.h src/proc.h src/io.h src/parse_tree.h
+src/expand.o: src/tokenizer.h src/parse_constants.h src/parser.h src/event.h
+src/expand.o: src/function.h src/expand.h src/wildcard.h src/complete.h
+src/expand.o: src/exec.h src/iothread.h src/parse_util.h src/autoload.h
+src/expand.o: src/lru.h
+src/fallback.o: config.h src/fallback.h src/signal.h src/util.h
+src/fish.o: config.h src/signal.h src/fallback.h src/util.h src/common.h
+src/fish.o: src/reader.h src/io.h src/complete.h src/highlight.h src/env.h
+src/fish.o: src/color.h src/parse_constants.h src/builtin.h src/function.h
+src/fish.o: src/event.h src/wutil.h src/sanity.h src/proc.h src/parse_tree.h
+src/fish.o: src/tokenizer.h src/parser.h src/expand.h src/intern.h src/exec.h
+src/fish.o: src/output.h src/screen.h src/history.h src/path.h src/input.h
+src/fish.o: src/input_common.h src/fish_version.h
+src/fish_indent.o: config.h src/wutil.h src/common.h src/util.h src/output.h
+src/fish_indent.o: src/fallback.h src/signal.h src/screen.h src/highlight.h
+src/fish_indent.o: src/env.h src/color.h src/input.h src/input_common.h
+src/fish_indent.o: src/parse_tree.h src/tokenizer.h src/parse_constants.h
+src/fish_indent.o: src/print_help.h src/fish_version.h
+src/fish_tests.o: config.h src/signal.h src/fallback.h src/util.h
+src/fish_tests.o: src/common.h src/proc.h src/io.h src/parse_tree.h
+src/fish_tests.o: src/tokenizer.h src/parse_constants.h src/reader.h
+src/fish_tests.o: src/complete.h src/highlight.h src/env.h src/color.h
+src/fish_tests.o: src/builtin.h src/function.h src/event.h src/autoload.h
+src/fish_tests.o: src/lru.h src/wutil.h src/expand.h src/parser.h
+src/fish_tests.o: src/output.h src/screen.h src/exec.h src/path.h
+src/fish_tests.o: src/history.h src/iothread.h src/postfork.h
+src/fish_tests.o: src/parse_util.h src/pager.h src/input.h src/input_common.h
+src/fish_tests.o: src/utf8.h src/env_universal_common.h src/wcstringutil.h
+src/fish_version.o: src/fish_version.h
+src/function.o: config.h src/signal.h src/wutil.h src/common.h src/util.h
+src/function.o: src/fallback.h src/function.h src/event.h src/env.h
+src/function.o: src/proc.h src/io.h src/parse_tree.h src/tokenizer.h
+src/function.o: src/parse_constants.h src/parser.h src/intern.h src/reader.h
+src/function.o: src/complete.h src/highlight.h src/color.h src/parse_util.h
+src/function.o: src/autoload.h src/lru.h src/parser_keywords.h src/expand.h
+src/highlight.o: config.h src/signal.h src/fallback.h src/util.h src/wutil.h
+src/highlight.o: src/common.h src/highlight.h src/env.h src/color.h
+src/highlight.o: src/tokenizer.h src/proc.h src/io.h src/parse_tree.h
+src/highlight.o: src/parse_constants.h src/parser.h src/event.h
+src/highlight.o: src/function.h src/parse_util.h src/autoload.h src/lru.h
+src/highlight.o: src/parser_keywords.h src/builtin.h src/expand.h
+src/highlight.o: src/sanity.h src/complete.h src/output.h src/screen.h
+src/highlight.o: src/wildcard.h src/path.h src/history.h
+src/history.o: config.h src/fallback.h src/signal.h src/util.h src/sanity.h
+src/history.o: src/tokenizer.h src/common.h src/reader.h src/io.h
+src/history.o: src/complete.h src/highlight.h src/env.h src/color.h
+src/history.o: src/parse_constants.h src/parse_tree.h src/wutil.h
+src/history.o: src/history.h src/intern.h src/path.h src/autoload.h src/lru.h
+src/history.o: src/iothread.h
+src/input.o: config.h src/signal.h src/fallback.h src/util.h src/wutil.h
+src/input.o: src/common.h src/reader.h src/io.h src/complete.h
+src/input.o: src/highlight.h src/env.h src/color.h src/parse_constants.h
+src/input.o: src/proc.h src/parse_tree.h src/tokenizer.h src/sanity.h
+src/input.o: src/input_common.h src/input.h src/parser.h src/event.h
+src/input.o: src/function.h src/expand.h src/output.h src/screen.h
+src/input.o: src/intern.h
+src/input_common.o: config.h src/fallback.h src/signal.h src/util.h
+src/input_common.o: src/common.h src/wutil.h src/input_common.h
+src/input_common.o: src/env_universal_common.h src/env.h src/iothread.h
+src/intern.o: config.h src/fallback.h src/signal.h src/util.h src/wutil.h
+src/intern.o: src/common.h src/intern.h
+src/io.o: config.h src/fallback.h src/signal.h src/util.h src/wutil.h
+src/io.o: src/common.h src/exec.h src/proc.h src/io.h src/parse_tree.h
+src/io.o: src/tokenizer.h src/parse_constants.h
+src/iothread.o: config.h src/iothread.h src/common.h src/util.h src/signal.h
+src/key_reader.o: config.h src/common.h src/util.h src/fallback.h
+src/key_reader.o: src/signal.h src/input_common.h
+src/kill.o: config.h src/signal.h src/fallback.h src/util.h src/wutil.h
+src/kill.o: src/common.h src/kill.h src/proc.h src/io.h src/parse_tree.h
+src/kill.o: src/tokenizer.h src/parse_constants.h src/sanity.h src/env.h
+src/kill.o: src/exec.h src/path.h
+src/mimedb.o: config.h src/xdgmime.h src/fallback.h src/signal.h src/util.h
+src/mimedb.o: src/print_help.h src/fish_version.h
+src/output.o: config.h src/signal.h src/fallback.h src/util.h src/wutil.h
+src/output.o: src/common.h src/expand.h src/parse_constants.h src/output.h
+src/output.o: src/screen.h src/highlight.h src/env.h src/color.h
+src/pager.o: config.h src/pager.h src/complete.h src/util.h src/common.h
+src/pager.o: src/screen.h src/highlight.h src/env.h src/color.h src/reader.h
+src/pager.o: src/io.h src/parse_constants.h src/input_common.h src/wutil.h
+src/parse_execution.o: src/parse_execution.h config.h src/util.h
+src/parse_execution.o: src/parse_tree.h src/common.h src/tokenizer.h
+src/parse_execution.o: src/parse_constants.h src/proc.h src/signal.h src/io.h
+src/parse_execution.o: src/parse_util.h src/autoload.h src/lru.h
+src/parse_execution.o: src/complete.h src/wildcard.h src/expand.h
+src/parse_execution.o: src/builtin.h src/parser.h src/event.h src/function.h
+src/parse_execution.o: src/env.h src/reader.h src/highlight.h src/color.h
+src/parse_execution.o: src/wutil.h src/exec.h src/path.h
+src/parse_productions.o: src/parse_productions.h src/parse_tree.h config.h
+src/parse_productions.o: src/util.h src/common.h src/tokenizer.h
+src/parse_productions.o: src/parse_constants.h
+src/parse_tree.o: src/parse_productions.h src/parse_tree.h config.h
+src/parse_tree.o: src/util.h src/common.h src/tokenizer.h
+src/parse_tree.o: src/parse_constants.h src/fallback.h src/signal.h
+src/parse_tree.o: src/wutil.h src/proc.h src/io.h src/expand.h
+src/parse_util.o: config.h src/fallback.h src/signal.h src/util.h src/wutil.h
+src/parse_util.o: src/common.h src/tokenizer.h src/parse_util.h
+src/parse_util.o: src/autoload.h src/lru.h src/parse_tree.h
+src/parse_util.o: src/parse_constants.h src/expand.h src/intern.h src/exec.h
+src/parse_util.o: src/proc.h src/io.h src/env.h src/wildcard.h src/complete.h
+src/parse_util.o: src/parser.h src/event.h src/function.h src/builtin.h
+src/parser.o: config.h src/fallback.h src/signal.h src/util.h src/common.h
+src/parser.o: src/wutil.h src/proc.h src/io.h src/parse_tree.h
+src/parser.o: src/tokenizer.h src/parse_constants.h src/parser.h src/event.h
+src/parser.o: src/function.h src/env.h src/parser_keywords.h src/exec.h
+src/parser.o: src/wildcard.h src/expand.h src/complete.h src/builtin.h
+src/parser.o: src/reader.h src/highlight.h src/color.h src/sanity.h
+src/parser.o: src/intern.h src/parse_util.h src/autoload.h src/lru.h
+src/parser.o: src/path.h src/parse_execution.h
+src/parser_keywords.o: config.h src/fallback.h src/signal.h src/common.h
+src/parser_keywords.o: src/util.h src/parser_keywords.h
+src/path.o: config.h src/fallback.h src/signal.h src/util.h src/common.h
+src/path.o: src/env.h src/wutil.h src/path.h src/expand.h
+src/path.o: src/parse_constants.h
+src/postfork.o: src/signal.h src/postfork.h config.h src/common.h src/util.h
+src/postfork.o: src/proc.h src/io.h src/parse_tree.h src/tokenizer.h
+src/postfork.o: src/parse_constants.h src/wutil.h src/iothread.h src/exec.h
+src/print_help.o: src/print_help.h
+src/proc.o: config.h src/signal.h src/fallback.h src/util.h src/wutil.h
+src/proc.o: src/common.h src/proc.h src/io.h src/parse_tree.h src/tokenizer.h
+src/proc.o: src/parse_constants.h src/reader.h src/complete.h src/highlight.h
+src/proc.o: src/env.h src/color.h src/sanity.h src/parser.h src/event.h
+src/proc.o: src/function.h src/output.h src/screen.h
+src/reader.o: config.h src/signal.h src/fallback.h src/util.h src/wutil.h
+src/reader.o: src/common.h src/highlight.h src/env.h src/color.h src/reader.h
+src/reader.o: src/io.h src/complete.h src/parse_constants.h src/proc.h
+src/reader.o: src/parse_tree.h src/tokenizer.h src/parser.h src/event.h
+src/reader.o: src/function.h src/history.h src/sanity.h src/exec.h
+src/reader.o: src/expand.h src/kill.h src/input_common.h src/input.h
+src/reader.o: src/output.h src/screen.h src/iothread.h src/intern.h
+src/reader.o: src/path.h src/parse_util.h src/autoload.h src/lru.h
+src/reader.o: src/parser_keywords.h src/pager.h
+src/sanity.o: config.h src/signal.h src/fallback.h src/util.h src/common.h
+src/sanity.o: src/sanity.h src/proc.h src/io.h src/parse_tree.h
+src/sanity.o: src/tokenizer.h src/parse_constants.h src/history.h src/wutil.h
+src/sanity.o: src/reader.h src/complete.h src/highlight.h src/env.h
+src/sanity.o: src/color.h src/kill.h
+src/screen.o: config.h src/fallback.h src/signal.h src/common.h src/util.h
+src/screen.o: src/wutil.h src/output.h src/screen.h src/highlight.h src/env.h
+src/screen.o: src/color.h src/pager.h src/complete.h src/reader.h src/io.h
+src/screen.o: src/parse_constants.h
+src/signal.o: config.h src/signal.h src/common.h src/util.h src/fallback.h
+src/signal.o: src/wutil.h src/event.h src/reader.h src/io.h src/complete.h
+src/signal.o: src/highlight.h src/env.h src/color.h src/parse_constants.h
+src/signal.o: src/proc.h src/parse_tree.h src/tokenizer.h
+src/tokenizer.o: config.h src/fallback.h src/signal.h src/util.h src/wutil.h
+src/tokenizer.o: src/common.h src/tokenizer.h
+src/utf8.o: src/utf8.h
+src/util.o: config.h src/fallback.h src/signal.h src/util.h src/common.h
+src/util.o: src/wutil.h
+src/wcstringutil.o: config.h src/wcstringutil.h src/common.h src/util.h
+src/wgetopt.o: config.h src/wgetopt.h src/wutil.h src/common.h src/util.h
+src/wgetopt.o: src/fallback.h src/signal.h
+src/wildcard.o: config.h src/fallback.h src/signal.h src/util.h src/wutil.h
+src/wildcard.o: src/common.h src/complete.h src/wildcard.h src/expand.h
+src/wildcard.o: src/parse_constants.h src/reader.h src/io.h src/highlight.h
+src/wildcard.o: src/env.h src/color.h src/exec.h src/proc.h src/parse_tree.h
+src/wildcard.o: src/tokenizer.h
+src/wutil.o: config.h src/fallback.h src/signal.h src/util.h src/common.h
+src/wutil.o: src/wutil.h
+src/xdgmime.o: src/xdgmime.h src/xdgmimeint.h src/xdgmimeglob.h
+src/xdgmime.o: src/xdgmimemagic.h src/xdgmimealias.h src/xdgmimeparent.h
+src/xdgmimealias.o: src/xdgmimealias.h src/xdgmime.h src/xdgmimeint.h
+src/xdgmimeglob.o: src/xdgmimeglob.h src/xdgmime.h src/xdgmimeint.h
+src/xdgmimeint.o: src/xdgmimeint.h src/xdgmime.h
+src/xdgmimemagic.o: src/xdgmimemagic.h src/xdgmime.h src/xdgmimeint.h
+src/xdgmimeparent.o: src/xdgmimeparent.h src/xdgmime.h src/xdgmimeint.h
diff --git a/fish.xcodeproj/project.pbxproj b/fish.xcodeproj/project.pbxproj
index 7b0982d5e..bdc74024c 100644
--- a/fish.xcodeproj/project.pbxproj
+++ b/fish.xcodeproj/project.pbxproj
@@ -361,7 +361,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		4E142D731B56B5D7008783C8 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = osx/config.h; sourceTree = "<group>"; };
+		4E142D731B56B5D7008783C8 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = ../osx/config.h; sourceTree = "<group>"; };
 		D00769421990137800CA4627 /* fish_tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = fish_tests; sourceTree = BUILT_PRODUCTS_DIR; };
 		D00F63F019137E9D00FCCDEC /* fish_version.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fish_version.cpp; sourceTree = "<group>"; };
 		D01A2D23169B730A00767098 /* man1 */ = {isa = PBXFileReference; lastKnownFileType = text; name = man1; path = pages_for_manpath/man1; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -701,6 +701,7 @@
 				D0A0856713B3ACEE0099B651 /* xdgmimeparent.cpp */,
 			);
 			name = Sources;
+			path = src;
 			sourceTree = "<group>";
 		};
 		D0D02AAB15985C14008E62BD /* Resources */ = {
diff --git a/autoload.cpp b/src/autoload.cpp
similarity index 100%
rename from autoload.cpp
rename to src/autoload.cpp
diff --git a/autoload.h b/src/autoload.h
similarity index 100%
rename from autoload.h
rename to src/autoload.h
diff --git a/builtin.cpp b/src/builtin.cpp
similarity index 100%
rename from builtin.cpp
rename to src/builtin.cpp
diff --git a/builtin.h b/src/builtin.h
similarity index 100%
rename from builtin.h
rename to src/builtin.h
diff --git a/builtin_commandline.cpp b/src/builtin_commandline.cpp
similarity index 100%
rename from builtin_commandline.cpp
rename to src/builtin_commandline.cpp
diff --git a/builtin_complete.cpp b/src/builtin_complete.cpp
similarity index 100%
rename from builtin_complete.cpp
rename to src/builtin_complete.cpp
diff --git a/builtin_jobs.cpp b/src/builtin_jobs.cpp
similarity index 100%
rename from builtin_jobs.cpp
rename to src/builtin_jobs.cpp
diff --git a/builtin_printf.cpp b/src/builtin_printf.cpp
similarity index 100%
rename from builtin_printf.cpp
rename to src/builtin_printf.cpp
diff --git a/builtin_set.cpp b/src/builtin_set.cpp
similarity index 100%
rename from builtin_set.cpp
rename to src/builtin_set.cpp
diff --git a/builtin_set_color.cpp b/src/builtin_set_color.cpp
similarity index 100%
rename from builtin_set_color.cpp
rename to src/builtin_set_color.cpp
diff --git a/builtin_test.cpp b/src/builtin_test.cpp
similarity index 100%
rename from builtin_test.cpp
rename to src/builtin_test.cpp
diff --git a/builtin_ulimit.cpp b/src/builtin_ulimit.cpp
similarity index 100%
rename from builtin_ulimit.cpp
rename to src/builtin_ulimit.cpp
diff --git a/color.cpp b/src/color.cpp
similarity index 100%
rename from color.cpp
rename to src/color.cpp
diff --git a/color.h b/src/color.h
similarity index 100%
rename from color.h
rename to src/color.h
diff --git a/common.cpp b/src/common.cpp
similarity index 100%
rename from common.cpp
rename to src/common.cpp
diff --git a/common.h b/src/common.h
similarity index 100%
rename from common.h
rename to src/common.h
diff --git a/complete.cpp b/src/complete.cpp
similarity index 100%
rename from complete.cpp
rename to src/complete.cpp
diff --git a/complete.h b/src/complete.h
similarity index 100%
rename from complete.h
rename to src/complete.h
diff --git a/env.cpp b/src/env.cpp
similarity index 100%
rename from env.cpp
rename to src/env.cpp
diff --git a/env.h b/src/env.h
similarity index 100%
rename from env.h
rename to src/env.h
diff --git a/env_universal_common.cpp b/src/env_universal_common.cpp
similarity index 100%
rename from env_universal_common.cpp
rename to src/env_universal_common.cpp
diff --git a/env_universal_common.h b/src/env_universal_common.h
similarity index 100%
rename from env_universal_common.h
rename to src/env_universal_common.h
diff --git a/event.cpp b/src/event.cpp
similarity index 100%
rename from event.cpp
rename to src/event.cpp
diff --git a/event.h b/src/event.h
similarity index 100%
rename from event.h
rename to src/event.h
diff --git a/exec.cpp b/src/exec.cpp
similarity index 100%
rename from exec.cpp
rename to src/exec.cpp
diff --git a/exec.h b/src/exec.h
similarity index 100%
rename from exec.h
rename to src/exec.h
diff --git a/expand.cpp b/src/expand.cpp
similarity index 100%
rename from expand.cpp
rename to src/expand.cpp
diff --git a/expand.h b/src/expand.h
similarity index 100%
rename from expand.h
rename to src/expand.h
diff --git a/fallback.cpp b/src/fallback.cpp
similarity index 100%
rename from fallback.cpp
rename to src/fallback.cpp
diff --git a/fallback.h b/src/fallback.h
similarity index 100%
rename from fallback.h
rename to src/fallback.h
diff --git a/fish.cpp b/src/fish.cpp
similarity index 100%
rename from fish.cpp
rename to src/fish.cpp
diff --git a/fish_indent.cpp b/src/fish_indent.cpp
similarity index 100%
rename from fish_indent.cpp
rename to src/fish_indent.cpp
diff --git a/fish_tests.cpp b/src/fish_tests.cpp
similarity index 100%
rename from fish_tests.cpp
rename to src/fish_tests.cpp
diff --git a/fish_version.cpp b/src/fish_version.cpp
similarity index 100%
rename from fish_version.cpp
rename to src/fish_version.cpp
diff --git a/fish_version.h b/src/fish_version.h
similarity index 100%
rename from fish_version.h
rename to src/fish_version.h
diff --git a/function.cpp b/src/function.cpp
similarity index 100%
rename from function.cpp
rename to src/function.cpp
diff --git a/function.h b/src/function.h
similarity index 100%
rename from function.h
rename to src/function.h
diff --git a/highlight.cpp b/src/highlight.cpp
similarity index 100%
rename from highlight.cpp
rename to src/highlight.cpp
diff --git a/highlight.h b/src/highlight.h
similarity index 100%
rename from highlight.h
rename to src/highlight.h
diff --git a/history.cpp b/src/history.cpp
similarity index 100%
rename from history.cpp
rename to src/history.cpp
diff --git a/history.h b/src/history.h
similarity index 100%
rename from history.h
rename to src/history.h
diff --git a/input.cpp b/src/input.cpp
similarity index 100%
rename from input.cpp
rename to src/input.cpp
diff --git a/input.h b/src/input.h
similarity index 100%
rename from input.h
rename to src/input.h
diff --git a/input_common.cpp b/src/input_common.cpp
similarity index 100%
rename from input_common.cpp
rename to src/input_common.cpp
diff --git a/input_common.h b/src/input_common.h
similarity index 100%
rename from input_common.h
rename to src/input_common.h
diff --git a/intern.cpp b/src/intern.cpp
similarity index 100%
rename from intern.cpp
rename to src/intern.cpp
diff --git a/intern.h b/src/intern.h
similarity index 100%
rename from intern.h
rename to src/intern.h
diff --git a/io.cpp b/src/io.cpp
similarity index 100%
rename from io.cpp
rename to src/io.cpp
diff --git a/io.h b/src/io.h
similarity index 100%
rename from io.h
rename to src/io.h
diff --git a/iothread.cpp b/src/iothread.cpp
similarity index 100%
rename from iothread.cpp
rename to src/iothread.cpp
diff --git a/iothread.h b/src/iothread.h
similarity index 100%
rename from iothread.h
rename to src/iothread.h
diff --git a/key_reader.cpp b/src/key_reader.cpp
similarity index 100%
rename from key_reader.cpp
rename to src/key_reader.cpp
diff --git a/kill.cpp b/src/kill.cpp
similarity index 100%
rename from kill.cpp
rename to src/kill.cpp
diff --git a/kill.h b/src/kill.h
similarity index 100%
rename from kill.h
rename to src/kill.h
diff --git a/lru.h b/src/lru.h
similarity index 100%
rename from lru.h
rename to src/lru.h
diff --git a/mimedb.cpp b/src/mimedb.cpp
similarity index 100%
rename from mimedb.cpp
rename to src/mimedb.cpp
diff --git a/output.cpp b/src/output.cpp
similarity index 100%
rename from output.cpp
rename to src/output.cpp
diff --git a/output.h b/src/output.h
similarity index 100%
rename from output.h
rename to src/output.h
diff --git a/pager.cpp b/src/pager.cpp
similarity index 100%
rename from pager.cpp
rename to src/pager.cpp
diff --git a/pager.h b/src/pager.h
similarity index 100%
rename from pager.h
rename to src/pager.h
diff --git a/parse_constants.h b/src/parse_constants.h
similarity index 100%
rename from parse_constants.h
rename to src/parse_constants.h
diff --git a/parse_execution.cpp b/src/parse_execution.cpp
similarity index 100%
rename from parse_execution.cpp
rename to src/parse_execution.cpp
diff --git a/parse_execution.h b/src/parse_execution.h
similarity index 100%
rename from parse_execution.h
rename to src/parse_execution.h
diff --git a/parse_productions.cpp b/src/parse_productions.cpp
similarity index 100%
rename from parse_productions.cpp
rename to src/parse_productions.cpp
diff --git a/parse_productions.h b/src/parse_productions.h
similarity index 100%
rename from parse_productions.h
rename to src/parse_productions.h
diff --git a/parse_tree.cpp b/src/parse_tree.cpp
similarity index 100%
rename from parse_tree.cpp
rename to src/parse_tree.cpp
diff --git a/parse_tree.h b/src/parse_tree.h
similarity index 100%
rename from parse_tree.h
rename to src/parse_tree.h
diff --git a/parse_util.cpp b/src/parse_util.cpp
similarity index 100%
rename from parse_util.cpp
rename to src/parse_util.cpp
diff --git a/parse_util.h b/src/parse_util.h
similarity index 100%
rename from parse_util.h
rename to src/parse_util.h
diff --git a/parser.cpp b/src/parser.cpp
similarity index 100%
rename from parser.cpp
rename to src/parser.cpp
diff --git a/parser.h b/src/parser.h
similarity index 100%
rename from parser.h
rename to src/parser.h
diff --git a/parser_keywords.cpp b/src/parser_keywords.cpp
similarity index 100%
rename from parser_keywords.cpp
rename to src/parser_keywords.cpp
diff --git a/parser_keywords.h b/src/parser_keywords.h
similarity index 100%
rename from parser_keywords.h
rename to src/parser_keywords.h
diff --git a/path.cpp b/src/path.cpp
similarity index 100%
rename from path.cpp
rename to src/path.cpp
diff --git a/path.h b/src/path.h
similarity index 100%
rename from path.h
rename to src/path.h
diff --git a/postfork.cpp b/src/postfork.cpp
similarity index 100%
rename from postfork.cpp
rename to src/postfork.cpp
diff --git a/postfork.h b/src/postfork.h
similarity index 100%
rename from postfork.h
rename to src/postfork.h
diff --git a/print_help.cpp b/src/print_help.cpp
similarity index 100%
rename from print_help.cpp
rename to src/print_help.cpp
diff --git a/print_help.h b/src/print_help.h
similarity index 100%
rename from print_help.h
rename to src/print_help.h
diff --git a/proc.cpp b/src/proc.cpp
similarity index 100%
rename from proc.cpp
rename to src/proc.cpp
diff --git a/proc.h b/src/proc.h
similarity index 100%
rename from proc.h
rename to src/proc.h
diff --git a/reader.cpp b/src/reader.cpp
similarity index 100%
rename from reader.cpp
rename to src/reader.cpp
diff --git a/reader.h b/src/reader.h
similarity index 100%
rename from reader.h
rename to src/reader.h
diff --git a/sanity.cpp b/src/sanity.cpp
similarity index 100%
rename from sanity.cpp
rename to src/sanity.cpp
diff --git a/sanity.h b/src/sanity.h
similarity index 100%
rename from sanity.h
rename to src/sanity.h
diff --git a/screen.cpp b/src/screen.cpp
similarity index 100%
rename from screen.cpp
rename to src/screen.cpp
diff --git a/screen.h b/src/screen.h
similarity index 100%
rename from screen.h
rename to src/screen.h
diff --git a/signal.cpp b/src/signal.cpp
similarity index 100%
rename from signal.cpp
rename to src/signal.cpp
diff --git a/signal.h b/src/signal.h
similarity index 100%
rename from signal.h
rename to src/signal.h
diff --git a/tokenizer.cpp b/src/tokenizer.cpp
similarity index 100%
rename from tokenizer.cpp
rename to src/tokenizer.cpp
diff --git a/tokenizer.h b/src/tokenizer.h
similarity index 100%
rename from tokenizer.h
rename to src/tokenizer.h
diff --git a/utf8.cpp b/src/utf8.cpp
similarity index 100%
rename from utf8.cpp
rename to src/utf8.cpp
diff --git a/utf8.h b/src/utf8.h
similarity index 100%
rename from utf8.h
rename to src/utf8.h
diff --git a/util.cpp b/src/util.cpp
similarity index 100%
rename from util.cpp
rename to src/util.cpp
diff --git a/util.h b/src/util.h
similarity index 100%
rename from util.h
rename to src/util.h
diff --git a/wcstringutil.cpp b/src/wcstringutil.cpp
similarity index 100%
rename from wcstringutil.cpp
rename to src/wcstringutil.cpp
diff --git a/wcstringutil.h b/src/wcstringutil.h
similarity index 100%
rename from wcstringutil.h
rename to src/wcstringutil.h
diff --git a/wgetopt.cpp b/src/wgetopt.cpp
similarity index 100%
rename from wgetopt.cpp
rename to src/wgetopt.cpp
diff --git a/wgetopt.h b/src/wgetopt.h
similarity index 100%
rename from wgetopt.h
rename to src/wgetopt.h
diff --git a/wildcard.cpp b/src/wildcard.cpp
similarity index 100%
rename from wildcard.cpp
rename to src/wildcard.cpp
diff --git a/wildcard.h b/src/wildcard.h
similarity index 100%
rename from wildcard.h
rename to src/wildcard.h
diff --git a/wutil.cpp b/src/wutil.cpp
similarity index 100%
rename from wutil.cpp
rename to src/wutil.cpp
diff --git a/wutil.h b/src/wutil.h
similarity index 100%
rename from wutil.h
rename to src/wutil.h
diff --git a/xdgmime.cpp b/src/xdgmime.cpp
similarity index 100%
rename from xdgmime.cpp
rename to src/xdgmime.cpp
diff --git a/xdgmime.h b/src/xdgmime.h
similarity index 100%
rename from xdgmime.h
rename to src/xdgmime.h
diff --git a/xdgmimealias.cpp b/src/xdgmimealias.cpp
similarity index 100%
rename from xdgmimealias.cpp
rename to src/xdgmimealias.cpp
diff --git a/xdgmimealias.h b/src/xdgmimealias.h
similarity index 100%
rename from xdgmimealias.h
rename to src/xdgmimealias.h
diff --git a/xdgmimeglob.cpp b/src/xdgmimeglob.cpp
similarity index 100%
rename from xdgmimeglob.cpp
rename to src/xdgmimeglob.cpp
diff --git a/xdgmimeglob.h b/src/xdgmimeglob.h
similarity index 100%
rename from xdgmimeglob.h
rename to src/xdgmimeglob.h
diff --git a/xdgmimeint.cpp b/src/xdgmimeint.cpp
similarity index 100%
rename from xdgmimeint.cpp
rename to src/xdgmimeint.cpp
diff --git a/xdgmimeint.h b/src/xdgmimeint.h
similarity index 100%
rename from xdgmimeint.h
rename to src/xdgmimeint.h
diff --git a/xdgmimemagic.cpp b/src/xdgmimemagic.cpp
similarity index 100%
rename from xdgmimemagic.cpp
rename to src/xdgmimemagic.cpp
diff --git a/xdgmimemagic.h b/src/xdgmimemagic.h
similarity index 100%
rename from xdgmimemagic.h
rename to src/xdgmimemagic.h
diff --git a/xdgmimeparent.cpp b/src/xdgmimeparent.cpp
similarity index 100%
rename from xdgmimeparent.cpp
rename to src/xdgmimeparent.cpp
diff --git a/xdgmimeparent.h b/src/xdgmimeparent.h
similarity index 100%
rename from xdgmimeparent.h
rename to src/xdgmimeparent.h