diff --git a/drivers/Makefile b/drivers/Makefile
index ce80133b4c9c453d1495577fee420843faceaed0..7c46280c52e41bb4c375ca9fd8fe3e6003eb9856 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # drivers/Makefile
 #
-#   Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -114,7 +114,7 @@ COBJS		= $(CSRCS:.c=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS)
 OBJS		= $(AOBJS) $(COBJS)
 
-BIN		= libdrivers$(LIBEXT)
+BIN			= libdrivers$(LIBEXT)
 
 VPATH		= serial:net:pipes:usbdev:usbhost:mmcsd:lcd:bch:mtd
 
diff --git a/include/string.h b/include/string.h
index 4aa5a48dcab0d3edaac4d9f1b8b4f0b7a0fa5962..7d7dc21d4c5b19cb57c961a082549efb393e36d9 100644
--- a/include/string.h
+++ b/include/string.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * include/string.h
  *
- *   Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/Makefile b/lib/Makefile
index a3a0c61811fd5b93a93390b8bef58704575b5eb1..c7cf965a6c2e14d7f94bddbb7d1c0fb7c36dcd37 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # lib/Makefile
 #
-#   Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -34,27 +34,19 @@
 ###########################################################################
 
 -include $(TOPDIR)/Make.defs
+include string/Make.defs
 
-ASRCS		= 
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
+ASRCS = 
+AOBJS = $(ASRCS:.S=$(OBJEXT))
 
-MISC_SRCS	= lib_init.c lib_filesem.c
+MISC_SRCS = lib_init.c lib_filesem.c
 ifneq ($(CONFIG_NFILE_STREAMS),0)
-MISC_SRCS	+= lib_streamsem.c
+MISC_SRCS += lib_streamsem.c
 endif
 
-STRING_SRCS	= lib_checkbase.c lib_isbasedigit.c lib_memset.c lib_memcpy.c \
-		  lib_memcmp.c lib_memmove.c lib_skipspace.c lib_strcasecmp.c  \
-		  lib_strcat.c lib_strchr.c lib_strcpy.c lib_strcmp.c lib_strcspn.c \
-		  lib_strdup.c lib_strerror.c lib_strlen.c lib_strnlen.c \
-		  lib_strncasecmp.c lib_strncat.c lib_strncmp.c lib_strncpy.c \
-		  lib_strpbrk.c lib_strrchr.c  lib_strspn.c lib_strstr.c lib_strtok.c \
-		  lib_strtokr.c lib_strtol.c lib_strtoll.c lib_strtoul.c \
-		  lib_strtoull.c lib_strtod.c
+CTYPE_SRCS = 
 
-CTYPE_SRCS	= 
-
-STDIO_SRCS	= lib_fileno.c lib_printf.c lib_rawprintf.c lib_lowprintf.c \
+STDIO_SRCS = lib_fileno.c lib_printf.c lib_rawprintf.c lib_lowprintf.c \
 		  lib_sprintf.c lib_snprintf.c lib_libsprintf.c lib_vsprintf.c \
 		  lib_vsnprintf.c lib_libvsprintf.c lib_meminstream.c \
 		  lib_memoutstream.c lib_lowinstream.c lib_lowoutstream.c \
@@ -62,9 +54,9 @@ STDIO_SRCS	= lib_fileno.c lib_printf.c lib_rawprintf.c lib_lowprintf.c \
 		  lib_sscanf.c
 
 ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
-STDIO_SRCS	+= lib_rawinstream.c lib_rawoutstream.c
+STDIO_SRCS += lib_rawinstream.c lib_rawoutstream.c
 ifneq ($(CONFIG_NFILE_STREAMS),0)
-STDIO_SRCS	+= lib_fopen.c lib_fclose.c lib_fread.c lib_libfread.c lib_fseek.c \
+STDIO_SRCS += lib_fopen.c lib_fclose.c lib_fread.c lib_libfread.c lib_fseek.c \
 		   lib_ftell.c lib_fsetpos.c lib_fgetpos.c lib_fgetc.c lib_fgets.c \
 		   lib_gets.c lib_fwrite.c lib_libfwrite.c lib_fflush.c \
 		   lib_libflushall.c lib_libfflush.c lib_rdflush.c lib_wrflush.c \
@@ -73,50 +65,54 @@ STDIO_SRCS	+= lib_fopen.c lib_fclose.c lib_fread.c lib_libfread.c lib_fseek.c \
 endif
 endif
 ifeq ($(CONFIG_LIBC_FLOATINGPOINT),y)
-STDIO_SRCS	+= lib_dtoa.c
+STDIO_SRCS += lib_dtoa.c
 endif
 
-STDLIB_SRCS	= lib_abs.c lib_imaxabs.c lib_labs.c lib_llabs.c lib_rand.c lib_qsort.c
+STDLIB_SRCS = lib_abs.c lib_imaxabs.c lib_labs.c lib_llabs.c lib_rand.c lib_qsort.c
 
-MATH_SRCS	= lib_rint.c lib_fixedmath.c lib_b16sin.c lib_b16cos.c
+MATH_SRCS = lib_rint.c lib_fixedmath.c lib_b16sin.c lib_b16cos.c
 
-UNISTD_SRCS	= lib_getopt.c lib_getoptargp.c lib_getoptindp.c lib_getoptoptp.c
+UNISTD_SRCS = lib_getopt.c lib_getoptargp.c lib_getoptindp.c lib_getoptoptp.c
 ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
 ifneq ($(CONFIG_DISABLE_ENVIRON),y)
-UNISTD_SRCS	+=  lib_chdir.c lib_getcwd.c
+UNISTD_SRCS +=  lib_chdir.c lib_getcwd.c
 endif
 endif
 
-TIME_SRCS	= lib_mktime.c lib_gmtime.c lib_gmtimer.c lib_strftime.c \
+TIME_SRCS = lib_mktime.c lib_gmtime.c lib_gmtimer.c lib_strftime.c \
 		  lib_calendar2utc.c lib_daysbeforemonth.c lib_isleapyear.c
 
-NET_SRCS	= lib_htons.c lib_htonl.c lib_inetntoa.c lib_etherntoa.c
+NET_SRCS = lib_htons.c lib_htonl.c lib_inetntoa.c lib_etherntoa.c
 
-LIBGEN_SRCS	= lib_basename.c lib_dirname.c
+LIBGEN_SRCS = lib_basename.c lib_dirname.c
 
-REGEX_SRCS	= lib_match.c
+REGEX_SRCS = lib_match.c
 
-CRC_SRCS	= lib_crc32.c
+CRC_SRCS = lib_crc32.c
 
-SQ_SRCS		= sq_addlast.c sq_addfirst.c sq_addafter.c \
+SQ_SRCS = sq_addlast.c sq_addfirst.c sq_addafter.c \
 		  sq_rem.c sq_remlast.c sq_remfirst.c sq_remafter.c
 
-DQ_SRCS		= dq_addlast.c dq_addfirst.c dq_addafter.c dq_addbefore.c \
+DQ_SRCS = dq_addlast.c dq_addfirst.c dq_addafter.c dq_addbefore.c \
 		  dq_rem.c dq_remlast.c dq_remfirst.c
 
-DBG_SRCS	= lib_dbg.c lib_dumpbuffer.c
+DBG_SRCS = lib_dbg.c lib_dumpbuffer.c
 
-CSRCS		= $(MISC_SRCS) $(STRING_SRCS) $(CTYPE_SRCS) $(STDIO_SRCS) $(STDLIB_SRCS) \
+CSRCS = $(MISC_SRCS) $(STRING_SRCS) $(CTYPE_SRCS) $(STDIO_SRCS) $(STDLIB_SRCS) \
 		  $(MATH_SRCS) $(UNISTD_SRCS) $(TIME_SRCS) $(NET_SRCS) $(LIBGEN_SRCS) \
 		  $(REGEX_SRCS) $(CRC_SRCS) $(SQ_SRCS) $(DQ_SRCS) $(DBG_SRCS) 
-COBJS		= $(CSRCS:.c=$(OBJEXT))
+COBJS = $(CSRCS:.c=$(OBJEXT))
+
+SRCS = $(ASRCS) $(CSRCS)
+OBJS = $(AOBJS) $(COBJS)
 
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
+ROOTDEPPATH	= --dep-path .
+STRINGDEPPATH = --dep-path string
+VPATH = string
 
-BIN		= liblib$(LIBEXT)
+BIN = liblib$(LIBEXT)
 
-all:	$(BIN)
+all: $(BIN)
 
 $(AOBJS): %$(OBJEXT): %.S
 	$(call ASSEMBLE, $<, $@)
@@ -130,7 +126,8 @@ $(BIN):	$(OBJS)
 	done ; )
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) $(STRINGDEPPATH) \
+	  $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@
 
 depend: .depend
diff --git a/lib/string/Make.defs b/lib/string/Make.defs
new file mode 100644
index 0000000000000000000000000000000000000000..c8f5b05f34e767ab489bfed229644acbe917a59a
--- /dev/null
+++ b/lib/string/Make.defs
@@ -0,0 +1,43 @@
+############################################################################
+# lib/string/Make.defs
+#
+#   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+STRING_SRCS	= lib_checkbase.c lib_isbasedigit.c lib_memset.c lib_memcpy.c \
+		  lib_memcmp.c lib_memmove.c lib_skipspace.c lib_strcasecmp.c  \
+		  lib_strcat.c lib_strchr.c lib_strcpy.c lib_strcmp.c lib_strcspn.c \
+		  lib_strdup.c lib_strerror.c lib_strlen.c lib_strnlen.c \
+		  lib_strncasecmp.c lib_strncat.c lib_strncmp.c lib_strncpy.c \
+		  lib_strpbrk.c lib_strrchr.c  lib_strspn.c lib_strstr.c lib_strtok.c \
+		  lib_strtokr.c lib_strtol.c lib_strtoll.c lib_strtoul.c \
+		  lib_strtoull.c lib_strtod.c
diff --git a/lib/lib_checkbase.c b/lib/string/lib_checkbase.c
similarity index 97%
rename from lib/lib_checkbase.c
rename to lib/string/lib_checkbase.c
index ed2654b1f4cdf7535a17aaf8c3f25cbf68b61b80..bec131b5c71733b21279efc92cb2c5bbeb99dc28 100644
--- a/lib/lib_checkbase.c
+++ b/lib/string/lib_checkbase.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_checkbase.c
+ * lib/string/lib_checkbase.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_isbasedigit.c b/lib/string/lib_isbasedigit.c
similarity index 97%
rename from lib/lib_isbasedigit.c
rename to lib/string/lib_isbasedigit.c
index adc8dfd3255251a1e464009b048e324d40002c78..26426e8213e5141c247a056a04b85f148ac8d049 100644
--- a/lib/lib_isbasedigit.c
+++ b/lib/string/lib_isbasedigit.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_isbasedigit.c
+ * lib/string/lib_isbasedigit.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_memcmp.c b/lib/string/lib_memcmp.c
similarity index 96%
rename from lib/lib_memcmp.c
rename to lib/string/lib_memcmp.c
index 3dee4f0c7c97fe156675d79d4bc3cb2edc06bb47..cd874a85e499c9bd46418ba88a4336646502dbc8 100644
--- a/lib/lib_memcmp.c
+++ b/lib/string/lib_memcmp.c
@@ -1,7 +1,7 @@
 /************************************************************
- * lib_memcmp.c
+ * lib/string/lib_memcmp.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_memcpy.c b/lib/string/lib_memcpy.c
similarity index 96%
rename from lib/lib_memcpy.c
rename to lib/string/lib_memcpy.c
index b9445214df0e463740b648c37571a21bae94d2d6..745bafe98a3f86657b3ac7fe91bdaff99a632bcb 100644
--- a/lib/lib_memcpy.c
+++ b/lib/string/lib_memcpy.c
@@ -1,7 +1,7 @@
 /************************************************************
- * lib_memcpy.c
+ * lib/string/lib_memcpy.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_memmove.c b/lib/string/lib_memmove.c
similarity index 96%
rename from lib/lib_memmove.c
rename to lib/string/lib_memmove.c
index 564f9cdbe0f11e6dcc4b9af3c12c4ff24f48667f..97bac99ed9078b6f1dab0935a95a7de03fc58990 100644
--- a/lib/lib_memmove.c
+++ b/lib/string/lib_memmove.c
@@ -1,7 +1,7 @@
 /************************************************************
- * lib_memmove.c
+ * lib/string/lib_memmove.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_memset.c b/lib/string/lib_memset.c
similarity index 96%
rename from lib/lib_memset.c
rename to lib/string/lib_memset.c
index 6b197460b5f9352e2c9751341cd83c40443c4f4e..f3a5497a9aee6e9db0d39f3bdb583f4d469e7b8c 100644
--- a/lib/lib_memset.c
+++ b/lib/string/lib_memset.c
@@ -1,7 +1,7 @@
 /************************************************************
- * lib_memset.c
+ * lib/string/lib_memset.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_skipspace.c b/lib/string/lib_skipspace.c
similarity index 96%
rename from lib/lib_skipspace.c
rename to lib/string/lib_skipspace.c
index bfd4d14fecd708f2c952d192f680f67ce4b231b1..826559efedb4c8b28c4b770f8b927ecf4b3219ad 100644
--- a/lib/lib_skipspace.c
+++ b/lib/string/lib_skipspace.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_skipspace.c
+ * lib/string/lib_skipspace.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_strcasecmp.c b/lib/string/lib_strcasecmp.c
similarity index 95%
rename from lib/lib_strcasecmp.c
rename to lib/string/lib_strcasecmp.c
index cb4585b5b1efbdae504dbb3dc7b779542d6b2759..ed5217831f4399ff6ff73fe8ed2a73516682939b 100644
--- a/lib/lib_strcasecmp.c
+++ b/lib/string/lib_strcasecmp.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_strcasecmp.c
+ * lib/string/lib_strcasecmp.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_strcat.c b/lib/string/lib_strcat.c
similarity index 93%
rename from lib/lib_strcat.c
rename to lib/string/lib_strcat.c
index e1104f4d4a1de8c8021ee270693706cd6cc77e07..2d12dd5a64849b63456b194ac740067d80a1af19 100644
--- a/lib/lib_strcat.c
+++ b/lib/string/lib_strcat.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_strcat.c
+ * lib/string/lib_strcat.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_strchr.c b/lib/string/lib_strchr.c
similarity index 96%
rename from lib/lib_strchr.c
rename to lib/string/lib_strchr.c
index 86a44530b3a0e0fb088372f6affb7282d0e39a62..1086f128d00030bcf4e596a08e3454f20c15dd90 100644
--- a/lib/lib_strchr.c
+++ b/lib/string/lib_strchr.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_strchr.c
+ * lib/string/lib_strchr.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_strcmp.c b/lib/string/lib_strcmp.c
similarity index 96%
rename from lib/lib_strcmp.c
rename to lib/string/lib_strcmp.c
index fd384926fdf235dd4db9e911af29883b3263d22d..1d78cb0495434a90d897f46003e85b7de796a313 100644
--- a/lib/lib_strcmp.c
+++ b/lib/string/lib_strcmp.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_strcmp.c
+ * lib/string/lib_strcmp.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_strcpy.c b/lib/string/lib_strcpy.c
similarity index 95%
rename from lib/lib_strcpy.c
rename to lib/string/lib_strcpy.c
index 10ef6918f13ca9fed6002771a91bdce2c99bd168..774e155347ec4c2506b62c4e42c248e72313264c 100644
--- a/lib/lib_strcpy.c
+++ b/lib/string/lib_strcpy.c
@@ -1,7 +1,7 @@
 /************************************************************************
- * lib/lib_strcpy.c
+ * lib/string/lib_strcpy.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_strcspn.c b/lib/string/lib_strcspn.c
similarity index 96%
rename from lib/lib_strcspn.c
rename to lib/string/lib_strcspn.c
index 1aa7c8ceb2900e96c1be369777f5a9eb4ddbe0f8..b28f223431a4750a03f12c4cd8b7799da02eaf48 100644
--- a/lib/lib_strcspn.c
+++ b/lib/string/lib_strcspn.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib_strcspn.c
+ * lib/string/lib_strcspn.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_strdup.c b/lib/string/lib_strdup.c
similarity index 95%
rename from lib/lib_strdup.c
rename to lib/string/lib_strdup.c
index 2bb9dbc9de5a56f95accc25a17850e3b38b99907..04ecaffbe1ed98f4f8847b744ff0db82444c409f 100644
--- a/lib/lib_strdup.c
+++ b/lib/string/lib_strdup.c
@@ -1,7 +1,7 @@
 /************************************************************************
- * lib/lib_strdup.c
+ * lib/string//lib_strdup.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_strerror.c b/lib/string/lib_strerror.c
similarity index 98%
rename from lib/lib_strerror.c
rename to lib/string/lib_strerror.c
index 4a3c891a138d02d076255ddedc6f2d0372b0cb19..61538952def27c935d32dfb220351deaa3a4a32b 100644
--- a/lib/lib_strerror.c
+++ b/lib/string/lib_strerror.c
@@ -1,7 +1,7 @@
 /************************************************************************
- * lib/lib_strerror.c
+ * lib/string/lib_strerror.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_strlen.c b/lib/string/lib_strlen.c
similarity index 95%
rename from lib/lib_strlen.c
rename to lib/string/lib_strlen.c
index 9c829c61f42fa5ce7940bfeddc6cca598c0e017a..ee964c1371506851de6345d8db32f6b4579186e6 100644
--- a/lib/lib_strlen.c
+++ b/lib/string/lib_strlen.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_strlen.c
+ * lib/string/lib_strlen.c
  *
- *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_strncasecmp.c b/lib/string/lib_strncasecmp.c
similarity index 96%
rename from lib/lib_strncasecmp.c
rename to lib/string/lib_strncasecmp.c
index fc8bf7b72f1c1ab20afadf34e5bafdb0cb86ba4e..78b18a3fb856fb9fa44b9782b199846bd931317e 100644
--- a/lib/lib_strncasecmp.c
+++ b/lib/string/lib_strncasecmp.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_strncasecmp.c
+ * lib/string/lib_strncasecmp.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_strncat.c b/lib/string/lib_strncat.c
similarity index 96%
rename from lib/lib_strncat.c
rename to lib/string/lib_strncat.c
index 6cb91ff413bde655856c39a0f0697fc63437417b..6b7d54f8166f5351efcb481b44e247c1b6a285d9 100644
--- a/lib/lib_strncat.c
+++ b/lib/string/lib_strncat.c
@@ -1,7 +1,7 @@
 /************************************************************
- * lib/lib_strncat.c
+ * lib/string/lib_strncat.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_strncmp.c b/lib/string/lib_strncmp.c
similarity index 100%
rename from lib/lib_strncmp.c
rename to lib/string/lib_strncmp.c
diff --git a/lib/lib_strncpy.c b/lib/string/lib_strncpy.c
similarity index 96%
rename from lib/lib_strncpy.c
rename to lib/string/lib_strncpy.c
index c612cacb1544bd835da9953273a847c451d3440c..b5702cae21840369fdf75c37edddcdd73d72472d 100644
--- a/lib/lib_strncpy.c
+++ b/lib/string/lib_strncpy.c
@@ -1,7 +1,7 @@
 /************************************************************
- * lib_strncpy.c
+ * lib/string/lib_strncpy.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_strnlen.c b/lib/string/lib_strnlen.c
similarity index 98%
rename from lib/lib_strnlen.c
rename to lib/string/lib_strnlen.c
index f6624a64f62b0610a38a5426192ee0ed7d6d4d0a..c2ffc248e62a909426a6304bb2c8ec16ebd1e721 100644
--- a/lib/lib_strnlen.c
+++ b/lib/string/lib_strnlen.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * lib/lib_strnlen.c
+ * lib/string/lib_strnlen.c
  *
  * This file is part of NuttX, contributed by Michael Hrabanek
  *
diff --git a/lib/lib_strpbrk.c b/lib/string/lib_strpbrk.c
similarity index 96%
rename from lib/lib_strpbrk.c
rename to lib/string/lib_strpbrk.c
index e429bb07971ce56e0b0d85abb02a120da07cc7c5..134058775031f447977ca6be18e68787b66ab963 100644
--- a/lib/lib_strpbrk.c
+++ b/lib/string/lib_strpbrk.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_strpbrk.pcs
+ * lib/string/lib_strpbrk.c
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use str source and binary forms, with or without
diff --git a/lib/lib_strrchr.c b/lib/string/lib_strrchr.c
similarity index 96%
rename from lib/lib_strrchr.c
rename to lib/string/lib_strrchr.c
index fcec61efeabcf803e6116359591e47c7f2931b7f..c80542341aa26a5f538a932bc2847b6fe7c30e94 100644
--- a/lib/lib_strrchr.c
+++ b/lib/string/lib_strrchr.c
@@ -1,7 +1,7 @@
 /************************************************************************
- * lib/lib_strrchr.c
+ * lib/string/lib_strrchr.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_strspn.c b/lib/string/lib_strspn.c
similarity index 96%
rename from lib/lib_strspn.c
rename to lib/string/lib_strspn.c
index 2e72cc4c73768c90f87a62d7e7d68cee38a4bfa1..e5cab9ad6574d6c27623d221ad457ec65f21b546 100644
--- a/lib/lib_strspn.c
+++ b/lib/string/lib_strspn.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib_strspn.c
+ * lib/string/lib_strspn.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_strstr.c b/lib/string/lib_strstr.c
similarity index 97%
rename from lib/lib_strstr.c
rename to lib/string/lib_strstr.c
index 6db0da642ca3c47a0ac249dc8a400c7203463a78..27ca6e19bbdfa2aecb0061f73f5fd3849312acf2 100644
--- a/lib/lib_strstr.c
+++ b/lib/string/lib_strstr.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_strstr.c
+ * lib/string/lib_strstr.c
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use str source and binary forms, with or without
diff --git a/lib/lib_strtod.c b/lib/string/lib_strtod.c
similarity index 97%
rename from lib/lib_strtod.c
rename to lib/string/lib_strtod.c
index 777eb6dedcde2cfbadba61bf44471ca9193a9501..26480f9255dc9bef0cc9aa066054eec0d8ba2638 100755
--- a/lib/lib_strtod.c
+++ b/lib/string/lib_strtod.c
@@ -1,10 +1,9 @@
 /****************************************************************************
- * lib/lib_strtod.c
- *
+ * lib/string/lib_strtod.c
  * Convert string to double
  *
- * Copyright (C) 2002 Michael Ringgaard. All rights reserved.
- * Copyright (C) 2006-2007 H. Peter Anvin.
+ *   Copyright (C) 2002 Michael Ringgaard. All rights reserved.
+ *   Copyright (C) 2006-2007 H. Peter Anvin.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/lib/lib_strtok.c b/lib/string/lib_strtok.c
similarity index 97%
rename from lib/lib_strtok.c
rename to lib/string/lib_strtok.c
index 5a15eb70158ad2fe5b8704481aa6d1ab5b3c45d9..bafa94853e83f6b4a698529121701b24c06131bc 100644
--- a/lib/lib_strtok.c
+++ b/lib/string/lib_strtok.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib_strtok.c
+ * lib/string/lib_strtok.c
  *
- *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_strtokr.c b/lib/string/lib_strtokr.c
similarity index 98%
rename from lib/lib_strtokr.c
rename to lib/string/lib_strtokr.c
index 3183acc0096f35f7e2320cad8aea35cd2fa718f7..366a31819878668a118cb8e94322f70a3bbc132f 100644
--- a/lib/lib_strtokr.c
+++ b/lib/string/lib_strtokr.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib_strtokr.c
+ * lib/string/lib_strtokr.c
  *
- *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_strtol.c b/lib/string/lib_strtol.c
similarity index 97%
rename from lib/lib_strtol.c
rename to lib/string/lib_strtol.c
index b07bd9973c1c8b5e4228a44df7366832e813c54b..4f69047934bfce12d19c8690204b8f8924eb0c14 100644
--- a/lib/lib_strtol.c
+++ b/lib/string/lib_strtol.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_strtol.c
+ * lib/string/lib_strtol.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_strtoll.c b/lib/string/lib_strtoll.c
similarity index 97%
rename from lib/lib_strtoll.c
rename to lib/string/lib_strtoll.c
index 8ddc6afe2f9c0524677d74ca85a3a526ee96e038..9c730b43102e8630820ab43d9109ea435940c20a 100644
--- a/lib/lib_strtoll.c
+++ b/lib/string/lib_strtoll.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib_strtoll.c
+ * lib/string/lib_strtoll.c
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_strtoul.c b/lib/string/lib_strtoul.c
similarity index 97%
rename from lib/lib_strtoul.c
rename to lib/string/lib_strtoul.c
index ba88139adc3b4c9b21eb2a2ad17e020fe52bf1fc..2aacc7cea85d2fb5f61ab0c25ad7b5b01c3bbbd7 100644
--- a/lib/lib_strtoul.c
+++ b/lib/string/lib_strtoul.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_strtoul.c
+ * /lib/string/lib_strtoul.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_strtoull.c b/lib/string/lib_strtoull.c
similarity index 97%
rename from lib/lib_strtoull.c
rename to lib/string/lib_strtoull.c
index f84bf7e11b479160f018b599d03877e409fa453d..334162148125463cbb0d7803091bb1d1fa8d9259 100644
--- a/lib/lib_strtoull.c
+++ b/lib/string/lib_strtoull.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_strtoull.c
+ * /lib/string/lib_strtoull.c
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without