--- a/libgui/src/module.mk
+++ b/libgui/src/module.mk
@@ -177,8 +177,7 @@
   -I$(top_srcdir)/liboctave/util \
   -I$(top_builddir)/libinterp -I$(top_srcdir)/libinterp \
   -I$(top_builddir)/libinterp/parse-tree -I$(top_srcdir)/libinterp/parse-tree \
-  -I$(top_builddir)/libinterp/interp-core -I$(top_srcdir)/libinterp/interp-core \
-  -I$(top_builddir)/libinterp/interpfcn -I$(top_srcdir)/libinterp/interpfcn \
+  -I$(top_builddir)/libinterp/corefcn -I$(top_srcdir)/libinterp/corefcn \
   -I$(top_srcdir)/libinterp/octave-value
 
 src_libgui_src_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS)

--- a/libinterp/Makefile.am
+++ b/libinterp/Makefile.am
@@ -33,9 +33,7 @@
   -I$(srcdir)/octave-value \
   -I$(srcdir)/operators \
   -Iparse-tree -I$(srcdir)/parse-tree \
-  -Iinterp-core -I$(srcdir)/interp-core \
-  -Iinterpfcn -I$(srcdir)/interpfcn \
-  -Icorefcn \
+  -Icorefcn -I$(srcdir)/corefcn \
   -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu
 
 AM_CFLAGS += $(WARN_CFLAGS)
@@ -48,11 +46,11 @@
 ## $(DEF_FILES), and building those requires all the sources
 ## (except builtins.cc) to be available.
 BUILT_SOURCES = \
-  interp-core/mxarray.h \
-  interp-core/oct-errno.cc \
-  interpfcn/defaults.h \
-  interpfcn/graphics-props.cc \
-  interpfcn/graphics.h \
+  corefcn/mxarray.h \
+  corefcn/oct-errno.cc \
+  corefcn/defaults.h \
+  corefcn/graphics-props.cc \
+  corefcn/graphics.h \
   operators/ops.cc \
   parse-tree/lex.cc \
   parse-tree/oct-gperf.h \
@@ -71,10 +69,10 @@
 ## Files that are created during build process and installed,
 ## BUT not distributed in tarball.
 BUILT_NODISTFILES = \
-  interp-core/mxarray.h \
-  interp-core/oct-errno.cc \
-  interpfcn/defaults.h \
-  interpfcn/graphics.h \
+  corefcn/mxarray.h \
+  corefcn/oct-errno.cc \
+  corefcn/defaults.h \
+  corefcn/graphics.h \
   builtin-defun-decls.h \
   operators/ops.cc \
   oct-conf.h \
@@ -103,7 +101,7 @@
   $(BUILT_DISTFILES)
 
 octinclude_HEADERS = \
-  interpfcn/graphics-props.cc \
+  corefcn/graphics-props.cc \
   parse-tree/oct-gperf.h \
   builtins.h \
   builtin-defun-decls.h \
@@ -112,13 +110,12 @@
   $(PARSE_TREE_INC) \
   $(PARSER_INC) \
   $(OPERATORS_INC) \
-  $(INTERP_CORE_INC) \
-  $(INTERPFCN_INC)
+  $(COREFCN_INC)
 
 nodist_octinclude_HEADERS = \
-  interp-core/mxarray.h \
-  interpfcn/defaults.h \
-  interpfcn/graphics.h \
+  corefcn/mxarray.h \
+  corefcn/defaults.h \
+  corefcn/graphics.h \
   oct-conf.h \
   version.h
 
@@ -127,8 +124,6 @@
   $(OCTAVE_VALUE_SRC) \
   $(PARSE_TREE_SRC) \
   $(PARSER_SRC) \
-  $(INTERP_CORE_SRC) \
-  $(INTERPFCN_SRC) \
   $(COREFCN_SRC)
 
 noinst_LTLIBRARIES =
@@ -137,8 +132,6 @@
 include octave-value/module.mk
 include operators/module.mk
 include template-inst/module.mk
-include interp-core/module.mk
-include interpfcn/module.mk
 include corefcn/module.mk
 include dldfcn/module.mk
 
@@ -161,10 +154,10 @@
   $(TEMPLATE_INST_SRC)
 
 nodist_liboctinterp_la_SOURCES = \
-  interp-core/mxarray.h \
-  interp-core/oct-errno.cc \
-  interpfcn/defaults.h \
-  interpfcn/graphics.h \
+  corefcn/mxarray.h \
+  corefcn/oct-errno.cc \
+  corefcn/defaults.h \
+  corefcn/graphics.h \
   operators/ops.cc \
   builtin-defun-decls.h \
   builtins.cc \
@@ -181,8 +174,6 @@
   octave-value/liboctave-value.la \
   parse-tree/libparse-tree.la \
   parse-tree/libparser.la \
-  interp-core/libinterp-core.la \
-  interpfcn/libinterpfcn.la \
   corefcn/libcorefcn.la \
   $(top_builddir)/liboctave/liboctave.la \
   $(LIBOCTINTERP_LINK_DEPS)
@@ -365,7 +356,7 @@
 
 CLEANFILES = \
   $(DLDFCN_PKG_ADD_FILE) \
-  interpfcn/graphics-props.cc \
+  corefcn/graphics-props.cc \
   parse-tree/oct-parse.output
 
 DISTCLEANFILES = \

rename from libinterp/interp-core/Cell.cc
rename to libinterp/corefcn/Cell.cc

rename from libinterp/interp-core/Cell.h
rename to libinterp/corefcn/Cell.h

rename from libinterp/interp-core/action-container.h
rename to libinterp/corefcn/action-container.h

rename from libinterp/interp-core/c-file-ptr-stream.cc
rename to libinterp/corefcn/c-file-ptr-stream.cc

rename from libinterp/interp-core/c-file-ptr-stream.h
rename to libinterp/corefcn/c-file-ptr-stream.h

rename from libinterp/interp-core/comment-list.cc
rename to libinterp/corefcn/comment-list.cc

rename from libinterp/interp-core/comment-list.h
rename to libinterp/corefcn/comment-list.h

rename from libinterp/interp-core/cutils.c
rename to libinterp/corefcn/cutils.c

rename from libinterp/interp-core/cutils.h
rename to libinterp/corefcn/cutils.h

rename from libinterp/interpfcn/data.cc
rename to libinterp/corefcn/data.cc

rename from libinterp/interpfcn/data.h
rename to libinterp/corefcn/data.h

rename from libinterp/interpfcn/debug.cc
rename to libinterp/corefcn/debug.cc

rename from libinterp/interpfcn/debug.h
rename to libinterp/corefcn/debug.h

rename from libinterp/interpfcn/defaults.cc
rename to libinterp/corefcn/defaults.cc

rename from libinterp/interpfcn/defaults.in.h
rename to libinterp/corefcn/defaults.in.h

rename from libinterp/interp-core/defun-dld.h
rename to libinterp/corefcn/defun-dld.h

rename from libinterp/interp-core/defun-int.h
rename to libinterp/corefcn/defun-int.h

rename from libinterp/interpfcn/defun.cc
rename to libinterp/corefcn/defun.cc

rename from libinterp/interpfcn/defun.h
rename to libinterp/corefcn/defun.h

rename from libinterp/interpfcn/dirfns.cc
rename to libinterp/corefcn/dirfns.cc

rename from libinterp/interpfcn/dirfns.h
rename to libinterp/corefcn/dirfns.h

rename from libinterp/interp-core/display.cc
rename to libinterp/corefcn/display.cc

rename from libinterp/interp-core/display.h
rename to libinterp/corefcn/display.h

rename from libinterp/interp-core/dynamic-ld.cc
rename to libinterp/corefcn/dynamic-ld.cc

rename from libinterp/interp-core/dynamic-ld.h
rename to libinterp/corefcn/dynamic-ld.h

rename from libinterp/interpfcn/error.cc
rename to libinterp/corefcn/error.cc

rename from libinterp/interpfcn/error.h
rename to libinterp/corefcn/error.h

rename from libinterp/interp-core/event-queue.h
rename to libinterp/corefcn/event-queue.h

rename from libinterp/interpfcn/file-io.cc
rename to libinterp/corefcn/file-io.cc

rename from libinterp/interpfcn/file-io.h
rename to libinterp/corefcn/file-io.h

rename from libinterp/interp-core/gl-render.cc
rename to libinterp/corefcn/gl-render.cc

rename from libinterp/interp-core/gl-render.h
rename to libinterp/corefcn/gl-render.h

rename from libinterp/interp-core/gl2ps-renderer.cc
rename to libinterp/corefcn/gl2ps-renderer.cc

rename from libinterp/interp-core/gl2ps-renderer.h
rename to libinterp/corefcn/gl2ps-renderer.h

rename from libinterp/interp-core/gl2ps.c
rename to libinterp/corefcn/gl2ps.c

rename from libinterp/interp-core/gl2ps.h
rename to libinterp/corefcn/gl2ps.h

rename from libinterp/interpfcn/graphics.cc
rename to libinterp/corefcn/graphics.cc

rename from libinterp/interpfcn/graphics.in.h
rename to libinterp/corefcn/graphics.in.h

rename from libinterp/interp-core/gripes.cc
rename to libinterp/corefcn/gripes.cc

rename from libinterp/interp-core/gripes.h
rename to libinterp/corefcn/gripes.h

rename from libinterp/interpfcn/help.cc
rename to libinterp/corefcn/help.cc

rename from libinterp/interpfcn/help.h
rename to libinterp/corefcn/help.h

rename from libinterp/interpfcn/hook-fcn.cc
rename to libinterp/corefcn/hook-fcn.cc

rename from libinterp/interpfcn/hook-fcn.h
rename to libinterp/corefcn/hook-fcn.h

rename from libinterp/interpfcn/input.cc
rename to libinterp/corefcn/input.cc

rename from libinterp/interpfcn/input.h
rename to libinterp/corefcn/input.h

rename from libinterp/interp-core/jit-ir.cc
rename to libinterp/corefcn/jit-ir.cc

rename from libinterp/interp-core/jit-ir.h
rename to libinterp/corefcn/jit-ir.h

rename from libinterp/interp-core/jit-typeinfo.cc
rename to libinterp/corefcn/jit-typeinfo.cc

rename from libinterp/interp-core/jit-typeinfo.h
rename to libinterp/corefcn/jit-typeinfo.h

rename from libinterp/interp-core/jit-util.cc
rename to libinterp/corefcn/jit-util.cc

rename from libinterp/interp-core/jit-util.h
rename to libinterp/corefcn/jit-util.h

rename from libinterp/interpfcn/load-path.cc
rename to libinterp/corefcn/load-path.cc

rename from libinterp/interpfcn/load-path.h
rename to libinterp/corefcn/load-path.h

rename from libinterp/interpfcn/load-save.cc
rename to libinterp/corefcn/load-save.cc

rename from libinterp/interpfcn/load-save.h
rename to libinterp/corefcn/load-save.h

rename from libinterp/interp-core/ls-ascii-helper.cc
rename to libinterp/corefcn/ls-ascii-helper.cc

rename from libinterp/interp-core/ls-ascii-helper.h
rename to libinterp/corefcn/ls-ascii-helper.h

rename from libinterp/interp-core/ls-hdf5.cc
rename to libinterp/corefcn/ls-hdf5.cc

rename from libinterp/interp-core/ls-hdf5.h
rename to libinterp/corefcn/ls-hdf5.h

rename from libinterp/interp-core/ls-mat-ascii.cc
rename to libinterp/corefcn/ls-mat-ascii.cc

rename from libinterp/interp-core/ls-mat-ascii.h
rename to libinterp/corefcn/ls-mat-ascii.h

rename from libinterp/interp-core/ls-mat4.cc
rename to libinterp/corefcn/ls-mat4.cc

rename from libinterp/interp-core/ls-mat4.h
rename to libinterp/corefcn/ls-mat4.h

rename from libinterp/interp-core/ls-mat5.cc
rename to libinterp/corefcn/ls-mat5.cc

rename from libinterp/interp-core/ls-mat5.h
rename to libinterp/corefcn/ls-mat5.h

rename from libinterp/interpfcn/ls-oct-ascii.cc
rename to libinterp/corefcn/ls-oct-ascii.cc

rename from libinterp/interpfcn/ls-oct-ascii.h
rename to libinterp/corefcn/ls-oct-ascii.h

rename from libinterp/interp-core/ls-oct-binary.cc
rename to libinterp/corefcn/ls-oct-binary.cc

rename from libinterp/interp-core/ls-oct-binary.h
rename to libinterp/corefcn/ls-oct-binary.h

rename from libinterp/interp-core/ls-utils.cc
rename to libinterp/corefcn/ls-utils.cc

rename from libinterp/interp-core/ls-utils.h
rename to libinterp/corefcn/ls-utils.h

rename from libinterp/interp-core/matherr.c
rename to libinterp/corefcn/matherr.c

rename from libinterp/interp-core/mex.cc
rename to libinterp/corefcn/mex.cc

rename from libinterp/interp-core/mex.h
rename to libinterp/corefcn/mex.h

rename from libinterp/interp-core/mexproto.h
rename to libinterp/corefcn/mexproto.h

--- a/libinterp/corefcn/module.mk
+++ b/libinterp/corefcn/module.mk
@@ -1,5 +1,10 @@
 EXTRA_DIST += \
-  corefcn/module.mk
+  corefcn/module.mk \
+  corefcn/defaults.in.h \
+  corefcn/gl2ps.c \
+  corefcn/graphics.in.h \
+  corefcn/mxarray.in.h \
+  corefcn/oct-errno.in.cc
 
 ## Options functions for Fortran packages like LSODE, DASPK.
 ## These are generated automagically by configure and Perl.
@@ -24,7 +29,101 @@
 $(OPT_INC) : %.h : %.in
 	$(MAKE) -C $(top_builddir)/liboctave/numeric $(@F)
 
+JIT_INC = \
+  corefcn/jit-util.h \
+  corefcn/jit-typeinfo.h \
+  corefcn/jit-ir.h \
+  corefcn/pt-jit.h
+
+COREFCN_INC = \
+  corefcn/Cell.h \
+  corefcn/action-container.h \
+  corefcn/c-file-ptr-stream.h \
+  corefcn/comment-list.h \
+  corefcn/cutils.h \
+  corefcn/data.h \
+  corefcn/debug.h \
+  corefcn/defun-dld.h \
+  corefcn/defun-int.h \
+  corefcn/defun.h \
+  corefcn/dirfns.h \
+  corefcn/display.h \
+  corefcn/dynamic-ld.h \
+  corefcn/error.h \
+  corefcn/event-queue.h \
+  corefcn/file-io.h \
+  corefcn/gl-render.h \
+  corefcn/gl2ps-renderer.h \
+  corefcn/gl2ps.h \
+  corefcn/gripes.h \
+  corefcn/help.h \
+  corefcn/hook-fcn.h \
+  corefcn/input.h \
+  corefcn/load-path.h \
+  corefcn/load-save.h \
+  corefcn/ls-ascii-helper.h \
+  corefcn/ls-hdf5.h \
+  corefcn/ls-mat-ascii.h \
+  corefcn/ls-mat4.h \
+  corefcn/ls-mat5.h \
+  corefcn/ls-oct-ascii.h \
+  corefcn/ls-oct-binary.h \
+  corefcn/ls-utils.h \
+  corefcn/mex.h \
+  corefcn/mexproto.h \
+  corefcn/mxarray.in.h \
+  corefcn/oct-errno.h \
+  corefcn/oct-fstrm.h \
+  corefcn/oct-hdf5.h \
+  corefcn/oct-hist.h \
+  corefcn/oct-iostrm.h \
+  corefcn/oct-lvalue.h \
+  corefcn/oct-map.h \
+  corefcn/oct-obj.h \
+  corefcn/oct-prcstrm.h \
+  corefcn/oct-procbuf.h \
+  corefcn/oct-stdstrm.h \
+  corefcn/oct-stream.h \
+  corefcn/oct-strstrm.h \
+  corefcn/oct.h \
+  corefcn/octave-link.h \
+  corefcn/pager.h \
+  corefcn/pr-output.h \
+  corefcn/procstream.h \
+  corefcn/profiler.h \
+  corefcn/sighandlers.h \
+  corefcn/siglist.h \
+  corefcn/sparse-xdiv.h \
+  corefcn/sparse-xpow.h \
+  corefcn/symtab.h \
+  corefcn/sysdep.h \
+  corefcn/toplev.h \
+  corefcn/txt-eng-ft.h \
+  corefcn/txt-eng.h \
+  corefcn/unwind-prot.h \
+  corefcn/utils.h \
+  corefcn/variables.h \
+  corefcn/workspace-element.h \
+  corefcn/xdiv.h \
+  corefcn/xnorm.h \
+  corefcn/xpow.h \
+  corefcn/zfstream.h \
+  $(JIT_INC)
+
+JIT_SRC = \
+  corefcn/jit-util.cc \
+  corefcn/jit-typeinfo.cc \
+  corefcn/jit-ir.cc \
+  corefcn/pt-jit.cc
+
+C_COREFCN_SRC = \
+  corefcn/cutils.c \
+  corefcn/matherr.c \
+  corefcn/siglist.c \
+  corefcn/xgl2ps.c
+
 COREFCN_SRC = \
+  corefcn/Cell.cc \
   corefcn/__contourc__.cc \
   corefcn/__dispatch__.cc \
   corefcn/__lin_interpn__.cc \
@@ -35,20 +134,31 @@
   corefcn/betainc.cc \
   corefcn/bitfcns.cc \
   corefcn/bsxfun.cc \
+  corefcn/c-file-ptr-stream.cc \
   corefcn/cellfun.cc \
   corefcn/colloc.cc \
+  corefcn/comment-list.cc \
   corefcn/conv2.cc \
   corefcn/daspk.cc \
   corefcn/dasrt.cc \
   corefcn/dassl.cc \
+  corefcn/data.cc \
+  corefcn/debug.cc \
+  corefcn/defaults.cc \
+  corefcn/defun.cc \
   corefcn/det.cc \
+  corefcn/dirfns.cc \
+  corefcn/display.cc \
   corefcn/dlmread.cc \
   corefcn/dot.cc \
+  corefcn/dynamic-ld.cc \
   corefcn/eig.cc \
   corefcn/ellipj.cc \
+  corefcn/error.cc \
   corefcn/fft.cc \
   corefcn/fft2.cc \
   corefcn/fftn.cc \
+  corefcn/file-io.cc \
   corefcn/filter.cc \
   corefcn/find.cc \
   corefcn/gammainc.cc \
@@ -57,11 +167,28 @@
   corefcn/getpwent.cc \
   corefcn/getrusage.cc \
   corefcn/givens.cc \
+  corefcn/gl-render.cc \
+  corefcn/gl2ps-renderer.cc \
+  corefcn/graphics.cc \
+  corefcn/gripes.cc \
+  corefcn/help.cc \
   corefcn/hess.cc \
   corefcn/hex2num.cc \
+  corefcn/hook-fcn.cc \
+  corefcn/input.cc \
   corefcn/inv.cc \
   corefcn/kron.cc \
+  corefcn/load-path.cc \
+  corefcn/load-save.cc \
   corefcn/lookup.cc \
+  corefcn/ls-ascii-helper.cc \
+  corefcn/ls-hdf5.cc \
+  corefcn/ls-mat-ascii.cc \
+  corefcn/ls-mat4.cc \
+  corefcn/ls-mat5.cc \
+  corefcn/ls-oct-ascii.cc \
+  corefcn/ls-oct-binary.cc \
+  corefcn/ls-utils.cc \
   corefcn/lsode.cc \
   corefcn/lu.cc \
   corefcn/luinc.cc \
@@ -69,9 +196,25 @@
   corefcn/matrix_type.cc \
   corefcn/max.cc \
   corefcn/md5sum.cc \
+  corefcn/mex.cc \
   corefcn/mgorth.cc \
   corefcn/nproc.cc \
+  corefcn/oct-fstrm.cc \
+  corefcn/oct-hist.cc \
+  corefcn/oct-iostrm.cc \
+  corefcn/oct-lvalue.cc \
+  corefcn/oct-map.cc \
+  corefcn/oct-obj.cc \
+  corefcn/oct-prcstrm.cc \
+  corefcn/oct-procbuf.cc \
+  corefcn/oct-stream.cc \
+  corefcn/oct-strstrm.cc \
+  corefcn/octave-link.cc \
+  corefcn/pager.cc \
   corefcn/pinv.cc \
+  corefcn/pr-output.cc \
+  corefcn/procstream.cc \
+  corefcn/profiler.cc \
   corefcn/quad.cc \
   corefcn/quadcc.cc \
   corefcn/qz.cc \
@@ -79,6 +222,9 @@
   corefcn/rcond.cc \
   corefcn/regexp.cc \
   corefcn/schur.cc \
+  corefcn/sighandlers.cc \
+  corefcn/sparse-xdiv.cc \
+  corefcn/sparse-xpow.cc \
   corefcn/sparse.cc \
   corefcn/spparms.cc \
   corefcn/sqrtm.cc \
@@ -88,10 +234,61 @@
   corefcn/sub2ind.cc \
   corefcn/svd.cc \
   corefcn/syl.cc \
+  corefcn/symtab.cc \
   corefcn/syscalls.cc \
+  corefcn/sysdep.cc \
   corefcn/time.cc \
+  corefcn/toplev.cc \
   corefcn/tril.cc \
-  corefcn/typecast.cc
+  corefcn/txt-eng-ft.cc \
+  corefcn/typecast.cc \
+  corefcn/unwind-prot.cc \
+  corefcn/utils.cc \
+  corefcn/variables.cc \
+  corefcn/xdiv.cc \
+  corefcn/xnorm.cc \
+  corefcn/xpow.cc \
+  corefcn/zfstream.cc \
+  $(JIT_SRC) \
+  $(C_COREFCN_SRC)
+
+## FIXME: Automake does not support per-object rules.
+##        These rules could be emulated by creating a new convenience
+##        library and using per-library rules.  Or we can just live
+##        without the rule since there haven't been any problems. (09/18/2012)
+#display.df display.lo: CPPFLAGS += $(X11_FLAGS)
+
+## Special rules for sources which must be built before rest of compilation.
+
+## defaults.h and graphics.h must depend on Makefile.  Calling configure
+## may change default/config values.  However, calling configure will also
+## regenerate the Makefiles from Makefile.am and trigger the rules below.
+corefcn/defaults.h: corefcn/defaults.in.h Makefile
+	@$(do_subst_default_vals)
+
+corefcn/graphics.h: corefcn/graphics.in.h genprops.awk Makefile
+	$(AWK) -f $(srcdir)/genprops.awk $< > $@-t
+	mv $@-t $@
+
+corefcn/graphics-props.cc: corefcn/graphics.in.h genprops.awk Makefile
+	$(AWK) -v emit_graphics_props=1 -f $(srcdir)/genprops.awk $< > $@-t
+	mv $@-t $@
+
+corefcn/oct-errno.cc: corefcn/oct-errno.in.cc Makefile
+	if test -n "$(PERL)"; then \
+	  $(srcdir)/mk-errno-list --perl "$(PERL)" < $< > $@-t; \
+	elif test -n "$(PYTHON)"; then \
+	  $(srcdir)/mk-errno-list --python "$(PYTHON)" < $< > $@-t; \
+	else \
+	  $(SED) '/@SYSDEP_ERRNO_LIST@/D' $< > $@-t; \
+	fi
+	mv $@-t $@
+
+corefcn/mxarray.h: corefcn/mxarray.in.h Makefile
+	$(SED) < $< \
+	  -e "s|%NO_EDIT_WARNING%|DO NOT EDIT!  Generated automatically from $(<F) by Make.|" \
+	  -e "s|%OCTAVE_IDX_TYPE%|${OCTAVE_IDX_TYPE}|" > $@-t
+	mv $@-t $@
 
 noinst_LTLIBRARIES += corefcn/libcorefcn.la
 

rename from libinterp/interp-core/mxarray.in.h
rename to libinterp/corefcn/mxarray.in.h

rename from libinterp/interp-core/oct-errno.h
rename to libinterp/corefcn/oct-errno.h

rename from libinterp/interp-core/oct-errno.in.cc
rename to libinterp/corefcn/oct-errno.in.cc

rename from libinterp/interp-core/oct-fstrm.cc
rename to libinterp/corefcn/oct-fstrm.cc

rename from libinterp/interp-core/oct-fstrm.h
rename to libinterp/corefcn/oct-fstrm.h

rename from libinterp/interp-core/oct-hdf5.h
rename to libinterp/corefcn/oct-hdf5.h

rename from libinterp/interpfcn/oct-hist.cc
rename to libinterp/corefcn/oct-hist.cc

rename from libinterp/interpfcn/oct-hist.h
rename to libinterp/corefcn/oct-hist.h

rename from libinterp/interp-core/oct-iostrm.cc
rename to libinterp/corefcn/oct-iostrm.cc

rename from libinterp/interp-core/oct-iostrm.h
rename to libinterp/corefcn/oct-iostrm.h

rename from libinterp/interp-core/oct-lvalue.cc
rename to libinterp/corefcn/oct-lvalue.cc

rename from libinterp/interp-core/oct-lvalue.h
rename to libinterp/corefcn/oct-lvalue.h

rename from libinterp/interp-core/oct-map.cc
rename to libinterp/corefcn/oct-map.cc

rename from libinterp/interp-core/oct-map.h
rename to libinterp/corefcn/oct-map.h

rename from libinterp/interp-core/oct-obj.cc
rename to libinterp/corefcn/oct-obj.cc

rename from libinterp/interp-core/oct-obj.h
rename to libinterp/corefcn/oct-obj.h

rename from libinterp/interp-core/oct-prcstrm.cc
rename to libinterp/corefcn/oct-prcstrm.cc

rename from libinterp/interp-core/oct-prcstrm.h
rename to libinterp/corefcn/oct-prcstrm.h

rename from libinterp/interp-core/oct-procbuf.cc
rename to libinterp/corefcn/oct-procbuf.cc

rename from libinterp/interp-core/oct-procbuf.h
rename to libinterp/corefcn/oct-procbuf.h

rename from libinterp/interp-core/oct-stdstrm.h
rename to libinterp/corefcn/oct-stdstrm.h

rename from libinterp/interp-core/oct-stream.cc
rename to libinterp/corefcn/oct-stream.cc

rename from libinterp/interp-core/oct-stream.h
rename to libinterp/corefcn/oct-stream.h

rename from libinterp/interp-core/oct-strstrm.cc
rename to libinterp/corefcn/oct-strstrm.cc

rename from libinterp/interp-core/oct-strstrm.h
rename to libinterp/corefcn/oct-strstrm.h

rename from libinterp/interp-core/oct.h
rename to libinterp/corefcn/oct.h

rename from libinterp/interpfcn/octave-link.cc
rename to libinterp/corefcn/octave-link.cc

rename from libinterp/interpfcn/octave-link.h
rename to libinterp/corefcn/octave-link.h

rename from libinterp/interpfcn/pager.cc
rename to libinterp/corefcn/pager.cc

rename from libinterp/interpfcn/pager.h
rename to libinterp/corefcn/pager.h

rename from libinterp/interpfcn/pr-output.cc
rename to libinterp/corefcn/pr-output.cc

rename from libinterp/interpfcn/pr-output.h
rename to libinterp/corefcn/pr-output.h

rename from libinterp/interp-core/procstream.cc
rename to libinterp/corefcn/procstream.cc

rename from libinterp/interp-core/procstream.h
rename to libinterp/corefcn/procstream.h

rename from libinterp/interpfcn/profiler.cc
rename to libinterp/corefcn/profiler.cc

rename from libinterp/interpfcn/profiler.h
rename to libinterp/corefcn/profiler.h

rename from libinterp/interp-core/pt-jit.cc
rename to libinterp/corefcn/pt-jit.cc

rename from libinterp/interp-core/pt-jit.h
rename to libinterp/corefcn/pt-jit.h

rename from libinterp/interpfcn/sighandlers.cc
rename to libinterp/corefcn/sighandlers.cc

rename from libinterp/interpfcn/sighandlers.h
rename to libinterp/corefcn/sighandlers.h

rename from libinterp/interp-core/siglist.c
rename to libinterp/corefcn/siglist.c

rename from libinterp/interp-core/siglist.h
rename to libinterp/corefcn/siglist.h

rename from libinterp/interp-core/sparse-xdiv.cc
rename to libinterp/corefcn/sparse-xdiv.cc

rename from libinterp/interp-core/sparse-xdiv.h
rename to libinterp/corefcn/sparse-xdiv.h

rename from libinterp/interp-core/sparse-xpow.cc
rename to libinterp/corefcn/sparse-xpow.cc

rename from libinterp/interp-core/sparse-xpow.h
rename to libinterp/corefcn/sparse-xpow.h

rename from libinterp/interpfcn/symtab.cc
rename to libinterp/corefcn/symtab.cc

rename from libinterp/interpfcn/symtab.h
rename to libinterp/corefcn/symtab.h

rename from libinterp/interpfcn/sysdep.cc
rename to libinterp/corefcn/sysdep.cc

rename from libinterp/interpfcn/sysdep.h
rename to libinterp/corefcn/sysdep.h

rename from libinterp/interpfcn/toplev.cc
rename to libinterp/corefcn/toplev.cc

rename from libinterp/interpfcn/toplev.h
rename to libinterp/corefcn/toplev.h

rename from libinterp/interp-core/txt-eng-ft.cc
rename to libinterp/corefcn/txt-eng-ft.cc

rename from libinterp/interp-core/txt-eng-ft.h
rename to libinterp/corefcn/txt-eng-ft.h

rename from libinterp/interp-core/txt-eng.h
rename to libinterp/corefcn/txt-eng.h

rename from libinterp/interp-core/unwind-prot.cc
rename to libinterp/corefcn/unwind-prot.cc

rename from libinterp/interp-core/unwind-prot.h
rename to libinterp/corefcn/unwind-prot.h

rename from libinterp/interpfcn/utils.cc
rename to libinterp/corefcn/utils.cc

rename from libinterp/interpfcn/utils.h
rename to libinterp/corefcn/utils.h

rename from libinterp/interpfcn/variables.cc
rename to libinterp/corefcn/variables.cc

rename from libinterp/interpfcn/variables.h
rename to libinterp/corefcn/variables.h

rename from libinterp/interpfcn/workspace-element.h
rename to libinterp/corefcn/workspace-element.h

rename from libinterp/interp-core/xdiv.cc
rename to libinterp/corefcn/xdiv.cc

rename from libinterp/interp-core/xdiv.h
rename to libinterp/corefcn/xdiv.h

rename from libinterp/interp-core/xgl2ps.c
rename to libinterp/corefcn/xgl2ps.c

rename from libinterp/interp-core/xnorm.cc
rename to libinterp/corefcn/xnorm.cc

rename from libinterp/interp-core/xnorm.h
rename to libinterp/corefcn/xnorm.h

rename from libinterp/interp-core/xpow.cc
rename to libinterp/corefcn/xpow.cc

rename from libinterp/interp-core/xpow.h
rename to libinterp/corefcn/xpow.h

rename from libinterp/interp-core/zfstream.cc
rename to libinterp/corefcn/zfstream.cc

rename from libinterp/interp-core/zfstream.h
rename to libinterp/corefcn/zfstream.h

deleted file mode 100644
--- a/libinterp/interp-core/module.mk
+++ /dev/null
@@ -1,140 +0,0 @@
-EXTRA_DIST += \
-  interp-core/module.mk \
-  interp-core/gl2ps.c \
-  interp-core/mxarray.in.h \
-  interp-core/oct-errno.in.cc
-
-JIT_INC = \
-  interp-core/jit-util.h \
-  interp-core/jit-typeinfo.h \
-  interp-core/jit-ir.h \
-  interp-core/pt-jit.h
-
-INTERP_CORE_INC = \
-  interp-core/Cell.h \
-  interp-core/action-container.h \
-  interp-core/c-file-ptr-stream.h \
-  interp-core/comment-list.h \
-  interp-core/cutils.h \
-  interp-core/defun-dld.h \
-  interp-core/defun-int.h \
-  interp-core/display.h \
-  interp-core/dynamic-ld.h \
-  interp-core/event-queue.h \
-  interp-core/gl-render.h \
-  interp-core/gl2ps-renderer.h \
-  interp-core/gl2ps.h \
-  interp-core/gripes.h \
-  interp-core/ls-ascii-helper.h \
-  interp-core/ls-hdf5.h \
-  interp-core/ls-mat-ascii.h \
-  interp-core/ls-mat4.h \
-  interp-core/ls-mat5.h \
-  interp-core/ls-oct-binary.h \
-  interp-core/ls-utils.h \
-  interp-core/mex.h \
-  interp-core/mexproto.h \
-  interp-core/mxarray.in.h \
-  interp-core/oct-errno.h \
-  interp-core/oct-fstrm.h \
-  interp-core/oct-hdf5.h \
-  interp-core/oct-iostrm.h \
-  interp-core/oct-lvalue.h \
-  interp-core/oct-map.h \
-  interp-core/oct-obj.h \
-  interp-core/oct-prcstrm.h \
-  interp-core/oct-procbuf.h \
-  interp-core/oct-stdstrm.h \
-  interp-core/oct-stream.h \
-  interp-core/oct-strstrm.h \
-  interp-core/oct.h \
-  interp-core/procstream.h \
-  interp-core/siglist.h \
-  interp-core/sparse-xdiv.h \
-  interp-core/sparse-xpow.h \
-  interp-core/txt-eng-ft.h \
-  interp-core/txt-eng.h \
-  interp-core/unwind-prot.h \
-  interp-core/xdiv.h \
-  interp-core/xnorm.h \
-  interp-core/xpow.h \
-  interp-core/zfstream.h \
-  $(JIT_INC)
-
-JIT_SRC = \
-  interp-core/jit-util.cc \
-  interp-core/jit-typeinfo.cc \
-  interp-core/jit-ir.cc \
-  interp-core/pt-jit.cc
-
-C_INTERP_CORE_SRC = \
-  interp-core/cutils.c \
-  interp-core/matherr.c \
-  interp-core/siglist.c \
-  interp-core/xgl2ps.c
-
-INTERP_CORE_SRC = \
-  interp-core/Cell.cc \
-  interp-core/c-file-ptr-stream.cc \
-  interp-core/comment-list.cc \
-  interp-core/display.cc \
-  interp-core/dynamic-ld.cc \
-  interp-core/gl-render.cc \
-  interp-core/gl2ps-renderer.cc \
-  interp-core/gripes.cc \
-  interp-core/ls-ascii-helper.cc \
-  interp-core/ls-hdf5.cc \
-  interp-core/ls-mat-ascii.cc \
-  interp-core/ls-mat4.cc \
-  interp-core/ls-mat5.cc \
-  interp-core/ls-oct-binary.cc \
-  interp-core/ls-utils.cc \
-  interp-core/mex.cc \
-  interp-core/oct-fstrm.cc \
-  interp-core/oct-iostrm.cc \
-  interp-core/oct-lvalue.cc \
-  interp-core/oct-map.cc \
-  interp-core/oct-obj.cc \
-  interp-core/oct-prcstrm.cc \
-  interp-core/oct-procbuf.cc \
-  interp-core/oct-stream.cc \
-  interp-core/oct-strstrm.cc \
-  interp-core/procstream.cc \
-  interp-core/sparse-xdiv.cc \
-  interp-core/sparse-xpow.cc \
-  interp-core/txt-eng-ft.cc \
-  interp-core/unwind-prot.cc \
-  interp-core/xdiv.cc \
-  interp-core/xnorm.cc \
-  interp-core/xpow.cc \
-  interp-core/zfstream.cc \
-  $(JIT_SRC) \
-  $(C_INTERP_CORE_SRC)
-
-## FIXME: Automake does not support per-object rules.
-##        These rules could be emulated by creating a new convenience
-##        library and using per-library rules.  Or we can just live
-##        without the rule since there haven't been any problems. (09/18/2012)
-#display.df display.lo: CPPFLAGS += $(X11_FLAGS)
-
-## Special rules for sources which must be built before rest of compilation.
-interp-core/oct-errno.cc: interp-core/oct-errno.in.cc Makefile
-	if test -n "$(PERL)"; then \
-	  $(srcdir)/mk-errno-list --perl "$(PERL)" < $< > $@-t; \
-	elif test -n "$(PYTHON)"; then \
-	  $(srcdir)/mk-errno-list --python "$(PYTHON)" < $< > $@-t; \
-	else \
-	  $(SED) '/@SYSDEP_ERRNO_LIST@/D' $< > $@-t; \
-	fi
-	mv $@-t $@
-
-interp-core/mxarray.h: interp-core/mxarray.in.h Makefile
-	$(SED) < $< \
-	  -e "s|%NO_EDIT_WARNING%|DO NOT EDIT!  Generated automatically from $(<F) by Make.|" \
-	  -e "s|%OCTAVE_IDX_TYPE%|${OCTAVE_IDX_TYPE}|" > $@-t
-	mv $@-t $@
-
-noinst_LTLIBRARIES += interp-core/libinterp-core.la
-
-interp_core_libinterp_core_la_SOURCES = $(INTERP_CORE_SRC)
-interp_core_libinterp_core_la_CPPFLAGS = $(liboctinterp_la_CPPFLAGS)

deleted file mode 100644
--- a/libinterp/interpfcn/module.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-EXTRA_DIST += \
-  interpfcn/module.mk \
-  interpfcn/defaults.in.h \
-  interpfcn/graphics.in.h
-
-INTERPFCN_INC = \
-  interpfcn/data.h \
-  interpfcn/debug.h \
-  interpfcn/defun.h \
-  interpfcn/dirfns.h \
-  interpfcn/error.h \
-  interpfcn/file-io.h \
-  interpfcn/help.h \
-  interpfcn/hook-fcn.h \
-  interpfcn/input.h \
-  interpfcn/load-path.h \
-  interpfcn/load-save.h \
-  interpfcn/ls-oct-ascii.h \
-  interpfcn/octave-link.h \
-  interpfcn/oct-hist.h \
-  interpfcn/pager.h \
-  interpfcn/pr-output.h \
-  interpfcn/profiler.h \
-  interpfcn/sighandlers.h \
-  interpfcn/symtab.h \
-  interpfcn/sysdep.h \
-  interpfcn/toplev.h \
-  interpfcn/utils.h \
-  interpfcn/variables.h \
-  interpfcn/workspace-element.h
-
-INTERPFCN_SRC = \
-  interpfcn/data.cc \
-  interpfcn/debug.cc \
-  interpfcn/defaults.cc \
-  interpfcn/defun.cc \
-  interpfcn/dirfns.cc \
-  interpfcn/error.cc \
-  interpfcn/file-io.cc \
-  interpfcn/graphics.cc \
-  interpfcn/help.cc \
-  interpfcn/hook-fcn.cc \
-  interpfcn/input.cc \
-  interpfcn/load-path.cc \
-  interpfcn/load-save.cc \
-  interpfcn/ls-oct-ascii.cc \
-  interpfcn/octave-link.cc \
-  interpfcn/oct-hist.cc \
-  interpfcn/pager.cc \
-  interpfcn/pr-output.cc \
-  interpfcn/profiler.cc \
-  interpfcn/sighandlers.cc \
-  interpfcn/symtab.cc \
-  interpfcn/sysdep.cc \
-  interpfcn/toplev.cc \
-  interpfcn/utils.cc \
-  interpfcn/variables.cc
-
-## defaults.h and graphics.h must depend on Makefile.  Calling configure
-## may change default/config values.  However, calling configure will also
-## regenerate the Makefiles from Makefile.am and trigger the rules below.
-interpfcn/defaults.h: interpfcn/defaults.in.h Makefile
-	@$(do_subst_default_vals)
-
-interpfcn/graphics.h: interpfcn/graphics.in.h genprops.awk Makefile
-	$(AWK) -f $(srcdir)/genprops.awk $< > $@-t
-	mv $@-t $@
-
-interpfcn/graphics-props.cc: interpfcn/graphics.in.h genprops.awk Makefile
-	$(AWK) -v emit_graphics_props=1 -f $(srcdir)/genprops.awk $< > $@-t
-	mv $@-t $@
-
-noinst_LTLIBRARIES += interpfcn/libinterpfcn.la
-
-interpfcn_libinterpfcn_la_SOURCES = $(INTERPFCN_SRC)
-interpfcn_libinterpfcn_la_CPPFLAGS = $(liboctinterp_la_CPPFLAGS)

--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,7 @@
   -I$(top_srcdir)/liboctave/system \
   -I$(top_srcdir)/liboctave/util \
   -I$(top_srcdir)/libinterp \
-  -I$(top_builddir)/libinterp/interpfcn -I$(top_srcdir)/libinterp/interpfcn \
+  -I$(top_builddir)/libinterp/corefcn -I$(top_srcdir)/libinterp/corefcn \
   -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu
 
 AM_CFLAGS += $(WARN_CFLAGS)