From: Benedikt Boehm Date: Sun, 10 Sep 2006 17:07:57 +0000 (+0000) Subject: skip duplicate util-vserver dir X-Git-Tag: release-0.30.211~72 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c78378bebc1a9f3d400f422df8ede9efea57dea;hp=faa778968d1a7dfeaebc9fe4b847e691dc62fd15;p=util-vserver.git skip duplicate util-vserver dir git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2283 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/AUTHORS b/AUTHORS similarity index 100% rename from util-vserver/AUTHORS rename to AUTHORS diff --git a/util-vserver/ChangeLog.sed b/ChangeLog.sed similarity index 100% rename from util-vserver/ChangeLog.sed rename to ChangeLog.sed diff --git a/util-vserver/Makefile.am b/Makefile.am similarity index 100% rename from util-vserver/Makefile.am rename to Makefile.am diff --git a/util-vserver/NEWS b/NEWS similarity index 100% rename from util-vserver/NEWS rename to NEWS diff --git a/util-vserver/README b/README similarity index 100% rename from util-vserver/README rename to README diff --git a/util-vserver/REQUIREMENTS b/REQUIREMENTS similarity index 100% rename from util-vserver/REQUIREMENTS rename to REQUIREMENTS diff --git a/util-vserver/THANKS b/THANKS similarity index 100% rename from util-vserver/THANKS rename to THANKS diff --git a/util-vserver/build-all b/build-all similarity index 100% rename from util-vserver/build-all rename to build-all diff --git a/util-vserver/compat-c99.h b/compat-c99.h similarity index 100% rename from util-vserver/compat-c99.h rename to compat-c99.h diff --git a/util-vserver/compat.h b/compat.h similarity index 100% rename from util-vserver/compat.h rename to compat.h diff --git a/util-vserver/configure.ac b/configure.ac similarity index 100% rename from util-vserver/configure.ac rename to configure.ac diff --git a/util-vserver/contrib/.cvsignore b/contrib/.cvsignore similarity index 100% rename from util-vserver/contrib/.cvsignore rename to contrib/.cvsignore diff --git a/util-vserver/contrib/Makefile-files b/contrib/Makefile-files similarity index 100% rename from util-vserver/contrib/Makefile-files rename to contrib/Makefile-files diff --git a/util-vserver/contrib/make-manifest b/contrib/make-manifest similarity index 100% rename from util-vserver/contrib/make-manifest rename to contrib/make-manifest diff --git a/util-vserver/contrib/manifest.dat.pathsubst b/contrib/manifest.dat.pathsubst similarity index 100% rename from util-vserver/contrib/manifest.dat.pathsubst rename to contrib/manifest.dat.pathsubst diff --git a/util-vserver/contrib/yum-2.2.1-chroot.patch b/contrib/yum-2.2.1-chroot.patch similarity index 100% rename from util-vserver/contrib/yum-2.2.1-chroot.patch rename to contrib/yum-2.2.1-chroot.patch diff --git a/util-vserver/contrib/yum-2.3.2-chroot.patch b/contrib/yum-2.3.2-chroot.patch similarity index 100% rename from util-vserver/contrib/yum-2.3.2-chroot.patch rename to contrib/yum-2.3.2-chroot.patch diff --git a/util-vserver/contrib/yum-2.3.3-chroot.patch b/contrib/yum-2.3.3-chroot.patch similarity index 100% rename from util-vserver/contrib/yum-2.3.3-chroot.patch rename to contrib/yum-2.3.3-chroot.patch diff --git a/util-vserver/contrib/yum-2.3.4-chroot.patch b/contrib/yum-2.3.4-chroot.patch similarity index 100% rename from util-vserver/contrib/yum-2.3.4-chroot.patch rename to contrib/yum-2.3.4-chroot.patch diff --git a/util-vserver/contrib/yum-2.6.0-chroot.patch b/contrib/yum-2.6.0-chroot.patch similarity index 100% rename from util-vserver/contrib/yum-2.6.0-chroot.patch rename to contrib/yum-2.6.0-chroot.patch diff --git a/util-vserver/cvsusers.map b/cvsusers.map similarity index 100% rename from util-vserver/cvsusers.map rename to cvsusers.map diff --git a/util-vserver/distrib/.cvsignore b/distrib/.cvsignore similarity index 100% rename from util-vserver/distrib/.cvsignore rename to distrib/.cvsignore diff --git a/util-vserver/distrib/Makefile.am b/distrib/Makefile.am similarity index 100% rename from util-vserver/distrib/Makefile.am rename to distrib/Makefile.am diff --git a/util-vserver/distrib/centos42/pkgs/01 b/distrib/centos42/pkgs/01 similarity index 100% rename from util-vserver/distrib/centos42/pkgs/01 rename to distrib/centos42/pkgs/01 diff --git a/util-vserver/distrib/centos42/pkgs/02 b/distrib/centos42/pkgs/02 similarity index 100% rename from util-vserver/distrib/centos42/pkgs/02 rename to distrib/centos42/pkgs/02 diff --git a/util-vserver/distrib/centos42/pkgs/03 b/distrib/centos42/pkgs/03 similarity index 100% rename from util-vserver/distrib/centos42/pkgs/03 rename to distrib/centos42/pkgs/03 diff --git a/util-vserver/distrib/centos42/yum.repos.d/CentOS-Base.repo b/distrib/centos42/yum.repos.d/CentOS-Base.repo similarity index 100% rename from util-vserver/distrib/centos42/yum.repos.d/CentOS-Base.repo rename to distrib/centos42/yum.repos.d/CentOS-Base.repo diff --git a/util-vserver/distrib/centos42/yum/yum.conf b/distrib/centos42/yum/yum.conf similarity index 100% rename from util-vserver/distrib/centos42/yum/yum.conf rename to distrib/centos42/yum/yum.conf diff --git a/util-vserver/distrib/defaults/apt.conf b/distrib/defaults/apt.conf similarity index 100% rename from util-vserver/distrib/defaults/apt.conf rename to distrib/defaults/apt.conf diff --git a/util-vserver/distrib/defaults/apt/apt.conf b/distrib/defaults/apt/apt.conf similarity index 100% rename from util-vserver/distrib/defaults/apt/apt.conf rename to distrib/defaults/apt/apt.conf diff --git a/util-vserver/distrib/defaults/devs b/distrib/defaults/devs similarity index 100% rename from util-vserver/distrib/defaults/devs rename to distrib/defaults/devs diff --git a/util-vserver/distrib/defaults/rpm/macros b/distrib/defaults/rpm/macros similarity index 100% rename from util-vserver/distrib/defaults/rpm/macros rename to distrib/defaults/rpm/macros diff --git a/util-vserver/distrib/fc1/apt/rpmpriorities b/distrib/fc1/apt/rpmpriorities similarity index 100% rename from util-vserver/distrib/fc1/apt/rpmpriorities rename to distrib/fc1/apt/rpmpriorities diff --git a/util-vserver/distrib/fc1/apt/sources.list b/distrib/fc1/apt/sources.list similarity index 100% rename from util-vserver/distrib/fc1/apt/sources.list rename to distrib/fc1/apt/sources.list diff --git a/util-vserver/distrib/fc1/pkgs/01 b/distrib/fc1/pkgs/01 similarity index 100% rename from util-vserver/distrib/fc1/pkgs/01 rename to distrib/fc1/pkgs/01 diff --git a/util-vserver/distrib/fc1/pkgs/02 b/distrib/fc1/pkgs/02 similarity index 100% rename from util-vserver/distrib/fc1/pkgs/02 rename to distrib/fc1/pkgs/02 diff --git a/util-vserver/distrib/fc2/apt/rpmpriorities b/distrib/fc2/apt/rpmpriorities similarity index 100% rename from util-vserver/distrib/fc2/apt/rpmpriorities rename to distrib/fc2/apt/rpmpriorities diff --git a/util-vserver/distrib/fc2/apt/sources.list b/distrib/fc2/apt/sources.list similarity index 100% rename from util-vserver/distrib/fc2/apt/sources.list rename to distrib/fc2/apt/sources.list diff --git a/util-vserver/distrib/fc2/pkgs/01 b/distrib/fc2/pkgs/01 similarity index 100% rename from util-vserver/distrib/fc2/pkgs/01 rename to distrib/fc2/pkgs/01 diff --git a/util-vserver/distrib/fc2/pkgs/02 b/distrib/fc2/pkgs/02 similarity index 100% rename from util-vserver/distrib/fc2/pkgs/02 rename to distrib/fc2/pkgs/02 diff --git a/util-vserver/distrib/fc3/apt/rpmpriorities b/distrib/fc3/apt/rpmpriorities similarity index 100% rename from util-vserver/distrib/fc3/apt/rpmpriorities rename to distrib/fc3/apt/rpmpriorities diff --git a/util-vserver/distrib/fc3/apt/sources.list b/distrib/fc3/apt/sources.list similarity index 100% rename from util-vserver/distrib/fc3/apt/sources.list rename to distrib/fc3/apt/sources.list diff --git a/util-vserver/distrib/fc3/pkgs/01 b/distrib/fc3/pkgs/01 similarity index 100% rename from util-vserver/distrib/fc3/pkgs/01 rename to distrib/fc3/pkgs/01 diff --git a/util-vserver/distrib/fc3/pkgs/02 b/distrib/fc3/pkgs/02 similarity index 100% rename from util-vserver/distrib/fc3/pkgs/02 rename to distrib/fc3/pkgs/02 diff --git a/util-vserver/distrib/fc3/pkgs/03 b/distrib/fc3/pkgs/03 similarity index 100% rename from util-vserver/distrib/fc3/pkgs/03 rename to distrib/fc3/pkgs/03 diff --git a/util-vserver/distrib/fc3/rpmlist.d/00.lst b/distrib/fc3/rpmlist.d/00.lst similarity index 100% rename from util-vserver/distrib/fc3/rpmlist.d/00.lst rename to distrib/fc3/rpmlist.d/00.lst diff --git a/util-vserver/distrib/fc3/yum.repos.d/fedora-devel.repo b/distrib/fc3/yum.repos.d/fedora-devel.repo similarity index 100% rename from util-vserver/distrib/fc3/yum.repos.d/fedora-devel.repo rename to distrib/fc3/yum.repos.d/fedora-devel.repo diff --git a/util-vserver/distrib/fc3/yum.repos.d/fedora-updates-testing.repo b/distrib/fc3/yum.repos.d/fedora-updates-testing.repo similarity index 100% rename from util-vserver/distrib/fc3/yum.repos.d/fedora-updates-testing.repo rename to distrib/fc3/yum.repos.d/fedora-updates-testing.repo diff --git a/util-vserver/distrib/fc3/yum.repos.d/fedora-updates.repo b/distrib/fc3/yum.repos.d/fedora-updates.repo similarity index 100% rename from util-vserver/distrib/fc3/yum.repos.d/fedora-updates.repo rename to distrib/fc3/yum.repos.d/fedora-updates.repo diff --git a/util-vserver/distrib/fc3/yum.repos.d/fedora.repo b/distrib/fc3/yum.repos.d/fedora.repo similarity index 100% rename from util-vserver/distrib/fc3/yum.repos.d/fedora.repo rename to distrib/fc3/yum.repos.d/fedora.repo diff --git a/util-vserver/distrib/fc3/yum/yum.conf b/distrib/fc3/yum/yum.conf similarity index 100% rename from util-vserver/distrib/fc3/yum/yum.conf rename to distrib/fc3/yum/yum.conf diff --git a/util-vserver/distrib/fc4/apt/rpmpriorities b/distrib/fc4/apt/rpmpriorities similarity index 100% rename from util-vserver/distrib/fc4/apt/rpmpriorities rename to distrib/fc4/apt/rpmpriorities diff --git a/util-vserver/distrib/fc4/apt/sources.list b/distrib/fc4/apt/sources.list similarity index 100% rename from util-vserver/distrib/fc4/apt/sources.list rename to distrib/fc4/apt/sources.list diff --git a/util-vserver/distrib/fc4/pkgs/01 b/distrib/fc4/pkgs/01 similarity index 100% rename from util-vserver/distrib/fc4/pkgs/01 rename to distrib/fc4/pkgs/01 diff --git a/util-vserver/distrib/fc4/pkgs/02 b/distrib/fc4/pkgs/02 similarity index 100% rename from util-vserver/distrib/fc4/pkgs/02 rename to distrib/fc4/pkgs/02 diff --git a/util-vserver/distrib/fc4/pkgs/03 b/distrib/fc4/pkgs/03 similarity index 100% rename from util-vserver/distrib/fc4/pkgs/03 rename to distrib/fc4/pkgs/03 diff --git a/util-vserver/distrib/fc4/rpmlist.d/00.lst b/distrib/fc4/rpmlist.d/00.lst similarity index 100% rename from util-vserver/distrib/fc4/rpmlist.d/00.lst rename to distrib/fc4/rpmlist.d/00.lst diff --git a/util-vserver/distrib/fc4/yum.repos.d/fedora-devel.repo b/distrib/fc4/yum.repos.d/fedora-devel.repo similarity index 100% rename from util-vserver/distrib/fc4/yum.repos.d/fedora-devel.repo rename to distrib/fc4/yum.repos.d/fedora-devel.repo diff --git a/util-vserver/distrib/fc4/yum.repos.d/fedora-updates-testing.repo b/distrib/fc4/yum.repos.d/fedora-updates-testing.repo similarity index 100% rename from util-vserver/distrib/fc4/yum.repos.d/fedora-updates-testing.repo rename to distrib/fc4/yum.repos.d/fedora-updates-testing.repo diff --git a/util-vserver/distrib/fc4/yum.repos.d/fedora-updates.repo b/distrib/fc4/yum.repos.d/fedora-updates.repo similarity index 100% rename from util-vserver/distrib/fc4/yum.repos.d/fedora-updates.repo rename to distrib/fc4/yum.repos.d/fedora-updates.repo diff --git a/util-vserver/distrib/fc4/yum.repos.d/fedora.repo b/distrib/fc4/yum.repos.d/fedora.repo similarity index 100% rename from util-vserver/distrib/fc4/yum.repos.d/fedora.repo rename to distrib/fc4/yum.repos.d/fedora.repo diff --git a/util-vserver/distrib/fc4/yum/yum.conf b/distrib/fc4/yum/yum.conf similarity index 100% rename from util-vserver/distrib/fc4/yum/yum.conf rename to distrib/fc4/yum/yum.conf diff --git a/util-vserver/distrib/misc/debootstrap.uri b/distrib/misc/debootstrap.uri similarity index 100% rename from util-vserver/distrib/misc/debootstrap.uri rename to distrib/misc/debootstrap.uri diff --git a/util-vserver/distrib/misc/fstab b/distrib/misc/fstab similarity index 100% rename from util-vserver/distrib/misc/fstab rename to distrib/misc/fstab diff --git a/util-vserver/distrib/misc/mtab b/distrib/misc/mtab similarity index 100% rename from util-vserver/distrib/misc/mtab rename to distrib/misc/mtab diff --git a/util-vserver/distrib/misc/vprocunhide-files b/distrib/misc/vprocunhide-files similarity index 100% rename from util-vserver/distrib/misc/vprocunhide-files rename to distrib/misc/vprocunhide-files diff --git a/util-vserver/distrib/misc/vunify-exclude b/distrib/misc/vunify-exclude similarity index 100% rename from util-vserver/distrib/misc/vunify-exclude rename to distrib/misc/vunify-exclude diff --git a/util-vserver/distrib/redhat/initpost b/distrib/redhat/initpost similarity index 100% rename from util-vserver/distrib/redhat/initpost rename to distrib/redhat/initpost diff --git a/util-vserver/distrib/redhat/initpre b/distrib/redhat/initpre similarity index 100% rename from util-vserver/distrib/redhat/initpre rename to distrib/redhat/initpre diff --git a/util-vserver/distrib/redhat/rc.sysinit b/distrib/redhat/rc.sysinit similarity index 100% rename from util-vserver/distrib/redhat/rc.sysinit rename to distrib/redhat/rc.sysinit diff --git a/util-vserver/distrib/rh9/apt/rpmpriorities b/distrib/rh9/apt/rpmpriorities similarity index 100% rename from util-vserver/distrib/rh9/apt/rpmpriorities rename to distrib/rh9/apt/rpmpriorities diff --git a/util-vserver/distrib/rh9/apt/sources.list b/distrib/rh9/apt/sources.list similarity index 100% rename from util-vserver/distrib/rh9/apt/sources.list rename to distrib/rh9/apt/sources.list diff --git a/util-vserver/distrib/rh9/pkgs/01 b/distrib/rh9/pkgs/01 similarity index 100% rename from util-vserver/distrib/rh9/pkgs/01 rename to distrib/rh9/pkgs/01 diff --git a/util-vserver/distrib/rh9/pkgs/02 b/distrib/rh9/pkgs/02 similarity index 100% rename from util-vserver/distrib/rh9/pkgs/02 rename to distrib/rh9/pkgs/02 diff --git a/util-vserver/distrib/suse91/apt/rpmpriorities b/distrib/suse91/apt/rpmpriorities similarity index 100% rename from util-vserver/distrib/suse91/apt/rpmpriorities rename to distrib/suse91/apt/rpmpriorities diff --git a/util-vserver/distrib/suse91/apt/sources.list b/distrib/suse91/apt/sources.list similarity index 100% rename from util-vserver/distrib/suse91/apt/sources.list rename to distrib/suse91/apt/sources.list diff --git a/util-vserver/distrib/suse91/initpost b/distrib/suse91/initpost similarity index 100% rename from util-vserver/distrib/suse91/initpost rename to distrib/suse91/initpost diff --git a/util-vserver/distrib/suse91/pkgs/01 b/distrib/suse91/pkgs/01 similarity index 100% rename from util-vserver/distrib/suse91/pkgs/01 rename to distrib/suse91/pkgs/01 diff --git a/util-vserver/distrib/suse91/pkgs/02 b/distrib/suse91/pkgs/02 similarity index 100% rename from util-vserver/distrib/suse91/pkgs/02 rename to distrib/suse91/pkgs/02 diff --git a/util-vserver/distrib/suse91/rpm/macros b/distrib/suse91/rpm/macros similarity index 100% rename from util-vserver/distrib/suse91/rpm/macros rename to distrib/suse91/rpm/macros diff --git a/util-vserver/distrib/template/initpost b/distrib/template/initpost similarity index 100% rename from util-vserver/distrib/template/initpost rename to distrib/template/initpost diff --git a/util-vserver/distrib/template/initpre b/distrib/template/initpre similarity index 100% rename from util-vserver/distrib/template/initpre rename to distrib/template/initpre diff --git a/util-vserver/doc/.cvsignore b/doc/.cvsignore similarity index 100% rename from util-vserver/doc/.cvsignore rename to doc/.cvsignore diff --git a/util-vserver/doc/Makefile-files b/doc/Makefile-files similarity index 100% rename from util-vserver/doc/Makefile-files rename to doc/Makefile-files diff --git a/util-vserver/doc/compatibility-xhtml.xsl b/doc/compatibility-xhtml.xsl similarity index 100% rename from util-vserver/doc/compatibility-xhtml.xsl rename to doc/compatibility-xhtml.xsl diff --git a/util-vserver/doc/compatibility.css b/doc/compatibility.css similarity index 100% rename from util-vserver/doc/compatibility.css rename to doc/compatibility.css diff --git a/util-vserver/doc/compatibility.dtd b/doc/compatibility.dtd similarity index 100% rename from util-vserver/doc/compatibility.dtd rename to doc/compatibility.dtd diff --git a/util-vserver/doc/compatibility.xml b/doc/compatibility.xml similarity index 100% rename from util-vserver/doc/compatibility.xml rename to doc/compatibility.xml diff --git a/util-vserver/doc/configuration-xhtml.xsl b/doc/configuration-xhtml.xsl similarity index 100% rename from util-vserver/doc/configuration-xhtml.xsl rename to doc/configuration-xhtml.xsl diff --git a/util-vserver/doc/configuration.css b/doc/configuration.css similarity index 100% rename from util-vserver/doc/configuration.css rename to doc/configuration.css diff --git a/util-vserver/doc/configuration.dtd b/doc/configuration.dtd similarity index 100% rename from util-vserver/doc/configuration.dtd rename to doc/configuration.dtd diff --git a/util-vserver/doc/configuration.xml b/doc/configuration.xml similarity index 100% rename from util-vserver/doc/configuration.xml rename to doc/configuration.xml diff --git a/util-vserver/doc/configuration.xsd b/doc/configuration.xsd similarity index 100% rename from util-vserver/doc/configuration.xsd rename to doc/configuration.xsd diff --git a/util-vserver/doc/intro.txt b/doc/intro.txt similarity index 100% rename from util-vserver/doc/intro.txt rename to doc/intro.txt diff --git a/util-vserver/doc/vunify-verbosity.txt b/doc/vunify-verbosity.txt similarity index 100% rename from util-vserver/doc/vunify-verbosity.txt rename to doc/vunify-verbosity.txt diff --git a/util-vserver/ensc_fmt/.cvsignore b/ensc_fmt/.cvsignore similarity index 100% rename from util-vserver/ensc_fmt/.cvsignore rename to ensc_fmt/.cvsignore diff --git a/util-vserver/ensc_fmt/Makefile-files b/ensc_fmt/Makefile-files similarity index 100% rename from util-vserver/ensc_fmt/Makefile-files rename to ensc_fmt/Makefile-files diff --git a/util-vserver/ensc_fmt/fmt-32.c b/ensc_fmt/fmt-32.c similarity index 100% rename from util-vserver/ensc_fmt/fmt-32.c rename to ensc_fmt/fmt-32.c diff --git a/util-vserver/ensc_fmt/fmt-64.c b/ensc_fmt/fmt-64.c similarity index 100% rename from util-vserver/ensc_fmt/fmt-64.c rename to ensc_fmt/fmt-64.c diff --git a/util-vserver/ensc_fmt/fmt-internal.h b/ensc_fmt/fmt-internal.h similarity index 100% rename from util-vserver/ensc_fmt/fmt-internal.h rename to ensc_fmt/fmt-internal.h diff --git a/util-vserver/ensc_fmt/fmt-tai64n.c b/ensc_fmt/fmt-tai64n.c similarity index 100% rename from util-vserver/ensc_fmt/fmt-tai64n.c rename to ensc_fmt/fmt-tai64n.c diff --git a/util-vserver/ensc_fmt/fmt.h b/ensc_fmt/fmt.h similarity index 100% rename from util-vserver/ensc_fmt/fmt.h rename to ensc_fmt/fmt.h diff --git a/util-vserver/ensc_fmt/fmt.hc b/ensc_fmt/fmt.hc similarity index 100% rename from util-vserver/ensc_fmt/fmt.hc rename to ensc_fmt/fmt.hc diff --git a/util-vserver/ensc_fmt/fmtx-32.c b/ensc_fmt/fmtx-32.c similarity index 100% rename from util-vserver/ensc_fmt/fmtx-32.c rename to ensc_fmt/fmtx-32.c diff --git a/util-vserver/ensc_fmt/fmtx-64.c b/ensc_fmt/fmtx-64.c similarity index 100% rename from util-vserver/ensc_fmt/fmtx-64.c rename to ensc_fmt/fmtx-64.c diff --git a/util-vserver/ensc_fmt/fmtx.hc b/ensc_fmt/fmtx.hc similarity index 100% rename from util-vserver/ensc_fmt/fmtx.hc rename to ensc_fmt/fmtx.hc diff --git a/util-vserver/ensc_vector/.cvsignore b/ensc_vector/.cvsignore similarity index 100% rename from util-vserver/ensc_vector/.cvsignore rename to ensc_vector/.cvsignore diff --git a/util-vserver/ensc_vector/Makefile-files b/ensc_vector/Makefile-files similarity index 100% rename from util-vserver/ensc_vector/Makefile-files rename to ensc_vector/Makefile-files diff --git a/util-vserver/ensc_vector/list-add.c b/ensc_vector/list-add.c similarity index 100% rename from util-vserver/ensc_vector/list-add.c rename to ensc_vector/list-add.c diff --git a/util-vserver/ensc_vector/list-at.c b/ensc_vector/list-at.c similarity index 100% rename from util-vserver/ensc_vector/list-at.c rename to ensc_vector/list-at.c diff --git a/util-vserver/ensc_vector/list-free.c b/ensc_vector/list-free.c similarity index 100% rename from util-vserver/ensc_vector/list-free.c rename to ensc_vector/list-free.c diff --git a/util-vserver/ensc_vector/list-init.c b/ensc_vector/list-init.c similarity index 100% rename from util-vserver/ensc_vector/list-init.c rename to ensc_vector/list-init.c diff --git a/util-vserver/ensc_vector/list-insertinternal.c b/ensc_vector/list-insertinternal.c similarity index 100% rename from util-vserver/ensc_vector/list-insertinternal.c rename to ensc_vector/list-insertinternal.c diff --git a/util-vserver/ensc_vector/list-internal.h b/ensc_vector/list-internal.h similarity index 100% rename from util-vserver/ensc_vector/list-internal.h rename to ensc_vector/list-internal.h diff --git a/util-vserver/ensc_vector/list-search.c b/ensc_vector/list-search.c similarity index 100% rename from util-vserver/ensc_vector/list-search.c rename to ensc_vector/list-search.c diff --git a/util-vserver/ensc_vector/list-searchselforg.c b/ensc_vector/list-searchselforg.c similarity index 100% rename from util-vserver/ensc_vector/list-searchselforg.c rename to ensc_vector/list-searchselforg.c diff --git a/util-vserver/ensc_vector/list.h b/ensc_vector/list.h similarity index 100% rename from util-vserver/ensc_vector/list.h rename to ensc_vector/list.h diff --git a/util-vserver/ensc_vector/list.hc b/ensc_vector/list.hc similarity index 100% rename from util-vserver/ensc_vector/list.hc rename to ensc_vector/list.hc diff --git a/util-vserver/ensc_vector/testsuite/.cvsignore b/ensc_vector/testsuite/.cvsignore similarity index 100% rename from util-vserver/ensc_vector/testsuite/.cvsignore rename to ensc_vector/testsuite/.cvsignore diff --git a/util-vserver/ensc_vector/testsuite/Makefile-files b/ensc_vector/testsuite/Makefile-files similarity index 100% rename from util-vserver/ensc_vector/testsuite/Makefile-files rename to ensc_vector/testsuite/Makefile-files diff --git a/util-vserver/ensc_vector/testsuite/test1.c b/ensc_vector/testsuite/test1.c similarity index 100% rename from util-vserver/ensc_vector/testsuite/test1.c rename to ensc_vector/testsuite/test1.c diff --git a/util-vserver/ensc_vector/testsuite/test2.c b/ensc_vector/testsuite/test2.c similarity index 100% rename from util-vserver/ensc_vector/testsuite/test2.c rename to ensc_vector/testsuite/test2.c diff --git a/util-vserver/ensc_vector/vector-clear.c b/ensc_vector/vector-clear.c similarity index 100% rename from util-vserver/ensc_vector/vector-clear.c rename to ensc_vector/vector-clear.c diff --git a/util-vserver/ensc_vector/vector-foreach.c b/ensc_vector/vector-foreach.c similarity index 100% rename from util-vserver/ensc_vector/vector-foreach.c rename to ensc_vector/vector-foreach.c diff --git a/util-vserver/ensc_vector/vector-free.c b/ensc_vector/vector-free.c similarity index 100% rename from util-vserver/ensc_vector/vector-free.c rename to ensc_vector/vector-free.c diff --git a/util-vserver/ensc_vector/vector-init.c b/ensc_vector/vector-init.c similarity index 100% rename from util-vserver/ensc_vector/vector-init.c rename to ensc_vector/vector-init.c diff --git a/util-vserver/ensc_vector/vector-insert.c b/ensc_vector/vector-insert.c similarity index 100% rename from util-vserver/ensc_vector/vector-insert.c rename to ensc_vector/vector-insert.c diff --git a/util-vserver/ensc_vector/vector-internal.h b/ensc_vector/vector-internal.h similarity index 100% rename from util-vserver/ensc_vector/vector-internal.h rename to ensc_vector/vector-internal.h diff --git a/util-vserver/ensc_vector/vector-popback.c b/ensc_vector/vector-popback.c similarity index 100% rename from util-vserver/ensc_vector/vector-popback.c rename to ensc_vector/vector-popback.c diff --git a/util-vserver/ensc_vector/vector-pushback.c b/ensc_vector/vector-pushback.c similarity index 100% rename from util-vserver/ensc_vector/vector-pushback.c rename to ensc_vector/vector-pushback.c diff --git a/util-vserver/ensc_vector/vector-resize.c b/ensc_vector/vector-resize.c similarity index 100% rename from util-vserver/ensc_vector/vector-resize.c rename to ensc_vector/vector-resize.c diff --git a/util-vserver/ensc_vector/vector-resizeinternal.hc b/ensc_vector/vector-resizeinternal.hc similarity index 100% rename from util-vserver/ensc_vector/vector-resizeinternal.hc rename to ensc_vector/vector-resizeinternal.hc diff --git a/util-vserver/ensc_vector/vector-search.c b/ensc_vector/vector-search.c similarity index 100% rename from util-vserver/ensc_vector/vector-search.c rename to ensc_vector/vector-search.c diff --git a/util-vserver/ensc_vector/vector-searchselforg.c b/ensc_vector/vector-searchselforg.c similarity index 100% rename from util-vserver/ensc_vector/vector-searchselforg.c rename to ensc_vector/vector-searchselforg.c diff --git a/util-vserver/ensc_vector/vector-sort.c b/ensc_vector/vector-sort.c similarity index 100% rename from util-vserver/ensc_vector/vector-sort.c rename to ensc_vector/vector-sort.c diff --git a/util-vserver/ensc_vector/vector-unique.c b/ensc_vector/vector-unique.c similarity index 100% rename from util-vserver/ensc_vector/vector-unique.c rename to ensc_vector/vector-unique.c diff --git a/util-vserver/ensc_vector/vector-zeroend.c b/ensc_vector/vector-zeroend.c similarity index 100% rename from util-vserver/ensc_vector/vector-zeroend.c rename to ensc_vector/vector-zeroend.c diff --git a/util-vserver/ensc_vector/vector.h b/ensc_vector/vector.h similarity index 100% rename from util-vserver/ensc_vector/vector.h rename to ensc_vector/vector.h diff --git a/util-vserver/ensc_vector/vector.hc b/ensc_vector/vector.hc similarity index 100% rename from util-vserver/ensc_vector/vector.hc rename to ensc_vector/vector.hc diff --git a/util-vserver/ensc_wrappers/Makefile-files b/ensc_wrappers/Makefile-files similarity index 100% rename from util-vserver/ensc_wrappers/Makefile-files rename to ensc_wrappers/Makefile-files diff --git a/util-vserver/ensc_wrappers/wrappers-clone.hc b/ensc_wrappers/wrappers-clone.hc similarity index 100% rename from util-vserver/ensc_wrappers/wrappers-clone.hc rename to ensc_wrappers/wrappers-clone.hc diff --git a/util-vserver/ensc_wrappers/wrappers-dirent.hc b/ensc_wrappers/wrappers-dirent.hc similarity index 100% rename from util-vserver/ensc_wrappers/wrappers-dirent.hc rename to ensc_wrappers/wrappers-dirent.hc diff --git a/util-vserver/ensc_wrappers/wrappers-fcntl.hc b/ensc_wrappers/wrappers-fcntl.hc similarity index 100% rename from util-vserver/ensc_wrappers/wrappers-fcntl.hc rename to ensc_wrappers/wrappers-fcntl.hc diff --git a/util-vserver/ensc_wrappers/wrappers-io.hc b/ensc_wrappers/wrappers-io.hc similarity index 100% rename from util-vserver/ensc_wrappers/wrappers-io.hc rename to ensc_wrappers/wrappers-io.hc diff --git a/util-vserver/ensc_wrappers/wrappers-ioctl.hc b/ensc_wrappers/wrappers-ioctl.hc similarity index 100% rename from util-vserver/ensc_wrappers/wrappers-ioctl.hc rename to ensc_wrappers/wrappers-ioctl.hc diff --git a/util-vserver/ensc_wrappers/wrappers-iosock.hc b/ensc_wrappers/wrappers-iosock.hc similarity index 100% rename from util-vserver/ensc_wrappers/wrappers-iosock.hc rename to ensc_wrappers/wrappers-iosock.hc diff --git a/util-vserver/ensc_wrappers/wrappers-mount.hc b/ensc_wrappers/wrappers-mount.hc similarity index 100% rename from util-vserver/ensc_wrappers/wrappers-mount.hc rename to ensc_wrappers/wrappers-mount.hc diff --git a/util-vserver/ensc_wrappers/wrappers-pivot.hc b/ensc_wrappers/wrappers-pivot.hc similarity index 100% rename from util-vserver/ensc_wrappers/wrappers-pivot.hc rename to ensc_wrappers/wrappers-pivot.hc diff --git a/util-vserver/ensc_wrappers/wrappers-resource.hc b/ensc_wrappers/wrappers-resource.hc similarity index 100% rename from util-vserver/ensc_wrappers/wrappers-resource.hc rename to ensc_wrappers/wrappers-resource.hc diff --git a/util-vserver/ensc_wrappers/wrappers-socket.hc b/ensc_wrappers/wrappers-socket.hc similarity index 100% rename from util-vserver/ensc_wrappers/wrappers-socket.hc rename to ensc_wrappers/wrappers-socket.hc diff --git a/util-vserver/ensc_wrappers/wrappers-stat.hc b/ensc_wrappers/wrappers-stat.hc similarity index 100% rename from util-vserver/ensc_wrappers/wrappers-stat.hc rename to ensc_wrappers/wrappers-stat.hc diff --git a/util-vserver/ensc_wrappers/wrappers-stdlib.hc b/ensc_wrappers/wrappers-stdlib.hc similarity index 100% rename from util-vserver/ensc_wrappers/wrappers-stdlib.hc rename to ensc_wrappers/wrappers-stdlib.hc diff --git a/util-vserver/ensc_wrappers/wrappers-string.hc b/ensc_wrappers/wrappers-string.hc similarity index 100% rename from util-vserver/ensc_wrappers/wrappers-string.hc rename to ensc_wrappers/wrappers-string.hc diff --git a/util-vserver/ensc_wrappers/wrappers-unistd.hc b/ensc_wrappers/wrappers-unistd.hc similarity index 100% rename from util-vserver/ensc_wrappers/wrappers-unistd.hc rename to ensc_wrappers/wrappers-unistd.hc diff --git a/util-vserver/ensc_wrappers/wrappers-vserver.hc b/ensc_wrappers/wrappers-vserver.hc similarity index 100% rename from util-vserver/ensc_wrappers/wrappers-vserver.hc rename to ensc_wrappers/wrappers-vserver.hc diff --git a/util-vserver/ensc_wrappers/wrappers-wait.hc b/ensc_wrappers/wrappers-wait.hc similarity index 100% rename from util-vserver/ensc_wrappers/wrappers-wait.hc rename to ensc_wrappers/wrappers-wait.hc diff --git a/util-vserver/ensc_wrappers/wrappers.h b/ensc_wrappers/wrappers.h similarity index 100% rename from util-vserver/ensc_wrappers/wrappers.h rename to ensc_wrappers/wrappers.h diff --git a/util-vserver/ensc_wrappers/wrappers_handler.hc b/ensc_wrappers/wrappers_handler.hc similarity index 100% rename from util-vserver/ensc_wrappers/wrappers_handler.hc rename to ensc_wrappers/wrappers_handler.hc diff --git a/util-vserver/kernel/context.h b/kernel/context.h similarity index 100% rename from util-vserver/kernel/context.h rename to kernel/context.h diff --git a/util-vserver/kernel/context_cmd.h b/kernel/context_cmd.h similarity index 100% rename from util-vserver/kernel/context_cmd.h rename to kernel/context_cmd.h diff --git a/util-vserver/kernel/cvirt.h b/kernel/cvirt.h similarity index 100% rename from util-vserver/kernel/cvirt.h rename to kernel/cvirt.h diff --git a/util-vserver/kernel/cvirt_cmd.h b/kernel/cvirt_cmd.h similarity index 100% rename from util-vserver/kernel/cvirt_cmd.h rename to kernel/cvirt_cmd.h diff --git a/util-vserver/kernel/cvirt_def.h b/kernel/cvirt_def.h similarity index 100% rename from util-vserver/kernel/cvirt_def.h rename to kernel/cvirt_def.h diff --git a/util-vserver/kernel/debug.h b/kernel/debug.h similarity index 100% rename from util-vserver/kernel/debug.h rename to kernel/debug.h diff --git a/util-vserver/kernel/debug_cmd.h b/kernel/debug_cmd.h similarity index 100% rename from util-vserver/kernel/debug_cmd.h rename to kernel/debug_cmd.h diff --git a/util-vserver/kernel/dlimit.h b/kernel/dlimit.h similarity index 100% rename from util-vserver/kernel/dlimit.h rename to kernel/dlimit.h diff --git a/util-vserver/kernel/dlimit_cmd.h b/kernel/dlimit_cmd.h similarity index 100% rename from util-vserver/kernel/dlimit_cmd.h rename to kernel/dlimit_cmd.h diff --git a/util-vserver/kernel/inode.h b/kernel/inode.h similarity index 100% rename from util-vserver/kernel/inode.h rename to kernel/inode.h diff --git a/util-vserver/kernel/inode_cmd.h b/kernel/inode_cmd.h similarity index 100% rename from util-vserver/kernel/inode_cmd.h rename to kernel/inode_cmd.h diff --git a/util-vserver/kernel/legacy.h b/kernel/legacy.h similarity index 100% rename from util-vserver/kernel/legacy.h rename to kernel/legacy.h diff --git a/util-vserver/kernel/limit.h b/kernel/limit.h similarity index 100% rename from util-vserver/kernel/limit.h rename to kernel/limit.h diff --git a/util-vserver/kernel/limit_cmd.h b/kernel/limit_cmd.h similarity index 100% rename from util-vserver/kernel/limit_cmd.h rename to kernel/limit_cmd.h diff --git a/util-vserver/kernel/limit_def.h b/kernel/limit_def.h similarity index 100% rename from util-vserver/kernel/limit_def.h rename to kernel/limit_def.h diff --git a/util-vserver/kernel/namespace.h b/kernel/namespace.h similarity index 100% rename from util-vserver/kernel/namespace.h rename to kernel/namespace.h diff --git a/util-vserver/kernel/namespace_cmd.h b/kernel/namespace_cmd.h similarity index 100% rename from util-vserver/kernel/namespace_cmd.h rename to kernel/namespace_cmd.h diff --git a/util-vserver/kernel/network.h b/kernel/network.h similarity index 100% rename from util-vserver/kernel/network.h rename to kernel/network.h diff --git a/util-vserver/kernel/network_cmd.h b/kernel/network_cmd.h similarity index 100% rename from util-vserver/kernel/network_cmd.h rename to kernel/network_cmd.h diff --git a/util-vserver/kernel/sched.h b/kernel/sched.h similarity index 100% rename from util-vserver/kernel/sched.h rename to kernel/sched.h diff --git a/util-vserver/kernel/sched_cmd.h b/kernel/sched_cmd.h similarity index 100% rename from util-vserver/kernel/sched_cmd.h rename to kernel/sched_cmd.h diff --git a/util-vserver/kernel/sched_def.h b/kernel/sched_def.h similarity index 100% rename from util-vserver/kernel/sched_def.h rename to kernel/sched_def.h diff --git a/util-vserver/kernel/signal_cmd.h b/kernel/signal_cmd.h similarity index 100% rename from util-vserver/kernel/signal_cmd.h rename to kernel/signal_cmd.h diff --git a/util-vserver/kernel/switch.h b/kernel/switch.h similarity index 100% rename from util-vserver/kernel/switch.h rename to kernel/switch.h diff --git a/util-vserver/kernel/xid.h b/kernel/xid.h similarity index 100% rename from util-vserver/kernel/xid.h rename to kernel/xid.h diff --git a/util-vserver/lib/.cvsignore b/lib/.cvsignore similarity index 100% rename from util-vserver/lib/.cvsignore rename to lib/.cvsignore diff --git a/util-vserver/lib/Makefile-files b/lib/Makefile-files similarity index 100% rename from util-vserver/lib/Makefile-files rename to lib/Makefile-files diff --git a/util-vserver/lib/apidoc/.cvsignore b/lib/apidoc/.cvsignore similarity index 100% rename from util-vserver/lib/apidoc/.cvsignore rename to lib/apidoc/.cvsignore diff --git a/util-vserver/lib/apidoc/Doxyfile.in b/lib/apidoc/Doxyfile.in similarity index 100% rename from util-vserver/lib/apidoc/Doxyfile.in rename to lib/apidoc/Doxyfile.in diff --git a/util-vserver/lib/apidoc/Makefile-files b/lib/apidoc/Makefile-files similarity index 100% rename from util-vserver/lib/apidoc/Makefile-files rename to lib/apidoc/Makefile-files diff --git a/util-vserver/lib/apidoc/list2xxx.descr b/lib/apidoc/list2xxx.descr similarity index 100% rename from util-vserver/lib/apidoc/list2xxx.descr rename to lib/apidoc/list2xxx.descr diff --git a/util-vserver/lib/apidoc/list2xxx.syntax b/lib/apidoc/list2xxx.syntax similarity index 100% rename from util-vserver/lib/apidoc/list2xxx.syntax rename to lib/apidoc/list2xxx.syntax diff --git a/util-vserver/lib/bcaps-v13.c b/lib/bcaps-v13.c similarity index 100% rename from util-vserver/lib/bcaps-v13.c rename to lib/bcaps-v13.c diff --git a/util-vserver/lib/bcaps_list-v13.c b/lib/bcaps_list-v13.c similarity index 100% rename from util-vserver/lib/bcaps_list-v13.c rename to lib/bcaps_list-v13.c diff --git a/util-vserver/lib/capabilities.c b/lib/capabilities.c similarity index 100% rename from util-vserver/lib/capabilities.c rename to lib/capabilities.c diff --git a/util-vserver/lib/ccaps-v13.c b/lib/ccaps-v13.c similarity index 100% rename from util-vserver/lib/ccaps-v13.c rename to lib/ccaps-v13.c diff --git a/util-vserver/lib/ccaps_list-v13.c b/lib/ccaps_list-v13.c similarity index 100% rename from util-vserver/lib/ccaps_list-v13.c rename to lib/ccaps_list-v13.c diff --git a/util-vserver/lib/cflags-compat.c b/lib/cflags-compat.c similarity index 100% rename from util-vserver/lib/cflags-compat.c rename to lib/cflags-compat.c diff --git a/util-vserver/lib/cflags-v13.c b/lib/cflags-v13.c similarity index 100% rename from util-vserver/lib/cflags-v13.c rename to lib/cflags-v13.c diff --git a/util-vserver/lib/cflags_list-compat.c b/lib/cflags_list-compat.c similarity index 100% rename from util-vserver/lib/cflags_list-compat.c rename to lib/cflags_list-compat.c diff --git a/util-vserver/lib/cflags_list-v13.c b/lib/cflags_list-v13.c similarity index 100% rename from util-vserver/lib/cflags_list-v13.c rename to lib/cflags_list-v13.c diff --git a/util-vserver/lib/checkversion.c b/lib/checkversion.c similarity index 100% rename from util-vserver/lib/checkversion.c rename to lib/checkversion.c diff --git a/util-vserver/lib/comparevserverbyid.c b/lib/comparevserverbyid.c similarity index 100% rename from util-vserver/lib/comparevserverbyid.c rename to lib/comparevserverbyid.c diff --git a/util-vserver/lib/createskeleton-full.hc b/lib/createskeleton-full.hc similarity index 100% rename from util-vserver/lib/createskeleton-full.hc rename to lib/createskeleton-full.hc diff --git a/util-vserver/lib/createskeleton-short.hc b/lib/createskeleton-short.hc similarity index 100% rename from util-vserver/lib/createskeleton-short.hc rename to lib/createskeleton-short.hc diff --git a/util-vserver/lib/createskeleton.c b/lib/createskeleton.c similarity index 100% rename from util-vserver/lib/createskeleton.c rename to lib/createskeleton.c diff --git a/util-vserver/lib/ext2fs.h b/lib/ext2fs.h similarity index 100% rename from util-vserver/lib/ext2fs.h rename to lib/ext2fs.h diff --git a/util-vserver/lib/fmt.h b/lib/fmt.h similarity index 100% rename from util-vserver/lib/fmt.h rename to lib/fmt.h diff --git a/util-vserver/lib/getfilecontext.c b/lib/getfilecontext.c similarity index 100% rename from util-vserver/lib/getfilecontext.c rename to lib/getfilecontext.c diff --git a/util-vserver/lib/getinsecurebcaps.c b/lib/getinsecurebcaps.c similarity index 100% rename from util-vserver/lib/getinsecurebcaps.c rename to lib/getinsecurebcaps.c diff --git a/util-vserver/lib/getnbipv4root.c b/lib/getnbipv4root.c similarity index 100% rename from util-vserver/lib/getnbipv4root.c rename to lib/getnbipv4root.c diff --git a/util-vserver/lib/getprocentry-legacy.c b/lib/getprocentry-legacy.c similarity index 100% rename from util-vserver/lib/getprocentry-legacy.c rename to lib/getprocentry-legacy.c diff --git a/util-vserver/lib/getversion-internal.hc b/lib/getversion-internal.hc similarity index 100% rename from util-vserver/lib/getversion-internal.hc rename to lib/getversion-internal.hc diff --git a/util-vserver/lib/getversion.c b/lib/getversion.c similarity index 100% rename from util-vserver/lib/getversion.c rename to lib/getversion.c diff --git a/util-vserver/lib/getvserverappdir.c b/lib/getvserverappdir.c similarity index 100% rename from util-vserver/lib/getvserverappdir.c rename to lib/getvserverappdir.c diff --git a/util-vserver/lib/getvserverbyctx-compat.hc b/lib/getvserverbyctx-compat.hc similarity index 100% rename from util-vserver/lib/getvserverbyctx-compat.hc rename to lib/getvserverbyctx-compat.hc diff --git a/util-vserver/lib/getvserverbyctx-v13.hc b/lib/getvserverbyctx-v13.hc similarity index 100% rename from util-vserver/lib/getvserverbyctx-v13.hc rename to lib/getvserverbyctx-v13.hc diff --git a/util-vserver/lib/getvserverbyctx.c b/lib/getvserverbyctx.c similarity index 100% rename from util-vserver/lib/getvserverbyctx.c rename to lib/getvserverbyctx.c diff --git a/util-vserver/lib/getvservercfgdir.c b/lib/getvservercfgdir.c similarity index 100% rename from util-vserver/lib/getvservercfgdir.c rename to lib/getvservercfgdir.c diff --git a/util-vserver/lib/getvservercfgstyle.c b/lib/getvservercfgstyle.c similarity index 100% rename from util-vserver/lib/getvservercfgstyle.c rename to lib/getvservercfgstyle.c diff --git a/util-vserver/lib/getvserverctx.c b/lib/getvserverctx.c similarity index 100% rename from util-vserver/lib/getvserverctx.c rename to lib/getvserverctx.c diff --git a/util-vserver/lib/getvservername.c b/lib/getvservername.c similarity index 100% rename from util-vserver/lib/getvservername.c rename to lib/getvservername.c diff --git a/util-vserver/lib/getvservervdir.c b/lib/getvservervdir.c similarity index 100% rename from util-vserver/lib/getvservervdir.c rename to lib/getvservervdir.c diff --git a/util-vserver/lib/getxidtype.c b/lib/getxidtype.c similarity index 100% rename from util-vserver/lib/getxidtype.c rename to lib/getxidtype.c diff --git a/util-vserver/lib/internal.h b/lib/internal.h similarity index 100% rename from util-vserver/lib/internal.h rename to lib/internal.h diff --git a/util-vserver/lib/ioctl-getext2flags.hc b/lib/ioctl-getext2flags.hc similarity index 100% rename from util-vserver/lib/ioctl-getext2flags.hc rename to lib/ioctl-getext2flags.hc diff --git a/util-vserver/lib/ioctl-getfilecontext.hc b/lib/ioctl-getfilecontext.hc similarity index 100% rename from util-vserver/lib/ioctl-getfilecontext.hc rename to lib/ioctl-getfilecontext.hc diff --git a/util-vserver/lib/ioctl-getxflg.hc b/lib/ioctl-getxflg.hc similarity index 100% rename from util-vserver/lib/ioctl-getxflg.hc rename to lib/ioctl-getxflg.hc diff --git a/util-vserver/lib/ioctl-setext2flags.hc b/lib/ioctl-setext2flags.hc similarity index 100% rename from util-vserver/lib/ioctl-setext2flags.hc rename to lib/ioctl-setext2flags.hc diff --git a/util-vserver/lib/ioctl-setfilecontext.hc b/lib/ioctl-setfilecontext.hc similarity index 100% rename from util-vserver/lib/ioctl-setfilecontext.hc rename to lib/ioctl-setfilecontext.hc diff --git a/util-vserver/lib/ioctl-setxflg.hc b/lib/ioctl-setxflg.hc similarity index 100% rename from util-vserver/lib/ioctl-setxflg.hc rename to lib/ioctl-setxflg.hc diff --git a/util-vserver/lib/isdirectory.c b/lib/isdirectory.c similarity index 100% rename from util-vserver/lib/isdirectory.c rename to lib/isdirectory.c diff --git a/util-vserver/lib/isdynamicxid.c b/lib/isdynamicxid.c similarity index 100% rename from util-vserver/lib/isdynamicxid.c rename to lib/isdynamicxid.c diff --git a/util-vserver/lib/isfile.c b/lib/isfile.c similarity index 100% rename from util-vserver/lib/isfile.c rename to lib/isfile.c diff --git a/util-vserver/lib/islink.c b/lib/islink.c similarity index 100% rename from util-vserver/lib/islink.c rename to lib/islink.c diff --git a/util-vserver/lib/issupported.c b/lib/issupported.c similarity index 100% rename from util-vserver/lib/issupported.c rename to lib/issupported.c diff --git a/util-vserver/lib/issupportedstring.c b/lib/issupportedstring.c similarity index 100% rename from util-vserver/lib/issupportedstring.c rename to lib/issupportedstring.c diff --git a/util-vserver/lib/listparser.hc b/lib/listparser.hc similarity index 100% rename from util-vserver/lib/listparser.hc rename to lib/listparser.hc diff --git a/util-vserver/lib/listparser_uint32.c b/lib/listparser_uint32.c similarity index 100% rename from util-vserver/lib/listparser_uint32.c rename to lib/listparser_uint32.c diff --git a/util-vserver/lib/listparser_uint64.c b/lib/listparser_uint64.c similarity index 100% rename from util-vserver/lib/listparser_uint64.c rename to lib/listparser_uint64.c diff --git a/util-vserver/lib/ncaps-net.c b/lib/ncaps-net.c similarity index 100% rename from util-vserver/lib/ncaps-net.c rename to lib/ncaps-net.c diff --git a/util-vserver/lib/ncaps_list-net.c b/lib/ncaps_list-net.c similarity index 100% rename from util-vserver/lib/ncaps_list-net.c rename to lib/ncaps_list-net.c diff --git a/util-vserver/lib/nflags-net.c b/lib/nflags-net.c similarity index 100% rename from util-vserver/lib/nflags-net.c rename to lib/nflags-net.c diff --git a/util-vserver/lib/nflags_list-net.c b/lib/nflags_list-net.c similarity index 100% rename from util-vserver/lib/nflags_list-net.c rename to lib/nflags_list-net.c diff --git a/util-vserver/lib/parselimit.c b/lib/parselimit.c similarity index 100% rename from util-vserver/lib/parselimit.c rename to lib/parselimit.c diff --git a/util-vserver/lib/personalityflag.c b/lib/personalityflag.c similarity index 100% rename from util-vserver/lib/personalityflag.c rename to lib/personalityflag.c diff --git a/util-vserver/lib/personalityflag_list.c b/lib/personalityflag_list.c similarity index 100% rename from util-vserver/lib/personalityflag_list.c rename to lib/personalityflag_list.c diff --git a/util-vserver/lib/personalitytype.c b/lib/personalitytype.c similarity index 100% rename from util-vserver/lib/personalitytype.c rename to lib/personalitytype.c diff --git a/util-vserver/lib/safechroot-internal.hc b/lib/safechroot-internal.hc similarity index 100% rename from util-vserver/lib/safechroot-internal.hc rename to lib/safechroot-internal.hc diff --git a/util-vserver/lib/syscall-alternative.h b/lib/syscall-alternative.h similarity index 100% rename from util-vserver/lib/syscall-alternative.h rename to lib/syscall-alternative.h diff --git a/util-vserver/lib/syscall-compat.hc b/lib/syscall-compat.hc similarity index 100% rename from util-vserver/lib/syscall-compat.hc rename to lib/syscall-compat.hc diff --git a/util-vserver/lib/syscall-fallback.h b/lib/syscall-fallback.h similarity index 100% rename from util-vserver/lib/syscall-fallback.h rename to lib/syscall-fallback.h diff --git a/util-vserver/lib/syscall-legacy.hc b/lib/syscall-legacy.hc similarity index 100% rename from util-vserver/lib/syscall-legacy.hc rename to lib/syscall-legacy.hc diff --git a/util-vserver/lib/syscall-syscall.c b/lib/syscall-syscall.c similarity index 100% rename from util-vserver/lib/syscall-syscall.c rename to lib/syscall-syscall.c diff --git a/util-vserver/lib/syscall-wrap.h b/lib/syscall-wrap.h similarity index 100% rename from util-vserver/lib/syscall-wrap.h rename to lib/syscall-wrap.h diff --git a/util-vserver/lib/syscall.c b/lib/syscall.c similarity index 100% rename from util-vserver/lib/syscall.c rename to lib/syscall.c diff --git a/util-vserver/lib/syscall_adddlimit-v13.hc b/lib/syscall_adddlimit-v13.hc similarity index 100% rename from util-vserver/lib/syscall_adddlimit-v13.hc rename to lib/syscall_adddlimit-v13.hc diff --git a/util-vserver/lib/syscall_adddlimit.c b/lib/syscall_adddlimit.c similarity index 100% rename from util-vserver/lib/syscall_adddlimit.c rename to lib/syscall_adddlimit.c diff --git a/util-vserver/lib/syscall_cleanupnamespace-v13.hc b/lib/syscall_cleanupnamespace-v13.hc similarity index 100% rename from util-vserver/lib/syscall_cleanupnamespace-v13.hc rename to lib/syscall_cleanupnamespace-v13.hc diff --git a/util-vserver/lib/syscall_cleanupnamespace.c b/lib/syscall_cleanupnamespace.c similarity index 100% rename from util-vserver/lib/syscall_cleanupnamespace.c rename to lib/syscall_cleanupnamespace.c diff --git a/util-vserver/lib/syscall_ctxcreate-v13.hc b/lib/syscall_ctxcreate-v13.hc similarity index 100% rename from util-vserver/lib/syscall_ctxcreate-v13.hc rename to lib/syscall_ctxcreate-v13.hc diff --git a/util-vserver/lib/syscall_ctxcreate.c b/lib/syscall_ctxcreate.c similarity index 100% rename from util-vserver/lib/syscall_ctxcreate.c rename to lib/syscall_ctxcreate.c diff --git a/util-vserver/lib/syscall_ctxmigrate-v13.hc b/lib/syscall_ctxmigrate-v13.hc similarity index 100% rename from util-vserver/lib/syscall_ctxmigrate-v13.hc rename to lib/syscall_ctxmigrate-v13.hc diff --git a/util-vserver/lib/syscall_ctxmigrate.c b/lib/syscall_ctxmigrate.c similarity index 100% rename from util-vserver/lib/syscall_ctxmigrate.c rename to lib/syscall_ctxmigrate.c diff --git a/util-vserver/lib/syscall_enternamespace-v13.hc b/lib/syscall_enternamespace-v13.hc similarity index 100% rename from util-vserver/lib/syscall_enternamespace-v13.hc rename to lib/syscall_enternamespace-v13.hc diff --git a/util-vserver/lib/syscall_enternamespace.c b/lib/syscall_enternamespace.c similarity index 100% rename from util-vserver/lib/syscall_enternamespace.c rename to lib/syscall_enternamespace.c diff --git a/util-vserver/lib/syscall_getccaps-v13.hc b/lib/syscall_getccaps-v13.hc similarity index 100% rename from util-vserver/lib/syscall_getccaps-v13.hc rename to lib/syscall_getccaps-v13.hc diff --git a/util-vserver/lib/syscall_getccaps.c b/lib/syscall_getccaps.c similarity index 100% rename from util-vserver/lib/syscall_getccaps.c rename to lib/syscall_getccaps.c diff --git a/util-vserver/lib/syscall_getcflags-v13.hc b/lib/syscall_getcflags-v13.hc similarity index 100% rename from util-vserver/lib/syscall_getcflags-v13.hc rename to lib/syscall_getcflags-v13.hc diff --git a/util-vserver/lib/syscall_getcflags.c b/lib/syscall_getcflags.c similarity index 100% rename from util-vserver/lib/syscall_getcflags.c rename to lib/syscall_getcflags.c diff --git a/util-vserver/lib/syscall_getdlimit-v13.hc b/lib/syscall_getdlimit-v13.hc similarity index 100% rename from util-vserver/lib/syscall_getdlimit-v13.hc rename to lib/syscall_getdlimit-v13.hc diff --git a/util-vserver/lib/syscall_getdlimit.c b/lib/syscall_getdlimit.c similarity index 100% rename from util-vserver/lib/syscall_getdlimit.c rename to lib/syscall_getdlimit.c diff --git a/util-vserver/lib/syscall_getiattr-fscompat.hc b/lib/syscall_getiattr-fscompat.hc similarity index 100% rename from util-vserver/lib/syscall_getiattr-fscompat.hc rename to lib/syscall_getiattr-fscompat.hc diff --git a/util-vserver/lib/syscall_getiattr-v13.hc b/lib/syscall_getiattr-v13.hc similarity index 100% rename from util-vserver/lib/syscall_getiattr-v13.hc rename to lib/syscall_getiattr-v13.hc diff --git a/util-vserver/lib/syscall_getiattr.c b/lib/syscall_getiattr.c similarity index 100% rename from util-vserver/lib/syscall_getiattr.c rename to lib/syscall_getiattr.c diff --git a/util-vserver/lib/syscall_getncaps-net.hc b/lib/syscall_getncaps-net.hc similarity index 100% rename from util-vserver/lib/syscall_getncaps-net.hc rename to lib/syscall_getncaps-net.hc diff --git a/util-vserver/lib/syscall_getncaps.c b/lib/syscall_getncaps.c similarity index 100% rename from util-vserver/lib/syscall_getncaps.c rename to lib/syscall_getncaps.c diff --git a/util-vserver/lib/syscall_getnflags-net.hc b/lib/syscall_getnflags-net.hc similarity index 100% rename from util-vserver/lib/syscall_getnflags-net.hc rename to lib/syscall_getnflags-net.hc diff --git a/util-vserver/lib/syscall_getnflags.c b/lib/syscall_getnflags.c similarity index 100% rename from util-vserver/lib/syscall_getnflags.c rename to lib/syscall_getnflags.c diff --git a/util-vserver/lib/syscall_getnxinfo-net.hc b/lib/syscall_getnxinfo-net.hc similarity index 100% rename from util-vserver/lib/syscall_getnxinfo-net.hc rename to lib/syscall_getnxinfo-net.hc diff --git a/util-vserver/lib/syscall_getnxinfo.c b/lib/syscall_getnxinfo.c similarity index 100% rename from util-vserver/lib/syscall_getnxinfo.c rename to lib/syscall_getnxinfo.c diff --git a/util-vserver/lib/syscall_gettasknid-net.hc b/lib/syscall_gettasknid-net.hc similarity index 100% rename from util-vserver/lib/syscall_gettasknid-net.hc rename to lib/syscall_gettasknid-net.hc diff --git a/util-vserver/lib/syscall_gettasknid.c b/lib/syscall_gettasknid.c similarity index 100% rename from util-vserver/lib/syscall_gettasknid.c rename to lib/syscall_gettasknid.c diff --git a/util-vserver/lib/syscall_gettaskxid-oldproc.hc b/lib/syscall_gettaskxid-oldproc.hc similarity index 100% rename from util-vserver/lib/syscall_gettaskxid-oldproc.hc rename to lib/syscall_gettaskxid-oldproc.hc diff --git a/util-vserver/lib/syscall_gettaskxid-v13.hc b/lib/syscall_gettaskxid-v13.hc similarity index 100% rename from util-vserver/lib/syscall_gettaskxid-v13.hc rename to lib/syscall_gettaskxid-v13.hc diff --git a/util-vserver/lib/syscall_gettaskxid.c b/lib/syscall_gettaskxid.c similarity index 100% rename from util-vserver/lib/syscall_gettaskxid.c rename to lib/syscall_gettaskxid.c diff --git a/util-vserver/lib/syscall_getvhiname-olduts.hc b/lib/syscall_getvhiname-olduts.hc similarity index 100% rename from util-vserver/lib/syscall_getvhiname-olduts.hc rename to lib/syscall_getvhiname-olduts.hc diff --git a/util-vserver/lib/syscall_getvhiname-v13.hc b/lib/syscall_getvhiname-v13.hc similarity index 100% rename from util-vserver/lib/syscall_getvhiname-v13.hc rename to lib/syscall_getvhiname-v13.hc diff --git a/util-vserver/lib/syscall_getvhiname.c b/lib/syscall_getvhiname.c similarity index 100% rename from util-vserver/lib/syscall_getvhiname.c rename to lib/syscall_getvhiname.c diff --git a/util-vserver/lib/syscall_getvxinfo-oldproc.hc b/lib/syscall_getvxinfo-oldproc.hc similarity index 100% rename from util-vserver/lib/syscall_getvxinfo-oldproc.hc rename to lib/syscall_getvxinfo-oldproc.hc diff --git a/util-vserver/lib/syscall_getvxinfo-v13.hc b/lib/syscall_getvxinfo-v13.hc similarity index 100% rename from util-vserver/lib/syscall_getvxinfo-v13.hc rename to lib/syscall_getvxinfo-v13.hc diff --git a/util-vserver/lib/syscall_getvxinfo.c b/lib/syscall_getvxinfo.c similarity index 100% rename from util-vserver/lib/syscall_getvxinfo.c rename to lib/syscall_getvxinfo.c diff --git a/util-vserver/lib/syscall_kill-v11.hc b/lib/syscall_kill-v11.hc similarity index 100% rename from util-vserver/lib/syscall_kill-v11.hc rename to lib/syscall_kill-v11.hc diff --git a/util-vserver/lib/syscall_kill.c b/lib/syscall_kill.c similarity index 100% rename from util-vserver/lib/syscall_kill.c rename to lib/syscall_kill.c diff --git a/util-vserver/lib/syscall_netadd-net.hc b/lib/syscall_netadd-net.hc similarity index 100% rename from util-vserver/lib/syscall_netadd-net.hc rename to lib/syscall_netadd-net.hc diff --git a/util-vserver/lib/syscall_netadd.c b/lib/syscall_netadd.c similarity index 100% rename from util-vserver/lib/syscall_netadd.c rename to lib/syscall_netadd.c diff --git a/util-vserver/lib/syscall_netcreate-net.hc b/lib/syscall_netcreate-net.hc similarity index 100% rename from util-vserver/lib/syscall_netcreate-net.hc rename to lib/syscall_netcreate-net.hc diff --git a/util-vserver/lib/syscall_netcreate.c b/lib/syscall_netcreate.c similarity index 100% rename from util-vserver/lib/syscall_netcreate.c rename to lib/syscall_netcreate.c diff --git a/util-vserver/lib/syscall_netmigrate-net.hc b/lib/syscall_netmigrate-net.hc similarity index 100% rename from util-vserver/lib/syscall_netmigrate-net.hc rename to lib/syscall_netmigrate-net.hc diff --git a/util-vserver/lib/syscall_netmigrate.c b/lib/syscall_netmigrate.c similarity index 100% rename from util-vserver/lib/syscall_netmigrate.c rename to lib/syscall_netmigrate.c diff --git a/util-vserver/lib/syscall_netremove-net.hc b/lib/syscall_netremove-net.hc similarity index 100% rename from util-vserver/lib/syscall_netremove-net.hc rename to lib/syscall_netremove-net.hc diff --git a/util-vserver/lib/syscall_netremove.c b/lib/syscall_netremove.c similarity index 100% rename from util-vserver/lib/syscall_netremove.c rename to lib/syscall_netremove.c diff --git a/util-vserver/lib/syscall_remdlimit-v13.hc b/lib/syscall_remdlimit-v13.hc similarity index 100% rename from util-vserver/lib/syscall_remdlimit-v13.hc rename to lib/syscall_remdlimit-v13.hc diff --git a/util-vserver/lib/syscall_remdlimit.c b/lib/syscall_remdlimit.c similarity index 100% rename from util-vserver/lib/syscall_remdlimit.c rename to lib/syscall_remdlimit.c diff --git a/util-vserver/lib/syscall_rlimit-v11.hc b/lib/syscall_rlimit-v11.hc similarity index 100% rename from util-vserver/lib/syscall_rlimit-v11.hc rename to lib/syscall_rlimit-v11.hc diff --git a/util-vserver/lib/syscall_rlimit.c b/lib/syscall_rlimit.c similarity index 100% rename from util-vserver/lib/syscall_rlimit.c rename to lib/syscall_rlimit.c diff --git a/util-vserver/lib/syscall_setccaps-v13.hc b/lib/syscall_setccaps-v13.hc similarity index 100% rename from util-vserver/lib/syscall_setccaps-v13.hc rename to lib/syscall_setccaps-v13.hc diff --git a/util-vserver/lib/syscall_setccaps.c b/lib/syscall_setccaps.c similarity index 100% rename from util-vserver/lib/syscall_setccaps.c rename to lib/syscall_setccaps.c diff --git a/util-vserver/lib/syscall_setcflags-v13.hc b/lib/syscall_setcflags-v13.hc similarity index 100% rename from util-vserver/lib/syscall_setcflags-v13.hc rename to lib/syscall_setcflags-v13.hc diff --git a/util-vserver/lib/syscall_setcflags.c b/lib/syscall_setcflags.c similarity index 100% rename from util-vserver/lib/syscall_setcflags.c rename to lib/syscall_setcflags.c diff --git a/util-vserver/lib/syscall_setdlimit-v13.hc b/lib/syscall_setdlimit-v13.hc similarity index 100% rename from util-vserver/lib/syscall_setdlimit-v13.hc rename to lib/syscall_setdlimit-v13.hc diff --git a/util-vserver/lib/syscall_setdlimit.c b/lib/syscall_setdlimit.c similarity index 100% rename from util-vserver/lib/syscall_setdlimit.c rename to lib/syscall_setdlimit.c diff --git a/util-vserver/lib/syscall_setiattr-fscompat.hc b/lib/syscall_setiattr-fscompat.hc similarity index 100% rename from util-vserver/lib/syscall_setiattr-fscompat.hc rename to lib/syscall_setiattr-fscompat.hc diff --git a/util-vserver/lib/syscall_setiattr-v13.hc b/lib/syscall_setiattr-v13.hc similarity index 100% rename from util-vserver/lib/syscall_setiattr-v13.hc rename to lib/syscall_setiattr-v13.hc diff --git a/util-vserver/lib/syscall_setiattr.c b/lib/syscall_setiattr.c similarity index 100% rename from util-vserver/lib/syscall_setiattr.c rename to lib/syscall_setiattr.c diff --git a/util-vserver/lib/syscall_setnamespace-v13.hc b/lib/syscall_setnamespace-v13.hc similarity index 100% rename from util-vserver/lib/syscall_setnamespace-v13.hc rename to lib/syscall_setnamespace-v13.hc diff --git a/util-vserver/lib/syscall_setnamespace.c b/lib/syscall_setnamespace.c similarity index 100% rename from util-vserver/lib/syscall_setnamespace.c rename to lib/syscall_setnamespace.c diff --git a/util-vserver/lib/syscall_setncaps-net.hc b/lib/syscall_setncaps-net.hc similarity index 100% rename from util-vserver/lib/syscall_setncaps-net.hc rename to lib/syscall_setncaps-net.hc diff --git a/util-vserver/lib/syscall_setncaps.c b/lib/syscall_setncaps.c similarity index 100% rename from util-vserver/lib/syscall_setncaps.c rename to lib/syscall_setncaps.c diff --git a/util-vserver/lib/syscall_setnflags-net.hc b/lib/syscall_setnflags-net.hc similarity index 100% rename from util-vserver/lib/syscall_setnflags-net.hc rename to lib/syscall_setnflags-net.hc diff --git a/util-vserver/lib/syscall_setnflags.c b/lib/syscall_setnflags.c similarity index 100% rename from util-vserver/lib/syscall_setnflags.c rename to lib/syscall_setnflags.c diff --git a/util-vserver/lib/syscall_setsched-v13.hc b/lib/syscall_setsched-v13.hc similarity index 100% rename from util-vserver/lib/syscall_setsched-v13.hc rename to lib/syscall_setsched-v13.hc diff --git a/util-vserver/lib/syscall_setsched-v13obs.hc b/lib/syscall_setsched-v13obs.hc similarity index 100% rename from util-vserver/lib/syscall_setsched-v13obs.hc rename to lib/syscall_setsched-v13obs.hc diff --git a/util-vserver/lib/syscall_setsched.c b/lib/syscall_setsched.c similarity index 100% rename from util-vserver/lib/syscall_setsched.c rename to lib/syscall_setsched.c diff --git a/util-vserver/lib/syscall_setvhiname-olduts.hc b/lib/syscall_setvhiname-olduts.hc similarity index 100% rename from util-vserver/lib/syscall_setvhiname-olduts.hc rename to lib/syscall_setvhiname-olduts.hc diff --git a/util-vserver/lib/syscall_setvhiname-v13.hc b/lib/syscall_setvhiname-v13.hc similarity index 100% rename from util-vserver/lib/syscall_setvhiname-v13.hc rename to lib/syscall_setvhiname-v13.hc diff --git a/util-vserver/lib/syscall_setvhiname.c b/lib/syscall_setvhiname.c similarity index 100% rename from util-vserver/lib/syscall_setvhiname.c rename to lib/syscall_setvhiname.c diff --git a/util-vserver/lib/syscall_waitexit-v13.hc b/lib/syscall_waitexit-v13.hc similarity index 100% rename from util-vserver/lib/syscall_waitexit-v13.hc rename to lib/syscall_waitexit-v13.hc diff --git a/util-vserver/lib/syscall_waitexit.c b/lib/syscall_waitexit.c similarity index 100% rename from util-vserver/lib/syscall_waitexit.c rename to lib/syscall_waitexit.c diff --git a/util-vserver/lib/testsuite/.cvsignore b/lib/testsuite/.cvsignore similarity index 100% rename from util-vserver/lib/testsuite/.cvsignore rename to lib/testsuite/.cvsignore diff --git a/util-vserver/lib/testsuite/Makefile-files b/lib/testsuite/Makefile-files similarity index 100% rename from util-vserver/lib/testsuite/Makefile-files rename to lib/testsuite/Makefile-files diff --git a/util-vserver/lib/testsuite/cflags.c b/lib/testsuite/cflags.c similarity index 100% rename from util-vserver/lib/testsuite/cflags.c rename to lib/testsuite/cflags.c diff --git a/util-vserver/lib/testsuite/fmt.c b/lib/testsuite/fmt.c similarity index 100% rename from util-vserver/lib/testsuite/fmt.c rename to lib/testsuite/fmt.c diff --git a/util-vserver/lib/testsuite/parselimit.c b/lib/testsuite/parselimit.c similarity index 100% rename from util-vserver/lib/testsuite/parselimit.c rename to lib/testsuite/parselimit.c diff --git a/util-vserver/lib/testsuite/personality.c b/lib/testsuite/personality.c similarity index 100% rename from util-vserver/lib/testsuite/personality.c rename to lib/testsuite/personality.c diff --git a/util-vserver/lib/util-vserver.pc.subst b/lib/util-vserver.pc.subst similarity index 100% rename from util-vserver/lib/util-vserver.pc.subst rename to lib/util-vserver.pc.subst diff --git a/util-vserver/lib/utils-legacy.h b/lib/utils-legacy.h similarity index 100% rename from util-vserver/lib/utils-legacy.h rename to lib/utils-legacy.h diff --git a/util-vserver/lib/val2text-t2v-uint32.c b/lib/val2text-t2v-uint32.c similarity index 100% rename from util-vserver/lib/val2text-t2v-uint32.c rename to lib/val2text-t2v-uint32.c diff --git a/util-vserver/lib/val2text-t2v-uint64.c b/lib/val2text-t2v-uint64.c similarity index 100% rename from util-vserver/lib/val2text-t2v-uint64.c rename to lib/val2text-t2v-uint64.c diff --git a/util-vserver/lib/val2text-v2t-uint32.c b/lib/val2text-v2t-uint32.c similarity index 100% rename from util-vserver/lib/val2text-v2t-uint32.c rename to lib/val2text-v2t-uint32.c diff --git a/util-vserver/lib/val2text-v2t-uint64.c b/lib/val2text-v2t-uint64.c similarity index 100% rename from util-vserver/lib/val2text-v2t-uint64.c rename to lib/val2text-v2t-uint64.c diff --git a/util-vserver/lib/val2text.hc b/lib/val2text.hc similarity index 100% rename from util-vserver/lib/val2text.hc rename to lib/val2text.hc diff --git a/util-vserver/lib/virtual.h b/lib/virtual.h similarity index 100% rename from util-vserver/lib/virtual.h rename to lib/virtual.h diff --git a/util-vserver/lib/vserver-internal.h b/lib/vserver-internal.h similarity index 100% rename from util-vserver/lib/vserver-internal.h rename to lib/vserver-internal.h diff --git a/util-vserver/lib/vserver.h b/lib/vserver.h similarity index 100% rename from util-vserver/lib/vserver.h rename to lib/vserver.h diff --git a/util-vserver/lib/xidopt2xid.c b/lib/xidopt2xid.c similarity index 100% rename from util-vserver/lib/xidopt2xid.c rename to lib/xidopt2xid.c diff --git a/util-vserver/lib_internal/.cvsignore b/lib_internal/.cvsignore similarity index 100% rename from util-vserver/lib_internal/.cvsignore rename to lib_internal/.cvsignore diff --git a/util-vserver/lib_internal/Makefile-files b/lib_internal/Makefile-files similarity index 100% rename from util-vserver/lib_internal/Makefile-files rename to lib_internal/Makefile-files diff --git a/util-vserver/lib_internal/command-appendparameter.c b/lib_internal/command-appendparameter.c similarity index 100% rename from util-vserver/lib_internal/command-appendparameter.c rename to lib_internal/command-appendparameter.c diff --git a/util-vserver/lib_internal/command-exec.c b/lib_internal/command-exec.c similarity index 100% rename from util-vserver/lib_internal/command-exec.c rename to lib_internal/command-exec.c diff --git a/util-vserver/lib_internal/command-free.c b/lib_internal/command-free.c similarity index 100% rename from util-vserver/lib_internal/command-free.c rename to lib_internal/command-free.c diff --git a/util-vserver/lib_internal/command-init.c b/lib_internal/command-init.c similarity index 100% rename from util-vserver/lib_internal/command-init.c rename to lib_internal/command-init.c diff --git a/util-vserver/lib_internal/command-reset.c b/lib_internal/command-reset.c similarity index 100% rename from util-vserver/lib_internal/command-reset.c rename to lib_internal/command-reset.c diff --git a/util-vserver/lib_internal/command-setparams.c b/lib_internal/command-setparams.c similarity index 100% rename from util-vserver/lib_internal/command-setparams.c rename to lib_internal/command-setparams.c diff --git a/util-vserver/lib_internal/command-wait.c b/lib_internal/command-wait.c similarity index 100% rename from util-vserver/lib_internal/command-wait.c rename to lib_internal/command-wait.c diff --git a/util-vserver/lib_internal/command.h b/lib_internal/command.h similarity index 100% rename from util-vserver/lib_internal/command.h rename to lib_internal/command.h diff --git a/util-vserver/lib_internal/coreassert.h b/lib_internal/coreassert.h similarity index 100% rename from util-vserver/lib_internal/coreassert.h rename to lib_internal/coreassert.h diff --git a/util-vserver/lib_internal/errinfo-writeerrno.c b/lib_internal/errinfo-writeerrno.c similarity index 100% rename from util-vserver/lib_internal/errinfo-writeerrno.c rename to lib_internal/errinfo-writeerrno.c diff --git a/util-vserver/lib_internal/errinfo.h b/lib_internal/errinfo.h similarity index 100% rename from util-vserver/lib_internal/errinfo.h rename to lib_internal/errinfo.h diff --git a/util-vserver/lib_internal/filecfg-iteratemultiline.c b/lib_internal/filecfg-iteratemultiline.c similarity index 100% rename from util-vserver/lib_internal/filecfg-iteratemultiline.c rename to lib_internal/filecfg-iteratemultiline.c diff --git a/util-vserver/lib_internal/filecfg-readentryflag.c b/lib_internal/filecfg-readentryflag.c similarity index 100% rename from util-vserver/lib_internal/filecfg-readentryflag.c rename to lib_internal/filecfg-readentryflag.c diff --git a/util-vserver/lib_internal/filecfg-readentrystr.c b/lib_internal/filecfg-readentrystr.c similarity index 100% rename from util-vserver/lib_internal/filecfg-readentrystr.c rename to lib_internal/filecfg-readentrystr.c diff --git a/util-vserver/lib_internal/filecfg.h b/lib_internal/filecfg.h similarity index 100% rename from util-vserver/lib_internal/filecfg.h rename to lib_internal/filecfg.h diff --git a/util-vserver/lib_internal/jail.h b/lib_internal/jail.h similarity index 100% rename from util-vserver/lib_internal/jail.h rename to lib_internal/jail.h diff --git a/util-vserver/lib_internal/jailintotempdir.c b/lib_internal/jailintotempdir.c similarity index 100% rename from util-vserver/lib_internal/jailintotempdir.c rename to lib_internal/jailintotempdir.c diff --git a/util-vserver/lib_internal/matchlist-appendfiles.c b/lib_internal/matchlist-appendfiles.c similarity index 100% rename from util-vserver/lib_internal/matchlist-appendfiles.c rename to lib_internal/matchlist-appendfiles.c diff --git a/util-vserver/lib_internal/matchlist-compare.c b/lib_internal/matchlist-compare.c similarity index 100% rename from util-vserver/lib_internal/matchlist-compare.c rename to lib_internal/matchlist-compare.c diff --git a/util-vserver/lib_internal/matchlist-destroy.c b/lib_internal/matchlist-destroy.c similarity index 100% rename from util-vserver/lib_internal/matchlist-destroy.c rename to lib_internal/matchlist-destroy.c diff --git a/util-vserver/lib_internal/matchlist-init.c b/lib_internal/matchlist-init.c similarity index 100% rename from util-vserver/lib_internal/matchlist-init.c rename to lib_internal/matchlist-init.c diff --git a/util-vserver/lib_internal/matchlist-initbyvserver.c b/lib_internal/matchlist-initbyvserver.c similarity index 100% rename from util-vserver/lib_internal/matchlist-initbyvserver.c rename to lib_internal/matchlist-initbyvserver.c diff --git a/util-vserver/lib_internal/matchlist-initmanually.c b/lib_internal/matchlist-initmanually.c similarity index 100% rename from util-vserver/lib_internal/matchlist-initmanually.c rename to lib_internal/matchlist-initmanually.c diff --git a/util-vserver/lib_internal/matchlist-initrefserverlist.c b/lib_internal/matchlist-initrefserverlist.c similarity index 100% rename from util-vserver/lib_internal/matchlist-initrefserverlist.c rename to lib_internal/matchlist-initrefserverlist.c diff --git a/util-vserver/lib_internal/matchlist-printid.c b/lib_internal/matchlist-printid.c similarity index 100% rename from util-vserver/lib_internal/matchlist-printid.c rename to lib_internal/matchlist-printid.c diff --git a/util-vserver/lib_internal/matchlist.h b/lib_internal/matchlist.h similarity index 100% rename from util-vserver/lib_internal/matchlist.h rename to lib_internal/matchlist.h diff --git a/util-vserver/lib_internal/matchvserverinfo-free.c b/lib_internal/matchvserverinfo-free.c similarity index 100% rename from util-vserver/lib_internal/matchvserverinfo-free.c rename to lib_internal/matchvserverinfo-free.c diff --git a/util-vserver/lib_internal/matchvserverinfo-init.c b/lib_internal/matchvserverinfo-init.c similarity index 100% rename from util-vserver/lib_internal/matchvserverinfo-init.c rename to lib_internal/matchvserverinfo-init.c diff --git a/util-vserver/lib_internal/pathinfo-append.c b/lib_internal/pathinfo-append.c similarity index 100% rename from util-vserver/lib_internal/pathinfo-append.c rename to lib_internal/pathinfo-append.c diff --git a/util-vserver/lib_internal/pathinfo-test.c b/lib_internal/pathinfo-test.c similarity index 100% rename from util-vserver/lib_internal/pathinfo-test.c rename to lib_internal/pathinfo-test.c diff --git a/util-vserver/lib_internal/pathinfo.h b/lib_internal/pathinfo.h similarity index 100% rename from util-vserver/lib_internal/pathinfo.h rename to lib_internal/pathinfo.h diff --git a/util-vserver/lib_internal/string.h b/lib_internal/string.h similarity index 100% rename from util-vserver/lib_internal/string.h rename to lib_internal/string.h diff --git a/util-vserver/lib_internal/string.hc b/lib_internal/string.hc similarity index 100% rename from util-vserver/lib_internal/string.hc rename to lib_internal/string.hc diff --git a/util-vserver/lib_internal/switchtowatchxid.c b/lib_internal/switchtowatchxid.c similarity index 100% rename from util-vserver/lib_internal/switchtowatchxid.c rename to lib_internal/switchtowatchxid.c diff --git a/util-vserver/lib_internal/sys_clone.h b/lib_internal/sys_clone.h similarity index 100% rename from util-vserver/lib_internal/sys_clone.h rename to lib_internal/sys_clone.h diff --git a/util-vserver/lib_internal/sys_personality.h b/lib_internal/sys_personality.h similarity index 100% rename from util-vserver/lib_internal/sys_personality.h rename to lib_internal/sys_personality.h diff --git a/util-vserver/lib_internal/testsuite/.cvsignore b/lib_internal/testsuite/.cvsignore similarity index 100% rename from util-vserver/lib_internal/testsuite/.cvsignore rename to lib_internal/testsuite/.cvsignore diff --git a/util-vserver/lib_internal/testsuite/Makefile-files b/lib_internal/testsuite/Makefile-files similarity index 100% rename from util-vserver/lib_internal/testsuite/Makefile-files rename to lib_internal/testsuite/Makefile-files diff --git a/util-vserver/lib_internal/testsuite/command.c b/lib_internal/testsuite/command.c similarity index 100% rename from util-vserver/lib_internal/testsuite/command.c rename to lib_internal/testsuite/command.c diff --git a/util-vserver/lib_internal/testsuite/copy-check b/lib_internal/testsuite/copy-check similarity index 100% rename from util-vserver/lib_internal/testsuite/copy-check rename to lib_internal/testsuite/copy-check diff --git a/util-vserver/lib_internal/testsuite/copy.c b/lib_internal/testsuite/copy.c similarity index 100% rename from util-vserver/lib_internal/testsuite/copy.c rename to lib_internal/testsuite/copy.c diff --git a/util-vserver/lib_internal/testsuite/filecfg-ml.c b/lib_internal/testsuite/filecfg-ml.c similarity index 100% rename from util-vserver/lib_internal/testsuite/filecfg-ml.c rename to lib_internal/testsuite/filecfg-ml.c diff --git a/util-vserver/lib_internal/testsuite/isnumber.c b/lib_internal/testsuite/isnumber.c similarity index 100% rename from util-vserver/lib_internal/testsuite/isnumber.c rename to lib_internal/testsuite/isnumber.c diff --git a/util-vserver/lib_internal/testsuite/sigbus.c b/lib_internal/testsuite/sigbus.c similarity index 100% rename from util-vserver/lib_internal/testsuite/sigbus.c rename to lib_internal/testsuite/sigbus.c diff --git a/util-vserver/lib_internal/unify-copy.c b/lib_internal/unify-copy.c similarity index 100% rename from util-vserver/lib_internal/unify-copy.c rename to lib_internal/unify-copy.c diff --git a/util-vserver/lib_internal/unify-deunify.c b/lib_internal/unify-deunify.c similarity index 100% rename from util-vserver/lib_internal/unify-deunify.c rename to lib_internal/unify-deunify.c diff --git a/util-vserver/lib_internal/unify-isiunlinkable.c b/lib_internal/unify-isiunlinkable.c similarity index 100% rename from util-vserver/lib_internal/unify-isiunlinkable.c rename to lib_internal/unify-isiunlinkable.c diff --git a/util-vserver/lib_internal/unify-settime.c b/lib_internal/unify-settime.c similarity index 100% rename from util-vserver/lib_internal/unify-settime.c rename to lib_internal/unify-settime.c diff --git a/util-vserver/lib_internal/unify-unify.c b/lib_internal/unify-unify.c similarity index 100% rename from util-vserver/lib_internal/unify-unify.c rename to lib_internal/unify-unify.c diff --git a/util-vserver/lib_internal/unify.h b/lib_internal/unify.h similarity index 100% rename from util-vserver/lib_internal/unify.h rename to lib_internal/unify.h diff --git a/util-vserver/lib_internal/util-canonify.c b/lib_internal/util-canonify.c similarity index 100% rename from util-vserver/lib_internal/util-canonify.c rename to lib_internal/util-canonify.c diff --git a/util-vserver/lib_internal/util-cast.h b/lib_internal/util-cast.h similarity index 100% rename from util-vserver/lib_internal/util-cast.h rename to lib_internal/util-cast.h diff --git a/util-vserver/lib_internal/util-commonstrings.h b/lib_internal/util-commonstrings.h similarity index 100% rename from util-vserver/lib_internal/util-commonstrings.h rename to lib_internal/util-commonstrings.h diff --git a/util-vserver/lib_internal/util-debug.h b/lib_internal/util-debug.h similarity index 100% rename from util-vserver/lib_internal/util-debug.h rename to lib_internal/util-debug.h diff --git a/util-vserver/lib_internal/util-declarecmd.h b/lib_internal/util-declarecmd.h similarity index 100% rename from util-vserver/lib_internal/util-declarecmd.h rename to lib_internal/util-declarecmd.h diff --git a/util-vserver/lib_internal/util-dimof.h b/lib_internal/util-dimof.h similarity index 100% rename from util-vserver/lib_internal/util-dimof.h rename to lib_internal/util-dimof.h diff --git a/util-vserver/lib_internal/util-dotfile.h b/lib_internal/util-dotfile.h similarity index 100% rename from util-vserver/lib_internal/util-dotfile.h rename to lib_internal/util-dotfile.h diff --git a/util-vserver/lib_internal/util-exitlikeprocess.c b/lib_internal/util-exitlikeprocess.c similarity index 100% rename from util-vserver/lib_internal/util-exitlikeprocess.c rename to lib_internal/util-exitlikeprocess.c diff --git a/util-vserver/lib_internal/util-exitlikeprocess.h b/lib_internal/util-exitlikeprocess.h similarity index 100% rename from util-vserver/lib_internal/util-exitlikeprocess.h rename to lib_internal/util-exitlikeprocess.h diff --git a/util-vserver/lib_internal/util-io.h b/lib_internal/util-io.h similarity index 100% rename from util-vserver/lib_internal/util-io.h rename to lib_internal/util-io.h diff --git a/util-vserver/lib_internal/util-isnumber.c b/lib_internal/util-isnumber.c similarity index 100% rename from util-vserver/lib_internal/util-isnumber.c rename to lib_internal/util-isnumber.c diff --git a/util-vserver/lib_internal/util-isnumber.hc b/lib_internal/util-isnumber.hc similarity index 100% rename from util-vserver/lib_internal/util-isnumber.hc rename to lib_internal/util-isnumber.hc diff --git a/util-vserver/lib_internal/util-isnumberunsigned.c b/lib_internal/util-isnumberunsigned.c similarity index 100% rename from util-vserver/lib_internal/util-isnumberunsigned.c rename to lib_internal/util-isnumberunsigned.c diff --git a/util-vserver/lib_internal/util-lockfile.c b/lib_internal/util-lockfile.c similarity index 100% rename from util-vserver/lib_internal/util-lockfile.c rename to lib_internal/util-lockfile.c diff --git a/util-vserver/lib_internal/util-lockfile.h b/lib_internal/util-lockfile.h similarity index 100% rename from util-vserver/lib_internal/util-lockfile.h rename to lib_internal/util-lockfile.h diff --git a/util-vserver/lib_internal/util-mem.h b/lib_internal/util-mem.h similarity index 100% rename from util-vserver/lib_internal/util-mem.h rename to lib_internal/util-mem.h diff --git a/util-vserver/lib_internal/util-perror.h b/lib_internal/util-perror.h similarity index 100% rename from util-vserver/lib_internal/util-perror.h rename to lib_internal/util-perror.h diff --git a/util-vserver/lib_internal/util-safechdir.c b/lib_internal/util-safechdir.c similarity index 100% rename from util-vserver/lib_internal/util-safechdir.c rename to lib_internal/util-safechdir.c diff --git a/util-vserver/lib_internal/util-safechdir.h b/lib_internal/util-safechdir.h similarity index 100% rename from util-vserver/lib_internal/util-safechdir.h rename to lib_internal/util-safechdir.h diff --git a/util-vserver/lib_internal/util-unixsock.h b/lib_internal/util-unixsock.h similarity index 100% rename from util-vserver/lib_internal/util-unixsock.h rename to lib_internal/util-unixsock.h diff --git a/util-vserver/lib_internal/util.h b/lib_internal/util.h similarity index 100% rename from util-vserver/lib_internal/util.h rename to lib_internal/util.h diff --git a/util-vserver/m4/changelog.am b/m4/changelog.am similarity index 100% rename from util-vserver/m4/changelog.am rename to m4/changelog.am diff --git a/util-vserver/m4/ensc_cflags.m4 b/m4/ensc_cflags.m4 similarity index 100% rename from util-vserver/m4/ensc_cflags.m4 rename to m4/ensc_cflags.m4 diff --git a/util-vserver/m4/ensc_changelog.m4 b/m4/ensc_changelog.m4 similarity index 100% rename from util-vserver/m4/ensc_changelog.m4 rename to m4/ensc_changelog.m4 diff --git a/util-vserver/m4/ensc_cxxcompiler.m4 b/m4/ensc_cxxcompiler.m4 similarity index 100% rename from util-vserver/m4/ensc_cxxcompiler.m4 rename to m4/ensc_cxxcompiler.m4 diff --git a/util-vserver/m4/ensc_dietlibc.m4 b/m4/ensc_dietlibc.m4 similarity index 100% rename from util-vserver/m4/ensc_dietlibc.m4 rename to m4/ensc_dietlibc.m4 diff --git a/util-vserver/m4/ensc_dietlibc_compat.m4 b/m4/ensc_dietlibc_compat.m4 similarity index 100% rename from util-vserver/m4/ensc_dietlibc_compat.m4 rename to m4/ensc_dietlibc_compat.m4 diff --git a/util-vserver/m4/ensc_e2fscheck.m4 b/m4/ensc_e2fscheck.m4 similarity index 100% rename from util-vserver/m4/ensc_e2fscheck.m4 rename to m4/ensc_e2fscheck.m4 diff --git a/util-vserver/m4/ensc_initrddir.m4 b/m4/ensc_initrddir.m4 similarity index 100% rename from util-vserver/m4/ensc_initrddir.m4 rename to m4/ensc_initrddir.m4 diff --git a/util-vserver/m4/ensc_pathprog.m4 b/m4/ensc_pathprog.m4 similarity index 100% rename from util-vserver/m4/ensc_pathprog.m4 rename to m4/ensc_pathprog.m4 diff --git a/util-vserver/m4/ensc_personality.m4 b/m4/ensc_personality.m4 similarity index 100% rename from util-vserver/m4/ensc_personality.m4 rename to m4/ensc_personality.m4 diff --git a/util-vserver/m4/ensc_release.m4 b/m4/ensc_release.m4 similarity index 100% rename from util-vserver/m4/ensc_release.m4 rename to m4/ensc_release.m4 diff --git a/util-vserver/m4/ensc_syscall.m4 b/m4/ensc_syscall.m4 similarity index 100% rename from util-vserver/m4/ensc_syscall.m4 rename to m4/ensc_syscall.m4 diff --git a/util-vserver/m4/ensc_syscallnr.m4 b/m4/ensc_syscallnr.m4 similarity index 100% rename from util-vserver/m4/ensc_syscallnr.m4 rename to m4/ensc_syscallnr.m4 diff --git a/util-vserver/m4/ensc_uv_vrootdir.m4 b/m4/ensc_uv_vrootdir.m4 similarity index 100% rename from util-vserver/m4/ensc_uv_vrootdir.m4 rename to m4/ensc_uv_vrootdir.m4 diff --git a/util-vserver/m4/gpgsig.am b/m4/gpgsig.am similarity index 100% rename from util-vserver/m4/gpgsig.am rename to m4/gpgsig.am diff --git a/util-vserver/m4/install-notify.am b/m4/install-notify.am similarity index 100% rename from util-vserver/m4/install-notify.am rename to m4/install-notify.am diff --git a/util-vserver/m4/libsel.am b/m4/libsel.am similarity index 100% rename from util-vserver/m4/libsel.am rename to m4/libsel.am diff --git a/util-vserver/m4/pkgconfig.am b/m4/pkgconfig.am similarity index 100% rename from util-vserver/m4/pkgconfig.am rename to m4/pkgconfig.am diff --git a/util-vserver/m4/validate.am b/m4/validate.am similarity index 100% rename from util-vserver/m4/validate.am rename to m4/validate.am diff --git a/util-vserver/man/Makefile-files b/man/Makefile-files similarity index 100% rename from util-vserver/man/Makefile-files rename to man/Makefile-files diff --git a/util-vserver/man/chbind.8 b/man/chbind.8 similarity index 100% rename from util-vserver/man/chbind.8 rename to man/chbind.8 diff --git a/util-vserver/man/chcontext.8 b/man/chcontext.8 similarity index 100% rename from util-vserver/man/chcontext.8 rename to man/chcontext.8 diff --git a/util-vserver/man/distrib-info.8 b/man/distrib-info.8 similarity index 100% rename from util-vserver/man/distrib-info.8 rename to man/distrib-info.8 diff --git a/util-vserver/man/rebootmgr.8 b/man/rebootmgr.8 similarity index 100% rename from util-vserver/man/rebootmgr.8 rename to man/rebootmgr.8 diff --git a/util-vserver/man/reducecap.8 b/man/reducecap.8 similarity index 100% rename from util-vserver/man/reducecap.8 rename to man/reducecap.8 diff --git a/util-vserver/man/vps.8 b/man/vps.8 similarity index 100% rename from util-vserver/man/vps.8 rename to man/vps.8 diff --git a/util-vserver/man/vpstree.8 b/man/vpstree.8 similarity index 100% rename from util-vserver/man/vpstree.8 rename to man/vpstree.8 diff --git a/util-vserver/man/vrpm.8 b/man/vrpm.8 similarity index 100% rename from util-vserver/man/vrpm.8 rename to man/vrpm.8 diff --git a/util-vserver/man/vserver-copy.8 b/man/vserver-copy.8 similarity index 100% rename from util-vserver/man/vserver-copy.8 rename to man/vserver-copy.8 diff --git a/util-vserver/man/vserver-stat.8 b/man/vserver-stat.8 similarity index 100% rename from util-vserver/man/vserver-stat.8 rename to man/vserver-stat.8 diff --git a/util-vserver/man/vserver.8 b/man/vserver.8 similarity index 100% rename from util-vserver/man/vserver.8 rename to man/vserver.8 diff --git a/util-vserver/man/vtop.8 b/man/vtop.8 similarity index 100% rename from util-vserver/man/vtop.8 rename to man/vtop.8 diff --git a/util-vserver/pathconfig.h.pathsubst b/pathconfig.h.pathsubst similarity index 100% rename from util-vserver/pathconfig.h.pathsubst rename to pathconfig.h.pathsubst diff --git a/util-vserver/scripts/.cvsignore b/scripts/.cvsignore similarity index 100% rename from util-vserver/scripts/.cvsignore rename to scripts/.cvsignore diff --git a/util-vserver/scripts/Makefile-files b/scripts/Makefile-files similarity index 100% rename from util-vserver/scripts/Makefile-files rename to scripts/Makefile-files diff --git a/util-vserver/scripts/X b/scripts/X similarity index 100% rename from util-vserver/scripts/X rename to scripts/X diff --git a/util-vserver/scripts/chcontext b/scripts/chcontext similarity index 100% rename from util-vserver/scripts/chcontext rename to scripts/chcontext diff --git a/util-vserver/scripts/functions b/scripts/functions similarity index 100% rename from util-vserver/scripts/functions rename to scripts/functions diff --git a/util-vserver/scripts/legacy/.cvsignore b/scripts/legacy/.cvsignore similarity index 100% rename from util-vserver/scripts/legacy/.cvsignore rename to scripts/legacy/.cvsignore diff --git a/util-vserver/scripts/legacy/distrib-info b/scripts/legacy/distrib-info similarity index 100% rename from util-vserver/scripts/legacy/distrib-info rename to scripts/legacy/distrib-info diff --git a/util-vserver/scripts/legacy/rootshell b/scripts/legacy/rootshell similarity index 100% rename from util-vserver/scripts/legacy/rootshell rename to scripts/legacy/rootshell diff --git a/util-vserver/scripts/legacy/save_s_context b/scripts/legacy/save_s_context similarity index 100% rename from util-vserver/scripts/legacy/save_s_context rename to scripts/legacy/save_s_context diff --git a/util-vserver/scripts/legacy/vps.pathsubst b/scripts/legacy/vps.pathsubst similarity index 100% rename from util-vserver/scripts/legacy/vps.pathsubst rename to scripts/legacy/vps.pathsubst diff --git a/util-vserver/scripts/legacy/vserver b/scripts/legacy/vserver similarity index 100% rename from util-vserver/scripts/legacy/vserver rename to scripts/legacy/vserver diff --git a/util-vserver/scripts/legacy/vserver-copy b/scripts/legacy/vserver-copy similarity index 100% rename from util-vserver/scripts/legacy/vserver-copy rename to scripts/legacy/vserver-copy diff --git a/util-vserver/scripts/legacy/vserverkillall b/scripts/legacy/vserverkillall similarity index 100% rename from util-vserver/scripts/legacy/vserverkillall rename to scripts/legacy/vserverkillall diff --git a/util-vserver/scripts/pkgmgmt b/scripts/pkgmgmt similarity index 100% rename from util-vserver/scripts/pkgmgmt rename to scripts/pkgmgmt diff --git a/util-vserver/scripts/start-vservers b/scripts/start-vservers similarity index 100% rename from util-vserver/scripts/start-vservers rename to scripts/start-vservers diff --git a/util-vserver/scripts/util-vserver-vars.pathsubst b/scripts/util-vserver-vars.pathsubst similarity index 100% rename from util-vserver/scripts/util-vserver-vars.pathsubst rename to scripts/util-vserver-vars.pathsubst diff --git a/util-vserver/scripts/vapt-get b/scripts/vapt-get similarity index 100% rename from util-vserver/scripts/vapt-get rename to scripts/vapt-get diff --git a/util-vserver/scripts/vapt-get-worker b/scripts/vapt-get-worker similarity index 100% rename from util-vserver/scripts/vapt-get-worker rename to scripts/vapt-get-worker diff --git a/util-vserver/scripts/vpkg b/scripts/vpkg similarity index 100% rename from util-vserver/scripts/vpkg rename to scripts/vpkg diff --git a/util-vserver/scripts/vprocunhide b/scripts/vprocunhide similarity index 100% rename from util-vserver/scripts/vprocunhide rename to scripts/vprocunhide diff --git a/util-vserver/scripts/vpstree b/scripts/vpstree similarity index 100% rename from util-vserver/scripts/vpstree rename to scripts/vpstree diff --git a/util-vserver/scripts/vrpm b/scripts/vrpm similarity index 100% rename from util-vserver/scripts/vrpm rename to scripts/vrpm diff --git a/util-vserver/scripts/vrpm-preload b/scripts/vrpm-preload similarity index 100% rename from util-vserver/scripts/vrpm-preload rename to scripts/vrpm-preload diff --git a/util-vserver/scripts/vrpm-worker b/scripts/vrpm-worker similarity index 100% rename from util-vserver/scripts/vrpm-worker rename to scripts/vrpm-worker diff --git a/util-vserver/scripts/vserver b/scripts/vserver similarity index 100% rename from util-vserver/scripts/vserver rename to scripts/vserver diff --git a/util-vserver/scripts/vserver-build b/scripts/vserver-build similarity index 100% rename from util-vserver/scripts/vserver-build rename to scripts/vserver-build diff --git a/util-vserver/scripts/vserver-build.apt-rpm b/scripts/vserver-build.apt-rpm similarity index 100% rename from util-vserver/scripts/vserver-build.apt-rpm rename to scripts/vserver-build.apt-rpm diff --git a/util-vserver/scripts/vserver-build.debootstrap b/scripts/vserver-build.debootstrap similarity index 100% rename from util-vserver/scripts/vserver-build.debootstrap rename to scripts/vserver-build.debootstrap diff --git a/util-vserver/scripts/vserver-build.functions b/scripts/vserver-build.functions similarity index 100% rename from util-vserver/scripts/vserver-build.functions rename to scripts/vserver-build.functions diff --git a/util-vserver/scripts/vserver-build.functions.apt b/scripts/vserver-build.functions.apt similarity index 100% rename from util-vserver/scripts/vserver-build.functions.apt rename to scripts/vserver-build.functions.apt diff --git a/util-vserver/scripts/vserver-build.functions.pkgmgmt b/scripts/vserver-build.functions.pkgmgmt similarity index 100% rename from util-vserver/scripts/vserver-build.functions.pkgmgmt rename to scripts/vserver-build.functions.pkgmgmt diff --git a/util-vserver/scripts/vserver-build.functions.rpm b/scripts/vserver-build.functions.rpm similarity index 100% rename from util-vserver/scripts/vserver-build.functions.rpm rename to scripts/vserver-build.functions.rpm diff --git a/util-vserver/scripts/vserver-build.functions.yum b/scripts/vserver-build.functions.yum similarity index 100% rename from util-vserver/scripts/vserver-build.functions.yum rename to scripts/vserver-build.functions.yum diff --git a/util-vserver/scripts/vserver-build.rpm b/scripts/vserver-build.rpm similarity index 100% rename from util-vserver/scripts/vserver-build.rpm rename to scripts/vserver-build.rpm diff --git a/util-vserver/scripts/vserver-build.skeleton b/scripts/vserver-build.skeleton similarity index 100% rename from util-vserver/scripts/vserver-build.skeleton rename to scripts/vserver-build.skeleton diff --git a/util-vserver/scripts/vserver-build.yum b/scripts/vserver-build.yum similarity index 100% rename from util-vserver/scripts/vserver-build.yum rename to scripts/vserver-build.yum diff --git a/util-vserver/scripts/vserver-setup.functions b/scripts/vserver-setup.functions similarity index 100% rename from util-vserver/scripts/vserver-setup.functions rename to scripts/vserver-setup.functions diff --git a/util-vserver/scripts/vserver-wrapper b/scripts/vserver-wrapper similarity index 100% rename from util-vserver/scripts/vserver-wrapper rename to scripts/vserver-wrapper diff --git a/util-vserver/scripts/vserver.functions b/scripts/vserver.functions similarity index 100% rename from util-vserver/scripts/vserver.functions rename to scripts/vserver.functions diff --git a/util-vserver/scripts/vserver.start b/scripts/vserver.start similarity index 100% rename from util-vserver/scripts/vserver.start rename to scripts/vserver.start diff --git a/util-vserver/scripts/vserver.stop b/scripts/vserver.stop similarity index 100% rename from util-vserver/scripts/vserver.stop rename to scripts/vserver.stop diff --git a/util-vserver/scripts/vserver.suexec b/scripts/vserver.suexec similarity index 100% rename from util-vserver/scripts/vserver.suexec rename to scripts/vserver.suexec diff --git a/util-vserver/scripts/vservers.grabinfo.sh b/scripts/vservers.grabinfo.sh similarity index 100% rename from util-vserver/scripts/vservers.grabinfo.sh rename to scripts/vservers.grabinfo.sh diff --git a/util-vserver/scripts/vshelper b/scripts/vshelper similarity index 100% rename from util-vserver/scripts/vshelper rename to scripts/vshelper diff --git a/util-vserver/scripts/vsomething b/scripts/vsomething similarity index 100% rename from util-vserver/scripts/vsomething rename to scripts/vsomething diff --git a/util-vserver/scripts/vsysvwrapper b/scripts/vsysvwrapper similarity index 100% rename from util-vserver/scripts/vsysvwrapper rename to scripts/vsysvwrapper diff --git a/util-vserver/scripts/vtop b/scripts/vtop similarity index 100% rename from util-vserver/scripts/vtop rename to scripts/vtop diff --git a/util-vserver/scripts/vyum b/scripts/vyum similarity index 100% rename from util-vserver/scripts/vyum rename to scripts/vyum diff --git a/util-vserver/scripts/vyum-worker b/scripts/vyum-worker similarity index 100% rename from util-vserver/scripts/vyum-worker rename to scripts/vyum-worker diff --git a/util-vserver/src/.cvsignore b/src/.cvsignore similarity index 100% rename from util-vserver/src/.cvsignore rename to src/.cvsignore diff --git a/util-vserver/src/Makefile-files b/src/Makefile-files similarity index 100% rename from util-vserver/src/Makefile-files rename to src/Makefile-files diff --git a/util-vserver/src/capability-compat.h b/src/capability-compat.h similarity index 100% rename from util-vserver/src/capability-compat.h rename to src/capability-compat.h diff --git a/util-vserver/src/capchroot.c b/src/capchroot.c similarity index 100% rename from util-vserver/src/capchroot.c rename to src/capchroot.c diff --git a/util-vserver/src/chain-echo.c b/src/chain-echo.c similarity index 100% rename from util-vserver/src/chain-echo.c rename to src/chain-echo.c diff --git a/util-vserver/src/chbind.c b/src/chbind.c similarity index 100% rename from util-vserver/src/chbind.c rename to src/chbind.c diff --git a/util-vserver/src/chcontext.c b/src/chcontext.c similarity index 100% rename from util-vserver/src/chcontext.c rename to src/chcontext.c diff --git a/util-vserver/src/check-unixfile.c b/src/check-unixfile.c similarity index 100% rename from util-vserver/src/check-unixfile.c rename to src/check-unixfile.c diff --git a/util-vserver/src/chroot-sh.c b/src/chroot-sh.c similarity index 100% rename from util-vserver/src/chroot-sh.c rename to src/chroot-sh.c diff --git a/util-vserver/src/chxid.c b/src/chxid.c similarity index 100% rename from util-vserver/src/chxid.c rename to src/chxid.c diff --git a/util-vserver/src/compat-pivot_root.h b/src/compat-pivot_root.h similarity index 100% rename from util-vserver/src/compat-pivot_root.h rename to src/compat-pivot_root.h diff --git a/util-vserver/src/context-sync.hc b/src/context-sync.hc similarity index 100% rename from util-vserver/src/context-sync.hc rename to src/context-sync.hc diff --git a/util-vserver/src/exec-cd.c b/src/exec-cd.c similarity index 100% rename from util-vserver/src/exec-cd.c rename to src/exec-cd.c diff --git a/util-vserver/src/exec-ulimit.c b/src/exec-ulimit.c similarity index 100% rename from util-vserver/src/exec-ulimit.c rename to src/exec-ulimit.c diff --git a/util-vserver/src/fakerunlevel.c b/src/fakerunlevel.c similarity index 100% rename from util-vserver/src/fakerunlevel.c rename to src/fakerunlevel.c diff --git a/util-vserver/src/filetime.c b/src/filetime.c similarity index 100% rename from util-vserver/src/filetime.c rename to src/filetime.c diff --git a/util-vserver/src/fstool.c b/src/fstool.c similarity index 100% rename from util-vserver/src/fstool.c rename to src/fstool.c diff --git a/util-vserver/src/fstool.h b/src/fstool.h similarity index 100% rename from util-vserver/src/fstool.h rename to src/fstool.h diff --git a/util-vserver/src/ifspec.c b/src/ifspec.c similarity index 100% rename from util-vserver/src/ifspec.c rename to src/ifspec.c diff --git a/util-vserver/src/keep-ctx-alive.c b/src/keep-ctx-alive.c similarity index 100% rename from util-vserver/src/keep-ctx-alive.c rename to src/keep-ctx-alive.c diff --git a/util-vserver/src/listdevip.c b/src/listdevip.c similarity index 100% rename from util-vserver/src/listdevip.c rename to src/listdevip.c diff --git a/util-vserver/src/lockfile.c b/src/lockfile.c similarity index 100% rename from util-vserver/src/lockfile.c rename to src/lockfile.c diff --git a/util-vserver/src/lsxid.c b/src/lsxid.c similarity index 100% rename from util-vserver/src/lsxid.c rename to src/lsxid.c diff --git a/util-vserver/src/mask2prefix.c b/src/mask2prefix.c similarity index 100% rename from util-vserver/src/mask2prefix.c rename to src/mask2prefix.c diff --git a/util-vserver/src/parserpmdump.c b/src/parserpmdump.c similarity index 100% rename from util-vserver/src/parserpmdump.c rename to src/parserpmdump.c diff --git a/util-vserver/src/readlink.c b/src/readlink.c similarity index 100% rename from util-vserver/src/readlink.c rename to src/readlink.c diff --git a/util-vserver/src/rebootmgr.c b/src/rebootmgr.c similarity index 100% rename from util-vserver/src/rebootmgr.c rename to src/rebootmgr.c diff --git a/util-vserver/src/reducecap.c b/src/reducecap.c similarity index 100% rename from util-vserver/src/reducecap.c rename to src/reducecap.c diff --git a/util-vserver/src/rpm-fake-resolver.c b/src/rpm-fake-resolver.c similarity index 100% rename from util-vserver/src/rpm-fake-resolver.c rename to src/rpm-fake-resolver.c diff --git a/util-vserver/src/rpm-fake.c b/src/rpm-fake.c similarity index 100% rename from util-vserver/src/rpm-fake.c rename to src/rpm-fake.c diff --git a/util-vserver/src/save_ctxinfo.c b/src/save_ctxinfo.c similarity index 100% rename from util-vserver/src/save_ctxinfo.c rename to src/save_ctxinfo.c diff --git a/util-vserver/src/secure-mount.c b/src/secure-mount.c similarity index 100% rename from util-vserver/src/secure-mount.c rename to src/secure-mount.c diff --git a/util-vserver/src/secure-umount.c b/src/secure-umount.c similarity index 100% rename from util-vserver/src/secure-umount.c rename to src/secure-umount.c diff --git a/util-vserver/src/setattr.c b/src/setattr.c similarity index 100% rename from util-vserver/src/setattr.c rename to src/setattr.c diff --git a/util-vserver/src/showattr.c b/src/showattr.c similarity index 100% rename from util-vserver/src/showattr.c rename to src/showattr.c diff --git a/util-vserver/src/showperm.c b/src/showperm.c similarity index 100% rename from util-vserver/src/showperm.c rename to src/showperm.c diff --git a/util-vserver/src/sigexec.c b/src/sigexec.c similarity index 100% rename from util-vserver/src/sigexec.c rename to src/sigexec.c diff --git a/util-vserver/src/stack-start.h b/src/stack-start.h similarity index 100% rename from util-vserver/src/stack-start.h rename to src/stack-start.h diff --git a/util-vserver/src/testsuite/.cvsignore b/src/testsuite/.cvsignore similarity index 100% rename from util-vserver/src/testsuite/.cvsignore rename to src/testsuite/.cvsignore diff --git a/util-vserver/src/testsuite/Makefile-files b/src/testsuite/Makefile-files similarity index 100% rename from util-vserver/src/testsuite/Makefile-files rename to src/testsuite/Makefile-files diff --git a/util-vserver/src/testsuite/chbind-test.c b/src/testsuite/chbind-test.c similarity index 100% rename from util-vserver/src/testsuite/chbind-test.c rename to src/testsuite/chbind-test.c diff --git a/util-vserver/src/testsuite/chcontext-test.c b/src/testsuite/chcontext-test.c similarity index 100% rename from util-vserver/src/testsuite/chcontext-test.c rename to src/testsuite/chcontext-test.c diff --git a/util-vserver/src/testsuite/data/rpm-fake-test.inp b/src/testsuite/data/rpm-fake-test.inp similarity index 100% rename from util-vserver/src/testsuite/data/rpm-fake-test.inp rename to src/testsuite/data/rpm-fake-test.inp diff --git a/util-vserver/src/testsuite/data/rpm-fake-test.out b/src/testsuite/data/rpm-fake-test.out similarity index 100% rename from util-vserver/src/testsuite/data/rpm-fake-test.out rename to src/testsuite/data/rpm-fake-test.out diff --git a/util-vserver/src/testsuite/hashcalc-plain.c b/src/testsuite/hashcalc-plain.c similarity index 100% rename from util-vserver/src/testsuite/hashcalc-plain.c rename to src/testsuite/hashcalc-plain.c diff --git a/util-vserver/src/testsuite/hashcalc-plain.sh b/src/testsuite/hashcalc-plain.sh similarity index 100% rename from util-vserver/src/testsuite/hashcalc-plain.sh rename to src/testsuite/hashcalc-plain.sh diff --git a/util-vserver/src/testsuite/hashcalc.c b/src/testsuite/hashcalc.c similarity index 100% rename from util-vserver/src/testsuite/hashcalc.c rename to src/testsuite/hashcalc.c diff --git a/util-vserver/src/testsuite/hashcalc.sh b/src/testsuite/hashcalc.sh similarity index 100% rename from util-vserver/src/testsuite/hashcalc.sh rename to src/testsuite/hashcalc.sh diff --git a/util-vserver/src/testsuite/rpm-fake-test.c b/src/testsuite/rpm-fake-test.c similarity index 100% rename from util-vserver/src/testsuite/rpm-fake-test.c rename to src/testsuite/rpm-fake-test.c diff --git a/util-vserver/src/testsuite/rpm-fake-test.sh b/src/testsuite/rpm-fake-test.sh similarity index 100% rename from util-vserver/src/testsuite/rpm-fake-test.sh rename to src/testsuite/rpm-fake-test.sh diff --git a/util-vserver/src/testsuite/vunify-functest.c b/src/testsuite/vunify-functest.c similarity index 100% rename from util-vserver/src/testsuite/vunify-functest.c rename to src/testsuite/vunify-functest.c diff --git a/util-vserver/src/testsuite/vunify-test.sh b/src/testsuite/vunify-test.sh similarity index 100% rename from util-vserver/src/testsuite/vunify-test.sh rename to src/testsuite/vunify-test.sh diff --git a/util-vserver/src/testsuite/vwait-test.sh b/src/testsuite/vwait-test.sh similarity index 100% rename from util-vserver/src/testsuite/vwait-test.sh rename to src/testsuite/vwait-test.sh diff --git a/util-vserver/src/util.h b/src/util.h similarity index 100% rename from util-vserver/src/util.h rename to src/util.h diff --git a/util-vserver/src/vattribute.c b/src/vattribute.c similarity index 100% rename from util-vserver/src/vattribute.c rename to src/vattribute.c diff --git a/util-vserver/src/vcontext.c b/src/vcontext.c similarity index 100% rename from util-vserver/src/vcontext.c rename to src/vcontext.c diff --git a/util-vserver/src/vcopy-init.hc b/src/vcopy-init.hc similarity index 100% rename from util-vserver/src/vcopy-init.hc rename to src/vcopy-init.hc diff --git a/util-vserver/src/vcopy.c b/src/vcopy.c similarity index 100% rename from util-vserver/src/vcopy.c rename to src/vcopy.c diff --git a/util-vserver/src/vdlimit.c b/src/vdlimit.c similarity index 100% rename from util-vserver/src/vdlimit.c rename to src/vdlimit.c diff --git a/util-vserver/src/vdu.c b/src/vdu.c similarity index 100% rename from util-vserver/src/vdu.c rename to src/vdu.c diff --git a/util-vserver/src/vhashify-init.hc b/src/vhashify-init.hc similarity index 100% rename from util-vserver/src/vhashify-init.hc rename to src/vhashify-init.hc diff --git a/util-vserver/src/vhashify.c b/src/vhashify.c similarity index 100% rename from util-vserver/src/vhashify.c rename to src/vhashify.c diff --git a/util-vserver/src/vhashify.h b/src/vhashify.h similarity index 100% rename from util-vserver/src/vhashify.h rename to src/vhashify.h diff --git a/util-vserver/src/vkill.c b/src/vkill.c similarity index 100% rename from util-vserver/src/vkill.c rename to src/vkill.c diff --git a/util-vserver/src/vlimit.c b/src/vlimit.c similarity index 100% rename from util-vserver/src/vlimit.c rename to src/vlimit.c diff --git a/util-vserver/src/vnamespace.c b/src/vnamespace.c similarity index 100% rename from util-vserver/src/vnamespace.c rename to src/vnamespace.c diff --git a/util-vserver/src/vps.c b/src/vps.c similarity index 100% rename from util-vserver/src/vps.c rename to src/vps.c diff --git a/util-vserver/src/vreboot.c b/src/vreboot.c similarity index 100% rename from util-vserver/src/vreboot.c rename to src/vreboot.c diff --git a/util-vserver/src/vrsetup.c b/src/vrsetup.c similarity index 100% rename from util-vserver/src/vrsetup.c rename to src/vrsetup.c diff --git a/util-vserver/src/vsched.c b/src/vsched.c similarity index 100% rename from util-vserver/src/vsched.c rename to src/vsched.c diff --git a/util-vserver/src/vserver-info.c b/src/vserver-info.c similarity index 100% rename from util-vserver/src/vserver-info.c rename to src/vserver-info.c diff --git a/util-vserver/src/vserver-stat.c b/src/vserver-stat.c similarity index 100% rename from util-vserver/src/vserver-stat.c rename to src/vserver-stat.c diff --git a/util-vserver/src/vserver-visitdir.hc b/src/vserver-visitdir.hc similarity index 100% rename from util-vserver/src/vserver-visitdir.hc rename to src/vserver-visitdir.hc diff --git a/util-vserver/src/vshelper-sync.c b/src/vshelper-sync.c similarity index 100% rename from util-vserver/src/vshelper-sync.c rename to src/vshelper-sync.c diff --git a/util-vserver/src/vuname.c b/src/vuname.c similarity index 100% rename from util-vserver/src/vuname.c rename to src/vuname.c diff --git a/util-vserver/src/vunify-init.hc b/src/vunify-init.hc similarity index 100% rename from util-vserver/src/vunify-init.hc rename to src/vunify-init.hc diff --git a/util-vserver/src/vunify.c b/src/vunify.c similarity index 100% rename from util-vserver/src/vunify.c rename to src/vunify.c diff --git a/util-vserver/src/vunify.h b/src/vunify.h similarity index 100% rename from util-vserver/src/vunify.h rename to src/vunify.h diff --git a/util-vserver/src/vwait.c b/src/vwait.c similarity index 100% rename from util-vserver/src/vwait.c rename to src/vwait.c diff --git a/util-vserver/sysv/.cvsignore b/sysv/.cvsignore similarity index 100% rename from util-vserver/sysv/.cvsignore rename to sysv/.cvsignore diff --git a/util-vserver/sysv/Makefile-files b/sysv/Makefile-files similarity index 100% rename from util-vserver/sysv/Makefile-files rename to sysv/Makefile-files diff --git a/util-vserver/sysv/rebootmgr b/sysv/rebootmgr similarity index 100% rename from util-vserver/sysv/rebootmgr rename to sysv/rebootmgr diff --git a/util-vserver/sysv/v_gated.subst b/sysv/v_gated.subst similarity index 100% rename from util-vserver/sysv/v_gated.subst rename to sysv/v_gated.subst diff --git a/util-vserver/sysv/v_httpd.subst b/sysv/v_httpd.subst similarity index 100% rename from util-vserver/sysv/v_httpd.subst rename to sysv/v_httpd.subst diff --git a/util-vserver/sysv/v_named.subst b/sysv/v_named.subst similarity index 100% rename from util-vserver/sysv/v_named.subst rename to sysv/v_named.subst diff --git a/util-vserver/sysv/v_portmap.subst b/sysv/v_portmap.subst similarity index 100% rename from util-vserver/sysv/v_portmap.subst rename to sysv/v_portmap.subst diff --git a/util-vserver/sysv/v_sendmail.subst b/sysv/v_sendmail.subst similarity index 100% rename from util-vserver/sysv/v_sendmail.subst rename to sysv/v_sendmail.subst diff --git a/util-vserver/sysv/v_smb.subst b/sysv/v_smb.subst similarity index 100% rename from util-vserver/sysv/v_smb.subst rename to sysv/v_smb.subst diff --git a/util-vserver/sysv/v_sshd.subst b/sysv/v_sshd.subst similarity index 100% rename from util-vserver/sysv/v_sshd.subst rename to sysv/v_sshd.subst diff --git a/util-vserver/sysv/v_xinetd.subst b/sysv/v_xinetd.subst similarity index 100% rename from util-vserver/sysv/v_xinetd.subst rename to sysv/v_xinetd.subst diff --git a/util-vserver/sysv/vprocunhide b/sysv/vprocunhide similarity index 100% rename from util-vserver/sysv/vprocunhide rename to sysv/vprocunhide diff --git a/util-vserver/sysv/vservers-default b/sysv/vservers-default similarity index 100% rename from util-vserver/sysv/vservers-default rename to sysv/vservers-default diff --git a/util-vserver/sysv/vservers-legacy b/sysv/vservers-legacy similarity index 100% rename from util-vserver/sysv/vservers-legacy rename to sysv/vservers-legacy diff --git a/util-vserver/sysv/vservers.conf b/sysv/vservers.conf similarity index 100% rename from util-vserver/sysv/vservers.conf rename to sysv/vservers.conf diff --git a/util-vserver/tests/.cvsignore b/tests/.cvsignore similarity index 100% rename from util-vserver/tests/.cvsignore rename to tests/.cvsignore diff --git a/util-vserver/tests/Makefile-files b/tests/Makefile-files similarity index 100% rename from util-vserver/tests/Makefile-files rename to tests/Makefile-files diff --git a/util-vserver/tests/chrootsafe.c b/tests/chrootsafe.c similarity index 100% rename from util-vserver/tests/chrootsafe.c rename to tests/chrootsafe.c diff --git a/util-vserver/tests/escaperoot.c b/tests/escaperoot.c similarity index 100% rename from util-vserver/tests/escaperoot.c rename to tests/escaperoot.c diff --git a/util-vserver/tests/forkbomb.c b/tests/forkbomb.c similarity index 100% rename from util-vserver/tests/forkbomb.c rename to tests/forkbomb.c diff --git a/util-vserver/tests/getctx.c b/tests/getctx.c similarity index 100% rename from util-vserver/tests/getctx.c rename to tests/getctx.c diff --git a/util-vserver/tests/getinitpid.c b/tests/getinitpid.c similarity index 100% rename from util-vserver/tests/getinitpid.c rename to tests/getinitpid.c diff --git a/util-vserver/tests/testipc.c b/tests/testipc.c similarity index 100% rename from util-vserver/tests/testipc.c rename to tests/testipc.c diff --git a/util-vserver/tests/testlimit.c b/tests/testlimit.c similarity index 100% rename from util-vserver/tests/testlimit.c rename to tests/testlimit.c diff --git a/util-vserver/tests/testopenf.c b/tests/testopenf.c similarity index 100% rename from util-vserver/tests/testopenf.c rename to tests/testopenf.c diff --git a/util-vserver/tests/vserver-info.c b/tests/vserver-info.c similarity index 100% rename from util-vserver/tests/vserver-info.c rename to tests/vserver-info.c diff --git a/util-vserver/update-doc b/update-doc similarity index 100% rename from util-vserver/update-doc rename to update-doc diff --git a/util-vserver/util-vserver.spec.in b/util-vserver.spec.in similarity index 100% rename from util-vserver/util-vserver.spec.in rename to util-vserver.spec.in diff --git a/util-vserver/vserver-start/.cvsignore b/vserver-start/.cvsignore similarity index 100% rename from util-vserver/vserver-start/.cvsignore rename to vserver-start/.cvsignore diff --git a/util-vserver/vserver-start/Makefile-files b/vserver-start/Makefile-files similarity index 100% rename from util-vserver/vserver-start/Makefile-files rename to vserver-start/Makefile-files diff --git a/util-vserver/vserver-start/configuration-init.c b/vserver-start/configuration-init.c similarity index 100% rename from util-vserver/vserver-start/configuration-init.c rename to vserver-start/configuration-init.c diff --git a/util-vserver/vserver-start/configuration.c b/vserver-start/configuration.c similarity index 100% rename from util-vserver/vserver-start/configuration.c rename to vserver-start/configuration.c diff --git a/util-vserver/vserver-start/configuration.h b/vserver-start/configuration.h similarity index 100% rename from util-vserver/vserver-start/configuration.h rename to vserver-start/configuration.h diff --git a/util-vserver/vserver-start/defaulttty.c b/vserver-start/defaulttty.c similarity index 100% rename from util-vserver/vserver-start/defaulttty.c rename to vserver-start/defaulttty.c diff --git a/util-vserver/vserver-start/interface-add.c b/vserver-start/interface-add.c similarity index 100% rename from util-vserver/vserver-start/interface-add.c rename to vserver-start/interface-add.c diff --git a/util-vserver/vserver-start/interface-free.hc b/vserver-start/interface-free.hc similarity index 100% rename from util-vserver/vserver-start/interface-free.hc rename to vserver-start/interface-free.hc diff --git a/util-vserver/vserver-start/interface-init.hc b/vserver-start/interface-init.hc similarity index 100% rename from util-vserver/vserver-start/interface-init.hc rename to vserver-start/interface-init.hc diff --git a/util-vserver/vserver-start/interface-print.c b/vserver-start/interface-print.c similarity index 100% rename from util-vserver/vserver-start/interface-print.c rename to vserver-start/interface-print.c diff --git a/util-vserver/vserver-start/interface-read.c b/vserver-start/interface-read.c similarity index 100% rename from util-vserver/vserver-start/interface-read.c rename to vserver-start/interface-read.c diff --git a/util-vserver/vserver-start/interface-remove.c b/vserver-start/interface-remove.c similarity index 100% rename from util-vserver/vserver-start/interface-remove.c rename to vserver-start/interface-remove.c diff --git a/util-vserver/vserver-start/interface.c b/vserver-start/interface.c similarity index 100% rename from util-vserver/vserver-start/interface.c rename to vserver-start/interface.c diff --git a/util-vserver/vserver-start/interface.h b/vserver-start/interface.h similarity index 100% rename from util-vserver/vserver-start/interface.h rename to vserver-start/interface.h diff --git a/util-vserver/vserver-start/main.c b/vserver-start/main.c similarity index 100% rename from util-vserver/vserver-start/main.c rename to vserver-start/main.c diff --git a/util-vserver/vserver-start/mount.c b/vserver-start/mount.c similarity index 100% rename from util-vserver/vserver-start/mount.c rename to vserver-start/mount.c diff --git a/util-vserver/vserver-start/mount.h b/vserver-start/mount.h similarity index 100% rename from util-vserver/vserver-start/mount.h rename to vserver-start/mount.h diff --git a/util-vserver/vserver-start/scriptlets.c b/vserver-start/scriptlets.c similarity index 100% rename from util-vserver/vserver-start/scriptlets.c rename to vserver-start/scriptlets.c diff --git a/util-vserver/vserver-start/undo.c b/vserver-start/undo.c similarity index 100% rename from util-vserver/vserver-start/undo.c rename to vserver-start/undo.c diff --git a/util-vserver/vserver-start/undo.h b/vserver-start/undo.h similarity index 100% rename from util-vserver/vserver-start/undo.h rename to vserver-start/undo.h diff --git a/util-vserver/vserver-start/vserver-start.h b/vserver-start/vserver-start.h similarity index 100% rename from util-vserver/vserver-start/vserver-start.h rename to vserver-start/vserver-start.h diff --git a/util-vserver/vserver-start/vshelper.c b/vserver-start/vshelper.c similarity index 100% rename from util-vserver/vserver-start/vshelper.c rename to vserver-start/vshelper.c diff --git a/util-vserver/vserver-start/vshelper.h b/vserver-start/vshelper.h similarity index 100% rename from util-vserver/vserver-start/vshelper.h rename to vserver-start/vshelper.h