Merge with klibc.git
diff --git a/Kbuild b/Kbuild
index 0751877..63f8f7d 100644
--- a/Kbuild
+++ b/Kbuild
@@ -6,12 +6,13 @@
$(obj)/all:
$(Q)$(MAKE) $(klibc)=scripts/basic
- $(Q)$(MAKE) $(klibc)=klibc
+ $(Q)$(MAKE) $(klibc)=usr/klibc
$(Q)$(MAKE) $(klibc)=usr/kinit
- $(Q)$(MAKE) $(klibc)=dash
- $(Q)$(MAKE) $(klibc)=utils
- $(Q)$(MAKE) $(klibc)=gzip
+ $(Q)$(MAKE) $(klibc)=usr/dash
+ $(Q)$(MAKE) $(klibc)=usr/utils
+ $(Q)$(MAKE) $(klibc)=usr/gzip
# Directories to visit during clean and install
-subdir- := scripts/basic klcc klibc dash utils gzip usr/kinit klibc/tests
+subdir- := scripts/basic klcc usr/klibc usr/dash usr/utils usr/gzip \
+ usr/kinit usr/klibc/tests
diff --git a/Makefile b/Makefile
index 9756aea..43e642d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
-VERSION := $(shell cat version)
SRCROOT = .
# kbuild compatibility
export srctree := $(shell pwd)
export objtree := $(shell pwd)
-export KLIBCSRC := klibc
-export KLIBCINC := include
-export KLIBCOBJ := klibc
+export KLIBCSRC := usr/klibc
+export VERSION := $(shell cat $(KLIBCSRC)/version)
+export KLIBCINC := usr/include
+export KLIBCOBJ := usr/klibc
export KLIBCKERNELSRC := linux/
export KLIBCKERNELOBJ := linux/
include scripts/Kbuild.include
@@ -85,7 +85,7 @@
rpmbuild = $(shell which rpmbuild 2>/dev/null || which rpm)
-klibc.spec: klibc.spec.in version
+klibc.spec: klibc.spec.in $(KLIBCSRC)/version
sed -e 's/@@VERSION@@/$(VERSION)/g' < $< > $@
# Build klcc - it is the first target
diff --git a/defconfig b/defconfig
index 0d5b477..723b2b8 100644
--- a/defconfig
+++ b/defconfig
@@ -1,2 +1,3 @@
CONFIG_KLIBC=y
CONFIG_KLIBC_ERRLIST=y
+CONFIG_KLIBC_ZLIB=y
diff --git a/klcc/Kbuild b/klcc/Kbuild
index 400dfc2..7efcd24 100644
--- a/klcc/Kbuild
+++ b/klcc/Kbuild
@@ -21,7 +21,7 @@
$(Q)echo 'STRIPFLAGS=$(KLIBCSTRIPFLAGS)' >> $@
$(Q)echo 'EMAIN=$(KLIBCEMAIN)' >> $@
$(Q)echo 'BITSIZE=$(KLIBCBITSIZE)' >> $@
- $(Q)echo 'VERSION=$(shell cat $(srctree)/version)' >> $@
+ $(Q)echo 'VERSION=$(shell cat $(srctree)/usr/klibc/version)' >> $@
$(Q)echo 'prefix=$(INSTALLDIR)' >> $@
$(Q)echo 'bindir=$(INSTALLDIR)/$(KCROSS)bin' >> $@
$(Q)echo 'libdir=$(INSTALLDIR)/$(KCROSS)lib' >> $@
diff --git a/klibc.spec.in b/klibc.spec.in
index d008130..85f57ef 100644
--- a/klibc.spec.in
+++ b/klibc.spec.in
@@ -77,11 +77,11 @@
# Install the docs
mkdir -p %{buildroot}%{bindocdir} %{buildroot}%{libdocdir}
install -m 444 README %{buildroot}%{libdocdir}
-install -m 444 klibc/README %{buildroot}%{libdocdir}/README.klibc
-install -m 444 klibc/arch/README %{buildroot}%{libdocdir}/README.klibc.arch
+install -m 444 usr/klibc/README %{buildroot}%{libdocdir}/README.klibc
+install -m 444 usr/klibc/arch/README %{buildroot}%{libdocdir}/README.klibc.arch
-install -m 444 gzip/COPYING %{buildroot}%{bindocdir}/COPYING.gzip
-install -m 444 gzip/README %{buildroot}%{bindocdir}/README.gzip
+install -m 444 usr/gzip/COPYING %{buildroot}%{bindocdir}/COPYING.gzip
+install -m 444 usr/gzip/README %{buildroot}%{bindocdir}/README.gzip
install -m 444 usr/kinit/ipconfig/README %{buildroot}%{bindocdir}/README.ipconfig
install -m 444 usr/kinit/README %{buildroot}%{bindocdir}/README.kinit
diff --git a/makerpm.sh b/makerpm.sh
index bb7af43..1e3a6f0 100755
--- a/makerpm.sh
+++ b/makerpm.sh
@@ -6,4 +6,4 @@
[ -z "$tmpdir" ] && export tmpdir=/var/tmp
./maketar.sh
-rpmbuild -ta $tmpdir/klibc-`cat version`.tar.gz
+rpmbuild -ta $tmpdir/klibc-`cat usr/klibc/version`.tar.gz
diff --git a/maketar.sh b/maketar.sh
index 2f286a6..deed7b3 100755
--- a/maketar.sh
+++ b/maketar.sh
@@ -10,7 +10,7 @@
cg-export $tmp
cd $tmp
make release
-version=`cat version`
+version=`cat usr/klibc/version`
rm -rf $tmpdir/klibc-$version
mv $tmp $tmpdir/klibc-$version
cd ..
diff --git a/scripts/Kbuild.install b/scripts/Kbuild.install
index 93d898c..1575169 100644
--- a/scripts/Kbuild.install
+++ b/scripts/Kbuild.install
@@ -105,7 +105,7 @@
done ; \
done
$(Q)cd $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include && ln -sf asm-$(KLIBCARCH) asm
- $(Q)cp -rf include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
+ $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
$(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
$(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc
index f90e5b3..3b83de8 100644
--- a/scripts/Kbuild.klibc
+++ b/scripts/Kbuild.klibc
@@ -60,8 +60,8 @@
include $(KLIBCSRC)/arch/$(KLIBCARCH)/MCONFIG
# klibc version
-KLIBCMAJOR := $(shell cut -d. -f1 $(srctree)/version)
-KLIBCMINOR := $(shell cut -d. -f2 $(srctree)/version)
+KLIBCMAJOR := $(shell cut -d. -f1 $(srctree)/usr/klibc/version)
+KLIBCMINOR := $(shell cut -d. -f2 $(srctree)/usr/klibc/version)
# binutils
KLIBCLD := $(LD)
diff --git a/syslinux/Makefile b/syslinux/Makefile
deleted file mode 100644
index 0e4a775..0000000
--- a/syslinux/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-SYSDIR = $(wildcard syslinux-[0-9]*)
-
-all:
- $(MAKE) -C $(SYSDIR) installer
- $(MAKE) -f Makefile.main
-
-clean:
- $(MAKE) -f Makefile.main clean
-
-spotless:
- $(MAKE) -C $(SYSDIR) clean
- $(MAKE) -f Makefile.main spotless
-
-install:
diff --git a/syslinux/Makefile.main b/syslinux/Makefile.main
deleted file mode 100644
index 7a18e67..0000000
--- a/syslinux/Makefile.main
+++ /dev/null
@@ -1,45 +0,0 @@
-SRCROOT = ..
-include ../MCONFIG
-
-SYSDIR = $(wildcard syslinux-[0-9]*)
-
-MAKEDEPS = -Wp,-MD,.$(subst /,-,$*).d
-CFLAGS = $(MAKEDEPS) $(OPTFLAGS) $(REQFLAGS) -W -Wall -DPATCH_OFFSET=`cat $(SYSDIR)/patch.offset`
-LIBS = $(KLIBC) $(LIBGCC)
-PROGS = syslinux syslinux.shared
-OBJS = syslinux-nomtools.o syslxmod.o bootsect_bin.o ldlinux_bin.o
-
-all: $(PROGS)
-
-syslinux: $(OBJS) $(CRT0) $(LIBS)
- $(LD) $(LDFLAGS) -o $@ $(CRT0) $(OBJS) $(LIBS)
- cp -f $@ $@.g
- $(STRIP) $@
-
-syslinux.shared: $(OBJS) $(CRT0) $(LIBS)
- $(LD) $(LDFLAGS) -o $@ $(EMAIN) $(CRTSHARED) $(OBJS) -R $(LIBSHARED) $(LIBGCC)
- cp -f $@ $@.g
- $(STRIP) $@
-
-%.c: $(SYSDIR)/%.c
- cp -f $< $@
-
-%.h: $(SYSDIR)/%.h
- cp -f $< $@
-
-$(CRT0) $(LIBS):
- @echo '*** error: $@ not up to date' || exit 1
-
-clean:
- $(RM) *.c *.h *.o $(PROGS) core .*.d
-
-spotless: clean
- $(RM) *~
-
-syslinux-nomtools.o: syslinux-nomtools.c syslinux.h
-
-syslxmod.o: syslxmod.c syslinux.h
-
-ifneq ($(wildcard .*.d),)
-include $(wildcard .*.d)
-endif
diff --git a/syslinux/README b/syslinux/README
deleted file mode 100644
index 7f975f9..0000000
--- a/syslinux/README
+++ /dev/null
@@ -1,5 +0,0 @@
-To build the klibc version of SYSLINUX, extract the SYSLINUX
-distribution into this directory (so it creates a directory called
-syslinux-<version> inside this directory), and type "make".
-
-SYSLINUX version 2.10-pre6 or later is required.
diff --git a/dash/Kbuild b/usr/dash/Kbuild
similarity index 100%
rename from dash/Kbuild
rename to usr/dash/Kbuild
diff --git a/dash/README.klibc b/usr/dash/README.klibc
similarity index 100%
rename from dash/README.klibc
rename to usr/dash/README.klibc
diff --git a/dash/TOUR b/usr/dash/TOUR
similarity index 100%
rename from dash/TOUR
rename to usr/dash/TOUR
diff --git a/dash/alias.c b/usr/dash/alias.c
similarity index 100%
rename from dash/alias.c
rename to usr/dash/alias.c
diff --git a/dash/alias.h b/usr/dash/alias.h
similarity index 100%
rename from dash/alias.h
rename to usr/dash/alias.h
diff --git a/dash/arith.y b/usr/dash/arith.y
similarity index 100%
rename from dash/arith.y
rename to usr/dash/arith.y
diff --git a/dash/arith_lex.l b/usr/dash/arith_lex.l
similarity index 100%
rename from dash/arith_lex.l
rename to usr/dash/arith_lex.l
diff --git a/dash/arith_yylex.c b/usr/dash/arith_yylex.c
similarity index 100%
rename from dash/arith_yylex.c
rename to usr/dash/arith_yylex.c
diff --git a/dash/bltin/bltin.h b/usr/dash/bltin/bltin.h
similarity index 100%
rename from dash/bltin/bltin.h
rename to usr/dash/bltin/bltin.h
diff --git a/dash/bltin/echo.1 b/usr/dash/bltin/echo.1
similarity index 100%
rename from dash/bltin/echo.1
rename to usr/dash/bltin/echo.1
diff --git a/dash/bltin/printf.1 b/usr/dash/bltin/printf.1
similarity index 100%
rename from dash/bltin/printf.1
rename to usr/dash/bltin/printf.1
diff --git a/dash/bltin/printf.c b/usr/dash/bltin/printf.c
similarity index 100%
rename from dash/bltin/printf.c
rename to usr/dash/bltin/printf.c
diff --git a/dash/bltin/test.1 b/usr/dash/bltin/test.1
similarity index 100%
rename from dash/bltin/test.1
rename to usr/dash/bltin/test.1
diff --git a/dash/bltin/test.c b/usr/dash/bltin/test.c
similarity index 100%
rename from dash/bltin/test.c
rename to usr/dash/bltin/test.c
diff --git a/dash/bltin/times.c b/usr/dash/bltin/times.c
similarity index 100%
rename from dash/bltin/times.c
rename to usr/dash/bltin/times.c
diff --git a/dash/builtins.def.in b/usr/dash/builtins.def.in
similarity index 100%
rename from dash/builtins.def.in
rename to usr/dash/builtins.def.in
diff --git a/dash/cd.c b/usr/dash/cd.c
similarity index 100%
rename from dash/cd.c
rename to usr/dash/cd.c
diff --git a/dash/cd.h b/usr/dash/cd.h
similarity index 100%
rename from dash/cd.h
rename to usr/dash/cd.h
diff --git a/dash/config.h b/usr/dash/config.h
similarity index 100%
rename from dash/config.h
rename to usr/dash/config.h
diff --git a/dash/error.c b/usr/dash/error.c
similarity index 100%
rename from dash/error.c
rename to usr/dash/error.c
diff --git a/dash/error.h b/usr/dash/error.h
similarity index 100%
rename from dash/error.h
rename to usr/dash/error.h
diff --git a/dash/eval.c b/usr/dash/eval.c
similarity index 100%
rename from dash/eval.c
rename to usr/dash/eval.c
diff --git a/dash/eval.h b/usr/dash/eval.h
similarity index 100%
rename from dash/eval.h
rename to usr/dash/eval.h
diff --git a/dash/exec.c b/usr/dash/exec.c
similarity index 100%
rename from dash/exec.c
rename to usr/dash/exec.c
diff --git a/dash/exec.h b/usr/dash/exec.h
similarity index 100%
rename from dash/exec.h
rename to usr/dash/exec.h
diff --git a/dash/expand.c b/usr/dash/expand.c
similarity index 100%
rename from dash/expand.c
rename to usr/dash/expand.c
diff --git a/dash/expand.h b/usr/dash/expand.h
similarity index 100%
rename from dash/expand.h
rename to usr/dash/expand.h
diff --git a/dash/funcs/cmv b/usr/dash/funcs/cmv
similarity index 100%
rename from dash/funcs/cmv
rename to usr/dash/funcs/cmv
diff --git a/dash/funcs/dirs b/usr/dash/funcs/dirs
similarity index 100%
rename from dash/funcs/dirs
rename to usr/dash/funcs/dirs
diff --git a/dash/funcs/kill b/usr/dash/funcs/kill
similarity index 100%
rename from dash/funcs/kill
rename to usr/dash/funcs/kill
diff --git a/dash/funcs/login b/usr/dash/funcs/login
similarity index 100%
rename from dash/funcs/login
rename to usr/dash/funcs/login
diff --git a/dash/funcs/newgrp b/usr/dash/funcs/newgrp
similarity index 100%
rename from dash/funcs/newgrp
rename to usr/dash/funcs/newgrp
diff --git a/dash/funcs/popd b/usr/dash/funcs/popd
similarity index 100%
rename from dash/funcs/popd
rename to usr/dash/funcs/popd
diff --git a/dash/funcs/pushd b/usr/dash/funcs/pushd
similarity index 100%
rename from dash/funcs/pushd
rename to usr/dash/funcs/pushd
diff --git a/dash/funcs/suspend b/usr/dash/funcs/suspend
similarity index 100%
rename from dash/funcs/suspend
rename to usr/dash/funcs/suspend
diff --git a/dash/hetio.c b/usr/dash/hetio.c
similarity index 100%
rename from dash/hetio.c
rename to usr/dash/hetio.c
diff --git a/dash/hetio.h b/usr/dash/hetio.h
similarity index 100%
rename from dash/hetio.h
rename to usr/dash/hetio.h
diff --git a/dash/histedit.c b/usr/dash/histedit.c
similarity index 100%
rename from dash/histedit.c
rename to usr/dash/histedit.c
diff --git a/dash/init.h b/usr/dash/init.h
similarity index 100%
rename from dash/init.h
rename to usr/dash/init.h
diff --git a/dash/input.c b/usr/dash/input.c
similarity index 100%
rename from dash/input.c
rename to usr/dash/input.c
diff --git a/dash/input.h b/usr/dash/input.h
similarity index 100%
rename from dash/input.h
rename to usr/dash/input.h
diff --git a/dash/jobs.c b/usr/dash/jobs.c
similarity index 100%
rename from dash/jobs.c
rename to usr/dash/jobs.c
diff --git a/dash/jobs.h b/usr/dash/jobs.h
similarity index 100%
rename from dash/jobs.h
rename to usr/dash/jobs.h
diff --git a/dash/machdep.h b/usr/dash/machdep.h
similarity index 100%
rename from dash/machdep.h
rename to usr/dash/machdep.h
diff --git a/dash/mail.c b/usr/dash/mail.c
similarity index 100%
rename from dash/mail.c
rename to usr/dash/mail.c
diff --git a/dash/mail.h b/usr/dash/mail.h
similarity index 100%
rename from dash/mail.h
rename to usr/dash/mail.h
diff --git a/dash/main.c b/usr/dash/main.c
similarity index 100%
rename from dash/main.c
rename to usr/dash/main.c
diff --git a/dash/main.h b/usr/dash/main.h
similarity index 100%
rename from dash/main.h
rename to usr/dash/main.h
diff --git a/dash/memalloc.c b/usr/dash/memalloc.c
similarity index 100%
rename from dash/memalloc.c
rename to usr/dash/memalloc.c
diff --git a/dash/memalloc.h b/usr/dash/memalloc.h
similarity index 100%
rename from dash/memalloc.h
rename to usr/dash/memalloc.h
diff --git a/dash/miscbltin.c b/usr/dash/miscbltin.c
similarity index 100%
rename from dash/miscbltin.c
rename to usr/dash/miscbltin.c
diff --git a/dash/miscbltin.h b/usr/dash/miscbltin.h
similarity index 100%
rename from dash/miscbltin.h
rename to usr/dash/miscbltin.h
diff --git a/dash/mkbuiltins b/usr/dash/mkbuiltins
similarity index 100%
rename from dash/mkbuiltins
rename to usr/dash/mkbuiltins
diff --git a/dash/mkinit.c b/usr/dash/mkinit.c
similarity index 100%
rename from dash/mkinit.c
rename to usr/dash/mkinit.c
diff --git a/dash/mknodes.c b/usr/dash/mknodes.c
similarity index 100%
rename from dash/mknodes.c
rename to usr/dash/mknodes.c
diff --git a/dash/mksyntax.c b/usr/dash/mksyntax.c
similarity index 100%
rename from dash/mksyntax.c
rename to usr/dash/mksyntax.c
diff --git a/dash/mktokens b/usr/dash/mktokens
similarity index 100%
rename from dash/mktokens
rename to usr/dash/mktokens
diff --git a/dash/myhistedit.h b/usr/dash/myhistedit.h
similarity index 100%
rename from dash/myhistedit.h
rename to usr/dash/myhistedit.h
diff --git a/dash/mystring.c b/usr/dash/mystring.c
similarity index 100%
rename from dash/mystring.c
rename to usr/dash/mystring.c
diff --git a/dash/mystring.h b/usr/dash/mystring.h
similarity index 100%
rename from dash/mystring.h
rename to usr/dash/mystring.h
diff --git a/dash/nodes.c.pat b/usr/dash/nodes.c.pat
similarity index 100%
rename from dash/nodes.c.pat
rename to usr/dash/nodes.c.pat
diff --git a/dash/nodetypes b/usr/dash/nodetypes
similarity index 100%
rename from dash/nodetypes
rename to usr/dash/nodetypes
diff --git a/dash/options.c b/usr/dash/options.c
similarity index 100%
rename from dash/options.c
rename to usr/dash/options.c
diff --git a/dash/options.h b/usr/dash/options.h
similarity index 100%
rename from dash/options.h
rename to usr/dash/options.h
diff --git a/dash/output.c b/usr/dash/output.c
similarity index 100%
rename from dash/output.c
rename to usr/dash/output.c
diff --git a/dash/output.h b/usr/dash/output.h
similarity index 100%
rename from dash/output.h
rename to usr/dash/output.h
diff --git a/dash/parser.c b/usr/dash/parser.c
similarity index 100%
rename from dash/parser.c
rename to usr/dash/parser.c
diff --git a/dash/parser.h b/usr/dash/parser.h
similarity index 100%
rename from dash/parser.h
rename to usr/dash/parser.h
diff --git a/dash/redir.c b/usr/dash/redir.c
similarity index 100%
rename from dash/redir.c
rename to usr/dash/redir.c
diff --git a/dash/redir.h b/usr/dash/redir.h
similarity index 100%
rename from dash/redir.h
rename to usr/dash/redir.h
diff --git a/dash/sh.1 b/usr/dash/sh.1
similarity index 100%
rename from dash/sh.1
rename to usr/dash/sh.1
diff --git a/dash/shell.h b/usr/dash/shell.h
similarity index 100%
rename from dash/shell.h
rename to usr/dash/shell.h
diff --git a/dash/show.c b/usr/dash/show.c
similarity index 100%
rename from dash/show.c
rename to usr/dash/show.c
diff --git a/dash/show.h b/usr/dash/show.h
similarity index 100%
rename from dash/show.h
rename to usr/dash/show.h
diff --git a/dash/system.c b/usr/dash/system.c
similarity index 100%
rename from dash/system.c
rename to usr/dash/system.c
diff --git a/dash/system.h b/usr/dash/system.h
similarity index 100%
rename from dash/system.h
rename to usr/dash/system.h
diff --git a/dash/trap.c b/usr/dash/trap.c
similarity index 100%
rename from dash/trap.c
rename to usr/dash/trap.c
diff --git a/dash/trap.h b/usr/dash/trap.h
similarity index 100%
rename from dash/trap.h
rename to usr/dash/trap.h
diff --git a/dash/var.c b/usr/dash/var.c
similarity index 100%
rename from dash/var.c
rename to usr/dash/var.c
diff --git a/dash/var.h b/usr/dash/var.h
similarity index 100%
rename from dash/var.h
rename to usr/dash/var.h
diff --git a/gzip/COPYING b/usr/gzip/COPYING
similarity index 100%
rename from gzip/COPYING
rename to usr/gzip/COPYING
diff --git a/gzip/Kbuild b/usr/gzip/Kbuild
similarity index 100%
rename from gzip/Kbuild
rename to usr/gzip/Kbuild
diff --git a/gzip/README b/usr/gzip/README
similarity index 100%
rename from gzip/README
rename to usr/gzip/README
diff --git a/gzip/bits.c b/usr/gzip/bits.c
similarity index 100%
rename from gzip/bits.c
rename to usr/gzip/bits.c
diff --git a/gzip/deflate.c b/usr/gzip/deflate.c
similarity index 100%
rename from gzip/deflate.c
rename to usr/gzip/deflate.c
diff --git a/gzip/gzip.c b/usr/gzip/gzip.c
similarity index 100%
rename from gzip/gzip.c
rename to usr/gzip/gzip.c
diff --git a/gzip/gzip.h b/usr/gzip/gzip.h
similarity index 100%
rename from gzip/gzip.h
rename to usr/gzip/gzip.h
diff --git a/gzip/inflate.c b/usr/gzip/inflate.c
similarity index 100%
rename from gzip/inflate.c
rename to usr/gzip/inflate.c
diff --git a/gzip/revision.h b/usr/gzip/revision.h
similarity index 100%
rename from gzip/revision.h
rename to usr/gzip/revision.h
diff --git a/gzip/tailor.h b/usr/gzip/tailor.h
similarity index 100%
rename from gzip/tailor.h
rename to usr/gzip/tailor.h
diff --git a/gzip/trees.c b/usr/gzip/trees.c
similarity index 100%
rename from gzip/trees.c
rename to usr/gzip/trees.c
diff --git a/gzip/unzip.c b/usr/gzip/unzip.c
similarity index 100%
rename from gzip/unzip.c
rename to usr/gzip/unzip.c
diff --git a/gzip/util.c b/usr/gzip/util.c
similarity index 100%
rename from gzip/util.c
rename to usr/gzip/util.c
diff --git a/gzip/zip.c b/usr/gzip/zip.c
similarity index 100%
rename from gzip/zip.c
rename to usr/gzip/zip.c
diff --git a/include/alloca.h b/usr/include/alloca.h
similarity index 100%
rename from include/alloca.h
rename to usr/include/alloca.h
diff --git a/include/arch/alpha/klibc/archconfig.h b/usr/include/arch/alpha/klibc/archconfig.h
similarity index 100%
rename from include/arch/alpha/klibc/archconfig.h
rename to usr/include/arch/alpha/klibc/archconfig.h
diff --git a/include/arch/alpha/klibc/archsetjmp.h b/usr/include/arch/alpha/klibc/archsetjmp.h
similarity index 100%
rename from include/arch/alpha/klibc/archsetjmp.h
rename to usr/include/arch/alpha/klibc/archsetjmp.h
diff --git a/include/arch/alpha/klibc/archsignal.h b/usr/include/arch/alpha/klibc/archsignal.h
similarity index 100%
rename from include/arch/alpha/klibc/archsignal.h
rename to usr/include/arch/alpha/klibc/archsignal.h
diff --git a/include/arch/alpha/klibc/archstat.h b/usr/include/arch/alpha/klibc/archstat.h
similarity index 100%
rename from include/arch/alpha/klibc/archstat.h
rename to usr/include/arch/alpha/klibc/archstat.h
diff --git a/include/arch/alpha/klibc/archsys.h b/usr/include/arch/alpha/klibc/archsys.h
similarity index 100%
rename from include/arch/alpha/klibc/archsys.h
rename to usr/include/arch/alpha/klibc/archsys.h
diff --git a/include/arch/alpha/machine/asm.h b/usr/include/arch/alpha/machine/asm.h
similarity index 100%
rename from include/arch/alpha/machine/asm.h
rename to usr/include/arch/alpha/machine/asm.h
diff --git a/include/arch/arm/klibc/archconfig.h b/usr/include/arch/arm/klibc/archconfig.h
similarity index 100%
rename from include/arch/arm/klibc/archconfig.h
rename to usr/include/arch/arm/klibc/archconfig.h
diff --git a/include/arch/arm/klibc/archsetjmp.h b/usr/include/arch/arm/klibc/archsetjmp.h
similarity index 100%
rename from include/arch/arm/klibc/archsetjmp.h
rename to usr/include/arch/arm/klibc/archsetjmp.h
diff --git a/include/arch/arm/klibc/archsignal.h b/usr/include/arch/arm/klibc/archsignal.h
similarity index 100%
rename from include/arch/arm/klibc/archsignal.h
rename to usr/include/arch/arm/klibc/archsignal.h
diff --git a/include/arch/arm/klibc/archstat.h b/usr/include/arch/arm/klibc/archstat.h
similarity index 100%
rename from include/arch/arm/klibc/archstat.h
rename to usr/include/arch/arm/klibc/archstat.h
diff --git a/include/arch/arm/klibc/archsys.h b/usr/include/arch/arm/klibc/archsys.h
similarity index 100%
rename from include/arch/arm/klibc/archsys.h
rename to usr/include/arch/arm/klibc/archsys.h
diff --git a/include/arch/cris/klibc/archconfig.h b/usr/include/arch/cris/klibc/archconfig.h
similarity index 100%
rename from include/arch/cris/klibc/archconfig.h
rename to usr/include/arch/cris/klibc/archconfig.h
diff --git a/include/arch/cris/klibc/archsetjmp.h b/usr/include/arch/cris/klibc/archsetjmp.h
similarity index 100%
rename from include/arch/cris/klibc/archsetjmp.h
rename to usr/include/arch/cris/klibc/archsetjmp.h
diff --git a/include/arch/cris/klibc/archsignal.h b/usr/include/arch/cris/klibc/archsignal.h
similarity index 100%
rename from include/arch/cris/klibc/archsignal.h
rename to usr/include/arch/cris/klibc/archsignal.h
diff --git a/include/arch/cris/klibc/archstat.h b/usr/include/arch/cris/klibc/archstat.h
similarity index 100%
rename from include/arch/cris/klibc/archstat.h
rename to usr/include/arch/cris/klibc/archstat.h
diff --git a/include/arch/cris/klibc/archsys.h b/usr/include/arch/cris/klibc/archsys.h
similarity index 100%
rename from include/arch/cris/klibc/archsys.h
rename to usr/include/arch/cris/klibc/archsys.h
diff --git a/include/arch/i386/klibc/archconfig.h b/usr/include/arch/i386/klibc/archconfig.h
similarity index 100%
rename from include/arch/i386/klibc/archconfig.h
rename to usr/include/arch/i386/klibc/archconfig.h
diff --git a/include/arch/i386/klibc/archsetjmp.h b/usr/include/arch/i386/klibc/archsetjmp.h
similarity index 100%
rename from include/arch/i386/klibc/archsetjmp.h
rename to usr/include/arch/i386/klibc/archsetjmp.h
diff --git a/include/arch/i386/klibc/archsignal.h b/usr/include/arch/i386/klibc/archsignal.h
similarity index 100%
rename from include/arch/i386/klibc/archsignal.h
rename to usr/include/arch/i386/klibc/archsignal.h
diff --git a/include/arch/i386/klibc/archstat.h b/usr/include/arch/i386/klibc/archstat.h
similarity index 100%
rename from include/arch/i386/klibc/archstat.h
rename to usr/include/arch/i386/klibc/archstat.h
diff --git a/include/arch/i386/klibc/archsys.h b/usr/include/arch/i386/klibc/archsys.h
similarity index 100%
rename from include/arch/i386/klibc/archsys.h
rename to usr/include/arch/i386/klibc/archsys.h
diff --git a/include/arch/i386/klibc/diverr.h b/usr/include/arch/i386/klibc/diverr.h
similarity index 100%
rename from include/arch/i386/klibc/diverr.h
rename to usr/include/arch/i386/klibc/diverr.h
diff --git a/include/arch/i386/sys/io.h b/usr/include/arch/i386/sys/io.h
similarity index 100%
rename from include/arch/i386/sys/io.h
rename to usr/include/arch/i386/sys/io.h
diff --git a/include/arch/i386/sys/vm86.h b/usr/include/arch/i386/sys/vm86.h
similarity index 100%
rename from include/arch/i386/sys/vm86.h
rename to usr/include/arch/i386/sys/vm86.h
diff --git a/include/arch/ia64/klibc/archconfig.h b/usr/include/arch/ia64/klibc/archconfig.h
similarity index 100%
rename from include/arch/ia64/klibc/archconfig.h
rename to usr/include/arch/ia64/klibc/archconfig.h
diff --git a/include/arch/ia64/klibc/archsetjmp.h b/usr/include/arch/ia64/klibc/archsetjmp.h
similarity index 100%
rename from include/arch/ia64/klibc/archsetjmp.h
rename to usr/include/arch/ia64/klibc/archsetjmp.h
diff --git a/include/arch/ia64/klibc/archsignal.h b/usr/include/arch/ia64/klibc/archsignal.h
similarity index 100%
rename from include/arch/ia64/klibc/archsignal.h
rename to usr/include/arch/ia64/klibc/archsignal.h
diff --git a/include/arch/ia64/klibc/archstat.h b/usr/include/arch/ia64/klibc/archstat.h
similarity index 100%
rename from include/arch/ia64/klibc/archstat.h
rename to usr/include/arch/ia64/klibc/archstat.h
diff --git a/include/arch/ia64/klibc/archsys.h b/usr/include/arch/ia64/klibc/archsys.h
similarity index 100%
rename from include/arch/ia64/klibc/archsys.h
rename to usr/include/arch/ia64/klibc/archsys.h
diff --git a/include/arch/m32r/klibc/archconfig.h b/usr/include/arch/m32r/klibc/archconfig.h
similarity index 100%
rename from include/arch/m32r/klibc/archconfig.h
rename to usr/include/arch/m32r/klibc/archconfig.h
diff --git a/include/arch/m32r/klibc/archsetjmp.h b/usr/include/arch/m32r/klibc/archsetjmp.h
similarity index 100%
rename from include/arch/m32r/klibc/archsetjmp.h
rename to usr/include/arch/m32r/klibc/archsetjmp.h
diff --git a/include/arch/m32r/klibc/archsignal.h b/usr/include/arch/m32r/klibc/archsignal.h
similarity index 100%
rename from include/arch/m32r/klibc/archsignal.h
rename to usr/include/arch/m32r/klibc/archsignal.h
diff --git a/include/arch/m32r/klibc/archstat.h b/usr/include/arch/m32r/klibc/archstat.h
similarity index 100%
rename from include/arch/m32r/klibc/archstat.h
rename to usr/include/arch/m32r/klibc/archstat.h
diff --git a/include/arch/m32r/klibc/archsys.h b/usr/include/arch/m32r/klibc/archsys.h
similarity index 100%
rename from include/arch/m32r/klibc/archsys.h
rename to usr/include/arch/m32r/klibc/archsys.h
diff --git a/include/arch/m68k/klibc/archconfig.h b/usr/include/arch/m68k/klibc/archconfig.h
similarity index 100%
rename from include/arch/m68k/klibc/archconfig.h
rename to usr/include/arch/m68k/klibc/archconfig.h
diff --git a/include/arch/m68k/klibc/archsignal.h b/usr/include/arch/m68k/klibc/archsignal.h
similarity index 100%
rename from include/arch/m68k/klibc/archsignal.h
rename to usr/include/arch/m68k/klibc/archsignal.h
diff --git a/include/arch/m68k/klibc/archstat.h b/usr/include/arch/m68k/klibc/archstat.h
similarity index 100%
rename from include/arch/m68k/klibc/archstat.h
rename to usr/include/arch/m68k/klibc/archstat.h
diff --git a/include/arch/m68k/klibc/archsys.h b/usr/include/arch/m68k/klibc/archsys.h
similarity index 100%
rename from include/arch/m68k/klibc/archsys.h
rename to usr/include/arch/m68k/klibc/archsys.h
diff --git a/include/arch/mips/klibc/archconfig.h b/usr/include/arch/mips/klibc/archconfig.h
similarity index 100%
rename from include/arch/mips/klibc/archconfig.h
rename to usr/include/arch/mips/klibc/archconfig.h
diff --git a/include/arch/mips/klibc/archfcntl.h b/usr/include/arch/mips/klibc/archfcntl.h
similarity index 100%
rename from include/arch/mips/klibc/archfcntl.h
rename to usr/include/arch/mips/klibc/archfcntl.h
diff --git a/include/arch/mips/klibc/archsetjmp.h b/usr/include/arch/mips/klibc/archsetjmp.h
similarity index 100%
rename from include/arch/mips/klibc/archsetjmp.h
rename to usr/include/arch/mips/klibc/archsetjmp.h
diff --git a/include/arch/mips/klibc/archsignal.h b/usr/include/arch/mips/klibc/archsignal.h
similarity index 100%
rename from include/arch/mips/klibc/archsignal.h
rename to usr/include/arch/mips/klibc/archsignal.h
diff --git a/include/arch/mips/klibc/archstat.h b/usr/include/arch/mips/klibc/archstat.h
similarity index 100%
rename from include/arch/mips/klibc/archstat.h
rename to usr/include/arch/mips/klibc/archstat.h
diff --git a/include/arch/mips/klibc/archsys.h b/usr/include/arch/mips/klibc/archsys.h
similarity index 100%
rename from include/arch/mips/klibc/archsys.h
rename to usr/include/arch/mips/klibc/archsys.h
diff --git a/include/arch/mips/machine/asm.h b/usr/include/arch/mips/machine/asm.h
similarity index 100%
rename from include/arch/mips/machine/asm.h
rename to usr/include/arch/mips/machine/asm.h
diff --git a/include/arch/mips/sgidefs.h b/usr/include/arch/mips/sgidefs.h
similarity index 100%
rename from include/arch/mips/sgidefs.h
rename to usr/include/arch/mips/sgidefs.h
diff --git a/include/arch/mips/spaces.h b/usr/include/arch/mips/spaces.h
similarity index 100%
rename from include/arch/mips/spaces.h
rename to usr/include/arch/mips/spaces.h
diff --git a/include/arch/mips64/klibc/archconfig.h b/usr/include/arch/mips64/klibc/archconfig.h
similarity index 100%
rename from include/arch/mips64/klibc/archconfig.h
rename to usr/include/arch/mips64/klibc/archconfig.h
diff --git a/include/arch/mips64/klibc/archsignal.h b/usr/include/arch/mips64/klibc/archsignal.h
similarity index 100%
rename from include/arch/mips64/klibc/archsignal.h
rename to usr/include/arch/mips64/klibc/archsignal.h
diff --git a/include/arch/mips64/klibc/archstat.h b/usr/include/arch/mips64/klibc/archstat.h
similarity index 100%
rename from include/arch/mips64/klibc/archstat.h
rename to usr/include/arch/mips64/klibc/archstat.h
diff --git a/include/arch/mips64/klibc/archsys.h b/usr/include/arch/mips64/klibc/archsys.h
similarity index 100%
rename from include/arch/mips64/klibc/archsys.h
rename to usr/include/arch/mips64/klibc/archsys.h
diff --git a/include/arch/parisc/klibc/archconfig.h b/usr/include/arch/parisc/klibc/archconfig.h
similarity index 100%
rename from include/arch/parisc/klibc/archconfig.h
rename to usr/include/arch/parisc/klibc/archconfig.h
diff --git a/include/arch/parisc/klibc/archsetjmp.h b/usr/include/arch/parisc/klibc/archsetjmp.h
similarity index 100%
rename from include/arch/parisc/klibc/archsetjmp.h
rename to usr/include/arch/parisc/klibc/archsetjmp.h
diff --git a/include/arch/parisc/klibc/archsignal.h b/usr/include/arch/parisc/klibc/archsignal.h
similarity index 100%
rename from include/arch/parisc/klibc/archsignal.h
rename to usr/include/arch/parisc/klibc/archsignal.h
diff --git a/include/arch/parisc/klibc/archstat.h b/usr/include/arch/parisc/klibc/archstat.h
similarity index 100%
rename from include/arch/parisc/klibc/archstat.h
rename to usr/include/arch/parisc/klibc/archstat.h
diff --git a/include/arch/parisc/klibc/archsys.h b/usr/include/arch/parisc/klibc/archsys.h
similarity index 100%
rename from include/arch/parisc/klibc/archsys.h
rename to usr/include/arch/parisc/klibc/archsys.h
diff --git a/include/arch/ppc/klibc/archconfig.h b/usr/include/arch/ppc/klibc/archconfig.h
similarity index 100%
rename from include/arch/ppc/klibc/archconfig.h
rename to usr/include/arch/ppc/klibc/archconfig.h
diff --git a/include/arch/ppc/klibc/archsetjmp.h b/usr/include/arch/ppc/klibc/archsetjmp.h
similarity index 100%
rename from include/arch/ppc/klibc/archsetjmp.h
rename to usr/include/arch/ppc/klibc/archsetjmp.h
diff --git a/include/arch/ppc/klibc/archsignal.h b/usr/include/arch/ppc/klibc/archsignal.h
similarity index 100%
rename from include/arch/ppc/klibc/archsignal.h
rename to usr/include/arch/ppc/klibc/archsignal.h
diff --git a/include/arch/ppc/klibc/archstat.h b/usr/include/arch/ppc/klibc/archstat.h
similarity index 100%
rename from include/arch/ppc/klibc/archstat.h
rename to usr/include/arch/ppc/klibc/archstat.h
diff --git a/include/arch/ppc/klibc/archsys.h b/usr/include/arch/ppc/klibc/archsys.h
similarity index 100%
rename from include/arch/ppc/klibc/archsys.h
rename to usr/include/arch/ppc/klibc/archsys.h
diff --git a/include/arch/ppc64/klibc/archconfig.h b/usr/include/arch/ppc64/klibc/archconfig.h
similarity index 100%
rename from include/arch/ppc64/klibc/archconfig.h
rename to usr/include/arch/ppc64/klibc/archconfig.h
diff --git a/include/arch/ppc64/klibc/archsetjmp.h b/usr/include/arch/ppc64/klibc/archsetjmp.h
similarity index 100%
rename from include/arch/ppc64/klibc/archsetjmp.h
rename to usr/include/arch/ppc64/klibc/archsetjmp.h
diff --git a/include/arch/ppc64/klibc/archsignal.h b/usr/include/arch/ppc64/klibc/archsignal.h
similarity index 100%
rename from include/arch/ppc64/klibc/archsignal.h
rename to usr/include/arch/ppc64/klibc/archsignal.h
diff --git a/include/arch/ppc64/klibc/archstat.h b/usr/include/arch/ppc64/klibc/archstat.h
similarity index 100%
rename from include/arch/ppc64/klibc/archstat.h
rename to usr/include/arch/ppc64/klibc/archstat.h
diff --git a/include/arch/ppc64/klibc/archsys.h b/usr/include/arch/ppc64/klibc/archsys.h
similarity index 100%
rename from include/arch/ppc64/klibc/archsys.h
rename to usr/include/arch/ppc64/klibc/archsys.h
diff --git a/include/arch/s390/klibc/archconfig.h b/usr/include/arch/s390/klibc/archconfig.h
similarity index 100%
rename from include/arch/s390/klibc/archconfig.h
rename to usr/include/arch/s390/klibc/archconfig.h
diff --git a/include/arch/s390/klibc/archsetjmp.h b/usr/include/arch/s390/klibc/archsetjmp.h
similarity index 100%
rename from include/arch/s390/klibc/archsetjmp.h
rename to usr/include/arch/s390/klibc/archsetjmp.h
diff --git a/include/arch/s390/klibc/archsignal.h b/usr/include/arch/s390/klibc/archsignal.h
similarity index 100%
rename from include/arch/s390/klibc/archsignal.h
rename to usr/include/arch/s390/klibc/archsignal.h
diff --git a/include/arch/s390/klibc/archstat.h b/usr/include/arch/s390/klibc/archstat.h
similarity index 100%
rename from include/arch/s390/klibc/archstat.h
rename to usr/include/arch/s390/klibc/archstat.h
diff --git a/include/arch/s390/klibc/archsys.h b/usr/include/arch/s390/klibc/archsys.h
similarity index 100%
rename from include/arch/s390/klibc/archsys.h
rename to usr/include/arch/s390/klibc/archsys.h
diff --git a/include/arch/s390x/klibc/archconfig.h b/usr/include/arch/s390x/klibc/archconfig.h
similarity index 100%
rename from include/arch/s390x/klibc/archconfig.h
rename to usr/include/arch/s390x/klibc/archconfig.h
diff --git a/include/arch/s390x/klibc/archsetjmp.h b/usr/include/arch/s390x/klibc/archsetjmp.h
similarity index 100%
rename from include/arch/s390x/klibc/archsetjmp.h
rename to usr/include/arch/s390x/klibc/archsetjmp.h
diff --git a/include/arch/s390x/klibc/archsignal.h b/usr/include/arch/s390x/klibc/archsignal.h
similarity index 100%
rename from include/arch/s390x/klibc/archsignal.h
rename to usr/include/arch/s390x/klibc/archsignal.h
diff --git a/include/arch/s390x/klibc/archstat.h b/usr/include/arch/s390x/klibc/archstat.h
similarity index 100%
rename from include/arch/s390x/klibc/archstat.h
rename to usr/include/arch/s390x/klibc/archstat.h
diff --git a/include/arch/s390x/klibc/archsys.h b/usr/include/arch/s390x/klibc/archsys.h
similarity index 100%
rename from include/arch/s390x/klibc/archsys.h
rename to usr/include/arch/s390x/klibc/archsys.h
diff --git a/include/arch/sh/klibc/archconfig.h b/usr/include/arch/sh/klibc/archconfig.h
similarity index 100%
rename from include/arch/sh/klibc/archconfig.h
rename to usr/include/arch/sh/klibc/archconfig.h
diff --git a/include/arch/sh/klibc/archsetjmp.h b/usr/include/arch/sh/klibc/archsetjmp.h
similarity index 100%
rename from include/arch/sh/klibc/archsetjmp.h
rename to usr/include/arch/sh/klibc/archsetjmp.h
diff --git a/include/arch/sh/klibc/archsignal.h b/usr/include/arch/sh/klibc/archsignal.h
similarity index 100%
rename from include/arch/sh/klibc/archsignal.h
rename to usr/include/arch/sh/klibc/archsignal.h
diff --git a/include/arch/sh/klibc/archstat.h b/usr/include/arch/sh/klibc/archstat.h
similarity index 100%
rename from include/arch/sh/klibc/archstat.h
rename to usr/include/arch/sh/klibc/archstat.h
diff --git a/include/arch/sh/klibc/archsys.h b/usr/include/arch/sh/klibc/archsys.h
similarity index 100%
rename from include/arch/sh/klibc/archsys.h
rename to usr/include/arch/sh/klibc/archsys.h
diff --git a/include/arch/sparc/klibc/archconfig.h b/usr/include/arch/sparc/klibc/archconfig.h
similarity index 100%
rename from include/arch/sparc/klibc/archconfig.h
rename to usr/include/arch/sparc/klibc/archconfig.h
diff --git a/include/arch/sparc/klibc/archsetjmp.h b/usr/include/arch/sparc/klibc/archsetjmp.h
similarity index 100%
rename from include/arch/sparc/klibc/archsetjmp.h
rename to usr/include/arch/sparc/klibc/archsetjmp.h
diff --git a/include/arch/sparc/klibc/archsignal.h b/usr/include/arch/sparc/klibc/archsignal.h
similarity index 100%
rename from include/arch/sparc/klibc/archsignal.h
rename to usr/include/arch/sparc/klibc/archsignal.h
diff --git a/include/arch/sparc/klibc/archstat.h b/usr/include/arch/sparc/klibc/archstat.h
similarity index 100%
rename from include/arch/sparc/klibc/archstat.h
rename to usr/include/arch/sparc/klibc/archstat.h
diff --git a/include/arch/sparc/klibc/archsys.h b/usr/include/arch/sparc/klibc/archsys.h
similarity index 100%
rename from include/arch/sparc/klibc/archsys.h
rename to usr/include/arch/sparc/klibc/archsys.h
diff --git a/include/arch/sparc/machine/asm.h b/usr/include/arch/sparc/machine/asm.h
similarity index 100%
rename from include/arch/sparc/machine/asm.h
rename to usr/include/arch/sparc/machine/asm.h
diff --git a/include/arch/sparc/machine/frame.h b/usr/include/arch/sparc/machine/frame.h
similarity index 100%
rename from include/arch/sparc/machine/frame.h
rename to usr/include/arch/sparc/machine/frame.h
diff --git a/include/arch/sparc/machine/trap.h b/usr/include/arch/sparc/machine/trap.h
similarity index 100%
rename from include/arch/sparc/machine/trap.h
rename to usr/include/arch/sparc/machine/trap.h
diff --git a/include/arch/sparc64/klibc/archconfig.h b/usr/include/arch/sparc64/klibc/archconfig.h
similarity index 100%
rename from include/arch/sparc64/klibc/archconfig.h
rename to usr/include/arch/sparc64/klibc/archconfig.h
diff --git a/include/arch/sparc64/klibc/archsetjmp.h b/usr/include/arch/sparc64/klibc/archsetjmp.h
similarity index 100%
rename from include/arch/sparc64/klibc/archsetjmp.h
rename to usr/include/arch/sparc64/klibc/archsetjmp.h
diff --git a/include/arch/sparc64/klibc/archsignal.h b/usr/include/arch/sparc64/klibc/archsignal.h
similarity index 100%
rename from include/arch/sparc64/klibc/archsignal.h
rename to usr/include/arch/sparc64/klibc/archsignal.h
diff --git a/include/arch/sparc64/klibc/archstat.h b/usr/include/arch/sparc64/klibc/archstat.h
similarity index 100%
rename from include/arch/sparc64/klibc/archstat.h
rename to usr/include/arch/sparc64/klibc/archstat.h
diff --git a/include/arch/sparc64/klibc/archsys.h b/usr/include/arch/sparc64/klibc/archsys.h
similarity index 100%
rename from include/arch/sparc64/klibc/archsys.h
rename to usr/include/arch/sparc64/klibc/archsys.h
diff --git a/include/arch/x86_64/klibc/archconfig.h b/usr/include/arch/x86_64/klibc/archconfig.h
similarity index 100%
rename from include/arch/x86_64/klibc/archconfig.h
rename to usr/include/arch/x86_64/klibc/archconfig.h
diff --git a/include/arch/x86_64/klibc/archsetjmp.h b/usr/include/arch/x86_64/klibc/archsetjmp.h
similarity index 100%
rename from include/arch/x86_64/klibc/archsetjmp.h
rename to usr/include/arch/x86_64/klibc/archsetjmp.h
diff --git a/include/arch/x86_64/klibc/archsignal.h b/usr/include/arch/x86_64/klibc/archsignal.h
similarity index 100%
rename from include/arch/x86_64/klibc/archsignal.h
rename to usr/include/arch/x86_64/klibc/archsignal.h
diff --git a/include/arch/x86_64/klibc/archstat.h b/usr/include/arch/x86_64/klibc/archstat.h
similarity index 100%
rename from include/arch/x86_64/klibc/archstat.h
rename to usr/include/arch/x86_64/klibc/archstat.h
diff --git a/include/arch/x86_64/klibc/archsys.h b/usr/include/arch/x86_64/klibc/archsys.h
similarity index 100%
rename from include/arch/x86_64/klibc/archsys.h
rename to usr/include/arch/x86_64/klibc/archsys.h
diff --git a/include/arch/x86_64/sys/io.h b/usr/include/arch/x86_64/sys/io.h
similarity index 100%
rename from include/arch/x86_64/sys/io.h
rename to usr/include/arch/x86_64/sys/io.h
diff --git a/include/arpa/inet.h b/usr/include/arpa/inet.h
similarity index 100%
rename from include/arpa/inet.h
rename to usr/include/arpa/inet.h
diff --git a/include/assert.h b/usr/include/assert.h
similarity index 100%
rename from include/assert.h
rename to usr/include/assert.h
diff --git a/include/bits32/bitsize.h b/usr/include/bits32/bitsize.h
similarity index 100%
rename from include/bits32/bitsize.h
rename to usr/include/bits32/bitsize.h
diff --git a/include/bits32/bitsize/limits.h b/usr/include/bits32/bitsize/limits.h
similarity index 100%
rename from include/bits32/bitsize/limits.h
rename to usr/include/bits32/bitsize/limits.h
diff --git a/include/bits32/bitsize/stddef.h b/usr/include/bits32/bitsize/stddef.h
similarity index 100%
rename from include/bits32/bitsize/stddef.h
rename to usr/include/bits32/bitsize/stddef.h
diff --git a/include/bits32/bitsize/stdint.h b/usr/include/bits32/bitsize/stdint.h
similarity index 100%
rename from include/bits32/bitsize/stdint.h
rename to usr/include/bits32/bitsize/stdint.h
diff --git a/include/bits32/bitsize/stdintconst.h b/usr/include/bits32/bitsize/stdintconst.h
similarity index 100%
rename from include/bits32/bitsize/stdintconst.h
rename to usr/include/bits32/bitsize/stdintconst.h
diff --git a/include/bits32/bitsize/stdintlimits.h b/usr/include/bits32/bitsize/stdintlimits.h
similarity index 100%
rename from include/bits32/bitsize/stdintlimits.h
rename to usr/include/bits32/bitsize/stdintlimits.h
diff --git a/include/bits64/bitsize.h b/usr/include/bits64/bitsize.h
similarity index 100%
rename from include/bits64/bitsize.h
rename to usr/include/bits64/bitsize.h
diff --git a/include/bits64/bitsize/limits.h b/usr/include/bits64/bitsize/limits.h
similarity index 100%
rename from include/bits64/bitsize/limits.h
rename to usr/include/bits64/bitsize/limits.h
diff --git a/include/bits64/bitsize/stddef.h b/usr/include/bits64/bitsize/stddef.h
similarity index 100%
rename from include/bits64/bitsize/stddef.h
rename to usr/include/bits64/bitsize/stddef.h
diff --git a/include/bits64/bitsize/stdint.h b/usr/include/bits64/bitsize/stdint.h
similarity index 100%
rename from include/bits64/bitsize/stdint.h
rename to usr/include/bits64/bitsize/stdint.h
diff --git a/include/bits64/bitsize/stdintconst.h b/usr/include/bits64/bitsize/stdintconst.h
similarity index 100%
rename from include/bits64/bitsize/stdintconst.h
rename to usr/include/bits64/bitsize/stdintconst.h
diff --git a/include/bits64/bitsize/stdintlimits.h b/usr/include/bits64/bitsize/stdintlimits.h
similarity index 100%
rename from include/bits64/bitsize/stdintlimits.h
rename to usr/include/bits64/bitsize/stdintlimits.h
diff --git a/include/byteswap.h b/usr/include/byteswap.h
similarity index 100%
rename from include/byteswap.h
rename to usr/include/byteswap.h
diff --git a/include/ctype.h b/usr/include/ctype.h
similarity index 100%
rename from include/ctype.h
rename to usr/include/ctype.h
diff --git a/include/dirent.h b/usr/include/dirent.h
similarity index 100%
rename from include/dirent.h
rename to usr/include/dirent.h
diff --git a/include/elf.h b/usr/include/elf.h
similarity index 100%
rename from include/elf.h
rename to usr/include/elf.h
diff --git a/include/endian.h b/usr/include/endian.h
similarity index 100%
rename from include/endian.h
rename to usr/include/endian.h
diff --git a/include/errno.h b/usr/include/errno.h
similarity index 100%
rename from include/errno.h
rename to usr/include/errno.h
diff --git a/include/fcntl.h b/usr/include/fcntl.h
similarity index 100%
rename from include/fcntl.h
rename to usr/include/fcntl.h
diff --git a/include/grp.h b/usr/include/grp.h
similarity index 100%
rename from include/grp.h
rename to usr/include/grp.h
diff --git a/include/inttypes.h b/usr/include/inttypes.h
similarity index 100%
rename from include/inttypes.h
rename to usr/include/inttypes.h
diff --git a/include/klibc/compiler.h b/usr/include/klibc/compiler.h
similarity index 100%
rename from include/klibc/compiler.h
rename to usr/include/klibc/compiler.h
diff --git a/include/klibc/diverr.h b/usr/include/klibc/diverr.h
similarity index 100%
rename from include/klibc/diverr.h
rename to usr/include/klibc/diverr.h
diff --git a/include/klibc/endian.h b/usr/include/klibc/endian.h
similarity index 100%
rename from include/klibc/endian.h
rename to usr/include/klibc/endian.h
diff --git a/include/klibc/extern.h b/usr/include/klibc/extern.h
similarity index 100%
rename from include/klibc/extern.h
rename to usr/include/klibc/extern.h
diff --git a/include/klibc/stathelp.h b/usr/include/klibc/stathelp.h
similarity index 100%
rename from include/klibc/stathelp.h
rename to usr/include/klibc/stathelp.h
diff --git a/include/klibc/sysconfig.h b/usr/include/klibc/sysconfig.h
similarity index 100%
rename from include/klibc/sysconfig.h
rename to usr/include/klibc/sysconfig.h
diff --git a/include/limits.h b/usr/include/limits.h
similarity index 100%
rename from include/limits.h
rename to usr/include/limits.h
diff --git a/include/malloc.h b/usr/include/malloc.h
similarity index 100%
rename from include/malloc.h
rename to usr/include/malloc.h
diff --git a/include/net/if.h b/usr/include/net/if.h
similarity index 100%
rename from include/net/if.h
rename to usr/include/net/if.h
diff --git a/include/net/if_arp.h b/usr/include/net/if_arp.h
similarity index 100%
rename from include/net/if_arp.h
rename to usr/include/net/if_arp.h
diff --git a/include/net/if_packet.h b/usr/include/net/if_packet.h
similarity index 100%
rename from include/net/if_packet.h
rename to usr/include/net/if_packet.h
diff --git a/include/net/route.h b/usr/include/net/route.h
similarity index 100%
rename from include/net/route.h
rename to usr/include/net/route.h
diff --git a/include/netinet/if_ether.h b/usr/include/netinet/if_ether.h
similarity index 100%
rename from include/netinet/if_ether.h
rename to usr/include/netinet/if_ether.h
diff --git a/include/netinet/in.h b/usr/include/netinet/in.h
similarity index 100%
rename from include/netinet/in.h
rename to usr/include/netinet/in.h
diff --git a/include/netinet/in6.h b/usr/include/netinet/in6.h
similarity index 100%
rename from include/netinet/in6.h
rename to usr/include/netinet/in6.h
diff --git a/include/netinet/ip.h b/usr/include/netinet/ip.h
similarity index 100%
rename from include/netinet/ip.h
rename to usr/include/netinet/ip.h
diff --git a/include/netinet/tcp.h b/usr/include/netinet/tcp.h
similarity index 100%
rename from include/netinet/tcp.h
rename to usr/include/netinet/tcp.h
diff --git a/include/netinet/udp.h b/usr/include/netinet/udp.h
similarity index 100%
rename from include/netinet/udp.h
rename to usr/include/netinet/udp.h
diff --git a/include/netpacket/packet.h b/usr/include/netpacket/packet.h
similarity index 100%
rename from include/netpacket/packet.h
rename to usr/include/netpacket/packet.h
diff --git a/include/paths.h b/usr/include/paths.h
similarity index 100%
rename from include/paths.h
rename to usr/include/paths.h
diff --git a/include/poll.h b/usr/include/poll.h
similarity index 100%
rename from include/poll.h
rename to usr/include/poll.h
diff --git a/include/sched.h b/usr/include/sched.h
similarity index 100%
rename from include/sched.h
rename to usr/include/sched.h
diff --git a/include/setjmp.h b/usr/include/setjmp.h
similarity index 100%
rename from include/setjmp.h
rename to usr/include/setjmp.h
diff --git a/include/signal.h b/usr/include/signal.h
similarity index 100%
rename from include/signal.h
rename to usr/include/signal.h
diff --git a/include/stdarg.h b/usr/include/stdarg.h
similarity index 100%
rename from include/stdarg.h
rename to usr/include/stdarg.h
diff --git a/include/stddef.h b/usr/include/stddef.h
similarity index 100%
rename from include/stddef.h
rename to usr/include/stddef.h
diff --git a/include/stdint.h b/usr/include/stdint.h
similarity index 100%
rename from include/stdint.h
rename to usr/include/stdint.h
diff --git a/include/stdio.h b/usr/include/stdio.h
similarity index 100%
rename from include/stdio.h
rename to usr/include/stdio.h
diff --git a/include/stdlib.h b/usr/include/stdlib.h
similarity index 100%
rename from include/stdlib.h
rename to usr/include/stdlib.h
diff --git a/include/string.h b/usr/include/string.h
similarity index 100%
rename from include/string.h
rename to usr/include/string.h
diff --git a/include/sys/dirent.h b/usr/include/sys/dirent.h
similarity index 100%
rename from include/sys/dirent.h
rename to usr/include/sys/dirent.h
diff --git a/include/sys/elf32.h b/usr/include/sys/elf32.h
similarity index 100%
rename from include/sys/elf32.h
rename to usr/include/sys/elf32.h
diff --git a/include/sys/elf64.h b/usr/include/sys/elf64.h
similarity index 100%
rename from include/sys/elf64.h
rename to usr/include/sys/elf64.h
diff --git a/include/sys/elfcommon.h b/usr/include/sys/elfcommon.h
similarity index 100%
rename from include/sys/elfcommon.h
rename to usr/include/sys/elfcommon.h
diff --git a/include/sys/fsuid.h b/usr/include/sys/fsuid.h
similarity index 100%
rename from include/sys/fsuid.h
rename to usr/include/sys/fsuid.h
diff --git a/include/sys/inotify.h b/usr/include/sys/inotify.h
similarity index 100%
rename from include/sys/inotify.h
rename to usr/include/sys/inotify.h
diff --git a/include/sys/ioctl.h b/usr/include/sys/ioctl.h
similarity index 100%
rename from include/sys/ioctl.h
rename to usr/include/sys/ioctl.h
diff --git a/include/sys/klog.h b/usr/include/sys/klog.h
similarity index 100%
rename from include/sys/klog.h
rename to usr/include/sys/klog.h
diff --git a/include/sys/md.h b/usr/include/sys/md.h
similarity index 100%
rename from include/sys/md.h
rename to usr/include/sys/md.h
diff --git a/include/sys/mman.h b/usr/include/sys/mman.h
similarity index 100%
rename from include/sys/mman.h
rename to usr/include/sys/mman.h
diff --git a/include/sys/mount.h b/usr/include/sys/mount.h
similarity index 100%
rename from include/sys/mount.h
rename to usr/include/sys/mount.h
diff --git a/include/sys/param.h b/usr/include/sys/param.h
similarity index 100%
rename from include/sys/param.h
rename to usr/include/sys/param.h
diff --git a/include/sys/poll.h b/usr/include/sys/poll.h
similarity index 100%
rename from include/sys/poll.h
rename to usr/include/sys/poll.h
diff --git a/include/sys/reboot.h b/usr/include/sys/reboot.h
similarity index 100%
rename from include/sys/reboot.h
rename to usr/include/sys/reboot.h
diff --git a/include/sys/resource.h b/usr/include/sys/resource.h
similarity index 100%
rename from include/sys/resource.h
rename to usr/include/sys/resource.h
diff --git a/include/sys/select.h b/usr/include/sys/select.h
similarity index 100%
rename from include/sys/select.h
rename to usr/include/sys/select.h
diff --git a/include/sys/socket.h b/usr/include/sys/socket.h
similarity index 100%
rename from include/sys/socket.h
rename to usr/include/sys/socket.h
diff --git a/include/sys/socketcalls.h b/usr/include/sys/socketcalls.h
similarity index 100%
rename from include/sys/socketcalls.h
rename to usr/include/sys/socketcalls.h
diff --git a/include/sys/splice.h b/usr/include/sys/splice.h
similarity index 100%
rename from include/sys/splice.h
rename to usr/include/sys/splice.h
diff --git a/include/sys/stat.h b/usr/include/sys/stat.h
similarity index 100%
rename from include/sys/stat.h
rename to usr/include/sys/stat.h
diff --git a/include/sys/statfs.h b/usr/include/sys/statfs.h
similarity index 100%
rename from include/sys/statfs.h
rename to usr/include/sys/statfs.h
diff --git a/include/sys/syscall.h b/usr/include/sys/syscall.h
similarity index 100%
rename from include/sys/syscall.h
rename to usr/include/sys/syscall.h
diff --git a/include/sys/sysinfo.h b/usr/include/sys/sysinfo.h
similarity index 100%
rename from include/sys/sysinfo.h
rename to usr/include/sys/sysinfo.h
diff --git a/include/sys/sysmacros.h b/usr/include/sys/sysmacros.h
similarity index 100%
rename from include/sys/sysmacros.h
rename to usr/include/sys/sysmacros.h
diff --git a/include/sys/time.h b/usr/include/sys/time.h
similarity index 100%
rename from include/sys/time.h
rename to usr/include/sys/time.h
diff --git a/include/sys/times.h b/usr/include/sys/times.h
similarity index 100%
rename from include/sys/times.h
rename to usr/include/sys/times.h
diff --git a/include/sys/types.h b/usr/include/sys/types.h
similarity index 100%
rename from include/sys/types.h
rename to usr/include/sys/types.h
diff --git a/include/sys/uio.h b/usr/include/sys/uio.h
similarity index 100%
rename from include/sys/uio.h
rename to usr/include/sys/uio.h
diff --git a/include/sys/un.h b/usr/include/sys/un.h
similarity index 100%
rename from include/sys/un.h
rename to usr/include/sys/un.h
diff --git a/include/sys/utime.h b/usr/include/sys/utime.h
similarity index 100%
rename from include/sys/utime.h
rename to usr/include/sys/utime.h
diff --git a/include/sys/utsname.h b/usr/include/sys/utsname.h
similarity index 100%
rename from include/sys/utsname.h
rename to usr/include/sys/utsname.h
diff --git a/include/sys/vfs.h b/usr/include/sys/vfs.h
similarity index 100%
rename from include/sys/vfs.h
rename to usr/include/sys/vfs.h
diff --git a/include/sys/wait.h b/usr/include/sys/wait.h
similarity index 100%
rename from include/sys/wait.h
rename to usr/include/sys/wait.h
diff --git a/include/syslog.h b/usr/include/syslog.h
similarity index 100%
rename from include/syslog.h
rename to usr/include/syslog.h
diff --git a/include/termios.h b/usr/include/termios.h
similarity index 100%
rename from include/termios.h
rename to usr/include/termios.h
diff --git a/include/time.h b/usr/include/time.h
similarity index 100%
rename from include/time.h
rename to usr/include/time.h
diff --git a/include/unistd.h b/usr/include/unistd.h
similarity index 100%
rename from include/unistd.h
rename to usr/include/unistd.h
diff --git a/include/utime.h b/usr/include/utime.h
similarity index 100%
rename from include/utime.h
rename to usr/include/utime.h
diff --git a/usr/kinit/Kbuild b/usr/kinit/Kbuild
index c8e8050..e53efbd 100644
--- a/usr/kinit/Kbuild
+++ b/usr/kinit/Kbuild
@@ -16,12 +16,11 @@
KLIBCCFLAGS += -I$(srctree)/$(src)/ipconfig \
-I$(srctree)/$(src)/nfsmount \
-I$(srctree)/$(src)/run-init \
- -I$(srctree)/$(src)/fstype \
- -I$(srctree)/$(src)/zlib
+ -I$(srctree)/$(src)/fstype
# Cleaning
targets := kinit kinit.g
-subdir- := ipconfig nfsmount run-init fstype zlib
+subdir- := ipconfig nfsmount run-init fstype
# install binary
diff --git a/klibc/CAVEATS b/usr/klibc/CAVEATS
similarity index 100%
rename from klibc/CAVEATS
rename to usr/klibc/CAVEATS
diff --git a/klibc/Kbuild b/usr/klibc/Kbuild
similarity index 100%
rename from klibc/Kbuild
rename to usr/klibc/Kbuild
diff --git a/klibc/LICENSE b/usr/klibc/LICENSE
similarity index 100%
rename from klibc/LICENSE
rename to usr/klibc/LICENSE
diff --git a/klibc/README b/usr/klibc/README
similarity index 100%
rename from klibc/README
rename to usr/klibc/README
diff --git a/klibc/SOCKETCALLS.def b/usr/klibc/SOCKETCALLS.def
similarity index 100%
rename from klibc/SOCKETCALLS.def
rename to usr/klibc/SOCKETCALLS.def
diff --git a/klibc/SYSCALLS.def b/usr/klibc/SYSCALLS.def
similarity index 100%
rename from klibc/SYSCALLS.def
rename to usr/klibc/SYSCALLS.def
diff --git a/klibc/__put_env.c b/usr/klibc/__put_env.c
similarity index 100%
rename from klibc/__put_env.c
rename to usr/klibc/__put_env.c
diff --git a/klibc/__shared_init.c b/usr/klibc/__shared_init.c
similarity index 100%
rename from klibc/__shared_init.c
rename to usr/klibc/__shared_init.c
diff --git a/klibc/__signal.c b/usr/klibc/__signal.c
similarity index 100%
rename from klibc/__signal.c
rename to usr/klibc/__signal.c
diff --git a/klibc/__static_init.c b/usr/klibc/__static_init.c
similarity index 100%
rename from klibc/__static_init.c
rename to usr/klibc/__static_init.c
diff --git a/klibc/abort.c b/usr/klibc/abort.c
similarity index 100%
rename from klibc/abort.c
rename to usr/klibc/abort.c
diff --git a/klibc/alarm.c b/usr/klibc/alarm.c
similarity index 100%
rename from klibc/alarm.c
rename to usr/klibc/alarm.c
diff --git a/klibc/arch/README b/usr/klibc/arch/README
similarity index 100%
rename from klibc/arch/README
rename to usr/klibc/arch/README
diff --git a/klibc/arch/alpha/MCONFIG b/usr/klibc/arch/alpha/MCONFIG
similarity index 100%
rename from klibc/arch/alpha/MCONFIG
rename to usr/klibc/arch/alpha/MCONFIG
diff --git a/klibc/arch/alpha/Makefile.inc b/usr/klibc/arch/alpha/Makefile.inc
similarity index 100%
rename from klibc/arch/alpha/Makefile.inc
rename to usr/klibc/arch/alpha/Makefile.inc
diff --git a/klibc/arch/alpha/README-gcc b/usr/klibc/arch/alpha/README-gcc
similarity index 100%
rename from klibc/arch/alpha/README-gcc
rename to usr/klibc/arch/alpha/README-gcc
diff --git a/klibc/arch/alpha/crt0.S b/usr/klibc/arch/alpha/crt0.S
similarity index 100%
rename from klibc/arch/alpha/crt0.S
rename to usr/klibc/arch/alpha/crt0.S
diff --git a/klibc/arch/alpha/divide.c b/usr/klibc/arch/alpha/divide.c
similarity index 100%
rename from klibc/arch/alpha/divide.c
rename to usr/klibc/arch/alpha/divide.c
diff --git a/klibc/arch/alpha/pipe.c b/usr/klibc/arch/alpha/pipe.c
similarity index 100%
rename from klibc/arch/alpha/pipe.c
rename to usr/klibc/arch/alpha/pipe.c
diff --git a/klibc/arch/alpha/setjmp.S b/usr/klibc/arch/alpha/setjmp.S
similarity index 100%
rename from klibc/arch/alpha/setjmp.S
rename to usr/klibc/arch/alpha/setjmp.S
diff --git a/klibc/arch/alpha/syscall.S b/usr/klibc/arch/alpha/syscall.S
similarity index 100%
rename from klibc/arch/alpha/syscall.S
rename to usr/klibc/arch/alpha/syscall.S
diff --git a/klibc/arch/alpha/sysdual.S b/usr/klibc/arch/alpha/sysdual.S
similarity index 100%
rename from klibc/arch/alpha/sysdual.S
rename to usr/klibc/arch/alpha/sysdual.S
diff --git a/klibc/arch/alpha/sysstub.ph b/usr/klibc/arch/alpha/sysstub.ph
similarity index 100%
rename from klibc/arch/alpha/sysstub.ph
rename to usr/klibc/arch/alpha/sysstub.ph
diff --git a/klibc/arch/arm/MCONFIG b/usr/klibc/arch/arm/MCONFIG
similarity index 100%
rename from klibc/arch/arm/MCONFIG
rename to usr/klibc/arch/arm/MCONFIG
diff --git a/klibc/arch/arm/Makefile.inc b/usr/klibc/arch/arm/Makefile.inc
similarity index 100%
rename from klibc/arch/arm/Makefile.inc
rename to usr/klibc/arch/arm/Makefile.inc
diff --git a/klibc/arch/arm/crt0.S b/usr/klibc/arch/arm/crt0.S
similarity index 100%
rename from klibc/arch/arm/crt0.S
rename to usr/klibc/arch/arm/crt0.S
diff --git a/klibc/arch/arm/setjmp-arm.S b/usr/klibc/arch/arm/setjmp-arm.S
similarity index 100%
rename from klibc/arch/arm/setjmp-arm.S
rename to usr/klibc/arch/arm/setjmp-arm.S
diff --git a/klibc/arch/arm/setjmp-thumb.S b/usr/klibc/arch/arm/setjmp-thumb.S
similarity index 100%
rename from klibc/arch/arm/setjmp-thumb.S
rename to usr/klibc/arch/arm/setjmp-thumb.S
diff --git a/klibc/arch/arm/syscall.S b/usr/klibc/arch/arm/syscall.S
similarity index 100%
rename from klibc/arch/arm/syscall.S
rename to usr/klibc/arch/arm/syscall.S
diff --git a/klibc/arch/arm/sysstub.ph b/usr/klibc/arch/arm/sysstub.ph
similarity index 100%
rename from klibc/arch/arm/sysstub.ph
rename to usr/klibc/arch/arm/sysstub.ph
diff --git a/klibc/arch/cris/MCONFIG b/usr/klibc/arch/cris/MCONFIG
similarity index 100%
rename from klibc/arch/cris/MCONFIG
rename to usr/klibc/arch/cris/MCONFIG
diff --git a/klibc/arch/cris/Makefile.inc b/usr/klibc/arch/cris/Makefile.inc
similarity index 100%
rename from klibc/arch/cris/Makefile.inc
rename to usr/klibc/arch/cris/Makefile.inc
diff --git a/klibc/arch/cris/__negdi2.S b/usr/klibc/arch/cris/__negdi2.S
similarity index 100%
rename from klibc/arch/cris/__negdi2.S
rename to usr/klibc/arch/cris/__negdi2.S
diff --git a/klibc/arch/cris/crt0.S b/usr/klibc/arch/cris/crt0.S
similarity index 100%
rename from klibc/arch/cris/crt0.S
rename to usr/klibc/arch/cris/crt0.S
diff --git a/klibc/arch/cris/divide.c b/usr/klibc/arch/cris/divide.c
similarity index 100%
rename from klibc/arch/cris/divide.c
rename to usr/klibc/arch/cris/divide.c
diff --git a/klibc/arch/cris/setjmp.S b/usr/klibc/arch/cris/setjmp.S
similarity index 100%
rename from klibc/arch/cris/setjmp.S
rename to usr/klibc/arch/cris/setjmp.S
diff --git a/klibc/arch/cris/syscall.S b/usr/klibc/arch/cris/syscall.S
similarity index 100%
rename from klibc/arch/cris/syscall.S
rename to usr/klibc/arch/cris/syscall.S
diff --git a/klibc/arch/cris/sysstub.ph b/usr/klibc/arch/cris/sysstub.ph
similarity index 100%
rename from klibc/arch/cris/sysstub.ph
rename to usr/klibc/arch/cris/sysstub.ph
diff --git a/klibc/arch/i386/MCONFIG b/usr/klibc/arch/i386/MCONFIG
similarity index 100%
rename from klibc/arch/i386/MCONFIG
rename to usr/klibc/arch/i386/MCONFIG
diff --git a/klibc/arch/i386/Makefile.inc b/usr/klibc/arch/i386/Makefile.inc
similarity index 100%
rename from klibc/arch/i386/Makefile.inc
rename to usr/klibc/arch/i386/Makefile.inc
diff --git a/klibc/arch/i386/crt0.S b/usr/klibc/arch/i386/crt0.S
similarity index 100%
rename from klibc/arch/i386/crt0.S
rename to usr/klibc/arch/i386/crt0.S
diff --git a/klibc/arch/i386/libgcc/__ashldi3.S b/usr/klibc/arch/i386/libgcc/__ashldi3.S
similarity index 100%
rename from klibc/arch/i386/libgcc/__ashldi3.S
rename to usr/klibc/arch/i386/libgcc/__ashldi3.S
diff --git a/klibc/arch/i386/libgcc/__ashrdi3.S b/usr/klibc/arch/i386/libgcc/__ashrdi3.S
similarity index 100%
rename from klibc/arch/i386/libgcc/__ashrdi3.S
rename to usr/klibc/arch/i386/libgcc/__ashrdi3.S
diff --git a/klibc/arch/i386/libgcc/__lshrdi3.S b/usr/klibc/arch/i386/libgcc/__lshrdi3.S
similarity index 100%
rename from klibc/arch/i386/libgcc/__lshrdi3.S
rename to usr/klibc/arch/i386/libgcc/__lshrdi3.S
diff --git a/klibc/arch/i386/libgcc/__muldi3.S b/usr/klibc/arch/i386/libgcc/__muldi3.S
similarity index 100%
rename from klibc/arch/i386/libgcc/__muldi3.S
rename to usr/klibc/arch/i386/libgcc/__muldi3.S
diff --git a/klibc/arch/i386/libgcc/__negdi2.S b/usr/klibc/arch/i386/libgcc/__negdi2.S
similarity index 100%
rename from klibc/arch/i386/libgcc/__negdi2.S
rename to usr/klibc/arch/i386/libgcc/__negdi2.S
diff --git a/klibc/arch/i386/open.S b/usr/klibc/arch/i386/open.S
similarity index 100%
rename from klibc/arch/i386/open.S
rename to usr/klibc/arch/i386/open.S
diff --git a/klibc/arch/i386/openat.S b/usr/klibc/arch/i386/openat.S
similarity index 100%
rename from klibc/arch/i386/openat.S
rename to usr/klibc/arch/i386/openat.S
diff --git a/klibc/arch/i386/setjmp.S b/usr/klibc/arch/i386/setjmp.S
similarity index 100%
rename from klibc/arch/i386/setjmp.S
rename to usr/klibc/arch/i386/setjmp.S
diff --git a/klibc/arch/i386/sigreturn.S b/usr/klibc/arch/i386/sigreturn.S
similarity index 100%
rename from klibc/arch/i386/sigreturn.S
rename to usr/klibc/arch/i386/sigreturn.S
diff --git a/klibc/arch/i386/socketcall.S b/usr/klibc/arch/i386/socketcall.S
similarity index 100%
rename from klibc/arch/i386/socketcall.S
rename to usr/klibc/arch/i386/socketcall.S
diff --git a/klibc/arch/i386/syscall.S b/usr/klibc/arch/i386/syscall.S
similarity index 100%
rename from klibc/arch/i386/syscall.S
rename to usr/klibc/arch/i386/syscall.S
diff --git a/klibc/arch/i386/sysstub.ph b/usr/klibc/arch/i386/sysstub.ph
similarity index 100%
rename from klibc/arch/i386/sysstub.ph
rename to usr/klibc/arch/i386/sysstub.ph
diff --git a/klibc/arch/i386/varsyscall.S b/usr/klibc/arch/i386/varsyscall.S
similarity index 100%
rename from klibc/arch/i386/varsyscall.S
rename to usr/klibc/arch/i386/varsyscall.S
diff --git a/klibc/arch/ia64/MCONFIG b/usr/klibc/arch/ia64/MCONFIG
similarity index 100%
rename from klibc/arch/ia64/MCONFIG
rename to usr/klibc/arch/ia64/MCONFIG
diff --git a/klibc/arch/ia64/Makefile.inc b/usr/klibc/arch/ia64/Makefile.inc
similarity index 100%
rename from klibc/arch/ia64/Makefile.inc
rename to usr/klibc/arch/ia64/Makefile.inc
diff --git a/klibc/arch/ia64/crt0.S b/usr/klibc/arch/ia64/crt0.S
similarity index 100%
rename from klibc/arch/ia64/crt0.S
rename to usr/klibc/arch/ia64/crt0.S
diff --git a/klibc/arch/ia64/pipe.c b/usr/klibc/arch/ia64/pipe.c
similarity index 100%
rename from klibc/arch/ia64/pipe.c
rename to usr/klibc/arch/ia64/pipe.c
diff --git a/klibc/arch/ia64/setjmp.S b/usr/klibc/arch/ia64/setjmp.S
similarity index 100%
rename from klibc/arch/ia64/setjmp.S
rename to usr/klibc/arch/ia64/setjmp.S
diff --git a/klibc/arch/ia64/syscall.S b/usr/klibc/arch/ia64/syscall.S
similarity index 100%
rename from klibc/arch/ia64/syscall.S
rename to usr/klibc/arch/ia64/syscall.S
diff --git a/klibc/arch/ia64/sysstub.ph b/usr/klibc/arch/ia64/sysstub.ph
similarity index 100%
rename from klibc/arch/ia64/sysstub.ph
rename to usr/klibc/arch/ia64/sysstub.ph
diff --git a/klibc/arch/ia64/vfork.S b/usr/klibc/arch/ia64/vfork.S
similarity index 100%
rename from klibc/arch/ia64/vfork.S
rename to usr/klibc/arch/ia64/vfork.S
diff --git a/klibc/arch/m32r/MCONFIG b/usr/klibc/arch/m32r/MCONFIG
similarity index 100%
rename from klibc/arch/m32r/MCONFIG
rename to usr/klibc/arch/m32r/MCONFIG
diff --git a/klibc/arch/m32r/Makefile.inc b/usr/klibc/arch/m32r/Makefile.inc
similarity index 100%
rename from klibc/arch/m32r/Makefile.inc
rename to usr/klibc/arch/m32r/Makefile.inc
diff --git a/klibc/arch/m32r/crt0.S b/usr/klibc/arch/m32r/crt0.S
similarity index 100%
rename from klibc/arch/m32r/crt0.S
rename to usr/klibc/arch/m32r/crt0.S
diff --git a/klibc/arch/m32r/setjmp.S b/usr/klibc/arch/m32r/setjmp.S
similarity index 100%
rename from klibc/arch/m32r/setjmp.S
rename to usr/klibc/arch/m32r/setjmp.S
diff --git a/klibc/arch/m32r/syscall.S b/usr/klibc/arch/m32r/syscall.S
similarity index 100%
rename from klibc/arch/m32r/syscall.S
rename to usr/klibc/arch/m32r/syscall.S
diff --git a/klibc/arch/m32r/sysstub.ph b/usr/klibc/arch/m32r/sysstub.ph
similarity index 100%
rename from klibc/arch/m32r/sysstub.ph
rename to usr/klibc/arch/m32r/sysstub.ph
diff --git a/klibc/arch/m68k/MCONFIG b/usr/klibc/arch/m68k/MCONFIG
similarity index 100%
rename from klibc/arch/m68k/MCONFIG
rename to usr/klibc/arch/m68k/MCONFIG
diff --git a/klibc/arch/m68k/Makefile.inc b/usr/klibc/arch/m68k/Makefile.inc
similarity index 100%
rename from klibc/arch/m68k/Makefile.inc
rename to usr/klibc/arch/m68k/Makefile.inc
diff --git a/klibc/arch/m68k/crt0.S b/usr/klibc/arch/m68k/crt0.S
similarity index 100%
rename from klibc/arch/m68k/crt0.S
rename to usr/klibc/arch/m68k/crt0.S
diff --git a/klibc/arch/m68k/setjmp.S b/usr/klibc/arch/m68k/setjmp.S
similarity index 100%
rename from klibc/arch/m68k/setjmp.S
rename to usr/klibc/arch/m68k/setjmp.S
diff --git a/klibc/arch/m68k/syscall.S b/usr/klibc/arch/m68k/syscall.S
similarity index 100%
rename from klibc/arch/m68k/syscall.S
rename to usr/klibc/arch/m68k/syscall.S
diff --git a/klibc/arch/m68k/sysstub.ph b/usr/klibc/arch/m68k/sysstub.ph
similarity index 100%
rename from klibc/arch/m68k/sysstub.ph
rename to usr/klibc/arch/m68k/sysstub.ph
diff --git a/klibc/arch/mips/MCONFIG b/usr/klibc/arch/mips/MCONFIG
similarity index 100%
rename from klibc/arch/mips/MCONFIG
rename to usr/klibc/arch/mips/MCONFIG
diff --git a/klibc/arch/mips/Makefile.inc b/usr/klibc/arch/mips/Makefile.inc
similarity index 100%
rename from klibc/arch/mips/Makefile.inc
rename to usr/klibc/arch/mips/Makefile.inc
diff --git a/klibc/arch/mips/crt0.S b/usr/klibc/arch/mips/crt0.S
similarity index 100%
rename from klibc/arch/mips/crt0.S
rename to usr/klibc/arch/mips/crt0.S
diff --git a/klibc/arch/mips/klibc.ld b/usr/klibc/arch/mips/klibc.ld
similarity index 100%
rename from klibc/arch/mips/klibc.ld
rename to usr/klibc/arch/mips/klibc.ld
diff --git a/klibc/arch/mips/pipe.S b/usr/klibc/arch/mips/pipe.S
similarity index 100%
rename from klibc/arch/mips/pipe.S
rename to usr/klibc/arch/mips/pipe.S
diff --git a/klibc/arch/mips/setjmp.S b/usr/klibc/arch/mips/setjmp.S
similarity index 100%
rename from klibc/arch/mips/setjmp.S
rename to usr/klibc/arch/mips/setjmp.S
diff --git a/klibc/arch/mips/syscall.S b/usr/klibc/arch/mips/syscall.S
similarity index 100%
rename from klibc/arch/mips/syscall.S
rename to usr/klibc/arch/mips/syscall.S
diff --git a/klibc/arch/mips/sysstub.ph b/usr/klibc/arch/mips/sysstub.ph
similarity index 100%
rename from klibc/arch/mips/sysstub.ph
rename to usr/klibc/arch/mips/sysstub.ph
diff --git a/klibc/arch/mips/vfork.S b/usr/klibc/arch/mips/vfork.S
similarity index 100%
rename from klibc/arch/mips/vfork.S
rename to usr/klibc/arch/mips/vfork.S
diff --git a/klibc/arch/mips64/MCONFIG b/usr/klibc/arch/mips64/MCONFIG
similarity index 100%
rename from klibc/arch/mips64/MCONFIG
rename to usr/klibc/arch/mips64/MCONFIG
diff --git a/klibc/arch/mips64/Makefile.inc b/usr/klibc/arch/mips64/Makefile.inc
similarity index 100%
rename from klibc/arch/mips64/Makefile.inc
rename to usr/klibc/arch/mips64/Makefile.inc
diff --git a/klibc/arch/parisc/MCONFIG b/usr/klibc/arch/parisc/MCONFIG
similarity index 100%
rename from klibc/arch/parisc/MCONFIG
rename to usr/klibc/arch/parisc/MCONFIG
diff --git a/klibc/arch/parisc/Makefile.inc b/usr/klibc/arch/parisc/Makefile.inc
similarity index 100%
rename from klibc/arch/parisc/Makefile.inc
rename to usr/klibc/arch/parisc/Makefile.inc
diff --git a/klibc/arch/parisc/crt0.S b/usr/klibc/arch/parisc/crt0.S
similarity index 100%
rename from klibc/arch/parisc/crt0.S
rename to usr/klibc/arch/parisc/crt0.S
diff --git a/klibc/arch/parisc/setjmp.S b/usr/klibc/arch/parisc/setjmp.S
similarity index 100%
rename from klibc/arch/parisc/setjmp.S
rename to usr/klibc/arch/parisc/setjmp.S
diff --git a/klibc/arch/parisc/syscall.S b/usr/klibc/arch/parisc/syscall.S
similarity index 100%
rename from klibc/arch/parisc/syscall.S
rename to usr/klibc/arch/parisc/syscall.S
diff --git a/klibc/arch/parisc/sysstub.ph b/usr/klibc/arch/parisc/sysstub.ph
similarity index 100%
rename from klibc/arch/parisc/sysstub.ph
rename to usr/klibc/arch/parisc/sysstub.ph
diff --git a/klibc/arch/ppc/MCONFIG b/usr/klibc/arch/ppc/MCONFIG
similarity index 100%
rename from klibc/arch/ppc/MCONFIG
rename to usr/klibc/arch/ppc/MCONFIG
diff --git a/klibc/arch/ppc/Makefile.inc b/usr/klibc/arch/ppc/Makefile.inc
similarity index 100%
rename from klibc/arch/ppc/Makefile.inc
rename to usr/klibc/arch/ppc/Makefile.inc
diff --git a/klibc/arch/ppc/crt0.S b/usr/klibc/arch/ppc/crt0.S
similarity index 100%
rename from klibc/arch/ppc/crt0.S
rename to usr/klibc/arch/ppc/crt0.S
diff --git a/klibc/arch/ppc/setjmp.S b/usr/klibc/arch/ppc/setjmp.S
similarity index 100%
rename from klibc/arch/ppc/setjmp.S
rename to usr/klibc/arch/ppc/setjmp.S
diff --git a/klibc/arch/ppc/syscall.S b/usr/klibc/arch/ppc/syscall.S
similarity index 100%
rename from klibc/arch/ppc/syscall.S
rename to usr/klibc/arch/ppc/syscall.S
diff --git a/klibc/arch/ppc/sysstub.ph b/usr/klibc/arch/ppc/sysstub.ph
similarity index 100%
rename from klibc/arch/ppc/sysstub.ph
rename to usr/klibc/arch/ppc/sysstub.ph
diff --git a/klibc/arch/ppc64/MCONFIG b/usr/klibc/arch/ppc64/MCONFIG
similarity index 100%
rename from klibc/arch/ppc64/MCONFIG
rename to usr/klibc/arch/ppc64/MCONFIG
diff --git a/klibc/arch/ppc64/Makefile.inc b/usr/klibc/arch/ppc64/Makefile.inc
similarity index 100%
rename from klibc/arch/ppc64/Makefile.inc
rename to usr/klibc/arch/ppc64/Makefile.inc
diff --git a/klibc/arch/ppc64/crt0.S b/usr/klibc/arch/ppc64/crt0.S
similarity index 100%
rename from klibc/arch/ppc64/crt0.S
rename to usr/klibc/arch/ppc64/crt0.S
diff --git a/klibc/arch/ppc64/setjmp.S b/usr/klibc/arch/ppc64/setjmp.S
similarity index 100%
rename from klibc/arch/ppc64/setjmp.S
rename to usr/klibc/arch/ppc64/setjmp.S
diff --git a/klibc/arch/ppc64/syscall.c b/usr/klibc/arch/ppc64/syscall.c
similarity index 100%
rename from klibc/arch/ppc64/syscall.c
rename to usr/klibc/arch/ppc64/syscall.c
diff --git a/klibc/arch/ppc64/sysstub.ph b/usr/klibc/arch/ppc64/sysstub.ph
similarity index 100%
rename from klibc/arch/ppc64/sysstub.ph
rename to usr/klibc/arch/ppc64/sysstub.ph
diff --git a/klibc/arch/s390/MCONFIG b/usr/klibc/arch/s390/MCONFIG
similarity index 100%
rename from klibc/arch/s390/MCONFIG
rename to usr/klibc/arch/s390/MCONFIG
diff --git a/klibc/arch/s390/Makefile.inc b/usr/klibc/arch/s390/Makefile.inc
similarity index 100%
rename from klibc/arch/s390/Makefile.inc
rename to usr/klibc/arch/s390/Makefile.inc
diff --git a/klibc/arch/s390/crt0.S b/usr/klibc/arch/s390/crt0.S
similarity index 100%
rename from klibc/arch/s390/crt0.S
rename to usr/klibc/arch/s390/crt0.S
diff --git a/klibc/arch/s390/mmap.c b/usr/klibc/arch/s390/mmap.c
similarity index 100%
rename from klibc/arch/s390/mmap.c
rename to usr/klibc/arch/s390/mmap.c
diff --git a/klibc/arch/s390/setjmp.S b/usr/klibc/arch/s390/setjmp.S
similarity index 100%
rename from klibc/arch/s390/setjmp.S
rename to usr/klibc/arch/s390/setjmp.S
diff --git a/klibc/arch/s390/syscall.c b/usr/klibc/arch/s390/syscall.c
similarity index 100%
rename from klibc/arch/s390/syscall.c
rename to usr/klibc/arch/s390/syscall.c
diff --git a/klibc/arch/s390/sysstub.ph b/usr/klibc/arch/s390/sysstub.ph
similarity index 100%
rename from klibc/arch/s390/sysstub.ph
rename to usr/klibc/arch/s390/sysstub.ph
diff --git a/klibc/arch/s390x/MCONFIG b/usr/klibc/arch/s390x/MCONFIG
similarity index 100%
rename from klibc/arch/s390x/MCONFIG
rename to usr/klibc/arch/s390x/MCONFIG
diff --git a/klibc/arch/s390x/Makefile.inc b/usr/klibc/arch/s390x/Makefile.inc
similarity index 100%
rename from klibc/arch/s390x/Makefile.inc
rename to usr/klibc/arch/s390x/Makefile.inc
diff --git a/klibc/arch/s390x/crt0.S b/usr/klibc/arch/s390x/crt0.S
similarity index 100%
rename from klibc/arch/s390x/crt0.S
rename to usr/klibc/arch/s390x/crt0.S
diff --git a/klibc/arch/s390x/mmap.c b/usr/klibc/arch/s390x/mmap.c
similarity index 100%
rename from klibc/arch/s390x/mmap.c
rename to usr/klibc/arch/s390x/mmap.c
diff --git a/klibc/arch/s390x/setjmp.S b/usr/klibc/arch/s390x/setjmp.S
similarity index 100%
rename from klibc/arch/s390x/setjmp.S
rename to usr/klibc/arch/s390x/setjmp.S
diff --git a/klibc/arch/s390x/syscall.c b/usr/klibc/arch/s390x/syscall.c
similarity index 100%
rename from klibc/arch/s390x/syscall.c
rename to usr/klibc/arch/s390x/syscall.c
diff --git a/klibc/arch/s390x/sysstub.ph b/usr/klibc/arch/s390x/sysstub.ph
similarity index 100%
rename from klibc/arch/s390x/sysstub.ph
rename to usr/klibc/arch/s390x/sysstub.ph
diff --git a/klibc/arch/sh/MCONFIG b/usr/klibc/arch/sh/MCONFIG
similarity index 100%
rename from klibc/arch/sh/MCONFIG
rename to usr/klibc/arch/sh/MCONFIG
diff --git a/klibc/arch/sh/Makefile.inc b/usr/klibc/arch/sh/Makefile.inc
similarity index 100%
rename from klibc/arch/sh/Makefile.inc
rename to usr/klibc/arch/sh/Makefile.inc
diff --git a/klibc/arch/sh/crt0.S b/usr/klibc/arch/sh/crt0.S
similarity index 100%
rename from klibc/arch/sh/crt0.S
rename to usr/klibc/arch/sh/crt0.S
diff --git a/klibc/arch/sh/setjmp.S b/usr/klibc/arch/sh/setjmp.S
similarity index 100%
rename from klibc/arch/sh/setjmp.S
rename to usr/klibc/arch/sh/setjmp.S
diff --git a/klibc/arch/sh/syscall.S b/usr/klibc/arch/sh/syscall.S
similarity index 100%
rename from klibc/arch/sh/syscall.S
rename to usr/klibc/arch/sh/syscall.S
diff --git a/klibc/arch/sh/sysstub.ph b/usr/klibc/arch/sh/sysstub.ph
similarity index 100%
rename from klibc/arch/sh/sysstub.ph
rename to usr/klibc/arch/sh/sysstub.ph
diff --git a/klibc/arch/sparc/MCONFIG b/usr/klibc/arch/sparc/MCONFIG
similarity index 100%
rename from klibc/arch/sparc/MCONFIG
rename to usr/klibc/arch/sparc/MCONFIG
diff --git a/klibc/arch/sparc/Makefile.inc b/usr/klibc/arch/sparc/Makefile.inc
similarity index 100%
rename from klibc/arch/sparc/Makefile.inc
rename to usr/klibc/arch/sparc/Makefile.inc
diff --git a/klibc/arch/sparc/crt0.S b/usr/klibc/arch/sparc/crt0.S
similarity index 100%
rename from klibc/arch/sparc/crt0.S
rename to usr/klibc/arch/sparc/crt0.S
diff --git a/klibc/arch/sparc/crt0i.S b/usr/klibc/arch/sparc/crt0i.S
similarity index 100%
rename from klibc/arch/sparc/crt0i.S
rename to usr/klibc/arch/sparc/crt0i.S
diff --git a/klibc/arch/sparc/divrem.m4 b/usr/klibc/arch/sparc/divrem.m4
similarity index 100%
rename from klibc/arch/sparc/divrem.m4
rename to usr/klibc/arch/sparc/divrem.m4
diff --git a/klibc/arch/sparc/setjmp.S b/usr/klibc/arch/sparc/setjmp.S
similarity index 100%
rename from klibc/arch/sparc/setjmp.S
rename to usr/klibc/arch/sparc/setjmp.S
diff --git a/klibc/arch/sparc/smul.S b/usr/klibc/arch/sparc/smul.S
similarity index 100%
rename from klibc/arch/sparc/smul.S
rename to usr/klibc/arch/sparc/smul.S
diff --git a/klibc/arch/sparc/syscall.S b/usr/klibc/arch/sparc/syscall.S
similarity index 100%
rename from klibc/arch/sparc/syscall.S
rename to usr/klibc/arch/sparc/syscall.S
diff --git a/klibc/arch/sparc/sysfork.S b/usr/klibc/arch/sparc/sysfork.S
similarity index 100%
rename from klibc/arch/sparc/sysfork.S
rename to usr/klibc/arch/sparc/sysfork.S
diff --git a/klibc/arch/sparc/sysstub.ph b/usr/klibc/arch/sparc/sysstub.ph
similarity index 100%
rename from klibc/arch/sparc/sysstub.ph
rename to usr/klibc/arch/sparc/sysstub.ph
diff --git a/klibc/arch/sparc/umul.S b/usr/klibc/arch/sparc/umul.S
similarity index 100%
rename from klibc/arch/sparc/umul.S
rename to usr/klibc/arch/sparc/umul.S
diff --git a/klibc/arch/sparc64/MCONFIG b/usr/klibc/arch/sparc64/MCONFIG
similarity index 100%
rename from klibc/arch/sparc64/MCONFIG
rename to usr/klibc/arch/sparc64/MCONFIG
diff --git a/klibc/arch/sparc64/Makefile.inc b/usr/klibc/arch/sparc64/Makefile.inc
similarity index 100%
rename from klibc/arch/sparc64/Makefile.inc
rename to usr/klibc/arch/sparc64/Makefile.inc
diff --git a/klibc/arch/sparc64/crt0.S b/usr/klibc/arch/sparc64/crt0.S
similarity index 100%
rename from klibc/arch/sparc64/crt0.S
rename to usr/klibc/arch/sparc64/crt0.S
diff --git a/klibc/arch/sparc64/setjmp.S b/usr/klibc/arch/sparc64/setjmp.S
similarity index 100%
rename from klibc/arch/sparc64/setjmp.S
rename to usr/klibc/arch/sparc64/setjmp.S
diff --git a/klibc/arch/sparc64/syscall.S b/usr/klibc/arch/sparc64/syscall.S
similarity index 100%
rename from klibc/arch/sparc64/syscall.S
rename to usr/klibc/arch/sparc64/syscall.S
diff --git a/klibc/arch/sparc64/sysfork.S b/usr/klibc/arch/sparc64/sysfork.S
similarity index 100%
rename from klibc/arch/sparc64/sysfork.S
rename to usr/klibc/arch/sparc64/sysfork.S
diff --git a/klibc/arch/sparc64/sysstub.ph b/usr/klibc/arch/sparc64/sysstub.ph
similarity index 100%
rename from klibc/arch/sparc64/sysstub.ph
rename to usr/klibc/arch/sparc64/sysstub.ph
diff --git a/klibc/arch/x86_64/MCONFIG b/usr/klibc/arch/x86_64/MCONFIG
similarity index 100%
rename from klibc/arch/x86_64/MCONFIG
rename to usr/klibc/arch/x86_64/MCONFIG
diff --git a/klibc/arch/x86_64/Makefile.inc b/usr/klibc/arch/x86_64/Makefile.inc
similarity index 100%
rename from klibc/arch/x86_64/Makefile.inc
rename to usr/klibc/arch/x86_64/Makefile.inc
diff --git a/klibc/arch/x86_64/crt0.S b/usr/klibc/arch/x86_64/crt0.S
similarity index 100%
rename from klibc/arch/x86_64/crt0.S
rename to usr/klibc/arch/x86_64/crt0.S
diff --git a/klibc/arch/x86_64/setjmp.S b/usr/klibc/arch/x86_64/setjmp.S
similarity index 100%
rename from klibc/arch/x86_64/setjmp.S
rename to usr/klibc/arch/x86_64/setjmp.S
diff --git a/klibc/arch/x86_64/sigreturn.S b/usr/klibc/arch/x86_64/sigreturn.S
similarity index 100%
rename from klibc/arch/x86_64/sigreturn.S
rename to usr/klibc/arch/x86_64/sigreturn.S
diff --git a/klibc/arch/x86_64/syscall.S b/usr/klibc/arch/x86_64/syscall.S
similarity index 100%
rename from klibc/arch/x86_64/syscall.S
rename to usr/klibc/arch/x86_64/syscall.S
diff --git a/klibc/arch/x86_64/sysstub.ph b/usr/klibc/arch/x86_64/sysstub.ph
similarity index 100%
rename from klibc/arch/x86_64/sysstub.ph
rename to usr/klibc/arch/x86_64/sysstub.ph
diff --git a/klibc/asprintf.c b/usr/klibc/asprintf.c
similarity index 100%
rename from klibc/asprintf.c
rename to usr/klibc/asprintf.c
diff --git a/klibc/assert.c b/usr/klibc/assert.c
similarity index 100%
rename from klibc/assert.c
rename to usr/klibc/assert.c
diff --git a/klibc/atexit.c b/usr/klibc/atexit.c
similarity index 100%
rename from klibc/atexit.c
rename to usr/klibc/atexit.c
diff --git a/klibc/atexit.h b/usr/klibc/atexit.h
similarity index 100%
rename from klibc/atexit.h
rename to usr/klibc/atexit.h
diff --git a/klibc/atoi.c b/usr/klibc/atoi.c
similarity index 100%
rename from klibc/atoi.c
rename to usr/klibc/atoi.c
diff --git a/klibc/atol.c b/usr/klibc/atol.c
similarity index 100%
rename from klibc/atol.c
rename to usr/klibc/atol.c
diff --git a/klibc/atoll.c b/usr/klibc/atoll.c
similarity index 100%
rename from klibc/atoll.c
rename to usr/klibc/atoll.c
diff --git a/klibc/atox.c b/usr/klibc/atox.c
similarity index 100%
rename from klibc/atox.c
rename to usr/klibc/atox.c
diff --git a/klibc/brk.c b/usr/klibc/brk.c
similarity index 100%
rename from klibc/brk.c
rename to usr/klibc/brk.c
diff --git a/klibc/bsd_signal.c b/usr/klibc/bsd_signal.c
similarity index 100%
rename from klibc/bsd_signal.c
rename to usr/klibc/bsd_signal.c
diff --git a/klibc/bsearch.c b/usr/klibc/bsearch.c
similarity index 100%
rename from klibc/bsearch.c
rename to usr/klibc/bsearch.c
diff --git a/klibc/calloc.c b/usr/klibc/calloc.c
similarity index 100%
rename from klibc/calloc.c
rename to usr/klibc/calloc.c
diff --git a/klibc/clearenv.c b/usr/klibc/clearenv.c
similarity index 100%
rename from klibc/clearenv.c
rename to usr/klibc/clearenv.c
diff --git a/klibc/closelog.c b/usr/klibc/closelog.c
similarity index 100%
rename from klibc/closelog.c
rename to usr/klibc/closelog.c
diff --git a/klibc/creat.c b/usr/klibc/creat.c
similarity index 100%
rename from klibc/creat.c
rename to usr/klibc/creat.c
diff --git a/klibc/ctype/ctypefunc.h b/usr/klibc/ctype/ctypefunc.h
similarity index 100%
rename from klibc/ctype/ctypefunc.h
rename to usr/klibc/ctype/ctypefunc.h
diff --git a/klibc/ctype/isalnum.c b/usr/klibc/ctype/isalnum.c
similarity index 100%
rename from klibc/ctype/isalnum.c
rename to usr/klibc/ctype/isalnum.c
diff --git a/klibc/ctype/isalpha.c b/usr/klibc/ctype/isalpha.c
similarity index 100%
rename from klibc/ctype/isalpha.c
rename to usr/klibc/ctype/isalpha.c
diff --git a/klibc/ctype/isascii.c b/usr/klibc/ctype/isascii.c
similarity index 100%
rename from klibc/ctype/isascii.c
rename to usr/klibc/ctype/isascii.c
diff --git a/klibc/ctype/isblank.c b/usr/klibc/ctype/isblank.c
similarity index 100%
rename from klibc/ctype/isblank.c
rename to usr/klibc/ctype/isblank.c
diff --git a/klibc/ctype/iscntrl.c b/usr/klibc/ctype/iscntrl.c
similarity index 100%
rename from klibc/ctype/iscntrl.c
rename to usr/klibc/ctype/iscntrl.c
diff --git a/klibc/ctype/isdigit.c b/usr/klibc/ctype/isdigit.c
similarity index 100%
rename from klibc/ctype/isdigit.c
rename to usr/klibc/ctype/isdigit.c
diff --git a/klibc/ctype/isgraph.c b/usr/klibc/ctype/isgraph.c
similarity index 100%
rename from klibc/ctype/isgraph.c
rename to usr/klibc/ctype/isgraph.c
diff --git a/klibc/ctype/islower.c b/usr/klibc/ctype/islower.c
similarity index 100%
rename from klibc/ctype/islower.c
rename to usr/klibc/ctype/islower.c
diff --git a/klibc/ctype/isprint.c b/usr/klibc/ctype/isprint.c
similarity index 100%
rename from klibc/ctype/isprint.c
rename to usr/klibc/ctype/isprint.c
diff --git a/klibc/ctype/ispunct.c b/usr/klibc/ctype/ispunct.c
similarity index 100%
rename from klibc/ctype/ispunct.c
rename to usr/klibc/ctype/ispunct.c
diff --git a/klibc/ctype/isspace.c b/usr/klibc/ctype/isspace.c
similarity index 100%
rename from klibc/ctype/isspace.c
rename to usr/klibc/ctype/isspace.c
diff --git a/klibc/ctype/isupper.c b/usr/klibc/ctype/isupper.c
similarity index 100%
rename from klibc/ctype/isupper.c
rename to usr/klibc/ctype/isupper.c
diff --git a/klibc/ctype/isxdigit.c b/usr/klibc/ctype/isxdigit.c
similarity index 100%
rename from klibc/ctype/isxdigit.c
rename to usr/klibc/ctype/isxdigit.c
diff --git a/klibc/ctype/tolower.c b/usr/klibc/ctype/tolower.c
similarity index 100%
rename from klibc/ctype/tolower.c
rename to usr/klibc/ctype/tolower.c
diff --git a/klibc/ctype/toupper.c b/usr/klibc/ctype/toupper.c
similarity index 100%
rename from klibc/ctype/toupper.c
rename to usr/klibc/ctype/toupper.c
diff --git a/klibc/ctypes.c b/usr/klibc/ctypes.c
similarity index 100%
rename from klibc/ctypes.c
rename to usr/klibc/ctypes.c
diff --git a/klibc/daemon.c b/usr/klibc/daemon.c
similarity index 100%
rename from klibc/daemon.c
rename to usr/klibc/daemon.c
diff --git a/klibc/env.h b/usr/klibc/env.h
similarity index 100%
rename from klibc/env.h
rename to usr/klibc/env.h
diff --git a/klibc/exec_l.c b/usr/klibc/exec_l.c
similarity index 100%
rename from klibc/exec_l.c
rename to usr/klibc/exec_l.c
diff --git a/klibc/execl.c b/usr/klibc/execl.c
similarity index 100%
rename from klibc/execl.c
rename to usr/klibc/execl.c
diff --git a/klibc/execle.c b/usr/klibc/execle.c
similarity index 100%
rename from klibc/execle.c
rename to usr/klibc/execle.c
diff --git a/klibc/execlp.c b/usr/klibc/execlp.c
similarity index 100%
rename from klibc/execlp.c
rename to usr/klibc/execlp.c
diff --git a/klibc/execlpe.c b/usr/klibc/execlpe.c
similarity index 100%
rename from klibc/execlpe.c
rename to usr/klibc/execlpe.c
diff --git a/klibc/execv.c b/usr/klibc/execv.c
similarity index 100%
rename from klibc/execv.c
rename to usr/klibc/execv.c
diff --git a/klibc/execvp.c b/usr/klibc/execvp.c
similarity index 100%
rename from klibc/execvp.c
rename to usr/klibc/execvp.c
diff --git a/klibc/execvpe.c b/usr/klibc/execvpe.c
similarity index 100%
rename from klibc/execvpe.c
rename to usr/klibc/execvpe.c
diff --git a/klibc/exit.c b/usr/klibc/exit.c
similarity index 100%
rename from klibc/exit.c
rename to usr/klibc/exit.c
diff --git a/klibc/fgetc.c b/usr/klibc/fgetc.c
similarity index 100%
rename from klibc/fgetc.c
rename to usr/klibc/fgetc.c
diff --git a/klibc/fgets.c b/usr/klibc/fgets.c
similarity index 100%
rename from klibc/fgets.c
rename to usr/klibc/fgets.c
diff --git a/klibc/fopen.c b/usr/klibc/fopen.c
similarity index 100%
rename from klibc/fopen.c
rename to usr/klibc/fopen.c
diff --git a/klibc/fork.c b/usr/klibc/fork.c
similarity index 100%
rename from klibc/fork.c
rename to usr/klibc/fork.c
diff --git a/klibc/fprintf.c b/usr/klibc/fprintf.c
similarity index 100%
rename from klibc/fprintf.c
rename to usr/klibc/fprintf.c
diff --git a/klibc/fputc.c b/usr/klibc/fputc.c
similarity index 100%
rename from klibc/fputc.c
rename to usr/klibc/fputc.c
diff --git a/klibc/fputs.c b/usr/klibc/fputs.c
similarity index 100%
rename from klibc/fputs.c
rename to usr/klibc/fputs.c
diff --git a/klibc/fread.c b/usr/klibc/fread.c
similarity index 100%
rename from klibc/fread.c
rename to usr/klibc/fread.c
diff --git a/klibc/fread2.c b/usr/klibc/fread2.c
similarity index 100%
rename from klibc/fread2.c
rename to usr/klibc/fread2.c
diff --git a/klibc/fstatfs.c b/usr/klibc/fstatfs.c
similarity index 100%
rename from klibc/fstatfs.c
rename to usr/klibc/fstatfs.c
diff --git a/klibc/fwrite.c b/usr/klibc/fwrite.c
similarity index 100%
rename from klibc/fwrite.c
rename to usr/klibc/fwrite.c
diff --git a/klibc/fwrite2.c b/usr/klibc/fwrite2.c
similarity index 100%
rename from klibc/fwrite2.c
rename to usr/klibc/fwrite2.c
diff --git a/klibc/getcwd.c b/usr/klibc/getcwd.c
similarity index 100%
rename from klibc/getcwd.c
rename to usr/klibc/getcwd.c
diff --git a/klibc/getdomainname.c b/usr/klibc/getdomainname.c
similarity index 100%
rename from klibc/getdomainname.c
rename to usr/klibc/getdomainname.c
diff --git a/klibc/getenv.c b/usr/klibc/getenv.c
similarity index 100%
rename from klibc/getenv.c
rename to usr/klibc/getenv.c
diff --git a/klibc/gethostname.c b/usr/klibc/gethostname.c
similarity index 100%
rename from klibc/gethostname.c
rename to usr/klibc/gethostname.c
diff --git a/klibc/getopt.c b/usr/klibc/getopt.c
similarity index 100%
rename from klibc/getopt.c
rename to usr/klibc/getopt.c
diff --git a/klibc/getpgrp.c b/usr/klibc/getpgrp.c
similarity index 100%
rename from klibc/getpgrp.c
rename to usr/klibc/getpgrp.c
diff --git a/klibc/getpriority.c b/usr/klibc/getpriority.c
similarity index 100%
rename from klibc/getpriority.c
rename to usr/klibc/getpriority.c
diff --git a/klibc/getpt.c b/usr/klibc/getpt.c
similarity index 100%
rename from klibc/getpt.c
rename to usr/klibc/getpt.c
diff --git a/klibc/globals.c b/usr/klibc/globals.c
similarity index 100%
rename from klibc/globals.c
rename to usr/klibc/globals.c
diff --git a/klibc/inet/bindresvport.c b/usr/klibc/inet/bindresvport.c
similarity index 100%
rename from klibc/inet/bindresvport.c
rename to usr/klibc/inet/bindresvport.c
diff --git a/klibc/inet/inet_addr.c b/usr/klibc/inet/inet_addr.c
similarity index 100%
rename from klibc/inet/inet_addr.c
rename to usr/klibc/inet/inet_addr.c
diff --git a/klibc/inet/inet_aton.c b/usr/klibc/inet/inet_aton.c
similarity index 100%
rename from klibc/inet/inet_aton.c
rename to usr/klibc/inet/inet_aton.c
diff --git a/klibc/inet/inet_ntoa.c b/usr/klibc/inet/inet_ntoa.c
similarity index 100%
rename from klibc/inet/inet_ntoa.c
rename to usr/klibc/inet/inet_ntoa.c
diff --git a/klibc/inet/inet_ntop.c b/usr/klibc/inet/inet_ntop.c
similarity index 100%
rename from klibc/inet/inet_ntop.c
rename to usr/klibc/inet/inet_ntop.c
diff --git a/klibc/inet/inet_pton.c b/usr/klibc/inet/inet_pton.c
similarity index 100%
rename from klibc/inet/inet_pton.c
rename to usr/klibc/inet/inet_pton.c
diff --git a/klibc/interp.S b/usr/klibc/interp.S
similarity index 100%
rename from klibc/interp.S
rename to usr/klibc/interp.S
diff --git a/klibc/isatty.c b/usr/klibc/isatty.c
similarity index 100%
rename from klibc/isatty.c
rename to usr/klibc/isatty.c
diff --git a/klibc/jrand48.c b/usr/klibc/jrand48.c
similarity index 100%
rename from klibc/jrand48.c
rename to usr/klibc/jrand48.c
diff --git a/klibc/libc_init.c b/usr/klibc/libc_init.c
similarity index 100%
rename from klibc/libc_init.c
rename to usr/klibc/libc_init.c
diff --git a/klibc/libgcc/__divdi3.c b/usr/klibc/libgcc/__divdi3.c
similarity index 100%
rename from klibc/libgcc/__divdi3.c
rename to usr/klibc/libgcc/__divdi3.c
diff --git a/klibc/libgcc/__divsi3.c b/usr/klibc/libgcc/__divsi3.c
similarity index 100%
rename from klibc/libgcc/__divsi3.c
rename to usr/klibc/libgcc/__divsi3.c
diff --git a/klibc/libgcc/__moddi3.c b/usr/klibc/libgcc/__moddi3.c
similarity index 100%
rename from klibc/libgcc/__moddi3.c
rename to usr/klibc/libgcc/__moddi3.c
diff --git a/klibc/libgcc/__modsi3.c b/usr/klibc/libgcc/__modsi3.c
similarity index 100%
rename from klibc/libgcc/__modsi3.c
rename to usr/klibc/libgcc/__modsi3.c
diff --git a/klibc/libgcc/__udivdi3.c b/usr/klibc/libgcc/__udivdi3.c
similarity index 100%
rename from klibc/libgcc/__udivdi3.c
rename to usr/klibc/libgcc/__udivdi3.c
diff --git a/klibc/libgcc/__udivmoddi4.c b/usr/klibc/libgcc/__udivmoddi4.c
similarity index 100%
rename from klibc/libgcc/__udivmoddi4.c
rename to usr/klibc/libgcc/__udivmoddi4.c
diff --git a/klibc/libgcc/__udivmodsi4.c b/usr/klibc/libgcc/__udivmodsi4.c
similarity index 100%
rename from klibc/libgcc/__udivmodsi4.c
rename to usr/klibc/libgcc/__udivmodsi4.c
diff --git a/klibc/libgcc/__udivsi3.c b/usr/klibc/libgcc/__udivsi3.c
similarity index 100%
rename from klibc/libgcc/__udivsi3.c
rename to usr/klibc/libgcc/__udivsi3.c
diff --git a/klibc/libgcc/__umoddi3.c b/usr/klibc/libgcc/__umoddi3.c
similarity index 100%
rename from klibc/libgcc/__umoddi3.c
rename to usr/klibc/libgcc/__umoddi3.c
diff --git a/klibc/libgcc/__umodsi3.c b/usr/klibc/libgcc/__umodsi3.c
similarity index 100%
rename from klibc/libgcc/__umodsi3.c
rename to usr/klibc/libgcc/__umodsi3.c
diff --git a/klibc/llseek.c b/usr/klibc/llseek.c
similarity index 100%
rename from klibc/llseek.c
rename to usr/klibc/llseek.c
diff --git a/klibc/lrand48.c b/usr/klibc/lrand48.c
similarity index 100%
rename from klibc/lrand48.c
rename to usr/klibc/lrand48.c
diff --git a/klibc/makeerrlist.pl b/usr/klibc/makeerrlist.pl
similarity index 100%
rename from klibc/makeerrlist.pl
rename to usr/klibc/makeerrlist.pl
diff --git a/klibc/malloc.c b/usr/klibc/malloc.c
similarity index 100%
rename from klibc/malloc.c
rename to usr/klibc/malloc.c
diff --git a/klibc/malloc.h b/usr/klibc/malloc.h
similarity index 100%
rename from klibc/malloc.h
rename to usr/klibc/malloc.h
diff --git a/klibc/memccpy.c b/usr/klibc/memccpy.c
similarity index 100%
rename from klibc/memccpy.c
rename to usr/klibc/memccpy.c
diff --git a/klibc/memchr.c b/usr/klibc/memchr.c
similarity index 100%
rename from klibc/memchr.c
rename to usr/klibc/memchr.c
diff --git a/klibc/memcmp.c b/usr/klibc/memcmp.c
similarity index 100%
rename from klibc/memcmp.c
rename to usr/klibc/memcmp.c
diff --git a/klibc/memcpy.c b/usr/klibc/memcpy.c
similarity index 100%
rename from klibc/memcpy.c
rename to usr/klibc/memcpy.c
diff --git a/klibc/memmem.c b/usr/klibc/memmem.c
similarity index 100%
rename from klibc/memmem.c
rename to usr/klibc/memmem.c
diff --git a/klibc/memmove.c b/usr/klibc/memmove.c
similarity index 100%
rename from klibc/memmove.c
rename to usr/klibc/memmove.c
diff --git a/klibc/memrchr.c b/usr/klibc/memrchr.c
similarity index 100%
rename from klibc/memrchr.c
rename to usr/klibc/memrchr.c
diff --git a/klibc/memset.c b/usr/klibc/memset.c
similarity index 100%
rename from klibc/memset.c
rename to usr/klibc/memset.c
diff --git a/klibc/memswap.c b/usr/klibc/memswap.c
similarity index 100%
rename from klibc/memswap.c
rename to usr/klibc/memswap.c
diff --git a/klibc/mmap.c b/usr/klibc/mmap.c
similarity index 100%
rename from klibc/mmap.c
rename to usr/klibc/mmap.c
diff --git a/klibc/mrand48.c b/usr/klibc/mrand48.c
similarity index 100%
rename from klibc/mrand48.c
rename to usr/klibc/mrand48.c
diff --git a/klibc/nice.c b/usr/klibc/nice.c
similarity index 100%
rename from klibc/nice.c
rename to usr/klibc/nice.c
diff --git a/klibc/nrand48.c b/usr/klibc/nrand48.c
similarity index 100%
rename from klibc/nrand48.c
rename to usr/klibc/nrand48.c
diff --git a/klibc/nullenv.c b/usr/klibc/nullenv.c
similarity index 100%
rename from klibc/nullenv.c
rename to usr/klibc/nullenv.c
diff --git a/klibc/onexit.c b/usr/klibc/onexit.c
similarity index 100%
rename from klibc/onexit.c
rename to usr/klibc/onexit.c
diff --git a/klibc/open.c b/usr/klibc/open.c
similarity index 100%
rename from klibc/open.c
rename to usr/klibc/open.c
diff --git a/klibc/openat.c b/usr/klibc/openat.c
similarity index 100%
rename from klibc/openat.c
rename to usr/klibc/openat.c
diff --git a/klibc/pause.c b/usr/klibc/pause.c
similarity index 100%
rename from klibc/pause.c
rename to usr/klibc/pause.c
diff --git a/klibc/perror.c b/usr/klibc/perror.c
similarity index 100%
rename from klibc/perror.c
rename to usr/klibc/perror.c
diff --git a/klibc/ppoll.c b/usr/klibc/ppoll.c
similarity index 100%
rename from klibc/ppoll.c
rename to usr/klibc/ppoll.c
diff --git a/klibc/printf.c b/usr/klibc/printf.c
similarity index 100%
rename from klibc/printf.c
rename to usr/klibc/printf.c
diff --git a/klibc/pselect.c b/usr/klibc/pselect.c
similarity index 100%
rename from klibc/pselect.c
rename to usr/klibc/pselect.c
diff --git a/klibc/pty.c b/usr/klibc/pty.c
similarity index 100%
rename from klibc/pty.c
rename to usr/klibc/pty.c
diff --git a/klibc/putchar.c b/usr/klibc/putchar.c
similarity index 100%
rename from klibc/putchar.c
rename to usr/klibc/putchar.c
diff --git a/klibc/putenv.c b/usr/klibc/putenv.c
similarity index 100%
rename from klibc/putenv.c
rename to usr/klibc/putenv.c
diff --git a/klibc/puts.c b/usr/klibc/puts.c
similarity index 100%
rename from klibc/puts.c
rename to usr/klibc/puts.c
diff --git a/klibc/qsort.c b/usr/klibc/qsort.c
similarity index 100%
rename from klibc/qsort.c
rename to usr/klibc/qsort.c
diff --git a/klibc/raise.c b/usr/klibc/raise.c
similarity index 100%
rename from klibc/raise.c
rename to usr/klibc/raise.c
diff --git a/klibc/readdir.c b/usr/klibc/readdir.c
similarity index 100%
rename from klibc/readdir.c
rename to usr/klibc/readdir.c
diff --git a/klibc/realloc.c b/usr/klibc/realloc.c
similarity index 100%
rename from klibc/realloc.c
rename to usr/klibc/realloc.c
diff --git a/klibc/reboot.c b/usr/klibc/reboot.c
similarity index 100%
rename from klibc/reboot.c
rename to usr/klibc/reboot.c
diff --git a/klibc/recv.c b/usr/klibc/recv.c
similarity index 100%
rename from klibc/recv.c
rename to usr/klibc/recv.c
diff --git a/klibc/remove.c b/usr/klibc/remove.c
similarity index 100%
rename from klibc/remove.c
rename to usr/klibc/remove.c
diff --git a/klibc/sbrk.c b/usr/klibc/sbrk.c
similarity index 100%
rename from klibc/sbrk.c
rename to usr/klibc/sbrk.c
diff --git a/klibc/seed48.c b/usr/klibc/seed48.c
similarity index 100%
rename from klibc/seed48.c
rename to usr/klibc/seed48.c
diff --git a/klibc/send.c b/usr/klibc/send.c
similarity index 100%
rename from klibc/send.c
rename to usr/klibc/send.c
diff --git a/klibc/setegid.c b/usr/klibc/setegid.c
similarity index 100%
rename from klibc/setegid.c
rename to usr/klibc/setegid.c
diff --git a/klibc/setenv.c b/usr/klibc/setenv.c
similarity index 100%
rename from klibc/setenv.c
rename to usr/klibc/setenv.c
diff --git a/klibc/seteuid.c b/usr/klibc/seteuid.c
similarity index 100%
rename from klibc/seteuid.c
rename to usr/klibc/seteuid.c
diff --git a/klibc/setpgrp.c b/usr/klibc/setpgrp.c
similarity index 100%
rename from klibc/setpgrp.c
rename to usr/klibc/setpgrp.c
diff --git a/klibc/sha1hash.c b/usr/klibc/sha1hash.c
similarity index 100%
rename from klibc/sha1hash.c
rename to usr/klibc/sha1hash.c
diff --git a/klibc/sigabbrev.c b/usr/klibc/sigabbrev.c
similarity index 100%
rename from klibc/sigabbrev.c
rename to usr/klibc/sigabbrev.c
diff --git a/klibc/sigaction.c b/usr/klibc/sigaction.c
similarity index 100%
rename from klibc/sigaction.c
rename to usr/klibc/sigaction.c
diff --git a/klibc/siglist.c b/usr/klibc/siglist.c
similarity index 100%
rename from klibc/siglist.c
rename to usr/klibc/siglist.c
diff --git a/klibc/siglongjmp.c b/usr/klibc/siglongjmp.c
similarity index 100%
rename from klibc/siglongjmp.c
rename to usr/klibc/siglongjmp.c
diff --git a/klibc/sigpending.c b/usr/klibc/sigpending.c
similarity index 100%
rename from klibc/sigpending.c
rename to usr/klibc/sigpending.c
diff --git a/klibc/sigprocmask.c b/usr/klibc/sigprocmask.c
similarity index 100%
rename from klibc/sigprocmask.c
rename to usr/klibc/sigprocmask.c
diff --git a/klibc/sigsuspend.c b/usr/klibc/sigsuspend.c
similarity index 100%
rename from klibc/sigsuspend.c
rename to usr/klibc/sigsuspend.c
diff --git a/klibc/sleep.c b/usr/klibc/sleep.c
similarity index 100%
rename from klibc/sleep.c
rename to usr/klibc/sleep.c
diff --git a/klibc/snprintf.c b/usr/klibc/snprintf.c
similarity index 100%
rename from klibc/snprintf.c
rename to usr/klibc/snprintf.c
diff --git a/klibc/socketcalls.pl b/usr/klibc/socketcalls.pl
similarity index 100%
rename from klibc/socketcalls.pl
rename to usr/klibc/socketcalls.pl
diff --git a/klibc/socketcalls/Kbuild b/usr/klibc/socketcalls/Kbuild
similarity index 100%
rename from klibc/socketcalls/Kbuild
rename to usr/klibc/socketcalls/Kbuild
diff --git a/klibc/socketcalls/socketcommon.h b/usr/klibc/socketcalls/socketcommon.h
similarity index 100%
rename from klibc/socketcalls/socketcommon.h
rename to usr/klibc/socketcalls/socketcommon.h
diff --git a/klibc/sprintf.c b/usr/klibc/sprintf.c
similarity index 100%
rename from klibc/sprintf.c
rename to usr/klibc/sprintf.c
diff --git a/klibc/srand48.c b/usr/klibc/srand48.c
similarity index 100%
rename from klibc/srand48.c
rename to usr/klibc/srand48.c
diff --git a/klibc/sscanf.c b/usr/klibc/sscanf.c
similarity index 100%
rename from klibc/sscanf.c
rename to usr/klibc/sscanf.c
diff --git a/klibc/statfs.c b/usr/klibc/statfs.c
similarity index 100%
rename from klibc/statfs.c
rename to usr/klibc/statfs.c
diff --git a/klibc/strcasecmp.c b/usr/klibc/strcasecmp.c
similarity index 100%
rename from klibc/strcasecmp.c
rename to usr/klibc/strcasecmp.c
diff --git a/klibc/strcat.c b/usr/klibc/strcat.c
similarity index 100%
rename from klibc/strcat.c
rename to usr/klibc/strcat.c
diff --git a/klibc/strchr.c b/usr/klibc/strchr.c
similarity index 100%
rename from klibc/strchr.c
rename to usr/klibc/strchr.c
diff --git a/klibc/strcmp.c b/usr/klibc/strcmp.c
similarity index 100%
rename from klibc/strcmp.c
rename to usr/klibc/strcmp.c
diff --git a/klibc/strcpy.c b/usr/klibc/strcpy.c
similarity index 100%
rename from klibc/strcpy.c
rename to usr/klibc/strcpy.c
diff --git a/klibc/strcspn.c b/usr/klibc/strcspn.c
similarity index 100%
rename from klibc/strcspn.c
rename to usr/klibc/strcspn.c
diff --git a/klibc/strdup.c b/usr/klibc/strdup.c
similarity index 100%
rename from klibc/strdup.c
rename to usr/klibc/strdup.c
diff --git a/klibc/strerror.c b/usr/klibc/strerror.c
similarity index 100%
rename from klibc/strerror.c
rename to usr/klibc/strerror.c
diff --git a/klibc/strlcat.c b/usr/klibc/strlcat.c
similarity index 100%
rename from klibc/strlcat.c
rename to usr/klibc/strlcat.c
diff --git a/klibc/strlcpy.c b/usr/klibc/strlcpy.c
similarity index 100%
rename from klibc/strlcpy.c
rename to usr/klibc/strlcpy.c
diff --git a/klibc/strlen.c b/usr/klibc/strlen.c
similarity index 100%
rename from klibc/strlen.c
rename to usr/klibc/strlen.c
diff --git a/klibc/strncasecmp.c b/usr/klibc/strncasecmp.c
similarity index 100%
rename from klibc/strncasecmp.c
rename to usr/klibc/strncasecmp.c
diff --git a/klibc/strncat.c b/usr/klibc/strncat.c
similarity index 100%
rename from klibc/strncat.c
rename to usr/klibc/strncat.c
diff --git a/klibc/strncmp.c b/usr/klibc/strncmp.c
similarity index 100%
rename from klibc/strncmp.c
rename to usr/klibc/strncmp.c
diff --git a/klibc/strncpy.c b/usr/klibc/strncpy.c
similarity index 100%
rename from klibc/strncpy.c
rename to usr/klibc/strncpy.c
diff --git a/klibc/strndup.c b/usr/klibc/strndup.c
similarity index 100%
rename from klibc/strndup.c
rename to usr/klibc/strndup.c
diff --git a/klibc/strnlen.c b/usr/klibc/strnlen.c
similarity index 100%
rename from klibc/strnlen.c
rename to usr/klibc/strnlen.c
diff --git a/klibc/strntoimax.c b/usr/klibc/strntoimax.c
similarity index 100%
rename from klibc/strntoimax.c
rename to usr/klibc/strntoimax.c
diff --git a/klibc/strntoumax.c b/usr/klibc/strntoumax.c
similarity index 100%
rename from klibc/strntoumax.c
rename to usr/klibc/strntoumax.c
diff --git a/klibc/strpbrk.c b/usr/klibc/strpbrk.c
similarity index 100%
rename from klibc/strpbrk.c
rename to usr/klibc/strpbrk.c
diff --git a/klibc/strrchr.c b/usr/klibc/strrchr.c
similarity index 100%
rename from klibc/strrchr.c
rename to usr/klibc/strrchr.c
diff --git a/klibc/strsep.c b/usr/klibc/strsep.c
similarity index 100%
rename from klibc/strsep.c
rename to usr/klibc/strsep.c
diff --git a/klibc/strsignal.c b/usr/klibc/strsignal.c
similarity index 100%
rename from klibc/strsignal.c
rename to usr/klibc/strsignal.c
diff --git a/klibc/strspn.c b/usr/klibc/strspn.c
similarity index 100%
rename from klibc/strspn.c
rename to usr/klibc/strspn.c
diff --git a/klibc/strstr.c b/usr/klibc/strstr.c
similarity index 100%
rename from klibc/strstr.c
rename to usr/klibc/strstr.c
diff --git a/klibc/strtoimax.c b/usr/klibc/strtoimax.c
similarity index 100%
rename from klibc/strtoimax.c
rename to usr/klibc/strtoimax.c
diff --git a/klibc/strtok.c b/usr/klibc/strtok.c
similarity index 100%
rename from klibc/strtok.c
rename to usr/klibc/strtok.c
diff --git a/klibc/strtol.c b/usr/klibc/strtol.c
similarity index 100%
rename from klibc/strtol.c
rename to usr/klibc/strtol.c
diff --git a/klibc/strtoll.c b/usr/klibc/strtoll.c
similarity index 100%
rename from klibc/strtoll.c
rename to usr/klibc/strtoll.c
diff --git a/klibc/strtotimespec.c b/usr/klibc/strtotimespec.c
similarity index 100%
rename from klibc/strtotimespec.c
rename to usr/klibc/strtotimespec.c
diff --git a/klibc/strtotimeval.c b/usr/klibc/strtotimeval.c
similarity index 100%
rename from klibc/strtotimeval.c
rename to usr/klibc/strtotimeval.c
diff --git a/klibc/strtotimex.c b/usr/klibc/strtotimex.c
similarity index 100%
rename from klibc/strtotimex.c
rename to usr/klibc/strtotimex.c
diff --git a/klibc/strtoul.c b/usr/klibc/strtoul.c
similarity index 100%
rename from klibc/strtoul.c
rename to usr/klibc/strtoul.c
diff --git a/klibc/strtoull.c b/usr/klibc/strtoull.c
similarity index 100%
rename from klibc/strtoull.c
rename to usr/klibc/strtoull.c
diff --git a/klibc/strtoumax.c b/usr/klibc/strtoumax.c
similarity index 100%
rename from klibc/strtoumax.c
rename to usr/klibc/strtoumax.c
diff --git a/klibc/strtox.c b/usr/klibc/strtox.c
similarity index 100%
rename from klibc/strtox.c
rename to usr/klibc/strtox.c
diff --git a/klibc/strxspn.c b/usr/klibc/strxspn.c
similarity index 100%
rename from klibc/strxspn.c
rename to usr/klibc/strxspn.c
diff --git a/klibc/strxspn.h b/usr/klibc/strxspn.h
similarity index 100%
rename from klibc/strxspn.h
rename to usr/klibc/strxspn.h
diff --git a/klibc/syscalls.pl b/usr/klibc/syscalls.pl
similarity index 100%
rename from klibc/syscalls.pl
rename to usr/klibc/syscalls.pl
diff --git a/klibc/syscalls/Kbuild b/usr/klibc/syscalls/Kbuild
similarity index 100%
rename from klibc/syscalls/Kbuild
rename to usr/klibc/syscalls/Kbuild
diff --git a/klibc/syscommon.h b/usr/klibc/syscommon.h
similarity index 100%
rename from klibc/syscommon.h
rename to usr/klibc/syscommon.h
diff --git a/klibc/syslog.c b/usr/klibc/syslog.c
similarity index 100%
rename from klibc/syslog.c
rename to usr/klibc/syslog.c
diff --git a/klibc/system.c b/usr/klibc/system.c
similarity index 100%
rename from klibc/system.c
rename to usr/klibc/system.c
diff --git a/klibc/sysv_signal.c b/usr/klibc/sysv_signal.c
similarity index 100%
rename from klibc/sysv_signal.c
rename to usr/klibc/sysv_signal.c
diff --git a/klibc/tests/Kbuild b/usr/klibc/tests/Kbuild
similarity index 100%
rename from klibc/tests/Kbuild
rename to usr/klibc/tests/Kbuild
diff --git a/klibc/tests/environ.c b/usr/klibc/tests/environ.c
similarity index 100%
rename from klibc/tests/environ.c
rename to usr/klibc/tests/environ.c
diff --git a/klibc/tests/fcntl.c b/usr/klibc/tests/fcntl.c
similarity index 100%
rename from klibc/tests/fcntl.c
rename to usr/klibc/tests/fcntl.c
diff --git a/klibc/tests/getopttest.c b/usr/klibc/tests/getopttest.c
similarity index 100%
rename from klibc/tests/getopttest.c
rename to usr/klibc/tests/getopttest.c
diff --git a/klibc/tests/getpagesize.c b/usr/klibc/tests/getpagesize.c
similarity index 100%
rename from klibc/tests/getpagesize.c
rename to usr/klibc/tests/getpagesize.c
diff --git a/klibc/tests/hello.c b/usr/klibc/tests/hello.c
similarity index 100%
rename from klibc/tests/hello.c
rename to usr/klibc/tests/hello.c
diff --git a/klibc/tests/idtest.c b/usr/klibc/tests/idtest.c
similarity index 100%
rename from klibc/tests/idtest.c
rename to usr/klibc/tests/idtest.c
diff --git a/klibc/tests/malloctest.c b/usr/klibc/tests/malloctest.c
similarity index 100%
rename from klibc/tests/malloctest.c
rename to usr/klibc/tests/malloctest.c
diff --git a/klibc/tests/malloctest2.c b/usr/klibc/tests/malloctest2.c
similarity index 100%
rename from klibc/tests/malloctest2.c
rename to usr/klibc/tests/malloctest2.c
diff --git a/klibc/tests/memstrtest.c b/usr/klibc/tests/memstrtest.c
similarity index 100%
rename from klibc/tests/memstrtest.c
rename to usr/klibc/tests/memstrtest.c
diff --git a/klibc/tests/microhello.c b/usr/klibc/tests/microhello.c
similarity index 100%
rename from klibc/tests/microhello.c
rename to usr/klibc/tests/microhello.c
diff --git a/klibc/tests/minihello.c b/usr/klibc/tests/minihello.c
similarity index 100%
rename from klibc/tests/minihello.c
rename to usr/klibc/tests/minihello.c
diff --git a/klibc/tests/mmaptest.c b/usr/klibc/tests/mmaptest.c
similarity index 100%
rename from klibc/tests/mmaptest.c
rename to usr/klibc/tests/mmaptest.c
diff --git a/klibc/tests/nfs_no_rpc.c b/usr/klibc/tests/nfs_no_rpc.c
similarity index 100%
rename from klibc/tests/nfs_no_rpc.c
rename to usr/klibc/tests/nfs_no_rpc.c
diff --git a/klibc/tests/opentest.c b/usr/klibc/tests/opentest.c
similarity index 100%
rename from klibc/tests/opentest.c
rename to usr/klibc/tests/opentest.c
diff --git a/klibc/tests/rtsig.c b/usr/klibc/tests/rtsig.c
similarity index 100%
rename from klibc/tests/rtsig.c
rename to usr/klibc/tests/rtsig.c
diff --git a/klibc/tests/setenvtest.c b/usr/klibc/tests/setenvtest.c
similarity index 100%
rename from klibc/tests/setenvtest.c
rename to usr/klibc/tests/setenvtest.c
diff --git a/klibc/tests/setjmptest.c b/usr/klibc/tests/setjmptest.c
similarity index 100%
rename from klibc/tests/setjmptest.c
rename to usr/klibc/tests/setjmptest.c
diff --git a/klibc/tests/sigint.c b/usr/klibc/tests/sigint.c
similarity index 100%
rename from klibc/tests/sigint.c
rename to usr/klibc/tests/sigint.c
diff --git a/klibc/tests/stat.c b/usr/klibc/tests/stat.c
similarity index 100%
rename from klibc/tests/stat.c
rename to usr/klibc/tests/stat.c
diff --git a/klibc/tests/statfs.c b/usr/klibc/tests/statfs.c
similarity index 100%
rename from klibc/tests/statfs.c
rename to usr/klibc/tests/statfs.c
diff --git a/klibc/tests/strlcpycat.c b/usr/klibc/tests/strlcpycat.c
similarity index 100%
rename from klibc/tests/strlcpycat.c
rename to usr/klibc/tests/strlcpycat.c
diff --git a/klibc/tests/strtoimax.c b/usr/klibc/tests/strtoimax.c
similarity index 100%
rename from klibc/tests/strtoimax.c
rename to usr/klibc/tests/strtoimax.c
diff --git a/klibc/tests/strtotime.c b/usr/klibc/tests/strtotime.c
similarity index 100%
rename from klibc/tests/strtotime.c
rename to usr/klibc/tests/strtotime.c
diff --git a/klibc/tests/testrand48.c b/usr/klibc/tests/testrand48.c
similarity index 100%
rename from klibc/tests/testrand48.c
rename to usr/klibc/tests/testrand48.c
diff --git a/klibc/tests/testvsnp.c b/usr/klibc/tests/testvsnp.c
similarity index 100%
rename from klibc/tests/testvsnp.c
rename to usr/klibc/tests/testvsnp.c
diff --git a/klibc/time.c b/usr/klibc/time.c
similarity index 100%
rename from klibc/time.c
rename to usr/klibc/time.c
diff --git a/klibc/umount.c b/usr/klibc/umount.c
similarity index 100%
rename from klibc/umount.c
rename to usr/klibc/umount.c
diff --git a/klibc/unsetenv.c b/usr/klibc/unsetenv.c
similarity index 100%
rename from klibc/unsetenv.c
rename to usr/klibc/unsetenv.c
diff --git a/klibc/usleep.c b/usr/klibc/usleep.c
similarity index 100%
rename from klibc/usleep.c
rename to usr/klibc/usleep.c
diff --git a/klibc/utime.c b/usr/klibc/utime.c
similarity index 100%
rename from klibc/utime.c
rename to usr/klibc/utime.c
diff --git a/klibc/vasprintf.c b/usr/klibc/vasprintf.c
similarity index 100%
rename from klibc/vasprintf.c
rename to usr/klibc/vasprintf.c
diff --git a/version b/usr/klibc/version
similarity index 100%
rename from version
rename to usr/klibc/version
diff --git a/klibc/vfork.c b/usr/klibc/vfork.c
similarity index 100%
rename from klibc/vfork.c
rename to usr/klibc/vfork.c
diff --git a/klibc/vfprintf.c b/usr/klibc/vfprintf.c
similarity index 100%
rename from klibc/vfprintf.c
rename to usr/klibc/vfprintf.c
diff --git a/klibc/vprintf.c b/usr/klibc/vprintf.c
similarity index 100%
rename from klibc/vprintf.c
rename to usr/klibc/vprintf.c
diff --git a/klibc/vsnprintf.c b/usr/klibc/vsnprintf.c
similarity index 100%
rename from klibc/vsnprintf.c
rename to usr/klibc/vsnprintf.c
diff --git a/klibc/vsprintf.c b/usr/klibc/vsprintf.c
similarity index 100%
rename from klibc/vsprintf.c
rename to usr/klibc/vsprintf.c
diff --git a/klibc/vsscanf.c b/usr/klibc/vsscanf.c
similarity index 100%
rename from klibc/vsscanf.c
rename to usr/klibc/vsscanf.c
diff --git a/klibc/wait.c b/usr/klibc/wait.c
similarity index 100%
rename from klibc/wait.c
rename to usr/klibc/wait.c
diff --git a/klibc/wait3.c b/usr/klibc/wait3.c
similarity index 100%
rename from klibc/wait3.c
rename to usr/klibc/wait3.c
diff --git a/klibc/waitpid.c b/usr/klibc/waitpid.c
similarity index 100%
rename from klibc/waitpid.c
rename to usr/klibc/waitpid.c
diff --git a/klibc/zlib/FAQ b/usr/klibc/zlib/FAQ
similarity index 100%
rename from klibc/zlib/FAQ
rename to usr/klibc/zlib/FAQ
diff --git a/klibc/zlib/INDEX b/usr/klibc/zlib/INDEX
similarity index 100%
rename from klibc/zlib/INDEX
rename to usr/klibc/zlib/INDEX
diff --git a/klibc/zlib/README b/usr/klibc/zlib/README
similarity index 100%
rename from klibc/zlib/README
rename to usr/klibc/zlib/README
diff --git a/klibc/zlib/adler32.c b/usr/klibc/zlib/adler32.c
similarity index 100%
rename from klibc/zlib/adler32.c
rename to usr/klibc/zlib/adler32.c
diff --git a/klibc/zlib/algorithm.txt b/usr/klibc/zlib/algorithm.txt
similarity index 100%
rename from klibc/zlib/algorithm.txt
rename to usr/klibc/zlib/algorithm.txt
diff --git a/klibc/zlib/compress.c b/usr/klibc/zlib/compress.c
similarity index 100%
rename from klibc/zlib/compress.c
rename to usr/klibc/zlib/compress.c
diff --git a/klibc/zlib/crc32.c b/usr/klibc/zlib/crc32.c
similarity index 100%
rename from klibc/zlib/crc32.c
rename to usr/klibc/zlib/crc32.c
diff --git a/klibc/zlib/crc32.h b/usr/klibc/zlib/crc32.h
similarity index 100%
rename from klibc/zlib/crc32.h
rename to usr/klibc/zlib/crc32.h
diff --git a/klibc/zlib/deflate.c b/usr/klibc/zlib/deflate.c
similarity index 100%
rename from klibc/zlib/deflate.c
rename to usr/klibc/zlib/deflate.c
diff --git a/klibc/zlib/deflate.h b/usr/klibc/zlib/deflate.h
similarity index 100%
rename from klibc/zlib/deflate.h
rename to usr/klibc/zlib/deflate.h
diff --git a/klibc/zlib/gzio.c b/usr/klibc/zlib/gzio.c
similarity index 100%
rename from klibc/zlib/gzio.c
rename to usr/klibc/zlib/gzio.c
diff --git a/klibc/zlib/infback.c b/usr/klibc/zlib/infback.c
similarity index 100%
rename from klibc/zlib/infback.c
rename to usr/klibc/zlib/infback.c
diff --git a/klibc/zlib/inffast.c b/usr/klibc/zlib/inffast.c
similarity index 100%
rename from klibc/zlib/inffast.c
rename to usr/klibc/zlib/inffast.c
diff --git a/klibc/zlib/inffast.h b/usr/klibc/zlib/inffast.h
similarity index 100%
rename from klibc/zlib/inffast.h
rename to usr/klibc/zlib/inffast.h
diff --git a/klibc/zlib/inffixed.h b/usr/klibc/zlib/inffixed.h
similarity index 100%
rename from klibc/zlib/inffixed.h
rename to usr/klibc/zlib/inffixed.h
diff --git a/klibc/zlib/inflate.c b/usr/klibc/zlib/inflate.c
similarity index 100%
rename from klibc/zlib/inflate.c
rename to usr/klibc/zlib/inflate.c
diff --git a/klibc/zlib/inflate.h b/usr/klibc/zlib/inflate.h
similarity index 100%
rename from klibc/zlib/inflate.h
rename to usr/klibc/zlib/inflate.h
diff --git a/klibc/zlib/inftrees.c b/usr/klibc/zlib/inftrees.c
similarity index 100%
rename from klibc/zlib/inftrees.c
rename to usr/klibc/zlib/inftrees.c
diff --git a/klibc/zlib/inftrees.h b/usr/klibc/zlib/inftrees.h
similarity index 100%
rename from klibc/zlib/inftrees.h
rename to usr/klibc/zlib/inftrees.h
diff --git a/klibc/zlib/trees.c b/usr/klibc/zlib/trees.c
similarity index 100%
rename from klibc/zlib/trees.c
rename to usr/klibc/zlib/trees.c
diff --git a/klibc/zlib/trees.h b/usr/klibc/zlib/trees.h
similarity index 100%
rename from klibc/zlib/trees.h
rename to usr/klibc/zlib/trees.h
diff --git a/klibc/zlib/uncompr.c b/usr/klibc/zlib/uncompr.c
similarity index 100%
rename from klibc/zlib/uncompr.c
rename to usr/klibc/zlib/uncompr.c
diff --git a/klibc/zlib/zconf.h b/usr/klibc/zlib/zconf.h
similarity index 100%
rename from klibc/zlib/zconf.h
rename to usr/klibc/zlib/zconf.h
diff --git a/klibc/zlib/zconf.in.h b/usr/klibc/zlib/zconf.in.h
similarity index 100%
rename from klibc/zlib/zconf.in.h
rename to usr/klibc/zlib/zconf.in.h
diff --git a/klibc/zlib/zlib.3 b/usr/klibc/zlib/zlib.3
similarity index 100%
rename from klibc/zlib/zlib.3
rename to usr/klibc/zlib/zlib.3
diff --git a/klibc/zlib/zlib.h b/usr/klibc/zlib/zlib.h
similarity index 100%
rename from klibc/zlib/zlib.h
rename to usr/klibc/zlib/zlib.h
diff --git a/klibc/zlib/zutil.c b/usr/klibc/zlib/zutil.c
similarity index 100%
rename from klibc/zlib/zutil.c
rename to usr/klibc/zlib/zutil.c
diff --git a/klibc/zlib/zutil.h b/usr/klibc/zlib/zutil.h
similarity index 100%
rename from klibc/zlib/zutil.h
rename to usr/klibc/zlib/zutil.h
diff --git a/utils/Kbuild b/usr/utils/Kbuild
similarity index 100%
rename from utils/Kbuild
rename to usr/utils/Kbuild
diff --git a/utils/cat.c b/usr/utils/cat.c
similarity index 100%
rename from utils/cat.c
rename to usr/utils/cat.c
diff --git a/utils/chroot.c b/usr/utils/chroot.c
similarity index 100%
rename from utils/chroot.c
rename to usr/utils/chroot.c
diff --git a/utils/dd.c b/usr/utils/dd.c
similarity index 100%
rename from utils/dd.c
rename to usr/utils/dd.c
diff --git a/utils/false.c b/usr/utils/false.c
similarity index 100%
rename from utils/false.c
rename to usr/utils/false.c
diff --git a/utils/file_mode.c b/usr/utils/file_mode.c
similarity index 100%
rename from utils/file_mode.c
rename to usr/utils/file_mode.c
diff --git a/utils/file_mode.h b/usr/utils/file_mode.h
similarity index 100%
rename from utils/file_mode.h
rename to usr/utils/file_mode.h
diff --git a/utils/insmod.c b/usr/utils/insmod.c
similarity index 100%
rename from utils/insmod.c
rename to usr/utils/insmod.c
diff --git a/utils/ln.c b/usr/utils/ln.c
similarity index 100%
rename from utils/ln.c
rename to usr/utils/ln.c
diff --git a/utils/minips.c b/usr/utils/minips.c
similarity index 100%
rename from utils/minips.c
rename to usr/utils/minips.c
diff --git a/utils/mkdir.c b/usr/utils/mkdir.c
similarity index 100%
rename from utils/mkdir.c
rename to usr/utils/mkdir.c
diff --git a/utils/mkfifo.c b/usr/utils/mkfifo.c
similarity index 100%
rename from utils/mkfifo.c
rename to usr/utils/mkfifo.c
diff --git a/utils/mount_main.c b/usr/utils/mount_main.c
similarity index 100%
rename from utils/mount_main.c
rename to usr/utils/mount_main.c
diff --git a/utils/mount_opts.c b/usr/utils/mount_opts.c
similarity index 100%
rename from utils/mount_opts.c
rename to usr/utils/mount_opts.c
diff --git a/utils/mount_opts.h b/usr/utils/mount_opts.h
similarity index 100%
rename from utils/mount_opts.h
rename to usr/utils/mount_opts.h
diff --git a/utils/nuke.c b/usr/utils/nuke.c
similarity index 100%
rename from utils/nuke.c
rename to usr/utils/nuke.c
diff --git a/utils/pivot_root.c b/usr/utils/pivot_root.c
similarity index 100%
rename from utils/pivot_root.c
rename to usr/utils/pivot_root.c
diff --git a/utils/sleep.c b/usr/utils/sleep.c
similarity index 100%
rename from utils/sleep.c
rename to usr/utils/sleep.c
diff --git a/utils/true.c b/usr/utils/true.c
similarity index 100%
rename from utils/true.c
rename to usr/utils/true.c
diff --git a/utils/umount.c b/usr/utils/umount.c
similarity index 100%
rename from utils/umount.c
rename to usr/utils/umount.c
diff --git a/utils/uname.c b/usr/utils/uname.c
similarity index 100%
rename from utils/uname.c
rename to usr/utils/uname.c
