diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89ad084d8195568564182e841373c55592a6d2f2..69e3a3ac5ecbf97c76ec562b2a63cb6859ccf116 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,16 +163,11 @@ configure_file(libug.pc.in libug.pc)
 configure_file(ug-config.cmake.in ug-config.cmake @ONLY)
 configure_file(ug-config-version.cmake.in ug-config-version.cmake @ONLY)
 
-#install header
-install(FILES initug.h DESTINATION ${CMAKE_INSTALL_PKGINCLUDEDIR})
-
 if(UG_ENABLE_PARALLEL)
   add_subdirectory(parallel)
 endif()
-add_subdirectory(dev)
 add_subdirectory(dune)
 add_subdirectory(np)
-add_subdirectory(ui)
 add_subdirectory(cmake/modules)
 # set variable names for config.h
 set(DDD_MAX_PROCBITS_IN_GID ${UG_DDD_MACROBITS})
diff --git a/dev/CMakeLists.txt b/dev/CMakeLists.txt
deleted file mode 100644
index f49283ad8f7ce12401112e954c0fd860441cd4d6..0000000000000000000000000000000000000000
--- a/dev/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-set(SOURCES  ugdevices.cc)
-set(devinclude_HEADERS  ugdevices.h)
-
-add_library(devices OBJECT ${SOURCES})
-install(FILES ${devinclude_HEADERS} DESTINATION  ${CMAKE_INSTALL_PKGINCLUDEDIR})
diff --git a/dune/uggrid/CMakeLists.txt b/dune/uggrid/CMakeLists.txt
index fada1079a0bc82d5f6e59310df9cf83d729b5d75..146b3a215dd8fafd101c7fecc5adc37d0651aca3 100644
--- a/dune/uggrid/CMakeLists.txt
+++ b/dune/uggrid/CMakeLists.txt
@@ -3,3 +3,10 @@ add_subdirectory(gm)
 add_subdirectory(lib)
 add_subdirectory(low)
 add_subdirectory(parallel)
+
+install(
+  FILES ugdevices.h commands.h initug.h
+  DESTINATION ${CMAKE_INSTALL_PKGINCLUDEDIR})
+
+add_library(devices OBJECT ugdevices.cc)
+ug_add_dim_libs(ugui OBJECT ugdevices.cc commands.cc)
diff --git a/ui/commands.cc b/dune/uggrid/commands.cc
similarity index 99%
rename from ui/commands.cc
rename to dune/uggrid/commands.cc
index 74faed0d3b233a5205ee597b488242e121675c23..9cf317d76cfe5a9b619d79470733141109d15497 100644
--- a/ui/commands.cc
+++ b/dune/uggrid/commands.cc
@@ -46,7 +46,7 @@
 #include <ctime>
 #include <cassert>
 
-#include <initug.h>
+#include <dune/uggrid/initug.h>
 
 /* low module */
 #include <dune/uggrid/low/architecture.h>
@@ -62,7 +62,7 @@
 #include <dune/uggrid/low/ugtypes.h>
 
 /* devices module */
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 
 /* grid manager module */
 #include <dune/uggrid/gm/algebra.h>
diff --git a/ui/commands.doc b/dune/uggrid/commands.doc
similarity index 100%
rename from ui/commands.doc
rename to dune/uggrid/commands.doc
diff --git a/ui/commands.h b/dune/uggrid/commands.h
similarity index 100%
rename from ui/commands.h
rename to dune/uggrid/commands.h
diff --git a/dune/uggrid/domain/std_domain.cc b/dune/uggrid/domain/std_domain.cc
index eb109f032d5506e6504d69eaf152659398441acd..2bdf675cfa0a27dfe2c518bef72a9e1313b9899d 100644
--- a/dune/uggrid/domain/std_domain.cc
+++ b/dune/uggrid/domain/std_domain.cc
@@ -69,7 +69,7 @@
 #include <dune/uggrid/gm/evm.h>
 
 /* dev modules */
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 
 /* domain module */
 #include "domain.h"
diff --git a/dune/uggrid/gm/algebra.cc b/dune/uggrid/gm/algebra.cc
index 4ba7714bd86347616dc8d4fb0d49f00eb3517e2e..5a72e424ab40288d3552f33db9ab9459970ec0a0 100644
--- a/dune/uggrid/gm/algebra.cc
+++ b/dune/uggrid/gm/algebra.cc
@@ -73,7 +73,7 @@
 #include <dune/uggrid/low/ugenv.h>
 #include <dune/uggrid/low/ugtypes.h>
 
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 
 #include "algebra.h"
 #include "cw.h"
diff --git a/dune/uggrid/gm/cw.cc b/dune/uggrid/gm/cw.cc
index 8acf17ad07206b605a29de9a6407f23ea4aac406..143e5162cb1237cd452deb2c32dee5a04c1b7ffd 100644
--- a/dune/uggrid/gm/cw.cc
+++ b/dune/uggrid/gm/cw.cc
@@ -27,7 +27,7 @@
 #define __COMPILE_CW__
 
 
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 #include <dune/uggrid/low/architecture.h>
 #include <dune/uggrid/low/debug.h>
 #include <dune/uggrid/low/general.h>
diff --git a/dune/uggrid/gm/elements.cc b/dune/uggrid/gm/elements.cc
index 41acaa1efb8c8fe272429d8aeb0118b5597c9efd..3bb4d68f3695f2afb0a5ebc438ebeb8f93362aa6 100644
--- a/dune/uggrid/gm/elements.cc
+++ b/dune/uggrid/gm/elements.cc
@@ -24,7 +24,7 @@
 #include <cassert>
 
 #include <dune/uggrid/low/general.h>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 
 #include "gm.h"
 #include "ugm.h"
diff --git a/dune/uggrid/gm/enrol.cc b/dune/uggrid/gm/enrol.cc
index 98d4c564f5aedddfca95ae6048d9c640410d62d3..db89fad76ac101c65e1cecb23559adc5befcaff8 100644
--- a/dune/uggrid/gm/enrol.cc
+++ b/dune/uggrid/gm/enrol.cc
@@ -51,7 +51,7 @@
 #include <dune/uggrid/low/ugtypes.h>
 
 /* devices module */
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 
 /* grid manager module */
 #include "gm.h"
diff --git a/dune/uggrid/gm/er.cc b/dune/uggrid/gm/er.cc
index e2bd1831ef71dbb249f02e352e56c197acaa6208..1e0023645ad219ec7b7f48335bb0f56878a9a31a 100644
--- a/dune/uggrid/gm/er.cc
+++ b/dune/uggrid/gm/er.cc
@@ -76,7 +76,7 @@
 #include "elements.h"
 
 /* ui  (for new memory model, remove later) */
-#include <ui/commands.h>
+#include <dune/uggrid/commands.h>
 
 /* own header */
 #include "er.h"
diff --git a/dune/uggrid/gm/evalproc.cc b/dune/uggrid/gm/evalproc.cc
index e2909f7b9e4de4502069e46a62c97a5913e372b8..8e68a2ce20f70a4006ca35fdbef8d26436ce17f0 100644
--- a/dune/uggrid/gm/evalproc.cc
+++ b/dune/uggrid/gm/evalproc.cc
@@ -38,7 +38,7 @@
 
 #include "gm.h"
 #include "evm.h"
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 #include "shapes.h"
 #include "elements.h"
 
diff --git a/dune/uggrid/gm/evm.cc b/dune/uggrid/gm/evm.cc
index 81e702c9e42505f830057d80f9bfa9943a7ad6e1..2dd6e5b3a90d1aba345c0f0d0b75c34dd4334488 100644
--- a/dune/uggrid/gm/evm.cc
+++ b/dune/uggrid/gm/evm.cc
@@ -39,7 +39,7 @@
 #include <dune/uggrid/low/architecture.h>
 #include <dune/uggrid/low/general.h>
 #include <dune/uggrid/low/misc.h>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 #include <dune/uggrid/low/ugtypes.h>
 
 #include "elements.h"
diff --git a/dune/uggrid/gm/gmcheck.cc b/dune/uggrid/gm/gmcheck.cc
index 369d4c3ff6db91ce256c5ad43561827408eac9db..9d0b31aff689f44896b21916e8b0a27b88a31124 100644
--- a/dune/uggrid/gm/gmcheck.cc
+++ b/dune/uggrid/gm/gmcheck.cc
@@ -49,7 +49,7 @@
 #include <dune/uggrid/low/ugstruct.h>
 #include <dune/uggrid/low/ugtypes.h>
 
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 
 #include "evm.h"
 #include "gm.h"
diff --git a/dune/uggrid/gm/refine.cc b/dune/uggrid/gm/refine.cc
index 535b34da94c9af436da4dc0d502eefa37d45296f..a570c87495ab976bf7592a36934d90659121dd02 100644
--- a/dune/uggrid/gm/refine.cc
+++ b/dune/uggrid/gm/refine.cc
@@ -76,7 +76,7 @@
 #include <dune/uggrid/low/ugtypes.h>
 
 /* dev module */
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 
 /* gm module */
 #include "algebra.h"
diff --git a/dune/uggrid/gm/rm-show.cc b/dune/uggrid/gm/rm-show.cc
index ac5853517781df81d53f2c78a19a197155401b37..5a1ad3790233c51da39632c99abc91679e747d15 100644
--- a/dune/uggrid/gm/rm-show.cc
+++ b/dune/uggrid/gm/rm-show.cc
@@ -7,7 +7,7 @@
 
 #include <dune/uggrid/low/namespace.h>
 #include <dune/uggrid/low/initlow.h>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 #include <dune/uggrid/gm/initgm.h>
 #include <dune/uggrid/gm/rm.h>
 
diff --git a/dune/uggrid/gm/rm-tetrahedron-rules-test.cc b/dune/uggrid/gm/rm-tetrahedron-rules-test.cc
index fbd3c86f5278d852a39da9ab50e5fc91a4f0ed65..ca5c0563c35b5dd59201d3430099caf52771467b 100644
--- a/dune/uggrid/gm/rm-tetrahedron-rules-test.cc
+++ b/dune/uggrid/gm/rm-tetrahedron-rules-test.cc
@@ -5,7 +5,7 @@
 #include <dune/common/parallel/mpihelper.hh>
 #include <dune/common/test/testsuite.hh>
 
-#include <initug.h>
+#include <dune/uggrid/initug.h>
 
 #include "evm.h"
 #include "gm.h"
diff --git a/dune/uggrid/gm/rm-write2file.h b/dune/uggrid/gm/rm-write2file.h
index fa15b02c8211ffda8ff04379df2ae2a809ced7d9..5444adf6c35349805e5efdb627266436a11c6b78 100644
--- a/dune/uggrid/gm/rm-write2file.h
+++ b/dune/uggrid/gm/rm-write2file.h
@@ -16,7 +16,7 @@
 #include <algorithm>
 #include <iterator>
 
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 #include "gm.h"
 #include "rm.h"
 #include "evm.h"
diff --git a/dune/uggrid/gm/rm.cc b/dune/uggrid/gm/rm.cc
index d713f640e7edd4b2c622b95db4a7a7b7310adb2c..e99960c3dab30be90893300f1a012b1c4b537046 100644
--- a/dune/uggrid/gm/rm.cc
+++ b/dune/uggrid/gm/rm.cc
@@ -43,7 +43,7 @@
 #include <dune/uggrid/low/misc.h>
 
 /* dev module */
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 
 /* gm module */
 #include "evm.h"
diff --git a/dune/uggrid/gm/ugio.cc b/dune/uggrid/gm/ugio.cc
index a3eb5838af76e026f3f99ea077a021772c7ea9ea..0f08ddcb7c289694f0ae20359844f85ec9a9bf55 100644
--- a/dune/uggrid/gm/ugio.cc
+++ b/dune/uggrid/gm/ugio.cc
@@ -53,7 +53,7 @@
 #include <dune/uggrid/low/ugstruct.h>
 #include <dune/uggrid/low/ugtypes.h>
 
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 #ifdef ModelP
 #include <parallel/dddif/parallel.h>
 #endif
diff --git a/dune/uggrid/gm/ugm.cc b/dune/uggrid/gm/ugm.cc
index d25c8f5ff8baa17d59c87c49a852fa263a92c7ae..98de0425c546a89e0890678d33b164eb6d96fd52 100644
--- a/dune/uggrid/gm/ugm.cc
+++ b/dune/uggrid/gm/ugm.cc
@@ -56,7 +56,7 @@
 #include <dune/uggrid/low/ugstruct.h>
 #include <dune/uggrid/low/ugtypes.h>
 
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 #include <dune/common/unused.hh>
 
 #include "cw.h"
diff --git a/initug.cc b/dune/uggrid/initug.cc
similarity index 99%
rename from initug.cc
rename to dune/uggrid/initug.cc
index 3eaf3974931d6ded5d9250e01e11a103de13bdd0..982c759c34fc4d5e814aaca512e6da27eaf66e2a 100644
--- a/initug.cc
+++ b/dune/uggrid/initug.cc
@@ -58,7 +58,7 @@ using namespace PPIF;
 #endif
 
 /* devices module */
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 
 /* domain module */
 #include <dune/uggrid/domain/domain.h>
diff --git a/initug.h b/dune/uggrid/initug.h
similarity index 100%
rename from initug.h
rename to dune/uggrid/initug.h
diff --git a/dune/uggrid/lib/CMakeLists.txt b/dune/uggrid/lib/CMakeLists.txt
index b036bc75fdc9323455ebe96bc715a86d8ba50912..05a2c0df9c6c5f1e7a999f965446c45e55c0cf5a 100644
--- a/dune/uggrid/lib/CMakeLists.txt
+++ b/dune/uggrid/lib/CMakeLists.txt
@@ -15,7 +15,7 @@ dune_add_library(ugL $<TARGET_OBJECTS:devices> $<TARGET_OBJECTS:low> ${_parallel
   ../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}
   )
diff --git a/dune/uggrid/low/debug.cc b/dune/uggrid/low/debug.cc
index 304d866a7b16b6fda5e2c29239efe2a02501520e..b559d88e632333dd6c4dac96753256b42574a7e6 100644
--- a/dune/uggrid/low/debug.cc
+++ b/dune/uggrid/low/debug.cc
@@ -39,7 +39,7 @@
 #include <cstdio>
 #include <stdarg.h>
 
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 #include "fileopen.h"
 #include "debug.h"
 
diff --git a/dune/uggrid/low/fileopen.cc b/dune/uggrid/low/fileopen.cc
index 48fc76fe9f33b0b33808f05313bac3f6d23d446f..b7c9bd33b8e0b7a461db640b67fc1b3e56c26512 100644
--- a/dune/uggrid/low/fileopen.cc
+++ b/dune/uggrid/low/fileopen.cc
@@ -70,7 +70,7 @@
 #include "defaults.h"
 #include "general.h"
 #include "ugenv.h"
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 
 #include "fileopen.h"
 
diff --git a/dune/uggrid/low/heaps.cc b/dune/uggrid/low/heaps.cc
index 1c7f1f95f0e7248990ce09c887ef26185d912dec..1e3891809a4b5b0b9b057fafa2b6dfd4dfea5103 100644
--- a/dune/uggrid/low/heaps.cc
+++ b/dune/uggrid/low/heaps.cc
@@ -42,7 +42,7 @@
 #include "misc.h"
 #include "general.h"
 #include "debug.h"
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 
 #include "namespace.h"
 USING_UG_NAMESPACE
diff --git a/dune/uggrid/low/ugenv.cc b/dune/uggrid/low/ugenv.cc
index bcfa39d595b8c9cb3e1e442af1eb00c9268a4de4..101d75e187aa9a1566730736a7a0ca1abecc341a 100644
--- a/dune/uggrid/low/ugenv.cc
+++ b/dune/uggrid/low/ugenv.cc
@@ -37,7 +37,7 @@
 #include "misc.h"
 #include "ugenv.h"
 /** \todo this is a hierarchy conflict, remove. (VR) */
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 
 USING_UG_NAMESPACE
 
diff --git a/dev/ugdevices.cc b/dune/uggrid/ugdevices.cc
similarity index 99%
rename from dev/ugdevices.cc
rename to dune/uggrid/ugdevices.cc
index 9b276601f4150769773279b5757bc5685110680c..2cdbb889a0c021f2de3baee6d23dd608f478416d 100644
--- a/dev/ugdevices.cc
+++ b/dune/uggrid/ugdevices.cc
@@ -46,7 +46,7 @@
 #include <dune/uggrid/low/ugtypes.h>
 
 /* dev module */
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 
 /* dddif module */
 #ifdef ModelP
diff --git a/dev/ugdevices.doc b/dune/uggrid/ugdevices.doc
similarity index 100%
rename from dev/ugdevices.doc
rename to dune/uggrid/ugdevices.doc
diff --git a/dev/ugdevices.h b/dune/uggrid/ugdevices.h
similarity index 100%
rename from dev/ugdevices.h
rename to dune/uggrid/ugdevices.h
diff --git a/np/udm/disctools.cc b/np/udm/disctools.cc
index 08cd07c773c3caf2bbbed408cdcee156b3eced72..0e39765665f9ca601e0cae7cd0f71e0b9b43c218 100644
--- a/np/udm/disctools.cc
+++ b/np/udm/disctools.cc
@@ -37,7 +37,7 @@
 
 #include <dune/uggrid/gm/evm.h>      /* for data structure               */
 #include <dune/uggrid/gm/gm.h>       /* for data structure               */
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 #include <dune/uggrid/low/general.h>
 
 #include "disctools.h"
diff --git a/np/udm/formats.cc b/np/udm/formats.cc
index 54053be8cda9db1f9889b50e59114356d2f3e881..1cc63f537b28a1f594a44946f700ebdf6235e7fa 100644
--- a/np/udm/formats.cc
+++ b/np/udm/formats.cc
@@ -33,7 +33,7 @@
 #include <cstring>
 #include <ctype.h>
 
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 #include <dune/uggrid/gm/algebra.h>
 #include <dune/uggrid/gm/enrol.h>
 #include <dune/uggrid/gm/gm.h>
diff --git a/np/udm/udm.cc b/np/udm/udm.cc
index 89f8174ab109e276b362f963e7f771112c7bf522..49996c8129bc9350cac9548f9c8fc0c8640d1285 100644
--- a/np/udm/udm.cc
+++ b/np/udm/udm.cc
@@ -32,7 +32,7 @@
 
 #include <cstring>
 
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 #include <dune/uggrid/gm/gm.h>
 #include <dune/uggrid/gm/rm.h>
 #include <dune/uggrid/low/architecture.h>
diff --git a/parallel/dddif/debugger.cc b/parallel/dddif/debugger.cc
index 68003786dd989bfc7a061701c2a07a984ac31cba..5edaedfa16e91d43a843cb294ace552beb42e9ce 100644
--- a/parallel/dddif/debugger.cc
+++ b/parallel/dddif/debugger.cc
@@ -11,7 +11,7 @@
 #include "parallel.h"
 #include "memmgr.h"
 #include <dune/uggrid/gm/ugm.h>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 #include <dune/uggrid/low/general.h>
 #include <dune/uggrid/low/namespace.h>
 
diff --git a/parallel/dddif/gridcons.cc b/parallel/dddif/gridcons.cc
index f12616f28c6948b0d9ccdc0e8836897e2248307e..f3ccd41df48c5aaab0195afa531f814528630c19 100644
--- a/parallel/dddif/gridcons.cc
+++ b/parallel/dddif/gridcons.cc
@@ -40,7 +40,7 @@
 #include <dune/uggrid/gm/refine.h>
 #include <dune/uggrid/gm/shapes.h>
 #include <dune/uggrid/gm/ugm.h>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 
 /* UG namespaces: */
 USING_UG_NAMESPACES
diff --git a/parallel/dddif/handler.cc b/parallel/dddif/handler.cc
index c040fe4cebd96f8d8b88cb26ef9665038976127c..7c9bacb3727bd3daa332db7ce8f0099a744a6950 100644
--- a/parallel/dddif/handler.cc
+++ b/parallel/dddif/handler.cc
@@ -40,7 +40,7 @@
 
 #include <dune/common/unused.hh>
 
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 #include <dune/uggrid/domain/domain.h>
 #include "parallel.h"
 #include <dune/uggrid/gm/algebra.h>
diff --git a/parallel/dddif/identify.cc b/parallel/dddif/identify.cc
index e531c6e91dd469c60789f1207f9e7dd959b1aeab..efb3b517ab46a5ad515187bbcc1d44044b1a8098 100644
--- a/parallel/dddif/identify.cc
+++ b/parallel/dddif/identify.cc
@@ -34,7 +34,7 @@
 
 #include <dune/common/unused.hh>
 
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 
 #include <dune/uggrid/gm/gm.h>
 #include <dune/uggrid/gm/refine.h>
diff --git a/parallel/dddif/initddd.cc b/parallel/dddif/initddd.cc
index d75bac1a09764c23a280fbab3bee4aa7c1f2a7be..ea90568d0243751bb24066da37b69f527e0cbd3f 100644
--- a/parallel/dddif/initddd.cc
+++ b/parallel/dddif/initddd.cc
@@ -37,7 +37,7 @@
 #include <dune/uggrid/low/namespace.h>
 #include <dune/uggrid/gm/ugm.h>      /* for GetFreeOBJT() */
 #include "memmgr.h"
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 
 /* UG namespaces: */
 USING_UG_NAMESPACES
diff --git a/parallel/dddif/lb.cc b/parallel/dddif/lb.cc
index 4f798dc00b68026bf36c2449e2fa64ec158f8d2a..65d3f6725281dade0be611490f7a19f492be7f26 100644
--- a/parallel/dddif/lb.cc
+++ b/parallel/dddif/lb.cc
@@ -35,7 +35,7 @@
 #include "parallel.h"
 #include <dune/uggrid/gm/evm.h>
 #include <dune/uggrid/gm/ugm.h>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 #include <dune/uggrid/low/general.h>
 #include <dune/uggrid/low/namespace.h>
 
diff --git a/parallel/dddif/lbrcb.cc b/parallel/dddif/lbrcb.cc
index 1973ab3fb8462a5e5380e3a6009a2bfea8fd1431..738dee18c0b2990aa7b8913f0d6de2395bca3b7c 100644
--- a/parallel/dddif/lbrcb.cc
+++ b/parallel/dddif/lbrcb.cc
@@ -40,7 +40,7 @@
 #include "parallel.h"
 #include <dune/uggrid/low/general.h>
 #include <dune/uggrid/low/namespace.h>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 #include <dune/uggrid/gm/evm.h>
 #include <dune/uggrid/gm/ugm.h>
 
diff --git a/parallel/dddif/memmgr.cc b/parallel/dddif/memmgr.cc
index 9060a718447ad6e73f79c92f543b430e9a0680c7..848616f8994b0cd07a7f774599fa4a9461c00ae5 100644
--- a/parallel/dddif/memmgr.cc
+++ b/parallel/dddif/memmgr.cc
@@ -39,7 +39,7 @@
 #include <dune/uggrid/low/misc.h>
 #include <dune/uggrid/low/namespace.h>
 #include <dune/uggrid/low/ugtypes.h>
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 
 #include "parallel.h"
 
diff --git a/parallel/dddif/overlap.cc b/parallel/dddif/overlap.cc
index 045dd51d4586e37be1da8cbb781295bdfaeb6f29..5867c4de6d07d72f8773e148c42f92f141b05a35 100644
--- a/parallel/dddif/overlap.cc
+++ b/parallel/dddif/overlap.cc
@@ -43,7 +43,7 @@
 #include <dune/uggrid/low/ugtypes.h>
 
 /* dev module */
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 
 /* gm module */
 #include <dune/uggrid/gm/algebra.h>
diff --git a/parallel/dddif/partition.cc b/parallel/dddif/partition.cc
index 93e116a5938176ae711d3fd19a02c15c9ee86ff2..7428df4072393d1d43c733782a02355ae6c2cbda 100644
--- a/parallel/dddif/partition.cc
+++ b/parallel/dddif/partition.cc
@@ -44,7 +44,7 @@
 #include <dune/uggrid/low/ugtypes.h>
 
 /* dev module */
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 
 /* gm module */
 #include <dune/uggrid/gm/algebra.h>
diff --git a/parallel/dddif/pgmcheck.cc b/parallel/dddif/pgmcheck.cc
index d9eef2f78d537f4f355f1c48e3d9f06ef7211686..578e9ef5a960efa6cb4ea93474a61c1a682b7d7c 100644
--- a/parallel/dddif/pgmcheck.cc
+++ b/parallel/dddif/pgmcheck.cc
@@ -35,7 +35,7 @@
 #include <cstdlib>
 
 #include "parallel.h"
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 #include <dune/uggrid/gm/evm.h>
 #include <dune/uggrid/gm/gm.h>
 #include <dune/uggrid/gm/refine.h>
diff --git a/parallel/dddif/priority.cc b/parallel/dddif/priority.cc
index 8afbc730fa48ee1efd14eef676f399adbfa071ef..fb535e2771becd9c695fdcfcd75018558ca99935 100644
--- a/parallel/dddif/priority.cc
+++ b/parallel/dddif/priority.cc
@@ -33,7 +33,7 @@
 #include <cstdlib>
 
 #include "parallel.h"
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 #include <dune/uggrid/gm/evm.h>
 #include <dune/uggrid/gm/gm.h>
 #include <dune/uggrid/gm/refine.h>
diff --git a/parallel/dddif/trans.cc b/parallel/dddif/trans.cc
index d8632b0d2b4858e0bfcfab172b082572021f3b37..b005432a686ab621bbac7703344465f58ce539d0 100644
--- a/parallel/dddif/trans.cc
+++ b/parallel/dddif/trans.cc
@@ -37,7 +37,7 @@
 #include <dune/uggrid/parallel/ppif/ppifcontext.hh>
 
 #include "parallel.h"
-#include <dev/ugdevices.h>
+#include <dune/uggrid/ugdevices.h>
 #include <dune/uggrid/domain/domain.h>
 #include <dune/uggrid/gm/algebra.h>
 #include <dune/uggrid/gm/evm.h>
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
deleted file mode 100644
index 618f6539b6042f568f3b340534382a3b3a7ac0f6..0000000000000000000000000000000000000000
--- a/ui/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-install(FILES commands.h
-  DESTINATION ${CMAKE_INSTALL_PKGINCLUDEDIR})
-ug_add_dim_libs(ugui OBJECT SOURCES commands.cc)