diff --git a/extra/serial/authors.txt b/extra/io/serial/authors.txt
similarity index 100%
rename from extra/serial/authors.txt
rename to extra/io/serial/authors.txt
diff --git a/extra/serial/serial.factor b/extra/io/serial/serial.factor
similarity index 75%
rename from extra/serial/serial.factor
rename to extra/io/serial/serial.factor
index 96900fb6e4..f7324acd05 100644
--- a/extra/serial/serial.factor
+++ b/extra/io/serial/serial.factor
@@ -3,22 +3,21 @@
 USING: accessors alien.c-types assocs combinators destructors
 kernel math math.bitwise math.parser sequences summary system
 vocabs.loader ;
-IN: serial
+IN: io.serial
 
 TUPLE: serial stream path baud 
     termios iflag oflag cflag lflag ;
 
 ERROR: invalid-baud baud ;
 M: invalid-baud summary ( invalid-baud -- string )
-    "Baud rate "
-    swap baud>> number>string
-    " not supported" 3append ;
+    baud>> number>string
+    "Baud rate " " not supported" surround ;
 
 HOOK: lookup-baud os ( m -- n )
 HOOK: open-serial os ( serial -- serial' )
 M: serial dispose ( serial -- ) stream>> dispose ;
 
 {
-    { [ os unix? ] [ "serial.unix" ] } 
-    { [ os windows? ] [ "serial.windows" ] }
+    { [ os unix? ] [ "io.serial.unix" ] } 
+    { [ os windows? ] [ "io.serial.windows" ] }
 } cond require
diff --git a/extra/serial/summary.txt b/extra/io/serial/summary.txt
similarity index 100%
rename from extra/serial/summary.txt
rename to extra/io/serial/summary.txt
diff --git a/extra/serial/tags.txt b/extra/io/serial/tags.txt
similarity index 100%
rename from extra/serial/tags.txt
rename to extra/io/serial/tags.txt
diff --git a/extra/serial/unix/bsd/bsd.factor b/extra/io/serial/unix/bsd/bsd.factor
similarity index 96%
rename from extra/serial/unix/bsd/bsd.factor
rename to extra/io/serial/unix/bsd/bsd.factor
index 22886ecb15..dbb013aca0 100644
--- a/extra/serial/unix/bsd/bsd.factor
+++ b/extra/io/serial/unix/bsd/bsd.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.syntax kernel math.bitwise sequences system serial ;
-IN: serial.unix
+USING: alien.syntax kernel math.bitwise sequences system io.serial ;
+IN: io.serial.unix
 
 M: bsd lookup-baud ( m -- n )
     dup {
diff --git a/extra/serial/unix/bsd/tags.txt b/extra/io/serial/unix/bsd/tags.txt
similarity index 100%
rename from extra/serial/unix/bsd/tags.txt
rename to extra/io/serial/unix/bsd/tags.txt
diff --git a/extra/serial/unix/linux/linux.factor b/extra/io/serial/unix/linux/linux.factor
similarity index 97%
rename from extra/serial/unix/linux/linux.factor
rename to extra/io/serial/unix/linux/linux.factor
index 9511ec45bf..4d1878d2a9 100644
--- a/extra/serial/unix/linux/linux.factor
+++ b/extra/io/serial/unix/linux/linux.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: assocs alien.syntax kernel serial system unix ;
-IN: serial.unix
+USING: assocs alien.syntax kernel io.serial system unix ;
+IN: io.serial.unix
 
 CONSTANT: TCSANOW     0
 CONSTANT: TCSADRAIN   1
diff --git a/extra/serial/unix/linux/tags.txt b/extra/io/serial/unix/linux/tags.txt
similarity index 100%
rename from extra/serial/unix/linux/tags.txt
rename to extra/io/serial/unix/linux/tags.txt
diff --git a/extra/serial/unix/tags.txt b/extra/io/serial/unix/tags.txt
similarity index 100%
rename from extra/serial/unix/tags.txt
rename to extra/io/serial/unix/tags.txt
diff --git a/extra/serial/unix/termios/bsd/bsd.factor b/extra/io/serial/unix/termios/bsd/bsd.factor
similarity index 95%
rename from extra/serial/unix/termios/bsd/bsd.factor
rename to extra/io/serial/unix/termios/bsd/bsd.factor
index 87414089cc..63d0157780 100644
--- a/extra/serial/unix/termios/bsd/bsd.factor
+++ b/extra/io/serial/unix/termios/bsd/bsd.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien.syntax kernel sequences system ;
-IN: serial.unix.termios
+IN: io.serial.unix.termios
 
 CONSTANT: NCCS 20
 
diff --git a/extra/serial/unix/termios/bsd/tags.txt b/extra/io/serial/unix/termios/bsd/tags.txt
similarity index 100%
rename from extra/serial/unix/termios/bsd/tags.txt
rename to extra/io/serial/unix/termios/bsd/tags.txt
diff --git a/extra/serial/unix/termios/linux/linux.factor b/extra/io/serial/unix/termios/linux/linux.factor
similarity index 96%
rename from extra/serial/unix/termios/linux/linux.factor
rename to extra/io/serial/unix/termios/linux/linux.factor
index 41df31db09..4b8c52c7fb 100644
--- a/extra/serial/unix/termios/linux/linux.factor
+++ b/extra/io/serial/unix/termios/linux/linux.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien.syntax kernel system unix ;
-IN: serial.unix.termios
+IN: io.serial.unix.termios
 
 CONSTANT: NCCS 32
 
diff --git a/extra/serial/unix/termios/linux/tags.txt b/extra/io/serial/unix/termios/linux/tags.txt
similarity index 100%
rename from extra/serial/unix/termios/linux/tags.txt
rename to extra/io/serial/unix/termios/linux/tags.txt
diff --git a/extra/serial/unix/termios/tags.txt b/extra/io/serial/unix/termios/tags.txt
similarity index 100%
rename from extra/serial/unix/termios/tags.txt
rename to extra/io/serial/unix/termios/tags.txt
diff --git a/extra/serial/unix/termios/termios.factor b/extra/io/serial/unix/termios/termios.factor
similarity index 52%
rename from extra/serial/unix/termios/termios.factor
rename to extra/io/serial/unix/termios/termios.factor
index 901416d62c..e5ccd37e87 100644
--- a/extra/serial/unix/termios/termios.factor
+++ b/extra/io/serial/unix/termios/termios.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators system vocabs.loader ;
-IN: serial.unix.termios
+IN: io.serial.unix.termios
 
 {
-    { [ os linux? ] [ "serial.unix.termios.linux" ] }
-    { [ os bsd? ] [ "serial.unix.termios.bsd" ] }
+    { [ os linux? ] [ "io.serial.unix.termios.linux" ] }
+    { [ os bsd? ] [ "io.serial.unix.termios.bsd" ] }
 } cond require
diff --git a/extra/serial/unix/unix-tests.factor b/extra/io/serial/unix/unix-tests.factor
similarity index 84%
rename from extra/serial/unix/unix-tests.factor
rename to extra/io/serial/unix/unix-tests.factor
index e9126a5961..e9b8d78e4b 100644
--- a/extra/serial/unix/unix-tests.factor
+++ b/extra/io/serial/unix/unix-tests.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel math.bitwise serial serial.unix ;
-IN: serial.unix
+USING: accessors kernel math.bitwise io.serial io.serial.unix ;
+IN: io.serial.unix
 
 : serial-obj ( -- obj )
     serial new
diff --git a/extra/serial/unix/unix.factor b/extra/io/serial/unix/unix.factor
similarity index 91%
rename from extra/serial/unix/unix.factor
rename to extra/io/serial/unix/unix.factor
index ee320b0d2e..1ba8031dfc 100644
--- a/extra/serial/unix/unix.factor
+++ b/extra/io/serial/unix/unix.factor
@@ -2,12 +2,12 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.c-types alien.syntax combinators io.ports
 io.streams.duplex system kernel math math.bitwise
-vocabs.loader unix serial serial.unix.termios io.backend.unix ;
-IN: serial.unix
+vocabs.loader unix io.serial io.serial.unix.termios io.backend.unix ;
+IN: io.serial.unix
 
 << {
-    { [ os linux? ] [ "serial.unix.linux" ] }
-    { [ os bsd? ] [ "serial.unix.bsd" ] }
+    { [ os linux? ] [ "io.serial.unix.linux" ] }
+    { [ os bsd? ] [ "io.serial.unix.bsd" ] }
 } cond require >>
 
 FUNCTION: speed_t cfgetispeed ( termios* t ) ;
diff --git a/extra/serial/windows/authors.txt b/extra/io/serial/windows/authors.txt
similarity index 100%
rename from extra/serial/windows/authors.txt
rename to extra/io/serial/windows/authors.txt
diff --git a/extra/serial/windows/tags.txt b/extra/io/serial/windows/tags.txt
similarity index 100%
rename from extra/serial/windows/tags.txt
rename to extra/io/serial/windows/tags.txt
diff --git a/extra/serial/windows/windows.factor b/extra/io/serial/windows/windows.factor
similarity index 96%
rename from extra/serial/windows/windows.factor
rename to extra/io/serial/windows/windows.factor
index a80366cb9f..2d27a489ef 100755
--- a/extra/serial/windows/windows.factor
+++ b/extra/io/serial/windows/windows.factor
@@ -3,7 +3,7 @@
 USING: io.files.windows io.streams.duplex kernel math
 math.bitwise windows.kernel32 accessors alien.c-types
 windows io.files.windows fry locals continuations ;
-IN: serial.windows
+IN: io.serial.windows
 
 : <serial-stream> ( path encoding -- duplex )
     [ open-r/w dup ] dip <encoder-duplex> ;
diff --git a/extra/serial/windows/windows-tests.factor b/extra/serial/windows/windows-tests.factor
deleted file mode 100755
index bd67f77eae..0000000000
--- a/extra/serial/windows/windows-tests.factor
+++ /dev/null
@@ -1,4 +0,0 @@
-! Copyright (C) 2009 Your name.
-! See http://factorcode.org/license.txt for BSD license.
-USING: tools.test serial.windows ;
-IN: serial.windows.tests