diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29ab12ed2c483811661c4df04a4b703973d61c7f..c717308d510772e6da29e68b18488fab6c9e20ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -174,7 +174,6 @@ add_subdirectory(dune)
 add_subdirectory(gm)
 add_subdirectory(np)
 add_subdirectory(ui)
-add_subdirectory(lib)
 add_subdirectory(cmake/modules)
 # set variable names for config.h
 set(DDD_MAX_PROCBITS_IN_GID ${UG_DDD_MACROBITS})
diff --git a/dune/uggrid/CMakeLists.txt b/dune/uggrid/CMakeLists.txt
index dcdd038cc5a325f12725b2bebf2ec832d14cf53d..479a89a5a896227bdbc14df778a15b000a3a1247 100644
--- a/dune/uggrid/CMakeLists.txt
+++ b/dune/uggrid/CMakeLists.txt
@@ -1,3 +1,4 @@
 add_subdirectory(domain)
+add_subdirectory(lib)
 add_subdirectory(low)
 add_subdirectory(parallel)
diff --git a/lib/CMakeLists.txt b/dune/uggrid/lib/CMakeLists.txt
similarity index 71%
rename from lib/CMakeLists.txt
rename to dune/uggrid/lib/CMakeLists.txt
index 818648a9944c7e57f5f57347fa96d9f992d2a62b..b036bc75fdc9323455ebe96bc715a86d8ba50912 100644
--- a/lib/CMakeLists.txt
+++ b/dune/uggrid/lib/CMakeLists.txt
@@ -1,5 +1,3 @@
-add_subdirectory(ugdata)
-
 if(UG_ENABLE_PARALLEL)
   set(_parallel_dim_libs ddd analyser ctrl ident if join mgr prio xfer dddif)
   set(_parallel_libs basic ppifmpi)
@@ -13,11 +11,11 @@ endforeach()
 
 dune_add_library(ugL $<TARGET_OBJECTS:devices> $<TARGET_OBJECTS:low> ${_parallel_objs}
   SOURCES
-  ../dune/uggrid/parallel/ddd/dddcontext.cc
-  ../dune/uggrid/parallel/ppif/ppifcontext.cc
+  ../parallel/ddd/dddcontext.cc
+  ../parallel/ppif/ppifcontext.cc
   ADD_LIBS ${DUNE_LIBS}
   )
-ug_add_dim_libs(ugS APPEND DUNE SOURCES ../initug.cc
+ug_add_dim_libs(ugS APPEND DUNE SOURCES ../../../initug.cc
   OBJECT_DIM_LIBS ${_dim_libs} domS ${_parallel_dim_libs}
   ADD_LIBS ugL ${DUNE_LIBS}
   )
@@ -25,3 +23,7 @@ ug_add_dim_libs(ugS APPEND DUNE SOURCES ../initug.cc
 if(MPI_C_FOUND)
   add_dune_mpi_flags(ugL)
 endif()
+
+install(
+  FILES RefRules.data tetra.rls triangle.rls
+  DESTINATION ${CMAKE_INSTALL_DATADIR})
diff --git a/lib/ugdata/RefRules.data b/dune/uggrid/lib/RefRules.data
similarity index 100%
rename from lib/ugdata/RefRules.data
rename to dune/uggrid/lib/RefRules.data
diff --git a/lib/ugdata/tetra.rls b/dune/uggrid/lib/tetra.rls
similarity index 100%
rename from lib/ugdata/tetra.rls
rename to dune/uggrid/lib/tetra.rls
diff --git a/lib/ugdata/triangle.rls b/dune/uggrid/lib/triangle.rls
similarity index 100%
rename from lib/ugdata/triangle.rls
rename to dune/uggrid/lib/triangle.rls
diff --git a/lib/ugdata/CMakeLists.txt b/lib/ugdata/CMakeLists.txt
deleted file mode 100644
index a9f36ce54748439b490f5152cd4e0406d9ba9fe3..0000000000000000000000000000000000000000
--- a/lib/ugdata/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# install into share-directory
-set(dist_data_DATA RefRules.data tetra.rls triangle.rls)
-install(FILES ${dist_data_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR})