diff --git a/include/GRI30.h b/include/GRI30.h
new file mode 100644
index 000000000..a87945cd0
--- /dev/null
+++ b/include/GRI30.h
@@ -0,0 +1,51 @@
+#ifndef CXX_IDEALGASMIX
+#define CXX_IDEALGASMIX
+
+#include <string>
+
+#include "kernel/IdealGasPhase.h"
+#include "kernel/GRI_30_Kinetics.h"
+#include "kernel/importCTML.h"
+
+namespace Cantera {
+
+    class GRI30 : 
+        public IdealGasPhase, public GRI_30_Kinetics
+    {
+    public:
+        GRI30() : m_ok(false), m_r(0) {
+            string path = findInputFile("gri30.xml");
+            ifstream fin(path.c_str());
+            if (!fin) {
+                throw CanteraError("GRI30","could not open "
+                    +path+" for reading.");
+            }
+            
+            m_r = new XML_Node("-");
+            m_r->build(fin);
+            m_ok = buildSolutionFromXML(*m_r, "gri30_hw", "phase", this, this);
+            if (!m_ok) throw CanteraError("GRI30",
+                "buildSolutionFromXML returned false");
+        }
+
+
+        virtual ~GRI30() {}
+
+        bool operator!() { return !m_ok;}
+        bool ready() { return m_ok; }
+        friend ostream& operator<<(ostream& s, GRI30& mix) {
+            string r = report(mix, true);
+            s << r;
+            return s;
+        }
+
+    protected:
+        bool m_ok;
+        XML_Node* m_r;
+
+    private:
+    };
+}
+
+
+#endif
diff --git a/include/onedim.h b/include/onedim.h
index 2da496a20..242c3013f 100755
--- a/include/onedim.h
+++ b/include/onedim.h
@@ -1,10 +1,10 @@
 #ifndef CT_INCL_ONEDIM_H
 #define CT_INCL_ONEDIM_H
 
-#include "oneD/OneDim.h"
-#include "oneD/Resid1D.h"
-#include "oneD/Inlet1D.h"
-#include "oneD/MultiNewton.h"
-#include "oneD/MultiJac.h"
+#include "kernel/oneD/OneDim.h"
+#include "kernel/oneD/Resid1D.h"
+#include "kernel/oneD/Inlet1D.h"
+#include "kernel/oneD/MultiNewton.h"
+#include "kernel/oneD/MultiJac.h"
 #endif
 
diff --git a/include/reactionpaths.h b/include/reactionpaths.h
new file mode 100644
index 000000000..3450ae2cf
--- /dev/null
+++ b/include/reactionpaths.h
@@ -0,0 +1,6 @@
+#ifndef CT_RXNPATHS_H
+#define CT_RXNPATHS_H
+
+#include "kernel/ReactionPath.h"
+
+#endif
diff --git a/include/transport.h b/include/transport.h
index d12c1f82f..7961a5d9e 100755
--- a/include/transport.h
+++ b/include/transport.h
@@ -1,5 +1,5 @@
 #ifndef CT_TRANSPORT_INCL
 #define CT_TRANSPORT_INCL
 
-#include "kernel/TransportFactory.h"
+#include "kernel/transport/TransportFactory.h"
 #endif
diff --git a/include/zerodim.h b/include/zerodim.h
new file mode 100644
index 000000000..6d9c0a339
--- /dev/null
+++ b/include/zerodim.h
@@ -0,0 +1,9 @@
+#ifndef CT_INCL_ZERODIM_H
+#define CT_INCL_ZERODIM_H
+
+#include "kernel/zeroD/Reactor.h"
+#include "kernel/zeroD/Reservoir.h"
+#include "kernel/zeroD/Wall.h"
+#include "kernel/zeroD/flowControllers.h"
+#endif
+