diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index f6d0b5ea..00000000
--- a/Makefile.am
+++ /dev/null
@@ -1,335 +0,0 @@
-# Additional aclocal(1) macros located here.
-ACLOCAL_AMFLAGS = -I m4
-
-# Recurse to build examples after libraries
-SUBDIRS = . tests examples tutorials
-
-# ----------------------------------------------------------------------
-# Declare products (i.e., the library)
-lib_LTLIBRARIES = lib/libopmcore.la
-
-# ----------------------------------------------------------------------
-# Build-time flags needed to build libopmcore.la
-
-AM_CPPFLAGS =					\
-$(ERT_CPPFLAGS)                                 \
-$(OPM_BOOST_CPPFLAGS)                           \
-$(SUPERLU_CPPFLAGS)
-
-# ----------------------------------------------------------------------
-# Link-time flags needed both to successfully link the library and to
-# (transitively) convey inter-library dependency information.
-
-lib_libopmcore_la_LDFLAGS =			\
--R $(OPM_BOOST_LIBDIR)				\
-$(OPM_BOOST_LDFLAGS)                            \
-$(ERT_LDFLAGS)                                  \
-$(SUPERLU_LDFLAGS)
-
-lib_libopmcore_la_LIBADD = 			\
-$(BOOST_FILESYSTEM_LIB)				\
-$(BOOST_SYSTEM_LIB)				\
-$(BOOST_DATE_TIME_LIB)				\
-$(BOOST_UNIT_TEST_FRAMEWORK_LIB)		\
-$(ERT_LIBS)                                     \
-$(LAPACK_LIBS) $(SUPERLU_LIBS) $(BLAS_LIBS) $(LIBS)
-
-# ----------------------------------------------------------------------
-# Library constituents.  SOURCES followed by HEADERS.
-#
-# Please try to keep the list sorted.
-
-# List of sources that should be built but not distributed.  See AGMG
-# support below for additional details.
-nodist_lib_libopmcore_la_SOURCES =
-
-lib_libopmcore_la_SOURCES =				\
-opm/core/GridManager.cpp				\
-opm/core/eclipse/EclipseGridInspector.cpp		\
-opm/core/eclipse/EclipseGridParser.cpp			\
-opm/core/fluid/BlackoilPropertiesBasic.cpp		\
-opm/core/fluid/BlackoilPropertiesFromDeck.cpp		\
-opm/core/fluid/IncompPropertiesBasic.cpp		\
-opm/core/fluid/IncompPropertiesFromDeck.cpp		\
-opm/core/fluid/PvtPropertiesBasic.cpp			\
-opm/core/fluid/PvtPropertiesIncompFromDeck.cpp		\
-opm/core/fluid/RockBasic.cpp				\
-opm/core/fluid/RockCompressibility.cpp			\
-opm/core/fluid/RockFromDeck.cpp				\
-opm/core/fluid/SaturationPropsBasic.cpp			\
-opm/core/fluid/SaturationPropsFromDeck.cpp		\
-opm/core/fluid/SatFuncGwseg.cpp				\
-opm/core/fluid/SatFuncStone2.cpp			\
-opm/core/fluid/SatFuncSimple.cpp                        \
-opm/core/fluid/blackoil/BlackoilPvtProperties.cpp	\
-opm/core/fluid/blackoil/SinglePvtDead.cpp		\
-opm/core/fluid/blackoil/SinglePvtDeadSpline.cpp		\
-opm/core/fluid/blackoil/SinglePvtInterface.cpp		\
-opm/core/fluid/blackoil/SinglePvtLiveGas.cpp		\
-opm/core/fluid/blackoil/SinglePvtLiveOil.cpp		\
-opm/core/grid.c						\
-opm/core/grid/cart_grid.c				\
-opm/core/grid/cornerpoint_grid.c			\
-opm/core/grid/cpgpreprocess/facetopology.c		\
-opm/core/grid/cpgpreprocess/geometry.c			\
-opm/core/grid/cpgpreprocess/preprocess.c		\
-opm/core/grid/cpgpreprocess/uniquepoints.c		\
-opm/core/linalg/LinearSolverFactory.cpp			\
-opm/core/linalg/LinearSolverInterface.cpp		\
-opm/core/linalg/sparse_sys.c				\
-opm/core/newwells.c					\
-opm/core/pressure/CompressibleTpfa.cpp			\
-opm/core/pressure/FlowBCManager.cpp			\
-opm/core/pressure/IncompTpfa.cpp			\
-opm/core/pressure/cfsh.c				\
-opm/core/pressure/flow_bc.c				\
-opm/core/pressure/fsh.c					\
-opm/core/pressure/fsh_common_impl.c			\
-opm/core/pressure/ifsh.c				\
-opm/core/pressure/mimetic/hybsys.c			\
-opm/core/pressure/mimetic/hybsys_global.c		\
-opm/core/pressure/mimetic/mimetic.c			\
-opm/core/pressure/msmfem/coarse_conn.c			\
-opm/core/pressure/msmfem/coarse_sys.c			\
-opm/core/pressure/msmfem/dfs.c				\
-opm/core/pressure/msmfem/hash_set.c			\
-opm/core/pressure/msmfem/ifsh_ms.c			\
-opm/core/pressure/msmfem/partition.c			\
-opm/core/pressure/tpfa/cfs_tpfa.c			\
-opm/core/pressure/tpfa/cfs_tpfa_residual.c		\
-opm/core/pressure/tpfa/compr_bc.c			\
-opm/core/pressure/tpfa/compr_quant.c			\
-opm/core/pressure/tpfa/compr_quant_general.c		\
-opm/core/pressure/tpfa/compr_source.c			\
-opm/core/pressure/tpfa/ifs_tpfa.c			\
-opm/core/pressure/tpfa/trans_tpfa.c			\
-opm/core/pressure/well.c				\
-opm/core/simulator/SimulatorCompressibleTwophase.cpp	\
-opm/core/simulator/SimulatorIncompTwophase.cpp		\
-opm/core/simulator/SimulatorReport.cpp			\
-opm/core/simulator/SimulatorTimer.cpp			\
-opm/core/transport/reorder/DGBasis.cpp			\
-opm/core/transport/reorder/TransportModelCompressibleTwophase.cpp	\
-opm/core/transport/reorder/TransportModelInterface.cpp	\
-opm/core/transport/reorder/TransportModelTracerTof.cpp	\
-opm/core/transport/reorder/TransportModelTracerTofDiscGal.cpp	\
-opm/core/transport/reorder/TransportModelTwophase.cpp	\
-opm/core/transport/reorder/nlsolvers.c			\
-opm/core/transport/reorder/reordersequence.cpp		\
-opm/core/transport/reorder/tarjan.c			\
-opm/core/transport/spu_explicit.c			\
-opm/core/transport/spu_implicit.c			\
-opm/core/transport/transport_source.c			\
-opm/core/utility/MonotCubicInterpolator.cpp		\
-opm/core/utility/StopWatch.cpp				\
-opm/core/utility/VelocityInterpolation.cpp		\
-opm/core/utility/WachspressCoord.cpp			\
-opm/core/utility/miscUtilities.cpp			\
-opm/core/utility/miscUtilitiesBlackoil.cpp		\
-opm/core/utility/parameters/Parameter.cpp		\
-opm/core/utility/parameters/ParameterGroup.cpp		\
-opm/core/utility/parameters/ParameterTools.cpp		\
-opm/core/utility/parameters/ParameterXML.cpp		\
-opm/core/utility/parameters/tinyxml/tinystr.cpp		\
-opm/core/utility/parameters/tinyxml/tinyxml.cpp		\
-opm/core/utility/parameters/tinyxml/tinyxmlerror.cpp	\
-opm/core/utility/parameters/tinyxml/tinyxmlparser.cpp	\
-opm/core/utility/writeECLData.cpp			\
-opm/core/utility/writeVtkData.cpp			\
-opm/core/vag_format/vag.cpp				\
-opm/core/wells/InjectionSpecification.cpp		\
-opm/core/wells/ProductionSpecification.cpp		\
-opm/core/wells/WellCollection.cpp			\
-opm/core/wells/WellsGroup.cpp				\
-opm/core/wells/WellsManager.cpp
-
-nobase_include_HEADERS =				\
-opm/core/GridAdapter.hpp				\
-opm/core/GridManager.hpp				\
-opm/core/eclipse/CornerpointChopper.hpp			\
-opm/core/eclipse/EclipseGridInspector.hpp		\
-opm/core/eclipse/EclipseGridParser.hpp			\
-opm/core/eclipse/EclipseGridParserHelpers.hpp		\
-opm/core/eclipse/EclipseUnits.hpp			\
-opm/core/eclipse/SpecialEclipseFields.hpp		\
-opm/core/fluid/BlackoilPropertiesBasic.hpp		\
-opm/core/fluid/BlackoilPropertiesFromDeck.hpp		\
-opm/core/fluid/BlackoilPropertiesInterface.hpp		\
-opm/core/fluid/IncompPropertiesBasic.hpp		\
-opm/core/fluid/IncompPropertiesFromDeck.hpp		\
-opm/core/fluid/IncompPropertiesInterface.hpp		\
-opm/core/fluid/PvtPropertiesBasic.hpp			\
-opm/core/fluid/PvtPropertiesIncompFromDeck.hpp		\
-opm/core/fluid/RockBasic.hpp				\
-opm/core/fluid/RockCompressibility.hpp			\
-opm/core/fluid/RockFromDeck.hpp				\
-opm/core/fluid/SatFuncGwseg.hpp				\
-opm/core/fluid/SatFuncStone2.hpp			\
-opm/core/fluid/SatFuncSimple.hpp                        \
-opm/core/fluid/SaturationPropsBasic.hpp			\
-opm/core/fluid/SaturationPropsFromDeck.hpp		\
-opm/core/fluid/SaturationPropsFromDeck_impl.hpp		\
-opm/core/fluid/SaturationPropsInterface.hpp		\
-opm/core/fluid/SimpleFluid2p.hpp			\
-opm/core/fluid/blackoil/BlackoilPhases.hpp		\
-opm/core/fluid/blackoil/BlackoilPvtProperties.hpp	\
-opm/core/fluid/blackoil/SinglePvtConstCompr.hpp		\
-opm/core/fluid/blackoil/SinglePvtDead.hpp		\
-opm/core/fluid/blackoil/SinglePvtDeadSpline.hpp		\
-opm/core/fluid/blackoil/SinglePvtInterface.hpp		\
-opm/core/fluid/blackoil/SinglePvtLiveGas.hpp		\
-opm/core/fluid/blackoil/SinglePvtLiveOil.hpp		\
-opm/core/fluid/blackoil/phaseUsageFromDeck.hpp		\
-opm/core/grid.h						\
-opm/core/grid/CellQuadrature.hpp			\
-opm/core/grid/FaceQuadrature.hpp			\
-opm/core/grid/cart_grid.h				\
-opm/core/grid/cornerpoint_grid.h			\
-opm/core/grid/cpgpreprocess/facetopology.h		\
-opm/core/grid/cpgpreprocess/geometry.h			\
-opm/core/grid/cpgpreprocess/grdecl.h			\
-opm/core/grid/cpgpreprocess/preprocess.h		\
-opm/core/grid/cpgpreprocess/uniquepoints.h		\
-opm/core/linalg/LinearSolverFactory.hpp			\
-opm/core/linalg/LinearSolverInterface.hpp		\
-opm/core/linalg/blas_lapack.h				\
-opm/core/linalg/sparse_sys.h				\
-opm/core/newwells.h					\
-opm/core/pressure/CompressibleTpfa.hpp			\
-opm/core/pressure/FlowBCManager.hpp			\
-opm/core/pressure/HybridPressureSolver.hpp		\
-opm/core/pressure/IncompTpfa.hpp			\
-opm/core/pressure/TPFACompressiblePressureSolver.hpp	\
-opm/core/pressure/TPFAPressureSolver.hpp		\
-opm/core/pressure/flow_bc.h				\
-opm/core/pressure/fsh.h					\
-opm/core/pressure/fsh_common_impl.h			\
-opm/core/pressure/mimetic/hybsys.h			\
-opm/core/pressure/mimetic/hybsys_global.h		\
-opm/core/pressure/mimetic/mimetic.h			\
-opm/core/pressure/msmfem/coarse_conn.h			\
-opm/core/pressure/msmfem/coarse_sys.h			\
-opm/core/pressure/msmfem/dfs.h				\
-opm/core/pressure/msmfem/hash_set.h			\
-opm/core/pressure/msmfem/ifsh_ms.h			\
-opm/core/pressure/msmfem/partition.h			\
-opm/core/pressure/tpfa/cfs_tpfa.h			\
-opm/core/pressure/tpfa/cfs_tpfa_residual.h		\
-opm/core/pressure/tpfa/compr_bc.h			\
-opm/core/pressure/tpfa/compr_quant.h			\
-opm/core/pressure/tpfa/compr_quant_general.h		\
-opm/core/pressure/tpfa/compr_source.h			\
-opm/core/pressure/tpfa/ifs_tpfa.h			\
-opm/core/pressure/tpfa/trans_tpfa.h			\
-opm/core/simulator/BlackoilState.hpp			\
-opm/core/simulator/SimulatorCompressibleTwophase.hpp	\
-opm/core/simulator/SimulatorReport.hpp			\
-opm/core/simulator/SimulatorIncompTwophase.hpp		\
-opm/core/simulator/SimulatorTimer.hpp			\
-opm/core/simulator/TwophaseState.hpp			\
-opm/core/simulator/WellState.hpp			\
-opm/core/transport/CSRMatrixBlockAssembler.hpp		\
-opm/core/transport/CSRMatrixUmfpackSolver.hpp		\
-opm/core/transport/GravityColumnSolver.hpp		\
-opm/core/transport/GravityColumnSolver_impl.hpp		\
-opm/core/transport/ImplicitAssembly.hpp			\
-opm/core/transport/ImplicitTransport.hpp		\
-opm/core/transport/JacobianSystem.hpp			\
-opm/core/transport/NormSupport.hpp			\
-opm/core/transport/SimpleFluid2pWrapper.hpp		\
-opm/core/transport/SinglePointUpwindTwoPhase.hpp	\
-opm/core/transport/reorder/DGBasis.hpp			\
-opm/core/transport/reorder/TransportModelCompressibleTwophase.hpp	\
-opm/core/transport/reorder/TransportModelInterface.hpp	\
-opm/core/transport/reorder/TransportModelTracerTof.hpp	\
-opm/core/transport/reorder/TransportModelTracerTofDiscGal.hpp	\
-opm/core/transport/reorder/TransportModelTwophase.hpp	\
-opm/core/transport/reorder/nlsolvers.h			\
-opm/core/transport/reorder/reordersequence.h		\
-opm/core/transport/reorder/tarjan.h			\
-opm/core/transport/spu_explicit.h			\
-opm/core/transport/spu_implicit.h			\
-opm/core/transport/transport_source.h			\
-opm/core/utility/Average.hpp				\
-opm/core/utility/ColumnExtract.hpp			\
-opm/core/utility/DataMap.hpp				\
-opm/core/utility/ErrorMacros.hpp			\
-opm/core/utility/Factory.hpp				\
-opm/core/utility/MonotCubicInterpolator.hpp		\
-opm/core/utility/NonuniformTableLinear.hpp		\
-opm/core/utility/RootFinders.hpp			\
-opm/core/utility/SparseTable.hpp			\
-opm/core/utility/SparseVector.hpp			\
-opm/core/utility/StopWatch.hpp				\
-opm/core/utility/UniformTableLinear.hpp			\
-opm/core/utility/Units.hpp				\
-opm/core/utility/VelocityInterpolation.hpp		\
-opm/core/utility/WachspressCoord.hpp			\
-opm/core/utility/buildUniformMonotoneTable.hpp		\
-opm/core/utility/have_boost_redef.hpp			\
-opm/core/utility/initState.hpp				\
-opm/core/utility/initState_impl.hpp			\
-opm/core/utility/linInt.hpp				\
-opm/core/utility/linearInterpolation.hpp		\
-opm/core/utility/miscUtilities.hpp			\
-opm/core/utility/miscUtilitiesBlackoil.hpp		\
-opm/core/utility/parameters/Parameter.hpp		\
-opm/core/utility/parameters/ParameterGroup.hpp		\
-opm/core/utility/parameters/ParameterGroup_impl.hpp	\
-opm/core/utility/parameters/ParameterMapItem.hpp	\
-opm/core/utility/parameters/ParameterRequirement.hpp	\
-opm/core/utility/parameters/ParameterStrings.hpp	\
-opm/core/utility/parameters/ParameterTools.hpp		\
-opm/core/utility/parameters/ParameterXML.hpp		\
-opm/core/utility/parameters/tinyxml/tinystr.h		\
-opm/core/utility/parameters/tinyxml/tinyxml.h		\
-opm/core/utility/writeECLData.hpp			\
-opm/core/utility/writeVtkData.hpp			\
-opm/core/vag_format/vag.hpp				\
-opm/core/well.h						\
-opm/core/wells/InjectionSpecification.hpp		\
-opm/core/wells/ProductionSpecification.hpp		\
-opm/core/wells/WellCollection.hpp			\
-opm/core/wells/WellsGroup.hpp				\
-opm/core/wells/WellsManager.hpp
-
-# ----------------------------------------------------------------------
-# Optional library constituents.
-
-if UMFPACK
-lib_libopmcore_la_SOURCES  +=			\
-opm/core/linalg/call_umfpack.c			\
-opm/core/linalg/LinearSolverUmfpack.cpp
-
-nobase_include_HEADERS +=			\
-opm/core/linalg/call_umfpack.h			\
-opm/core/linalg/LinearSolverUmfpack.hpp
-endif
-
-
-if DUNE_ISTL
-lib_libopmcore_la_SOURCES  +=			\
-opm/core/linalg/LinearSolverIstl.cpp
-
-nobase_include_HEADERS +=			\
-opm/core/linalg/LinearSolverIstl.hpp
-endif
-
-
-if BUILD_AGMG
-nodist_lib_libopmcore_la_SOURCES +=		\
-$(AGMG_SRCDIR)/dagmg.f90			\
-$(AGMG_SRCDIR)/dagmg_mumps.f90
-
-lib_libopmcore_la_SOURCES +=			\
-opm/core/linalg/LinearSolverAGMG.cpp
-
-nobase_include_HEADERS +=			\
-opm/core/linalg/LinearSolverAGMG.hpp
-
-lib_libopmcore_la_LDFLAGS +=			\
-$(FCLIBS)
-endif
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = lib/pkgconfig/opm-core.pc
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 2261da15..00000000
--- a/configure.ac
+++ /dev/null
@@ -1,64 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.59])
-AC_INIT([OPM Core Library], [0.1], [atgeirr@sintef.no],
-        [opmcore], [https://public.ict.sintef.no/opm/hg/opmcore])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
-
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-# Needed for automake since version 1.12 because extra-portability
-# warnings were then added to -Wall. Ifdef makes it backwards compatible.
-m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_SRCDIR([opm/core/grid.h])
-AC_CONFIG_HEADERS([config.h])
-
-# Checks for programs.
-AC_PROG_CC
-AM_PROG_CC_C_O
-
-dnl Initialize libtool; the funny indentation here is to
-dnl satisfy libtoolize' check for the presence of this macro
-m4_ifdef([LT_INIT],
-         [
-          LT_INIT[]dnl
-          LT_LANG([C++])dnl
-          LT_LANG([Fortran 77])dnl
-          LT_LANG([Fortran])dnl
-         ],dnl
-         [AC_PROG_LIBTOOL[]dnl
-          AC_PROG_CXX[]dnl
-          AC_PROG_F77[]dnl
-          AC_PROG_FC[]dnl
-         ])[]dnl
-
-OPM_CORE_CHECKS
-
-OPM_DYNLINK_BOOST_TEST
-
-ERT
-
-dnl Substitute Autoconf's abs_*dir variables into the Makefiles for the
-dnl benefit of external code that uses these variables to derive
-dnl locations (e.g., Dune's DUNE_CHECK_MODULES macro).  Automakes prior
-dnl to version 1.10 do not automatically substitute these variables into
-dnl output files.
-AC_SUBST([abs_srcdir])
-AC_SUBST([abs_builddir])
-AC_SUBST([abs_top_srcdir])
-AC_SUBST([abs_top_builddir])
-
-AC_CONFIG_FILES([
- Makefile
- tests/Makefile
- examples/Makefile
- tutorials/Makefile
- opm-core.pc
- lib/pkgconfig/opm-core.pc
- opm-core-config.cmake
-])
-
-AC_OUTPUT
diff --git a/examples/Makefile.am b/examples/Makefile.am
deleted file mode 100644
index b898af1b..00000000
--- a/examples/Makefile.am
+++ /dev/null
@@ -1,89 +0,0 @@
-# Build-time flags needed to form example programs
-
-AM_CPPFLAGS =                                   \
--I$(top_srcdir)                                 \
-$(ERT_CPPFLAGS)					\
-$(OPM_BOOST_CPPFLAGS)
-
-# All targets link to the library
-LDADD =                                         \
-$(top_builddir)/lib/libopmcore.la
-
-# Convenience definition for targets that use Boost.Filesystem directly.
-# While libopmcore depends on (and references) Boost.Filesystem (through
-# the $(BOOST_FILESYSTEM_LIB) macro) this indirect dependency is not
-# sufficient to satisfy the requirements of targets that use the indirect
-# libraries directly.
-#
-# Additional details at
-#   https://fedoraproject.org/wiki/UnderstandingDSOLinkChange
-#
-LINK_BOOST_FILESYSTEM =                         \
-$(OPM_BOOST_LDFLAGS)                            \
-$(BOOST_FILESYSTEM_LIB)                         \
-$(BOOST_SYSTEM_LIB)
-
-# ----------------------------------------------------------------------
-# Declare products (i.e., the example programs).
-#
-# Please keep the list sorted.
-
-noinst_PROGRAMS =                               \
-compute_tof                                     \
-compute_tof_from_files                          \
-refine_wells                                    \
-scaneclipsedeck                                 \
-sim_2p_comp_reorder                             \
-sim_2p_incomp_reorder                           \
-sim_wateroil                                    \
-wells_example                                   
-
-if HAVE_ERT
-noinst_PROGRAMS += import_rewrite
-endif
-
-
-
-# ----------------------------------------------------------------------
-# Product constituents.  Must be specified for every product that's
-# built from more than a single ".c" file and/or that link to anything
-# more than the OPM-Core library.
-#
-# Please maintain sort order from "noinst_PROGRAMS".
-
-compute_tof_SOURCES           = compute_tof.cpp
-compute_tof_LDADD             = $(LDADD) $(LINK_BOOST_FILESYSTEM)
-
-compute_tof_from_files_SOURCES = compute_tof_from_files.cpp
-compute_tof_from_files_LDADD   = $(LDADD) $(LINK_BOOST_FILESYSTEM)
-
-refine_wells_SOURCES          = refine_wells.cpp
-
-if HAVE_ERT
-   import_rewrite_SOURCES        = import_rewrite.cpp
-   import_rewrite_LDADD          = $(LDADD) $(LINK_BOOST_FILESYSTEM)
-endif
-
-sim_2p_comp_reorder_SOURCES   = sim_2p_comp_reorder.cpp
-sim_2p_comp_reorder_LDADD     = $(LDADD) $(LINK_BOOST_FILESYSTEM)
-
-sim_2p_incomp_reorder_SOURCES = sim_2p_incomp_reorder.cpp
-sim_2p_incomp_reorder_LDADD   = $(LDADD) $(LINK_BOOST_FILESYSTEM)
-
-sim_wateroil_SOURCES          = sim_wateroil.cpp
-sim_wateroil_LDADD            = $(LDADD) $(LINK_BOOST_FILESYSTEM)
-
-wells_example_SOURCES         = wells_example.cpp
-
-# ----------------------------------------------------------------------
-# Optional examples, or examples that use optional add-on components.
-
-if UMFPACK
-noinst_PROGRAMS += spu_2p
-
-spu_2p_SOURCES   = spu_2p.cpp
-spu_2p_LDADD     =                              \
-$(LDADD)                                        \
-$(LINK_BOOST_FILESYSTEM)                        \
-$(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS)
-endif
diff --git a/lib/pkgconfig/opm-core.pc.in b/lib/pkgconfig/opm-core.pc.in
deleted file mode 100644
index 528117e3..00000000
--- a/lib/pkgconfig/opm-core.pc.in
+++ /dev/null
@@ -1,25 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: @PACKAGE_NAME@
-Description: @PACKAGE_STRING@
-Version: @PACKAGE_VERSION@
-URL: @PACKAGE_URL@
-Libs: -L${libdir} -l@PACKAGE@ \
-@OPM_BOOST_LDFLAGS@ \
-@BOOST_FILESYSTEM_LIB@ \
-@BOOST_SYSTEM_LIB@ \
-@BOOST_DATE_TIME_LIB@ \
-@BOOST_UNIT_TEST_FRAMEWORK_LIB@ \
-@ERT_LDFLAGS@ \
-@ERT_LIBS@ \
-@LAPACK_LIBS@ \
-@SUPERLU_LIBS@ \
-@BLAS_LIBS@ \
-@LIBS@
-Cflags: -I${includedir} \
-@ERT_CPPFLAGS@ \
-@OPM_BOOST_CPPFLAGS@ \
-@SUPERLU_CPPFLAGS@
diff --git a/opm-core-config.cmake.in b/opm-core-config.cmake.in
deleted file mode 100644
index 14eb8069..00000000
--- a/opm-core-config.cmake.in
+++ /dev/null
@@ -1,37 +0,0 @@
-# - Open Porous Media Initiative Core Library config mode
-#
-# Defines the following variables:
-#  opm-core_FOUND        - true
-#  opm-core_VERSION      - version of the opm-core library found, e.g. 0.2
-#  opm-core_DEFINITIONS  - defines to be made on the command line
-#  opm-core_INCLUDE_DIRS - header directories with which to compile
-#  opm-core_LINKER_FLAGS - flags that must be passed to the linker
-#  opm-core_LIBRARIES    - names of the libraries with which to link
-#  opm-core_LIBRARY_DIRS - directories in which the libraries are situated
-#
-# You should put lines like this in your CMakeLists.txt
-#  set (opm-core_DIR "${PROJECT_BINARY_DIR}/../opm-core" CACHE LOCATION "Build tree of opm-core")
-#  find_package (opm-core)
-
-# <http://www.vtk.org/Wiki/CMake/Tutorials/How_to_create_a_ProjectConfig.cmake_file>
-
-# propagate this property from one build system to the other
-set (opm-core_VERSION @PACKAGE_VERSION@)
-
-# make the pkg-config portion of the configuration do the heavy lifting
-find_package (PkgConfig)
-set (ENV{PKG_CONFIG_PATH} "@abs_top_builddir@:$ENV{PKG_CONFIG_PATH}")
-pkg_check_modules (opm-core REQUIRED opm-core)
-
-# these variables have non-standard names in FindPkgConfig (sic)
-set (opm-core_DEFINITIONS ${opm-core_CFLAGS_OTHER})
-set (opm-core_LINKER_FLAGS ${opm-core_LDFLAGS_OTHER})
-
-# libraries come from the build tree where this file was generated
-find_library (opm-core_LOCATION NAMES "opmcore" PATHS "@abs_top_builddir@/lib/.libs")
-mark_as_advanced (opm-core_LOCATION)
-
-# add the library as a target, so that other things in the project including
-# this file may depend on it and get rebuild if this library changes.
-add_library (opmcore UNKNOWN IMPORTED)
-set_property (TARGET opmcore PROPERTY IMPORTED_LOCATION "${opm-core_LOCATION}")
diff --git a/opm-core.pc.in b/opm-core.pc.in
deleted file mode 100644
index d813e9c0..00000000
--- a/opm-core.pc.in
+++ /dev/null
@@ -1,32 +0,0 @@
-# This is the configuration for local builds. Use this by putting the
-# compilation output path (the directory in which you ran ./configure)
-# into the environment variable PKG_CONFIG_PATH. This will enable you
-# to use pkg-config in your code while making changes to opm-core.
-
-# This is NOT the file that is installed in the system directories when
-# you do `make install`. That is the one in lib/pkgconfig. However, if
-# you make changes here, you should consider that one as well.
-
-libdir=@abs_top_builddir@/lib/.libs
-includedir=@abs_top_srcdir@
-
-Name: @PACKAGE_NAME@
-Description: @PACKAGE_STRING@
-Version: @PACKAGE_VERSION@
-URL: @PACKAGE_URL@
-Libs: -L${libdir} -l@PACKAGE@ \
-@OPM_BOOST_LDFLAGS@ \
-@BOOST_FILESYSTEM_LIB@ \
-@BOOST_SYSTEM_LIB@ \
-@BOOST_DATE_TIME_LIB@ \
-@BOOST_UNIT_TEST_FRAMEWORK_LIB@ \
-@ERT_LDFLAGS@ \
-@ERT_LIBS@ \
-@LAPACK_LIBS@ \
-@SUPERLU_LIBS@ \
-@BLAS_LIBS@ \
-@LIBS@
-Cflags: -I${includedir} \
-@ERT_CPPFLAGS@ \
-@OPM_BOOST_CPPFLAGS@ \
-@SUPERLU_CPPFLAGS@
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index fbf6575a..00000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,102 +0,0 @@
-AM_CPPFLAGS =					\
--I$(top_srcdir)					\
-$(OPM_BOOST_CPPFLAGS) $(SUPERLU_CPPFLAGS)	\
-$(ERT_CPPFLAGS)
-
-AM_LDFLAGS = $(OPM_BOOST_LDFLAGS) $(ERT_LDFLAGS)
-
-
-LDADD =	$(top_builddir)/lib/libopmcore.la
-
-
-noinst_PROGRAMS =				\
-bo_resprop_test					\
-monotcubicinterpolator_test			\
-param_test					\
-pvt_test					\
-relperm_test                 			\
-sparsetable_test				\
-sparsevector_test				\
-test_cartgrid					\
-test_column_extract				\
-test_dgbasis					\
-test_lapack					\
-test_quadratures				\
-test_read_grid					\
-test_read_vag					\
-test_readpolymer				\
-test_sf2p					\
-test_velocityinterpolation			\
-test_wachspresscoord				\
-test_wells					\
-test_writeVtkData				\
-unit_test
-
-
-bo_resprop_test_SOURCES = bo_resprop_test.cpp
-
-monotcubicinterpolator_test_SOURCES = monotcubicinterpolator_test.cpp
-
-param_test_SOURCES        = param_test.cpp
-param_test_LDADD          = $(LDADD) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
-
-pvt_test_SOURCES          = pvt_test.cpp
-
-relperm_test_SOURCES      = relperm_test.cpp
-
-sparsetable_test_SOURCES  = sparsetable_test.cpp
-sparsetable_test_LDADD    = $(LDADD) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
-
-sparsevector_test_SOURCES = sparsevector_test.cpp
-sparsevector_test_LDADD   = $(LDADD) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
-
-test_cartgrid_SOURCES     = test_cartgrid.cpp
-
-test_column_extract_SOURCES = test_column_extract.cpp
-test_column_extract_LDADD = $(LDADD) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
-
-test_dgbasis_SOURCES = test_dgbasis.cpp
-test_dgbasis_LDADD = $(LDADD) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
-
-test_lapack_SOURCES       = test_lapack.cpp
-test_lapack_LDADD         = $(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS)
-
-test_quadratures_SOURCES = test_quadratures.cpp
-test_quadratures_LDADD   = $(LDADD) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
-
-test_readpolymer_SOURCES  = test_readpolymer.cpp
-test_read_vag_SOURCES     = test_read_vag.cpp
-
-test_sf2p_SOURCES         = test_sf2p.cpp
-
-test_velocityinterpolation_SOURCES = test_velocityinterpolation.cpp
-test_velocityinterpolation_LDADD   = $(LDADD) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
-
-test_wachspresscoord_SOURCES = test_wachspresscoord.cpp
-test_wachspresscoord_LDADD   = $(LDADD) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
-
-test_writeVtkData_SOURCES = test_writeVtkData.cpp
-
-test_wells_SOURCES        = test_wells.cpp
-test_wells_LDADD          = $(LDADD) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
-
-unit_test_SOURCES         = unit_test.cpp
-
-
-if UMFPACK
-noinst_PROGRAMS    += test_cfs_tpfa
-noinst_PROGRAMS    += test_jacsys
-test_jacsys_SOURCES = test_jacsys.cpp
-endif
-
-
-if BUILD_AGMG
-noinst_PROGRAMS   += test_agmg
-test_agmg_SOURCES  = test_agmg.cpp
-endif
-
-
-if HAVE_ERT
-noinst_PROGRAMS   += test_ert
-test_ert_SOURCES   = test_ert.cpp
-endif
diff --git a/tutorials/Makefile.am b/tutorials/Makefile.am
deleted file mode 100644
index 3be1c9f8..00000000
--- a/tutorials/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-AM_CPPFLAGS =					\
--I$(top_srcdir)					\
-$(ERT_CPPFLAGS)					\
-$(OPM_BOOST_CPPFLAGS)
-
-AM_LDFLAGS = $(OPM_BOOST_LDFLAGS)
-
-LDADD =	$(top_builddir)/lib/libopmcore.la
-
-noinst_PROGRAMS   = tutorial1
-tutorial1_SOURCES = tutorial1.cpp
-
-if UMFPACK
-noinst_PROGRAMS +=				\
-tutorial2					\
-tutorial3					\
-tutorial4
-
-tutorial2_SOURCES = tutorial2.cpp
-tutorial3_SOURCES = tutorial3.cpp
-tutorial4_SOURCES = tutorial4.cpp
-endif