diff --git a/Makefile b/Makefile
index 770bbc3908..b5713fed55 100644
--- a/Makefile
+++ b/Makefile
@@ -331,8 +331,8 @@ cs-after-racket-with-racket-and-scheme-src:
 	$(MAKE) cs-after-racket-with-abs-paths RACKET="$(ABS_RACKET)" SCHEME_SRC="$(ABS_SCHEME_SRC)" SELF_UP=../
 
 cs-after-racket-with-abs-paths:
-	$(MAKE) racket/src/build/cs/Makefile
-	cd racket/src/build/cs; $(MAKE) RACKET="$(RACKET)" SCHEME_SRC="$(SCHEME_SRC)" MAKE_BUILD_SCHEME="$(MAKE_BUILD_SCHEME)"
+	$(MAKE) racket/src/build/cs/c/Makefile
+	cd racket/src/build/cs/c; $(MAKE) RACKET="$(RACKET)" SCHEME_SRC="$(SCHEME_SRC)" MAKE_BUILD_SCHEME="$(MAKE_BUILD_SCHEME)"
 	$(MAKE) base-config
 	cd racket/src/build; $(MAKE) install-cs RACKET="$(RACKET)" CS_INSTALLED=$(RACKETCS_SUFFIX) $(INSTALL_SETUP_ARGS)
 	$(MAKE) $(CS_SETUP_TARGET) PLAIN_RACKET=racket/bin/racket$(RACKETCS_SUFFIX)
@@ -340,9 +340,9 @@ cs-after-racket-with-abs-paths:
 nothing-after-base:
 	echo base done
 
-racket/src/build/cs/Makefile: racket/src/cs/c/configure racket/src/cs/c/Makefile.in racket/src/cfg-cs
-	mkdir -p cd racket/src/build/cs
-	cd racket/src/build/cs; ../../cs/c/configure $(CONFIGURE_ARGS_qq) $(MORE_CONFIGURE_ARGS)
+racket/src/build/cs/c/Makefile: racket/src/cs/c/configure racket/src/cs/c/Makefile.in racket/src/cfg-cs
+	mkdir -p cd racket/src/build/cs/c
+	cd racket/src/build/cs/c; ../../../cs/c/configure $(CONFIGURE_ARGS_qq) $(MORE_CONFIGURE_ARGS)
 	$(MAKE) $(CS_CONFIG_TARGET)
 
 run-cfg-cs:
diff --git a/racket/src/Makefile.in b/racket/src/Makefile.in
index a4a50bf6d2..b82d35de01 100644
--- a/racket/src/Makefile.in
+++ b/racket/src/Makefile.in
@@ -84,7 +84,7 @@ both:
 
 racketcs:
 	$(MAKE) @CS_BOOTSTRAP_HELP@
-	cd cs; $(MAKE)
+	cd cs/c; $(MAKE)
 
 .PHONY: cs
 cs:
@@ -253,9 +253,9 @@ CS_SETUP_INSTALL_TARGET = setup-install
 
 install-cs-common:
 	$(MAKE) install-common-first
-	cd cs; $(MAKE) plain-install
+	cd cs/c; $(MAKE) plain-install
 	$(MAKE) install-common-middle
-	cd cs; $(MAKE) $(CS_SETUP_INSTALL_TARGET)
+	cd cs/c; $(MAKE) $(CS_SETUP_INSTALL_TARGET)
 	$(MAKE) install-common-last
 
 install-racketcs:
diff --git a/racket/src/cfg-cs b/racket/src/cfg-cs
index 99a77ea1dd..214415ba62 100755
--- a/racket/src/cfg-cs
+++ b/racket/src/cfg-cs
@@ -2186,7 +2186,7 @@ MAKE_GRACKET=no
 LIBFINISH=echo
 
 ICP=cp
-RUN_RACKET_CGC="cs/racketcs"
+RUN_RACKET_CGC="cs/c/racketcs"
 
 
 
diff --git a/racket/src/configure b/racket/src/configure
index e6f13ffeda..f0578dffbb 100755
--- a/racket/src/configure
+++ b/racket/src/configure
@@ -67,13 +67,13 @@ if test "$use_cs" = "yes" ; then
   # configuration, so we run it first and let "cfg-cs" or
   # "cfg-racket" report that information.
 
-  mkdir -p cs
+  mkdir -p cs/c
   case "$dir" in
     /*)
-     cd cs && "$dir/cs/c/configure" ${1+"$@"} && cd ..
+     cd cs/c && "$dir/cs/c/configure" ${1+"$@"} && cd ../..
      ;;
     *)
-     cd cs && "../$dir/cs/c/configure" ${1+"$@"} && cd ..
+     cd cs/c && "../../$dir/cs/c/configure" ${1+"$@"} && cd ../..
      ;;
   esac
 fi
diff --git a/racket/src/cs/c/Makefile.in b/racket/src/cs/c/Makefile.in
index 2769590d87..12c572ddde 100644
--- a/racket/src/cs/c/Makefile.in
+++ b/racket/src/cs/c/Makefile.in
@@ -19,7 +19,7 @@ LIBS = @LIBS@
 STRIP_DEBUG = @STRIP_DEBUG@
 STRIP_LIB_DEBUG = @STRIP_LIB_DEBUG@
 
-DEFAULT_RACKET = ../racket/racket3m
+DEFAULT_RACKET = ../../racket/racket3m
 RACKET = @RACKET@
 
 CS_INSTALLED = @CS_INSTALLED@
diff --git a/racket/src/cs/c/configure b/racket/src/cs/c/configure
index 99dd4426c7..795853c963 100755
--- a/racket/src/cs/c/configure
+++ b/racket/src/cs/c/configure
@@ -3861,7 +3861,7 @@ case "$MACH_HOST_CPU" in
     ;;
 esac
 
-SCHEME_SRC=../ChezScheme
+SCHEME_SRC=../../ChezScheme
 MAKE_BUILD_SCHEME=y
 
 if test "${enable_scheme}" != "" ; then
diff --git a/racket/src/cs/c/configure-parent.ac b/racket/src/cs/c/configure-parent.ac
index bfbed03c75..c156de55ab 100644
--- a/racket/src/cs/c/configure-parent.ac
+++ b/racket/src/cs/c/configure-parent.ac
@@ -27,7 +27,7 @@ MAKE_GRACKET=no
 LIBFINISH=echo
 
 ICP=cp
-RUN_RACKET_CGC="cs/racketcs"
+RUN_RACKET_CGC="cs/c/racketcs"
 
 AC_SUBST(ICP)
 AC_SUBST(RUN_RACKET_CGC)
diff --git a/racket/src/cs/c/configure.ac b/racket/src/cs/c/configure.ac
index cdcf60d657..45bdbc4a0c 100644
--- a/racket/src/cs/c/configure.ac
+++ b/racket/src/cs/c/configure.ac
@@ -263,7 +263,7 @@ case "$MACH_HOST_CPU" in
     ;;
 esac
 
-SCHEME_SRC=../ChezScheme
+SCHEME_SRC=../../ChezScheme
 MAKE_BUILD_SCHEME=y
 
 if test "${enable_scheme}" != "" ; then