diff --git a/Makefile.am b/Makefile.am
index 650b612..3b78173 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
 # we need the module file to be able to build via dunecontrol
 EXTRA_DIST=dune.module
 
-SUBDIRS = m4 dune doc examples
+SUBDIRS = m4 opm doc examples
 
 if BUILD_DOCS
 # TODO: set up documentation tree automatically
diff --git a/configure.ac b/configure.ac
index f35702b..39aadb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ AM_INIT_AUTOMAKE
 #
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-AC_CONFIG_SRCDIR([dune/upscaling/SinglePhaseUpscaler.hpp])
+AC_CONFIG_SRCDIR([opm/upscaling/SinglePhaseUpscaler.hpp])
 AM_CONFIG_HEADER([config.h])
 
 
@@ -36,10 +36,10 @@ AC_CONFIG_FILES([
   doc/Makefile
   doc/doxygen/Makefile
   doc/doxygen/Doxyfile
-  dune/Makefile
-  dune/upscaling/Makefile
-  dune/elasticity/Makefile
-  dune/upscaling/test/Makefile
+  opm/Makefile
+  opm/upscaling/Makefile
+  opm/elasticity/Makefile
+  opm/upscaling/test/Makefile
   opm-upscaling.pc
   examples/Makefile
 ])
diff --git a/examples/Makefile.am b/examples/Makefile.am
index b8205d9..eef7a2f 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -41,7 +41,7 @@ upscale_cond_SOURCES = upscale_cond.cpp
 upscale_elasticity_SOURCES = upscale_elasticity.cpp
 upscale_elasticity_CXXFLAGS = ${OPENMP_CXXFLAGS}
 upscale_elasticity_LDADD = \
-$(top_srcdir)/dune/elasticity/libelasticityupscale.la \
+$(top_srcdir)/opm/elasticity/libelasticityupscale.la \
 $(LDADD)
 
 upscale_perm_SOURCES = upscale_perm.cpp
diff --git a/examples/cpchop.cpp b/examples/cpchop.cpp
index f85aee9..1a7a609 100644
--- a/examples/cpchop.cpp
+++ b/examples/cpchop.cpp
@@ -21,9 +21,9 @@
 #include <opm/core/utility/have_boost_redef.hpp>
 
 #include <opm/core/eclipse/CornerpointChopper.hpp>
-#include <dune/upscaling/SinglePhaseUpscaler.hpp>
+#include <opm/upscaling/SinglePhaseUpscaler.hpp>
 #include <opm/core/utility/MonotCubicInterpolator.hpp>
-#include <dune/porsol/common/setupBoundaryConditions.hpp>
+#include <opm/porsol/common/setupBoundaryConditions.hpp>
 #include <opm/core/utility/Units.hpp>
 
 #include <boost/random/mersenne_twister.hpp>
@@ -222,17 +222,17 @@ int main(int argc, char** argv)
         gen.seed(userseed);
     }
 
-    Dune::SinglePhaseUpscaler::BoundaryConditionType bctype = Dune::SinglePhaseUpscaler::Fixed;
+    Opm::SinglePhaseUpscaler::BoundaryConditionType bctype = Opm::SinglePhaseUpscaler::Fixed;
     bool isFixed, isPeriodic;
     isFixed = isPeriodic = false;
     if (upscale) {
         if (bc == "fixed") {
             isFixed = true;
-            bctype = Dune::SinglePhaseUpscaler::Fixed;
+            bctype = Opm::SinglePhaseUpscaler::Fixed;
         }
         else if (bc == "periodic") {
             isPeriodic = true;
-            bctype = Dune::SinglePhaseUpscaler::Periodic;
+            bctype = Opm::SinglePhaseUpscaler::Periodic;
         }
         else {
             std::cout << "Boundary condition type (bc=" << bc << ") not allowed." << std::endl;
@@ -295,12 +295,12 @@ int main(int argc, char** argv)
             if (upscale) {
                 Opm::EclipseGridParser subparser = ch.subparser();
                 subparser.convertToSI();
-                Dune::SinglePhaseUpscaler upscaler;
+                Opm::SinglePhaseUpscaler upscaler;
                 
                 upscaler.init(subparser, bctype, minpermSI, z_tolerance,
                               residual_tolerance, linsolver_verbosity, linsolver_type, false);
 
-                Dune::SinglePhaseUpscaler::permtensor_t upscaled_K = upscaler.upscaleSinglePhase();
+                Opm::SinglePhaseUpscaler::permtensor_t upscaled_K = upscaler.upscaleSinglePhase();
                 upscaled_K *= (1.0/(Opm::prefix::milli*Opm::unit::darcy));
 
 
@@ -320,7 +320,7 @@ int main(int argc, char** argv)
                 Opm::EclipseGridParser subparser = ch.subparser();
                 std::vector<double>  perms = subparser.getFloatingPointValue("PERMX");
                 subparser.convertToSI();
-                Dune::SinglePhaseUpscaler upscaler;                
+                Opm::SinglePhaseUpscaler upscaler;                
                 upscaler.init(subparser, bctype, minpermSI, z_tolerance,
                               residual_tolerance, linsolver_verbosity, linsolver_type, false);
                 std::vector<int>   satnums = subparser.getIntegerValue("SATNUM");
diff --git a/examples/cpchop_depthtrend.cpp b/examples/cpchop_depthtrend.cpp
index 9399c69..1238350 100644
--- a/examples/cpchop_depthtrend.cpp
+++ b/examples/cpchop_depthtrend.cpp
@@ -22,8 +22,8 @@
 
 
 #include <opm/core/eclipse/CornerpointChopper.hpp>
-#include <dune/upscaling/SinglePhaseUpscaler.hpp>
-#include <dune/porsol/common/setupBoundaryConditions.hpp>
+#include <opm/upscaling/SinglePhaseUpscaler.hpp>
+#include <opm/porsol/common/setupBoundaryConditions.hpp>
 #include <opm/core/utility/Units.hpp>
 
 #include <boost/random/mersenne_twister.hpp>
@@ -156,11 +156,11 @@ int main(int argc, char** argv)
             if (upscale) {
                 Opm::EclipseGridParser subparser = ch.subparser();
                 subparser.convertToSI();
-                Dune::SinglePhaseUpscaler upscaler;
-                upscaler.init(subparser, Dune::SinglePhaseUpscaler::Fixed, minpermSI, z_tolerance,
+                Opm::SinglePhaseUpscaler upscaler;
+                upscaler.init(subparser, Opm::SinglePhaseUpscaler::Fixed, minpermSI, z_tolerance,
                               residual_tolerance, linsolver_verbosity, linsolver_type, false);
                 
-                Dune::SinglePhaseUpscaler::permtensor_t upscaled_K = upscaler.upscaleSinglePhase();
+                Opm::SinglePhaseUpscaler::permtensor_t upscaled_K = upscaler.upscaleSinglePhase();
                 upscaled_K *= (1.0/(Opm::prefix::milli*Opm::unit::darcy));
                 
                 
diff --git a/examples/cpregularize.cpp b/examples/cpregularize.cpp
index de99689..605a731 100644
--- a/examples/cpregularize.cpp
+++ b/examples/cpregularize.cpp
@@ -39,8 +39,8 @@
 #include <opm/core/eclipse/CornerpointChopper.hpp>
 #include <opm/core/eclipse/EclipseGridParser.hpp>
 #include <opm/core/eclipse/EclipseGridInspector.hpp>
-#include <dune/upscaling/SinglePhaseUpscaler.hpp>
-#include <dune/porsol/common/setupBoundaryConditions.hpp>
+#include <opm/upscaling/SinglePhaseUpscaler.hpp>
+#include <opm/porsol/common/setupBoundaryConditions.hpp>
 #include <opm/core/utility/Units.hpp>
 
 #include <ios>
@@ -161,11 +161,11 @@ int main(int argc, char** argv)
 		try {
 		    Opm::EclipseGridParser subparser = ch.subparser();
                     subparser.convertToSI(); // Because the upscaler expects SI units.
-		    Dune::SinglePhaseUpscaler upscaler;
-		    upscaler.init(subparser, Dune::SinglePhaseUpscaler::Fixed, minpermSI, z_tolerance,
+		    Opm::SinglePhaseUpscaler upscaler;
+		    upscaler.init(subparser, Opm::SinglePhaseUpscaler::Fixed, minpermSI, z_tolerance,
 				  residual_tolerance, linsolver_verbosity, linsolver_type, false);
             
-		    Dune::SinglePhaseUpscaler::permtensor_t upscaled_K = upscaler.upscaleSinglePhase();
+		    Opm::SinglePhaseUpscaler::permtensor_t upscaled_K = upscaler.upscaleSinglePhase();
 		    upscaled_K *= (1.0/(Opm::prefix::milli*Opm::unit::darcy));
 		    poro.push_back(upscaler.upscalePorosity());
 		    permx.push_back(upscaled_K(0,0));
diff --git a/examples/exp_variogram.cpp b/examples/exp_variogram.cpp
index 7a36dab..a6d7a9a 100644
--- a/examples/exp_variogram.cpp
+++ b/examples/exp_variogram.cpp
@@ -34,8 +34,8 @@
 #include <opm/core/utility/have_boost_redef.hpp>
 
 #include <opm/core/eclipse/CornerpointChopper.hpp>
-#include <dune/upscaling/SinglePhaseUpscaler.hpp>
-#include <dune/porsol/common/setupBoundaryConditions.hpp>
+#include <opm/upscaling/SinglePhaseUpscaler.hpp>
+#include <opm/porsol/common/setupBoundaryConditions.hpp>
 #include <opm/core/utility/Units.hpp>
 
 #include <boost/random/mersenne_twister.hpp>
@@ -168,10 +168,10 @@ int main(int argc, char** argv)
 	
         Opm::EclipseGridParser subparser_1 = ch.subparser();
         subparser_1.convertToSI();
-        Dune::SinglePhaseUpscaler upscaler_1;
-        upscaler_1.init(subparser_1, Dune::SinglePhaseUpscaler::Fixed, minpermSI, z_tolerance,
+        Opm::SinglePhaseUpscaler upscaler_1;
+        upscaler_1.init(subparser_1, Opm::SinglePhaseUpscaler::Fixed, minpermSI, z_tolerance,
 			residual_tolerance, linsolver_verbosity, linsolver_type, false);
-        Dune::SinglePhaseUpscaler::permtensor_t upscaled_K_1 = upscaler_1.upscaleSinglePhase();
+        Opm::SinglePhaseUpscaler::permtensor_t upscaled_K_1 = upscaler_1.upscaleSinglePhase();
         upscaled_K_1 *= (1.0/(Opm::prefix::milli*Opm::unit::darcy));
 	double porosity_1 = upscaler_1.upscalePorosity();
 
@@ -192,10 +192,10 @@ int main(int argc, char** argv)
 	
         Opm::EclipseGridParser subparser_2 = ch.subparser();
 	subparser_2.convertToSI();
-        Dune::SinglePhaseUpscaler upscaler_2;
-        upscaler_2.init(subparser_2, Dune::SinglePhaseUpscaler::Fixed, minpermSI, z_tolerance,
+        Opm::SinglePhaseUpscaler upscaler_2;
+        upscaler_2.init(subparser_2, Opm::SinglePhaseUpscaler::Fixed, minpermSI, z_tolerance,
 			residual_tolerance, linsolver_verbosity, linsolver_type, false);
-        Dune::SinglePhaseUpscaler::permtensor_t upscaled_K_2 = upscaler_2.upscaleSinglePhase();
+        Opm::SinglePhaseUpscaler::permtensor_t upscaled_K_2 = upscaler_2.upscaleSinglePhase();
         upscaled_K_2 *= (1.0/(Opm::prefix::milli*Opm::unit::darcy));
 	double porosity_2 = upscaler_2.upscalePorosity();
 
diff --git a/examples/grdecldips.cpp b/examples/grdecldips.cpp
index c6f7448..6b8762e 100644
--- a/examples/grdecldips.cpp
+++ b/examples/grdecldips.cpp
@@ -36,8 +36,8 @@
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 
 #include <opm/core/eclipse/CornerpointChopper.hpp>
-#include <dune/upscaling/SinglePhaseUpscaler.hpp>
-#include <dune/porsol/common/setupBoundaryConditions.hpp>
+#include <opm/upscaling/SinglePhaseUpscaler.hpp>
+#include <opm/porsol/common/setupBoundaryConditions.hpp>
 #include <opm/core/utility/Units.hpp>
 
 
diff --git a/examples/upscale_avg.cpp b/examples/upscale_avg.cpp
index 955ae50..9d91661 100644
--- a/examples/upscale_avg.cpp
+++ b/examples/upscale_avg.cpp
@@ -52,9 +52,9 @@
 #include <numeric> // for std::accumulate
 #include <sys/utsname.h>
 
-#include <dune/upscaling/SinglePhaseUpscaler.hpp>
+#include <opm/upscaling/SinglePhaseUpscaler.hpp>
 
-using namespace Dune;
+using namespace Opm;
 using namespace std;
 
 void usage() {
@@ -243,7 +243,7 @@ int main(int varnum, char** vararg) {
         
     }
     const std::vector<int>& ecl_idx = upscaler.grid().globalCell();
-    CpGrid::Codim<0>::LeafIterator c = upscaler.grid().leafbegin<0>();
+    Dune::CpGrid::Codim<0>::LeafIterator c = upscaler.grid().leafbegin<0>();
     for (; c != upscaler.grid().leafend<0>(); ++c) {
       size_t cell_idx = ecl_idx[c->index()];
       
diff --git a/examples/upscale_cap.cpp b/examples/upscale_cap.cpp
index dc9bdc6..2df5728 100644
--- a/examples/upscale_cap.cpp
+++ b/examples/upscale_cap.cpp
@@ -67,9 +67,9 @@
 #include <sys/utsname.h>
 
 #include <opm/core/utility/MonotCubicInterpolator.hpp>
-#include <dune/upscaling/SinglePhaseUpscaler.hpp>
+#include <opm/upscaling/SinglePhaseUpscaler.hpp>
 
-using namespace Dune;
+using namespace Opm;
 using namespace std;
 
 /**
@@ -427,7 +427,7 @@ int main(int varnum, char** vararg)
    double Sworvolume = 0;
 
    const std::vector<int>& ecl_idx = upscaler.grid().globalCell();
-   CpGrid::Codim<0>::LeafIterator c = upscaler.grid().leafbegin<0>();
+   Dune::CpGrid::Codim<0>::LeafIterator c = upscaler.grid().leafbegin<0>();
    for (; c != upscaler.grid().leafend<0>(); ++c) {
        unsigned int cell_idx = ecl_idx[c->index()];
        if (satnums[cell_idx] > 0) { // Satnum zero is "no rock"
diff --git a/examples/upscale_cond.cpp b/examples/upscale_cond.cpp
index e64b4c5..a4dc24f 100644
--- a/examples/upscale_cond.cpp
+++ b/examples/upscale_cond.cpp
@@ -68,9 +68,9 @@
 #endif
 
 #include <opm/core/utility/MonotCubicInterpolator.hpp>
-#include <dune/upscaling/SinglePhaseUpscaler.hpp>
+#include <opm/upscaling/SinglePhaseUpscaler.hpp>
  
-using namespace Dune;
+using namespace Opm;
 using namespace std;
 
 
@@ -529,7 +529,7 @@ int main(int varnum, char** vararg)
    double Swirvolume = 0;
    double Sworvolume = 0;
    const std::vector<int>& ecl_idx = upscaler.grid().globalCell();
-   CpGrid::Codim<0>::LeafIterator c = upscaler.grid().leafbegin<0>();
+   Dune::CpGrid::Codim<0>::LeafIterator c = upscaler.grid().leafbegin<0>();
    for (; c != upscaler.grid().leafend<0>(); ++c) {
        size_t cell_idx = ecl_idx[c->index()];
        if (satnums[cell_idx] > 0) { // Satnum zero is "no rock"
@@ -723,7 +723,7 @@ int main(int varnum, char** vararg)
        }
        
        double waterVolume = 0.0;
-       CpGrid::Codim<0>::LeafIterator c = upscaler.grid().leafbegin<0>();
+       Dune::CpGrid::Codim<0>::LeafIterator c = upscaler.grid().leafbegin<0>();
        for (; c != upscaler.grid().leafend<0>(); ++c) {
            size_t cell_idx = ecl_idx[c->index()];
            //           for (size_t cell_idx = 0; cell_idx < satnums.size(); ++cell_idx) {
@@ -852,7 +852,7 @@ int main(int varnum, char** vararg)
            // capillary pressure:
            waterVolumeLF = 0.0;
 
-           CpGrid::Codim<0>::LeafIterator c = upscaler.grid().leafbegin<0>();
+           Dune::CpGrid::Codim<0>::LeafIterator c = upscaler.grid().leafbegin<0>();
            for (; c != upscaler.grid().leafend<0>(); ++c) {
                size_t cell_idx = ecl_idx[c->index()];
                //               for (size_t cell_idx = 0; cell_idx < satnums.size(); ++cell_idx) {
diff --git a/examples/upscale_elasticity.cpp b/examples/upscale_elasticity.cpp
index b1584e2..b06ceaa 100644
--- a/examples/upscale_elasticity.cpp
+++ b/examples/upscale_elasticity.cpp
@@ -27,8 +27,8 @@
 #include <omp.h>
 #endif
 
-#include <dune/elasticity/elasticity_upscale.hpp>
-#include <dune/elasticity/matrixops.hpp>
+#include <opm/elasticity/elasticity_upscale.hpp>
+#include <opm/elasticity/matrixops.hpp>
 
 
 //! \brief Display the available command line parameters
diff --git a/examples/upscale_perm.cpp b/examples/upscale_perm.cpp
index 6dcbabf..112d37a 100644
--- a/examples/upscale_perm.cpp
+++ b/examples/upscale_perm.cpp
@@ -54,7 +54,7 @@
 #include <ctime>
 #include <sys/utsname.h>
 
-#include <dune/upscaling/SinglePhaseUpscaler.hpp>
+#include <opm/upscaling/SinglePhaseUpscaler.hpp>
 #include <dune/common/mpihelper.hh>
 
 using namespace std;
@@ -177,7 +177,7 @@ int upscale(int varnum, char** vararg) {
     cout << endl;
     
     // Storage for upscaled results:
-    using Dune::SinglePhaseUpscaler;
+    using Opm::SinglePhaseUpscaler;
     typedef SinglePhaseUpscaler::permtensor_t Matrix;
     Matrix Kfixed, Klinear, Kperiodic;
    
diff --git a/examples/upscale_relperm.cpp b/examples/upscale_relperm.cpp
index 8bb9e2e..1e37241 100644
--- a/examples/upscale_relperm.cpp
+++ b/examples/upscale_relperm.cpp
@@ -76,9 +76,9 @@
 #endif
 
 #include <opm/core/utility/MonotCubicInterpolator.hpp>
-#include <dune/upscaling/SinglePhaseUpscaler.hpp>
+#include <opm/upscaling/SinglePhaseUpscaler.hpp>
 
-using namespace Dune;
+using namespace Opm;
 using namespace std;
 
 
@@ -1062,7 +1062,7 @@ int main(int varnum, char** vararg)
    double Sworvolume = 0;
    // cell_idx is the eclipse index.
    const std::vector<int>& ecl_idx = upscaler.grid().globalCell();
-   CpGrid::Codim<0>::LeafIterator c = upscaler.grid().leafbegin<0>();
+   Dune::CpGrid::Codim<0>::LeafIterator c = upscaler.grid().leafbegin<0>();
    for (; c != upscaler.grid().leafend<0>(); ++c) {
        unsigned int cell_idx = ecl_idx[c->index()];
        if (satnums[cell_idx] > 0) { // Satnum zero is "no rock"
diff --git a/examples/upscale_relpermvisc.cpp b/examples/upscale_relpermvisc.cpp
index bc32f21..dba21d2 100644
--- a/examples/upscale_relpermvisc.cpp
+++ b/examples/upscale_relpermvisc.cpp
@@ -86,9 +86,9 @@
 #endif
 
 #include <opm/core/utility/MonotCubicInterpolator.hpp>
-#include <dune/upscaling/SinglePhaseUpscaler.hpp>
+#include <opm/upscaling/SinglePhaseUpscaler.hpp>
 
-using namespace Dune;
+using namespace Opm;
 using namespace std;
 
 /**
@@ -864,7 +864,7 @@ int main(int varnum, char** vararg)
     // Loop through all cells. Add the cells porevolume to the corresponding rock type volume 
     // Also determine bounds for fractional flow ratio 
     const std::vector<int>& ecl_idx = upscaler.grid().globalCell();
-    CpGrid::Codim<0>::LeafIterator c = upscaler.grid().leafbegin<0>();
+    Dune::CpGrid::Codim<0>::LeafIterator c = upscaler.grid().leafbegin<0>();
     for (; c != upscaler.grid().leafend<0>(); ++c) {
         unsigned int cell_idx = ecl_idx[c->index()];
         if (satnums[cell_idx] > 0) { // Satnum zero is "no rock"
diff --git a/examples/upscale_steadystate_implicit.cpp b/examples/upscale_steadystate_implicit.cpp
index 60b616b..07dee55 100644
--- a/examples/upscale_steadystate_implicit.cpp
+++ b/examples/upscale_steadystate_implicit.cpp
@@ -37,14 +37,14 @@
 
 
 //#define VERBOSE
-#include <dune/upscaling/SteadyStateUpscalerImplicit.hpp>
-#include <dune/upscaling/SteadyStateUpscalerManagerImplicit.hpp>
-#include <dune/porsol/euler/EulerUpstreamImplicit.hpp>
-#include <dune/porsol/common/SimulatorTraits.hpp>
+#include <opm/upscaling/SteadyStateUpscalerImplicit.hpp>
+#include <opm/upscaling/SteadyStateUpscalerManagerImplicit.hpp>
+#include <opm/porsol/euler/EulerUpstreamImplicit.hpp>
+#include <opm/porsol/common/SimulatorTraits.hpp>
 #include <opm/core/utility/MonotCubicInterpolator.hpp>
-#include <dune/upscaling/SinglePhaseUpscaler.hpp>
+#include <opm/upscaling/SinglePhaseUpscaler.hpp>
 #include <sys/utsname.h>
-namespace Dune{
+namespace Opm{
 	template <class IsotropyPolicy>
     struct Implicit
     {
@@ -63,7 +63,7 @@ namespace Dune{
     };
 	typedef SimulatorTraits<Isotropic, Implicit> UpscalingTraitsBasicImplicit;
 }
-using namespace Dune;
+using namespace Opm;
 
 void usage()
 {
@@ -196,7 +196,7 @@ int main(int argc, char** argv)
     int linsolver_smooth_steps = param.getDefault("linsolver_smooth_steps", 2);
     double linsolver_prolongate_factor = param.getDefault("linsolver_prolongate_factor", 1.6);
     std::string bc=param.getDefault<std::string>("bc","fixed");
-    double gravity = param.getDefault("gravity", 0);
+    //double gravity = param.getDefault("gravity", 0);
     double surfaceTension = param.getDefault("surfaceTension", 11);
     int num_sats = param.getDefault("num_sats", 10);
     int num_pdrops = param.getDefault("num_pdrops", 10);
@@ -273,8 +273,8 @@ int main(int argc, char** argv)
                   << "the number of rock types in grid(" << num_rock_types_grid << ")." << std::endl;
         usageandexit();
     }
-    Dune::SinglePhaseUpscaler spupscaler; // needed to access porosities and cell volumes
-    spupscaler.init(eclparser, Dune::SinglePhaseUpscaler::Fixed,
+    Opm::SinglePhaseUpscaler spupscaler; // needed to access porosities and cell volumes
+    spupscaler.init(eclparser, Opm::SinglePhaseUpscaler::Fixed,
                     0.0,0.0, linsolver_tolerance, linsolver_verbosity, linsolver_type, false, linsolver_maxit,
                     linsolver_prolongate_factor, linsolver_smooth_steps);
     std::vector<double>  cellPoreVolumes; 
@@ -283,7 +283,7 @@ int main(int argc, char** argv)
     double sworvolume = 0.0;
     // cell_idx is the eclipse index.
     const std::vector<int>& ecl_idx = spupscaler.grid().globalCell();
-    CpGrid::Codim<0>::LeafIterator c = spupscaler.grid().leafbegin<0>();
+    Dune::CpGrid::Codim<0>::LeafIterator c = spupscaler.grid().leafbegin<0>();
     for (; c != spupscaler.grid().leafend<0>(); ++c) {
         unsigned int cell_idx = ecl_idx[c->index()];
         if (satnums[cell_idx] > 0) { // Satnum zero is "no rock"
diff --git a/m4/opm-upscaling.m4 b/m4/opm-upscaling.m4
index e5c260c..e402af2 100644
--- a/m4/opm-upscaling.m4
+++ b/m4/opm-upscaling.m4
@@ -13,6 +13,6 @@ AC_DEFUN([OPM_UPSCALING_CHECKS])
 # not by opm-upscaling itself
 AC_DEFUN([OPM_UPSCALING_CHECK_MODULE],
 [
-  DUNE_CHECK_MODULES([opm-upscaling],
-                     [upscaling/SinglePhaseUpscaler.hpp])
+  OPM_PORSOL_CHECK_MODULES([opm-upscaling],
+                     [opm/upscaling/SinglePhaseUpscaler.hpp])
 ])
diff --git a/dune/Makefile.am b/opm/Makefile.am
similarity index 100%
rename from dune/Makefile.am
rename to opm/Makefile.am
diff --git a/dune/elasticity/Makefile.am b/opm/elasticity/Makefile.am
similarity index 100%
rename from dune/elasticity/Makefile.am
rename to opm/elasticity/Makefile.am
diff --git a/dune/elasticity/applier.hpp b/opm/elasticity/applier.hpp
similarity index 100%
rename from dune/elasticity/applier.hpp
rename to opm/elasticity/applier.hpp
diff --git a/dune/elasticity/asmhandler.hpp b/opm/elasticity/asmhandler.hpp
similarity index 98%
rename from dune/elasticity/asmhandler.hpp
rename to opm/elasticity/asmhandler.hpp
index f34b095..4326074 100644
--- a/dune/elasticity/asmhandler.hpp
+++ b/opm/elasticity/asmhandler.hpp
@@ -16,9 +16,9 @@
 #include <dune/common/fmatrix.hh>
 #include <dune/istl/bvector.hh>
 #include <dune/common/fvector.hh>
-#include <dune/elasticity/logutils.hpp>
-#include <dune/elasticity/mpc.hh>
-#include <dune/elasticity/matrixops.hpp>
+#include <opm/elasticity/logutils.hpp>
+#include <opm/elasticity/mpc.hh>
+#include <opm/elasticity/matrixops.hpp>
 
 #include <iostream>
 
diff --git a/dune/elasticity/asmhandler_impl.hpp b/opm/elasticity/asmhandler_impl.hpp
similarity index 100%
rename from dune/elasticity/asmhandler_impl.hpp
rename to opm/elasticity/asmhandler_impl.hpp
diff --git a/dune/elasticity/boundarygrid.cpp b/opm/elasticity/boundarygrid.cpp
similarity index 100%
rename from dune/elasticity/boundarygrid.cpp
rename to opm/elasticity/boundarygrid.cpp
diff --git a/dune/elasticity/boundarygrid.hh b/opm/elasticity/boundarygrid.hh
similarity index 100%
rename from dune/elasticity/boundarygrid.hh
rename to opm/elasticity/boundarygrid.hh
diff --git a/dune/elasticity/dynmatrixev.cpp b/opm/elasticity/dynmatrixev.cpp
similarity index 99%
rename from dune/elasticity/dynmatrixev.cpp
rename to opm/elasticity/dynmatrixev.cpp
index d5880a9..3d4fe29 100644
--- a/dune/elasticity/dynmatrixev.cpp
+++ b/opm/elasticity/dynmatrixev.cpp
@@ -127,7 +127,7 @@ extern void DGEEV_FORTRAN(const char* jobvl, const char* jobvr, const long
 } // end extern C 
 #endif
 
-namespace Dune {
+namespace Opm {
 
 namespace DynamicMatrixHelp {
 
@@ -148,5 +148,5 @@ void eigenValuesNonsymLapackCall(
 
 } // end namespace FMatrixHelp 
 
-} // end namespace Dune 
+} // end namespace Opm 
 #endif
diff --git a/dune/elasticity/dynmatrixev.hh b/opm/elasticity/dynmatrixev.hh
similarity index 86%
rename from dune/elasticity/dynmatrixev.hh
rename to opm/elasticity/dynmatrixev.hh
index 570c5cc..0a8cd1a 100644
--- a/dune/elasticity/dynmatrixev.hh
+++ b/opm/elasticity/dynmatrixev.hh
@@ -3,7 +3,7 @@
 
 #include <dune/common/dynmatrix.hh>
 
-namespace Dune {
+namespace Opm {
 
 namespace DynamicMatrixHelp {
 
@@ -15,8 +15,8 @@ extern void eigenValuesNonsymLapackCall(
     const long int* lwork, const long int* info);
 
 template <typename K, class C>
-static void eigenValuesNonSym(const DynamicMatrix<K>& matrix,
-                              DynamicVector<C>& eigenValues)
+static void eigenValuesNonSym(const Dune::DynamicMatrix<K>& matrix,
+                              Dune::DynamicVector<C>& eigenValues)
 {
   {
     const long int N = matrix.rows();
@@ -53,7 +53,7 @@ static void eigenValuesNonSym(const DynamicMatrix<K>& matrix,
     if( info != 0 ) 
     {
       std::cerr << "For matrix " << matrix << " eigenvalue calculation failed! " << std::endl;
-      DUNE_THROW(InvalidStateException,"eigenValues: Eigenvalue calculation failed!");
+      DUNE_THROW(Dune::InvalidStateException,"eigenValues: Eigenvalue calculation failed!");
     }
     for (int i=0;i<N;++i)
       eigenValues[i] = std::complex<double>(eigenR[i], eigenI[i]);
diff --git a/dune/elasticity/elasticity.hpp b/opm/elasticity/elasticity.hpp
similarity index 100%
rename from dune/elasticity/elasticity.hpp
rename to opm/elasticity/elasticity.hpp
diff --git a/dune/elasticity/elasticity_impl.hpp b/opm/elasticity/elasticity_impl.hpp
similarity index 100%
rename from dune/elasticity/elasticity_impl.hpp
rename to opm/elasticity/elasticity_impl.hpp
diff --git a/dune/elasticity/elasticity_upscale.hpp b/opm/elasticity/elasticity_upscale.hpp
similarity index 96%
rename from dune/elasticity/elasticity_upscale.hpp
rename to opm/elasticity/elasticity_upscale.hpp
index 98605a1..8f20cc8 100644
--- a/dune/elasticity/elasticity_upscale.hpp
+++ b/opm/elasticity/elasticity_upscale.hpp
@@ -19,21 +19,21 @@
 #include <dune/istl/ilu.hh>
 #include <dune/istl/solvers.hh>
 #include <dune/istl/preconditioners.hh>
-#include <dune/elasticity/seqlu.hpp>
+#include <opm/elasticity/seqlu.hpp>
 #include <dune/grid/CpGrid.hpp>
-#include <dune/elasticity/shapefunctions.hpp>
+#include <opm/elasticity/shapefunctions.hpp>
 
-#include <dune/elasticity/asmhandler.hpp>
-#include <dune/elasticity/boundarygrid.hh>
-#include <dune/elasticity/elasticity.hpp>
-#include <dune/elasticity/logutils.hpp>
-#include <dune/elasticity/materials.hh>
-#include <dune/elasticity/mpc.hh>
-#include <dune/elasticity/mortar_schur.hpp>
-#include <dune/elasticity/mortar_utils.hpp>
-#include <dune/elasticity/mortar_evaluator.hpp>
-#include <dune/elasticity/mortar_schur_precond.hpp>
-#include <dune/elasticity/uzawa_solver.hpp>
+#include <opm/elasticity/asmhandler.hpp>
+#include <opm/elasticity/boundarygrid.hh>
+#include <opm/elasticity/elasticity.hpp>
+#include <opm/elasticity/logutils.hpp>
+#include <opm/elasticity/materials.hh>
+#include <opm/elasticity/mpc.hh>
+#include <opm/elasticity/mortar_schur.hpp>
+#include <opm/elasticity/mortar_utils.hpp>
+#include <opm/elasticity/mortar_evaluator.hpp>
+#include <opm/elasticity/mortar_schur_precond.hpp>
+#include <opm/elasticity/uzawa_solver.hpp>
 
 #include <dune/istl/paamg/amg.hh>
 
diff --git a/dune/elasticity/elasticity_upscale_impl.hpp b/opm/elasticity/elasticity_upscale_impl.hpp
similarity index 100%
rename from dune/elasticity/elasticity_upscale_impl.hpp
rename to opm/elasticity/elasticity_upscale_impl.hpp
diff --git a/dune/elasticity/fmatrixev_ext.cc b/opm/elasticity/fmatrixev_ext.cc
similarity index 99%
rename from dune/elasticity/fmatrixev_ext.cc
rename to opm/elasticity/fmatrixev_ext.cc
index a80c060..f34ceb2 100644
--- a/dune/elasticity/fmatrixev_ext.cc
+++ b/opm/elasticity/fmatrixev_ext.cc
@@ -127,7 +127,7 @@ extern void DGEEV_FORTRAN(const char* jobvl, const char* jobvr, const long
 } // end extern C 
 #endif
 
-namespace Dune {
+namespace Opm {
 
 namespace FMatrixHelp {
 
@@ -148,5 +148,5 @@ void eigenValuesNonsymLapackCall(
 
 } // end namespace FMatrixHelp 
 
-} // end namespace Dune 
+} // end namespace Opm 
 #endif
diff --git a/dune/elasticity/fmatrixev_ext.hh b/opm/elasticity/fmatrixev_ext.hh
similarity index 90%
rename from dune/elasticity/fmatrixev_ext.hh
rename to opm/elasticity/fmatrixev_ext.hh
index bfdebcc..2ded14f 100644
--- a/dune/elasticity/fmatrixev_ext.hh
+++ b/opm/elasticity/fmatrixev_ext.hh
@@ -1,7 +1,7 @@
 #ifndef DUNE_FMATRIXEIGENVALUES_EXT_HH
 #define DUNE_FMATRIXEIGENVALUES_EXT_HH
 
-namespace Dune {
+namespace Opm {
 
 namespace FMatrixHelp {
 
@@ -14,7 +14,7 @@ extern void eigenValuesNonsymLapackCall(
 
 template <int dim, typename K, class C>
 static void eigenValuesNonSym(const FieldMatrix<K, dim, dim>& matrix,
-                              FieldVector<C, dim>& eigenValues)
+                              Dune::FieldVector<C, dim>& eigenValues)
 {
   {
     const long int N = dim ;
@@ -54,7 +54,7 @@ static void eigenValuesNonSym(const FieldMatrix<K, dim, dim>& matrix,
     if( info != 0 ) 
     {
       std::cerr << "For matrix " << matrix << " eigenvalue calculation failed! " << std::endl;
-      DUNE_THROW(InvalidStateException,"eigenValues: Eigenvalue calculation failed!");
+      DUNE_THROW(Dune::InvalidStateException,"eigenValues: Eigenvalue calculation failed!");
     }
     for (int i=0;i<N;++i) {
       eigenValues[i].real = eigenR[i];
diff --git a/dune/elasticity/logutils.hpp b/opm/elasticity/logutils.hpp
similarity index 100%
rename from dune/elasticity/logutils.hpp
rename to opm/elasticity/logutils.hpp
diff --git a/dune/elasticity/material.cpp b/opm/elasticity/material.cpp
similarity index 99%
rename from dune/elasticity/material.cpp
rename to opm/elasticity/material.cpp
index 22e9956..23cde86 100644
--- a/dune/elasticity/material.cpp
+++ b/opm/elasticity/material.cpp
@@ -10,6 +10,7 @@
 //!
 //==============================================================================
 
+#include "config.h"
 #include "material.hh"
 #include "materials.hh"
 #include <fstream>
@@ -133,7 +134,7 @@ Material* Material::create(int ID, const std::string& file)
           E = p1;
           nu = p2;
       } else {
-        std::cerr << "Could not parse rock file " << file << ", bailing" << std::endl
+        std::cerr << "Could not parse rock file " << file << ", bailing" << std::endl;
         exit(1);
       }
 
diff --git a/dune/elasticity/material.hh b/opm/elasticity/material.hh
similarity index 100%
rename from dune/elasticity/material.hh
rename to opm/elasticity/material.hh
diff --git a/dune/elasticity/materials.cpp b/opm/elasticity/materials.cpp
similarity index 99%
rename from dune/elasticity/materials.cpp
rename to opm/elasticity/materials.cpp
index bfd55c0..3c43462 100644
--- a/dune/elasticity/materials.cpp
+++ b/opm/elasticity/materials.cpp
@@ -10,6 +10,7 @@
 //!
 //==============================================================================
 
+#include "config.h"
 #include "materials.hh"
 #include <string.h>
 
diff --git a/dune/elasticity/materials.hh b/opm/elasticity/materials.hh
similarity index 100%
rename from dune/elasticity/materials.hh
rename to opm/elasticity/materials.hh
diff --git a/dune/elasticity/matrixops.hpp b/opm/elasticity/matrixops.hpp
similarity index 100%
rename from dune/elasticity/matrixops.hpp
rename to opm/elasticity/matrixops.hpp
diff --git a/dune/elasticity/matrixops_impl.hpp b/opm/elasticity/matrixops_impl.hpp
similarity index 100%
rename from dune/elasticity/matrixops_impl.hpp
rename to opm/elasticity/matrixops_impl.hpp
diff --git a/dune/elasticity/mortar_evaluator.hpp b/opm/elasticity/mortar_evaluator.hpp
similarity index 96%
rename from dune/elasticity/mortar_evaluator.hpp
rename to opm/elasticity/mortar_evaluator.hpp
index 68c7dd8..73fab09 100644
--- a/dune/elasticity/mortar_evaluator.hpp
+++ b/opm/elasticity/mortar_evaluator.hpp
@@ -13,8 +13,8 @@
 #define MORTAR_EVALUATOR_HPP_
 
 #include <dune/istl/matrixmatrix.hh>
-#include <dune/elasticity/matrixops.hpp>
-#include <dune/elasticity/mortar_utils.hpp>
+#include <opm/elasticity/matrixops.hpp>
+#include <opm/elasticity/mortar_utils.hpp>
 
 namespace Opm {
 namespace Elasticity {
diff --git a/dune/elasticity/mortar_schur.hpp b/opm/elasticity/mortar_schur.hpp
similarity index 96%
rename from dune/elasticity/mortar_schur.hpp
rename to opm/elasticity/mortar_schur.hpp
index 7093873..d11366b 100644
--- a/dune/elasticity/mortar_schur.hpp
+++ b/opm/elasticity/mortar_schur.hpp
@@ -13,8 +13,8 @@
 #define MORTAR_SCHUR_HPP_
 
 #include <dune/istl/matrixmatrix.hh>
-#include <dune/elasticity/applier.hpp>
-#include <dune/elasticity/matrixops.hpp>
+#include <opm/elasticity/applier.hpp>
+#include <opm/elasticity/matrixops.hpp>
 
 namespace Opm {
 namespace Elasticity {
diff --git a/dune/elasticity/mortar_schur_precond.hpp b/opm/elasticity/mortar_schur_precond.hpp
similarity index 97%
rename from dune/elasticity/mortar_schur_precond.hpp
rename to opm/elasticity/mortar_schur_precond.hpp
index 9dfe7a7..19756d0 100644
--- a/dune/elasticity/mortar_schur_precond.hpp
+++ b/opm/elasticity/mortar_schur_precond.hpp
@@ -14,8 +14,8 @@
 
 #include <dune/istl/preconditioners.hh>
 #include <dune/istl/matrixmatrix.hh>
-#include <dune/elasticity/matrixops.hpp>
-#include <dune/elasticity/mortar_utils.hpp>
+#include <opm/elasticity/matrixops.hpp>
+#include <opm/elasticity/mortar_utils.hpp>
 
 namespace Opm {
 namespace Elasticity {
diff --git a/dune/elasticity/mortar_utils.hpp b/opm/elasticity/mortar_utils.hpp
similarity index 100%
rename from dune/elasticity/mortar_utils.hpp
rename to opm/elasticity/mortar_utils.hpp
diff --git a/dune/elasticity/mpc.cpp b/opm/elasticity/mpc.cpp
similarity index 100%
rename from dune/elasticity/mpc.cpp
rename to opm/elasticity/mpc.cpp
diff --git a/dune/elasticity/mpc.hh b/opm/elasticity/mpc.hh
similarity index 100%
rename from dune/elasticity/mpc.hh
rename to opm/elasticity/mpc.hh
diff --git a/dune/elasticity/seqlu.hpp b/opm/elasticity/seqlu.hpp
similarity index 100%
rename from dune/elasticity/seqlu.hpp
rename to opm/elasticity/seqlu.hpp
diff --git a/dune/elasticity/shapefunctions.hpp b/opm/elasticity/shapefunctions.hpp
similarity index 99%
rename from dune/elasticity/shapefunctions.hpp
rename to opm/elasticity/shapefunctions.hpp
index eef6723..58b02f7 100644
--- a/dune/elasticity/shapefunctions.hpp
+++ b/opm/elasticity/shapefunctions.hpp
@@ -368,7 +368,7 @@ protected:
       A[n-1][n-2] = (n-1.0)/(2.0*n-1.0);
 
       Dune::DynamicVector<std::complex<double> > eigenValues(n);
-      Dune::DynamicMatrixHelp::eigenValuesNonSym(A, eigenValues);
+      Opm::DynamicMatrixHelp::eigenValuesNonSym(A, eigenValues);
 
       std::vector<double> result(n);
       for (int i=0; i < n; ++i)
diff --git a/dune/elasticity/uzawa_solver.hpp b/opm/elasticity/uzawa_solver.hpp
similarity index 100%
rename from dune/elasticity/uzawa_solver.hpp
rename to opm/elasticity/uzawa_solver.hpp
diff --git a/dune/upscaling/Makefile.am b/opm/upscaling/Makefile.am
similarity index 85%
rename from dune/upscaling/Makefile.am
rename to opm/upscaling/Makefile.am
index 92b4811..f87d28b 100644
--- a/dune/upscaling/Makefile.am
+++ b/opm/upscaling/Makefile.am
@@ -3,7 +3,7 @@
 
 SUBDIRS = test
 
-upscalingdir = $(includedir)/dune/upscaling
+upscalingdir = $(includedir)/opm/upscaling
 upscaling_HEADERS = SinglePhaseUpscaler.hpp \
                     SteadyStateUpscaler.hpp SteadyStateUpscaler_impl.hpp
 
diff --git a/dune/upscaling/SinglePhaseUpscaler.hpp b/opm/upscaling/SinglePhaseUpscaler.hpp
similarity index 84%
rename from dune/upscaling/SinglePhaseUpscaler.hpp
rename to opm/upscaling/SinglePhaseUpscaler.hpp
index 8e3f9a8..6189042 100644
--- a/dune/upscaling/SinglePhaseUpscaler.hpp
+++ b/opm/upscaling/SinglePhaseUpscaler.hpp
@@ -33,14 +33,14 @@
   along with OpenRS.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef OPENRS_SINGLEPHASEUPSCALER_HEADER
-#define OPENRS_SINGLEPHASEUPSCALER_HEADER
+#ifndef OPM_SINGLEPHASEUPSCALER_HEADER
+#define OPM_SINGLEPHASEUPSCALER_HEADER
 
-#include <dune/upscaling/UpscalingTraits.hpp>
-#include <dune/upscaling/UpscalerBase.hpp>
+#include <opm/upscaling/UpscalingTraits.hpp>
+#include <opm/upscaling/UpscalerBase.hpp>
 
 
-namespace Dune
+namespace Opm
 {
 
     /**
@@ -52,7 +52,7 @@ namespace Dune
     };
 
 
-} // namespace Dune
+} // namespace Opm
 
 
-#endif // OPENRS_SINGLEPHASEUPSCALER_HEADER
+#endif // OPM_SINGLEPHASEUPSCALER_HEADER
diff --git a/dune/upscaling/SteadyStateUpscaler.hpp b/opm/upscaling/SteadyStateUpscaler.hpp
similarity index 93%
rename from dune/upscaling/SteadyStateUpscaler.hpp
rename to opm/upscaling/SteadyStateUpscaler.hpp
index d2342bb..398d787 100644
--- a/dune/upscaling/SteadyStateUpscaler.hpp
+++ b/opm/upscaling/SteadyStateUpscaler.hpp
@@ -33,15 +33,15 @@
   along with OpenRS.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef OPENRS_STEADYSTATEUPSCALER_HEADER
-#define OPENRS_STEADYSTATEUPSCALER_HEADER
+#ifndef OPM_STEADYSTATEUPSCALER_HEADER
+#define OPM_STEADYSTATEUPSCALER_HEADER
 
-#include <dune/upscaling/UpscalerBase.hpp>
-#include <dune/porsol/euler/EulerUpstream.hpp>
-#include <dune/porsol/euler/ImplicitCapillarity.hpp>
+#include <opm/upscaling/UpscalerBase.hpp>
+#include <opm/porsol/euler/EulerUpstream.hpp>
+#include <opm/porsol/euler/ImplicitCapillarity.hpp>
 #include <boost/array.hpp>
 
-namespace Dune
+namespace Opm
 {
     /**
        @brief A class for doing steady state upscaling.
@@ -117,9 +117,9 @@ namespace Dune
 	TransportSolver transport_solver_;
     };
 
-} // namespace Dune
+} // namespace Opm
 
 #include "SteadyStateUpscaler_impl.hpp"
 
 
-#endif // OPENRS_STEADYSTATEUPSCALER_HEADER
+#endif // OPM_STEADYSTATEUPSCALER_HEADER
diff --git a/dune/upscaling/SteadyStateUpscalerImplicit.hpp b/opm/upscaling/SteadyStateUpscalerImplicit.hpp
similarity index 94%
rename from dune/upscaling/SteadyStateUpscalerImplicit.hpp
rename to opm/upscaling/SteadyStateUpscalerImplicit.hpp
index cce128b..af6d9e2 100644
--- a/dune/upscaling/SteadyStateUpscalerImplicit.hpp
+++ b/opm/upscaling/SteadyStateUpscalerImplicit.hpp
@@ -33,16 +33,16 @@
   along with OpenRS.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef OPENRS_STEADYSTATEUPSCALERIMPLICIT_HEADER
-#define OPENRS_STEADYSTATEUPSCALERIMPLICIT_HEADER
+#ifndef OPM_STEADYSTATEUPSCALERIMPLICIT_HEADER
+#define OPM_STEADYSTATEUPSCALERIMPLICIT_HEADER
 
-#include <dune/upscaling/UpscalerBase.hpp>
-#include <dune/porsol/euler/EulerUpstream.hpp>
-#include <dune/porsol/euler/ImplicitCapillarity.hpp>
+#include <opm/upscaling/UpscalerBase.hpp>
+#include <opm/porsol/euler/EulerUpstream.hpp>
+#include <opm/porsol/euler/ImplicitCapillarity.hpp>
 #include <opm/core/GridAdapter.hpp>
 #include <boost/array.hpp>
 
-namespace Dune
+namespace Opm
 {
     /**
        @brief A class for doing steady state upscaling.
@@ -130,9 +130,9 @@ namespace Dune
         GridAdapter grid_adapter_;
     };
 
-} // namespace Dune
+} // namespace Opm
 
 #include "SteadyStateUpscalerImplicit_impl.hpp"
 
 
-#endif // OPENRS_STEADYSTATEUPSCALERIMPLICIT_HEADER
+#endif // OPM_STEADYSTATEUPSCALERIMPLICIT_HEADER
diff --git a/dune/upscaling/SteadyStateUpscalerImplicit_impl.hpp b/opm/upscaling/SteadyStateUpscalerImplicit_impl.hpp
similarity index 97%
rename from dune/upscaling/SteadyStateUpscalerImplicit_impl.hpp
rename to opm/upscaling/SteadyStateUpscalerImplicit_impl.hpp
index 10e01d8..968cb4d 100644
--- a/dune/upscaling/SteadyStateUpscalerImplicit_impl.hpp
+++ b/opm/upscaling/SteadyStateUpscalerImplicit_impl.hpp
@@ -33,21 +33,21 @@
   along with OpenRS.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef OPENRS_STEADYSTATEUPSCALERIMPLICIT_IMPL_HEADER
-#define OPENRS_STEADYSTATEUPSCALERIMPLICIT_IMPL_HEADER
+#ifndef OPM_STEADYSTATEUPSCALERIMPLICIT_IMPL_HEADER
+#define OPM_STEADYSTATEUPSCALERIMPLICIT_IMPL_HEADER
 
 
 #include <boost/lexical_cast.hpp>
-#include <dune/porsol/common/MatrixInverse.hpp>
-#include <dune/porsol/common/SimulatorUtilities.hpp>
-#include <dune/porsol/common/ReservoirPropertyFixedMobility.hpp>
-#include <dune/porsol/euler/MatchSaturatedVolumeFunctor.hpp>
+#include <opm/porsol/common/MatrixInverse.hpp>
+#include <opm/porsol/common/SimulatorUtilities.hpp>
+#include <opm/porsol/common/ReservoirPropertyFixedMobility.hpp>
+#include <opm/porsol/euler/MatchSaturatedVolumeFunctor.hpp>
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/utility/writeECLData.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <algorithm>
 
-namespace Dune
+namespace Opm
 {
 
 
@@ -156,7 +156,7 @@ namespace Dune
         std::vector<double> src(num_cells, 0.0);
 	Opm::SparseVector<double> injection(num_cells);
         // Gravity.
-        FieldVector<double, 3> gravity(0.0);
+        Dune::FieldVector<double, 3> gravity(0.0);
         if (use_gravity_) {
             gravity[2] = Opm::unit::gravity;
         }
@@ -457,7 +457,7 @@ namespace Dune
 
 
 
-} // namespace Dune
+} // namespace Opm
 
 
-#endif // OPENRS_STEADYSTATEUPSCALERIMPLICIT_IMPL_HEADER
+#endif // OPM_STEADYSTATEUPSCALERIMPLICIT_IMPL_HEADER
diff --git a/dune/upscaling/SteadyStateUpscalerManager.hpp b/opm/upscaling/SteadyStateUpscalerManager.hpp
similarity index 97%
rename from dune/upscaling/SteadyStateUpscalerManager.hpp
rename to opm/upscaling/SteadyStateUpscalerManager.hpp
index 4816476..60525bb 100644
--- a/dune/upscaling/SteadyStateUpscalerManager.hpp
+++ b/opm/upscaling/SteadyStateUpscalerManager.hpp
@@ -33,12 +33,12 @@
   along with OpenRS.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef OPENRS_STEADYSTATEUPSCALERMANAGER_HEADER
-#define OPENRS_STEADYSTATEUPSCALERMANAGER_HEADER
+#ifndef OPM_STEADYSTATEUPSCALERMANAGER_HEADER
+#define OPM_STEADYSTATEUPSCALERMANAGER_HEADER
 
 
-#include <dune/upscaling/SteadyStateUpscaler.hpp>
-#include <dune/upscaling/UpscalingTraits.hpp>
+#include <opm/upscaling/SteadyStateUpscaler.hpp>
+#include <opm/upscaling/UpscalingTraits.hpp>
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/utility/SparseTable.hpp>
 #include <cmath>
@@ -46,7 +46,7 @@
 #include <iostream>
 
 
-namespace Dune
+namespace Opm
 {
 
 
@@ -245,6 +245,6 @@ namespace Dune
 
 
 
-} // namespace Dune
+} // namespace Opm
 
-#endif // OPENRS_STEADYSTATEUPSCALERMANAGER_HEADER
+#endif // OPM_STEADYSTATEUPSCALERMANAGER_HEADER
diff --git a/dune/upscaling/SteadyStateUpscalerManagerImplicit.hpp b/opm/upscaling/SteadyStateUpscalerManagerImplicit.hpp
similarity index 97%
rename from dune/upscaling/SteadyStateUpscalerManagerImplicit.hpp
rename to opm/upscaling/SteadyStateUpscalerManagerImplicit.hpp
index d27de1a..c014f22 100644
--- a/dune/upscaling/SteadyStateUpscalerManagerImplicit.hpp
+++ b/opm/upscaling/SteadyStateUpscalerManagerImplicit.hpp
@@ -33,12 +33,12 @@
   along with OpenRS.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef OPENRS_STEADYSTATEUPSCALERMANAGERIMPLICIT_HEADER
-#define OPENRS_STEADYSTATEUPSCALERMANAGERIMPLICIT_HEADER
+#ifndef OPM_STEADYSTATEUPSCALERMANAGERIMPLICIT_HEADER
+#define OPM_STEADYSTATEUPSCALERMANAGERIMPLICIT_HEADER
 
 
-#include <dune/upscaling/SteadyStateUpscalerImplicit.hpp>
-#include <dune/upscaling/UpscalingTraits.hpp>
+#include <opm/upscaling/SteadyStateUpscalerImplicit.hpp>
+#include <opm/upscaling/UpscalingTraits.hpp>
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/utility/SparseTable.hpp>
 #include <cmath>
@@ -46,7 +46,7 @@
 #include <iostream>
 
 
-namespace Dune
+namespace Opm
 {
 
 
@@ -279,6 +279,6 @@ namespace Dune
 
 
 
-} // namespace Dune
+} // namespace Opm
 
-#endif // OPENRS_STEADYSTATEUPSCALERMANAGER_HEADER
+#endif // OPM_STEADYSTATEUPSCALERMANAGER_HEADER
diff --git a/dune/upscaling/SteadyStateUpscaler_impl.hpp b/opm/upscaling/SteadyStateUpscaler_impl.hpp
similarity index 97%
rename from dune/upscaling/SteadyStateUpscaler_impl.hpp
rename to opm/upscaling/SteadyStateUpscaler_impl.hpp
index 1dc9b4e..8189ccf 100644
--- a/dune/upscaling/SteadyStateUpscaler_impl.hpp
+++ b/opm/upscaling/SteadyStateUpscaler_impl.hpp
@@ -33,18 +33,18 @@
   along with OpenRS.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef OPENRS_STEADYSTATEUPSCALER_IMPL_HEADER
-#define OPENRS_STEADYSTATEUPSCALER_IMPL_HEADER
+#ifndef OPM_STEADYSTATEUPSCALER_IMPL_HEADER
+#define OPM_STEADYSTATEUPSCALER_IMPL_HEADER
 
 
 #include <boost/lexical_cast.hpp>
-#include <dune/porsol/common/MatrixInverse.hpp>
-#include <dune/porsol/common/SimulatorUtilities.hpp>
-#include <dune/porsol/common/ReservoirPropertyFixedMobility.hpp>
+#include <opm/porsol/common/MatrixInverse.hpp>
+#include <opm/porsol/common/SimulatorUtilities.hpp>
+#include <opm/porsol/common/ReservoirPropertyFixedMobility.hpp>
 #include <opm/core/utility/Units.hpp>
 #include <algorithm>
 
-namespace Dune
+namespace Opm
 {
 
 
@@ -142,7 +142,7 @@ namespace Dune
 	std::vector<double> src(num_cells, 0.0);
 	Opm::SparseVector<double> injection(num_cells);
 	// Gravity.
-	FieldVector<double, 3> gravity(0.0);
+	Dune::FieldVector<double, 3> gravity(0.0);
         if (use_gravity_) {
             gravity[2] = Opm::unit::gravity;
         }
@@ -384,7 +384,7 @@ namespace Dune
 
 
 
-} // namespace Dune
+} // namespace Opm
 
 
-#endif // OPENRS_STEADYSTATEUPSCALER_IMPL_HEADER
+#endif // OPM_STEADYSTATEUPSCALER_IMPL_HEADER
diff --git a/dune/upscaling/UpscalerBase.hpp b/opm/upscaling/UpscalerBase.hpp
similarity index 94%
rename from dune/upscaling/UpscalerBase.hpp
rename to opm/upscaling/UpscalerBase.hpp
index 1d58319..d770644 100644
--- a/dune/upscaling/UpscalerBase.hpp
+++ b/opm/upscaling/UpscalerBase.hpp
@@ -32,17 +32,17 @@
   along with OpenRS.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef OPENRS_UPSCALERBASE_HEADER
-#define OPENRS_UPSCALERBASE_HEADER
+#ifndef OPM_UPSCALERBASE_HEADER
+#define OPM_UPSCALERBASE_HEADER
 
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <dune/grid/CpGrid.hpp>
 #include <opm/core/eclipse/EclipseGridParser.hpp>
-#include <dune/porsol/common/GridInterfaceEuler.hpp>
-#include <dune/porsol/common/BoundaryConditions.hpp>
+#include <opm/porsol/common/GridInterfaceEuler.hpp>
+#include <opm/porsol/common/BoundaryConditions.hpp>
 
 
-namespace Dune
+namespace Opm
 {
     /**
        @brief A base class for upscaling.
@@ -54,7 +54,7 @@ namespace Dune
     protected:
     public:
 	// ------- Typedefs  -------
-	typedef CpGrid GridType;
+	typedef Dune::CpGrid GridType;
  	enum { Dimension = GridType::dimension };
 	typedef GridInterfaceEuler<GridType> GridInterface;
     typedef typename Traits::template ResProp<Dimension>::Type ResProp;
@@ -146,11 +146,11 @@ namespace Dune
 	FlowSolver flow_solver_;
     };
 
-} // namespace Dune
+} // namespace Opm
 
 #include "UpscalerBase_impl.hpp"
 
 
 
 
-#endif // OPENRS_UPSCALERBASE_HEADER
+#endif // OPM_UPSCALERBASE_HEADER
diff --git a/dune/upscaling/UpscalerBase_impl.hpp b/opm/upscaling/UpscalerBase_impl.hpp
similarity index 97%
rename from dune/upscaling/UpscalerBase_impl.hpp
rename to opm/upscaling/UpscalerBase_impl.hpp
index b52a94d..d4a4ebe 100644
--- a/dune/upscaling/UpscalerBase_impl.hpp
+++ b/opm/upscaling/UpscalerBase_impl.hpp
@@ -32,14 +32,14 @@
   along with OpenRS.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef OPENRS_UPSCALERBASE_IMPL_HEADER
-#define OPENRS_UPSCALERBASE_IMPL_HEADER
+#ifndef OPM_UPSCALERBASE_IMPL_HEADER
+#define OPM_UPSCALERBASE_IMPL_HEADER
 
-#include <dune/porsol/common/setupGridAndProps.hpp>
-#include <dune/porsol/common/setupBoundaryConditions.hpp>
-#include <dune/porsol/common/ReservoirPropertyTracerFluid.hpp>
+#include <opm/porsol/common/setupGridAndProps.hpp>
+#include <opm/porsol/common/setupBoundaryConditions.hpp>
+#include <opm/porsol/common/ReservoirPropertyTracerFluid.hpp>
 
-namespace Dune
+namespace Opm
 {
 
     template <class Traits>
@@ -227,7 +227,7 @@ namespace Dune
 	// Just water.
 	std::vector<double> sat(num_cells, 1.0);
 	// Gravity.
-	FieldVector<double, 3> gravity(0.0);
+	Dune::FieldVector<double, 3> gravity(0.0);
 	// gravity[2] = -Dune::unit::gravity;
 
 	permtensor_t upscaled_K(3, 3, (double*)0);
@@ -383,8 +383,8 @@ namespace Dune
 
 
 
-} // namespace Dune
+} // namespace Opm
 
 
 
-#endif // OPENRS_UPSCALERBASE_IMPL_HEADER
+#endif // OPM_UPSCALERBASE_IMPL_HEADER
diff --git a/dune/upscaling/UpscalingTraits.hpp b/opm/upscaling/UpscalingTraits.hpp
similarity index 86%
rename from dune/upscaling/UpscalingTraits.hpp
rename to opm/upscaling/UpscalingTraits.hpp
index e9249fe..bf1a8bd 100644
--- a/dune/upscaling/UpscalingTraits.hpp
+++ b/opm/upscaling/UpscalingTraits.hpp
@@ -32,18 +32,18 @@
   along with OpenRS.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef OPENRS_UPSCALINGTRAITS_HEADER
-#define OPENRS_UPSCALINGTRAITS_HEADER
+#ifndef OPM_UPSCALINGTRAITS_HEADER
+#define OPM_UPSCALINGTRAITS_HEADER
 
-#include <dune/porsol/common/SimulatorTraits.hpp>
+#include <opm/porsol/common/SimulatorTraits.hpp>
 
-namespace Dune
+namespace Opm
 {
     typedef SimulatorTraits<Isotropic, Explicit> UpscalingTraitsBasic;
     //typedef SimulatorTraits<Isotropic, Implicit> UpscalingTraitsBasicImplicit;
     typedef SimulatorTraits<Anisotropic, Explicit> UpscalingTraitsAnisoRelperm;
 
-} // namespace Dune
+} // namespace Opm
 
 
-#endif // OPENRS_UPSCALINGTRAITS_HEADER
+#endif // OPM_UPSCALINGTRAITS_HEADER
diff --git a/dune/upscaling/periodic_testresults.txt b/opm/upscaling/periodic_testresults.txt
similarity index 100%
rename from dune/upscaling/periodic_testresults.txt
rename to opm/upscaling/periodic_testresults.txt
diff --git a/dune/upscaling/solver_tests.txt b/opm/upscaling/solver_tests.txt
similarity index 100%
rename from dune/upscaling/solver_tests.txt
rename to opm/upscaling/solver_tests.txt
diff --git a/dune/upscaling/test/Makefile.am b/opm/upscaling/test/Makefile.am
similarity index 100%
rename from dune/upscaling/test/Makefile.am
rename to opm/upscaling/test/Makefile.am
diff --git a/dune/upscaling/test/aniso_implicit_steadystate_test.cpp b/opm/upscaling/test/aniso_implicit_steadystate_test.cpp
similarity index 92%
rename from dune/upscaling/test/aniso_implicit_steadystate_test.cpp
rename to opm/upscaling/test/aniso_implicit_steadystate_test.cpp
index f83ee29..afb492b 100644
--- a/dune/upscaling/test/aniso_implicit_steadystate_test.cpp
+++ b/opm/upscaling/test/aniso_implicit_steadystate_test.cpp
@@ -38,10 +38,10 @@
 
 #define VERBOSE
 
-#include <dune/upscaling/SteadyStateUpscalerManager.hpp>
-#include <dune/upscaling/UpscalingTraits.hpp>
+#include <opm/upscaling/SteadyStateUpscalerManager.hpp>
+#include <opm/upscaling/UpscalingTraits.hpp>
 
-using namespace Dune;
+using namespace Opm;
 
 int main(int argc, char** argv)
 {
diff --git a/dune/upscaling/test/aniso_steadystate_test.cpp b/opm/upscaling/test/aniso_steadystate_test.cpp
similarity index 92%
rename from dune/upscaling/test/aniso_steadystate_test.cpp
rename to opm/upscaling/test/aniso_steadystate_test.cpp
index 92944cd..0b28681 100644
--- a/dune/upscaling/test/aniso_steadystate_test.cpp
+++ b/opm/upscaling/test/aniso_steadystate_test.cpp
@@ -38,10 +38,10 @@
 
 //#define VERBOSE
 
-#include <dune/upscaling/SteadyStateUpscalerManager.hpp>
-#include <dune/upscaling/UpscalingTraits.hpp>
+#include <opm/upscaling/SteadyStateUpscalerManager.hpp>
+#include <opm/upscaling/UpscalingTraits.hpp>
 
-using namespace Dune;
+using namespace Opm;
 
 int main(int argc, char** argv)
 {
diff --git a/dune/upscaling/test/implicit_steadystate_test.cpp b/opm/upscaling/test/implicit_steadystate_test.cpp
similarity index 92%
rename from dune/upscaling/test/implicit_steadystate_test.cpp
rename to opm/upscaling/test/implicit_steadystate_test.cpp
index fc62f6f..f4e3c03 100644
--- a/dune/upscaling/test/implicit_steadystate_test.cpp
+++ b/opm/upscaling/test/implicit_steadystate_test.cpp
@@ -38,10 +38,10 @@
 
 #define VERBOSE
 
-#include <dune/upscaling/SteadyStateUpscalerManager.hpp>
-#include <dune/upscaling/UpscalingTraits.hpp>
+#include <opm/upscaling/SteadyStateUpscalerManager.hpp>
+#include <opm/upscaling/UpscalingTraits.hpp>
 
-using namespace Dune;
+using namespace Opm;
 
 int main(int argc, char** argv)
 {
diff --git a/dune/upscaling/test/opmpressure_test.cpp b/opm/upscaling/test/opmpressure_test.cpp
similarity index 92%
rename from dune/upscaling/test/opmpressure_test.cpp
rename to opm/upscaling/test/opmpressure_test.cpp
index c185c08..75d8196 100644
--- a/dune/upscaling/test/opmpressure_test.cpp
+++ b/opm/upscaling/test/opmpressure_test.cpp
@@ -25,12 +25,12 @@
 
 #include <opm/core/utility/have_boost_redef.hpp>
 
-#include <dune/upscaling/UpscalerBase.hpp>
+#include <opm/upscaling/UpscalerBase.hpp>
 #include <opm/core/utility/Units.hpp>
-#include <dune/porsol/common/SimulatorTraits.hpp>
-#include <dune/porsol/mimetic/IfshInterface.hpp>
+#include <opm/porsol/common/SimulatorTraits.hpp>
+#include <opm/porsol/mimetic/IfshInterface.hpp>
 
-using namespace Dune;
+using namespace Opm;
 using namespace Opm::prefix;
 using namespace Opm::unit;
 
diff --git a/dune/upscaling/test/steadystate_test_explicit.cpp b/opm/upscaling/test/steadystate_test_explicit.cpp
similarity index 92%
rename from dune/upscaling/test/steadystate_test_explicit.cpp
rename to opm/upscaling/test/steadystate_test_explicit.cpp
index f936997..aabc496 100644
--- a/dune/upscaling/test/steadystate_test_explicit.cpp
+++ b/opm/upscaling/test/steadystate_test_explicit.cpp
@@ -39,10 +39,10 @@
 
 //#define VERBOSE
 
-#include <dune/upscaling/SteadyStateUpscalerManager.hpp>
-#include <dune/upscaling/UpscalingTraits.hpp>
+#include <opm/upscaling/SteadyStateUpscalerManager.hpp>
+#include <opm/upscaling/UpscalingTraits.hpp>
 
-using namespace Dune;
+using namespace Opm;
 
 int main(int argc, char** argv)
 {
diff --git a/dune/upscaling/test/steadystate_test_implicit.cpp b/opm/upscaling/test/steadystate_test_implicit.cpp
similarity index 87%
rename from dune/upscaling/test/steadystate_test_implicit.cpp
rename to opm/upscaling/test/steadystate_test_implicit.cpp
index a61058d..90963eb 100644
--- a/dune/upscaling/test/steadystate_test_implicit.cpp
+++ b/opm/upscaling/test/steadystate_test_implicit.cpp
@@ -38,12 +38,12 @@
 
 
 //#define VERBOSE
-#include <dune/upscaling/SteadyStateUpscalerImplicit.hpp>
-#include <dune/upscaling/SteadyStateUpscalerManagerImplicit.hpp>
-//#include <dune/upscaling/UpscalingTraits.hpp>
-#include <dune/porsol/euler/EulerUpstreamImplicit.hpp>
-#include <dune/porsol/common/SimulatorTraits.hpp>
-namespace Dune{
+#include <opm/upscaling/SteadyStateUpscalerImplicit.hpp>
+#include <opm/upscaling/SteadyStateUpscalerManagerImplicit.hpp>
+//#include <opm/upscaling/UpscalingTraits.hpp>
+#include <opm/porsol/euler/EulerUpstreamImplicit.hpp>
+#include <opm/porsol/common/SimulatorTraits.hpp>
+namespace Opm{
 	template <class IsotropyPolicy>
     struct Implicit
     {
@@ -62,7 +62,7 @@ namespace Dune{
     };
 	typedef SimulatorTraits<Isotropic, Implicit> UpscalingTraitsBasicImplicit;
 }
-using namespace Dune;
+using namespace Opm;
 
 int main(int argc, char** argv)
 {
diff --git a/dune/upscaling/test/upscaling_test.cpp b/opm/upscaling/test/upscaling_test.cpp
similarity index 96%
rename from dune/upscaling/test/upscaling_test.cpp
rename to opm/upscaling/test/upscaling_test.cpp
index 8938cbf..67aab10 100644
--- a/dune/upscaling/test/upscaling_test.cpp
+++ b/opm/upscaling/test/upscaling_test.cpp
@@ -39,10 +39,10 @@
 
 #include <opm/core/utility/have_boost_redef.hpp>
 
-#include <dune/upscaling/SinglePhaseUpscaler.hpp>
+#include <opm/upscaling/SinglePhaseUpscaler.hpp>
 #include <opm/core/utility/Units.hpp>
 
-using namespace Dune;
+using namespace Opm;
 using namespace Opm::prefix;
 using namespace Opm::unit;
 
diff --git a/dune/upscaling/testresults.txt b/opm/upscaling/testresults.txt
similarity index 100%
rename from dune/upscaling/testresults.txt
rename to opm/upscaling/testresults.txt
diff --git a/dune/upscaling/upscaling.hh b/opm/upscaling/upscaling.hh
similarity index 100%
rename from dune/upscaling/upscaling.hh
rename to opm/upscaling/upscaling.hh