diff --git a/Cantera/Makefile.am b/Cantera/Makefile.am deleted file mode 100644 index e7f5b3e5b..000000000 --- a/Cantera/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -# $Id: $ - -# will need to add python and matlab -SUBDIRS = ext src user cxx diff --git a/Cantera/README.txt b/Cantera/README.txt deleted file mode 100644 index 23de2a853..000000000 --- a/Cantera/README.txt +++ /dev/null @@ -1,11 +0,0 @@ - -This directory contains the source for Cantera and its various -language interfaces. - -clib - the library of C-callable functions used by the Python and - Matlab interfaces. -cxx - files that are only required for C++ application programs. -matlab - the Cantera Matlab toolbox -python - the Cantera Python package -src - the Cantera kernel, used by Cantera in all its forms - diff --git a/Cantera/cxx/Makefile.am b/Cantera/cxx/Makefile.am deleted file mode 100644 index f963effea..000000000 --- a/Cantera/cxx/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = src \ No newline at end of file diff --git a/Cantera/cxx/src/Makefile.am b/Cantera/cxx/src/Makefile.am deleted file mode 100644 index fcd35b991..000000000 --- a/Cantera/cxx/src/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -h_sources = - -cc_sources = importPhase.cpp - -AM_CPPFLAGS = -I$(top_builddir)/build/include -AM_CXXFLAGS = $(AM_CPPFLAGS) - -lib_LTLIBRARIES = $(top_builddir)/build/lib/libctcxx.la -library_includedir = $(top_builddir)/build/include -library_include_HEADERS = $(h_sources) - -#----------------------- -# Cantera Converters C/C++ library -#----------------------- - -__top_builddir__build_lib_libctcxx_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) -__top_builddir__build_lib_libctcxx_la_SOURCES = $(cc_sources) $(h_sources) - -__top_builddir__build_lib_libctcxx_include_HEADERS = $(h_sources) -__top_builddir__build_lib_libctcxx_includedir = $(prefix)/include - - -# header file accumulation -all: - @echo copying headers $< - cp -p *.h $(top_builddir)/build/include/ - -CLEANFILES = *.o diff --git a/Cantera/user/Makefile.am b/Cantera/user/Makefile.am deleted file mode 100644 index bd6545341..000000000 --- a/Cantera/user/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -cc_sources = user.cpp - -AM_CPPFLAGS = -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera -AM_CXXFLAGS = $(AM_CPPFLAGS) - -lib_LTLIBRARIES = $(top_builddir)/build/lib/libuser.la -library_includedir = $(top_builddir)/build/include -library_include_HEADERS = $(h_sources) - -#----------------------- -# Cantera Converters C/C++ library -#----------------------- - -__top_builddir__build_lib_libuser_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) -__top_builddir__build_lib_libuser_la_SOURCES = $(cc_sources) $(h_sources) - -CLEANFILES = *.o diff --git a/apps/README.txt b/apps/README.txt deleted file mode 100644 index 6c6cafadd..000000000 --- a/apps/README.txt +++ /dev/null @@ -1,8 +0,0 @@ -This directory is for applications that are not part of Cantera -itself, but may be distributed with Cantera. - -Contents: - -MixMaster -- A graphical control panel for viewing mixture properties - (Python) - diff --git a/docs/Makefile.am b/doc/Makefile.am similarity index 100% rename from docs/Makefile.am rename to doc/Makefile.am diff --git a/docs/Cantera.cfg.in b/doc/doxygen/Cantera.cfg.in similarity index 100% rename from docs/Cantera.cfg.in rename to doc/doxygen/Cantera.cfg.in diff --git a/docs/doxyinput/Cantera.txt b/doc/doxygen/Cantera.txt similarity index 100% rename from docs/doxyinput/Cantera.txt rename to doc/doxygen/Cantera.txt diff --git a/docs/aminclude.am b/doc/doxygen/aminclude.am similarity index 100% rename from docs/aminclude.am rename to doc/doxygen/aminclude.am diff --git a/docs/html/banner4.jpg b/doc/doxygen/banner4.jpg similarity index 100% rename from docs/html/banner4.jpg rename to doc/doxygen/banner4.jpg diff --git a/docs/doxyinput/bindings.txt b/doc/doxygen/bindings.txt similarity index 100% rename from docs/doxyinput/bindings.txt rename to doc/doxygen/bindings.txt diff --git a/docs/doxyinput/build.txt b/doc/doxygen/build.txt similarity index 100% rename from docs/doxyinput/build.txt rename to doc/doxygen/build.txt diff --git a/docs/doxyinput/buildcygwin.txt b/doc/doxygen/buildcygwin.txt similarity index 100% rename from docs/doxyinput/buildcygwin.txt rename to doc/doxygen/buildcygwin.txt diff --git a/docs/doxyinput/configuring.txt b/doc/doxygen/configuring.txt similarity index 100% rename from docs/doxyinput/configuring.txt rename to doc/doxygen/configuring.txt diff --git a/docs/doxyinput/ctnew.txt b/doc/doxygen/ctnew.txt similarity index 100% rename from docs/doxyinput/ctnew.txt rename to doc/doxygen/ctnew.txt diff --git a/docs/doxyinput/cxx-headers.txt b/doc/doxygen/cxx-headers.txt similarity index 100% rename from docs/doxyinput/cxx-headers.txt rename to doc/doxygen/cxx-headers.txt diff --git a/docs/doxyinput/cxx-setup.txt b/doc/doxygen/cxx-setup.txt similarity index 100% rename from docs/doxyinput/cxx-setup.txt rename to doc/doxygen/cxx-setup.txt diff --git a/docs/doxyinput/demo.cpp b/doc/doxygen/demo.cpp similarity index 100% rename from docs/doxyinput/demo.cpp rename to doc/doxygen/demo.cpp diff --git a/docs/doxyinput/demo1.cpp b/doc/doxygen/demo1.cpp similarity index 100% rename from docs/doxyinput/demo1.cpp rename to doc/doxygen/demo1.cpp diff --git a/docs/doxyinput/demo1a.cpp b/doc/doxygen/demo1a.cpp similarity index 100% rename from docs/doxyinput/demo1a.cpp rename to doc/doxygen/demo1a.cpp diff --git a/docs/doxyinput/demoequil.cpp b/doc/doxygen/demoequil.cpp similarity index 100% rename from docs/doxyinput/demoequil.cpp rename to doc/doxygen/demoequil.cpp diff --git a/docs/doxyinput/edemo.cpp b/doc/doxygen/edemo.cpp similarity index 100% rename from docs/doxyinput/edemo.cpp rename to doc/doxygen/edemo.cpp diff --git a/docs/doxyinput/equildemo.txt b/doc/doxygen/equildemo.txt similarity index 100% rename from docs/doxyinput/equildemo.txt rename to doc/doxygen/equildemo.txt diff --git a/docs/doxyinput/ex1.cpp b/doc/doxygen/ex1.cpp similarity index 100% rename from docs/doxyinput/ex1.cpp rename to doc/doxygen/ex1.cpp diff --git a/docs/doxyinput/except.cpp b/doc/doxygen/except.cpp similarity index 100% rename from docs/doxyinput/except.cpp rename to doc/doxygen/except.cpp diff --git a/docs/doxyinput/exceptions.txt b/doc/doxygen/exceptions.txt similarity index 100% rename from docs/doxyinput/exceptions.txt rename to doc/doxygen/exceptions.txt diff --git a/docs/doxyinput/initthermo.txt b/doc/doxygen/initthermo.txt similarity index 100% rename from docs/doxyinput/initthermo.txt rename to doc/doxygen/initthermo.txt diff --git a/docs/doxyinput/introcxx.txt b/doc/doxygen/introcxx.txt similarity index 100% rename from docs/doxyinput/introcxx.txt rename to doc/doxygen/introcxx.txt diff --git a/docs/doxyinput/languages.txt b/doc/doxygen/languages.txt similarity index 100% rename from docs/doxyinput/languages.txt rename to doc/doxygen/languages.txt diff --git a/docs/doxyinput/matlab.txt b/doc/doxygen/matlab.txt similarity index 100% rename from docs/doxyinput/matlab.txt rename to doc/doxygen/matlab.txt diff --git a/docs/doxyinput/numarray.txt b/doc/doxygen/numarray.txt similarity index 100% rename from docs/doxyinput/numarray.txt rename to doc/doxygen/numarray.txt diff --git a/docs/doxyinput/thermo.txt b/doc/doxygen/thermo.txt similarity index 100% rename from docs/doxyinput/thermo.txt rename to doc/doxygen/thermo.txt diff --git a/docs/doxyinput/thermodemo.cpp b/doc/doxygen/thermodemo.cpp similarity index 100% rename from docs/doxyinput/thermodemo.cpp rename to doc/doxygen/thermodemo.cpp diff --git a/docs/doxyinput/thermodemo.txt b/doc/doxygen/thermodemo.txt similarity index 100% rename from docs/doxyinput/thermodemo.txt rename to doc/doxygen/thermodemo.txt diff --git a/docs/doxyinput/transport.txt b/doc/doxygen/transport.txt similarity index 100% rename from docs/doxyinput/transport.txt rename to doc/doxygen/transport.txt diff --git a/docs/doxyinput/winbuild.txt b/doc/doxygen/winbuild.txt similarity index 100% rename from docs/doxyinput/winbuild.txt rename to doc/doxygen/winbuild.txt diff --git a/docs/python/makedoc b/doc/python/makedoc similarity index 100% rename from docs/python/makedoc rename to doc/python/makedoc diff --git a/docs/python/mkmkdoc.py b/doc/python/mkmkdoc.py similarity index 100% rename from docs/python/mkmkdoc.py rename to doc/python/mkmkdoc.py diff --git a/Cantera/ext/Makefile.am b/ext/Makefile.am similarity index 100% rename from Cantera/ext/Makefile.am rename to ext/Makefile.am diff --git a/Cantera/cxx/include/Cantera.h b/include/cantera/Cantera.h similarity index 100% rename from Cantera/cxx/include/Cantera.h rename to include/cantera/Cantera.h diff --git a/Cantera/cxx/include/Edge.h b/include/cantera/Edge.h similarity index 100% rename from Cantera/cxx/include/Edge.h rename to include/cantera/Edge.h diff --git a/Cantera/cxx/include/GRI30.h b/include/cantera/GRI30.h similarity index 100% rename from Cantera/cxx/include/GRI30.h rename to include/cantera/GRI30.h diff --git a/Cantera/cxx/include/IdealGasMix.h b/include/cantera/IdealGasMix.h similarity index 100% rename from Cantera/cxx/include/IdealGasMix.h rename to include/cantera/IdealGasMix.h diff --git a/Cantera/cxx/include/IncompressibleSolid.h b/include/cantera/IncompressibleSolid.h similarity index 100% rename from Cantera/cxx/include/IncompressibleSolid.h rename to include/cantera/IncompressibleSolid.h diff --git a/Cantera/cxx/include/Interface.h b/include/cantera/Interface.h similarity index 100% rename from Cantera/cxx/include/Interface.h rename to include/cantera/Interface.h diff --git a/Cantera/cxx/include/Metal.h b/include/cantera/Metal.h similarity index 100% rename from Cantera/cxx/include/Metal.h rename to include/cantera/Metal.h diff --git a/Cantera/cxx/include/PureFluid.h b/include/cantera/PureFluid.h similarity index 100% rename from Cantera/cxx/include/PureFluid.h rename to include/cantera/PureFluid.h diff --git a/Cantera/src/base/Array.h b/include/cantera/base/Array.h similarity index 100% rename from Cantera/src/base/Array.h rename to include/cantera/base/Array.h diff --git a/Cantera/src/base/FactoryBase.h b/include/cantera/base/FactoryBase.h similarity index 100% rename from Cantera/src/base/FactoryBase.h rename to include/cantera/base/FactoryBase.h diff --git a/Cantera/src/base/PrintCtrl.h b/include/cantera/base/PrintCtrl.h similarity index 100% rename from Cantera/src/base/PrintCtrl.h rename to include/cantera/base/PrintCtrl.h diff --git a/Cantera/src/base/XML_Writer.h b/include/cantera/base/XML_Writer.h similarity index 100% rename from Cantera/src/base/XML_Writer.h rename to include/cantera/base/XML_Writer.h diff --git a/Cantera/src/base/clockWC.h b/include/cantera/base/clockWC.h similarity index 100% rename from Cantera/src/base/clockWC.h rename to include/cantera/base/clockWC.h diff --git a/Cantera/src/base/config.h.in b/include/cantera/base/config.h.in similarity index 100% rename from Cantera/src/base/config.h.in rename to include/cantera/base/config.h.in diff --git a/Cantera/src/base/ct_defs.h b/include/cantera/base/ct_defs.h similarity index 100% rename from Cantera/src/base/ct_defs.h rename to include/cantera/base/ct_defs.h diff --git a/Cantera/src/base/ctexceptions.h b/include/cantera/base/ctexceptions.h similarity index 100% rename from Cantera/src/base/ctexceptions.h rename to include/cantera/base/ctexceptions.h diff --git a/Cantera/src/base/ctml.h b/include/cantera/base/ctml.h similarity index 100% rename from Cantera/src/base/ctml.h rename to include/cantera/base/ctml.h diff --git a/Cantera/src/base/global.h b/include/cantera/base/global.h similarity index 100% rename from Cantera/src/base/global.h rename to include/cantera/base/global.h diff --git a/Cantera/src/base/logger.h b/include/cantera/base/logger.h similarity index 100% rename from Cantera/src/base/logger.h rename to include/cantera/base/logger.h diff --git a/Cantera/src/base/mdp_allo.h b/include/cantera/base/mdp_allo.h similarity index 100% rename from Cantera/src/base/mdp_allo.h rename to include/cantera/base/mdp_allo.h diff --git a/Cantera/src/base/stringUtils.h b/include/cantera/base/stringUtils.h similarity index 100% rename from Cantera/src/base/stringUtils.h rename to include/cantera/base/stringUtils.h diff --git a/Cantera/src/base/utilities.h b/include/cantera/base/utilities.h similarity index 100% rename from Cantera/src/base/utilities.h rename to include/cantera/base/utilities.h diff --git a/Cantera/src/base/vec_functions.h b/include/cantera/base/vec_functions.h similarity index 100% rename from Cantera/src/base/vec_functions.h rename to include/cantera/base/vec_functions.h diff --git a/Cantera/src/base/xml.h b/include/cantera/base/xml.h similarity index 100% rename from Cantera/src/base/xml.h rename to include/cantera/base/xml.h diff --git a/Cantera/cxx/include/electrolyteThermo.h b/include/cantera/electrolyteThermo.h similarity index 100% rename from Cantera/cxx/include/electrolyteThermo.h rename to include/cantera/electrolyteThermo.h diff --git a/Cantera/src/equil/ChemEquil.h b/include/cantera/equil/ChemEquil.h similarity index 100% rename from Cantera/src/equil/ChemEquil.h rename to include/cantera/equil/ChemEquil.h diff --git a/Cantera/src/equil/MultiPhase.h b/include/cantera/equil/MultiPhase.h similarity index 100% rename from Cantera/src/equil/MultiPhase.h rename to include/cantera/equil/MultiPhase.h diff --git a/Cantera/src/equil/MultiPhaseEquil.h b/include/cantera/equil/MultiPhaseEquil.h similarity index 100% rename from Cantera/src/equil/MultiPhaseEquil.h rename to include/cantera/equil/MultiPhaseEquil.h diff --git a/Cantera/src/equil/equil.h b/include/cantera/equil/equil.h similarity index 100% rename from Cantera/src/equil/equil.h rename to include/cantera/equil/equil.h diff --git a/Cantera/src/equil/vcs_MultiPhaseEquil.h b/include/cantera/equil/vcs_MultiPhaseEquil.h similarity index 100% rename from Cantera/src/equil/vcs_MultiPhaseEquil.h rename to include/cantera/equil/vcs_MultiPhaseEquil.h diff --git a/Cantera/src/equil/vcs_defs.h b/include/cantera/equil/vcs_defs.h similarity index 100% rename from Cantera/src/equil/vcs_defs.h rename to include/cantera/equil/vcs_defs.h diff --git a/Cantera/cxx/include/equilibrium.h b/include/cantera/equilibrium.h similarity index 100% rename from Cantera/cxx/include/equilibrium.h rename to include/cantera/equilibrium.h diff --git a/Cantera/cxx/include/integrators.h b/include/cantera/integrators.h similarity index 100% rename from Cantera/cxx/include/integrators.h rename to include/cantera/integrators.h diff --git a/Cantera/cxx/include/kinetics.h b/include/cantera/kinetics.h similarity index 100% rename from Cantera/cxx/include/kinetics.h rename to include/cantera/kinetics.h diff --git a/Cantera/src/kinetics/AqueousKinetics.h b/include/cantera/kinetics/AqueousKinetics.h similarity index 100% rename from Cantera/src/kinetics/AqueousKinetics.h rename to include/cantera/kinetics/AqueousKinetics.h diff --git a/Cantera/src/kinetics/EdgeKinetics.h b/include/cantera/kinetics/EdgeKinetics.h similarity index 100% rename from Cantera/src/kinetics/EdgeKinetics.h rename to include/cantera/kinetics/EdgeKinetics.h diff --git a/Cantera/src/kinetics/Enhanced3BConc.h b/include/cantera/kinetics/Enhanced3BConc.h similarity index 100% rename from Cantera/src/kinetics/Enhanced3BConc.h rename to include/cantera/kinetics/Enhanced3BConc.h diff --git a/Cantera/src/kinetics/FalloffFactory.h b/include/cantera/kinetics/FalloffFactory.h similarity index 100% rename from Cantera/src/kinetics/FalloffFactory.h rename to include/cantera/kinetics/FalloffFactory.h diff --git a/Cantera/src/kinetics/FalloffMgr.h b/include/cantera/kinetics/FalloffMgr.h similarity index 100% rename from Cantera/src/kinetics/FalloffMgr.h rename to include/cantera/kinetics/FalloffMgr.h diff --git a/Cantera/src/kinetics/GRI_30_Kinetics.h b/include/cantera/kinetics/GRI_30_Kinetics.h similarity index 100% rename from Cantera/src/kinetics/GRI_30_Kinetics.h rename to include/cantera/kinetics/GRI_30_Kinetics.h diff --git a/Cantera/src/kinetics/GasKinetics.h b/include/cantera/kinetics/GasKinetics.h similarity index 100% rename from Cantera/src/kinetics/GasKinetics.h rename to include/cantera/kinetics/GasKinetics.h diff --git a/Cantera/src/kinetics/Group.h b/include/cantera/kinetics/Group.h similarity index 100% rename from Cantera/src/kinetics/Group.h rename to include/cantera/kinetics/Group.h diff --git a/Cantera/src/kinetics/InterfaceKinetics.h b/include/cantera/kinetics/InterfaceKinetics.h similarity index 100% rename from Cantera/src/kinetics/InterfaceKinetics.h rename to include/cantera/kinetics/InterfaceKinetics.h diff --git a/Cantera/src/kinetics/Kinetics.h b/include/cantera/kinetics/Kinetics.h similarity index 100% rename from Cantera/src/kinetics/Kinetics.h rename to include/cantera/kinetics/Kinetics.h diff --git a/Cantera/src/kinetics/KineticsFactory.h b/include/cantera/kinetics/KineticsFactory.h similarity index 100% rename from Cantera/src/kinetics/KineticsFactory.h rename to include/cantera/kinetics/KineticsFactory.h diff --git a/Cantera/src/kinetics/RateCoeffMgr.h b/include/cantera/kinetics/RateCoeffMgr.h similarity index 100% rename from Cantera/src/kinetics/RateCoeffMgr.h rename to include/cantera/kinetics/RateCoeffMgr.h diff --git a/Cantera/src/kinetics/ReactionPath.h b/include/cantera/kinetics/ReactionPath.h similarity index 100% rename from Cantera/src/kinetics/ReactionPath.h rename to include/cantera/kinetics/ReactionPath.h diff --git a/Cantera/src/kinetics/ReactionStoichMgr.h b/include/cantera/kinetics/ReactionStoichMgr.h similarity index 100% rename from Cantera/src/kinetics/ReactionStoichMgr.h rename to include/cantera/kinetics/ReactionStoichMgr.h diff --git a/Cantera/src/kinetics/RxnRates.h b/include/cantera/kinetics/RxnRates.h similarity index 100% rename from Cantera/src/kinetics/RxnRates.h rename to include/cantera/kinetics/RxnRates.h diff --git a/Cantera/src/kinetics/ThirdBodyMgr.h b/include/cantera/kinetics/ThirdBodyMgr.h similarity index 100% rename from Cantera/src/kinetics/ThirdBodyMgr.h rename to include/cantera/kinetics/ThirdBodyMgr.h diff --git a/Cantera/src/kinetics/importKinetics.h b/include/cantera/kinetics/importKinetics.h similarity index 100% rename from Cantera/src/kinetics/importKinetics.h rename to include/cantera/kinetics/importKinetics.h diff --git a/Cantera/src/kinetics/reaction_defs.h b/include/cantera/kinetics/reaction_defs.h similarity index 100% rename from Cantera/src/kinetics/reaction_defs.h rename to include/cantera/kinetics/reaction_defs.h diff --git a/Cantera/cxx/include/numerics.h b/include/cantera/numerics.h similarity index 100% rename from Cantera/cxx/include/numerics.h rename to include/cantera/numerics.h diff --git a/Cantera/src/numerics/ArrayViewer.h b/include/cantera/numerics/ArrayViewer.h similarity index 100% rename from Cantera/src/numerics/ArrayViewer.h rename to include/cantera/numerics/ArrayViewer.h diff --git a/Cantera/src/numerics/BandMatrix.h b/include/cantera/numerics/BandMatrix.h similarity index 100% rename from Cantera/src/numerics/BandMatrix.h rename to include/cantera/numerics/BandMatrix.h diff --git a/Cantera/src/numerics/DAE_Solver.h b/include/cantera/numerics/DAE_Solver.h similarity index 100% rename from Cantera/src/numerics/DAE_Solver.h rename to include/cantera/numerics/DAE_Solver.h diff --git a/Cantera/src/numerics/DenseMatrix.h b/include/cantera/numerics/DenseMatrix.h similarity index 100% rename from Cantera/src/numerics/DenseMatrix.h rename to include/cantera/numerics/DenseMatrix.h diff --git a/Cantera/src/numerics/Func1.h b/include/cantera/numerics/Func1.h similarity index 100% rename from Cantera/src/numerics/Func1.h rename to include/cantera/numerics/Func1.h diff --git a/Cantera/src/numerics/FuncEval.h b/include/cantera/numerics/FuncEval.h similarity index 100% rename from Cantera/src/numerics/FuncEval.h rename to include/cantera/numerics/FuncEval.h diff --git a/Cantera/src/numerics/GeneralMatrix.h b/include/cantera/numerics/GeneralMatrix.h similarity index 100% rename from Cantera/src/numerics/GeneralMatrix.h rename to include/cantera/numerics/GeneralMatrix.h diff --git a/Cantera/src/numerics/IDA_Solver.h b/include/cantera/numerics/IDA_Solver.h similarity index 100% rename from Cantera/src/numerics/IDA_Solver.h rename to include/cantera/numerics/IDA_Solver.h diff --git a/Cantera/src/numerics/Integrator.h b/include/cantera/numerics/Integrator.h similarity index 100% rename from Cantera/src/numerics/Integrator.h rename to include/cantera/numerics/Integrator.h diff --git a/Cantera/src/numerics/NonlinearSolver.h b/include/cantera/numerics/NonlinearSolver.h similarity index 100% rename from Cantera/src/numerics/NonlinearSolver.h rename to include/cantera/numerics/NonlinearSolver.h diff --git a/Cantera/src/numerics/ResidEval.h b/include/cantera/numerics/ResidEval.h similarity index 100% rename from Cantera/src/numerics/ResidEval.h rename to include/cantera/numerics/ResidEval.h diff --git a/Cantera/src/numerics/ResidJacEval.h b/include/cantera/numerics/ResidJacEval.h similarity index 100% rename from Cantera/src/numerics/ResidJacEval.h rename to include/cantera/numerics/ResidJacEval.h diff --git a/Cantera/src/numerics/RootFind.h b/include/cantera/numerics/RootFind.h similarity index 100% rename from Cantera/src/numerics/RootFind.h rename to include/cantera/numerics/RootFind.h diff --git a/Cantera/src/numerics/SquareMatrix.h b/include/cantera/numerics/SquareMatrix.h similarity index 100% rename from Cantera/src/numerics/SquareMatrix.h rename to include/cantera/numerics/SquareMatrix.h diff --git a/Cantera/src/numerics/ctlapack.h b/include/cantera/numerics/ctlapack.h similarity index 100% rename from Cantera/src/numerics/ctlapack.h rename to include/cantera/numerics/ctlapack.h diff --git a/Cantera/src/numerics/funcs.h b/include/cantera/numerics/funcs.h similarity index 100% rename from Cantera/src/numerics/funcs.h rename to include/cantera/numerics/funcs.h diff --git a/Cantera/src/numerics/polyfit.h b/include/cantera/numerics/polyfit.h similarity index 100% rename from Cantera/src/numerics/polyfit.h rename to include/cantera/numerics/polyfit.h diff --git a/Cantera/src/numerics/solveProb.h b/include/cantera/numerics/solveProb.h similarity index 100% rename from Cantera/src/numerics/solveProb.h rename to include/cantera/numerics/solveProb.h diff --git a/Cantera/src/oneD/Domain1D.h b/include/cantera/oneD/Domain1D.h similarity index 100% rename from Cantera/src/oneD/Domain1D.h rename to include/cantera/oneD/Domain1D.h diff --git a/Cantera/src/oneD/Inlet1D.h b/include/cantera/oneD/Inlet1D.h similarity index 100% rename from Cantera/src/oneD/Inlet1D.h rename to include/cantera/oneD/Inlet1D.h diff --git a/Cantera/src/oneD/MultiJac.h b/include/cantera/oneD/MultiJac.h similarity index 100% rename from Cantera/src/oneD/MultiJac.h rename to include/cantera/oneD/MultiJac.h diff --git a/Cantera/src/oneD/MultiNewton.h b/include/cantera/oneD/MultiNewton.h similarity index 100% rename from Cantera/src/oneD/MultiNewton.h rename to include/cantera/oneD/MultiNewton.h diff --git a/Cantera/src/oneD/OneDim.h b/include/cantera/oneD/OneDim.h similarity index 100% rename from Cantera/src/oneD/OneDim.h rename to include/cantera/oneD/OneDim.h diff --git a/Cantera/src/oneD/Sim1D.h b/include/cantera/oneD/Sim1D.h similarity index 100% rename from Cantera/src/oneD/Sim1D.h rename to include/cantera/oneD/Sim1D.h diff --git a/Cantera/src/oneD/StFlow.h b/include/cantera/oneD/StFlow.h similarity index 100% rename from Cantera/src/oneD/StFlow.h rename to include/cantera/oneD/StFlow.h diff --git a/Cantera/src/oneD/Surf1D.h b/include/cantera/oneD/Surf1D.h similarity index 100% rename from Cantera/src/oneD/Surf1D.h rename to include/cantera/oneD/Surf1D.h diff --git a/Cantera/src/oneD/refine.h b/include/cantera/oneD/refine.h similarity index 100% rename from Cantera/src/oneD/refine.h rename to include/cantera/oneD/refine.h diff --git a/Cantera/cxx/include/onedim.h b/include/cantera/onedim.h similarity index 90% rename from Cantera/cxx/include/onedim.h rename to include/cantera/onedim.h index 175806e98..7278bb023 100755 --- a/Cantera/cxx/include/onedim.h +++ b/include/cantera/onedim.h @@ -5,6 +5,7 @@ #include "kernel/OneDim.h" #include "kernel/Domain1D.h" #include "kernel/Inlet1D.h" +#include "kernel/Surf1D.h" #include "kernel/MultiNewton.h" #include "kernel/MultiJac.h" #include "kernel/StFlow.h" diff --git a/Cantera/cxx/include/radiation.h b/include/cantera/radiation.h similarity index 100% rename from Cantera/cxx/include/radiation.h rename to include/cantera/radiation.h diff --git a/Cantera/cxx/include/reactionpaths.h b/include/cantera/reactionpaths.h similarity index 100% rename from Cantera/cxx/include/reactionpaths.h rename to include/cantera/reactionpaths.h diff --git a/Cantera/cxx/include/solvers.h b/include/cantera/solvers.h similarity index 100% rename from Cantera/cxx/include/solvers.h rename to include/cantera/solvers.h diff --git a/Cantera/cxx/include/spectra.h b/include/cantera/spectra.h similarity index 100% rename from Cantera/cxx/include/spectra.h rename to include/cantera/spectra.h diff --git a/Cantera/src/spectra/LineBroadener.h b/include/cantera/spectra/LineBroadener.h similarity index 100% rename from Cantera/src/spectra/LineBroadener.h rename to include/cantera/spectra/LineBroadener.h diff --git a/Cantera/src/spectra/rotor.h b/include/cantera/spectra/rotor.h similarity index 100% rename from Cantera/src/spectra/rotor.h rename to include/cantera/spectra/rotor.h diff --git a/Cantera/cxx/include/surface.h b/include/cantera/surface.h similarity index 100% rename from Cantera/cxx/include/surface.h rename to include/cantera/surface.h diff --git a/Cantera/cxx/include/thermo.h b/include/cantera/thermo.h similarity index 100% rename from Cantera/cxx/include/thermo.h rename to include/cantera/thermo.h diff --git a/Cantera/src/thermo/AdsorbateThermo.h b/include/cantera/thermo/AdsorbateThermo.h similarity index 100% rename from Cantera/src/thermo/AdsorbateThermo.h rename to include/cantera/thermo/AdsorbateThermo.h diff --git a/Cantera/src/thermo/ConstDensityThermo.h b/include/cantera/thermo/ConstDensityThermo.h similarity index 100% rename from Cantera/src/thermo/ConstDensityThermo.h rename to include/cantera/thermo/ConstDensityThermo.h diff --git a/Cantera/src/thermo/Constituents.h b/include/cantera/thermo/Constituents.h similarity index 100% rename from Cantera/src/thermo/Constituents.h rename to include/cantera/thermo/Constituents.h diff --git a/Cantera/src/thermo/Crystal.h b/include/cantera/thermo/Crystal.h similarity index 100% rename from Cantera/src/thermo/Crystal.h rename to include/cantera/thermo/Crystal.h diff --git a/Cantera/src/thermo/DebyeHuckel.h b/include/cantera/thermo/DebyeHuckel.h similarity index 100% rename from Cantera/src/thermo/DebyeHuckel.h rename to include/cantera/thermo/DebyeHuckel.h diff --git a/Cantera/src/thermo/EdgePhase.h b/include/cantera/thermo/EdgePhase.h similarity index 100% rename from Cantera/src/thermo/EdgePhase.h rename to include/cantera/thermo/EdgePhase.h diff --git a/Cantera/src/thermo/Elements.h b/include/cantera/thermo/Elements.h similarity index 100% rename from Cantera/src/thermo/Elements.h rename to include/cantera/thermo/Elements.h diff --git a/Cantera/src/thermo/FixedChemPotSSTP.h b/include/cantera/thermo/FixedChemPotSSTP.h similarity index 100% rename from Cantera/src/thermo/FixedChemPotSSTP.h rename to include/cantera/thermo/FixedChemPotSSTP.h diff --git a/Cantera/src/thermo/GeneralSpeciesThermo.h b/include/cantera/thermo/GeneralSpeciesThermo.h similarity index 100% rename from Cantera/src/thermo/GeneralSpeciesThermo.h rename to include/cantera/thermo/GeneralSpeciesThermo.h diff --git a/Cantera/src/thermo/GibbsExcessVPSSTP.h b/include/cantera/thermo/GibbsExcessVPSSTP.h similarity index 100% rename from Cantera/src/thermo/GibbsExcessVPSSTP.h rename to include/cantera/thermo/GibbsExcessVPSSTP.h diff --git a/Cantera/src/thermo/HMWSoln.h b/include/cantera/thermo/HMWSoln.h similarity index 100% rename from Cantera/src/thermo/HMWSoln.h rename to include/cantera/thermo/HMWSoln.h diff --git a/Cantera/src/thermo/IdealGasPhase.h b/include/cantera/thermo/IdealGasPhase.h similarity index 100% rename from Cantera/src/thermo/IdealGasPhase.h rename to include/cantera/thermo/IdealGasPhase.h diff --git a/Cantera/src/thermo/IdealMolalSoln.h b/include/cantera/thermo/IdealMolalSoln.h similarity index 100% rename from Cantera/src/thermo/IdealMolalSoln.h rename to include/cantera/thermo/IdealMolalSoln.h diff --git a/Cantera/src/thermo/IdealSolidSolnPhase.h b/include/cantera/thermo/IdealSolidSolnPhase.h similarity index 100% rename from Cantera/src/thermo/IdealSolidSolnPhase.h rename to include/cantera/thermo/IdealSolidSolnPhase.h diff --git a/Cantera/src/thermo/IdealSolnGasVPSS.h b/include/cantera/thermo/IdealSolnGasVPSS.h similarity index 100% rename from Cantera/src/thermo/IdealSolnGasVPSS.h rename to include/cantera/thermo/IdealSolnGasVPSS.h diff --git a/Cantera/src/thermo/IonsFromNeutralVPSSTP.h b/include/cantera/thermo/IonsFromNeutralVPSSTP.h similarity index 100% rename from Cantera/src/thermo/IonsFromNeutralVPSSTP.h rename to include/cantera/thermo/IonsFromNeutralVPSSTP.h diff --git a/Cantera/src/thermo/LatticePhase.h b/include/cantera/thermo/LatticePhase.h similarity index 100% rename from Cantera/src/thermo/LatticePhase.h rename to include/cantera/thermo/LatticePhase.h diff --git a/Cantera/src/thermo/LatticeSolidPhase.h b/include/cantera/thermo/LatticeSolidPhase.h similarity index 100% rename from Cantera/src/thermo/LatticeSolidPhase.h rename to include/cantera/thermo/LatticeSolidPhase.h diff --git a/Cantera/src/thermo/MargulesVPSSTP.h b/include/cantera/thermo/MargulesVPSSTP.h similarity index 100% rename from Cantera/src/thermo/MargulesVPSSTP.h rename to include/cantera/thermo/MargulesVPSSTP.h diff --git a/Cantera/src/thermo/MetalPhase.h b/include/cantera/thermo/MetalPhase.h similarity index 100% rename from Cantera/src/thermo/MetalPhase.h rename to include/cantera/thermo/MetalPhase.h diff --git a/Cantera/src/thermo/MetalSHEelectrons.h b/include/cantera/thermo/MetalSHEelectrons.h similarity index 100% rename from Cantera/src/thermo/MetalSHEelectrons.h rename to include/cantera/thermo/MetalSHEelectrons.h diff --git a/Cantera/src/thermo/MineralEQ3.h b/include/cantera/thermo/MineralEQ3.h similarity index 100% rename from Cantera/src/thermo/MineralEQ3.h rename to include/cantera/thermo/MineralEQ3.h diff --git a/Cantera/src/thermo/MixedSolventElectrolyte.h b/include/cantera/thermo/MixedSolventElectrolyte.h similarity index 100% rename from Cantera/src/thermo/MixedSolventElectrolyte.h rename to include/cantera/thermo/MixedSolventElectrolyte.h diff --git a/Cantera/src/thermo/MixtureFugacityTP.h b/include/cantera/thermo/MixtureFugacityTP.h similarity index 100% rename from Cantera/src/thermo/MixtureFugacityTP.h rename to include/cantera/thermo/MixtureFugacityTP.h diff --git a/Cantera/src/thermo/MolalityVPSSTP.h b/include/cantera/thermo/MolalityVPSSTP.h similarity index 100% rename from Cantera/src/thermo/MolalityVPSSTP.h rename to include/cantera/thermo/MolalityVPSSTP.h diff --git a/Cantera/src/thermo/MolarityIonicVPSSTP.h b/include/cantera/thermo/MolarityIonicVPSSTP.h similarity index 100% rename from Cantera/src/thermo/MolarityIonicVPSSTP.h rename to include/cantera/thermo/MolarityIonicVPSSTP.h diff --git a/Cantera/src/thermo/Nasa9Poly1.h b/include/cantera/thermo/Nasa9Poly1.h similarity index 100% rename from Cantera/src/thermo/Nasa9Poly1.h rename to include/cantera/thermo/Nasa9Poly1.h diff --git a/Cantera/src/thermo/NasaPoly1.h b/include/cantera/thermo/NasaPoly1.h similarity index 100% rename from Cantera/src/thermo/NasaPoly1.h rename to include/cantera/thermo/NasaPoly1.h diff --git a/Cantera/src/thermo/PDSS.h b/include/cantera/thermo/PDSS.h similarity index 100% rename from Cantera/src/thermo/PDSS.h rename to include/cantera/thermo/PDSS.h diff --git a/Cantera/src/thermo/PDSS_ConstVol.h b/include/cantera/thermo/PDSS_ConstVol.h similarity index 100% rename from Cantera/src/thermo/PDSS_ConstVol.h rename to include/cantera/thermo/PDSS_ConstVol.h diff --git a/Cantera/src/thermo/PDSS_HKFT.h b/include/cantera/thermo/PDSS_HKFT.h similarity index 100% rename from Cantera/src/thermo/PDSS_HKFT.h rename to include/cantera/thermo/PDSS_HKFT.h diff --git a/Cantera/src/thermo/PDSS_IdealGas.h b/include/cantera/thermo/PDSS_IdealGas.h similarity index 100% rename from Cantera/src/thermo/PDSS_IdealGas.h rename to include/cantera/thermo/PDSS_IdealGas.h diff --git a/Cantera/src/thermo/PDSS_IonsFromNeutral.h b/include/cantera/thermo/PDSS_IonsFromNeutral.h similarity index 100% rename from Cantera/src/thermo/PDSS_IonsFromNeutral.h rename to include/cantera/thermo/PDSS_IonsFromNeutral.h diff --git a/Cantera/src/thermo/PDSS_SSVol.h b/include/cantera/thermo/PDSS_SSVol.h similarity index 100% rename from Cantera/src/thermo/PDSS_SSVol.h rename to include/cantera/thermo/PDSS_SSVol.h diff --git a/Cantera/src/thermo/PDSS_Water.h b/include/cantera/thermo/PDSS_Water.h similarity index 100% rename from Cantera/src/thermo/PDSS_Water.h rename to include/cantera/thermo/PDSS_Water.h diff --git a/Cantera/src/thermo/Phase.h b/include/cantera/thermo/Phase.h similarity index 100% rename from Cantera/src/thermo/Phase.h rename to include/cantera/thermo/Phase.h diff --git a/Cantera/src/thermo/PhaseCombo_Interaction.h b/include/cantera/thermo/PhaseCombo_Interaction.h similarity index 100% rename from Cantera/src/thermo/PhaseCombo_Interaction.h rename to include/cantera/thermo/PhaseCombo_Interaction.h diff --git a/Cantera/src/thermo/PseudoBinaryVPSSTP.h b/include/cantera/thermo/PseudoBinaryVPSSTP.h similarity index 100% rename from Cantera/src/thermo/PseudoBinaryVPSSTP.h rename to include/cantera/thermo/PseudoBinaryVPSSTP.h diff --git a/Cantera/src/thermo/PureFluidPhase.h b/include/cantera/thermo/PureFluidPhase.h similarity index 100% rename from Cantera/src/thermo/PureFluidPhase.h rename to include/cantera/thermo/PureFluidPhase.h diff --git a/Cantera/src/thermo/RedlichKwongMFTP.h b/include/cantera/thermo/RedlichKwongMFTP.h similarity index 100% rename from Cantera/src/thermo/RedlichKwongMFTP.h rename to include/cantera/thermo/RedlichKwongMFTP.h diff --git a/Cantera/src/thermo/SemiconductorPhase.h b/include/cantera/thermo/SemiconductorPhase.h similarity index 100% rename from Cantera/src/thermo/SemiconductorPhase.h rename to include/cantera/thermo/SemiconductorPhase.h diff --git a/Cantera/src/thermo/SimpleThermo.h b/include/cantera/thermo/SimpleThermo.h similarity index 100% rename from Cantera/src/thermo/SimpleThermo.h rename to include/cantera/thermo/SimpleThermo.h diff --git a/Cantera/src/thermo/SingleSpeciesTP.h b/include/cantera/thermo/SingleSpeciesTP.h similarity index 100% rename from Cantera/src/thermo/SingleSpeciesTP.h rename to include/cantera/thermo/SingleSpeciesTP.h diff --git a/Cantera/src/thermo/SpeciesThermo.h b/include/cantera/thermo/SpeciesThermo.h similarity index 100% rename from Cantera/src/thermo/SpeciesThermo.h rename to include/cantera/thermo/SpeciesThermo.h diff --git a/Cantera/src/thermo/SpeciesThermoFactory.h b/include/cantera/thermo/SpeciesThermoFactory.h similarity index 100% rename from Cantera/src/thermo/SpeciesThermoFactory.h rename to include/cantera/thermo/SpeciesThermoFactory.h diff --git a/Cantera/src/thermo/SpeciesThermoInterpType.h b/include/cantera/thermo/SpeciesThermoInterpType.h similarity index 100% rename from Cantera/src/thermo/SpeciesThermoInterpType.h rename to include/cantera/thermo/SpeciesThermoInterpType.h diff --git a/Cantera/src/thermo/SpeciesThermoMgr.h b/include/cantera/thermo/SpeciesThermoMgr.h similarity index 100% rename from Cantera/src/thermo/SpeciesThermoMgr.h rename to include/cantera/thermo/SpeciesThermoMgr.h diff --git a/Cantera/src/thermo/State.h b/include/cantera/thermo/State.h similarity index 100% rename from Cantera/src/thermo/State.h rename to include/cantera/thermo/State.h diff --git a/Cantera/src/thermo/StoichSubstance.h b/include/cantera/thermo/StoichSubstance.h similarity index 100% rename from Cantera/src/thermo/StoichSubstance.h rename to include/cantera/thermo/StoichSubstance.h diff --git a/Cantera/src/thermo/StoichSubstanceSSTP.h b/include/cantera/thermo/StoichSubstanceSSTP.h similarity index 100% rename from Cantera/src/thermo/StoichSubstanceSSTP.h rename to include/cantera/thermo/StoichSubstanceSSTP.h diff --git a/Cantera/src/thermo/SurfPhase.h b/include/cantera/thermo/SurfPhase.h similarity index 100% rename from Cantera/src/thermo/SurfPhase.h rename to include/cantera/thermo/SurfPhase.h diff --git a/Cantera/src/thermo/ThermoFactory.h b/include/cantera/thermo/ThermoFactory.h similarity index 100% rename from Cantera/src/thermo/ThermoFactory.h rename to include/cantera/thermo/ThermoFactory.h diff --git a/Cantera/src/thermo/ThermoPhase.h b/include/cantera/thermo/ThermoPhase.h similarity index 100% rename from Cantera/src/thermo/ThermoPhase.h rename to include/cantera/thermo/ThermoPhase.h diff --git a/Cantera/src/thermo/VPSSMgr.h b/include/cantera/thermo/VPSSMgr.h similarity index 100% rename from Cantera/src/thermo/VPSSMgr.h rename to include/cantera/thermo/VPSSMgr.h diff --git a/Cantera/src/thermo/VPSSMgr_ConstVol.h b/include/cantera/thermo/VPSSMgr_ConstVol.h similarity index 100% rename from Cantera/src/thermo/VPSSMgr_ConstVol.h rename to include/cantera/thermo/VPSSMgr_ConstVol.h diff --git a/Cantera/src/thermo/VPSSMgr_General.h b/include/cantera/thermo/VPSSMgr_General.h similarity index 100% rename from Cantera/src/thermo/VPSSMgr_General.h rename to include/cantera/thermo/VPSSMgr_General.h diff --git a/Cantera/src/thermo/VPSSMgr_IdealGas.h b/include/cantera/thermo/VPSSMgr_IdealGas.h similarity index 100% rename from Cantera/src/thermo/VPSSMgr_IdealGas.h rename to include/cantera/thermo/VPSSMgr_IdealGas.h diff --git a/Cantera/src/thermo/VPSSMgr_Water_ConstVol.h b/include/cantera/thermo/VPSSMgr_Water_ConstVol.h similarity index 100% rename from Cantera/src/thermo/VPSSMgr_Water_ConstVol.h rename to include/cantera/thermo/VPSSMgr_Water_ConstVol.h diff --git a/Cantera/src/thermo/VPSSMgr_Water_HKFT.h b/include/cantera/thermo/VPSSMgr_Water_HKFT.h similarity index 100% rename from Cantera/src/thermo/VPSSMgr_Water_HKFT.h rename to include/cantera/thermo/VPSSMgr_Water_HKFT.h diff --git a/Cantera/src/thermo/VPSSMgr_types.h b/include/cantera/thermo/VPSSMgr_types.h similarity index 100% rename from Cantera/src/thermo/VPSSMgr_types.h rename to include/cantera/thermo/VPSSMgr_types.h diff --git a/Cantera/src/thermo/VPStandardStateTP.h b/include/cantera/thermo/VPStandardStateTP.h similarity index 100% rename from Cantera/src/thermo/VPStandardStateTP.h rename to include/cantera/thermo/VPStandardStateTP.h diff --git a/Cantera/src/thermo/WaterProps.h b/include/cantera/thermo/WaterProps.h similarity index 100% rename from Cantera/src/thermo/WaterProps.h rename to include/cantera/thermo/WaterProps.h diff --git a/Cantera/src/thermo/WaterPropsIAPWS.h b/include/cantera/thermo/WaterPropsIAPWS.h similarity index 100% rename from Cantera/src/thermo/WaterPropsIAPWS.h rename to include/cantera/thermo/WaterPropsIAPWS.h diff --git a/Cantera/src/thermo/WaterPropsIAPWSphi.h b/include/cantera/thermo/WaterPropsIAPWSphi.h similarity index 100% rename from Cantera/src/thermo/WaterPropsIAPWSphi.h rename to include/cantera/thermo/WaterPropsIAPWSphi.h diff --git a/Cantera/src/thermo/WaterSSTP.h b/include/cantera/thermo/WaterSSTP.h similarity index 100% rename from Cantera/src/thermo/WaterSSTP.h rename to include/cantera/thermo/WaterSSTP.h diff --git a/Cantera/src/thermo/electrolytes.h b/include/cantera/thermo/electrolytes.h similarity index 100% rename from Cantera/src/thermo/electrolytes.h rename to include/cantera/thermo/electrolytes.h diff --git a/Cantera/src/thermo/mix_defs.h b/include/cantera/thermo/mix_defs.h similarity index 100% rename from Cantera/src/thermo/mix_defs.h rename to include/cantera/thermo/mix_defs.h diff --git a/Cantera/src/thermo/speciesThermoTypes.h b/include/cantera/thermo/speciesThermoTypes.h similarity index 100% rename from Cantera/src/thermo/speciesThermoTypes.h rename to include/cantera/thermo/speciesThermoTypes.h diff --git a/ext/tpx/Sub.h b/include/cantera/tpx/Sub.h similarity index 100% rename from ext/tpx/Sub.h rename to include/cantera/tpx/Sub.h diff --git a/ext/tpx/utils.h b/include/cantera/tpx/utils.h similarity index 100% rename from ext/tpx/utils.h rename to include/cantera/tpx/utils.h diff --git a/Cantera/cxx/include/transport.h b/include/cantera/transport.h similarity index 100% rename from Cantera/cxx/include/transport.h rename to include/cantera/transport.h diff --git a/Cantera/src/transport/AqueousTransport.h b/include/cantera/transport/AqueousTransport.h similarity index 100% rename from Cantera/src/transport/AqueousTransport.h rename to include/cantera/transport/AqueousTransport.h diff --git a/Cantera/src/transport/DustyGasTransport.h b/include/cantera/transport/DustyGasTransport.h similarity index 100% rename from Cantera/src/transport/DustyGasTransport.h rename to include/cantera/transport/DustyGasTransport.h diff --git a/Cantera/src/transport/LTPspecies.h b/include/cantera/transport/LTPspecies.h similarity index 100% rename from Cantera/src/transport/LTPspecies.h rename to include/cantera/transport/LTPspecies.h diff --git a/Cantera/src/transport/LiquidTranInteraction.h b/include/cantera/transport/LiquidTranInteraction.h similarity index 100% rename from Cantera/src/transport/LiquidTranInteraction.h rename to include/cantera/transport/LiquidTranInteraction.h diff --git a/Cantera/src/transport/LiquidTransport.h b/include/cantera/transport/LiquidTransport.h similarity index 100% rename from Cantera/src/transport/LiquidTransport.h rename to include/cantera/transport/LiquidTransport.h diff --git a/Cantera/src/transport/LiquidTransportData.h b/include/cantera/transport/LiquidTransportData.h similarity index 100% rename from Cantera/src/transport/LiquidTransportData.h rename to include/cantera/transport/LiquidTransportData.h diff --git a/Cantera/src/transport/LiquidTransportParams.h b/include/cantera/transport/LiquidTransportParams.h similarity index 100% rename from Cantera/src/transport/LiquidTransportParams.h rename to include/cantera/transport/LiquidTransportParams.h diff --git a/Cantera/src/transport/MixTransport.h b/include/cantera/transport/MixTransport.h similarity index 100% rename from Cantera/src/transport/MixTransport.h rename to include/cantera/transport/MixTransport.h diff --git a/Cantera/src/transport/MultiTransport.h b/include/cantera/transport/MultiTransport.h similarity index 100% rename from Cantera/src/transport/MultiTransport.h rename to include/cantera/transport/MultiTransport.h diff --git a/Cantera/src/transport/SimpleTransport.h b/include/cantera/transport/SimpleTransport.h similarity index 100% rename from Cantera/src/transport/SimpleTransport.h rename to include/cantera/transport/SimpleTransport.h diff --git a/Cantera/src/transport/SolidTransport.h b/include/cantera/transport/SolidTransport.h similarity index 100% rename from Cantera/src/transport/SolidTransport.h rename to include/cantera/transport/SolidTransport.h diff --git a/Cantera/src/transport/TransportBase.h b/include/cantera/transport/TransportBase.h similarity index 100% rename from Cantera/src/transport/TransportBase.h rename to include/cantera/transport/TransportBase.h diff --git a/Cantera/src/transport/TransportFactory.h b/include/cantera/transport/TransportFactory.h similarity index 100% rename from Cantera/src/transport/TransportFactory.h rename to include/cantera/transport/TransportFactory.h diff --git a/Cantera/src/transport/TransportParams.h b/include/cantera/transport/TransportParams.h similarity index 100% rename from Cantera/src/transport/TransportParams.h rename to include/cantera/transport/TransportParams.h diff --git a/Cantera/src/transport/WaterTransport.h b/include/cantera/transport/WaterTransport.h similarity index 100% rename from Cantera/src/transport/WaterTransport.h rename to include/cantera/transport/WaterTransport.h diff --git a/Cantera/src/zeroD/ConstPressureReactor.h b/include/cantera/zeroD/ConstPressureReactor.h similarity index 100% rename from Cantera/src/zeroD/ConstPressureReactor.h rename to include/cantera/zeroD/ConstPressureReactor.h diff --git a/Cantera/src/zeroD/FlowDevice.h b/include/cantera/zeroD/FlowDevice.h similarity index 100% rename from Cantera/src/zeroD/FlowDevice.h rename to include/cantera/zeroD/FlowDevice.h diff --git a/Cantera/src/zeroD/FlowReactor.h b/include/cantera/zeroD/FlowReactor.h similarity index 100% rename from Cantera/src/zeroD/FlowReactor.h rename to include/cantera/zeroD/FlowReactor.h diff --git a/Cantera/src/zeroD/PID_Controller.h b/include/cantera/zeroD/PID_Controller.h similarity index 100% rename from Cantera/src/zeroD/PID_Controller.h rename to include/cantera/zeroD/PID_Controller.h diff --git a/Cantera/src/zeroD/Reactor.h b/include/cantera/zeroD/Reactor.h similarity index 100% rename from Cantera/src/zeroD/Reactor.h rename to include/cantera/zeroD/Reactor.h diff --git a/Cantera/src/zeroD/ReactorBase.h b/include/cantera/zeroD/ReactorBase.h similarity index 100% rename from Cantera/src/zeroD/ReactorBase.h rename to include/cantera/zeroD/ReactorBase.h diff --git a/Cantera/src/zeroD/ReactorFactory.h b/include/cantera/zeroD/ReactorFactory.h similarity index 100% rename from Cantera/src/zeroD/ReactorFactory.h rename to include/cantera/zeroD/ReactorFactory.h diff --git a/Cantera/src/zeroD/ReactorNet.h b/include/cantera/zeroD/ReactorNet.h similarity index 100% rename from Cantera/src/zeroD/ReactorNet.h rename to include/cantera/zeroD/ReactorNet.h diff --git a/Cantera/src/zeroD/Reservoir.h b/include/cantera/zeroD/Reservoir.h similarity index 100% rename from Cantera/src/zeroD/Reservoir.h rename to include/cantera/zeroD/Reservoir.h diff --git a/Cantera/src/zeroD/Wall.h b/include/cantera/zeroD/Wall.h similarity index 100% rename from Cantera/src/zeroD/Wall.h rename to include/cantera/zeroD/Wall.h diff --git a/Cantera/src/zeroD/flowControllers.h b/include/cantera/zeroD/flowControllers.h similarity index 100% rename from Cantera/src/zeroD/flowControllers.h rename to include/cantera/zeroD/flowControllers.h diff --git a/Cantera/cxx/include/zerodim.h b/include/cantera/zerodim.h similarity index 100% rename from Cantera/cxx/include/zerodim.h rename to include/cantera/zerodim.h diff --git a/tools/ctpath.m.in b/interfaces/matlab/ctpath.m.in similarity index 100% rename from tools/ctpath.m.in rename to interfaces/matlab/ctpath.m.in diff --git a/Cantera/matlab/cantera/1D/@Domain1D/Domain1D.m b/interfaces/matlab/toolbox/1D/@Domain1D/Domain1D.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/Domain1D.m rename to interfaces/matlab/toolbox/1D/@Domain1D/Domain1D.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/componentIndex.m b/interfaces/matlab/toolbox/1D/@Domain1D/componentIndex.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/componentIndex.m rename to interfaces/matlab/toolbox/1D/@Domain1D/componentIndex.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/componentName.m b/interfaces/matlab/toolbox/1D/@Domain1D/componentName.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/componentName.m rename to interfaces/matlab/toolbox/1D/@Domain1D/componentName.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/disableEnergy.m b/interfaces/matlab/toolbox/1D/@Domain1D/disableEnergy.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/disableEnergy.m rename to interfaces/matlab/toolbox/1D/@Domain1D/disableEnergy.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/domainIndex.m b/interfaces/matlab/toolbox/1D/@Domain1D/domainIndex.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/domainIndex.m rename to interfaces/matlab/toolbox/1D/@Domain1D/domainIndex.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/domainType.m b/interfaces/matlab/toolbox/1D/@Domain1D/domainType.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/domainType.m rename to interfaces/matlab/toolbox/1D/@Domain1D/domainType.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/domain_hndl.m b/interfaces/matlab/toolbox/1D/@Domain1D/domain_hndl.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/domain_hndl.m rename to interfaces/matlab/toolbox/1D/@Domain1D/domain_hndl.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/enableEnergy.m b/interfaces/matlab/toolbox/1D/@Domain1D/enableEnergy.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/enableEnergy.m rename to interfaces/matlab/toolbox/1D/@Domain1D/enableEnergy.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/gridPoints.m b/interfaces/matlab/toolbox/1D/@Domain1D/gridPoints.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/gridPoints.m rename to interfaces/matlab/toolbox/1D/@Domain1D/gridPoints.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/isFlow.m b/interfaces/matlab/toolbox/1D/@Domain1D/isFlow.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/isFlow.m rename to interfaces/matlab/toolbox/1D/@Domain1D/isFlow.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/isInlet.m b/interfaces/matlab/toolbox/1D/@Domain1D/isInlet.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/isInlet.m rename to interfaces/matlab/toolbox/1D/@Domain1D/isInlet.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/isSurface.m b/interfaces/matlab/toolbox/1D/@Domain1D/isSurface.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/isSurface.m rename to interfaces/matlab/toolbox/1D/@Domain1D/isSurface.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/massFlux.m b/interfaces/matlab/toolbox/1D/@Domain1D/massFlux.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/massFlux.m rename to interfaces/matlab/toolbox/1D/@Domain1D/massFlux.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/massFraction.m b/interfaces/matlab/toolbox/1D/@Domain1D/massFraction.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/massFraction.m rename to interfaces/matlab/toolbox/1D/@Domain1D/massFraction.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/nComponents.m b/interfaces/matlab/toolbox/1D/@Domain1D/nComponents.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/nComponents.m rename to interfaces/matlab/toolbox/1D/@Domain1D/nComponents.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/nPoints.m b/interfaces/matlab/toolbox/1D/@Domain1D/nPoints.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/nPoints.m rename to interfaces/matlab/toolbox/1D/@Domain1D/nPoints.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/private/domain_methods.m b/interfaces/matlab/toolbox/1D/@Domain1D/private/domain_methods.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/private/domain_methods.m rename to interfaces/matlab/toolbox/1D/@Domain1D/private/domain_methods.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/set.m b/interfaces/matlab/toolbox/1D/@Domain1D/set.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/set.m rename to interfaces/matlab/toolbox/1D/@Domain1D/set.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/setBounds.m b/interfaces/matlab/toolbox/1D/@Domain1D/setBounds.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/setBounds.m rename to interfaces/matlab/toolbox/1D/@Domain1D/setBounds.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/setCoverageEqs.m b/interfaces/matlab/toolbox/1D/@Domain1D/setCoverageEqs.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/setCoverageEqs.m rename to interfaces/matlab/toolbox/1D/@Domain1D/setCoverageEqs.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/setFixedTempProfile.m b/interfaces/matlab/toolbox/1D/@Domain1D/setFixedTempProfile.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/setFixedTempProfile.m rename to interfaces/matlab/toolbox/1D/@Domain1D/setFixedTempProfile.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/setID.m b/interfaces/matlab/toolbox/1D/@Domain1D/setID.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/setID.m rename to interfaces/matlab/toolbox/1D/@Domain1D/setID.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/setMdot.m b/interfaces/matlab/toolbox/1D/@Domain1D/setMdot.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/setMdot.m rename to interfaces/matlab/toolbox/1D/@Domain1D/setMdot.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/setMoleFractions.m b/interfaces/matlab/toolbox/1D/@Domain1D/setMoleFractions.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/setMoleFractions.m rename to interfaces/matlab/toolbox/1D/@Domain1D/setMoleFractions.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/setPressure.m b/interfaces/matlab/toolbox/1D/@Domain1D/setPressure.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/setPressure.m rename to interfaces/matlab/toolbox/1D/@Domain1D/setPressure.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/setProfile.m b/interfaces/matlab/toolbox/1D/@Domain1D/setProfile.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/setProfile.m rename to interfaces/matlab/toolbox/1D/@Domain1D/setProfile.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/setTemperature.m b/interfaces/matlab/toolbox/1D/@Domain1D/setTemperature.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/setTemperature.m rename to interfaces/matlab/toolbox/1D/@Domain1D/setTemperature.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/setTolerances.m b/interfaces/matlab/toolbox/1D/@Domain1D/setTolerances.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/setTolerances.m rename to interfaces/matlab/toolbox/1D/@Domain1D/setTolerances.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/setupGrid.m b/interfaces/matlab/toolbox/1D/@Domain1D/setupGrid.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/setupGrid.m rename to interfaces/matlab/toolbox/1D/@Domain1D/setupGrid.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/temperature.m b/interfaces/matlab/toolbox/1D/@Domain1D/temperature.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/temperature.m rename to interfaces/matlab/toolbox/1D/@Domain1D/temperature.m diff --git a/Cantera/matlab/cantera/1D/@Domain1D/z.m b/interfaces/matlab/toolbox/1D/@Domain1D/z.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Domain1D/z.m rename to interfaces/matlab/toolbox/1D/@Domain1D/z.m diff --git a/Cantera/matlab/cantera/1D/@Stack/Stack.m b/interfaces/matlab/toolbox/1D/@Stack/Stack.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Stack/Stack.m rename to interfaces/matlab/toolbox/1D/@Stack/Stack.m diff --git a/Cantera/matlab/cantera/1D/@Stack/display.m b/interfaces/matlab/toolbox/1D/@Stack/display.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Stack/display.m rename to interfaces/matlab/toolbox/1D/@Stack/display.m diff --git a/Cantera/matlab/cantera/1D/@Stack/domainIndex.m b/interfaces/matlab/toolbox/1D/@Stack/domainIndex.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Stack/domainIndex.m rename to interfaces/matlab/toolbox/1D/@Stack/domainIndex.m diff --git a/Cantera/matlab/cantera/1D/@Stack/grid.m b/interfaces/matlab/toolbox/1D/@Stack/grid.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Stack/grid.m rename to interfaces/matlab/toolbox/1D/@Stack/grid.m diff --git a/Cantera/matlab/cantera/1D/@Stack/plotSolution.m b/interfaces/matlab/toolbox/1D/@Stack/plotSolution.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Stack/plotSolution.m rename to interfaces/matlab/toolbox/1D/@Stack/plotSolution.m diff --git a/Cantera/matlab/cantera/1D/@Stack/private/stack_methods.m b/interfaces/matlab/toolbox/1D/@Stack/private/stack_methods.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Stack/private/stack_methods.m rename to interfaces/matlab/toolbox/1D/@Stack/private/stack_methods.m diff --git a/Cantera/matlab/cantera/1D/@Stack/resid.m b/interfaces/matlab/toolbox/1D/@Stack/resid.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Stack/resid.m rename to interfaces/matlab/toolbox/1D/@Stack/resid.m diff --git a/Cantera/matlab/cantera/1D/@Stack/restore.m b/interfaces/matlab/toolbox/1D/@Stack/restore.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Stack/restore.m rename to interfaces/matlab/toolbox/1D/@Stack/restore.m diff --git a/Cantera/matlab/cantera/1D/@Stack/save.m b/interfaces/matlab/toolbox/1D/@Stack/save.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Stack/save.m rename to interfaces/matlab/toolbox/1D/@Stack/save.m diff --git a/Cantera/matlab/cantera/1D/@Stack/saveSoln.m b/interfaces/matlab/toolbox/1D/@Stack/saveSoln.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Stack/saveSoln.m rename to interfaces/matlab/toolbox/1D/@Stack/saveSoln.m diff --git a/Cantera/matlab/cantera/1D/@Stack/setFlatProfile.m b/interfaces/matlab/toolbox/1D/@Stack/setFlatProfile.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Stack/setFlatProfile.m rename to interfaces/matlab/toolbox/1D/@Stack/setFlatProfile.m diff --git a/Cantera/matlab/cantera/1D/@Stack/setMaxJacAge.m b/interfaces/matlab/toolbox/1D/@Stack/setMaxJacAge.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Stack/setMaxJacAge.m rename to interfaces/matlab/toolbox/1D/@Stack/setMaxJacAge.m diff --git a/Cantera/matlab/cantera/1D/@Stack/setProfile.m b/interfaces/matlab/toolbox/1D/@Stack/setProfile.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Stack/setProfile.m rename to interfaces/matlab/toolbox/1D/@Stack/setProfile.m diff --git a/Cantera/matlab/cantera/1D/@Stack/setRefineCriteria.m b/interfaces/matlab/toolbox/1D/@Stack/setRefineCriteria.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Stack/setRefineCriteria.m rename to interfaces/matlab/toolbox/1D/@Stack/setRefineCriteria.m diff --git a/Cantera/matlab/cantera/1D/@Stack/setTimeStep.m b/interfaces/matlab/toolbox/1D/@Stack/setTimeStep.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Stack/setTimeStep.m rename to interfaces/matlab/toolbox/1D/@Stack/setTimeStep.m diff --git a/Cantera/matlab/cantera/1D/@Stack/setValue.m b/interfaces/matlab/toolbox/1D/@Stack/setValue.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Stack/setValue.m rename to interfaces/matlab/toolbox/1D/@Stack/setValue.m diff --git a/Cantera/matlab/cantera/1D/@Stack/solution.m b/interfaces/matlab/toolbox/1D/@Stack/solution.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Stack/solution.m rename to interfaces/matlab/toolbox/1D/@Stack/solution.m diff --git a/Cantera/matlab/cantera/1D/@Stack/solve.m b/interfaces/matlab/toolbox/1D/@Stack/solve.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Stack/solve.m rename to interfaces/matlab/toolbox/1D/@Stack/solve.m diff --git a/Cantera/matlab/cantera/1D/@Stack/subsref.m b/interfaces/matlab/toolbox/1D/@Stack/subsref.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Stack/subsref.m rename to interfaces/matlab/toolbox/1D/@Stack/subsref.m diff --git a/Cantera/matlab/cantera/1D/@Stack/writeStats.m b/interfaces/matlab/toolbox/1D/@Stack/writeStats.m similarity index 100% rename from Cantera/matlab/cantera/1D/@Stack/writeStats.m rename to interfaces/matlab/toolbox/1D/@Stack/writeStats.m diff --git a/Cantera/matlab/cantera/1D/AxiStagnFlow.m b/interfaces/matlab/toolbox/1D/AxiStagnFlow.m similarity index 100% rename from Cantera/matlab/cantera/1D/AxiStagnFlow.m rename to interfaces/matlab/toolbox/1D/AxiStagnFlow.m diff --git a/Cantera/matlab/cantera/1D/AxisymmetricFlow.m b/interfaces/matlab/toolbox/1D/AxisymmetricFlow.m similarity index 100% rename from Cantera/matlab/cantera/1D/AxisymmetricFlow.m rename to interfaces/matlab/toolbox/1D/AxisymmetricFlow.m diff --git a/Cantera/matlab/cantera/1D/FreeFlame.m b/interfaces/matlab/toolbox/1D/FreeFlame.m similarity index 100% rename from Cantera/matlab/cantera/1D/FreeFlame.m rename to interfaces/matlab/toolbox/1D/FreeFlame.m diff --git a/Cantera/matlab/cantera/1D/Inlet.m b/interfaces/matlab/toolbox/1D/Inlet.m similarity index 100% rename from Cantera/matlab/cantera/1D/Inlet.m rename to interfaces/matlab/toolbox/1D/Inlet.m diff --git a/Cantera/matlab/cantera/1D/Outlet.m b/interfaces/matlab/toolbox/1D/Outlet.m similarity index 100% rename from Cantera/matlab/cantera/1D/Outlet.m rename to interfaces/matlab/toolbox/1D/Outlet.m diff --git a/Cantera/matlab/cantera/1D/OutletRes.m b/interfaces/matlab/toolbox/1D/OutletRes.m similarity index 100% rename from Cantera/matlab/cantera/1D/OutletRes.m rename to interfaces/matlab/toolbox/1D/OutletRes.m diff --git a/Cantera/matlab/cantera/1D/Surface.m b/interfaces/matlab/toolbox/1D/Surface.m similarity index 100% rename from Cantera/matlab/cantera/1D/Surface.m rename to interfaces/matlab/toolbox/1D/Surface.m diff --git a/Cantera/matlab/cantera/1D/SymmPlane.m b/interfaces/matlab/toolbox/1D/SymmPlane.m similarity index 100% rename from Cantera/matlab/cantera/1D/SymmPlane.m rename to interfaces/matlab/toolbox/1D/SymmPlane.m diff --git a/Cantera/matlab/cantera/1D/nComponents.m b/interfaces/matlab/toolbox/1D/nComponents.m similarity index 100% rename from Cantera/matlab/cantera/1D/nComponents.m rename to interfaces/matlab/toolbox/1D/nComponents.m diff --git a/Cantera/matlab/cantera/1D/npflame_init.m b/interfaces/matlab/toolbox/1D/npflame_init.m similarity index 100% rename from Cantera/matlab/cantera/1D/npflame_init.m rename to interfaces/matlab/toolbox/1D/npflame_init.m diff --git a/Cantera/matlab/cantera/@FlowDevice/FlowDevice.m b/interfaces/matlab/toolbox/@FlowDevice/FlowDevice.m similarity index 100% rename from Cantera/matlab/cantera/@FlowDevice/FlowDevice.m rename to interfaces/matlab/toolbox/@FlowDevice/FlowDevice.m diff --git a/Cantera/matlab/cantera/@FlowDevice/clear.m b/interfaces/matlab/toolbox/@FlowDevice/clear.m similarity index 100% rename from Cantera/matlab/cantera/@FlowDevice/clear.m rename to interfaces/matlab/toolbox/@FlowDevice/clear.m diff --git a/Cantera/matlab/cantera/@FlowDevice/install.m b/interfaces/matlab/toolbox/@FlowDevice/install.m similarity index 100% rename from Cantera/matlab/cantera/@FlowDevice/install.m rename to interfaces/matlab/toolbox/@FlowDevice/install.m diff --git a/Cantera/matlab/cantera/@FlowDevice/massFlowRate.m b/interfaces/matlab/toolbox/@FlowDevice/massFlowRate.m similarity index 100% rename from Cantera/matlab/cantera/@FlowDevice/massFlowRate.m rename to interfaces/matlab/toolbox/@FlowDevice/massFlowRate.m diff --git a/Cantera/matlab/cantera/@FlowDevice/private/flowdevicemethods.m b/interfaces/matlab/toolbox/@FlowDevice/private/flowdevicemethods.m similarity index 100% rename from Cantera/matlab/cantera/@FlowDevice/private/flowdevicemethods.m rename to interfaces/matlab/toolbox/@FlowDevice/private/flowdevicemethods.m diff --git a/Cantera/matlab/cantera/@FlowDevice/setFunction.m b/interfaces/matlab/toolbox/@FlowDevice/setFunction.m similarity index 100% rename from Cantera/matlab/cantera/@FlowDevice/setFunction.m rename to interfaces/matlab/toolbox/@FlowDevice/setFunction.m diff --git a/Cantera/matlab/cantera/@FlowDevice/setMassFlowRate.m b/interfaces/matlab/toolbox/@FlowDevice/setMassFlowRate.m similarity index 100% rename from Cantera/matlab/cantera/@FlowDevice/setMassFlowRate.m rename to interfaces/matlab/toolbox/@FlowDevice/setMassFlowRate.m diff --git a/Cantera/matlab/cantera/@FlowDevice/setValveCoeff.m b/interfaces/matlab/toolbox/@FlowDevice/setValveCoeff.m similarity index 100% rename from Cantera/matlab/cantera/@FlowDevice/setValveCoeff.m rename to interfaces/matlab/toolbox/@FlowDevice/setValveCoeff.m diff --git a/Cantera/matlab/cantera/@Func/Func.m b/interfaces/matlab/toolbox/@Func/Func.m similarity index 100% rename from Cantera/matlab/cantera/@Func/Func.m rename to interfaces/matlab/toolbox/@Func/Func.m diff --git a/Cantera/matlab/cantera/@Func/char.m b/interfaces/matlab/toolbox/@Func/char.m similarity index 100% rename from Cantera/matlab/cantera/@Func/char.m rename to interfaces/matlab/toolbox/@Func/char.m diff --git a/Cantera/matlab/cantera/@Func/display.m b/interfaces/matlab/toolbox/@Func/display.m similarity index 100% rename from Cantera/matlab/cantera/@Func/display.m rename to interfaces/matlab/toolbox/@Func/display.m diff --git a/Cantera/matlab/cantera/@Func/func_hndl.m b/interfaces/matlab/toolbox/@Func/func_hndl.m similarity index 100% rename from Cantera/matlab/cantera/@Func/func_hndl.m rename to interfaces/matlab/toolbox/@Func/func_hndl.m diff --git a/Cantera/matlab/cantera/@Func/plus.m b/interfaces/matlab/toolbox/@Func/plus.m similarity index 100% rename from Cantera/matlab/cantera/@Func/plus.m rename to interfaces/matlab/toolbox/@Func/plus.m diff --git a/Cantera/matlab/cantera/@Func/private/funcmethods.m b/interfaces/matlab/toolbox/@Func/private/funcmethods.m similarity index 100% rename from Cantera/matlab/cantera/@Func/private/funcmethods.m rename to interfaces/matlab/toolbox/@Func/private/funcmethods.m diff --git a/Cantera/matlab/cantera/@Func/rdivide.m b/interfaces/matlab/toolbox/@Func/rdivide.m similarity index 100% rename from Cantera/matlab/cantera/@Func/rdivide.m rename to interfaces/matlab/toolbox/@Func/rdivide.m diff --git a/Cantera/matlab/cantera/@Func/subsref.m b/interfaces/matlab/toolbox/@Func/subsref.m similarity index 100% rename from Cantera/matlab/cantera/@Func/subsref.m rename to interfaces/matlab/toolbox/@Func/subsref.m diff --git a/Cantera/matlab/cantera/@Func/times.m b/interfaces/matlab/toolbox/@Func/times.m similarity index 100% rename from Cantera/matlab/cantera/@Func/times.m rename to interfaces/matlab/toolbox/@Func/times.m diff --git a/Cantera/matlab/cantera/@Interface/Interface.m b/interfaces/matlab/toolbox/@Interface/Interface.m similarity index 100% rename from Cantera/matlab/cantera/@Interface/Interface.m rename to interfaces/matlab/toolbox/@Interface/Interface.m diff --git a/Cantera/matlab/cantera/@Interface/concentrations.m b/interfaces/matlab/toolbox/@Interface/concentrations.m similarity index 100% rename from Cantera/matlab/cantera/@Interface/concentrations.m rename to interfaces/matlab/toolbox/@Interface/concentrations.m diff --git a/Cantera/matlab/cantera/@Interface/coverages.m b/interfaces/matlab/toolbox/@Interface/coverages.m similarity index 100% rename from Cantera/matlab/cantera/@Interface/coverages.m rename to interfaces/matlab/toolbox/@Interface/coverages.m diff --git a/Cantera/matlab/cantera/@Interface/private/surfmethods.m b/interfaces/matlab/toolbox/@Interface/private/surfmethods.m similarity index 100% rename from Cantera/matlab/cantera/@Interface/private/surfmethods.m rename to interfaces/matlab/toolbox/@Interface/private/surfmethods.m diff --git a/Cantera/matlab/cantera/@Interface/setCoverages.m b/interfaces/matlab/toolbox/@Interface/setCoverages.m similarity index 100% rename from Cantera/matlab/cantera/@Interface/setCoverages.m rename to interfaces/matlab/toolbox/@Interface/setCoverages.m diff --git a/Cantera/matlab/cantera/@Kinetics/Kinetics.m b/interfaces/matlab/toolbox/@Kinetics/Kinetics.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/Kinetics.m rename to interfaces/matlab/toolbox/@Kinetics/Kinetics.m diff --git a/Cantera/matlab/cantera/@Kinetics/advanceCoverages.m b/interfaces/matlab/toolbox/@Kinetics/advanceCoverages.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/advanceCoverages.m rename to interfaces/matlab/toolbox/@Kinetics/advanceCoverages.m diff --git a/Cantera/matlab/cantera/@Kinetics/clear.m b/interfaces/matlab/toolbox/@Kinetics/clear.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/clear.m rename to interfaces/matlab/toolbox/@Kinetics/clear.m diff --git a/Cantera/matlab/cantera/@Kinetics/creationRates.m b/interfaces/matlab/toolbox/@Kinetics/creationRates.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/creationRates.m rename to interfaces/matlab/toolbox/@Kinetics/creationRates.m diff --git a/Cantera/matlab/cantera/@Kinetics/destructionRates.m b/interfaces/matlab/toolbox/@Kinetics/destructionRates.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/destructionRates.m rename to interfaces/matlab/toolbox/@Kinetics/destructionRates.m diff --git a/Cantera/matlab/cantera/@Kinetics/destruction_rates.m b/interfaces/matlab/toolbox/@Kinetics/destruction_rates.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/destruction_rates.m rename to interfaces/matlab/toolbox/@Kinetics/destruction_rates.m diff --git a/Cantera/matlab/cantera/@Kinetics/equil_Kc.m b/interfaces/matlab/toolbox/@Kinetics/equil_Kc.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/equil_Kc.m rename to interfaces/matlab/toolbox/@Kinetics/equil_Kc.m diff --git a/Cantera/matlab/cantera/@Kinetics/hndl.m b/interfaces/matlab/toolbox/@Kinetics/hndl.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/hndl.m rename to interfaces/matlab/toolbox/@Kinetics/hndl.m diff --git a/Cantera/matlab/cantera/@Kinetics/isReversible.m b/interfaces/matlab/toolbox/@Kinetics/isReversible.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/isReversible.m rename to interfaces/matlab/toolbox/@Kinetics/isReversible.m diff --git a/Cantera/matlab/cantera/@Kinetics/kinetics_hndl.m b/interfaces/matlab/toolbox/@Kinetics/kinetics_hndl.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/kinetics_hndl.m rename to interfaces/matlab/toolbox/@Kinetics/kinetics_hndl.m diff --git a/Cantera/matlab/cantera/@Kinetics/multiplier.m b/interfaces/matlab/toolbox/@Kinetics/multiplier.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/multiplier.m rename to interfaces/matlab/toolbox/@Kinetics/multiplier.m diff --git a/Cantera/matlab/cantera/@Kinetics/nReactions.m b/interfaces/matlab/toolbox/@Kinetics/nReactions.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/nReactions.m rename to interfaces/matlab/toolbox/@Kinetics/nReactions.m diff --git a/Cantera/matlab/cantera/@Kinetics/nTotalSpecies.m b/interfaces/matlab/toolbox/@Kinetics/nTotalSpecies.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/nTotalSpecies.m rename to interfaces/matlab/toolbox/@Kinetics/nTotalSpecies.m diff --git a/Cantera/matlab/cantera/@Kinetics/netProdRates.m b/interfaces/matlab/toolbox/@Kinetics/netProdRates.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/netProdRates.m rename to interfaces/matlab/toolbox/@Kinetics/netProdRates.m diff --git a/Cantera/matlab/cantera/@Kinetics/private/kinetics_get.m b/interfaces/matlab/toolbox/@Kinetics/private/kinetics_get.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/private/kinetics_get.m rename to interfaces/matlab/toolbox/@Kinetics/private/kinetics_get.m diff --git a/Cantera/matlab/cantera/@Kinetics/private/kinetics_set.m b/interfaces/matlab/toolbox/@Kinetics/private/kinetics_set.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/private/kinetics_set.m rename to interfaces/matlab/toolbox/@Kinetics/private/kinetics_set.m diff --git a/Cantera/matlab/cantera/@Kinetics/reactionEqn.m b/interfaces/matlab/toolbox/@Kinetics/reactionEqn.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/reactionEqn.m rename to interfaces/matlab/toolbox/@Kinetics/reactionEqn.m diff --git a/Cantera/matlab/cantera/@Kinetics/rop.m b/interfaces/matlab/toolbox/@Kinetics/rop.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/rop.m rename to interfaces/matlab/toolbox/@Kinetics/rop.m diff --git a/Cantera/matlab/cantera/@Kinetics/rop_f.m b/interfaces/matlab/toolbox/@Kinetics/rop_f.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/rop_f.m rename to interfaces/matlab/toolbox/@Kinetics/rop_f.m diff --git a/Cantera/matlab/cantera/@Kinetics/rop_net.m b/interfaces/matlab/toolbox/@Kinetics/rop_net.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/rop_net.m rename to interfaces/matlab/toolbox/@Kinetics/rop_net.m diff --git a/Cantera/matlab/cantera/@Kinetics/rop_r.m b/interfaces/matlab/toolbox/@Kinetics/rop_r.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/rop_r.m rename to interfaces/matlab/toolbox/@Kinetics/rop_r.m diff --git a/Cantera/matlab/cantera/@Kinetics/rxnEqs.m b/interfaces/matlab/toolbox/@Kinetics/rxnEqs.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/rxnEqs.m rename to interfaces/matlab/toolbox/@Kinetics/rxnEqs.m diff --git a/Cantera/matlab/cantera/@Kinetics/setMultiplier.m b/interfaces/matlab/toolbox/@Kinetics/setMultiplier.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/setMultiplier.m rename to interfaces/matlab/toolbox/@Kinetics/setMultiplier.m diff --git a/Cantera/matlab/cantera/@Kinetics/stoich_net.m b/interfaces/matlab/toolbox/@Kinetics/stoich_net.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/stoich_net.m rename to interfaces/matlab/toolbox/@Kinetics/stoich_net.m diff --git a/Cantera/matlab/cantera/@Kinetics/stoich_p.m b/interfaces/matlab/toolbox/@Kinetics/stoich_p.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/stoich_p.m rename to interfaces/matlab/toolbox/@Kinetics/stoich_p.m diff --git a/Cantera/matlab/cantera/@Kinetics/stoich_r.m b/interfaces/matlab/toolbox/@Kinetics/stoich_r.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/stoich_r.m rename to interfaces/matlab/toolbox/@Kinetics/stoich_r.m diff --git a/Cantera/matlab/cantera/@Kinetics/ydot.m b/interfaces/matlab/toolbox/@Kinetics/ydot.m similarity index 100% rename from Cantera/matlab/cantera/@Kinetics/ydot.m rename to interfaces/matlab/toolbox/@Kinetics/ydot.m diff --git a/Cantera/matlab/cantera/@Mixture/Mixture.m b/interfaces/matlab/toolbox/@Mixture/Mixture.m similarity index 100% rename from Cantera/matlab/cantera/@Mixture/Mixture.m rename to interfaces/matlab/toolbox/@Mixture/Mixture.m diff --git a/Cantera/matlab/cantera/@Mixture/addPhase.m b/interfaces/matlab/toolbox/@Mixture/addPhase.m similarity index 100% rename from Cantera/matlab/cantera/@Mixture/addPhase.m rename to interfaces/matlab/toolbox/@Mixture/addPhase.m diff --git a/Cantera/matlab/cantera/@Mixture/chemPotentials.m b/interfaces/matlab/toolbox/@Mixture/chemPotentials.m similarity index 100% rename from Cantera/matlab/cantera/@Mixture/chemPotentials.m rename to interfaces/matlab/toolbox/@Mixture/chemPotentials.m diff --git a/Cantera/matlab/cantera/@Mixture/display.m b/interfaces/matlab/toolbox/@Mixture/display.m similarity index 100% rename from Cantera/matlab/cantera/@Mixture/display.m rename to interfaces/matlab/toolbox/@Mixture/display.m diff --git a/Cantera/matlab/cantera/@Mixture/elementIndex.m b/interfaces/matlab/toolbox/@Mixture/elementIndex.m similarity index 100% rename from Cantera/matlab/cantera/@Mixture/elementIndex.m rename to interfaces/matlab/toolbox/@Mixture/elementIndex.m diff --git a/Cantera/matlab/cantera/@Mixture/equilibrate.m b/interfaces/matlab/toolbox/@Mixture/equilibrate.m similarity index 100% rename from Cantera/matlab/cantera/@Mixture/equilibrate.m rename to interfaces/matlab/toolbox/@Mixture/equilibrate.m diff --git a/Cantera/matlab/cantera/@Mixture/mix_hndl.m b/interfaces/matlab/toolbox/@Mixture/mix_hndl.m similarity index 100% rename from Cantera/matlab/cantera/@Mixture/mix_hndl.m rename to interfaces/matlab/toolbox/@Mixture/mix_hndl.m diff --git a/Cantera/matlab/cantera/@Mixture/nElements.m b/interfaces/matlab/toolbox/@Mixture/nElements.m similarity index 100% rename from Cantera/matlab/cantera/@Mixture/nElements.m rename to interfaces/matlab/toolbox/@Mixture/nElements.m diff --git a/Cantera/matlab/cantera/@Mixture/nPhases.m b/interfaces/matlab/toolbox/@Mixture/nPhases.m similarity index 100% rename from Cantera/matlab/cantera/@Mixture/nPhases.m rename to interfaces/matlab/toolbox/@Mixture/nPhases.m diff --git a/Cantera/matlab/cantera/@Mixture/nSpecies.m b/interfaces/matlab/toolbox/@Mixture/nSpecies.m similarity index 100% rename from Cantera/matlab/cantera/@Mixture/nSpecies.m rename to interfaces/matlab/toolbox/@Mixture/nSpecies.m diff --git a/Cantera/matlab/cantera/@Mixture/phaseMoles.m b/interfaces/matlab/toolbox/@Mixture/phaseMoles.m similarity index 100% rename from Cantera/matlab/cantera/@Mixture/phaseMoles.m rename to interfaces/matlab/toolbox/@Mixture/phaseMoles.m diff --git a/Cantera/matlab/cantera/@Mixture/pressure.m b/interfaces/matlab/toolbox/@Mixture/pressure.m similarity index 100% rename from Cantera/matlab/cantera/@Mixture/pressure.m rename to interfaces/matlab/toolbox/@Mixture/pressure.m diff --git a/Cantera/matlab/cantera/@Mixture/private/mixturemethods.m b/interfaces/matlab/toolbox/@Mixture/private/mixturemethods.m similarity index 100% rename from Cantera/matlab/cantera/@Mixture/private/mixturemethods.m rename to interfaces/matlab/toolbox/@Mixture/private/mixturemethods.m diff --git a/Cantera/matlab/cantera/@Mixture/setPhaseMoles.m b/interfaces/matlab/toolbox/@Mixture/setPhaseMoles.m similarity index 100% rename from Cantera/matlab/cantera/@Mixture/setPhaseMoles.m rename to interfaces/matlab/toolbox/@Mixture/setPhaseMoles.m diff --git a/Cantera/matlab/cantera/@Mixture/setPressure.m b/interfaces/matlab/toolbox/@Mixture/setPressure.m similarity index 100% rename from Cantera/matlab/cantera/@Mixture/setPressure.m rename to interfaces/matlab/toolbox/@Mixture/setPressure.m diff --git a/Cantera/matlab/cantera/@Mixture/setSpeciesMoles.m b/interfaces/matlab/toolbox/@Mixture/setSpeciesMoles.m similarity index 100% rename from Cantera/matlab/cantera/@Mixture/setSpeciesMoles.m rename to interfaces/matlab/toolbox/@Mixture/setSpeciesMoles.m diff --git a/Cantera/matlab/cantera/@Mixture/setTemperature.m b/interfaces/matlab/toolbox/@Mixture/setTemperature.m similarity index 100% rename from Cantera/matlab/cantera/@Mixture/setTemperature.m rename to interfaces/matlab/toolbox/@Mixture/setTemperature.m diff --git a/Cantera/matlab/cantera/@Mixture/speciesIndex.m b/interfaces/matlab/toolbox/@Mixture/speciesIndex.m similarity index 100% rename from Cantera/matlab/cantera/@Mixture/speciesIndex.m rename to interfaces/matlab/toolbox/@Mixture/speciesIndex.m diff --git a/Cantera/matlab/cantera/@Mixture/temperature.m b/interfaces/matlab/toolbox/@Mixture/temperature.m similarity index 100% rename from Cantera/matlab/cantera/@Mixture/temperature.m rename to interfaces/matlab/toolbox/@Mixture/temperature.m diff --git a/Cantera/matlab/cantera/@Reactor/Reactor.m b/interfaces/matlab/toolbox/@Reactor/Reactor.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/Reactor.m rename to interfaces/matlab/toolbox/@Reactor/Reactor.m diff --git a/Cantera/matlab/cantera/@Reactor/advance.m b/interfaces/matlab/toolbox/@Reactor/advance.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/advance.m rename to interfaces/matlab/toolbox/@Reactor/advance.m diff --git a/Cantera/matlab/cantera/@Reactor/clear.m b/interfaces/matlab/toolbox/@Reactor/clear.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/clear.m rename to interfaces/matlab/toolbox/@Reactor/clear.m diff --git a/Cantera/matlab/cantera/@Reactor/density.m b/interfaces/matlab/toolbox/@Reactor/density.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/density.m rename to interfaces/matlab/toolbox/@Reactor/density.m diff --git a/Cantera/matlab/cantera/@Reactor/enthalpy_mass.m b/interfaces/matlab/toolbox/@Reactor/enthalpy_mass.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/enthalpy_mass.m rename to interfaces/matlab/toolbox/@Reactor/enthalpy_mass.m diff --git a/Cantera/matlab/cantera/@Reactor/hndl.m b/interfaces/matlab/toolbox/@Reactor/hndl.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/hndl.m rename to interfaces/matlab/toolbox/@Reactor/hndl.m diff --git a/Cantera/matlab/cantera/@Reactor/insert.m b/interfaces/matlab/toolbox/@Reactor/insert.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/insert.m rename to interfaces/matlab/toolbox/@Reactor/insert.m diff --git a/Cantera/matlab/cantera/@Reactor/intEnergy_mass.m b/interfaces/matlab/toolbox/@Reactor/intEnergy_mass.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/intEnergy_mass.m rename to interfaces/matlab/toolbox/@Reactor/intEnergy_mass.m diff --git a/Cantera/matlab/cantera/@Reactor/mass.m b/interfaces/matlab/toolbox/@Reactor/mass.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/mass.m rename to interfaces/matlab/toolbox/@Reactor/mass.m diff --git a/Cantera/matlab/cantera/@Reactor/massFraction.m b/interfaces/matlab/toolbox/@Reactor/massFraction.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/massFraction.m rename to interfaces/matlab/toolbox/@Reactor/massFraction.m diff --git a/Cantera/matlab/cantera/@Reactor/massFractions.m b/interfaces/matlab/toolbox/@Reactor/massFractions.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/massFractions.m rename to interfaces/matlab/toolbox/@Reactor/massFractions.m diff --git a/Cantera/matlab/cantera/@Reactor/pressure.m b/interfaces/matlab/toolbox/@Reactor/pressure.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/pressure.m rename to interfaces/matlab/toolbox/@Reactor/pressure.m diff --git a/Cantera/matlab/cantera/@Reactor/private/reactormethods.m b/interfaces/matlab/toolbox/@Reactor/private/reactormethods.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/private/reactormethods.m rename to interfaces/matlab/toolbox/@Reactor/private/reactormethods.m diff --git a/Cantera/matlab/cantera/@Reactor/reactor_hndl.m b/interfaces/matlab/toolbox/@Reactor/reactor_hndl.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/reactor_hndl.m rename to interfaces/matlab/toolbox/@Reactor/reactor_hndl.m diff --git a/Cantera/matlab/cantera/@Reactor/setEnergy.m b/interfaces/matlab/toolbox/@Reactor/setEnergy.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/setEnergy.m rename to interfaces/matlab/toolbox/@Reactor/setEnergy.m diff --git a/Cantera/matlab/cantera/@Reactor/setInitialTime.m b/interfaces/matlab/toolbox/@Reactor/setInitialTime.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/setInitialTime.m rename to interfaces/matlab/toolbox/@Reactor/setInitialTime.m diff --git a/Cantera/matlab/cantera/@Reactor/setInitialVolume.m b/interfaces/matlab/toolbox/@Reactor/setInitialVolume.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/setInitialVolume.m rename to interfaces/matlab/toolbox/@Reactor/setInitialVolume.m diff --git a/Cantera/matlab/cantera/@Reactor/setKineticsMgr.m b/interfaces/matlab/toolbox/@Reactor/setKineticsMgr.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/setKineticsMgr.m rename to interfaces/matlab/toolbox/@Reactor/setKineticsMgr.m diff --git a/Cantera/matlab/cantera/@Reactor/setThermoMgr.m b/interfaces/matlab/toolbox/@Reactor/setThermoMgr.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/setThermoMgr.m rename to interfaces/matlab/toolbox/@Reactor/setThermoMgr.m diff --git a/Cantera/matlab/cantera/@Reactor/step.m b/interfaces/matlab/toolbox/@Reactor/step.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/step.m rename to interfaces/matlab/toolbox/@Reactor/step.m diff --git a/Cantera/matlab/cantera/@Reactor/temperature.m b/interfaces/matlab/toolbox/@Reactor/temperature.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/temperature.m rename to interfaces/matlab/toolbox/@Reactor/temperature.m diff --git a/Cantera/matlab/cantera/@Reactor/time.m b/interfaces/matlab/toolbox/@Reactor/time.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/time.m rename to interfaces/matlab/toolbox/@Reactor/time.m diff --git a/Cantera/matlab/cantera/@Reactor/volume.m b/interfaces/matlab/toolbox/@Reactor/volume.m similarity index 100% rename from Cantera/matlab/cantera/@Reactor/volume.m rename to interfaces/matlab/toolbox/@Reactor/volume.m diff --git a/Cantera/matlab/cantera/@ReactorNet/ReactorNet.m b/interfaces/matlab/toolbox/@ReactorNet/ReactorNet.m similarity index 100% rename from Cantera/matlab/cantera/@ReactorNet/ReactorNet.m rename to interfaces/matlab/toolbox/@ReactorNet/ReactorNet.m diff --git a/Cantera/matlab/cantera/@ReactorNet/addReactor.m b/interfaces/matlab/toolbox/@ReactorNet/addReactor.m similarity index 100% rename from Cantera/matlab/cantera/@ReactorNet/addReactor.m rename to interfaces/matlab/toolbox/@ReactorNet/addReactor.m diff --git a/Cantera/matlab/cantera/@ReactorNet/advance.m b/interfaces/matlab/toolbox/@ReactorNet/advance.m similarity index 100% rename from Cantera/matlab/cantera/@ReactorNet/advance.m rename to interfaces/matlab/toolbox/@ReactorNet/advance.m diff --git a/Cantera/matlab/cantera/@ReactorNet/atol.m b/interfaces/matlab/toolbox/@ReactorNet/atol.m similarity index 100% rename from Cantera/matlab/cantera/@ReactorNet/atol.m rename to interfaces/matlab/toolbox/@ReactorNet/atol.m diff --git a/Cantera/matlab/cantera/@ReactorNet/private/reactornetmethods.m b/interfaces/matlab/toolbox/@ReactorNet/private/reactornetmethods.m similarity index 100% rename from Cantera/matlab/cantera/@ReactorNet/private/reactornetmethods.m rename to interfaces/matlab/toolbox/@ReactorNet/private/reactornetmethods.m diff --git a/Cantera/matlab/cantera/@ReactorNet/reactornet_hndl.m b/interfaces/matlab/toolbox/@ReactorNet/reactornet_hndl.m similarity index 100% rename from Cantera/matlab/cantera/@ReactorNet/reactornet_hndl.m rename to interfaces/matlab/toolbox/@ReactorNet/reactornet_hndl.m diff --git a/Cantera/matlab/cantera/@ReactorNet/rtol.m b/interfaces/matlab/toolbox/@ReactorNet/rtol.m similarity index 100% rename from Cantera/matlab/cantera/@ReactorNet/rtol.m rename to interfaces/matlab/toolbox/@ReactorNet/rtol.m diff --git a/Cantera/matlab/cantera/@ReactorNet/setInitialTime.m b/interfaces/matlab/toolbox/@ReactorNet/setInitialTime.m similarity index 100% rename from Cantera/matlab/cantera/@ReactorNet/setInitialTime.m rename to interfaces/matlab/toolbox/@ReactorNet/setInitialTime.m diff --git a/Cantera/matlab/cantera/@ReactorNet/setMaxTimeStep.m b/interfaces/matlab/toolbox/@ReactorNet/setMaxTimeStep.m similarity index 100% rename from Cantera/matlab/cantera/@ReactorNet/setMaxTimeStep.m rename to interfaces/matlab/toolbox/@ReactorNet/setMaxTimeStep.m diff --git a/Cantera/matlab/cantera/@ReactorNet/setTolerances.m b/interfaces/matlab/toolbox/@ReactorNet/setTolerances.m similarity index 100% rename from Cantera/matlab/cantera/@ReactorNet/setTolerances.m rename to interfaces/matlab/toolbox/@ReactorNet/setTolerances.m diff --git a/Cantera/matlab/cantera/@ReactorNet/step.m b/interfaces/matlab/toolbox/@ReactorNet/step.m similarity index 100% rename from Cantera/matlab/cantera/@ReactorNet/step.m rename to interfaces/matlab/toolbox/@ReactorNet/step.m diff --git a/Cantera/matlab/cantera/@ReactorNet/time.m b/interfaces/matlab/toolbox/@ReactorNet/time.m similarity index 100% rename from Cantera/matlab/cantera/@ReactorNet/time.m rename to interfaces/matlab/toolbox/@ReactorNet/time.m diff --git a/Cantera/matlab/cantera/@Solution/Solution.m b/interfaces/matlab/toolbox/@Solution/Solution.m similarity index 100% rename from Cantera/matlab/cantera/@Solution/Solution.m rename to interfaces/matlab/toolbox/@Solution/Solution.m diff --git a/Cantera/matlab/cantera/@Solution/clear.m b/interfaces/matlab/toolbox/@Solution/clear.m similarity index 100% rename from Cantera/matlab/cantera/@Solution/clear.m rename to interfaces/matlab/toolbox/@Solution/clear.m diff --git a/Cantera/matlab/cantera/@Solution/set.m b/interfaces/matlab/toolbox/@Solution/set.m similarity index 100% rename from Cantera/matlab/cantera/@Solution/set.m rename to interfaces/matlab/toolbox/@Solution/set.m diff --git a/Cantera/matlab/cantera/@Solution/soundspeed.m b/interfaces/matlab/toolbox/@Solution/soundspeed.m similarity index 100% rename from Cantera/matlab/cantera/@Solution/soundspeed.m rename to interfaces/matlab/toolbox/@Solution/soundspeed.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/ThermoPhase.m b/interfaces/matlab/toolbox/@ThermoPhase/ThermoPhase.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/ThermoPhase.m rename to interfaces/matlab/toolbox/@ThermoPhase/ThermoPhase.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/atomicMasses.m b/interfaces/matlab/toolbox/@ThermoPhase/atomicMasses.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/atomicMasses.m rename to interfaces/matlab/toolbox/@ThermoPhase/atomicMasses.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/chemPotentials.m b/interfaces/matlab/toolbox/@ThermoPhase/chemPotentials.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/chemPotentials.m rename to interfaces/matlab/toolbox/@ThermoPhase/chemPotentials.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/clear.m b/interfaces/matlab/toolbox/@ThermoPhase/clear.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/clear.m rename to interfaces/matlab/toolbox/@ThermoPhase/clear.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/cp_R.m b/interfaces/matlab/toolbox/@ThermoPhase/cp_R.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/cp_R.m rename to interfaces/matlab/toolbox/@ThermoPhase/cp_R.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/cp_mass.m b/interfaces/matlab/toolbox/@ThermoPhase/cp_mass.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/cp_mass.m rename to interfaces/matlab/toolbox/@ThermoPhase/cp_mass.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/cp_mole.m b/interfaces/matlab/toolbox/@ThermoPhase/cp_mole.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/cp_mole.m rename to interfaces/matlab/toolbox/@ThermoPhase/cp_mole.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/critDensity.m b/interfaces/matlab/toolbox/@ThermoPhase/critDensity.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/critDensity.m rename to interfaces/matlab/toolbox/@ThermoPhase/critDensity.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/critPressure.m b/interfaces/matlab/toolbox/@ThermoPhase/critPressure.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/critPressure.m rename to interfaces/matlab/toolbox/@ThermoPhase/critPressure.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/critTemperature.m b/interfaces/matlab/toolbox/@ThermoPhase/critTemperature.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/critTemperature.m rename to interfaces/matlab/toolbox/@ThermoPhase/critTemperature.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/cv_mass.m b/interfaces/matlab/toolbox/@ThermoPhase/cv_mass.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/cv_mass.m rename to interfaces/matlab/toolbox/@ThermoPhase/cv_mass.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/cv_mole.m b/interfaces/matlab/toolbox/@ThermoPhase/cv_mole.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/cv_mole.m rename to interfaces/matlab/toolbox/@ThermoPhase/cv_mole.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/density.m b/interfaces/matlab/toolbox/@ThermoPhase/density.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/density.m rename to interfaces/matlab/toolbox/@ThermoPhase/density.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/display.m b/interfaces/matlab/toolbox/@ThermoPhase/display.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/display.m rename to interfaces/matlab/toolbox/@ThermoPhase/display.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/electricPotential.m b/interfaces/matlab/toolbox/@ThermoPhase/electricPotential.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/electricPotential.m rename to interfaces/matlab/toolbox/@ThermoPhase/electricPotential.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/elementIndex.m b/interfaces/matlab/toolbox/@ThermoPhase/elementIndex.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/elementIndex.m rename to interfaces/matlab/toolbox/@ThermoPhase/elementIndex.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/elementName.m b/interfaces/matlab/toolbox/@ThermoPhase/elementName.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/elementName.m rename to interfaces/matlab/toolbox/@ThermoPhase/elementName.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/enthalpies_RT.m b/interfaces/matlab/toolbox/@ThermoPhase/enthalpies_RT.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/enthalpies_RT.m rename to interfaces/matlab/toolbox/@ThermoPhase/enthalpies_RT.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/enthalpy_mass.m b/interfaces/matlab/toolbox/@ThermoPhase/enthalpy_mass.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/enthalpy_mass.m rename to interfaces/matlab/toolbox/@ThermoPhase/enthalpy_mass.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/enthalpy_mole.m b/interfaces/matlab/toolbox/@ThermoPhase/enthalpy_mole.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/enthalpy_mole.m rename to interfaces/matlab/toolbox/@ThermoPhase/enthalpy_mole.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/entropies_R.m b/interfaces/matlab/toolbox/@ThermoPhase/entropies_R.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/entropies_R.m rename to interfaces/matlab/toolbox/@ThermoPhase/entropies_R.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/entropy_mass.m b/interfaces/matlab/toolbox/@ThermoPhase/entropy_mass.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/entropy_mass.m rename to interfaces/matlab/toolbox/@ThermoPhase/entropy_mass.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/entropy_mole.m b/interfaces/matlab/toolbox/@ThermoPhase/entropy_mole.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/entropy_mole.m rename to interfaces/matlab/toolbox/@ThermoPhase/entropy_mole.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/eosType.m b/interfaces/matlab/toolbox/@ThermoPhase/eosType.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/eosType.m rename to interfaces/matlab/toolbox/@ThermoPhase/eosType.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/equilibrate.m b/interfaces/matlab/toolbox/@ThermoPhase/equilibrate.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/equilibrate.m rename to interfaces/matlab/toolbox/@ThermoPhase/equilibrate.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/gibbs_RT.m b/interfaces/matlab/toolbox/@ThermoPhase/gibbs_RT.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/gibbs_RT.m rename to interfaces/matlab/toolbox/@ThermoPhase/gibbs_RT.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/gibbs_mass.m b/interfaces/matlab/toolbox/@ThermoPhase/gibbs_mass.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/gibbs_mass.m rename to interfaces/matlab/toolbox/@ThermoPhase/gibbs_mass.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/gibbs_mole.m b/interfaces/matlab/toolbox/@ThermoPhase/gibbs_mole.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/gibbs_mole.m rename to interfaces/matlab/toolbox/@ThermoPhase/gibbs_mole.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/hndl.m b/interfaces/matlab/toolbox/@ThermoPhase/hndl.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/hndl.m rename to interfaces/matlab/toolbox/@ThermoPhase/hndl.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/intEnergy_mass.m b/interfaces/matlab/toolbox/@ThermoPhase/intEnergy_mass.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/intEnergy_mass.m rename to interfaces/matlab/toolbox/@ThermoPhase/intEnergy_mass.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/intEnergy_mole.m b/interfaces/matlab/toolbox/@ThermoPhase/intEnergy_mole.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/intEnergy_mole.m rename to interfaces/matlab/toolbox/@ThermoPhase/intEnergy_mole.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/isIdealGas.m b/interfaces/matlab/toolbox/@ThermoPhase/isIdealGas.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/isIdealGas.m rename to interfaces/matlab/toolbox/@ThermoPhase/isIdealGas.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/massFraction.m b/interfaces/matlab/toolbox/@ThermoPhase/massFraction.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/massFraction.m rename to interfaces/matlab/toolbox/@ThermoPhase/massFraction.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/massFractions.m b/interfaces/matlab/toolbox/@ThermoPhase/massFractions.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/massFractions.m rename to interfaces/matlab/toolbox/@ThermoPhase/massFractions.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/maxTemp.m b/interfaces/matlab/toolbox/@ThermoPhase/maxTemp.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/maxTemp.m rename to interfaces/matlab/toolbox/@ThermoPhase/maxTemp.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/meanMolarMass.m b/interfaces/matlab/toolbox/@ThermoPhase/meanMolarMass.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/meanMolarMass.m rename to interfaces/matlab/toolbox/@ThermoPhase/meanMolarMass.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/meanMolecularWeight.m b/interfaces/matlab/toolbox/@ThermoPhase/meanMolecularWeight.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/meanMolecularWeight.m rename to interfaces/matlab/toolbox/@ThermoPhase/meanMolecularWeight.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/minTemp.m b/interfaces/matlab/toolbox/@ThermoPhase/minTemp.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/minTemp.m rename to interfaces/matlab/toolbox/@ThermoPhase/minTemp.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/molarDensity.m b/interfaces/matlab/toolbox/@ThermoPhase/molarDensity.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/molarDensity.m rename to interfaces/matlab/toolbox/@ThermoPhase/molarDensity.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/molarMasses.m b/interfaces/matlab/toolbox/@ThermoPhase/molarMasses.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/molarMasses.m rename to interfaces/matlab/toolbox/@ThermoPhase/molarMasses.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/moleFraction.m b/interfaces/matlab/toolbox/@ThermoPhase/moleFraction.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/moleFraction.m rename to interfaces/matlab/toolbox/@ThermoPhase/moleFraction.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/moleFractions.m b/interfaces/matlab/toolbox/@ThermoPhase/moleFractions.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/moleFractions.m rename to interfaces/matlab/toolbox/@ThermoPhase/moleFractions.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/molecularWeights.m b/interfaces/matlab/toolbox/@ThermoPhase/molecularWeights.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/molecularWeights.m rename to interfaces/matlab/toolbox/@ThermoPhase/molecularWeights.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/nAtoms.m b/interfaces/matlab/toolbox/@ThermoPhase/nAtoms.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/nAtoms.m rename to interfaces/matlab/toolbox/@ThermoPhase/nAtoms.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/nElements.m b/interfaces/matlab/toolbox/@ThermoPhase/nElements.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/nElements.m rename to interfaces/matlab/toolbox/@ThermoPhase/nElements.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/nSpecies.m b/interfaces/matlab/toolbox/@ThermoPhase/nSpecies.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/nSpecies.m rename to interfaces/matlab/toolbox/@ThermoPhase/nSpecies.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/name.m b/interfaces/matlab/toolbox/@ThermoPhase/name.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/name.m rename to interfaces/matlab/toolbox/@ThermoPhase/name.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/ph.m b/interfaces/matlab/toolbox/@ThermoPhase/ph.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/ph.m rename to interfaces/matlab/toolbox/@ThermoPhase/ph.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/pressure.m b/interfaces/matlab/toolbox/@ThermoPhase/pressure.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/pressure.m rename to interfaces/matlab/toolbox/@ThermoPhase/pressure.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/private/phase_get.m b/interfaces/matlab/toolbox/@ThermoPhase/private/phase_get.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/private/phase_get.m rename to interfaces/matlab/toolbox/@ThermoPhase/private/phase_get.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/private/phase_set.m b/interfaces/matlab/toolbox/@ThermoPhase/private/phase_set.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/private/phase_set.m rename to interfaces/matlab/toolbox/@ThermoPhase/private/phase_set.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/private/thermo_get.m b/interfaces/matlab/toolbox/@ThermoPhase/private/thermo_get.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/private/thermo_get.m rename to interfaces/matlab/toolbox/@ThermoPhase/private/thermo_get.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/private/thermo_set.m b/interfaces/matlab/toolbox/@ThermoPhase/private/thermo_set.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/private/thermo_set.m rename to interfaces/matlab/toolbox/@ThermoPhase/private/thermo_set.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/refPressure.m b/interfaces/matlab/toolbox/@ThermoPhase/refPressure.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/refPressure.m rename to interfaces/matlab/toolbox/@ThermoPhase/refPressure.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/satPressure.m b/interfaces/matlab/toolbox/@ThermoPhase/satPressure.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/satPressure.m rename to interfaces/matlab/toolbox/@ThermoPhase/satPressure.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/satTemperature.m b/interfaces/matlab/toolbox/@ThermoPhase/satTemperature.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/satTemperature.m rename to interfaces/matlab/toolbox/@ThermoPhase/satTemperature.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/set.m b/interfaces/matlab/toolbox/@ThermoPhase/set.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/set.m rename to interfaces/matlab/toolbox/@ThermoPhase/set.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/setDensity.m b/interfaces/matlab/toolbox/@ThermoPhase/setDensity.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/setDensity.m rename to interfaces/matlab/toolbox/@ThermoPhase/setDensity.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/setElectricPotential.m b/interfaces/matlab/toolbox/@ThermoPhase/setElectricPotential.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/setElectricPotential.m rename to interfaces/matlab/toolbox/@ThermoPhase/setElectricPotential.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/setMassFractions.m b/interfaces/matlab/toolbox/@ThermoPhase/setMassFractions.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/setMassFractions.m rename to interfaces/matlab/toolbox/@ThermoPhase/setMassFractions.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/setMoleFractions.m b/interfaces/matlab/toolbox/@ThermoPhase/setMoleFractions.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/setMoleFractions.m rename to interfaces/matlab/toolbox/@ThermoPhase/setMoleFractions.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/setName.m b/interfaces/matlab/toolbox/@ThermoPhase/setName.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/setName.m rename to interfaces/matlab/toolbox/@ThermoPhase/setName.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/setPressure.m b/interfaces/matlab/toolbox/@ThermoPhase/setPressure.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/setPressure.m rename to interfaces/matlab/toolbox/@ThermoPhase/setPressure.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/setState.m b/interfaces/matlab/toolbox/@ThermoPhase/setState.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/setState.m rename to interfaces/matlab/toolbox/@ThermoPhase/setState.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/setState_HP.m b/interfaces/matlab/toolbox/@ThermoPhase/setState_HP.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/setState_HP.m rename to interfaces/matlab/toolbox/@ThermoPhase/setState_HP.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/setState_Psat.m b/interfaces/matlab/toolbox/@ThermoPhase/setState_Psat.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/setState_Psat.m rename to interfaces/matlab/toolbox/@ThermoPhase/setState_Psat.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/setState_SP.m b/interfaces/matlab/toolbox/@ThermoPhase/setState_SP.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/setState_SP.m rename to interfaces/matlab/toolbox/@ThermoPhase/setState_SP.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/setState_SV.m b/interfaces/matlab/toolbox/@ThermoPhase/setState_SV.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/setState_SV.m rename to interfaces/matlab/toolbox/@ThermoPhase/setState_SV.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/setState_Tsat.m b/interfaces/matlab/toolbox/@ThermoPhase/setState_Tsat.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/setState_Tsat.m rename to interfaces/matlab/toolbox/@ThermoPhase/setState_Tsat.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/setState_UV.m b/interfaces/matlab/toolbox/@ThermoPhase/setState_UV.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/setState_UV.m rename to interfaces/matlab/toolbox/@ThermoPhase/setState_UV.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/setState_satLiquid.m b/interfaces/matlab/toolbox/@ThermoPhase/setState_satLiquid.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/setState_satLiquid.m rename to interfaces/matlab/toolbox/@ThermoPhase/setState_satLiquid.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/setState_satVapor.m b/interfaces/matlab/toolbox/@ThermoPhase/setState_satVapor.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/setState_satVapor.m rename to interfaces/matlab/toolbox/@ThermoPhase/setState_satVapor.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/setTemperature.m b/interfaces/matlab/toolbox/@ThermoPhase/setTemperature.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/setTemperature.m rename to interfaces/matlab/toolbox/@ThermoPhase/setTemperature.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/speciesIndex.m b/interfaces/matlab/toolbox/@ThermoPhase/speciesIndex.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/speciesIndex.m rename to interfaces/matlab/toolbox/@ThermoPhase/speciesIndex.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/speciesName.m b/interfaces/matlab/toolbox/@ThermoPhase/speciesName.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/speciesName.m rename to interfaces/matlab/toolbox/@ThermoPhase/speciesName.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/speciesNames.m b/interfaces/matlab/toolbox/@ThermoPhase/speciesNames.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/speciesNames.m rename to interfaces/matlab/toolbox/@ThermoPhase/speciesNames.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/temperature.m b/interfaces/matlab/toolbox/@ThermoPhase/temperature.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/temperature.m rename to interfaces/matlab/toolbox/@ThermoPhase/temperature.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/thermo_hndl.m b/interfaces/matlab/toolbox/@ThermoPhase/thermo_hndl.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/thermo_hndl.m rename to interfaces/matlab/toolbox/@ThermoPhase/thermo_hndl.m diff --git a/Cantera/matlab/cantera/@ThermoPhase/vaporFraction.m b/interfaces/matlab/toolbox/@ThermoPhase/vaporFraction.m similarity index 100% rename from Cantera/matlab/cantera/@ThermoPhase/vaporFraction.m rename to interfaces/matlab/toolbox/@ThermoPhase/vaporFraction.m diff --git a/Cantera/matlab/cantera/@Transport/Transport.m b/interfaces/matlab/toolbox/@Transport/Transport.m similarity index 100% rename from Cantera/matlab/cantera/@Transport/Transport.m rename to interfaces/matlab/toolbox/@Transport/Transport.m diff --git a/Cantera/matlab/cantera/@Transport/binDiffCoeffs.m b/interfaces/matlab/toolbox/@Transport/binDiffCoeffs.m similarity index 100% rename from Cantera/matlab/cantera/@Transport/binDiffCoeffs.m rename to interfaces/matlab/toolbox/@Transport/binDiffCoeffs.m diff --git a/Cantera/matlab/cantera/@Transport/hndl.m b/interfaces/matlab/toolbox/@Transport/hndl.m similarity index 100% rename from Cantera/matlab/cantera/@Transport/hndl.m rename to interfaces/matlab/toolbox/@Transport/hndl.m diff --git a/Cantera/matlab/cantera/@Transport/mixDiffCoeffs.m b/interfaces/matlab/toolbox/@Transport/mixDiffCoeffs.m similarity index 100% rename from Cantera/matlab/cantera/@Transport/mixDiffCoeffs.m rename to interfaces/matlab/toolbox/@Transport/mixDiffCoeffs.m diff --git a/Cantera/matlab/cantera/@Transport/multiDiffCoeffs.m b/interfaces/matlab/toolbox/@Transport/multiDiffCoeffs.m similarity index 100% rename from Cantera/matlab/cantera/@Transport/multiDiffCoeffs.m rename to interfaces/matlab/toolbox/@Transport/multiDiffCoeffs.m diff --git a/Cantera/matlab/cantera/@Transport/private/trans_get.m b/interfaces/matlab/toolbox/@Transport/private/trans_get.m similarity index 100% rename from Cantera/matlab/cantera/@Transport/private/trans_get.m rename to interfaces/matlab/toolbox/@Transport/private/trans_get.m diff --git a/Cantera/matlab/cantera/@Transport/setParameters.m b/interfaces/matlab/toolbox/@Transport/setParameters.m similarity index 100% rename from Cantera/matlab/cantera/@Transport/setParameters.m rename to interfaces/matlab/toolbox/@Transport/setParameters.m diff --git a/Cantera/matlab/cantera/@Transport/setThermalConductivity.m b/interfaces/matlab/toolbox/@Transport/setThermalConductivity.m similarity index 100% rename from Cantera/matlab/cantera/@Transport/setThermalConductivity.m rename to interfaces/matlab/toolbox/@Transport/setThermalConductivity.m diff --git a/Cantera/matlab/cantera/@Transport/thermalConductivity.m b/interfaces/matlab/toolbox/@Transport/thermalConductivity.m similarity index 100% rename from Cantera/matlab/cantera/@Transport/thermalConductivity.m rename to interfaces/matlab/toolbox/@Transport/thermalConductivity.m diff --git a/Cantera/matlab/cantera/@Transport/thermalDiffCoeffs.m b/interfaces/matlab/toolbox/@Transport/thermalDiffCoeffs.m similarity index 100% rename from Cantera/matlab/cantera/@Transport/thermalDiffCoeffs.m rename to interfaces/matlab/toolbox/@Transport/thermalDiffCoeffs.m diff --git a/Cantera/matlab/cantera/@Transport/trans_hndl.m b/interfaces/matlab/toolbox/@Transport/trans_hndl.m similarity index 100% rename from Cantera/matlab/cantera/@Transport/trans_hndl.m rename to interfaces/matlab/toolbox/@Transport/trans_hndl.m diff --git a/Cantera/matlab/cantera/@Transport/viscosity.m b/interfaces/matlab/toolbox/@Transport/viscosity.m similarity index 100% rename from Cantera/matlab/cantera/@Transport/viscosity.m rename to interfaces/matlab/toolbox/@Transport/viscosity.m diff --git a/Cantera/matlab/cantera/@Wall/Wall.m b/interfaces/matlab/toolbox/@Wall/Wall.m similarity index 100% rename from Cantera/matlab/cantera/@Wall/Wall.m rename to interfaces/matlab/toolbox/@Wall/Wall.m diff --git a/Cantera/matlab/cantera/@Wall/area.m b/interfaces/matlab/toolbox/@Wall/area.m similarity index 100% rename from Cantera/matlab/cantera/@Wall/area.m rename to interfaces/matlab/toolbox/@Wall/area.m diff --git a/Cantera/matlab/cantera/@Wall/install.m b/interfaces/matlab/toolbox/@Wall/install.m similarity index 100% rename from Cantera/matlab/cantera/@Wall/install.m rename to interfaces/matlab/toolbox/@Wall/install.m diff --git a/Cantera/matlab/cantera/@Wall/private/wallmethods.m b/interfaces/matlab/toolbox/@Wall/private/wallmethods.m similarity index 100% rename from Cantera/matlab/cantera/@Wall/private/wallmethods.m rename to interfaces/matlab/toolbox/@Wall/private/wallmethods.m diff --git a/Cantera/matlab/cantera/@Wall/ready.m b/interfaces/matlab/toolbox/@Wall/ready.m similarity index 100% rename from Cantera/matlab/cantera/@Wall/ready.m rename to interfaces/matlab/toolbox/@Wall/ready.m diff --git a/Cantera/matlab/cantera/@Wall/setArea.m b/interfaces/matlab/toolbox/@Wall/setArea.m similarity index 100% rename from Cantera/matlab/cantera/@Wall/setArea.m rename to interfaces/matlab/toolbox/@Wall/setArea.m diff --git a/Cantera/matlab/cantera/@Wall/setExpansionRateCoeff.m b/interfaces/matlab/toolbox/@Wall/setExpansionRateCoeff.m similarity index 100% rename from Cantera/matlab/cantera/@Wall/setExpansionRateCoeff.m rename to interfaces/matlab/toolbox/@Wall/setExpansionRateCoeff.m diff --git a/Cantera/matlab/cantera/@Wall/setHeatFlux.m b/interfaces/matlab/toolbox/@Wall/setHeatFlux.m similarity index 100% rename from Cantera/matlab/cantera/@Wall/setHeatFlux.m rename to interfaces/matlab/toolbox/@Wall/setHeatFlux.m diff --git a/Cantera/matlab/cantera/@Wall/setHeatTransferCoeff.m b/interfaces/matlab/toolbox/@Wall/setHeatTransferCoeff.m similarity index 100% rename from Cantera/matlab/cantera/@Wall/setHeatTransferCoeff.m rename to interfaces/matlab/toolbox/@Wall/setHeatTransferCoeff.m diff --git a/Cantera/matlab/cantera/@Wall/setKinetics.m b/interfaces/matlab/toolbox/@Wall/setKinetics.m similarity index 100% rename from Cantera/matlab/cantera/@Wall/setKinetics.m rename to interfaces/matlab/toolbox/@Wall/setKinetics.m diff --git a/Cantera/matlab/cantera/@Wall/setThermalResistance.m b/interfaces/matlab/toolbox/@Wall/setThermalResistance.m similarity index 100% rename from Cantera/matlab/cantera/@Wall/setThermalResistance.m rename to interfaces/matlab/toolbox/@Wall/setThermalResistance.m diff --git a/Cantera/matlab/cantera/@Wall/setVelocity.m b/interfaces/matlab/toolbox/@Wall/setVelocity.m similarity index 100% rename from Cantera/matlab/cantera/@Wall/setVelocity.m rename to interfaces/matlab/toolbox/@Wall/setVelocity.m diff --git a/Cantera/matlab/cantera/@Wall/wall_hndl.m b/interfaces/matlab/toolbox/@Wall/wall_hndl.m similarity index 100% rename from Cantera/matlab/cantera/@Wall/wall_hndl.m rename to interfaces/matlab/toolbox/@Wall/wall_hndl.m diff --git a/Cantera/matlab/cantera/@XML_Node/XML_Node.m b/interfaces/matlab/toolbox/@XML_Node/XML_Node.m similarity index 100% rename from Cantera/matlab/cantera/@XML_Node/XML_Node.m rename to interfaces/matlab/toolbox/@XML_Node/XML_Node.m diff --git a/Cantera/matlab/cantera/@XML_Node/addChild.m b/interfaces/matlab/toolbox/@XML_Node/addChild.m similarity index 100% rename from Cantera/matlab/cantera/@XML_Node/addChild.m rename to interfaces/matlab/toolbox/@XML_Node/addChild.m diff --git a/Cantera/matlab/cantera/@XML_Node/attrib.m b/interfaces/matlab/toolbox/@XML_Node/attrib.m similarity index 100% rename from Cantera/matlab/cantera/@XML_Node/attrib.m rename to interfaces/matlab/toolbox/@XML_Node/attrib.m diff --git a/Cantera/matlab/cantera/@XML_Node/build.m b/interfaces/matlab/toolbox/@XML_Node/build.m similarity index 100% rename from Cantera/matlab/cantera/@XML_Node/build.m rename to interfaces/matlab/toolbox/@XML_Node/build.m diff --git a/Cantera/matlab/cantera/@XML_Node/child.m b/interfaces/matlab/toolbox/@XML_Node/child.m similarity index 100% rename from Cantera/matlab/cantera/@XML_Node/child.m rename to interfaces/matlab/toolbox/@XML_Node/child.m diff --git a/Cantera/matlab/cantera/@XML_Node/findByID.m b/interfaces/matlab/toolbox/@XML_Node/findByID.m similarity index 100% rename from Cantera/matlab/cantera/@XML_Node/findByID.m rename to interfaces/matlab/toolbox/@XML_Node/findByID.m diff --git a/Cantera/matlab/cantera/@XML_Node/findByName.m b/interfaces/matlab/toolbox/@XML_Node/findByName.m similarity index 100% rename from Cantera/matlab/cantera/@XML_Node/findByName.m rename to interfaces/matlab/toolbox/@XML_Node/findByName.m diff --git a/Cantera/matlab/cantera/@XML_Node/hndl.m b/interfaces/matlab/toolbox/@XML_Node/hndl.m similarity index 100% rename from Cantera/matlab/cantera/@XML_Node/hndl.m rename to interfaces/matlab/toolbox/@XML_Node/hndl.m diff --git a/Cantera/matlab/cantera/@XML_Node/nChildren.m b/interfaces/matlab/toolbox/@XML_Node/nChildren.m similarity index 100% rename from Cantera/matlab/cantera/@XML_Node/nChildren.m rename to interfaces/matlab/toolbox/@XML_Node/nChildren.m diff --git a/Cantera/matlab/cantera/@XML_Node/value.m b/interfaces/matlab/toolbox/@XML_Node/value.m similarity index 100% rename from Cantera/matlab/cantera/@XML_Node/value.m rename to interfaces/matlab/toolbox/@XML_Node/value.m diff --git a/Cantera/matlab/cantera/@XML_Node/write.m b/interfaces/matlab/toolbox/@XML_Node/write.m similarity index 100% rename from Cantera/matlab/cantera/@XML_Node/write.m rename to interfaces/matlab/toolbox/@XML_Node/write.m diff --git a/Cantera/matlab/cantera/Contents.m b/interfaces/matlab/toolbox/Contents.m similarity index 100% rename from Cantera/matlab/cantera/Contents.m rename to interfaces/matlab/toolbox/Contents.m diff --git a/Cantera/matlab/cantera/GRI30.m b/interfaces/matlab/toolbox/GRI30.m similarity index 100% rename from Cantera/matlab/cantera/GRI30.m rename to interfaces/matlab/toolbox/GRI30.m diff --git a/Cantera/matlab/cantera/Hydrogen.m b/interfaces/matlab/toolbox/Hydrogen.m similarity index 100% rename from Cantera/matlab/cantera/Hydrogen.m rename to interfaces/matlab/toolbox/Hydrogen.m diff --git a/Cantera/matlab/cantera/IdealGasMix.m b/interfaces/matlab/toolbox/IdealGasMix.m similarity index 100% rename from Cantera/matlab/cantera/IdealGasMix.m rename to interfaces/matlab/toolbox/IdealGasMix.m diff --git a/Cantera/matlab/cantera/MassFlowController.m b/interfaces/matlab/toolbox/MassFlowController.m similarity index 100% rename from Cantera/matlab/cantera/MassFlowController.m rename to interfaces/matlab/toolbox/MassFlowController.m diff --git a/Cantera/matlab/cantera/Methane.m b/interfaces/matlab/toolbox/Methane.m similarity index 100% rename from Cantera/matlab/cantera/Methane.m rename to interfaces/matlab/toolbox/Methane.m diff --git a/Cantera/matlab/cantera/Nitrogen.m b/interfaces/matlab/toolbox/Nitrogen.m similarity index 100% rename from Cantera/matlab/cantera/Nitrogen.m rename to interfaces/matlab/toolbox/Nitrogen.m diff --git a/Cantera/matlab/cantera/Oxygen.m b/interfaces/matlab/toolbox/Oxygen.m similarity index 100% rename from Cantera/matlab/cantera/Oxygen.m rename to interfaces/matlab/toolbox/Oxygen.m diff --git a/Cantera/matlab/cantera/Reservoir.m b/interfaces/matlab/toolbox/Reservoir.m similarity index 100% rename from Cantera/matlab/cantera/Reservoir.m rename to interfaces/matlab/toolbox/Reservoir.m diff --git a/Cantera/matlab/cantera/Valve.m b/interfaces/matlab/toolbox/Valve.m similarity index 100% rename from Cantera/matlab/cantera/Valve.m rename to interfaces/matlab/toolbox/Valve.m diff --git a/Cantera/matlab/cantera/Water.m b/interfaces/matlab/toolbox/Water.m similarity index 100% rename from Cantera/matlab/cantera/Water.m rename to interfaces/matlab/toolbox/Water.m diff --git a/Cantera/matlab/cantera/adddir.m b/interfaces/matlab/toolbox/adddir.m similarity index 100% rename from Cantera/matlab/cantera/adddir.m rename to interfaces/matlab/toolbox/adddir.m diff --git a/Cantera/matlab/cantera/air.m b/interfaces/matlab/toolbox/air.m similarity index 100% rename from Cantera/matlab/cantera/air.m rename to interfaces/matlab/toolbox/air.m diff --git a/Cantera/matlab/cantera/ck2cti.m b/interfaces/matlab/toolbox/ck2cti.m similarity index 100% rename from Cantera/matlab/cantera/ck2cti.m rename to interfaces/matlab/toolbox/ck2cti.m diff --git a/Cantera/matlab/cantera/ck2ctml.m b/interfaces/matlab/toolbox/ck2ctml.m similarity index 100% rename from Cantera/matlab/cantera/ck2ctml.m rename to interfaces/matlab/toolbox/ck2ctml.m diff --git a/Cantera/matlab/cantera/cleanup.m b/interfaces/matlab/toolbox/cleanup.m similarity index 100% rename from Cantera/matlab/cantera/cleanup.m rename to interfaces/matlab/toolbox/cleanup.m diff --git a/Cantera/matlab/cantera/conhp.m b/interfaces/matlab/toolbox/conhp.m similarity index 100% rename from Cantera/matlab/cantera/conhp.m rename to interfaces/matlab/toolbox/conhp.m diff --git a/Cantera/matlab/cantera/constants.m b/interfaces/matlab/toolbox/constants.m similarity index 100% rename from Cantera/matlab/cantera/constants.m rename to interfaces/matlab/toolbox/constants.m diff --git a/Cantera/matlab/cantera/conuv.m b/interfaces/matlab/toolbox/conuv.m similarity index 100% rename from Cantera/matlab/cantera/conuv.m rename to interfaces/matlab/toolbox/conuv.m diff --git a/Cantera/matlab/cantera/gasconstant.m b/interfaces/matlab/toolbox/gasconstant.m similarity index 100% rename from Cantera/matlab/cantera/gasconstant.m rename to interfaces/matlab/toolbox/gasconstant.m diff --git a/Cantera/matlab/cantera/gaussian.m b/interfaces/matlab/toolbox/gaussian.m similarity index 100% rename from Cantera/matlab/cantera/gaussian.m rename to interfaces/matlab/toolbox/gaussian.m diff --git a/Cantera/matlab/cantera/geterr.m b/interfaces/matlab/toolbox/geterr.m similarity index 100% rename from Cantera/matlab/cantera/geterr.m rename to interfaces/matlab/toolbox/geterr.m diff --git a/Cantera/matlab/cantera/importEdge.m b/interfaces/matlab/toolbox/importEdge.m similarity index 100% rename from Cantera/matlab/cantera/importEdge.m rename to interfaces/matlab/toolbox/importEdge.m diff --git a/Cantera/matlab/cantera/importInterface.m b/interfaces/matlab/toolbox/importInterface.m similarity index 100% rename from Cantera/matlab/cantera/importInterface.m rename to interfaces/matlab/toolbox/importInterface.m diff --git a/Cantera/matlab/cantera/importPhase.m b/interfaces/matlab/toolbox/importPhase.m similarity index 100% rename from Cantera/matlab/cantera/importPhase.m rename to interfaces/matlab/toolbox/importPhase.m diff --git a/Cantera/matlab/cantera/oneatm.m b/interfaces/matlab/toolbox/oneatm.m similarity index 100% rename from Cantera/matlab/cantera/oneatm.m rename to interfaces/matlab/toolbox/oneatm.m diff --git a/Cantera/matlab/cantera/polynom.m b/interfaces/matlab/toolbox/polynom.m similarity index 100% rename from Cantera/matlab/cantera/polynom.m rename to interfaces/matlab/toolbox/polynom.m diff --git a/Cantera/matlab/cantera/reactor_ode.m b/interfaces/matlab/toolbox/reactor_ode.m similarity index 100% rename from Cantera/matlab/cantera/reactor_ode.m rename to interfaces/matlab/toolbox/reactor_ode.m diff --git a/Cantera/python/.gitignore b/interfaces/python/.gitignore similarity index 100% rename from Cantera/python/.gitignore rename to interfaces/python/.gitignore diff --git a/Cantera/python/Cantera/DustyGasTransport.py b/interfaces/python/Cantera/DustyGasTransport.py similarity index 100% rename from Cantera/python/Cantera/DustyGasTransport.py rename to interfaces/python/Cantera/DustyGasTransport.py diff --git a/Cantera/python/Cantera/Edge.py b/interfaces/python/Cantera/Edge.py similarity index 100% rename from Cantera/python/Cantera/Edge.py rename to interfaces/python/Cantera/Edge.py diff --git a/Cantera/python/Cantera/Func.py b/interfaces/python/Cantera/Func.py similarity index 100% rename from Cantera/python/Cantera/Func.py rename to interfaces/python/Cantera/Func.py diff --git a/Cantera/python/Cantera/Interface.py b/interfaces/python/Cantera/Interface.py similarity index 100% rename from Cantera/python/Cantera/Interface.py rename to interfaces/python/Cantera/Interface.py diff --git a/Cantera/python/Cantera/Kinetics.py b/interfaces/python/Cantera/Kinetics.py similarity index 100% rename from Cantera/python/Cantera/Kinetics.py rename to interfaces/python/Cantera/Kinetics.py diff --git a/Cantera/python/Cantera/OneD/BurnerDiffFlame.py b/interfaces/python/Cantera/OneD/BurnerDiffFlame.py similarity index 100% rename from Cantera/python/Cantera/OneD/BurnerDiffFlame.py rename to interfaces/python/Cantera/OneD/BurnerDiffFlame.py diff --git a/Cantera/python/Cantera/OneD/BurnerFlame.py b/interfaces/python/Cantera/OneD/BurnerFlame.py similarity index 100% rename from Cantera/python/Cantera/OneD/BurnerFlame.py rename to interfaces/python/Cantera/OneD/BurnerFlame.py diff --git a/Cantera/python/Cantera/OneD/CounterFlame.py b/interfaces/python/Cantera/OneD/CounterFlame.py similarity index 100% rename from Cantera/python/Cantera/OneD/CounterFlame.py rename to interfaces/python/Cantera/OneD/CounterFlame.py diff --git a/Cantera/python/Cantera/OneD/FreeFlame.py b/interfaces/python/Cantera/OneD/FreeFlame.py similarity index 100% rename from Cantera/python/Cantera/OneD/FreeFlame.py rename to interfaces/python/Cantera/OneD/FreeFlame.py diff --git a/Cantera/python/Cantera/OneD/StagnationFlow.py b/interfaces/python/Cantera/OneD/StagnationFlow.py similarity index 100% rename from Cantera/python/Cantera/OneD/StagnationFlow.py rename to interfaces/python/Cantera/OneD/StagnationFlow.py diff --git a/Cantera/python/Cantera/OneD/__init__.py b/interfaces/python/Cantera/OneD/__init__.py similarity index 100% rename from Cantera/python/Cantera/OneD/__init__.py rename to interfaces/python/Cantera/OneD/__init__.py diff --git a/Cantera/python/Cantera/OneD/onedim.py b/interfaces/python/Cantera/OneD/onedim.py similarity index 100% rename from Cantera/python/Cantera/OneD/onedim.py rename to interfaces/python/Cantera/OneD/onedim.py diff --git a/Cantera/python/Cantera/Phase.py b/interfaces/python/Cantera/Phase.py similarity index 100% rename from Cantera/python/Cantera/Phase.py rename to interfaces/python/Cantera/Phase.py diff --git a/Cantera/python/Cantera/Reactor.py b/interfaces/python/Cantera/Reactor.py similarity index 100% rename from Cantera/python/Cantera/Reactor.py rename to interfaces/python/Cantera/Reactor.py diff --git a/Cantera/python/Cantera/SolidTransport.py b/interfaces/python/Cantera/SolidTransport.py similarity index 100% rename from Cantera/python/Cantera/SolidTransport.py rename to interfaces/python/Cantera/SolidTransport.py diff --git a/Cantera/python/Cantera/SurfacePhase.py b/interfaces/python/Cantera/SurfacePhase.py similarity index 100% rename from Cantera/python/Cantera/SurfacePhase.py rename to interfaces/python/Cantera/SurfacePhase.py diff --git a/Cantera/python/Cantera/ThermoPhase.py b/interfaces/python/Cantera/ThermoPhase.py similarity index 100% rename from Cantera/python/Cantera/ThermoPhase.py rename to interfaces/python/Cantera/ThermoPhase.py diff --git a/Cantera/python/Cantera/Transport.py b/interfaces/python/Cantera/Transport.py similarity index 100% rename from Cantera/python/Cantera/Transport.py rename to interfaces/python/Cantera/Transport.py diff --git a/Cantera/python/Cantera/XML.py b/interfaces/python/Cantera/XML.py similarity index 100% rename from Cantera/python/Cantera/XML.py rename to interfaces/python/Cantera/XML.py diff --git a/Cantera/python/Cantera/__init__.py b/interfaces/python/Cantera/__init__.py similarity index 100% rename from Cantera/python/Cantera/__init__.py rename to interfaces/python/Cantera/__init__.py diff --git a/Cantera/python/Cantera/ck2cti.py b/interfaces/python/Cantera/ck2cti.py similarity index 100% rename from Cantera/python/Cantera/ck2cti.py rename to interfaces/python/Cantera/ck2cti.py diff --git a/Cantera/python/Cantera/constants.py b/interfaces/python/Cantera/constants.py similarity index 100% rename from Cantera/python/Cantera/constants.py rename to interfaces/python/Cantera/constants.py diff --git a/Cantera/python/Cantera/elements.py b/interfaces/python/Cantera/elements.py similarity index 100% rename from Cantera/python/Cantera/elements.py rename to interfaces/python/Cantera/elements.py diff --git a/Cantera/python/Cantera/excel.py b/interfaces/python/Cantera/excel.py similarity index 100% rename from Cantera/python/Cantera/excel.py rename to interfaces/python/Cantera/excel.py diff --git a/Cantera/python/Cantera/exceptions.py b/interfaces/python/Cantera/exceptions.py similarity index 100% rename from Cantera/python/Cantera/exceptions.py rename to interfaces/python/Cantera/exceptions.py diff --git a/Cantera/python/Cantera/gases.py b/interfaces/python/Cantera/gases.py similarity index 100% rename from Cantera/python/Cantera/gases.py rename to interfaces/python/Cantera/gases.py diff --git a/Cantera/python/Cantera/importFromFile.py b/interfaces/python/Cantera/importFromFile.py similarity index 100% rename from Cantera/python/Cantera/importFromFile.py rename to interfaces/python/Cantera/importFromFile.py diff --git a/Cantera/python/Cantera/interp.py b/interfaces/python/Cantera/interp.py similarity index 100% rename from Cantera/python/Cantera/interp.py rename to interfaces/python/Cantera/interp.py diff --git a/Cantera/python/Cantera/liquidvapor.py b/interfaces/python/Cantera/liquidvapor.py similarity index 100% rename from Cantera/python/Cantera/liquidvapor.py rename to interfaces/python/Cantera/liquidvapor.py diff --git a/Cantera/python/Cantera/mixture.py b/interfaces/python/Cantera/mixture.py similarity index 100% rename from Cantera/python/Cantera/mixture.py rename to interfaces/python/Cantera/mixture.py diff --git a/Cantera/python/Cantera/num.py b/interfaces/python/Cantera/num.py similarity index 100% rename from Cantera/python/Cantera/num.py rename to interfaces/python/Cantera/num.py diff --git a/Cantera/python/Cantera/rxnpath.py b/interfaces/python/Cantera/rxnpath.py similarity index 100% rename from Cantera/python/Cantera/rxnpath.py rename to interfaces/python/Cantera/rxnpath.py diff --git a/Cantera/python/Cantera/set.py b/interfaces/python/Cantera/set.py similarity index 100% rename from Cantera/python/Cantera/set.py rename to interfaces/python/Cantera/set.py diff --git a/Cantera/python/Cantera/solid.py b/interfaces/python/Cantera/solid.py similarity index 100% rename from Cantera/python/Cantera/solid.py rename to interfaces/python/Cantera/solid.py diff --git a/Cantera/python/Cantera/solids.py b/interfaces/python/Cantera/solids.py similarity index 100% rename from Cantera/python/Cantera/solids.py rename to interfaces/python/Cantera/solids.py diff --git a/Cantera/python/Cantera/solution.py b/interfaces/python/Cantera/solution.py similarity index 100% rename from Cantera/python/Cantera/solution.py rename to interfaces/python/Cantera/solution.py diff --git a/Cantera/python/Cantera/solve.py b/interfaces/python/Cantera/solve.py similarity index 100% rename from Cantera/python/Cantera/solve.py rename to interfaces/python/Cantera/solve.py diff --git a/Cantera/python/Cantera/stoich.py b/interfaces/python/Cantera/stoich.py similarity index 100% rename from Cantera/python/Cantera/stoich.py rename to interfaces/python/Cantera/stoich.py diff --git a/Cantera/python/Cantera/tecplot.py b/interfaces/python/Cantera/tecplot.py similarity index 100% rename from Cantera/python/Cantera/tecplot.py rename to interfaces/python/Cantera/tecplot.py diff --git a/Cantera/python/Cantera/units.py b/interfaces/python/Cantera/units.py similarity index 100% rename from Cantera/python/Cantera/units.py rename to interfaces/python/Cantera/units.py diff --git a/apps/MixMaster/CompositionFrame.py b/interfaces/python/MixMaster/CompositionFrame.py similarity index 100% rename from apps/MixMaster/CompositionFrame.py rename to interfaces/python/MixMaster/CompositionFrame.py diff --git a/apps/MixMaster/ControlPanel.py b/interfaces/python/MixMaster/ControlPanel.py similarity index 100% rename from apps/MixMaster/ControlPanel.py rename to interfaces/python/MixMaster/ControlPanel.py diff --git a/apps/MixMaster/DataFrame.py b/interfaces/python/MixMaster/DataFrame.py similarity index 100% rename from apps/MixMaster/DataFrame.py rename to interfaces/python/MixMaster/DataFrame.py diff --git a/apps/MixMaster/DataGraph.py b/interfaces/python/MixMaster/DataGraph.py similarity index 100% rename from apps/MixMaster/DataGraph.py rename to interfaces/python/MixMaster/DataGraph.py diff --git a/apps/MixMaster/Edit.py b/interfaces/python/MixMaster/Edit.py similarity index 100% rename from apps/MixMaster/Edit.py rename to interfaces/python/MixMaster/Edit.py diff --git a/apps/MixMaster/ElementFrame.py b/interfaces/python/MixMaster/ElementFrame.py similarity index 100% rename from apps/MixMaster/ElementFrame.py rename to interfaces/python/MixMaster/ElementFrame.py diff --git a/apps/MixMaster/GraphFrame.py b/interfaces/python/MixMaster/GraphFrame.py similarity index 100% rename from apps/MixMaster/GraphFrame.py rename to interfaces/python/MixMaster/GraphFrame.py diff --git a/apps/MixMaster/ImportFrame.py b/interfaces/python/MixMaster/ImportFrame.py similarity index 100% rename from apps/MixMaster/ImportFrame.py rename to interfaces/python/MixMaster/ImportFrame.py diff --git a/apps/MixMaster/KineticsFrame.py b/interfaces/python/MixMaster/KineticsFrame.py similarity index 100% rename from apps/MixMaster/KineticsFrame.py rename to interfaces/python/MixMaster/KineticsFrame.py diff --git a/apps/MixMaster/MechManager.py b/interfaces/python/MixMaster/MechManager.py similarity index 100% rename from apps/MixMaster/MechManager.py rename to interfaces/python/MixMaster/MechManager.py diff --git a/apps/MixMaster/Mix.py b/interfaces/python/MixMaster/Mix.py similarity index 100% rename from apps/MixMaster/Mix.py rename to interfaces/python/MixMaster/Mix.py diff --git a/apps/MixMaster/NewFlowFrame.py b/interfaces/python/MixMaster/NewFlowFrame.py similarity index 100% rename from apps/MixMaster/NewFlowFrame.py rename to interfaces/python/MixMaster/NewFlowFrame.py diff --git a/apps/MixMaster/SpeciesFrame.py b/interfaces/python/MixMaster/SpeciesFrame.py similarity index 100% rename from apps/MixMaster/SpeciesFrame.py rename to interfaces/python/MixMaster/SpeciesFrame.py diff --git a/apps/MixMaster/SpeciesInfo.py b/interfaces/python/MixMaster/SpeciesInfo.py similarity index 100% rename from apps/MixMaster/SpeciesInfo.py rename to interfaces/python/MixMaster/SpeciesInfo.py diff --git a/apps/MixMaster/ThermoFrame.py b/interfaces/python/MixMaster/ThermoFrame.py similarity index 100% rename from apps/MixMaster/ThermoFrame.py rename to interfaces/python/MixMaster/ThermoFrame.py diff --git a/apps/MixMaster/ThermoProp.py b/interfaces/python/MixMaster/ThermoProp.py similarity index 100% rename from apps/MixMaster/ThermoProp.py rename to interfaces/python/MixMaster/ThermoProp.py diff --git a/apps/MixMaster/TransportFrame.py b/interfaces/python/MixMaster/TransportFrame.py similarity index 100% rename from apps/MixMaster/TransportFrame.py rename to interfaces/python/MixMaster/TransportFrame.py diff --git a/apps/MixMaster/UnitChooser.py b/interfaces/python/MixMaster/UnitChooser.py similarity index 100% rename from apps/MixMaster/UnitChooser.py rename to interfaces/python/MixMaster/UnitChooser.py diff --git a/apps/MixMaster/Units/SI.py b/interfaces/python/MixMaster/Units/SI.py similarity index 100% rename from apps/MixMaster/Units/SI.py rename to interfaces/python/MixMaster/Units/SI.py diff --git a/apps/MixMaster/Units/__init__.py b/interfaces/python/MixMaster/Units/__init__.py similarity index 100% rename from apps/MixMaster/Units/__init__.py rename to interfaces/python/MixMaster/Units/__init__.py diff --git a/apps/MixMaster/Units/area.py b/interfaces/python/MixMaster/Units/area.py similarity index 100% rename from apps/MixMaster/Units/area.py rename to interfaces/python/MixMaster/Units/area.py diff --git a/apps/MixMaster/Units/density.py b/interfaces/python/MixMaster/Units/density.py similarity index 100% rename from apps/MixMaster/Units/density.py rename to interfaces/python/MixMaster/Units/density.py diff --git a/apps/MixMaster/Units/energy.py b/interfaces/python/MixMaster/Units/energy.py similarity index 100% rename from apps/MixMaster/Units/energy.py rename to interfaces/python/MixMaster/Units/energy.py diff --git a/apps/MixMaster/Units/force.py b/interfaces/python/MixMaster/Units/force.py similarity index 100% rename from apps/MixMaster/Units/force.py rename to interfaces/python/MixMaster/Units/force.py diff --git a/apps/MixMaster/Units/length.py b/interfaces/python/MixMaster/Units/length.py similarity index 100% rename from apps/MixMaster/Units/length.py rename to interfaces/python/MixMaster/Units/length.py diff --git a/apps/MixMaster/Units/mass.py b/interfaces/python/MixMaster/Units/mass.py similarity index 100% rename from apps/MixMaster/Units/mass.py rename to interfaces/python/MixMaster/Units/mass.py diff --git a/apps/MixMaster/Units/power.py b/interfaces/python/MixMaster/Units/power.py similarity index 100% rename from apps/MixMaster/Units/power.py rename to interfaces/python/MixMaster/Units/power.py diff --git a/apps/MixMaster/Units/pressure.py b/interfaces/python/MixMaster/Units/pressure.py similarity index 100% rename from apps/MixMaster/Units/pressure.py rename to interfaces/python/MixMaster/Units/pressure.py diff --git a/apps/MixMaster/Units/specificEnergy.py b/interfaces/python/MixMaster/Units/specificEnergy.py similarity index 100% rename from apps/MixMaster/Units/specificEnergy.py rename to interfaces/python/MixMaster/Units/specificEnergy.py diff --git a/apps/MixMaster/Units/specificEntropy.py b/interfaces/python/MixMaster/Units/specificEntropy.py similarity index 100% rename from apps/MixMaster/Units/specificEntropy.py rename to interfaces/python/MixMaster/Units/specificEntropy.py diff --git a/apps/MixMaster/Units/speed.py b/interfaces/python/MixMaster/Units/speed.py similarity index 100% rename from apps/MixMaster/Units/speed.py rename to interfaces/python/MixMaster/Units/speed.py diff --git a/apps/MixMaster/Units/temperature.py b/interfaces/python/MixMaster/Units/temperature.py similarity index 100% rename from apps/MixMaster/Units/temperature.py rename to interfaces/python/MixMaster/Units/temperature.py diff --git a/apps/MixMaster/Units/time.py b/interfaces/python/MixMaster/Units/time.py similarity index 100% rename from apps/MixMaster/Units/time.py rename to interfaces/python/MixMaster/Units/time.py diff --git a/apps/MixMaster/Units/unit.py b/interfaces/python/MixMaster/Units/unit.py similarity index 100% rename from apps/MixMaster/Units/unit.py rename to interfaces/python/MixMaster/Units/unit.py diff --git a/apps/MixMaster/Units/volume.py b/interfaces/python/MixMaster/Units/volume.py similarity index 100% rename from apps/MixMaster/Units/volume.py rename to interfaces/python/MixMaster/Units/volume.py diff --git a/apps/MixMaster/__init__.py b/interfaces/python/MixMaster/__init__.py similarity index 100% rename from apps/MixMaster/__init__.py rename to interfaces/python/MixMaster/__init__.py diff --git a/apps/MixMaster/config.py b/interfaces/python/MixMaster/config.py similarity index 100% rename from apps/MixMaster/config.py rename to interfaces/python/MixMaster/config.py diff --git a/apps/MixMaster/flowpanel.py b/interfaces/python/MixMaster/flowpanel.py similarity index 100% rename from apps/MixMaster/flowpanel.py rename to interfaces/python/MixMaster/flowpanel.py diff --git a/apps/MixMaster/gri30.py b/interfaces/python/MixMaster/gri30.py similarity index 100% rename from apps/MixMaster/gri30.py rename to interfaces/python/MixMaster/gri30.py diff --git a/apps/MixMaster/main.py b/interfaces/python/MixMaster/main.py similarity index 100% rename from apps/MixMaster/main.py rename to interfaces/python/MixMaster/main.py diff --git a/apps/MixMaster/menu.py b/interfaces/python/MixMaster/menu.py similarity index 100% rename from apps/MixMaster/menu.py rename to interfaces/python/MixMaster/menu.py diff --git a/apps/MixMaster/newflow.py b/interfaces/python/MixMaster/newflow.py similarity index 100% rename from apps/MixMaster/newflow.py rename to interfaces/python/MixMaster/newflow.py diff --git a/apps/MixMaster/utilities.py b/interfaces/python/MixMaster/utilities.py similarity index 100% rename from apps/MixMaster/utilities.py rename to interfaces/python/MixMaster/utilities.py diff --git a/Cantera/python/SConscript b/interfaces/python/SConscript similarity index 100% rename from Cantera/python/SConscript rename to interfaces/python/SConscript diff --git a/Cantera/python/ctml_writer.py b/interfaces/python/ctml_writer.py similarity index 100% rename from Cantera/python/ctml_writer.py rename to interfaces/python/ctml_writer.py diff --git a/tools/mixmaster.in b/interfaces/python/mixmaster.in similarity index 100% rename from tools/mixmaster.in rename to interfaces/python/mixmaster.in diff --git a/Cantera/python/setup.py.in b/interfaces/python/setup.py.in similarity index 100% rename from Cantera/python/setup.py.in rename to interfaces/python/setup.py.in diff --git a/cantera.pc.in b/platform/posix/cantera.pc.in similarity index 100% rename from cantera.pc.in rename to platform/posix/cantera.pc.in diff --git a/tools/coverage.py b/platform/posix/coverage.py similarity index 100% rename from tools/coverage.py rename to platform/posix/coverage.py diff --git a/tools/man/ck2cti.1 b/platform/posix/man/ck2cti.1 similarity index 100% rename from tools/man/ck2cti.1 rename to platform/posix/man/ck2cti.1 diff --git a/tools/man/mixmaster.1 b/platform/posix/man/mixmaster.1 similarity index 100% rename from tools/man/mixmaster.1 rename to platform/posix/man/mixmaster.1 diff --git a/tools/setup_cantera.in b/platform/posix/setup_cantera.in similarity index 100% rename from tools/setup_cantera.in rename to platform/posix/setup_cantera.in diff --git a/examples/Makefile.am b/samples/Makefile.am similarity index 100% rename from examples/Makefile.am rename to samples/Makefile.am diff --git a/examples/cxx/Makefile.am b/samples/cxx/Makefile.am similarity index 100% rename from examples/cxx/Makefile.am rename to samples/cxx/Makefile.am diff --git a/Cantera/cxx/demos/NASA_coeffs/NASA_coeffs.cpp b/samples/cxx/NASA_coeffs/NASA_coeffs.cpp similarity index 100% rename from Cantera/cxx/demos/NASA_coeffs/NASA_coeffs.cpp rename to samples/cxx/NASA_coeffs/NASA_coeffs.cpp diff --git a/Cantera/cxx/demos/NASA_coeffs/output_0_blessed.txt b/samples/cxx/NASA_coeffs/output_0_blessed.txt similarity index 100% rename from Cantera/cxx/demos/NASA_coeffs/output_0_blessed.txt rename to samples/cxx/NASA_coeffs/output_0_blessed.txt diff --git a/Cantera/cxx/demos/NASA_coeffs/runtest b/samples/cxx/NASA_coeffs/runtest similarity index 100% rename from Cantera/cxx/demos/NASA_coeffs/runtest rename to samples/cxx/NASA_coeffs/runtest diff --git a/apps/bvp/AxiStagnBVP.cpp b/samples/cxx/bvp/AxiStagnBVP.cpp similarity index 100% rename from apps/bvp/AxiStagnBVP.cpp rename to samples/cxx/bvp/AxiStagnBVP.cpp diff --git a/apps/bvp/AxiStagnBVP.h b/samples/cxx/bvp/AxiStagnBVP.h similarity index 100% rename from apps/bvp/AxiStagnBVP.h rename to samples/cxx/bvp/AxiStagnBVP.h diff --git a/apps/bvp/BoundaryValueProblem.h b/samples/cxx/bvp/BoundaryValueProblem.h similarity index 100% rename from apps/bvp/BoundaryValueProblem.h rename to samples/cxx/bvp/BoundaryValueProblem.h diff --git a/apps/bvp/README b/samples/cxx/bvp/README similarity index 100% rename from apps/bvp/README rename to samples/cxx/bvp/README diff --git a/apps/bvp/blasius.cpp b/samples/cxx/bvp/blasius.cpp similarity index 100% rename from apps/bvp/blasius.cpp rename to samples/cxx/bvp/blasius.cpp diff --git a/apps/bvp/stagnation.cpp b/samples/cxx/bvp/stagnation.cpp similarity index 100% rename from apps/bvp/stagnation.cpp rename to samples/cxx/bvp/stagnation.cpp diff --git a/Cantera/cxx/demos/combustor/combustor.cpp b/samples/cxx/combustor/combustor.cpp similarity index 100% rename from Cantera/cxx/demos/combustor/combustor.cpp rename to samples/cxx/combustor/combustor.cpp diff --git a/Cantera/cxx/demos/combustor/combustor_blessed_0.csv b/samples/cxx/combustor/combustor_blessed_0.csv similarity index 100% rename from Cantera/cxx/demos/combustor/combustor_blessed_0.csv rename to samples/cxx/combustor/combustor_blessed_0.csv diff --git a/Cantera/cxx/demos/combustor/output_0_blessed.txt b/samples/cxx/combustor/output_0_blessed.txt similarity index 100% rename from Cantera/cxx/demos/combustor/output_0_blessed.txt rename to samples/cxx/combustor/output_0_blessed.txt diff --git a/Cantera/cxx/demos/combustor/runtest b/samples/cxx/combustor/runtest similarity index 100% rename from Cantera/cxx/demos/combustor/runtest rename to samples/cxx/combustor/runtest diff --git a/tools/templates/cxx/demo.cpp b/samples/cxx/demo.cpp similarity index 100% rename from tools/templates/cxx/demo.cpp rename to samples/cxx/demo.cpp diff --git a/Cantera/cxx/demos/flamespeed/flamespeed.cpp b/samples/cxx/flamespeed/flamespeed.cpp similarity index 100% rename from Cantera/cxx/demos/flamespeed/flamespeed.cpp rename to samples/cxx/flamespeed/flamespeed.cpp diff --git a/Cantera/cxx/demos/flamespeed/flamespeed_blessed_0.csv b/samples/cxx/flamespeed/flamespeed_blessed_0.csv similarity index 100% rename from Cantera/cxx/demos/flamespeed/flamespeed_blessed_0.csv rename to samples/cxx/flamespeed/flamespeed_blessed_0.csv diff --git a/Cantera/cxx/demos/flamespeed/gri30.cti b/samples/cxx/flamespeed/gri30.cti similarity index 100% rename from Cantera/cxx/demos/flamespeed/gri30.cti rename to samples/cxx/flamespeed/gri30.cti diff --git a/Cantera/cxx/demos/flamespeed/output_0_blessed.txt b/samples/cxx/flamespeed/output_0_blessed.txt similarity index 100% rename from Cantera/cxx/demos/flamespeed/output_0_blessed.txt rename to samples/cxx/flamespeed/output_0_blessed.txt diff --git a/Cantera/cxx/demos/flamespeed/phi_input.txt b/samples/cxx/flamespeed/phi_input.txt similarity index 100% rename from Cantera/cxx/demos/flamespeed/phi_input.txt rename to samples/cxx/flamespeed/phi_input.txt diff --git a/Cantera/cxx/demos/flamespeed/runtest b/samples/cxx/flamespeed/runtest similarity index 100% rename from Cantera/cxx/demos/flamespeed/runtest rename to samples/cxx/flamespeed/runtest diff --git a/Cantera/cxx/demos/kinetics1/example_utils.h b/samples/cxx/kinetics1/example_utils.h similarity index 100% rename from Cantera/cxx/demos/kinetics1/example_utils.h rename to samples/cxx/kinetics1/example_utils.h diff --git a/Cantera/cxx/demos/kinetics1/kin1_blessed_0.csv b/samples/cxx/kinetics1/kin1_blessed_0.csv similarity index 100% rename from Cantera/cxx/demos/kinetics1/kin1_blessed_0.csv rename to samples/cxx/kinetics1/kin1_blessed_0.csv diff --git a/Cantera/cxx/demos/kinetics1/kinetics1.cpp b/samples/cxx/kinetics1/kinetics1.cpp similarity index 100% rename from Cantera/cxx/demos/kinetics1/kinetics1.cpp rename to samples/cxx/kinetics1/kinetics1.cpp diff --git a/Cantera/cxx/demos/kinetics1/output_0_blessed.txt b/samples/cxx/kinetics1/output_0_blessed.txt similarity index 100% rename from Cantera/cxx/demos/kinetics1/output_0_blessed.txt rename to samples/cxx/kinetics1/output_0_blessed.txt diff --git a/Cantera/cxx/demos/kinetics1/runtest b/samples/cxx/kinetics1/runtest similarity index 100% rename from Cantera/cxx/demos/kinetics1/runtest rename to samples/cxx/kinetics1/runtest diff --git a/Cantera/cxx/demos/rankine/output_0_blessed.txt b/samples/cxx/rankine/output_0_blessed.txt similarity index 100% rename from Cantera/cxx/demos/rankine/output_0_blessed.txt rename to samples/cxx/rankine/output_0_blessed.txt diff --git a/Cantera/cxx/demos/rankine/rankine.cpp b/samples/cxx/rankine/rankine.cpp similarity index 100% rename from Cantera/cxx/demos/rankine/rankine.cpp rename to samples/cxx/rankine/rankine.cpp diff --git a/Cantera/cxx/demos/rankine/runtest b/samples/cxx/rankine/runtest similarity index 100% rename from Cantera/cxx/demos/rankine/runtest rename to samples/cxx/rankine/runtest diff --git a/Cantera/fortran/f77demos/README.txt b/samples/f77/README.txt similarity index 100% rename from Cantera/fortran/f77demos/README.txt rename to samples/f77/README.txt diff --git a/tools/templates/f77/README_unix.txt b/samples/f77/README_unix.txt similarity index 100% rename from tools/templates/f77/README_unix.txt rename to samples/f77/README_unix.txt diff --git a/Cantera/fortran/f77demos/ctlib.f b/samples/f77/ctlib.f similarity index 100% rename from Cantera/fortran/f77demos/ctlib.f rename to samples/f77/ctlib.f diff --git a/tools/templates/f77/demo.f b/samples/f77/demo.f similarity index 100% rename from tools/templates/f77/demo.f rename to samples/f77/demo.f diff --git a/Cantera/fortran/f77demos/demo_ftnlib.cpp b/samples/f77/demo_ftnlib.cpp similarity index 100% rename from Cantera/fortran/f77demos/demo_ftnlib.cpp rename to samples/f77/demo_ftnlib.cpp diff --git a/Cantera/fortran/f77demos/isentropic.f b/samples/f77/isentropic.f similarity index 100% rename from Cantera/fortran/f77demos/isentropic.f rename to samples/f77/isentropic.f diff --git a/Cantera/fortran/f77demos/output_0_blessed.txt b/samples/f77/output_0_blessed.txt similarity index 100% rename from Cantera/fortran/f77demos/output_0_blessed.txt rename to samples/f77/output_0_blessed.txt diff --git a/Cantera/fortran/f77demos/output_1_blessed.txt b/samples/f77/output_1_blessed.txt similarity index 100% rename from Cantera/fortran/f77demos/output_1_blessed.txt rename to samples/f77/output_1_blessed.txt diff --git a/Cantera/fortran/f77demos/runtest b/samples/f77/runtest similarity index 100% rename from Cantera/fortran/f77demos/runtest rename to samples/f77/runtest diff --git a/tools/templates/f90/demo.f90 b/samples/f90/demo.f90 similarity index 100% rename from tools/templates/f90/demo.f90 rename to samples/f90/demo.f90 diff --git a/Cantera/matlab/tutorial/README b/samples/matlab/README similarity index 100% rename from Cantera/matlab/tutorial/README rename to samples/matlab/README diff --git a/tools/cantera_demos.m b/samples/matlab/cantera_demos.m similarity index 100% rename from tools/cantera_demos.m rename to samples/matlab/cantera_demos.m diff --git a/Cantera/matlab/examples/catcomb.m b/samples/matlab/catcomb.m similarity index 100% rename from Cantera/matlab/examples/catcomb.m rename to samples/matlab/catcomb.m diff --git a/Cantera/matlab/examples/diffflame.m b/samples/matlab/diffflame.m similarity index 100% rename from Cantera/matlab/examples/diffflame.m rename to samples/matlab/diffflame.m diff --git a/Cantera/matlab/examples/equil.m b/samples/matlab/equil.m similarity index 100% rename from Cantera/matlab/examples/equil.m rename to samples/matlab/equil.m diff --git a/Cantera/matlab/examples/flame.m b/samples/matlab/flame.m similarity index 100% rename from Cantera/matlab/examples/flame.m rename to samples/matlab/flame.m diff --git a/Cantera/matlab/examples/flame1.m b/samples/matlab/flame1.m similarity index 100% rename from Cantera/matlab/examples/flame1.m rename to samples/matlab/flame1.m diff --git a/Cantera/matlab/examples/flame2.m b/samples/matlab/flame2.m similarity index 100% rename from Cantera/matlab/examples/flame2.m rename to samples/matlab/flame2.m diff --git a/Cantera/matlab/examples/ignite.m b/samples/matlab/ignite.m similarity index 100% rename from Cantera/matlab/examples/ignite.m rename to samples/matlab/ignite.m diff --git a/Cantera/matlab/examples/ignite2.m b/samples/matlab/ignite2.m similarity index 100% rename from Cantera/matlab/examples/ignite2.m rename to samples/matlab/ignite2.m diff --git a/Cantera/matlab/examples/ignite3.m b/samples/matlab/ignite3.m similarity index 100% rename from Cantera/matlab/examples/ignite3.m rename to samples/matlab/ignite3.m diff --git a/Cantera/matlab/examples/ignite_hp.m b/samples/matlab/ignite_hp.m similarity index 100% rename from Cantera/matlab/examples/ignite_hp.m rename to samples/matlab/ignite_hp.m diff --git a/Cantera/matlab/examples/ignite_uv.m b/samples/matlab/ignite_uv.m similarity index 100% rename from Cantera/matlab/examples/ignite_uv.m rename to samples/matlab/ignite_uv.m diff --git a/Cantera/matlab/examples/isentropic.m b/samples/matlab/isentropic.m similarity index 100% rename from Cantera/matlab/examples/isentropic.m rename to samples/matlab/isentropic.m diff --git a/Cantera/matlab/examples/periodic_cstr.m b/samples/matlab/periodic_cstr.m similarity index 100% rename from Cantera/matlab/examples/periodic_cstr.m rename to samples/matlab/periodic_cstr.m diff --git a/Cantera/matlab/examples/prandtl1.m b/samples/matlab/prandtl1.m similarity index 100% rename from Cantera/matlab/examples/prandtl1.m rename to samples/matlab/prandtl1.m diff --git a/Cantera/matlab/examples/prandtl2.m b/samples/matlab/prandtl2.m similarity index 100% rename from Cantera/matlab/examples/prandtl2.m rename to samples/matlab/prandtl2.m diff --git a/Cantera/matlab/examples/rankine.m b/samples/matlab/rankine.m similarity index 100% rename from Cantera/matlab/examples/rankine.m rename to samples/matlab/rankine.m diff --git a/Cantera/matlab/examples/reactor1.m b/samples/matlab/reactor1.m similarity index 100% rename from Cantera/matlab/examples/reactor1.m rename to samples/matlab/reactor1.m diff --git a/Cantera/matlab/examples/reactor2.m b/samples/matlab/reactor2.m similarity index 100% rename from Cantera/matlab/examples/reactor2.m rename to samples/matlab/reactor2.m diff --git a/Cantera/matlab/examples/run_examples.m b/samples/matlab/run_examples.m similarity index 100% rename from Cantera/matlab/examples/run_examples.m rename to samples/matlab/run_examples.m diff --git a/Cantera/matlab/examples/surfreactor.m b/samples/matlab/surfreactor.m similarity index 100% rename from Cantera/matlab/examples/surfreactor.m rename to samples/matlab/surfreactor.m diff --git a/Cantera/matlab/examples/test_examples.m b/samples/matlab/test_examples.m similarity index 100% rename from Cantera/matlab/examples/test_examples.m rename to samples/matlab/test_examples.m diff --git a/Cantera/matlab/examples/transport1.m b/samples/matlab/transport1.m similarity index 100% rename from Cantera/matlab/examples/transport1.m rename to samples/matlab/transport1.m diff --git a/Cantera/matlab/tutorial/tut1.m b/samples/matlab/tut1.m similarity index 100% rename from Cantera/matlab/tutorial/tut1.m rename to samples/matlab/tut1.m diff --git a/Cantera/matlab/tutorial/tut2.m b/samples/matlab/tut2.m similarity index 100% rename from Cantera/matlab/tutorial/tut2.m rename to samples/matlab/tut2.m diff --git a/Cantera/matlab/tutorial/tut3.m b/samples/matlab/tut3.m similarity index 100% rename from Cantera/matlab/tutorial/tut3.m rename to samples/matlab/tut3.m diff --git a/Cantera/matlab/tutorial/tut4.m b/samples/matlab/tut4.m similarity index 100% rename from Cantera/matlab/tutorial/tut4.m rename to samples/matlab/tut4.m diff --git a/Cantera/matlab/tutorial/tut5.m b/samples/matlab/tut5.m similarity index 100% rename from Cantera/matlab/tutorial/tut5.m rename to samples/matlab/tut5.m diff --git a/Cantera/matlab/tutorial/tut6.m b/samples/matlab/tut6.m similarity index 100% rename from Cantera/matlab/tutorial/tut6.m rename to samples/matlab/tut6.m diff --git a/Cantera/matlab/tutorial/tut7.m b/samples/matlab/tut7.m similarity index 100% rename from Cantera/matlab/tutorial/tut7.m rename to samples/matlab/tut7.m diff --git a/Cantera/python/examples/equilibrium/adiabatic_flame/adiabatic.py b/samples/python/equilibrium/adiabatic_flame/adiabatic.py similarity index 100% rename from Cantera/python/examples/equilibrium/adiabatic_flame/adiabatic.py rename to samples/python/equilibrium/adiabatic_flame/adiabatic.py diff --git a/Cantera/python/examples/equilibrium/adiabatic_flame/adiabatic_blessed_0.csv b/samples/python/equilibrium/adiabatic_flame/adiabatic_blessed_0.csv similarity index 100% rename from Cantera/python/examples/equilibrium/adiabatic_flame/adiabatic_blessed_0.csv rename to samples/python/equilibrium/adiabatic_flame/adiabatic_blessed_0.csv diff --git a/Cantera/python/examples/equilibrium/adiabatic_flame/cleanup b/samples/python/equilibrium/adiabatic_flame/cleanup similarity index 100% rename from Cantera/python/examples/equilibrium/adiabatic_flame/cleanup rename to samples/python/equilibrium/adiabatic_flame/cleanup diff --git a/Cantera/python/examples/equilibrium/adiabatic_flame/output_blessed_0.txt b/samples/python/equilibrium/adiabatic_flame/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/equilibrium/adiabatic_flame/output_blessed_0.txt rename to samples/python/equilibrium/adiabatic_flame/output_blessed_0.txt diff --git a/Cantera/python/examples/equilibrium/adiabatic_flame/runtest b/samples/python/equilibrium/adiabatic_flame/runtest similarity index 100% rename from Cantera/python/examples/equilibrium/adiabatic_flame/runtest rename to samples/python/equilibrium/adiabatic_flame/runtest diff --git a/Cantera/python/examples/equilibrium/cleanup b/samples/python/equilibrium/cleanup similarity index 100% rename from Cantera/python/examples/equilibrium/cleanup rename to samples/python/equilibrium/cleanup diff --git a/Cantera/python/examples/equilibrium/multiphase_plasma/KOH.cti b/samples/python/equilibrium/multiphase_plasma/KOH.cti similarity index 100% rename from Cantera/python/examples/equilibrium/multiphase_plasma/KOH.cti rename to samples/python/equilibrium/multiphase_plasma/KOH.cti diff --git a/Cantera/python/examples/equilibrium/multiphase_plasma/cleanup b/samples/python/equilibrium/multiphase_plasma/cleanup similarity index 100% rename from Cantera/python/examples/equilibrium/multiphase_plasma/cleanup rename to samples/python/equilibrium/multiphase_plasma/cleanup diff --git a/Cantera/python/examples/equilibrium/multiphase_plasma/equil_koh_blessed_0.csv b/samples/python/equilibrium/multiphase_plasma/equil_koh_blessed_0.csv similarity index 100% rename from Cantera/python/examples/equilibrium/multiphase_plasma/equil_koh_blessed_0.csv rename to samples/python/equilibrium/multiphase_plasma/equil_koh_blessed_0.csv diff --git a/Cantera/python/examples/equilibrium/multiphase_plasma/multiphase_plasma.py b/samples/python/equilibrium/multiphase_plasma/multiphase_plasma.py similarity index 100% rename from Cantera/python/examples/equilibrium/multiphase_plasma/multiphase_plasma.py rename to samples/python/equilibrium/multiphase_plasma/multiphase_plasma.py diff --git a/Cantera/python/examples/equilibrium/multiphase_plasma/output_blessed_0.txt b/samples/python/equilibrium/multiphase_plasma/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/equilibrium/multiphase_plasma/output_blessed_0.txt rename to samples/python/equilibrium/multiphase_plasma/output_blessed_0.txt diff --git a/Cantera/python/examples/equilibrium/multiphase_plasma/runtest b/samples/python/equilibrium/multiphase_plasma/runtest similarity index 100% rename from Cantera/python/examples/equilibrium/multiphase_plasma/runtest rename to samples/python/equilibrium/multiphase_plasma/runtest diff --git a/Cantera/python/examples/equilibrium/plotting.py b/samples/python/equilibrium/plotting.py similarity index 100% rename from Cantera/python/examples/equilibrium/plotting.py rename to samples/python/equilibrium/plotting.py diff --git a/Cantera/python/examples/equilibrium/simple_test/cleanup b/samples/python/equilibrium/simple_test/cleanup similarity index 100% rename from Cantera/python/examples/equilibrium/simple_test/cleanup rename to samples/python/equilibrium/simple_test/cleanup diff --git a/Cantera/python/examples/equilibrium/simple_test/output_blessed_0.txt b/samples/python/equilibrium/simple_test/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/equilibrium/simple_test/output_blessed_0.txt rename to samples/python/equilibrium/simple_test/output_blessed_0.txt diff --git a/Cantera/python/examples/equilibrium/simple_test/runtest b/samples/python/equilibrium/simple_test/runtest similarity index 100% rename from Cantera/python/examples/equilibrium/simple_test/runtest rename to samples/python/equilibrium/simple_test/runtest diff --git a/Cantera/python/examples/equilibrium/simple_test/simple.py b/samples/python/equilibrium/simple_test/simple.py similarity index 100% rename from Cantera/python/examples/equilibrium/simple_test/simple.py rename to samples/python/equilibrium/simple_test/simple.py diff --git a/Cantera/python/examples/equilibrium/stoich_flame/cleanup b/samples/python/equilibrium/stoich_flame/cleanup similarity index 100% rename from Cantera/python/examples/equilibrium/stoich_flame/cleanup rename to samples/python/equilibrium/stoich_flame/cleanup diff --git a/Cantera/python/examples/equilibrium/stoich_flame/output_blessed_0.txt b/samples/python/equilibrium/stoich_flame/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/equilibrium/stoich_flame/output_blessed_0.txt rename to samples/python/equilibrium/stoich_flame/output_blessed_0.txt diff --git a/Cantera/python/examples/equilibrium/stoich_flame/runtest b/samples/python/equilibrium/stoich_flame/runtest similarity index 100% rename from Cantera/python/examples/equilibrium/stoich_flame/runtest rename to samples/python/equilibrium/stoich_flame/runtest diff --git a/Cantera/python/examples/equilibrium/stoich_flame/stoich.py b/samples/python/equilibrium/stoich_flame/stoich.py similarity index 100% rename from Cantera/python/examples/equilibrium/stoich_flame/stoich.py rename to samples/python/equilibrium/stoich_flame/stoich.py diff --git a/Cantera/python/examples/flames/adiabatic_flame/adiabatic_flame.py b/samples/python/flames/adiabatic_flame/adiabatic_flame.py similarity index 100% rename from Cantera/python/examples/flames/adiabatic_flame/adiabatic_flame.py rename to samples/python/flames/adiabatic_flame/adiabatic_flame.py diff --git a/Cantera/python/examples/flames/adiabatic_flame/adiabatic_flame_blessed_0.csv b/samples/python/flames/adiabatic_flame/adiabatic_flame_blessed_0.csv similarity index 100% rename from Cantera/python/examples/flames/adiabatic_flame/adiabatic_flame_blessed_0.csv rename to samples/python/flames/adiabatic_flame/adiabatic_flame_blessed_0.csv diff --git a/Cantera/python/examples/flames/adiabatic_flame/cleanup b/samples/python/flames/adiabatic_flame/cleanup similarity index 100% rename from Cantera/python/examples/flames/adiabatic_flame/cleanup rename to samples/python/flames/adiabatic_flame/cleanup diff --git a/Cantera/python/examples/flames/adiabatic_flame/output_blessed_0.txt b/samples/python/flames/adiabatic_flame/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/flames/adiabatic_flame/output_blessed_0.txt rename to samples/python/flames/adiabatic_flame/output_blessed_0.txt diff --git a/Cantera/python/examples/flames/adiabatic_flame/runtest b/samples/python/flames/adiabatic_flame/runtest similarity index 100% rename from Cantera/python/examples/flames/adiabatic_flame/runtest rename to samples/python/flames/adiabatic_flame/runtest diff --git a/Cantera/python/examples/flames/flame1/cleanup b/samples/python/flames/flame1/cleanup similarity index 100% rename from Cantera/python/examples/flames/flame1/cleanup rename to samples/python/flames/flame1/cleanup diff --git a/Cantera/python/examples/flames/flame1/flame1.py b/samples/python/flames/flame1/flame1.py similarity index 100% rename from Cantera/python/examples/flames/flame1/flame1.py rename to samples/python/flames/flame1/flame1.py diff --git a/Cantera/python/examples/flames/flame1/flame1_blessed_0.csv b/samples/python/flames/flame1/flame1_blessed_0.csv similarity index 100% rename from Cantera/python/examples/flames/flame1/flame1_blessed_0.csv rename to samples/python/flames/flame1/flame1_blessed_0.csv diff --git a/Cantera/python/examples/flames/flame1/output_blessed_0.txt b/samples/python/flames/flame1/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/flames/flame1/output_blessed_0.txt rename to samples/python/flames/flame1/output_blessed_0.txt diff --git a/Cantera/python/examples/flames/flame1/runtest b/samples/python/flames/flame1/runtest similarity index 100% rename from Cantera/python/examples/flames/flame1/runtest rename to samples/python/flames/flame1/runtest diff --git a/Cantera/python/examples/flames/flame2/cleanup b/samples/python/flames/flame2/cleanup similarity index 100% rename from Cantera/python/examples/flames/flame2/cleanup rename to samples/python/flames/flame2/cleanup diff --git a/Cantera/python/examples/flames/flame2/flame2.py b/samples/python/flames/flame2/flame2.py similarity index 100% rename from Cantera/python/examples/flames/flame2/flame2.py rename to samples/python/flames/flame2/flame2.py diff --git a/Cantera/python/examples/flames/flame2/flame2_blessed_0.csv b/samples/python/flames/flame2/flame2_blessed_0.csv similarity index 100% rename from Cantera/python/examples/flames/flame2/flame2_blessed_0.csv rename to samples/python/flames/flame2/flame2_blessed_0.csv diff --git a/Cantera/python/examples/flames/flame2/output_blessed_0.txt b/samples/python/flames/flame2/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/flames/flame2/output_blessed_0.txt rename to samples/python/flames/flame2/output_blessed_0.txt diff --git a/Cantera/python/examples/flames/flame2/runtest b/samples/python/flames/flame2/runtest similarity index 100% rename from Cantera/python/examples/flames/flame2/runtest rename to samples/python/flames/flame2/runtest diff --git a/Cantera/python/examples/flames/flame_fixed_T/cleanup b/samples/python/flames/flame_fixed_T/cleanup similarity index 100% rename from Cantera/python/examples/flames/flame_fixed_T/cleanup rename to samples/python/flames/flame_fixed_T/cleanup diff --git a/Cantera/python/examples/flames/flame_fixed_T/flame_fixed_T.py b/samples/python/flames/flame_fixed_T/flame_fixed_T.py similarity index 100% rename from Cantera/python/examples/flames/flame_fixed_T/flame_fixed_T.py rename to samples/python/flames/flame_fixed_T/flame_fixed_T.py diff --git a/Cantera/python/examples/flames/flame_fixed_T/flame_fixed_T_blessed_0.csv b/samples/python/flames/flame_fixed_T/flame_fixed_T_blessed_0.csv similarity index 100% rename from Cantera/python/examples/flames/flame_fixed_T/flame_fixed_T_blessed_0.csv rename to samples/python/flames/flame_fixed_T/flame_fixed_T_blessed_0.csv diff --git a/Cantera/python/examples/flames/flame_fixed_T/output_blessed_0.txt b/samples/python/flames/flame_fixed_T/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/flames/flame_fixed_T/output_blessed_0.txt rename to samples/python/flames/flame_fixed_T/output_blessed_0.txt diff --git a/Cantera/python/examples/flames/flame_fixed_T/runtest b/samples/python/flames/flame_fixed_T/runtest similarity index 100% rename from Cantera/python/examples/flames/flame_fixed_T/runtest rename to samples/python/flames/flame_fixed_T/runtest diff --git a/Cantera/python/examples/flames/flame_fixed_T/tdata.dat b/samples/python/flames/flame_fixed_T/tdata.dat similarity index 100% rename from Cantera/python/examples/flames/flame_fixed_T/tdata.dat rename to samples/python/flames/flame_fixed_T/tdata.dat diff --git a/Cantera/python/examples/flames/free_h2_air/cleanup b/samples/python/flames/free_h2_air/cleanup similarity index 100% rename from Cantera/python/examples/flames/free_h2_air/cleanup rename to samples/python/flames/free_h2_air/cleanup diff --git a/Cantera/python/examples/flames/free_h2_air/free_h2_air.py b/samples/python/flames/free_h2_air/free_h2_air.py similarity index 100% rename from Cantera/python/examples/flames/free_h2_air/free_h2_air.py rename to samples/python/flames/free_h2_air/free_h2_air.py diff --git a/Cantera/python/examples/flames/free_h2_air/freeflame1_blessed_0.csv b/samples/python/flames/free_h2_air/freeflame1_blessed_0.csv similarity index 100% rename from Cantera/python/examples/flames/free_h2_air/freeflame1_blessed_0.csv rename to samples/python/flames/free_h2_air/freeflame1_blessed_0.csv diff --git a/Cantera/python/examples/flames/free_h2_air/output_blessed_0.txt b/samples/python/flames/free_h2_air/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/flames/free_h2_air/output_blessed_0.txt rename to samples/python/flames/free_h2_air/output_blessed_0.txt diff --git a/Cantera/python/examples/flames/free_h2_air/runtest b/samples/python/flames/free_h2_air/runtest similarity index 100% rename from Cantera/python/examples/flames/free_h2_air/runtest rename to samples/python/flames/free_h2_air/runtest diff --git a/Cantera/python/examples/flames/npflame1/cleanup b/samples/python/flames/npflame1/cleanup similarity index 100% rename from Cantera/python/examples/flames/npflame1/cleanup rename to samples/python/flames/npflame1/cleanup diff --git a/Cantera/python/examples/flames/npflame1/npflame1.py b/samples/python/flames/npflame1/npflame1.py similarity index 100% rename from Cantera/python/examples/flames/npflame1/npflame1.py rename to samples/python/flames/npflame1/npflame1.py diff --git a/Cantera/python/examples/flames/npflame1/npflame1_blessed_0.csv b/samples/python/flames/npflame1/npflame1_blessed_0.csv similarity index 100% rename from Cantera/python/examples/flames/npflame1/npflame1_blessed_0.csv rename to samples/python/flames/npflame1/npflame1_blessed_0.csv diff --git a/Cantera/python/examples/flames/npflame1/output_blessed_0.txt b/samples/python/flames/npflame1/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/flames/npflame1/output_blessed_0.txt rename to samples/python/flames/npflame1/output_blessed_0.txt diff --git a/Cantera/python/examples/flames/npflame1/runtest b/samples/python/flames/npflame1/runtest similarity index 100% rename from Cantera/python/examples/flames/npflame1/runtest rename to samples/python/flames/npflame1/runtest diff --git a/Cantera/python/examples/flames/stflame1/cleanup b/samples/python/flames/stflame1/cleanup similarity index 100% rename from Cantera/python/examples/flames/stflame1/cleanup rename to samples/python/flames/stflame1/cleanup diff --git a/Cantera/python/examples/flames/stflame1/output_blessed_0.txt b/samples/python/flames/stflame1/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/flames/stflame1/output_blessed_0.txt rename to samples/python/flames/stflame1/output_blessed_0.txt diff --git a/Cantera/python/examples/flames/stflame1/runtest b/samples/python/flames/stflame1/runtest similarity index 100% rename from Cantera/python/examples/flames/stflame1/runtest rename to samples/python/flames/stflame1/runtest diff --git a/Cantera/python/examples/flames/stflame1/stflame1.py b/samples/python/flames/stflame1/stflame1.py similarity index 100% rename from Cantera/python/examples/flames/stflame1/stflame1.py rename to samples/python/flames/stflame1/stflame1.py diff --git a/Cantera/python/examples/flames/stflame1/stflame1_1_blessed_0.csv b/samples/python/flames/stflame1/stflame1_1_blessed_0.csv similarity index 100% rename from Cantera/python/examples/flames/stflame1/stflame1_1_blessed_0.csv rename to samples/python/flames/stflame1/stflame1_1_blessed_0.csv diff --git a/Cantera/python/examples/fuel_cells/cleanup b/samples/python/fuel_cells/cleanup similarity index 100% rename from Cantera/python/examples/fuel_cells/cleanup rename to samples/python/fuel_cells/cleanup diff --git a/Cantera/python/examples/fuel_cells/output_blessed_0.txt b/samples/python/fuel_cells/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/fuel_cells/output_blessed_0.txt rename to samples/python/fuel_cells/output_blessed_0.txt diff --git a/Cantera/python/examples/fuel_cells/runtest b/samples/python/fuel_cells/runtest similarity index 100% rename from Cantera/python/examples/fuel_cells/runtest rename to samples/python/fuel_cells/runtest diff --git a/Cantera/python/examples/fuel_cells/sofc.cti b/samples/python/fuel_cells/sofc.cti similarity index 100% rename from Cantera/python/examples/fuel_cells/sofc.cti rename to samples/python/fuel_cells/sofc.cti diff --git a/Cantera/python/examples/fuel_cells/sofc.py b/samples/python/fuel_cells/sofc.py similarity index 100% rename from Cantera/python/examples/fuel_cells/sofc.py rename to samples/python/fuel_cells/sofc.py diff --git a/Cantera/python/examples/fuel_cells/sofc_blessed_0.csv b/samples/python/fuel_cells/sofc_blessed_0.csv similarity index 100% rename from Cantera/python/examples/fuel_cells/sofc_blessed_0.csv rename to samples/python/fuel_cells/sofc_blessed_0.csv diff --git a/Cantera/python/examples/gasdynamics/isentropic/cleanup b/samples/python/gasdynamics/isentropic/cleanup similarity index 100% rename from Cantera/python/examples/gasdynamics/isentropic/cleanup rename to samples/python/gasdynamics/isentropic/cleanup diff --git a/Cantera/python/examples/gasdynamics/isentropic/isentropic.py b/samples/python/gasdynamics/isentropic/isentropic.py similarity index 100% rename from Cantera/python/examples/gasdynamics/isentropic/isentropic.py rename to samples/python/gasdynamics/isentropic/isentropic.py diff --git a/Cantera/python/examples/gasdynamics/isentropic/output_blessed_0.txt b/samples/python/gasdynamics/isentropic/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/gasdynamics/isentropic/output_blessed_0.txt rename to samples/python/gasdynamics/isentropic/output_blessed_0.txt diff --git a/Cantera/python/examples/gasdynamics/isentropic/runtest b/samples/python/gasdynamics/isentropic/runtest similarity index 100% rename from Cantera/python/examples/gasdynamics/isentropic/runtest rename to samples/python/gasdynamics/isentropic/runtest diff --git a/Cantera/python/examples/gasdynamics/soundSpeed/cleanup b/samples/python/gasdynamics/soundSpeed/cleanup similarity index 100% rename from Cantera/python/examples/gasdynamics/soundSpeed/cleanup rename to samples/python/gasdynamics/soundSpeed/cleanup diff --git a/Cantera/python/examples/gasdynamics/soundSpeed/output_blessed_0.txt b/samples/python/gasdynamics/soundSpeed/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/gasdynamics/soundSpeed/output_blessed_0.txt rename to samples/python/gasdynamics/soundSpeed/output_blessed_0.txt diff --git a/Cantera/python/examples/gasdynamics/soundSpeed/runtest b/samples/python/gasdynamics/soundSpeed/runtest similarity index 100% rename from Cantera/python/examples/gasdynamics/soundSpeed/runtest rename to samples/python/gasdynamics/soundSpeed/runtest diff --git a/Cantera/python/examples/gasdynamics/soundSpeed/soundSpeed.py b/samples/python/gasdynamics/soundSpeed/soundSpeed.py similarity index 100% rename from Cantera/python/examples/gasdynamics/soundSpeed/soundSpeed.py rename to samples/python/gasdynamics/soundSpeed/soundSpeed.py diff --git a/Cantera/python/examples/kinetics/cleanup b/samples/python/kinetics/cleanup similarity index 100% rename from Cantera/python/examples/kinetics/cleanup rename to samples/python/kinetics/cleanup diff --git a/Cantera/python/examples/kinetics/output_blessed_0.txt b/samples/python/kinetics/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/kinetics/output_blessed_0.txt rename to samples/python/kinetics/output_blessed_0.txt diff --git a/Cantera/python/examples/kinetics/ratecoeffs.py b/samples/python/kinetics/ratecoeffs.py similarity index 100% rename from Cantera/python/examples/kinetics/ratecoeffs.py rename to samples/python/kinetics/ratecoeffs.py diff --git a/Cantera/python/examples/kinetics/runtest b/samples/python/kinetics/runtest similarity index 100% rename from Cantera/python/examples/kinetics/runtest rename to samples/python/kinetics/runtest diff --git a/Cantera/python/examples/liquid_vapor/critProperties/cleanup b/samples/python/liquid_vapor/critProperties/cleanup similarity index 100% rename from Cantera/python/examples/liquid_vapor/critProperties/cleanup rename to samples/python/liquid_vapor/critProperties/cleanup diff --git a/Cantera/python/examples/liquid_vapor/critProperties/critProperties.py b/samples/python/liquid_vapor/critProperties/critProperties.py similarity index 100% rename from Cantera/python/examples/liquid_vapor/critProperties/critProperties.py rename to samples/python/liquid_vapor/critProperties/critProperties.py diff --git a/Cantera/python/examples/liquid_vapor/critProperties/output_blessed_0.txt b/samples/python/liquid_vapor/critProperties/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/liquid_vapor/critProperties/output_blessed_0.txt rename to samples/python/liquid_vapor/critProperties/output_blessed_0.txt diff --git a/Cantera/python/examples/liquid_vapor/critProperties/runtest b/samples/python/liquid_vapor/critProperties/runtest similarity index 100% rename from Cantera/python/examples/liquid_vapor/critProperties/runtest rename to samples/python/liquid_vapor/critProperties/runtest diff --git a/Cantera/python/examples/liquid_vapor/rankine/cleanup b/samples/python/liquid_vapor/rankine/cleanup similarity index 100% rename from Cantera/python/examples/liquid_vapor/rankine/cleanup rename to samples/python/liquid_vapor/rankine/cleanup diff --git a/Cantera/python/examples/liquid_vapor/rankine/output_blessed_0.txt b/samples/python/liquid_vapor/rankine/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/liquid_vapor/rankine/output_blessed_0.txt rename to samples/python/liquid_vapor/rankine/output_blessed_0.txt diff --git a/Cantera/python/examples/liquid_vapor/rankine/rankine.py b/samples/python/liquid_vapor/rankine/rankine.py similarity index 100% rename from Cantera/python/examples/liquid_vapor/rankine/rankine.py rename to samples/python/liquid_vapor/rankine/rankine.py diff --git a/Cantera/python/examples/liquid_vapor/rankine/runtest b/samples/python/liquid_vapor/rankine/runtest similarity index 100% rename from Cantera/python/examples/liquid_vapor/rankine/runtest rename to samples/python/liquid_vapor/rankine/runtest diff --git a/Cantera/python/examples/misc/cleanup b/samples/python/misc/cleanup similarity index 100% rename from Cantera/python/examples/misc/cleanup rename to samples/python/misc/cleanup diff --git a/Cantera/python/examples/misc/output_blessed_0.txt b/samples/python/misc/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/misc/output_blessed_0.txt rename to samples/python/misc/output_blessed_0.txt diff --git a/Cantera/python/examples/misc/rp_blessed_0.txt b/samples/python/misc/rp_blessed_0.txt similarity index 100% rename from Cantera/python/examples/misc/rp_blessed_0.txt rename to samples/python/misc/rp_blessed_0.txt diff --git a/Cantera/python/examples/misc/runtest b/samples/python/misc/runtest similarity index 100% rename from Cantera/python/examples/misc/runtest rename to samples/python/misc/runtest diff --git a/Cantera/python/examples/misc/rxnpath1.py b/samples/python/misc/rxnpath1.py similarity index 100% rename from Cantera/python/examples/misc/rxnpath1.py rename to samples/python/misc/rxnpath1.py diff --git a/Cantera/python/examples/reactors/combustor_sim/cleanup b/samples/python/reactors/combustor_sim/cleanup similarity index 100% rename from Cantera/python/examples/reactors/combustor_sim/cleanup rename to samples/python/reactors/combustor_sim/cleanup diff --git a/Cantera/python/examples/reactors/combustor_sim/combustor.py b/samples/python/reactors/combustor_sim/combustor.py similarity index 100% rename from Cantera/python/examples/reactors/combustor_sim/combustor.py rename to samples/python/reactors/combustor_sim/combustor.py diff --git a/Cantera/python/examples/reactors/combustor_sim/combustor_blessed_0.csv b/samples/python/reactors/combustor_sim/combustor_blessed_0.csv similarity index 100% rename from Cantera/python/examples/reactors/combustor_sim/combustor_blessed_0.csv rename to samples/python/reactors/combustor_sim/combustor_blessed_0.csv diff --git a/Cantera/python/examples/reactors/combustor_sim/output_blessed_0.txt b/samples/python/reactors/combustor_sim/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/reactors/combustor_sim/output_blessed_0.txt rename to samples/python/reactors/combustor_sim/output_blessed_0.txt diff --git a/Cantera/python/examples/reactors/combustor_sim/runtest b/samples/python/reactors/combustor_sim/runtest similarity index 100% rename from Cantera/python/examples/reactors/combustor_sim/runtest rename to samples/python/reactors/combustor_sim/runtest diff --git a/Cantera/python/examples/reactors/functors_sim/cleanup b/samples/python/reactors/functors_sim/cleanup similarity index 100% rename from Cantera/python/examples/reactors/functors_sim/cleanup rename to samples/python/reactors/functors_sim/cleanup diff --git a/Cantera/python/examples/reactors/functors_sim/functors.py b/samples/python/reactors/functors_sim/functors.py similarity index 100% rename from Cantera/python/examples/reactors/functors_sim/functors.py rename to samples/python/reactors/functors_sim/functors.py diff --git a/Cantera/python/examples/reactors/functors_sim/output_blessed_0.txt b/samples/python/reactors/functors_sim/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/reactors/functors_sim/output_blessed_0.txt rename to samples/python/reactors/functors_sim/output_blessed_0.txt diff --git a/Cantera/python/examples/reactors/functors_sim/runtest b/samples/python/reactors/functors_sim/runtest similarity index 100% rename from Cantera/python/examples/reactors/functors_sim/runtest rename to samples/python/reactors/functors_sim/runtest diff --git a/Cantera/python/examples/reactors/mix1_sim/cleanup b/samples/python/reactors/mix1_sim/cleanup similarity index 100% rename from Cantera/python/examples/reactors/mix1_sim/cleanup rename to samples/python/reactors/mix1_sim/cleanup diff --git a/Cantera/python/examples/reactors/mix1_sim/mix1.py b/samples/python/reactors/mix1_sim/mix1.py similarity index 100% rename from Cantera/python/examples/reactors/mix1_sim/mix1.py rename to samples/python/reactors/mix1_sim/mix1.py diff --git a/Cantera/python/examples/reactors/mix1_sim/output_blessed_0.txt b/samples/python/reactors/mix1_sim/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/reactors/mix1_sim/output_blessed_0.txt rename to samples/python/reactors/mix1_sim/output_blessed_0.txt diff --git a/Cantera/python/examples/reactors/mix1_sim/runtest b/samples/python/reactors/mix1_sim/runtest similarity index 100% rename from Cantera/python/examples/reactors/mix1_sim/runtest rename to samples/python/reactors/mix1_sim/runtest diff --git a/Cantera/python/examples/reactors/mix2_sim/cleanup b/samples/python/reactors/mix2_sim/cleanup similarity index 100% rename from Cantera/python/examples/reactors/mix2_sim/cleanup rename to samples/python/reactors/mix2_sim/cleanup diff --git a/Cantera/python/examples/reactors/mix2_sim/mix2.py b/samples/python/reactors/mix2_sim/mix2.py similarity index 100% rename from Cantera/python/examples/reactors/mix2_sim/mix2.py rename to samples/python/reactors/mix2_sim/mix2.py diff --git a/Cantera/python/examples/reactors/mix2_sim/output_blessed_0.txt b/samples/python/reactors/mix2_sim/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/reactors/mix2_sim/output_blessed_0.txt rename to samples/python/reactors/mix2_sim/output_blessed_0.txt diff --git a/Cantera/python/examples/reactors/mix2_sim/runtest b/samples/python/reactors/mix2_sim/runtest similarity index 100% rename from Cantera/python/examples/reactors/mix2_sim/runtest rename to samples/python/reactors/mix2_sim/runtest diff --git a/Cantera/python/examples/reactors/piston_sim/cleanup b/samples/python/reactors/piston_sim/cleanup similarity index 100% rename from Cantera/python/examples/reactors/piston_sim/cleanup rename to samples/python/reactors/piston_sim/cleanup diff --git a/Cantera/python/examples/reactors/piston_sim/output_blessed_0.txt b/samples/python/reactors/piston_sim/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/reactors/piston_sim/output_blessed_0.txt rename to samples/python/reactors/piston_sim/output_blessed_0.txt diff --git a/Cantera/python/examples/reactors/piston_sim/piston.py b/samples/python/reactors/piston_sim/piston.py similarity index 100% rename from Cantera/python/examples/reactors/piston_sim/piston.py rename to samples/python/reactors/piston_sim/piston.py diff --git a/Cantera/python/examples/reactors/piston_sim/runtest b/samples/python/reactors/piston_sim/runtest similarity index 100% rename from Cantera/python/examples/reactors/piston_sim/runtest rename to samples/python/reactors/piston_sim/runtest diff --git a/Cantera/python/examples/reactors/reactor1_sim/cleanup b/samples/python/reactors/reactor1_sim/cleanup similarity index 100% rename from Cantera/python/examples/reactors/reactor1_sim/cleanup rename to samples/python/reactors/reactor1_sim/cleanup diff --git a/Cantera/python/examples/reactors/reactor1_sim/output_blessed_0.txt b/samples/python/reactors/reactor1_sim/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/reactors/reactor1_sim/output_blessed_0.txt rename to samples/python/reactors/reactor1_sim/output_blessed_0.txt diff --git a/Cantera/python/examples/reactors/reactor1_sim/reactor1.py b/samples/python/reactors/reactor1_sim/reactor1.py similarity index 100% rename from Cantera/python/examples/reactors/reactor1_sim/reactor1.py rename to samples/python/reactors/reactor1_sim/reactor1.py diff --git a/Cantera/python/examples/reactors/reactor1_sim/runtest b/samples/python/reactors/reactor1_sim/runtest similarity index 100% rename from Cantera/python/examples/reactors/reactor1_sim/runtest rename to samples/python/reactors/reactor1_sim/runtest diff --git a/Cantera/python/examples/reactors/reactor2_sim/cleanup b/samples/python/reactors/reactor2_sim/cleanup similarity index 100% rename from Cantera/python/examples/reactors/reactor2_sim/cleanup rename to samples/python/reactors/reactor2_sim/cleanup diff --git a/Cantera/python/examples/reactors/reactor2_sim/output_blessed_0.txt b/samples/python/reactors/reactor2_sim/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/reactors/reactor2_sim/output_blessed_0.txt rename to samples/python/reactors/reactor2_sim/output_blessed_0.txt diff --git a/Cantera/python/examples/reactors/reactor2_sim/piston_blessed_0.csv b/samples/python/reactors/reactor2_sim/piston_blessed_0.csv similarity index 100% rename from Cantera/python/examples/reactors/reactor2_sim/piston_blessed_0.csv rename to samples/python/reactors/reactor2_sim/piston_blessed_0.csv diff --git a/Cantera/python/examples/reactors/reactor2_sim/reactor2.py b/samples/python/reactors/reactor2_sim/reactor2.py similarity index 100% rename from Cantera/python/examples/reactors/reactor2_sim/reactor2.py rename to samples/python/reactors/reactor2_sim/reactor2.py diff --git a/Cantera/python/examples/reactors/reactor2_sim/runtest b/samples/python/reactors/reactor2_sim/runtest similarity index 100% rename from Cantera/python/examples/reactors/reactor2_sim/runtest rename to samples/python/reactors/reactor2_sim/runtest diff --git a/Cantera/python/examples/reactors/sensitivity_sim/cleanup b/samples/python/reactors/sensitivity_sim/cleanup similarity index 100% rename from Cantera/python/examples/reactors/sensitivity_sim/cleanup rename to samples/python/reactors/sensitivity_sim/cleanup diff --git a/Cantera/python/examples/reactors/sensitivity_sim/output_blessed_0.txt b/samples/python/reactors/sensitivity_sim/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/reactors/sensitivity_sim/output_blessed_0.txt rename to samples/python/reactors/sensitivity_sim/output_blessed_0.txt diff --git a/Cantera/python/examples/reactors/sensitivity_sim/runtest b/samples/python/reactors/sensitivity_sim/runtest similarity index 100% rename from Cantera/python/examples/reactors/sensitivity_sim/runtest rename to samples/python/reactors/sensitivity_sim/runtest diff --git a/Cantera/python/examples/reactors/sensitivity_sim/sensitivity1.py b/samples/python/reactors/sensitivity_sim/sensitivity1.py similarity index 100% rename from Cantera/python/examples/reactors/sensitivity_sim/sensitivity1.py rename to samples/python/reactors/sensitivity_sim/sensitivity1.py diff --git a/Cantera/python/examples/reactors/surf_pfr_sim/cleanup b/samples/python/reactors/surf_pfr_sim/cleanup similarity index 100% rename from Cantera/python/examples/reactors/surf_pfr_sim/cleanup rename to samples/python/reactors/surf_pfr_sim/cleanup diff --git a/Cantera/python/examples/reactors/surf_pfr_sim/output_blessed_0.txt b/samples/python/reactors/surf_pfr_sim/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/reactors/surf_pfr_sim/output_blessed_0.txt rename to samples/python/reactors/surf_pfr_sim/output_blessed_0.txt diff --git a/Cantera/python/examples/reactors/surf_pfr_sim/runtest b/samples/python/reactors/surf_pfr_sim/runtest similarity index 100% rename from Cantera/python/examples/reactors/surf_pfr_sim/runtest rename to samples/python/reactors/surf_pfr_sim/runtest diff --git a/Cantera/python/examples/reactors/surf_pfr_sim/surf_pfr.py b/samples/python/reactors/surf_pfr_sim/surf_pfr.py similarity index 100% rename from Cantera/python/examples/reactors/surf_pfr_sim/surf_pfr.py rename to samples/python/reactors/surf_pfr_sim/surf_pfr.py diff --git a/Cantera/python/examples/reactors/surf_pfr_sim/surf_pfr_blessed_0.csv b/samples/python/reactors/surf_pfr_sim/surf_pfr_blessed_0.csv similarity index 100% rename from Cantera/python/examples/reactors/surf_pfr_sim/surf_pfr_blessed_0.csv rename to samples/python/reactors/surf_pfr_sim/surf_pfr_blessed_0.csv diff --git a/Cantera/python/examples/run_examples.py b/samples/python/run_examples.py similarity index 100% rename from Cantera/python/examples/run_examples.py rename to samples/python/run_examples.py diff --git a/Cantera/python/examples/surface_chemistry/catcomb_stagflow/catcomb.py b/samples/python/surface_chemistry/catcomb_stagflow/catcomb.py similarity index 100% rename from Cantera/python/examples/surface_chemistry/catcomb_stagflow/catcomb.py rename to samples/python/surface_chemistry/catcomb_stagflow/catcomb.py diff --git a/Cantera/python/examples/surface_chemistry/catcomb_stagflow/catcomb_blessed_0.csv b/samples/python/surface_chemistry/catcomb_stagflow/catcomb_blessed_0.csv similarity index 100% rename from Cantera/python/examples/surface_chemistry/catcomb_stagflow/catcomb_blessed_0.csv rename to samples/python/surface_chemistry/catcomb_stagflow/catcomb_blessed_0.csv diff --git a/Cantera/python/examples/surface_chemistry/catcomb_stagflow/cleanup b/samples/python/surface_chemistry/catcomb_stagflow/cleanup similarity index 100% rename from Cantera/python/examples/surface_chemistry/catcomb_stagflow/cleanup rename to samples/python/surface_chemistry/catcomb_stagflow/cleanup diff --git a/Cantera/python/examples/surface_chemistry/catcomb_stagflow/output_blessed_0.txt b/samples/python/surface_chemistry/catcomb_stagflow/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/surface_chemistry/catcomb_stagflow/output_blessed_0.txt rename to samples/python/surface_chemistry/catcomb_stagflow/output_blessed_0.txt diff --git a/Cantera/python/examples/surface_chemistry/catcomb_stagflow/runtest b/samples/python/surface_chemistry/catcomb_stagflow/runtest similarity index 100% rename from Cantera/python/examples/surface_chemistry/catcomb_stagflow/runtest rename to samples/python/surface_chemistry/catcomb_stagflow/runtest diff --git a/Cantera/python/examples/surface_chemistry/diamond_cvd/cleanup b/samples/python/surface_chemistry/diamond_cvd/cleanup similarity index 100% rename from Cantera/python/examples/surface_chemistry/diamond_cvd/cleanup rename to samples/python/surface_chemistry/diamond_cvd/cleanup diff --git a/Cantera/python/examples/surface_chemistry/diamond_cvd/diamond.py b/samples/python/surface_chemistry/diamond_cvd/diamond.py similarity index 100% rename from Cantera/python/examples/surface_chemistry/diamond_cvd/diamond.py rename to samples/python/surface_chemistry/diamond_cvd/diamond.py diff --git a/Cantera/python/examples/surface_chemistry/diamond_cvd/diamond_blessed_0.csv b/samples/python/surface_chemistry/diamond_cvd/diamond_blessed_0.csv similarity index 100% rename from Cantera/python/examples/surface_chemistry/diamond_cvd/diamond_blessed_0.csv rename to samples/python/surface_chemistry/diamond_cvd/diamond_blessed_0.csv diff --git a/Cantera/python/examples/surface_chemistry/diamond_cvd/output_blessed_0.txt b/samples/python/surface_chemistry/diamond_cvd/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/surface_chemistry/diamond_cvd/output_blessed_0.txt rename to samples/python/surface_chemistry/diamond_cvd/output_blessed_0.txt diff --git a/Cantera/python/examples/surface_chemistry/diamond_cvd/runtest b/samples/python/surface_chemistry/diamond_cvd/runtest similarity index 100% rename from Cantera/python/examples/surface_chemistry/diamond_cvd/runtest rename to samples/python/surface_chemistry/diamond_cvd/runtest diff --git a/Cantera/python/examples/transport/cleanup b/samples/python/transport/cleanup similarity index 100% rename from Cantera/python/examples/transport/cleanup rename to samples/python/transport/cleanup diff --git a/Cantera/python/examples/transport/dustygas.py b/samples/python/transport/dustygas.py similarity index 100% rename from Cantera/python/examples/transport/dustygas.py rename to samples/python/transport/dustygas.py diff --git a/Cantera/python/examples/transport/output_blessed_0.txt b/samples/python/transport/output_blessed_0.txt similarity index 100% rename from Cantera/python/examples/transport/output_blessed_0.txt rename to samples/python/transport/output_blessed_0.txt diff --git a/Cantera/python/examples/transport/runtest b/samples/python/transport/runtest similarity index 100% rename from Cantera/python/examples/transport/runtest rename to samples/python/transport/runtest diff --git a/Cantera/python/tutorial/tut1.py b/samples/python/tut1.py similarity index 100% rename from Cantera/python/tutorial/tut1.py rename to samples/python/tut1.py diff --git a/Cantera/python/tutorial/tut2.py b/samples/python/tut2.py similarity index 100% rename from Cantera/python/tutorial/tut2.py rename to samples/python/tut2.py diff --git a/Cantera/python/tutorial/tut3.py b/samples/python/tut3.py similarity index 100% rename from Cantera/python/tutorial/tut3.py rename to samples/python/tut3.py diff --git a/Cantera/python/tutorial/tut4.py b/samples/python/tut4.py similarity index 100% rename from Cantera/python/tutorial/tut4.py rename to samples/python/tut4.py diff --git a/Cantera/src/Makefile.am b/src/Makefile.am similarity index 100% rename from Cantera/src/Makefile.am rename to src/Makefile.am diff --git a/Cantera/src/SConscript b/src/SConscript similarity index 100% rename from Cantera/src/SConscript rename to src/SConscript diff --git a/tools/testtools/Makefile.am b/src/apps/Makefile.am similarity index 100% rename from tools/testtools/Makefile.am rename to src/apps/Makefile.am diff --git a/tools/SConscript b/src/apps/SConscript similarity index 100% rename from tools/SConscript rename to src/apps/SConscript diff --git a/tools/src/ck2cti.cpp b/src/apps/ck2cti.cpp similarity index 100% rename from tools/src/ck2cti.cpp rename to src/apps/ck2cti.cpp diff --git a/tools/testtools/csvdiff.cpp b/src/apps/csvdiff.cpp similarity index 100% rename from tools/testtools/csvdiff.cpp rename to src/apps/csvdiff.cpp diff --git a/tools/src/cti2ctml.cpp b/src/apps/cti2ctml.cpp similarity index 100% rename from tools/src/cti2ctml.cpp rename to src/apps/cti2ctml.cpp diff --git a/tools/testtools/mdp_allo.cpp b/src/apps/mdp_allo.cpp similarity index 100% rename from tools/testtools/mdp_allo.cpp rename to src/apps/mdp_allo.cpp diff --git a/tools/testtools/mdp_allo.h b/src/apps/mdp_allo.h similarity index 100% rename from tools/testtools/mdp_allo.h rename to src/apps/mdp_allo.h diff --git a/tools/testtools/tok_input_util.cpp b/src/apps/tok_input_util.cpp similarity index 100% rename from tools/testtools/tok_input_util.cpp rename to src/apps/tok_input_util.cpp diff --git a/tools/testtools/tok_input_util.h b/src/apps/tok_input_util.h similarity index 100% rename from tools/testtools/tok_input_util.h rename to src/apps/tok_input_util.h diff --git a/Cantera/src/base/LogPrintCtrl.cpp b/src/base/LogPrintCtrl.cpp similarity index 100% rename from Cantera/src/base/LogPrintCtrl.cpp rename to src/base/LogPrintCtrl.cpp diff --git a/Cantera/src/base/LogPrintCtrl.h b/src/base/LogPrintCtrl.h similarity index 100% rename from Cantera/src/base/LogPrintCtrl.h rename to src/base/LogPrintCtrl.h diff --git a/Cantera/src/base/Makefile.am b/src/base/Makefile.am similarity index 100% rename from Cantera/src/base/Makefile.am rename to src/base/Makefile.am diff --git a/Cantera/src/base/PrintCtrl.cpp b/src/base/PrintCtrl.cpp similarity index 100% rename from Cantera/src/base/PrintCtrl.cpp rename to src/base/PrintCtrl.cpp diff --git a/Cantera/src/base/checkFinite.cpp b/src/base/checkFinite.cpp similarity index 100% rename from Cantera/src/base/checkFinite.cpp rename to src/base/checkFinite.cpp diff --git a/Cantera/src/base/clockWC.cpp b/src/base/clockWC.cpp similarity index 100% rename from Cantera/src/base/clockWC.cpp rename to src/base/clockWC.cpp diff --git a/Cantera/src/base/ct2ctml.cpp b/src/base/ct2ctml.cpp similarity index 100% rename from Cantera/src/base/ct2ctml.cpp rename to src/base/ct2ctml.cpp diff --git a/Cantera/src/base/ctml.cpp b/src/base/ctml.cpp similarity index 100% rename from Cantera/src/base/ctml.cpp rename to src/base/ctml.cpp diff --git a/Cantera/src/base/mdp_allo.cpp b/src/base/mdp_allo.cpp similarity index 100% rename from Cantera/src/base/mdp_allo.cpp rename to src/base/mdp_allo.cpp diff --git a/Cantera/src/base/misc.cpp b/src/base/misc.cpp similarity index 100% rename from Cantera/src/base/misc.cpp rename to src/base/misc.cpp diff --git a/Cantera/src/base/plots.cpp b/src/base/plots.cpp similarity index 100% rename from Cantera/src/base/plots.cpp rename to src/base/plots.cpp diff --git a/Cantera/src/base/plots.h b/src/base/plots.h similarity index 100% rename from Cantera/src/base/plots.h rename to src/base/plots.h diff --git a/Cantera/src/base/stringUtils.cpp b/src/base/stringUtils.cpp similarity index 100% rename from Cantera/src/base/stringUtils.cpp rename to src/base/stringUtils.cpp diff --git a/Cantera/src/base/units.h b/src/base/units.h similarity index 100% rename from Cantera/src/base/units.h rename to src/base/units.h diff --git a/Cantera/src/base/xml.cpp b/src/base/xml.cpp similarity index 100% rename from Cantera/src/base/xml.cpp rename to src/base/xml.cpp diff --git a/Cantera/clib/src/Cabinet.h b/src/clib/Cabinet.h similarity index 100% rename from Cantera/clib/src/Cabinet.h rename to src/clib/Cabinet.h diff --git a/Cantera/clib/README.txt b/src/clib/README.txt similarity index 100% rename from Cantera/clib/README.txt rename to src/clib/README.txt diff --git a/Cantera/clib/SConscript b/src/clib/SConscript similarity index 100% rename from Cantera/clib/SConscript rename to src/clib/SConscript diff --git a/Cantera/clib/src/Storage.cpp b/src/clib/Storage.cpp similarity index 100% rename from Cantera/clib/src/Storage.cpp rename to src/clib/Storage.cpp diff --git a/Cantera/clib/src/Storage.h b/src/clib/Storage.h similarity index 100% rename from Cantera/clib/src/Storage.h rename to src/clib/Storage.h diff --git a/Cantera/clib/src/clib_defs.h b/src/clib/clib_defs.h similarity index 100% rename from Cantera/clib/src/clib_defs.h rename to src/clib/clib_defs.h diff --git a/Cantera/clib/src/ct.cpp b/src/clib/ct.cpp similarity index 100% rename from Cantera/clib/src/ct.cpp rename to src/clib/ct.cpp diff --git a/Cantera/clib/src/ct.h b/src/clib/ct.h similarity index 100% rename from Cantera/clib/src/ct.h rename to src/clib/ct.h diff --git a/Cantera/clib/src/ctbdry.cpp b/src/clib/ctbdry.cpp similarity index 100% rename from Cantera/clib/src/ctbdry.cpp rename to src/clib/ctbdry.cpp diff --git a/Cantera/clib/src/ctbdry.h b/src/clib/ctbdry.h similarity index 100% rename from Cantera/clib/src/ctbdry.h rename to src/clib/ctbdry.h diff --git a/Cantera/clib/src/ctfunc.cpp b/src/clib/ctfunc.cpp similarity index 100% rename from Cantera/clib/src/ctfunc.cpp rename to src/clib/ctfunc.cpp diff --git a/Cantera/clib/src/ctfunc.h b/src/clib/ctfunc.h similarity index 100% rename from Cantera/clib/src/ctfunc.h rename to src/clib/ctfunc.h diff --git a/Cantera/clib/src/ctmultiphase.cpp b/src/clib/ctmultiphase.cpp similarity index 100% rename from Cantera/clib/src/ctmultiphase.cpp rename to src/clib/ctmultiphase.cpp diff --git a/Cantera/clib/src/ctmultiphase.h b/src/clib/ctmultiphase.h similarity index 100% rename from Cantera/clib/src/ctmultiphase.h rename to src/clib/ctmultiphase.h diff --git a/Cantera/clib/src/ctonedim.cpp b/src/clib/ctonedim.cpp similarity index 100% rename from Cantera/clib/src/ctonedim.cpp rename to src/clib/ctonedim.cpp diff --git a/Cantera/clib/src/ctonedim.h b/src/clib/ctonedim.h similarity index 100% rename from Cantera/clib/src/ctonedim.h rename to src/clib/ctonedim.h diff --git a/Cantera/clib/src/ctreactor.cpp b/src/clib/ctreactor.cpp similarity index 100% rename from Cantera/clib/src/ctreactor.cpp rename to src/clib/ctreactor.cpp diff --git a/Cantera/clib/src/ctreactor.h b/src/clib/ctreactor.h similarity index 100% rename from Cantera/clib/src/ctreactor.h rename to src/clib/ctreactor.h diff --git a/Cantera/clib/src/ctrpath.cpp b/src/clib/ctrpath.cpp similarity index 100% rename from Cantera/clib/src/ctrpath.cpp rename to src/clib/ctrpath.cpp diff --git a/Cantera/clib/src/ctrpath.h b/src/clib/ctrpath.h similarity index 100% rename from Cantera/clib/src/ctrpath.h rename to src/clib/ctrpath.h diff --git a/Cantera/clib/src/ctsurf.cpp b/src/clib/ctsurf.cpp similarity index 100% rename from Cantera/clib/src/ctsurf.cpp rename to src/clib/ctsurf.cpp diff --git a/Cantera/clib/src/ctsurf.h b/src/clib/ctsurf.h similarity index 100% rename from Cantera/clib/src/ctsurf.h rename to src/clib/ctsurf.h diff --git a/Cantera/clib/src/ctxml.cpp b/src/clib/ctxml.cpp similarity index 100% rename from Cantera/clib/src/ctxml.cpp rename to src/clib/ctxml.cpp diff --git a/Cantera/clib/src/ctxml.h b/src/clib/ctxml.h similarity index 100% rename from Cantera/clib/src/ctxml.h rename to src/clib/ctxml.h diff --git a/Cantera/src/converters/CKParser.cpp b/src/converters/CKParser.cpp similarity index 100% rename from Cantera/src/converters/CKParser.cpp rename to src/converters/CKParser.cpp diff --git a/Cantera/src/converters/CKParser.h b/src/converters/CKParser.h similarity index 100% rename from Cantera/src/converters/CKParser.h rename to src/converters/CKParser.h diff --git a/Cantera/src/converters/CKReader.cpp b/src/converters/CKReader.cpp similarity index 100% rename from Cantera/src/converters/CKReader.cpp rename to src/converters/CKReader.cpp diff --git a/Cantera/src/converters/CKReader.h b/src/converters/CKReader.h similarity index 100% rename from Cantera/src/converters/CKReader.h rename to src/converters/CKReader.h diff --git a/Cantera/src/converters/Constituent.h b/src/converters/Constituent.h similarity index 100% rename from Cantera/src/converters/Constituent.h rename to src/converters/Constituent.h diff --git a/Cantera/src/converters/Element.h b/src/converters/Element.h similarity index 100% rename from Cantera/src/converters/Element.h rename to src/converters/Element.h diff --git a/Cantera/src/converters/Makefile.am b/src/converters/Makefile.am similarity index 100% rename from Cantera/src/converters/Makefile.am rename to src/converters/Makefile.am diff --git a/Cantera/src/converters/NASA9Parser.cpp b/src/converters/NASA9Parser.cpp similarity index 100% rename from Cantera/src/converters/NASA9Parser.cpp rename to src/converters/NASA9Parser.cpp diff --git a/Cantera/src/converters/Reaction.cpp b/src/converters/Reaction.cpp similarity index 100% rename from Cantera/src/converters/Reaction.cpp rename to src/converters/Reaction.cpp diff --git a/Cantera/src/converters/Reaction.h b/src/converters/Reaction.h similarity index 100% rename from Cantera/src/converters/Reaction.h rename to src/converters/Reaction.h diff --git a/Cantera/src/converters/RxnSpecies.h b/src/converters/RxnSpecies.h similarity index 100% rename from Cantera/src/converters/RxnSpecies.h rename to src/converters/RxnSpecies.h diff --git a/Cantera/src/converters/Species.cpp b/src/converters/Species.cpp similarity index 100% rename from Cantera/src/converters/Species.cpp rename to src/converters/Species.cpp diff --git a/Cantera/src/converters/Species.h b/src/converters/Species.h similarity index 100% rename from Cantera/src/converters/Species.h rename to src/converters/Species.h diff --git a/Cantera/src/converters/atomicWeightDB.cpp b/src/converters/atomicWeightDB.cpp similarity index 100% rename from Cantera/src/converters/atomicWeightDB.cpp rename to src/converters/atomicWeightDB.cpp diff --git a/Cantera/src/converters/ck2ct.cpp b/src/converters/ck2ct.cpp similarity index 100% rename from Cantera/src/converters/ck2ct.cpp rename to src/converters/ck2ct.cpp diff --git a/Cantera/src/converters/ck2ct.h b/src/converters/ck2ct.h similarity index 100% rename from Cantera/src/converters/ck2ct.h rename to src/converters/ck2ct.h diff --git a/Cantera/src/converters/ckr_defs.h b/src/converters/ckr_defs.h similarity index 100% rename from Cantera/src/converters/ckr_defs.h rename to src/converters/ckr_defs.h diff --git a/Cantera/src/converters/ckr_utils.cpp b/src/converters/ckr_utils.cpp similarity index 100% rename from Cantera/src/converters/ckr_utils.cpp rename to src/converters/ckr_utils.cpp diff --git a/Cantera/src/converters/ckr_utils.h b/src/converters/ckr_utils.h similarity index 100% rename from Cantera/src/converters/ckr_utils.h rename to src/converters/ckr_utils.h diff --git a/Cantera/src/converters/newThermoReading.txt b/src/converters/newThermoReading.txt similarity index 100% rename from Cantera/src/converters/newThermoReading.txt rename to src/converters/newThermoReading.txt diff --git a/Cantera/src/converters/thermoFunctions.cpp b/src/converters/thermoFunctions.cpp similarity index 100% rename from Cantera/src/converters/thermoFunctions.cpp rename to src/converters/thermoFunctions.cpp diff --git a/Cantera/src/converters/thermoFunctions.h b/src/converters/thermoFunctions.h similarity index 100% rename from Cantera/src/converters/thermoFunctions.h rename to src/converters/thermoFunctions.h diff --git a/Cantera/src/converters/writelog.cpp b/src/converters/writelog.cpp similarity index 100% rename from Cantera/src/converters/writelog.cpp rename to src/converters/writelog.cpp diff --git a/Cantera/src/converters/writelog.h b/src/converters/writelog.h similarity index 100% rename from Cantera/src/converters/writelog.h rename to src/converters/writelog.h diff --git a/Cantera/cxx/SConscript b/src/cxx/SConscript similarity index 100% rename from Cantera/cxx/SConscript rename to src/cxx/SConscript diff --git a/Cantera/src/equil/BasisOptimize.cpp b/src/equil/BasisOptimize.cpp similarity index 100% rename from Cantera/src/equil/BasisOptimize.cpp rename to src/equil/BasisOptimize.cpp diff --git a/Cantera/src/equil/ChemEquil.cpp b/src/equil/ChemEquil.cpp similarity index 100% rename from Cantera/src/equil/ChemEquil.cpp rename to src/equil/ChemEquil.cpp diff --git a/Cantera/src/equil/Makefile.am b/src/equil/Makefile.am similarity index 100% rename from Cantera/src/equil/Makefile.am rename to src/equil/Makefile.am diff --git a/Cantera/src/equil/MultiPhase.cpp b/src/equil/MultiPhase.cpp similarity index 100% rename from Cantera/src/equil/MultiPhase.cpp rename to src/equil/MultiPhase.cpp diff --git a/Cantera/src/equil/MultiPhaseEquil.cpp b/src/equil/MultiPhaseEquil.cpp similarity index 100% rename from Cantera/src/equil/MultiPhaseEquil.cpp rename to src/equil/MultiPhaseEquil.cpp diff --git a/Cantera/src/equil/PropertyCalculator.h b/src/equil/PropertyCalculator.h similarity index 100% rename from Cantera/src/equil/PropertyCalculator.h rename to src/equil/PropertyCalculator.h diff --git a/Cantera/src/equil/equilibrate.cpp b/src/equil/equilibrate.cpp similarity index 100% rename from Cantera/src/equil/equilibrate.cpp rename to src/equil/equilibrate.cpp diff --git a/Cantera/src/equil/vcs_DoubleStarStar.cpp b/src/equil/vcs_DoubleStarStar.cpp similarity index 100% rename from Cantera/src/equil/vcs_DoubleStarStar.cpp rename to src/equil/vcs_DoubleStarStar.cpp diff --git a/Cantera/src/equil/vcs_DoubleStarStar.h b/src/equil/vcs_DoubleStarStar.h similarity index 100% rename from Cantera/src/equil/vcs_DoubleStarStar.h rename to src/equil/vcs_DoubleStarStar.h diff --git a/Cantera/src/equil/vcs_Exception.cpp b/src/equil/vcs_Exception.cpp similarity index 100% rename from Cantera/src/equil/vcs_Exception.cpp rename to src/equil/vcs_Exception.cpp diff --git a/Cantera/src/equil/vcs_Exception.h b/src/equil/vcs_Exception.h similarity index 100% rename from Cantera/src/equil/vcs_Exception.h rename to src/equil/vcs_Exception.h diff --git a/Cantera/src/equil/vcs_Gibbs.cpp b/src/equil/vcs_Gibbs.cpp similarity index 100% rename from Cantera/src/equil/vcs_Gibbs.cpp rename to src/equil/vcs_Gibbs.cpp diff --git a/Cantera/src/equil/vcs_IntStarStar.cpp b/src/equil/vcs_IntStarStar.cpp similarity index 100% rename from Cantera/src/equil/vcs_IntStarStar.cpp rename to src/equil/vcs_IntStarStar.cpp diff --git a/Cantera/src/equil/vcs_IntStarStar.h b/src/equil/vcs_IntStarStar.h similarity index 100% rename from Cantera/src/equil/vcs_IntStarStar.h rename to src/equil/vcs_IntStarStar.h diff --git a/Cantera/src/equil/vcs_MultiPhaseEquil.cpp b/src/equil/vcs_MultiPhaseEquil.cpp similarity index 100% rename from Cantera/src/equil/vcs_MultiPhaseEquil.cpp rename to src/equil/vcs_MultiPhaseEquil.cpp diff --git a/Cantera/src/equil/vcs_SpeciesProperties.cpp b/src/equil/vcs_SpeciesProperties.cpp similarity index 100% rename from Cantera/src/equil/vcs_SpeciesProperties.cpp rename to src/equil/vcs_SpeciesProperties.cpp diff --git a/Cantera/src/equil/vcs_SpeciesProperties.h b/src/equil/vcs_SpeciesProperties.h similarity index 100% rename from Cantera/src/equil/vcs_SpeciesProperties.h rename to src/equil/vcs_SpeciesProperties.h diff --git a/Cantera/src/equil/vcs_TP.cpp b/src/equil/vcs_TP.cpp similarity index 100% rename from Cantera/src/equil/vcs_TP.cpp rename to src/equil/vcs_TP.cpp diff --git a/Cantera/src/equil/vcs_VolPhase.cpp b/src/equil/vcs_VolPhase.cpp similarity index 100% rename from Cantera/src/equil/vcs_VolPhase.cpp rename to src/equil/vcs_VolPhase.cpp diff --git a/Cantera/src/equil/vcs_VolPhase.h b/src/equil/vcs_VolPhase.h similarity index 100% rename from Cantera/src/equil/vcs_VolPhase.h rename to src/equil/vcs_VolPhase.h diff --git a/Cantera/src/equil/vcs_dbocls.c b/src/equil/vcs_dbocls.c similarity index 100% rename from Cantera/src/equil/vcs_dbocls.c rename to src/equil/vcs_dbocls.c diff --git a/Cantera/src/equil/vcs_dbols.c b/src/equil/vcs_dbols.c similarity index 100% rename from Cantera/src/equil/vcs_dbols.c rename to src/equil/vcs_dbols.c diff --git a/Cantera/src/equil/vcs_dbolsm.c b/src/equil/vcs_dbolsm.c similarity index 100% rename from Cantera/src/equil/vcs_dbolsm.c rename to src/equil/vcs_dbolsm.c diff --git a/Cantera/src/equil/vcs_dmout.c b/src/equil/vcs_dmout.c similarity index 100% rename from Cantera/src/equil/vcs_dmout.c rename to src/equil/vcs_dmout.c diff --git a/Cantera/src/equil/vcs_dvout.c b/src/equil/vcs_dvout.c similarity index 100% rename from Cantera/src/equil/vcs_dvout.c rename to src/equil/vcs_dvout.c diff --git a/Cantera/src/equil/vcs_elem.cpp b/src/equil/vcs_elem.cpp similarity index 100% rename from Cantera/src/equil/vcs_elem.cpp rename to src/equil/vcs_elem.cpp diff --git a/Cantera/src/equil/vcs_elem_rearrange.cpp b/src/equil/vcs_elem_rearrange.cpp similarity index 100% rename from Cantera/src/equil/vcs_elem_rearrange.cpp rename to src/equil/vcs_elem_rearrange.cpp diff --git a/Cantera/src/equil/vcs_equilibrate.cpp b/src/equil/vcs_equilibrate.cpp similarity index 100% rename from Cantera/src/equil/vcs_equilibrate.cpp rename to src/equil/vcs_equilibrate.cpp diff --git a/Cantera/src/equil/vcs_inest.cpp b/src/equil/vcs_inest.cpp similarity index 100% rename from Cantera/src/equil/vcs_inest.cpp rename to src/equil/vcs_inest.cpp diff --git a/Cantera/src/equil/vcs_internal.h b/src/equil/vcs_internal.h similarity index 100% rename from Cantera/src/equil/vcs_internal.h rename to src/equil/vcs_internal.h diff --git a/Cantera/src/equil/vcs_ivout.c b/src/equil/vcs_ivout.c similarity index 100% rename from Cantera/src/equil/vcs_ivout.c rename to src/equil/vcs_ivout.c diff --git a/Cantera/src/equil/vcs_nondim.cpp b/src/equil/vcs_nondim.cpp similarity index 100% rename from Cantera/src/equil/vcs_nondim.cpp rename to src/equil/vcs_nondim.cpp diff --git a/Cantera/src/equil/vcs_phaseStability.cpp b/src/equil/vcs_phaseStability.cpp similarity index 100% rename from Cantera/src/equil/vcs_phaseStability.cpp rename to src/equil/vcs_phaseStability.cpp diff --git a/Cantera/src/equil/vcs_prep.cpp b/src/equil/vcs_prep.cpp similarity index 100% rename from Cantera/src/equil/vcs_prep.cpp rename to src/equil/vcs_prep.cpp diff --git a/Cantera/src/equil/vcs_prob.cpp b/src/equil/vcs_prob.cpp similarity index 100% rename from Cantera/src/equil/vcs_prob.cpp rename to src/equil/vcs_prob.cpp diff --git a/Cantera/src/equil/vcs_prob.h b/src/equil/vcs_prob.h similarity index 100% rename from Cantera/src/equil/vcs_prob.h rename to src/equil/vcs_prob.h diff --git a/Cantera/src/equil/vcs_rearrange.cpp b/src/equil/vcs_rearrange.cpp similarity index 100% rename from Cantera/src/equil/vcs_rearrange.cpp rename to src/equil/vcs_rearrange.cpp diff --git a/Cantera/src/equil/vcs_report.cpp b/src/equil/vcs_report.cpp similarity index 100% rename from Cantera/src/equil/vcs_report.cpp rename to src/equil/vcs_report.cpp diff --git a/Cantera/src/equil/vcs_root1d.cpp b/src/equil/vcs_root1d.cpp similarity index 100% rename from Cantera/src/equil/vcs_root1d.cpp rename to src/equil/vcs_root1d.cpp diff --git a/Cantera/src/equil/vcs_rxnadj.cpp b/src/equil/vcs_rxnadj.cpp similarity index 100% rename from Cantera/src/equil/vcs_rxnadj.cpp rename to src/equil/vcs_rxnadj.cpp diff --git a/Cantera/src/equil/vcs_setMolesLinProg.cpp b/src/equil/vcs_setMolesLinProg.cpp similarity index 100% rename from Cantera/src/equil/vcs_setMolesLinProg.cpp rename to src/equil/vcs_setMolesLinProg.cpp diff --git a/Cantera/src/equil/vcs_solve.cpp b/src/equil/vcs_solve.cpp similarity index 100% rename from Cantera/src/equil/vcs_solve.cpp rename to src/equil/vcs_solve.cpp diff --git a/Cantera/src/equil/vcs_solve.h b/src/equil/vcs_solve.h similarity index 100% rename from Cantera/src/equil/vcs_solve.h rename to src/equil/vcs_solve.h diff --git a/Cantera/src/equil/vcs_solve_TP.cpp b/src/equil/vcs_solve_TP.cpp similarity index 100% rename from Cantera/src/equil/vcs_solve_TP.cpp rename to src/equil/vcs_solve_TP.cpp diff --git a/Cantera/src/equil/vcs_solve_phaseStability.cpp b/src/equil/vcs_solve_phaseStability.cpp similarity index 100% rename from Cantera/src/equil/vcs_solve_phaseStability.cpp rename to src/equil/vcs_solve_phaseStability.cpp diff --git a/Cantera/src/equil/vcs_species_thermo.cpp b/src/equil/vcs_species_thermo.cpp similarity index 100% rename from Cantera/src/equil/vcs_species_thermo.cpp rename to src/equil/vcs_species_thermo.cpp diff --git a/Cantera/src/equil/vcs_species_thermo.h b/src/equil/vcs_species_thermo.h similarity index 100% rename from Cantera/src/equil/vcs_species_thermo.h rename to src/equil/vcs_species_thermo.h diff --git a/Cantera/src/equil/vcs_util.cpp b/src/equil/vcs_util.cpp similarity index 100% rename from Cantera/src/equil/vcs_util.cpp rename to src/equil/vcs_util.cpp diff --git a/Cantera/src/equil/vcs_xerror.c b/src/equil/vcs_xerror.c similarity index 100% rename from Cantera/src/equil/vcs_xerror.c rename to src/equil/vcs_xerror.c diff --git a/Cantera/fortran/SConscript b/src/fortran/SConscript similarity index 100% rename from Cantera/fortran/SConscript rename to src/fortran/SConscript diff --git a/Cantera/fortran/src/cantera.f90 b/src/fortran/cantera.f90 similarity index 100% rename from Cantera/fortran/src/cantera.f90 rename to src/fortran/cantera.f90 diff --git a/Cantera/fortran/src/cantera_funcs.f90 b/src/fortran/cantera_funcs.f90 similarity index 100% rename from Cantera/fortran/src/cantera_funcs.f90 rename to src/fortran/cantera_funcs.f90 diff --git a/Cantera/fortran/src/cantera_iface.f90 b/src/fortran/cantera_iface.f90 similarity index 100% rename from Cantera/fortran/src/cantera_iface.f90 rename to src/fortran/cantera_iface.f90 diff --git a/Cantera/fortran/src/cantera_kinetics.f90 b/src/fortran/cantera_kinetics.f90 similarity index 100% rename from Cantera/fortran/src/cantera_kinetics.f90 rename to src/fortran/cantera_kinetics.f90 diff --git a/Cantera/fortran/src/cantera_thermo.f90 b/src/fortran/cantera_thermo.f90 similarity index 100% rename from Cantera/fortran/src/cantera_thermo.f90 rename to src/fortran/cantera_thermo.f90 diff --git a/Cantera/fortran/src/cantera_transport.f90 b/src/fortran/cantera_transport.f90 similarity index 100% rename from Cantera/fortran/src/cantera_transport.f90 rename to src/fortran/cantera_transport.f90 diff --git a/Cantera/fortran/src/cantera_xml.f90 b/src/fortran/cantera_xml.f90 similarity index 100% rename from Cantera/fortran/src/cantera_xml.f90 rename to src/fortran/cantera_xml.f90 diff --git a/Cantera/fortran/src/fct.cpp b/src/fortran/fct.cpp similarity index 100% rename from Cantera/fortran/src/fct.cpp rename to src/fortran/fct.cpp diff --git a/Cantera/fortran/src/fct_interface.f90 b/src/fortran/fct_interface.f90 similarity index 100% rename from Cantera/fortran/src/fct_interface.f90 rename to src/fortran/fct_interface.f90 diff --git a/Cantera/fortran/src/fctxml.cpp b/src/fortran/fctxml.cpp similarity index 100% rename from Cantera/fortran/src/fctxml.cpp rename to src/fortran/fctxml.cpp diff --git a/Cantera/fortran/src/fctxml_interface.f90 b/src/fortran/fctxml_interface.f90 similarity index 100% rename from Cantera/fortran/src/fctxml_interface.f90 rename to src/fortran/fctxml_interface.f90 diff --git a/Cantera/fortran/src/flib_defs.h b/src/fortran/flib_defs.h similarity index 100% rename from Cantera/fortran/src/flib_defs.h rename to src/fortran/flib_defs.h diff --git a/Cantera/fortran/src/genf.py b/src/fortran/genf.py similarity index 100% rename from Cantera/fortran/src/genf.py rename to src/fortran/genf.py diff --git a/Cantera/fortran/src/makect.py b/src/fortran/makect.py similarity index 100% rename from Cantera/fortran/src/makect.py rename to src/fortran/makect.py diff --git a/Cantera/src/kinetics/AqueousKinetics.cpp b/src/kinetics/AqueousKinetics.cpp similarity index 100% rename from Cantera/src/kinetics/AqueousKinetics.cpp rename to src/kinetics/AqueousKinetics.cpp diff --git a/Cantera/src/kinetics/FalloffFactory.cpp b/src/kinetics/FalloffFactory.cpp similarity index 100% rename from Cantera/src/kinetics/FalloffFactory.cpp rename to src/kinetics/FalloffFactory.cpp diff --git a/Cantera/src/kinetics/GRI_30_Kinetics.cpp b/src/kinetics/GRI_30_Kinetics.cpp similarity index 100% rename from Cantera/src/kinetics/GRI_30_Kinetics.cpp rename to src/kinetics/GRI_30_Kinetics.cpp diff --git a/Cantera/src/kinetics/GasKinetics.cpp b/src/kinetics/GasKinetics.cpp similarity index 100% rename from Cantera/src/kinetics/GasKinetics.cpp rename to src/kinetics/GasKinetics.cpp diff --git a/Cantera/src/kinetics/Group.cpp b/src/kinetics/Group.cpp similarity index 100% rename from Cantera/src/kinetics/Group.cpp rename to src/kinetics/Group.cpp diff --git a/Cantera/src/kinetics/ImplicitSurfChem.cpp b/src/kinetics/ImplicitSurfChem.cpp similarity index 100% rename from Cantera/src/kinetics/ImplicitSurfChem.cpp rename to src/kinetics/ImplicitSurfChem.cpp diff --git a/Cantera/src/kinetics/ImplicitSurfChem.h b/src/kinetics/ImplicitSurfChem.h similarity index 100% rename from Cantera/src/kinetics/ImplicitSurfChem.h rename to src/kinetics/ImplicitSurfChem.h diff --git a/Cantera/src/kinetics/InterfaceKinetics.cpp b/src/kinetics/InterfaceKinetics.cpp similarity index 100% rename from Cantera/src/kinetics/InterfaceKinetics.cpp rename to src/kinetics/InterfaceKinetics.cpp diff --git a/Cantera/src/kinetics/Kinetics.cpp b/src/kinetics/Kinetics.cpp similarity index 100% rename from Cantera/src/kinetics/Kinetics.cpp rename to src/kinetics/Kinetics.cpp diff --git a/Cantera/src/kinetics/KineticsFactory.cpp b/src/kinetics/KineticsFactory.cpp similarity index 100% rename from Cantera/src/kinetics/KineticsFactory.cpp rename to src/kinetics/KineticsFactory.cpp diff --git a/Cantera/src/kinetics/Makefile.am b/src/kinetics/Makefile.am similarity index 100% rename from Cantera/src/kinetics/Makefile.am rename to src/kinetics/Makefile.am diff --git a/Cantera/src/kinetics/ReactionData.h b/src/kinetics/ReactionData.h similarity index 100% rename from Cantera/src/kinetics/ReactionData.h rename to src/kinetics/ReactionData.h diff --git a/Cantera/src/kinetics/ReactionPath.cpp b/src/kinetics/ReactionPath.cpp similarity index 100% rename from Cantera/src/kinetics/ReactionPath.cpp rename to src/kinetics/ReactionPath.cpp diff --git a/Cantera/src/kinetics/ReactionStoichMgr.cpp b/src/kinetics/ReactionStoichMgr.cpp similarity index 100% rename from Cantera/src/kinetics/ReactionStoichMgr.cpp rename to src/kinetics/ReactionStoichMgr.cpp diff --git a/Cantera/src/kinetics/StoichManager.h b/src/kinetics/StoichManager.h similarity index 100% rename from Cantera/src/kinetics/StoichManager.h rename to src/kinetics/StoichManager.h diff --git a/Cantera/src/kinetics/importKinetics.cpp b/src/kinetics/importKinetics.cpp similarity index 100% rename from Cantera/src/kinetics/importKinetics.cpp rename to src/kinetics/importKinetics.cpp diff --git a/Cantera/src/kinetics/solveSP.cpp b/src/kinetics/solveSP.cpp similarity index 100% rename from Cantera/src/kinetics/solveSP.cpp rename to src/kinetics/solveSP.cpp diff --git a/Cantera/src/kinetics/solveSP.h b/src/kinetics/solveSP.h similarity index 100% rename from Cantera/src/kinetics/solveSP.h rename to src/kinetics/solveSP.h diff --git a/Cantera/matlab/SConscript b/src/matlab/SConscript similarity index 100% rename from Cantera/matlab/SConscript rename to src/matlab/SConscript diff --git a/Cantera/matlab/src/ctfunctions.cpp b/src/matlab/ctfunctions.cpp similarity index 100% rename from Cantera/matlab/src/ctfunctions.cpp rename to src/matlab/ctfunctions.cpp diff --git a/Cantera/matlab/src/ctmatutils.h b/src/matlab/ctmatutils.h similarity index 100% rename from Cantera/matlab/src/ctmatutils.h rename to src/matlab/ctmatutils.h diff --git a/Cantera/matlab/src/ctmethods.cpp b/src/matlab/ctmethods.cpp similarity index 100% rename from Cantera/matlab/src/ctmethods.cpp rename to src/matlab/ctmethods.cpp diff --git a/Cantera/matlab/src/flowdevicemethods.cpp b/src/matlab/flowdevicemethods.cpp similarity index 100% rename from Cantera/matlab/src/flowdevicemethods.cpp rename to src/matlab/flowdevicemethods.cpp diff --git a/Cantera/matlab/src/funcmethods.cpp b/src/matlab/funcmethods.cpp similarity index 100% rename from Cantera/matlab/src/funcmethods.cpp rename to src/matlab/funcmethods.cpp diff --git a/Cantera/matlab/src/kineticsmethods.cpp b/src/matlab/kineticsmethods.cpp similarity index 100% rename from Cantera/matlab/src/kineticsmethods.cpp rename to src/matlab/kineticsmethods.cpp diff --git a/Cantera/matlab/src/mixturemethods.cpp b/src/matlab/mixturemethods.cpp similarity index 100% rename from Cantera/matlab/src/mixturemethods.cpp rename to src/matlab/mixturemethods.cpp diff --git a/Cantera/matlab/src/mllogger.h b/src/matlab/mllogger.h similarity index 100% rename from Cantera/matlab/src/mllogger.h rename to src/matlab/mllogger.h diff --git a/Cantera/matlab/src/onedimmethods.cpp b/src/matlab/onedimmethods.cpp similarity index 100% rename from Cantera/matlab/src/onedimmethods.cpp rename to src/matlab/onedimmethods.cpp diff --git a/Cantera/matlab/src/phasemethods.cpp b/src/matlab/phasemethods.cpp similarity index 100% rename from Cantera/matlab/src/phasemethods.cpp rename to src/matlab/phasemethods.cpp diff --git a/Cantera/matlab/src/reactormethods.cpp b/src/matlab/reactormethods.cpp similarity index 100% rename from Cantera/matlab/src/reactormethods.cpp rename to src/matlab/reactormethods.cpp diff --git a/Cantera/matlab/src/reactornetmethods.cpp b/src/matlab/reactornetmethods.cpp similarity index 100% rename from Cantera/matlab/src/reactornetmethods.cpp rename to src/matlab/reactornetmethods.cpp diff --git a/Cantera/matlab/src/surfmethods.cpp b/src/matlab/surfmethods.cpp similarity index 100% rename from Cantera/matlab/src/surfmethods.cpp rename to src/matlab/surfmethods.cpp diff --git a/Cantera/matlab/src/thermomethods.cpp b/src/matlab/thermomethods.cpp similarity index 100% rename from Cantera/matlab/src/thermomethods.cpp rename to src/matlab/thermomethods.cpp diff --git a/Cantera/matlab/src/transportmethods.cpp b/src/matlab/transportmethods.cpp similarity index 100% rename from Cantera/matlab/src/transportmethods.cpp rename to src/matlab/transportmethods.cpp diff --git a/Cantera/matlab/src/wallmethods.cpp b/src/matlab/wallmethods.cpp similarity index 100% rename from Cantera/matlab/src/wallmethods.cpp rename to src/matlab/wallmethods.cpp diff --git a/Cantera/matlab/src/xmlmethods.cpp b/src/matlab/xmlmethods.cpp similarity index 100% rename from Cantera/matlab/src/xmlmethods.cpp rename to src/matlab/xmlmethods.cpp diff --git a/Cantera/src/numerics/BEulerInt.cpp b/src/numerics/BEulerInt.cpp similarity index 100% rename from Cantera/src/numerics/BEulerInt.cpp rename to src/numerics/BEulerInt.cpp diff --git a/Cantera/src/numerics/BEulerInt.h b/src/numerics/BEulerInt.h similarity index 100% rename from Cantera/src/numerics/BEulerInt.h rename to src/numerics/BEulerInt.h diff --git a/Cantera/src/numerics/BandMatrix.cpp b/src/numerics/BandMatrix.cpp similarity index 100% rename from Cantera/src/numerics/BandMatrix.cpp rename to src/numerics/BandMatrix.cpp diff --git a/Cantera/src/numerics/CVodeInt.cpp b/src/numerics/CVodeInt.cpp similarity index 100% rename from Cantera/src/numerics/CVodeInt.cpp rename to src/numerics/CVodeInt.cpp diff --git a/Cantera/src/numerics/CVodeInt.h b/src/numerics/CVodeInt.h similarity index 100% rename from Cantera/src/numerics/CVodeInt.h rename to src/numerics/CVodeInt.h diff --git a/Cantera/src/numerics/CVodesIntegrator.cpp b/src/numerics/CVodesIntegrator.cpp similarity index 100% rename from Cantera/src/numerics/CVodesIntegrator.cpp rename to src/numerics/CVodesIntegrator.cpp diff --git a/Cantera/src/numerics/CVodesIntegrator.h b/src/numerics/CVodesIntegrator.h similarity index 100% rename from Cantera/src/numerics/CVodesIntegrator.h rename to src/numerics/CVodesIntegrator.h diff --git a/Cantera/src/numerics/DenseMatrix.cpp b/src/numerics/DenseMatrix.cpp similarity index 100% rename from Cantera/src/numerics/DenseMatrix.cpp rename to src/numerics/DenseMatrix.cpp diff --git a/Cantera/src/numerics/Func1.cpp b/src/numerics/Func1.cpp similarity index 100% rename from Cantera/src/numerics/Func1.cpp rename to src/numerics/Func1.cpp diff --git a/Cantera/src/numerics/GeneralMatrix.cpp b/src/numerics/GeneralMatrix.cpp similarity index 100% rename from Cantera/src/numerics/GeneralMatrix.cpp rename to src/numerics/GeneralMatrix.cpp diff --git a/Cantera/src/numerics/IDA_Solver.cpp b/src/numerics/IDA_Solver.cpp similarity index 100% rename from Cantera/src/numerics/IDA_Solver.cpp rename to src/numerics/IDA_Solver.cpp diff --git a/Cantera/src/numerics/Makefile.am b/src/numerics/Makefile.am similarity index 100% rename from Cantera/src/numerics/Makefile.am rename to src/numerics/Makefile.am diff --git a/Cantera/src/numerics/NonlinearSolver.cpp b/src/numerics/NonlinearSolver.cpp similarity index 100% rename from Cantera/src/numerics/NonlinearSolver.cpp rename to src/numerics/NonlinearSolver.cpp diff --git a/Cantera/src/numerics/ODE_integrators.cpp b/src/numerics/ODE_integrators.cpp similarity index 100% rename from Cantera/src/numerics/ODE_integrators.cpp rename to src/numerics/ODE_integrators.cpp diff --git a/Cantera/src/numerics/ResidJacEval.cpp b/src/numerics/ResidJacEval.cpp similarity index 100% rename from Cantera/src/numerics/ResidJacEval.cpp rename to src/numerics/ResidJacEval.cpp diff --git a/Cantera/src/numerics/RootFind.cpp b/src/numerics/RootFind.cpp similarity index 100% rename from Cantera/src/numerics/RootFind.cpp rename to src/numerics/RootFind.cpp diff --git a/Cantera/src/numerics/SquareMatrix.cpp b/src/numerics/SquareMatrix.cpp similarity index 100% rename from Cantera/src/numerics/SquareMatrix.cpp rename to src/numerics/SquareMatrix.cpp diff --git a/Cantera/src/numerics/funcs.cpp b/src/numerics/funcs.cpp similarity index 100% rename from Cantera/src/numerics/funcs.cpp rename to src/numerics/funcs.cpp diff --git a/Cantera/src/numerics/lapack.h b/src/numerics/lapack.h similarity index 100% rename from Cantera/src/numerics/lapack.h rename to src/numerics/lapack.h diff --git a/Cantera/src/numerics/solveProb.cpp b/src/numerics/solveProb.cpp similarity index 100% rename from Cantera/src/numerics/solveProb.cpp rename to src/numerics/solveProb.cpp diff --git a/Cantera/src/oneD/Domain1D.cpp b/src/oneD/Domain1D.cpp similarity index 100% rename from Cantera/src/oneD/Domain1D.cpp rename to src/oneD/Domain1D.cpp diff --git a/Cantera/src/oneD/Makefile.am b/src/oneD/Makefile.am similarity index 100% rename from Cantera/src/oneD/Makefile.am rename to src/oneD/Makefile.am diff --git a/Cantera/src/oneD/MultiJac.cpp b/src/oneD/MultiJac.cpp similarity index 100% rename from Cantera/src/oneD/MultiJac.cpp rename to src/oneD/MultiJac.cpp diff --git a/Cantera/src/oneD/MultiNewton.cpp b/src/oneD/MultiNewton.cpp similarity index 100% rename from Cantera/src/oneD/MultiNewton.cpp rename to src/oneD/MultiNewton.cpp diff --git a/Cantera/src/oneD/OneDim.cpp b/src/oneD/OneDim.cpp similarity index 100% rename from Cantera/src/oneD/OneDim.cpp rename to src/oneD/OneDim.cpp diff --git a/Cantera/src/oneD/Resid1D.h b/src/oneD/Resid1D.h similarity index 100% rename from Cantera/src/oneD/Resid1D.h rename to src/oneD/Resid1D.h diff --git a/Cantera/src/oneD/Sim1D.cpp b/src/oneD/Sim1D.cpp similarity index 100% rename from Cantera/src/oneD/Sim1D.cpp rename to src/oneD/Sim1D.cpp diff --git a/Cantera/src/oneD/StFlow.cpp b/src/oneD/StFlow.cpp similarity index 100% rename from Cantera/src/oneD/StFlow.cpp rename to src/oneD/StFlow.cpp diff --git a/Cantera/src/oneD/boundaries1D.cpp b/src/oneD/boundaries1D.cpp similarity index 100% rename from Cantera/src/oneD/boundaries1D.cpp rename to src/oneD/boundaries1D.cpp diff --git a/Cantera/src/oneD/newton_utils.cpp b/src/oneD/newton_utils.cpp similarity index 100% rename from Cantera/src/oneD/newton_utils.cpp rename to src/oneD/newton_utils.cpp diff --git a/Cantera/src/oneD/refine.cpp b/src/oneD/refine.cpp similarity index 100% rename from Cantera/src/oneD/refine.cpp rename to src/oneD/refine.cpp diff --git a/Cantera/python/src/ctbndry_methods.cpp b/src/python/ctbndry_methods.cpp similarity index 100% rename from Cantera/python/src/ctbndry_methods.cpp rename to src/python/ctbndry_methods.cpp diff --git a/Cantera/python/src/ctflow_methods.cpp b/src/python/ctflow_methods.cpp similarity index 100% rename from Cantera/python/src/ctflow_methods.cpp rename to src/python/ctflow_methods.cpp diff --git a/Cantera/python/src/ctfunc_methods.cpp b/src/python/ctfunc_methods.cpp similarity index 100% rename from Cantera/python/src/ctfunc_methods.cpp rename to src/python/ctfunc_methods.cpp diff --git a/Cantera/python/src/ctfuncs.cpp b/src/python/ctfuncs.cpp similarity index 100% rename from Cantera/python/src/ctfuncs.cpp rename to src/python/ctfuncs.cpp diff --git a/Cantera/python/src/ctkinetics_methods.cpp b/src/python/ctkinetics_methods.cpp similarity index 100% rename from Cantera/python/src/ctkinetics_methods.cpp rename to src/python/ctkinetics_methods.cpp diff --git a/Cantera/python/src/ctmultiphase_methods.cpp b/src/python/ctmultiphase_methods.cpp similarity index 100% rename from Cantera/python/src/ctmultiphase_methods.cpp rename to src/python/ctmultiphase_methods.cpp diff --git a/Cantera/python/src/ctonedim_methods.cpp b/src/python/ctonedim_methods.cpp similarity index 100% rename from Cantera/python/src/ctonedim_methods.cpp rename to src/python/ctonedim_methods.cpp diff --git a/Cantera/python/src/ctphase_methods.cpp b/src/python/ctphase_methods.cpp similarity index 100% rename from Cantera/python/src/ctphase_methods.cpp rename to src/python/ctphase_methods.cpp diff --git a/Cantera/python/src/ctreactor_methods.cpp b/src/python/ctreactor_methods.cpp similarity index 100% rename from Cantera/python/src/ctreactor_methods.cpp rename to src/python/ctreactor_methods.cpp diff --git a/Cantera/python/src/ctrpath_methods.cpp b/src/python/ctrpath_methods.cpp similarity index 100% rename from Cantera/python/src/ctrpath_methods.cpp rename to src/python/ctrpath_methods.cpp diff --git a/Cantera/python/src/ctsurf_methods.cpp b/src/python/ctsurf_methods.cpp similarity index 100% rename from Cantera/python/src/ctsurf_methods.cpp rename to src/python/ctsurf_methods.cpp diff --git a/Cantera/python/src/ctthermo_methods.cpp b/src/python/ctthermo_methods.cpp similarity index 100% rename from Cantera/python/src/ctthermo_methods.cpp rename to src/python/ctthermo_methods.cpp diff --git a/Cantera/python/src/cttransport_methods.cpp b/src/python/cttransport_methods.cpp similarity index 100% rename from Cantera/python/src/cttransport_methods.cpp rename to src/python/cttransport_methods.cpp diff --git a/Cantera/python/src/ctxml_methods.cpp b/src/python/ctxml_methods.cpp similarity index 100% rename from Cantera/python/src/ctxml_methods.cpp rename to src/python/ctxml_methods.cpp diff --git a/Cantera/python/src/methods.h b/src/python/methods.h similarity index 100% rename from Cantera/python/src/methods.h rename to src/python/methods.h diff --git a/Cantera/python/src/pycantera.cpp b/src/python/pycantera.cpp similarity index 100% rename from Cantera/python/src/pycantera.cpp rename to src/python/pycantera.cpp diff --git a/Cantera/python/src/pylogger.h b/src/python/pylogger.h similarity index 100% rename from Cantera/python/src/pylogger.h rename to src/python/pylogger.h diff --git a/Cantera/python/src/pyutils.h b/src/python/pyutils.h similarity index 100% rename from Cantera/python/src/pyutils.h rename to src/python/pyutils.h diff --git a/Cantera/python/src/spam.c b/src/python/spam.c similarity index 100% rename from Cantera/python/src/spam.c rename to src/python/spam.c diff --git a/Cantera/src/spectra/DiatomicMolecule.h b/src/spectra/DiatomicMolecule.h similarity index 100% rename from Cantera/src/spectra/DiatomicMolecule.h rename to src/spectra/DiatomicMolecule.h diff --git a/Cantera/src/spectra/LineBroadener.cpp b/src/spectra/LineBroadener.cpp similarity index 100% rename from Cantera/src/spectra/LineBroadener.cpp rename to src/spectra/LineBroadener.cpp diff --git a/Cantera/src/spectra/Makefile.am b/src/spectra/Makefile.am similarity index 100% rename from Cantera/src/spectra/Makefile.am rename to src/spectra/Makefile.am diff --git a/Cantera/src/spectra/Nuclei.h b/src/spectra/Nuclei.h similarity index 100% rename from Cantera/src/spectra/Nuclei.h rename to src/spectra/Nuclei.h diff --git a/Cantera/src/spectra/rotor.cpp b/src/spectra/rotor.cpp similarity index 100% rename from Cantera/src/spectra/rotor.cpp rename to src/spectra/rotor.cpp diff --git a/Cantera/src/spectra/spectralUtilities.cpp b/src/spectra/spectralUtilities.cpp similarity index 100% rename from Cantera/src/spectra/spectralUtilities.cpp rename to src/spectra/spectralUtilities.cpp diff --git a/Cantera/src/spectra/spectralUtilities.h b/src/spectra/spectralUtilities.h similarity index 100% rename from Cantera/src/spectra/spectralUtilities.h rename to src/spectra/spectralUtilities.h diff --git a/Cantera/src/thermo/ConstCpPoly.cpp b/src/thermo/ConstCpPoly.cpp similarity index 100% rename from Cantera/src/thermo/ConstCpPoly.cpp rename to src/thermo/ConstCpPoly.cpp diff --git a/Cantera/src/thermo/ConstCpPoly.h b/src/thermo/ConstCpPoly.h similarity index 100% rename from Cantera/src/thermo/ConstCpPoly.h rename to src/thermo/ConstCpPoly.h diff --git a/Cantera/src/thermo/ConstDensityThermo.cpp b/src/thermo/ConstDensityThermo.cpp similarity index 100% rename from Cantera/src/thermo/ConstDensityThermo.cpp rename to src/thermo/ConstDensityThermo.cpp diff --git a/Cantera/src/thermo/Constituents.cpp b/src/thermo/Constituents.cpp similarity index 100% rename from Cantera/src/thermo/Constituents.cpp rename to src/thermo/Constituents.cpp diff --git a/Cantera/src/thermo/DebyeHuckel.cpp b/src/thermo/DebyeHuckel.cpp similarity index 100% rename from Cantera/src/thermo/DebyeHuckel.cpp rename to src/thermo/DebyeHuckel.cpp diff --git a/Cantera/src/thermo/Elements.cpp b/src/thermo/Elements.cpp similarity index 100% rename from Cantera/src/thermo/Elements.cpp rename to src/thermo/Elements.cpp diff --git a/Cantera/src/thermo/FixedChemPotSSTP.cpp b/src/thermo/FixedChemPotSSTP.cpp similarity index 100% rename from Cantera/src/thermo/FixedChemPotSSTP.cpp rename to src/thermo/FixedChemPotSSTP.cpp diff --git a/Cantera/src/thermo/GeneralSpeciesThermo.cpp b/src/thermo/GeneralSpeciesThermo.cpp similarity index 100% rename from Cantera/src/thermo/GeneralSpeciesThermo.cpp rename to src/thermo/GeneralSpeciesThermo.cpp diff --git a/Cantera/src/thermo/GibbsExcessVPSSTP.cpp b/src/thermo/GibbsExcessVPSSTP.cpp similarity index 100% rename from Cantera/src/thermo/GibbsExcessVPSSTP.cpp rename to src/thermo/GibbsExcessVPSSTP.cpp diff --git a/Cantera/src/thermo/HMWSoln.cpp b/src/thermo/HMWSoln.cpp similarity index 100% rename from Cantera/src/thermo/HMWSoln.cpp rename to src/thermo/HMWSoln.cpp diff --git a/Cantera/src/thermo/HMWSoln_input.cpp b/src/thermo/HMWSoln_input.cpp similarity index 100% rename from Cantera/src/thermo/HMWSoln_input.cpp rename to src/thermo/HMWSoln_input.cpp diff --git a/Cantera/src/thermo/IdealGasPhase.cpp b/src/thermo/IdealGasPhase.cpp similarity index 100% rename from Cantera/src/thermo/IdealGasPhase.cpp rename to src/thermo/IdealGasPhase.cpp diff --git a/Cantera/src/thermo/IdealMolalSoln.cpp b/src/thermo/IdealMolalSoln.cpp similarity index 100% rename from Cantera/src/thermo/IdealMolalSoln.cpp rename to src/thermo/IdealMolalSoln.cpp diff --git a/Cantera/src/thermo/IdealSolidSolnPhase.cpp b/src/thermo/IdealSolidSolnPhase.cpp similarity index 100% rename from Cantera/src/thermo/IdealSolidSolnPhase.cpp rename to src/thermo/IdealSolidSolnPhase.cpp diff --git a/Cantera/src/thermo/IdealSolnGasVPSS.cpp b/src/thermo/IdealSolnGasVPSS.cpp similarity index 100% rename from Cantera/src/thermo/IdealSolnGasVPSS.cpp rename to src/thermo/IdealSolnGasVPSS.cpp diff --git a/Cantera/src/thermo/IonsFromNeutralVPSSTP.cpp b/src/thermo/IonsFromNeutralVPSSTP.cpp similarity index 100% rename from Cantera/src/thermo/IonsFromNeutralVPSSTP.cpp rename to src/thermo/IonsFromNeutralVPSSTP.cpp diff --git a/Cantera/src/thermo/LatticePhase.cpp b/src/thermo/LatticePhase.cpp similarity index 100% rename from Cantera/src/thermo/LatticePhase.cpp rename to src/thermo/LatticePhase.cpp diff --git a/Cantera/src/thermo/LatticeSolidPhase.cpp b/src/thermo/LatticeSolidPhase.cpp similarity index 100% rename from Cantera/src/thermo/LatticeSolidPhase.cpp rename to src/thermo/LatticeSolidPhase.cpp diff --git a/Cantera/src/thermo/Makefile.am b/src/thermo/Makefile.am similarity index 100% rename from Cantera/src/thermo/Makefile.am rename to src/thermo/Makefile.am diff --git a/Cantera/src/thermo/MargulesVPSSTP.cpp b/src/thermo/MargulesVPSSTP.cpp similarity index 100% rename from Cantera/src/thermo/MargulesVPSSTP.cpp rename to src/thermo/MargulesVPSSTP.cpp diff --git a/Cantera/src/thermo/MetalSHEelectrons.cpp b/src/thermo/MetalSHEelectrons.cpp similarity index 100% rename from Cantera/src/thermo/MetalSHEelectrons.cpp rename to src/thermo/MetalSHEelectrons.cpp diff --git a/Cantera/src/thermo/MineralEQ3.cpp b/src/thermo/MineralEQ3.cpp similarity index 100% rename from Cantera/src/thermo/MineralEQ3.cpp rename to src/thermo/MineralEQ3.cpp diff --git a/Cantera/src/thermo/MixedSolventElectrolyte.cpp b/src/thermo/MixedSolventElectrolyte.cpp similarity index 100% rename from Cantera/src/thermo/MixedSolventElectrolyte.cpp rename to src/thermo/MixedSolventElectrolyte.cpp diff --git a/Cantera/src/thermo/MixtureFugacityTP.cpp b/src/thermo/MixtureFugacityTP.cpp similarity index 100% rename from Cantera/src/thermo/MixtureFugacityTP.cpp rename to src/thermo/MixtureFugacityTP.cpp diff --git a/Cantera/src/thermo/MolalityVPSSTP.cpp b/src/thermo/MolalityVPSSTP.cpp similarity index 100% rename from Cantera/src/thermo/MolalityVPSSTP.cpp rename to src/thermo/MolalityVPSSTP.cpp diff --git a/Cantera/src/thermo/MolarityIonicVPSSTP.cpp b/src/thermo/MolarityIonicVPSSTP.cpp similarity index 100% rename from Cantera/src/thermo/MolarityIonicVPSSTP.cpp rename to src/thermo/MolarityIonicVPSSTP.cpp diff --git a/Cantera/src/thermo/Mu0Poly.cpp b/src/thermo/Mu0Poly.cpp similarity index 100% rename from Cantera/src/thermo/Mu0Poly.cpp rename to src/thermo/Mu0Poly.cpp diff --git a/Cantera/src/thermo/Mu0Poly.h b/src/thermo/Mu0Poly.h similarity index 100% rename from Cantera/src/thermo/Mu0Poly.h rename to src/thermo/Mu0Poly.h diff --git a/Cantera/src/thermo/Nasa9Poly1.cpp b/src/thermo/Nasa9Poly1.cpp similarity index 100% rename from Cantera/src/thermo/Nasa9Poly1.cpp rename to src/thermo/Nasa9Poly1.cpp diff --git a/Cantera/src/thermo/Nasa9PolyMultiTempRegion.cpp b/src/thermo/Nasa9PolyMultiTempRegion.cpp similarity index 100% rename from Cantera/src/thermo/Nasa9PolyMultiTempRegion.cpp rename to src/thermo/Nasa9PolyMultiTempRegion.cpp diff --git a/Cantera/src/thermo/Nasa9PolyMultiTempRegion.h b/src/thermo/Nasa9PolyMultiTempRegion.h similarity index 100% rename from Cantera/src/thermo/Nasa9PolyMultiTempRegion.h rename to src/thermo/Nasa9PolyMultiTempRegion.h diff --git a/Cantera/src/thermo/NasaPoly2.h b/src/thermo/NasaPoly2.h similarity index 100% rename from Cantera/src/thermo/NasaPoly2.h rename to src/thermo/NasaPoly2.h diff --git a/Cantera/src/thermo/NasaThermo.h b/src/thermo/NasaThermo.h similarity index 100% rename from Cantera/src/thermo/NasaThermo.h rename to src/thermo/NasaThermo.h diff --git a/Cantera/src/thermo/PDSS.cpp b/src/thermo/PDSS.cpp similarity index 100% rename from Cantera/src/thermo/PDSS.cpp rename to src/thermo/PDSS.cpp diff --git a/Cantera/src/thermo/PDSS_ConstVol.cpp b/src/thermo/PDSS_ConstVol.cpp similarity index 100% rename from Cantera/src/thermo/PDSS_ConstVol.cpp rename to src/thermo/PDSS_ConstVol.cpp diff --git a/Cantera/src/thermo/PDSS_HKFT.cpp b/src/thermo/PDSS_HKFT.cpp similarity index 100% rename from Cantera/src/thermo/PDSS_HKFT.cpp rename to src/thermo/PDSS_HKFT.cpp diff --git a/Cantera/src/thermo/PDSS_IdealGas.cpp b/src/thermo/PDSS_IdealGas.cpp similarity index 100% rename from Cantera/src/thermo/PDSS_IdealGas.cpp rename to src/thermo/PDSS_IdealGas.cpp diff --git a/Cantera/src/thermo/PDSS_IonsFromNeutral.cpp b/src/thermo/PDSS_IonsFromNeutral.cpp similarity index 100% rename from Cantera/src/thermo/PDSS_IonsFromNeutral.cpp rename to src/thermo/PDSS_IonsFromNeutral.cpp diff --git a/Cantera/src/thermo/PDSS_SSVol.cpp b/src/thermo/PDSS_SSVol.cpp similarity index 100% rename from Cantera/src/thermo/PDSS_SSVol.cpp rename to src/thermo/PDSS_SSVol.cpp diff --git a/Cantera/src/thermo/PDSS_Water.cpp b/src/thermo/PDSS_Water.cpp similarity index 100% rename from Cantera/src/thermo/PDSS_Water.cpp rename to src/thermo/PDSS_Water.cpp diff --git a/Cantera/src/thermo/Phase.cpp b/src/thermo/Phase.cpp similarity index 100% rename from Cantera/src/thermo/Phase.cpp rename to src/thermo/Phase.cpp diff --git a/Cantera/src/thermo/PhaseCombo_Interaction.cpp b/src/thermo/PhaseCombo_Interaction.cpp similarity index 100% rename from Cantera/src/thermo/PhaseCombo_Interaction.cpp rename to src/thermo/PhaseCombo_Interaction.cpp diff --git a/Cantera/src/thermo/PseudoBinaryVPSSTP.cpp b/src/thermo/PseudoBinaryVPSSTP.cpp similarity index 100% rename from Cantera/src/thermo/PseudoBinaryVPSSTP.cpp rename to src/thermo/PseudoBinaryVPSSTP.cpp diff --git a/Cantera/src/thermo/PureFluidPhase.cpp b/src/thermo/PureFluidPhase.cpp similarity index 100% rename from Cantera/src/thermo/PureFluidPhase.cpp rename to src/thermo/PureFluidPhase.cpp diff --git a/Cantera/src/thermo/RedlichKisterVPSSTP.cpp b/src/thermo/RedlichKisterVPSSTP.cpp similarity index 100% rename from Cantera/src/thermo/RedlichKisterVPSSTP.cpp rename to src/thermo/RedlichKisterVPSSTP.cpp diff --git a/Cantera/src/thermo/RedlichKisterVPSSTP.h b/src/thermo/RedlichKisterVPSSTP.h similarity index 100% rename from Cantera/src/thermo/RedlichKisterVPSSTP.h rename to src/thermo/RedlichKisterVPSSTP.h diff --git a/Cantera/src/thermo/RedlichKwongMFTP.cpp b/src/thermo/RedlichKwongMFTP.cpp similarity index 100% rename from Cantera/src/thermo/RedlichKwongMFTP.cpp rename to src/thermo/RedlichKwongMFTP.cpp diff --git a/Cantera/src/thermo/SemiconductorPhase.cpp b/src/thermo/SemiconductorPhase.cpp similarity index 100% rename from Cantera/src/thermo/SemiconductorPhase.cpp rename to src/thermo/SemiconductorPhase.cpp diff --git a/Cantera/src/thermo/ShomatePoly.h b/src/thermo/ShomatePoly.h similarity index 100% rename from Cantera/src/thermo/ShomatePoly.h rename to src/thermo/ShomatePoly.h diff --git a/Cantera/src/thermo/ShomateThermo.h b/src/thermo/ShomateThermo.h similarity index 100% rename from Cantera/src/thermo/ShomateThermo.h rename to src/thermo/ShomateThermo.h diff --git a/Cantera/src/thermo/SingleSpeciesTP.cpp b/src/thermo/SingleSpeciesTP.cpp similarity index 100% rename from Cantera/src/thermo/SingleSpeciesTP.cpp rename to src/thermo/SingleSpeciesTP.cpp diff --git a/Cantera/src/thermo/SpeciesThermoFactory.cpp b/src/thermo/SpeciesThermoFactory.cpp similarity index 100% rename from Cantera/src/thermo/SpeciesThermoFactory.cpp rename to src/thermo/SpeciesThermoFactory.cpp diff --git a/Cantera/src/thermo/SpeciesThermoInterpType.cpp b/src/thermo/SpeciesThermoInterpType.cpp similarity index 100% rename from Cantera/src/thermo/SpeciesThermoInterpType.cpp rename to src/thermo/SpeciesThermoInterpType.cpp diff --git a/Cantera/src/thermo/State.cpp b/src/thermo/State.cpp similarity index 100% rename from Cantera/src/thermo/State.cpp rename to src/thermo/State.cpp diff --git a/Cantera/src/thermo/StoichSubstance.cpp b/src/thermo/StoichSubstance.cpp similarity index 100% rename from Cantera/src/thermo/StoichSubstance.cpp rename to src/thermo/StoichSubstance.cpp diff --git a/Cantera/src/thermo/StoichSubstanceSSTP.cpp b/src/thermo/StoichSubstanceSSTP.cpp similarity index 100% rename from Cantera/src/thermo/StoichSubstanceSSTP.cpp rename to src/thermo/StoichSubstanceSSTP.cpp diff --git a/Cantera/src/thermo/SurfPhase.cpp b/src/thermo/SurfPhase.cpp similarity index 100% rename from Cantera/src/thermo/SurfPhase.cpp rename to src/thermo/SurfPhase.cpp diff --git a/Cantera/src/thermo/ThermoFactory.cpp b/src/thermo/ThermoFactory.cpp similarity index 100% rename from Cantera/src/thermo/ThermoFactory.cpp rename to src/thermo/ThermoFactory.cpp diff --git a/Cantera/src/thermo/ThermoPhase.cpp b/src/thermo/ThermoPhase.cpp similarity index 100% rename from Cantera/src/thermo/ThermoPhase.cpp rename to src/thermo/ThermoPhase.cpp diff --git a/Cantera/src/thermo/VPSSMgr.cpp b/src/thermo/VPSSMgr.cpp similarity index 100% rename from Cantera/src/thermo/VPSSMgr.cpp rename to src/thermo/VPSSMgr.cpp diff --git a/Cantera/src/thermo/VPSSMgrFactory.cpp b/src/thermo/VPSSMgrFactory.cpp similarity index 100% rename from Cantera/src/thermo/VPSSMgrFactory.cpp rename to src/thermo/VPSSMgrFactory.cpp diff --git a/Cantera/src/thermo/VPSSMgrFactory.h b/src/thermo/VPSSMgrFactory.h similarity index 100% rename from Cantera/src/thermo/VPSSMgrFactory.h rename to src/thermo/VPSSMgrFactory.h diff --git a/Cantera/src/thermo/VPSSMgr_ConstVol.cpp b/src/thermo/VPSSMgr_ConstVol.cpp similarity index 100% rename from Cantera/src/thermo/VPSSMgr_ConstVol.cpp rename to src/thermo/VPSSMgr_ConstVol.cpp diff --git a/Cantera/src/thermo/VPSSMgr_General.cpp b/src/thermo/VPSSMgr_General.cpp similarity index 100% rename from Cantera/src/thermo/VPSSMgr_General.cpp rename to src/thermo/VPSSMgr_General.cpp diff --git a/Cantera/src/thermo/VPSSMgr_IdealGas.cpp b/src/thermo/VPSSMgr_IdealGas.cpp similarity index 100% rename from Cantera/src/thermo/VPSSMgr_IdealGas.cpp rename to src/thermo/VPSSMgr_IdealGas.cpp diff --git a/Cantera/src/thermo/VPSSMgr_Water_ConstVol.cpp b/src/thermo/VPSSMgr_Water_ConstVol.cpp similarity index 100% rename from Cantera/src/thermo/VPSSMgr_Water_ConstVol.cpp rename to src/thermo/VPSSMgr_Water_ConstVol.cpp diff --git a/Cantera/src/thermo/VPSSMgr_Water_HKFT.cpp b/src/thermo/VPSSMgr_Water_HKFT.cpp similarity index 100% rename from Cantera/src/thermo/VPSSMgr_Water_HKFT.cpp rename to src/thermo/VPSSMgr_Water_HKFT.cpp diff --git a/Cantera/src/thermo/VPStandardStateTP.cpp b/src/thermo/VPStandardStateTP.cpp similarity index 100% rename from Cantera/src/thermo/VPStandardStateTP.cpp rename to src/thermo/VPStandardStateTP.cpp diff --git a/Cantera/src/thermo/WaterProps.cpp b/src/thermo/WaterProps.cpp similarity index 100% rename from Cantera/src/thermo/WaterProps.cpp rename to src/thermo/WaterProps.cpp diff --git a/Cantera/src/thermo/WaterPropsIAPWS.cpp b/src/thermo/WaterPropsIAPWS.cpp similarity index 100% rename from Cantera/src/thermo/WaterPropsIAPWS.cpp rename to src/thermo/WaterPropsIAPWS.cpp diff --git a/Cantera/src/thermo/WaterPropsIAPWSphi.cpp b/src/thermo/WaterPropsIAPWSphi.cpp similarity index 100% rename from Cantera/src/thermo/WaterPropsIAPWSphi.cpp rename to src/thermo/WaterPropsIAPWSphi.cpp diff --git a/Cantera/src/thermo/WaterSSTP.cpp b/src/thermo/WaterSSTP.cpp similarity index 100% rename from Cantera/src/thermo/WaterSSTP.cpp rename to src/thermo/WaterSSTP.cpp diff --git a/Cantera/src/thermo/phasereport.cpp b/src/thermo/phasereport.cpp similarity index 100% rename from Cantera/src/thermo/phasereport.cpp rename to src/thermo/phasereport.cpp diff --git a/ext/tpx/CarbonDioxide.cpp b/src/tpx/CarbonDioxide.cpp similarity index 100% rename from ext/tpx/CarbonDioxide.cpp rename to src/tpx/CarbonDioxide.cpp diff --git a/ext/tpx/CarbonDioxide.h b/src/tpx/CarbonDioxide.h similarity index 100% rename from ext/tpx/CarbonDioxide.h rename to src/tpx/CarbonDioxide.h diff --git a/ext/tpx/HFC134a.cpp b/src/tpx/HFC134a.cpp similarity index 100% rename from ext/tpx/HFC134a.cpp rename to src/tpx/HFC134a.cpp diff --git a/ext/tpx/HFC134a.h b/src/tpx/HFC134a.h similarity index 100% rename from ext/tpx/HFC134a.h rename to src/tpx/HFC134a.h diff --git a/ext/tpx/Heptane.cpp b/src/tpx/Heptane.cpp similarity index 100% rename from ext/tpx/Heptane.cpp rename to src/tpx/Heptane.cpp diff --git a/ext/tpx/Heptane.h b/src/tpx/Heptane.h similarity index 100% rename from ext/tpx/Heptane.h rename to src/tpx/Heptane.h diff --git a/ext/tpx/Hydrogen.cpp b/src/tpx/Hydrogen.cpp similarity index 100% rename from ext/tpx/Hydrogen.cpp rename to src/tpx/Hydrogen.cpp diff --git a/ext/tpx/Hydrogen.h b/src/tpx/Hydrogen.h similarity index 100% rename from ext/tpx/Hydrogen.h rename to src/tpx/Hydrogen.h diff --git a/ext/tpx/Makefile.am b/src/tpx/Makefile.am similarity index 100% rename from ext/tpx/Makefile.am rename to src/tpx/Makefile.am diff --git a/ext/tpx/Methane.cpp b/src/tpx/Methane.cpp similarity index 100% rename from ext/tpx/Methane.cpp rename to src/tpx/Methane.cpp diff --git a/ext/tpx/Methane.h b/src/tpx/Methane.h similarity index 100% rename from ext/tpx/Methane.h rename to src/tpx/Methane.h diff --git a/ext/tpx/Nitrogen.cpp b/src/tpx/Nitrogen.cpp similarity index 100% rename from ext/tpx/Nitrogen.cpp rename to src/tpx/Nitrogen.cpp diff --git a/ext/tpx/Nitrogen.h b/src/tpx/Nitrogen.h similarity index 100% rename from ext/tpx/Nitrogen.h rename to src/tpx/Nitrogen.h diff --git a/ext/tpx/Oxygen.cpp b/src/tpx/Oxygen.cpp similarity index 100% rename from ext/tpx/Oxygen.cpp rename to src/tpx/Oxygen.cpp diff --git a/ext/tpx/Oxygen.h b/src/tpx/Oxygen.h similarity index 100% rename from ext/tpx/Oxygen.h rename to src/tpx/Oxygen.h diff --git a/ext/tpx/RedlichKwong.cpp b/src/tpx/RedlichKwong.cpp similarity index 100% rename from ext/tpx/RedlichKwong.cpp rename to src/tpx/RedlichKwong.cpp diff --git a/ext/tpx/RedlichKwong.h b/src/tpx/RedlichKwong.h similarity index 100% rename from ext/tpx/RedlichKwong.h rename to src/tpx/RedlichKwong.h diff --git a/ext/tpx/Sub.cpp b/src/tpx/Sub.cpp similarity index 100% rename from ext/tpx/Sub.cpp rename to src/tpx/Sub.cpp diff --git a/ext/tpx/Water.cpp b/src/tpx/Water.cpp similarity index 100% rename from ext/tpx/Water.cpp rename to src/tpx/Water.cpp diff --git a/ext/tpx/Water.h b/src/tpx/Water.h similarity index 100% rename from ext/tpx/Water.h rename to src/tpx/Water.h diff --git a/ext/tpx/lk.cpp b/src/tpx/lk.cpp similarity index 100% rename from ext/tpx/lk.cpp rename to src/tpx/lk.cpp diff --git a/ext/tpx/lk.h b/src/tpx/lk.h similarity index 100% rename from ext/tpx/lk.h rename to src/tpx/lk.h diff --git a/ext/tpx/mix.h b/src/tpx/mix.h similarity index 100% rename from ext/tpx/mix.h rename to src/tpx/mix.h diff --git a/ext/tpx/subs.h b/src/tpx/subs.h similarity index 100% rename from ext/tpx/subs.h rename to src/tpx/subs.h diff --git a/ext/tpx/utils.cpp b/src/tpx/utils.cpp similarity index 100% rename from ext/tpx/utils.cpp rename to src/tpx/utils.cpp diff --git a/Cantera/src/transport/AqueousTransport.cpp b/src/transport/AqueousTransport.cpp similarity index 100% rename from Cantera/src/transport/AqueousTransport.cpp rename to src/transport/AqueousTransport.cpp diff --git a/Cantera/src/transport/DustyGasTransport.cpp b/src/transport/DustyGasTransport.cpp similarity index 100% rename from Cantera/src/transport/DustyGasTransport.cpp rename to src/transport/DustyGasTransport.cpp diff --git a/Cantera/src/transport/FtnTransport.h b/src/transport/FtnTransport.h similarity index 100% rename from Cantera/src/transport/FtnTransport.h rename to src/transport/FtnTransport.h diff --git a/Cantera/src/transport/LTPspecies.cpp b/src/transport/LTPspecies.cpp similarity index 100% rename from Cantera/src/transport/LTPspecies.cpp rename to src/transport/LTPspecies.cpp diff --git a/Cantera/src/transport/L_matrix.h b/src/transport/L_matrix.h similarity index 100% rename from Cantera/src/transport/L_matrix.h rename to src/transport/L_matrix.h diff --git a/Cantera/src/transport/LiquidTranInteraction.cpp b/src/transport/LiquidTranInteraction.cpp similarity index 100% rename from Cantera/src/transport/LiquidTranInteraction.cpp rename to src/transport/LiquidTranInteraction.cpp diff --git a/Cantera/src/transport/LiquidTransport.cpp b/src/transport/LiquidTransport.cpp similarity index 100% rename from Cantera/src/transport/LiquidTransport.cpp rename to src/transport/LiquidTransport.cpp diff --git a/Cantera/src/transport/LiquidTransportData.cpp b/src/transport/LiquidTransportData.cpp similarity index 100% rename from Cantera/src/transport/LiquidTransportData.cpp rename to src/transport/LiquidTransportData.cpp diff --git a/Cantera/src/transport/LiquidTransportParams.cpp b/src/transport/LiquidTransportParams.cpp similarity index 100% rename from Cantera/src/transport/LiquidTransportParams.cpp rename to src/transport/LiquidTransportParams.cpp diff --git a/Cantera/src/transport/MMCollisionInt.cpp b/src/transport/MMCollisionInt.cpp similarity index 100% rename from Cantera/src/transport/MMCollisionInt.cpp rename to src/transport/MMCollisionInt.cpp diff --git a/Cantera/src/transport/MMCollisionInt.h b/src/transport/MMCollisionInt.h similarity index 100% rename from Cantera/src/transport/MMCollisionInt.h rename to src/transport/MMCollisionInt.h diff --git a/Cantera/src/transport/Makefile.am b/src/transport/Makefile.am similarity index 100% rename from Cantera/src/transport/Makefile.am rename to src/transport/Makefile.am diff --git a/Cantera/src/transport/MixTransport.cpp b/src/transport/MixTransport.cpp similarity index 100% rename from Cantera/src/transport/MixTransport.cpp rename to src/transport/MixTransport.cpp diff --git a/Cantera/src/transport/MultiTransport.cpp b/src/transport/MultiTransport.cpp similarity index 100% rename from Cantera/src/transport/MultiTransport.cpp rename to src/transport/MultiTransport.cpp diff --git a/Cantera/src/transport/SimpleTransport.cpp b/src/transport/SimpleTransport.cpp similarity index 100% rename from Cantera/src/transport/SimpleTransport.cpp rename to src/transport/SimpleTransport.cpp diff --git a/Cantera/src/transport/SolidTransport.cpp b/src/transport/SolidTransport.cpp similarity index 100% rename from Cantera/src/transport/SolidTransport.cpp rename to src/transport/SolidTransport.cpp diff --git a/Cantera/src/transport/Tortuosity.h b/src/transport/Tortuosity.h similarity index 100% rename from Cantera/src/transport/Tortuosity.h rename to src/transport/Tortuosity.h diff --git a/Cantera/src/transport/TortuosityBase.cpp b/src/transport/TortuosityBase.cpp similarity index 100% rename from Cantera/src/transport/TortuosityBase.cpp rename to src/transport/TortuosityBase.cpp diff --git a/Cantera/src/transport/TortuosityBase.h b/src/transport/TortuosityBase.h similarity index 100% rename from Cantera/src/transport/TortuosityBase.h rename to src/transport/TortuosityBase.h diff --git a/Cantera/src/transport/TortuosityBruggeman.cpp b/src/transport/TortuosityBruggeman.cpp similarity index 100% rename from Cantera/src/transport/TortuosityBruggeman.cpp rename to src/transport/TortuosityBruggeman.cpp diff --git a/Cantera/src/transport/TortuosityBruggeman.h b/src/transport/TortuosityBruggeman.h similarity index 100% rename from Cantera/src/transport/TortuosityBruggeman.h rename to src/transport/TortuosityBruggeman.h diff --git a/Cantera/src/transport/TortuosityMaxwell.cpp b/src/transport/TortuosityMaxwell.cpp similarity index 100% rename from Cantera/src/transport/TortuosityMaxwell.cpp rename to src/transport/TortuosityMaxwell.cpp diff --git a/Cantera/src/transport/TortuosityMaxwell.h b/src/transport/TortuosityMaxwell.h similarity index 100% rename from Cantera/src/transport/TortuosityMaxwell.h rename to src/transport/TortuosityMaxwell.h diff --git a/Cantera/src/transport/TortuosityPercolation.cpp b/src/transport/TortuosityPercolation.cpp similarity index 100% rename from Cantera/src/transport/TortuosityPercolation.cpp rename to src/transport/TortuosityPercolation.cpp diff --git a/Cantera/src/transport/TortuosityPercolation.h b/src/transport/TortuosityPercolation.h similarity index 100% rename from Cantera/src/transport/TortuosityPercolation.h rename to src/transport/TortuosityPercolation.h diff --git a/Cantera/src/transport/TransportBase.cpp b/src/transport/TransportBase.cpp similarity index 100% rename from Cantera/src/transport/TransportBase.cpp rename to src/transport/TransportBase.cpp diff --git a/Cantera/src/transport/TransportFactory.cpp b/src/transport/TransportFactory.cpp similarity index 100% rename from Cantera/src/transport/TransportFactory.cpp rename to src/transport/TransportFactory.cpp diff --git a/Cantera/src/transport/TransportParams.cpp b/src/transport/TransportParams.cpp similarity index 100% rename from Cantera/src/transport/TransportParams.cpp rename to src/transport/TransportParams.cpp diff --git a/Cantera/src/transport/WaterTransport.cpp b/src/transport/WaterTransport.cpp similarity index 100% rename from Cantera/src/transport/WaterTransport.cpp rename to src/transport/WaterTransport.cpp diff --git a/Cantera/src/zeroD/ConstPressureReactor.cpp b/src/zeroD/ConstPressureReactor.cpp similarity index 100% rename from Cantera/src/zeroD/ConstPressureReactor.cpp rename to src/zeroD/ConstPressureReactor.cpp diff --git a/Cantera/src/zeroD/FlowDevice.cpp b/src/zeroD/FlowDevice.cpp similarity index 100% rename from Cantera/src/zeroD/FlowDevice.cpp rename to src/zeroD/FlowDevice.cpp diff --git a/Cantera/src/zeroD/FlowReactor.cpp b/src/zeroD/FlowReactor.cpp similarity index 100% rename from Cantera/src/zeroD/FlowReactor.cpp rename to src/zeroD/FlowReactor.cpp diff --git a/Cantera/src/zeroD/Makefile.am b/src/zeroD/Makefile.am similarity index 100% rename from Cantera/src/zeroD/Makefile.am rename to src/zeroD/Makefile.am diff --git a/Cantera/src/zeroD/Reactor.cpp b/src/zeroD/Reactor.cpp similarity index 100% rename from Cantera/src/zeroD/Reactor.cpp rename to src/zeroD/Reactor.cpp diff --git a/Cantera/src/zeroD/ReactorBase.cpp b/src/zeroD/ReactorBase.cpp similarity index 100% rename from Cantera/src/zeroD/ReactorBase.cpp rename to src/zeroD/ReactorBase.cpp diff --git a/Cantera/src/zeroD/ReactorFactory.cpp b/src/zeroD/ReactorFactory.cpp similarity index 100% rename from Cantera/src/zeroD/ReactorFactory.cpp rename to src/zeroD/ReactorFactory.cpp diff --git a/Cantera/src/zeroD/ReactorNet.cpp b/src/zeroD/ReactorNet.cpp similarity index 100% rename from Cantera/src/zeroD/ReactorNet.cpp rename to src/zeroD/ReactorNet.cpp diff --git a/Cantera/src/zeroD/Wall.cpp b/src/zeroD/Wall.cpp similarity index 100% rename from Cantera/src/zeroD/Wall.cpp rename to src/zeroD/Wall.cpp diff --git a/tools/Makefile.am b/tools/Makefile.am deleted file mode 100644 index 5cd375fe0..000000000 --- a/tools/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = testtools \ No newline at end of file diff --git a/tools/ctnew.in b/tools/ctnew.in deleted file mode 100644 index de2be4a17..000000000 --- a/tools/ctnew.in +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -if test "x$1" = "x-f77"; then - cp @ct_templdir@/f77/*.* . -elif test "x$1" = "x-f90"; then - cp @ct_templdir@/f90/*.* . -else - cp @ct_templdir@/cxx/*.* . -fi diff --git a/tools/templates/f77/demo_ftnlib.cpp b/tools/templates/f77/demo_ftnlib.cpp deleted file mode 100644 index 90453f99e..000000000 --- a/tools/templates/f77/demo_ftnlib.cpp +++ /dev/null @@ -1,412 +0,0 @@ -/*! - A simple Fortran 77 interface - - This file is an example of how to write an interface to use Cantera - in Fortran 77 programs. The basic idea is to store pointers to - Cantera objects in global storage, and then create Fortran-callable - functions that access the objects through the pointers. - - This particular example defines functions that return thermodynamic - properties, transport properties, and kinetic rates for reacting - ideal gas mixtures. Only a single pointer to an IdealGasMix object is - stored, so only one reaction mechanism may be used at any one time in - the application. Of course, it is a simple modification to store - multiple objects if it is desired to use multiple reaction - mechanisms. - - The functions defined here are ones commonly needed in application - programs that simulate gas-phase combustion or similar - processes. Similar libraries to access other capabilities of Cantera - (surface chemistry, etc.) could be written in the same way. - - This library is designed for Fortran compilers that expect external - procedure na,es to be lowercase with a trailing underscore. If this - is not the case, the procedure names must be edited before use. - - */ - -// add any other Cantera header files you need here -#include -#include - -using namespace Cantera; - -// store a pointer to an IdealGasMix object -static IdealGasMix* _gas = 0; - -// provides access to the pointers for functions in other libraries -IdealGasMix* _gasptr() -{ - return _gas; -} - -// comment these out to produce a smaller executable if not needed -#define WITH_EQUIL -#define WITH_TRANSPORT - -#ifdef WITH_EQUIL -#include -#endif - - -#ifdef WITH_TRANSPORT -#include - -// store a pointer to a transport manager -static Transport* _trans = 0; -Transport* _transptr() -{ - return _trans; -} -#endif - -// error handler -void handleError() -{ - showErrors(cout); - exit(-1); -} - -// extern "C" turns off C++ name-mangling, so that the procedure names -// in the object file are exactly as shown here. - -extern "C" { - - /// This is the Fortran main program. This works for g77; it may - /// need to be modified for other Fortran compilers -#ifdef NEED_ALT_MAIN - extern int MAIN__(); -#endif - - /** - * Read in a reaction mechanism file and create an IdealGasMix - * object. The file may be in Cantera input format or in CTML. (If - * you have a file in Chemkin-compatible format, use utility - * program ck2cti first to convert it into Cantera format.) - */ - void newidealgasmix_(char* file, char* id, char* transport, - ftnlen lenfile, ftnlen lenid, ftnlen lentr) - { - string trmodel = ""; - try { - string fin = string(file, lenfile); - string fth = string(id, lenid); - trmodel = string(transport, lentr); - if (_gas) { - delete _gas; - } - _gas = new IdealGasMix(fin, fth); - } catch (CanteraError) { - handleError(); - } -#ifdef WITH_TRANSPORT - try { - if (_trans) { - delete _trans; - } - _trans = newTransportMgr(trmodel,_gas,1); - } catch (CanteraError) { - _trans = newTransportMgr("",_gas,1); - } -#endif - } - - /// integer function nElements() - integer nelements_() - { - return _gas->nElements(); - } - - /// integer function nSpecies() - integer nspecies_() - { - return _gas->nSpecies(); - } - - /// integer function nReactions() - integer nreactions_() - { - return _gas->nReactions(); - } - - void getspeciesname_(integer* k, char* name, ftnlen n) - { - int ik = *k - 1; - fill(name, name + n, ' '); - string spnm = _gas->speciesName(ik); - int ns = spnm.size(); - unsigned int nmx = (ns > n ? n : ns); - copy(spnm.begin(), spnm.begin()+nmx, name); - } - - //-------------- setting the state ---------------------------- - - /// subroutine setState_TPX(T, P, X) - void setstate_tpx_(doublereal* T, doublereal* P, doublereal* X) - { - try { - _gas->setState_TPX(*T, *P, X); - } catch (CanteraError) { - handleError(); - } - } - - /// subroutine setState_TPX_String(T, P, X) - void setstate_tpx_string_(doublereal* T, doublereal* P, - char* X, ftnlen lenx) - { - try { - _gas->setState_TPX(*T, *P, string(X, lenx)); - } catch (CanteraError) { - handleError(); - } - } - - void setstate_try_(doublereal* T, doublereal* rho, doublereal* Y) - { - try { - _gas->setState_TRY(*T, *rho, Y); - } catch (CanteraError) { - handleError(); - } - } - - void setstate_tpy_(doublereal* T, doublereal* p, doublereal* Y) - { - try { - _gas->setState_TPY(*T, *p, Y); - } catch (CanteraError) { - handleError(); - } - } - - void setstate_sp_(doublereal* s, doublereal* p) - { - try { - _gas->setState_SP(*s, *p); - } catch (CanteraError) { - handleError(); - } - } - - //-------------- thermodynamic properties ---------------------- - - /// Temperature (K) - doublereal temperature_() - { - return _gas->temperature(); - } - - /// Pressure (Pa) - doublereal pressure_() - { - return _gas->pressure(); - } - - /// Density (kg/m^3) - doublereal density_() - { - return _gas->density(); - } - - /// Mean molar mass (kg/kmol). - doublereal meanmolarmass_() - { - return _gas->meanMolecularWeight(); - } - - /// Molar enthalpy (J/kmol) - doublereal enthalpy_mole_() - { - return _gas->enthalpy_mole(); - } - - /// Molar internal energy (J/kmol) - doublereal intenergy_mole_() - { - return _gas->intEnergy_mole(); - } - - /// Molar entropy (J/kmol-K) - doublereal entropy_mole_() - { - return _gas->entropy_mole(); - } - - /// Molar heat capacity at constant P (J/kmol-K) - doublereal cp_mole_() - { - return _gas->cp_mole(); - } - - /// Molar Gibbs function (J/kmol) - doublereal gibbs_mole_() - { - return _gas->gibbs_mole(); - } - - doublereal enthalpy_mass_() - { - return _gas->enthalpy_mass(); - } - - doublereal intenergy_mass_() - { - return _gas->intEnergy_mass(); - } - - doublereal entropy_mass_() - { - return _gas->entropy_mass(); - } - - doublereal cp_mass_() - { - return _gas->cp_mass(); - } - - doublereal cv_mass_() - { - return _gas->cv_mass(); - } - - doublereal gibbs_mass_() - { - return _gas->gibbs_mass(); - } - - void gotmolefractions_(doublereal* x) - { - _gas->getMoleFractions(x); - } - - void gotmassfractions_(doublereal* y) - { - _gas->getMassFractions(y); - } - -#ifdef WITH_EQUIL - void equilibrate_(char* opt, ftnlen lenopt) - { - try { - if (lenopt != 2) { - throw CanteraError("equilibrate", - "two-character string required."); - } - string optstr = string(opt, 2); - equilibrate(*_gas, optstr.c_str()); - } catch (CanteraError) { - handleError(); - } - } -#endif - - //---------------- kinetics ------------------------- - - void getreactioneqn_(integer* i, char* eqn, ftnlen n) - { - int irxn = *i - 1; - fill(eqn, eqn + n, ' '); - string e = _gas->reactionString(irxn); - int ns = e.size(); - unsigned int nmx = (ns > n ? n : ns); - copy(e.begin(), e.begin()+nmx, eqn); - } - - void getnetproductionrates_(doublereal* wdot) - { - _gas->getNetProductionRates(wdot); - } - - void getcreationrates_(doublereal* cdot) - { - _gas->getCreationRates(cdot); - } - - void getdestructionrates_(doublereal* ddot) - { - _gas->getDestructionRates(ddot); - } - - void getnetratesofprogress_(doublereal* q) - { - _gas->getNetRatesOfProgress(q); - } - - void getfwdratesofprogress_(doublereal* q) - { - _gas->getFwdRatesOfProgress(q); - } - - void getrevratesofprogress_(doublereal* q) - { - _gas->getRevRatesOfProgress(q); - } - - //-------------------- transport properties -------------------- - -#ifdef WITH_TRANSPORT - double viscosity_() - { - try { - return _trans->viscosity(); - } catch (CanteraError) { - handleError(); - return 0.0; - } - } - - double thermalconductivity_() - { - try { - return _trans->thermalConductivity(); - } catch (CanteraError) { - handleError(); - return 0.0; - } - } - - void getmixdiffcoeffs_(double* diff) - { - try { - _trans->getMixDiffCoeffs(diff); - } catch (CanteraError) { - handleError(); - } - } - - void getthermaldiffcoeffs_(double* dt) - { - try { - _trans->getThermalDiffCoeffs(dt); - } catch (CanteraError) { - handleError(); - } - } -#endif - -} - -/* - * HKM 7/22/09: - * I'm skeptical that you need this for any system. - * Definately creates an error (dupl main()) for the solaris - * system - */ -#ifdef NEED_ALT_MAIN -/** - * This C++ main program simply calls the Fortran main program. - */ -int main() -{ - try { - return MAIN__(); - } catch (CanteraError) { - showErrors(cerr); - exit(-1); - } catch (...) { - cout << "An exception was trapped. Program terminating." << endl; - exit(-1); - } -} -#endif