Index: Makefile.am
===================================================================
--- Makefile.am	(revision 843054c23fcb725d2486e5e42e91b3741bc523b8)
+++ Makefile.am	(revision 76f2e97f2ab49a5bae32f69e960a096822171771)
@@ -1,3 +1,3 @@
-SUBDIRS = translator driver libcfa
+SUBDIRS = driver libcfa src
 
 # non-source files
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 843054c23fcb725d2486e5e42e91b3741bc523b8)
+++ Makefile.in	(revision 76f2e97f2ab49a5bae32f69e960a096822171771)
@@ -36,8 +36,7 @@
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure $(top_srcdir)/driver/Makefile.in \
-	$(top_srcdir)/libcfa/Makefile.in \
-	$(top_srcdir)/translator/Makefile.in \
-	$(top_srcdir)/translator/examples/Makefile.in AUTHORS INSTALL \
-	TODO install-sh missing mkinstalldirs
+	$(top_srcdir)/libcfa/Makefile.in $(top_srcdir)/src/Makefile.in \
+	$(top_srcdir)/src/examples/Makefile.in AUTHORS INSTALL TODO \
+	install-sh missing mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -48,6 +47,6 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = translator/Makefile driver/Makefile \
-	libcfa/Makefile translator/examples/Makefile
+CONFIG_CLEAN_FILES = src/Makefile driver/Makefile libcfa/Makefile \
+	src/examples/Makefile
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
@@ -211,5 +210,5 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = translator driver libcfa
+SUBDIRS = driver libcfa src
 
 # non-source files
@@ -268,5 +267,5 @@
 distclean-hdr:
 	-rm -f config.h stamp-h1
-translator/Makefile: $(top_builddir)/config.status $(top_srcdir)/translator/Makefile.in
+src/Makefile: $(top_builddir)/config.status $(top_srcdir)/src/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 driver/Makefile: $(top_builddir)/config.status $(top_srcdir)/driver/Makefile.in
@@ -274,5 +273,5 @@
 libcfa/Makefile: $(top_builddir)/config.status $(top_srcdir)/libcfa/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-translator/examples/Makefile: $(top_builddir)/config.status $(top_srcdir)/translator/examples/Makefile.in
+src/examples/Makefile: $(top_builddir)/config.status $(top_srcdir)/src/examples/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 
Index: configure
===================================================================
--- configure	(revision 843054c23fcb725d2486e5e42e91b3741bc523b8)
+++ configure	(revision 76f2e97f2ab49a5bae32f69e960a096822171771)
@@ -566,5 +566,5 @@
 PACKAGE_URL=''
 
-ac_unique_file="translator/main.cc"
+ac_unique_file="src/main.cc"
 # Factoring default headers for most tests.
 ac_includes_default="\
@@ -5000,5 +5000,5 @@
 
 
-ac_config_files="$ac_config_files Makefile translator/Makefile driver/Makefile libcfa/Makefile translator/examples/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile driver/Makefile libcfa/Makefile src/examples/Makefile"
 
 cat >confcache <<\_ACEOF
@@ -5738,8 +5738,8 @@
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "translator/Makefile") CONFIG_FILES="$CONFIG_FILES translator/Makefile" ;;
+    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "driver/Makefile") CONFIG_FILES="$CONFIG_FILES driver/Makefile" ;;
     "libcfa/Makefile") CONFIG_FILES="$CONFIG_FILES libcfa/Makefile" ;;
-    "translator/examples/Makefile") CONFIG_FILES="$CONFIG_FILES translator/examples/Makefile" ;;
+    "src/examples/Makefile") CONFIG_FILES="$CONFIG_FILES src/examples/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
Index: configure.in
===================================================================
--- configure.in	(revision 843054c23fcb725d2486e5e42e91b3741bc523b8)
+++ configure.in	(revision 76f2e97f2ab49a5bae32f69e960a096822171771)
@@ -1,4 +1,4 @@
 AC_INIT(cfa-cc, 1.0, cforall@plg.uwaterloo.ca)
-AC_CONFIG_SRCDIR([translator/main.cc])
+AC_CONFIG_SRCDIR([src/main.cc])
 
 AM_INIT_AUTOMAKE([foreign])		# do not follow GNU standard
@@ -101,5 +101,5 @@
 AC_SUBST(CFA_LIBDIR)
 
-AC_OUTPUT([ Makefile translator/Makefile driver/Makefile libcfa/Makefile translator/examples/Makefile ])
+AC_OUTPUT([ Makefile src/Makefile driver/Makefile libcfa/Makefile src/examples/Makefile ])
 
 dnl Final text
Index: libcfa/Makefile.in
===================================================================
--- libcfa/Makefile.in	(revision 843054c23fcb725d2486e5e42e91b3741bc523b8)
+++ libcfa/Makefile.in	(revision 76f2e97f2ab49a5bae32f69e960a096822171771)
@@ -11,10 +11,11 @@
 ## Created On       : Sat May 16 08:05:18 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Sat May 16 08:06:05 2015
-## Update Count     : 1
+## Last Modified On : Thu May 21 22:00:51 2015
+## Update Count     : 3
 ###############################################################################
 
 INSTALL=@INSTALL@
 BACKEND_CC := @BACKEND_CC@
+CFA_LIBDIR = @CFA_LIBDIR@
 
 LIBRARIES := libcfa.a builtins.cf builtins.c
@@ -35,7 +36,7 @@
 	${INSTALL} builtins.cf @CFA_LIBDIR@
 
-libcfa-prelude.c: ../translator/cfa-cpp prelude.cf builtins.cf
+libcfa-prelude.c: @CFA_LIBDIR@/cfa-cpp prelude.cf builtins.cf
 	sed -i -e "s#typedef.*ptrdiff_t.*#`@BACKEND_CC@ -E ptrdiff_t.c | grep 'typedef.*ptrdiff_t'`#" prelude.cf
-	../translator/cfa-cpp -l prelude.cf $@
+	@CFA_LIBDIR@/cfa-cpp -l prelude.cf $@
 	rm -f prelude.c