diff --git a/lib/libc/stdtime/asctime.c b/libc/stdtime/asctime.c
similarity index 100%
rename from lib/libc/stdtime/asctime.c
rename to libc/stdtime/asctime.c
diff --git a/lib/libc/stdtime/difftime.c b/libc/stdtime/difftime.c
similarity index 100%
rename from lib/libc/stdtime/difftime.c
rename to libc/stdtime/difftime.c
diff --git a/lib/libc/stdtime/localtime.c b/libc/stdtime/localtime.c
similarity index 100%
rename from lib/libc/stdtime/localtime.c
rename to libc/stdtime/localtime.c
diff --git a/lib/libc/stdtime/private.h b/libc/stdtime/private.h
similarity index 100%
rename from lib/libc/stdtime/private.h
rename to libc/stdtime/private.h
diff --git a/lib/libc/stdtime/strftime.c b/libc/stdtime/strftime.c
similarity index 100%
rename from lib/libc/stdtime/strftime.c
rename to libc/stdtime/strftime.c
diff --git a/lib/libc/stdtime/time2posix.3 b/libc/stdtime/time2posix.3
similarity index 100%
rename from lib/libc/stdtime/time2posix.3
rename to libc/stdtime/time2posix.3
diff --git a/lib/libc/stdtime/tzfile.5 b/libc/stdtime/tzfile.5
similarity index 100%
rename from lib/libc/stdtime/tzfile.5
rename to libc/stdtime/tzfile.5
diff --git a/lib/libc/stdtime/tzfile.h b/libc/stdtime/tzfile.h
similarity index 100%
rename from lib/libc/stdtime/tzfile.h
rename to libc/stdtime/tzfile.h
diff --git a/usr.sbin/zic/Makefile b/zic/Makefile
similarity index 100%
rename from usr.sbin/zic/Makefile
rename to zic/Makefile
diff --git a/usr.sbin/zic/Music b/zic/Music
similarity index 100%
rename from usr.sbin/zic/Music
rename to zic/Music
diff --git a/usr.sbin/zic/README b/zic/README
similarity index 100%
rename from usr.sbin/zic/README
rename to zic/README
diff --git a/usr.sbin/zic/Theory b/zic/Theory
similarity index 100%
rename from usr.sbin/zic/Theory
rename to zic/Theory
diff --git a/usr.sbin/zic/WWW b/zic/WWW
similarity index 100%
rename from usr.sbin/zic/WWW
rename to zic/WWW
diff --git a/usr.sbin/zic/ialloc.c b/zic/ialloc.c
similarity index 100%
rename from usr.sbin/zic/ialloc.c
rename to zic/ialloc.c
diff --git a/usr.sbin/zic/private.h b/zic/private.h
similarity index 100%
rename from usr.sbin/zic/private.h
rename to zic/private.h
diff --git a/usr.sbin/zic/scheck.c b/zic/scheck.c
similarity index 100%
rename from usr.sbin/zic/scheck.c
rename to zic/scheck.c
diff --git a/usr.sbin/zic/tz-art.htm b/zic/tz-art.htm
similarity index 100%
rename from usr.sbin/zic/tz-art.htm
rename to zic/tz-art.htm
diff --git a/usr.sbin/zic/tz-link.htm b/zic/tz-link.htm
similarity index 100%
rename from usr.sbin/zic/tz-link.htm
rename to zic/tz-link.htm
diff --git a/usr.sbin/zic/zdump.8 b/zic/zdump.8
similarity index 100%
rename from usr.sbin/zic/zdump.8
rename to zic/zdump.8
diff --git a/usr.sbin/zic/zdump.c b/zic/zdump.c
similarity index 100%
rename from usr.sbin/zic/zdump.c
rename to zic/zdump.c
diff --git a/usr.sbin/zic/zic.8 b/zic/zic.8
similarity index 100%
rename from usr.sbin/zic/zic.8
rename to zic/zic.8
diff --git a/usr.sbin/zic/zic.c b/zic/zic.c
similarity index 100%
rename from usr.sbin/zic/zic.c
rename to zic/zic.c