diff --git a/Makefile.am b/Makefile.am
index c37ebadb9b3f3119fc1c8060c54ad533633496f5..fe68dd3ecfd63c3fd5a32312108fe9282b2bf542 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 = src m4 dune
+SUBDIRS = m4 dune
 
 if BUILD_DOCS
 SUBDIRS += doc
diff --git a/configure.ac b/configure.ac
index 3a1da5e3555d5c3f781b1513250a3b4597000772..d3164328fe26403a7177eb400f69337bf48105ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 AC_PREREQ(2.50)
 DUNE_AC_INIT # gets module version from dune.module file
 AM_INIT_AUTOMAKE
-AC_CONFIG_SRCDIR([src/dune_solvers.cc])
+AC_CONFIG_SRCDIR([dune-solvers.pc.in])
 AC_CONFIG_HEADERS([config.h])
 
 
@@ -18,7 +18,6 @@ LIBS="$DUNE_LIBS"
 AC_CONFIG_FILES([
   Makefile
   doc/doxygen/Doxyfile
-  src/Makefile
   dune/Makefile
   dune/solvers/Makefile
   dune/solvers/common/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 72df5b3fedd5af8396542953bf5fa8d306167f75..0000000000000000000000000000000000000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-
-SUBDIRS =
-
-noinst_PROGRAMS = dune_solvers
-
-dune_solvers_SOURCES = dune_solvers.cc
-
-dune_solvers_CXXFLAGS = $(MPI_CPPFLAGS) $(UG_CPPFLAGS) $(AMIRAMESH_CPPFLAGS) $(ALBERTA_CPPFLAGS) $(ALU_CPPFLAGS)
-dune_solvers_LDADD = $(MPI_LDFLAGS) $(ALBERTA_LDFLAGS) $(ALBERTA_LIBS) $(ALU_LIBS) $(AMIRAMESH_LDFLAGS) $(AMIRAMESH_LIBS) $(UG_LDFLAGS) $(UG_LIBS) $(MPI_LDFLAGS) $(DUNE_LDFLAGS) $(DUNE_LIBS)
-
-# don't follow the full GNU-standard
-# we need automake 1.5
-AUTOMAKE_OPTIONS = foreign 1.5
-
-# pass most important options when "make distcheck" is used
-DISTCHECK_CONFIGURE_FLAGS = --with-dune-common=$(DUNE_COMMON_ROOT) --with-dune-grid=$(DUNE_GRID_ROOT) --with-dune-istl=$(DUNE_ISTL_ROOT)  CXX="$(CXX)" CC="$(CC)"
-
-include $(top_srcdir)/am/global-rules
-
diff --git a/src/dune_solvers.cc b/src/dune_solvers.cc
deleted file mode 100644
index fe21ae8656d71a83367bc45939dd33740f2a00d3..0000000000000000000000000000000000000000
--- a/src/dune_solvers.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"     
-#endif
-#include <iostream>
-#include <dune/common/parallel/mpihelper.hh> // An initializer of MPI
-#include"dune/common/exceptions.hh" // We use exceptions
-
-int main(int argc, char** argv)
-{
-  try{
-    //Maybe initialize Mpi
-    Dune::MPIHelper& helper = Dune::MPIHelper::instance(argc, argv);
-    std::cout << "Hello World! This is dune/solvers." << std::endl;
-    if(Dune::MPIHelper::isFake)
-      std::cout<< "This is a sequential program." << std::endl;
-    else
-      std::cout<<"I am rank "<<helper.rank()<<" of "<<helper.size()
-        <<" processes!"<<std::endl;
-    return 0;
-  }
-  catch (Dune::Exception &e){
-    std::cerr << "Dune reported error: " << e << std::endl;
-  }
-  catch (...){
-    std::cerr << "Unknown exception thrown!" << std::endl;
-  }
-}