diff --git a/Cantera/src/equil/CMakeLists.txt b/Cantera/src/equil/CMakeLists.txt
index 5d9815a36..35d1202d6 100644
--- a/Cantera/src/equil/CMakeLists.txt
+++ b/Cantera/src/equil/CMakeLists.txt
@@ -5,13 +5,9 @@ INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/base)
 INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/thermo)
 INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/numerics)
 
-SET (LIBRARY_OUTPUT_PATH 
-  ${PROJECT_BINARY_DIR}/build/lib/${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_VERSION} CACHE PATH "Single directory for all libraries"
-  )
-
 ADD_LIBRARY(equil  ${EQUIL_SRCS} )
-TARGET_LINK_LIBRARIES( equil thermo ctbase)
+TARGET_LINK_LIBRARIES( equil numerics thermo ctbase)
 
 SET(EQUIL_H  ChemEquil.h MultiPhase.h MultiPhaseEquil.h equil.h PropertyCalculator.h)
-
+INSTALL_FILES(/include/cantera/kernel FILES ${EQUIL_H})
 
diff --git a/Cantera/src/kinetics/CMakeLists.txt b/Cantera/src/kinetics/CMakeLists.txt
new file mode 100644
index 000000000..de00782dd
--- /dev/null
+++ b/Cantera/src/kinetics/CMakeLists.txt
@@ -0,0 +1,21 @@
+SET (KINETICS_SRCS importKinetics.cpp GRI_30_Kinetics.cpp KineticsFactory.cpp
+            GasKinetics.cpp FalloffFactory.cpp ReactionStoichMgr.cpp Kinetics.cpp 
+            solveSP.cpp InterfaceKinetics.cpp ImplicitSurfChem.cpp Group.cpp 
+            ReactionPath.cpp)
+
+INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/base)
+INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/thermo)
+INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/numerics)
+
+ADD_LIBRARY(kinetics ${KINETICS_SRCS})
+
+TARGET_LINK_LIBRARIES (kinetics numerics thermo ctbase)
+
+SET(KINETICS_H  importKinetics.h GRI_30_Kinetics.h KineticsFactory.h 
+             Kinetics.h GasKinetics.h 
+             FalloffFactory.h  ReactionStoichMgr.h reaction_defs.h 
+             FalloffMgr.h ThirdBodyMgr.h RateCoeffMgr.h ReactionData.h 
+             RxnRates.h Enhanced3BConc.h StoichManager.h solveSP.h InterfaceKinetics.h
+             ImplicitSurfChem.h EdgeKinetics.h Group.h ReactionPath.h)
+
+INSTALL_FILES(/include/cantera/kernel FILES ${KINETICS_H})
diff --git a/Cantera/src/oneD/CMakeLists.txt b/Cantera/src/oneD/CMakeLists.txt
new file mode 100644
index 000000000..0d8fc6a91
--- /dev/null
+++ b/Cantera/src/oneD/CMakeLists.txt
@@ -0,0 +1,17 @@
+SET (ONED_SRCS  MultiJac.cpp MultiNewton.cpp newton_utils.cpp OneDim.cpp
+          StFlow.cpp boundaries1D.cpp refine.cpp Sim1D.cpp Domain1D.cpp )
+
+INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/base)
+INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/thermo)
+INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/numerics)
+INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/kinetics)
+INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/transport)
+
+ADD_LIBRARY(oneD  ${ONED_SRCS} )
+
+SET (ONED_H  Inlet1D.h   MultiJac.h  Sim1D.h     StFlow.h
+          Surf1D.h    Domain1D.h  MultiNewton.h   OneDim.h
+          Resid1D.h   Solid1D.h   refine.h)
+
+INSTALL_FILES(/include/cantera/kernel FILES ${ONED_H})
+
diff --git a/Cantera/src/transport/CMakeLists.txt b/Cantera/src/transport/CMakeLists.txt
new file mode 100644
index 000000000..e20c7273b
--- /dev/null
+++ b/Cantera/src/transport/CMakeLists.txt
@@ -0,0 +1,17 @@
+SET (TRANSPORT_SRCS  TransportFactory.cpp MultiTransport.cpp MixTransport.cpp
+                                      MMCollisionInt.cpp SolidTransport.cpp DustyGasTransport.cpp)
+
+INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/base)
+INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/thermo)
+INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/numerics)
+
+ADD_LIBRARY(transport ${TRANSPORT_SRCS})
+
+TARGET_LINK_LIBRARIES (transport numerics thermo ctbase)
+
+SET (TRANSPORT_H   TransportFactory.h MultiTransport.h MixTransport.h 
+       		       MMCollisionInt.h  SolidTransport.h DustyGasTransport.h 
+           	       TransportBase.h L_matrix.h TransportParams.h )
+INSTALL_FILES(/include/cantera/kernel FILES ${TRANSPORT_H})
+
+
diff --git a/Cantera/src/zeroD/CMakeLists.txt b/Cantera/src/zeroD/CMakeLists.txt
new file mode 100644
index 000000000..46999707c
--- /dev/null
+++ b/Cantera/src/zeroD/CMakeLists.txt
@@ -0,0 +1,15 @@
+SET (ZEROD_SRCS Reactor.cpp ReactorBase.cpp FlowDevice.cpp Wall.cpp ReactorNet.cpp
+      FlowReactor.cpp ConstPressureReactor.cpp ReactorFactory.cpp )
+
+INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/base)
+INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/thermo)
+INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/numerics)
+INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/Cantera/src/kinetics)
+
+ADD_LIBRARY(zeroD  ${ZEROD_SRCS} )
+
+SET (ZEROD_H Reactor.h ReactorBase.h FlowDevice.h Wall.h ReactorNet.h
+          flowControllers.h Reservoir.h FlowReactor.h
+          ConstPressureReactor.h ReactorFactory.h )
+INSTALL_FILES(/include/cantera/kernel FILES ${ZEROD_H})
+