diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/Makefile.am b/dumux/decoupled/2p/diffusion/fvmpfa/Makefile.am
index f5dc03720c61592c7578324fcba093e7d628fe77..cbfb94edf9fd4331a51be69a74191a9e157fba3b 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/Makefile.am
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = omethod lmethod
+
 fvmpfadir = $(includedir)/dumux/decoupled/2p/diffusion/fvmpfa
 fvmpfa_HEADERS = *.hh
 
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/Makefile.am b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..c1a2de33093d85583978c2f90070eb4108b3cb73
--- /dev/null
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/Makefile.am
@@ -0,0 +1,4 @@
+omethoddir = $(includedir)/dumux/decoupled/2p/diffusion/fvmpfa/omethod
+omethod_HEADERS = *.hh
+
+include $(top_srcdir)/am/global-rules
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh
similarity index 100%
rename from dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p.hh
rename to dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressureproperties2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressurepropertiessimple2p.hh
similarity index 97%
rename from dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressureproperties2p.hh
rename to dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressurepropertiessimple2p.hh
index 5dad0646080753579c97693e68df459126393148..2af45647b9b44f320c404c39b47c40bc8f106bea 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressureproperties2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressurepropertiessimple2p.hh
@@ -44,7 +44,7 @@ NEW_TYPE_TAG(FVMPFAOPressurePropertiesTwoP, INHERITS_FROM(PressureTwoP, MPFAProp
 }
 }
 
-#include <dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh>
+#include <dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaovelocity2p.hh>
 
 namespace Dumux
 {
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaovelocity2p.hh
similarity index 100%
rename from dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh
rename to dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaovelocity2p.hh