diff --git a/readline/.cvsignore b/cmd-line-utils/readline/.cvsignore
similarity index 100%
rename from readline/.cvsignore
rename to cmd-line-utils/readline/.cvsignore
diff --git a/readline/COPYING b/cmd-line-utils/readline/COPYING
similarity index 100%
rename from readline/COPYING
rename to cmd-line-utils/readline/COPYING
diff --git a/readline/INSTALL b/cmd-line-utils/readline/INSTALL
similarity index 100%
rename from readline/INSTALL
rename to cmd-line-utils/readline/INSTALL
diff --git a/readline/Makefile.am b/cmd-line-utils/readline/Makefile.am
similarity index 100%
rename from readline/Makefile.am
rename to cmd-line-utils/readline/Makefile.am
diff --git a/readline/README b/cmd-line-utils/readline/README
similarity index 100%
rename from readline/README
rename to cmd-line-utils/readline/README
diff --git a/readline/ansi_stdlib.h b/cmd-line-utils/readline/ansi_stdlib.h
similarity index 100%
rename from readline/ansi_stdlib.h
rename to cmd-line-utils/readline/ansi_stdlib.h
diff --git a/readline/bind.c b/cmd-line-utils/readline/bind.c
similarity index 100%
rename from readline/bind.c
rename to cmd-line-utils/readline/bind.c
diff --git a/readline/callback.c b/cmd-line-utils/readline/callback.c
similarity index 100%
rename from readline/callback.c
rename to cmd-line-utils/readline/callback.c
diff --git a/readline/chardefs.h b/cmd-line-utils/readline/chardefs.h
similarity index 100%
rename from readline/chardefs.h
rename to cmd-line-utils/readline/chardefs.h
diff --git a/readline/complete.c b/cmd-line-utils/readline/complete.c
similarity index 100%
rename from readline/complete.c
rename to cmd-line-utils/readline/complete.c
diff --git a/readline/configure.in b/cmd-line-utils/readline/configure.in
similarity index 100%
rename from readline/configure.in
rename to cmd-line-utils/readline/configure.in
diff --git a/readline/display.c b/cmd-line-utils/readline/display.c
similarity index 100%
rename from readline/display.c
rename to cmd-line-utils/readline/display.c
diff --git a/readline/emacs_keymap.c b/cmd-line-utils/readline/emacs_keymap.c
similarity index 100%
rename from readline/emacs_keymap.c
rename to cmd-line-utils/readline/emacs_keymap.c
diff --git a/readline/funmap.c b/cmd-line-utils/readline/funmap.c
similarity index 100%
rename from readline/funmap.c
rename to cmd-line-utils/readline/funmap.c
diff --git a/readline/histexpand.c b/cmd-line-utils/readline/histexpand.c
similarity index 100%
rename from readline/histexpand.c
rename to cmd-line-utils/readline/histexpand.c
diff --git a/readline/histfile.c b/cmd-line-utils/readline/histfile.c
similarity index 100%
rename from readline/histfile.c
rename to cmd-line-utils/readline/histfile.c
diff --git a/readline/histlib.h b/cmd-line-utils/readline/histlib.h
similarity index 100%
rename from readline/histlib.h
rename to cmd-line-utils/readline/histlib.h
diff --git a/readline/history.c b/cmd-line-utils/readline/history.c
similarity index 100%
rename from readline/history.c
rename to cmd-line-utils/readline/history.c
diff --git a/readline/history.h b/cmd-line-utils/readline/history.h
similarity index 100%
rename from readline/history.h
rename to cmd-line-utils/readline/history.h
diff --git a/readline/histsearch.c b/cmd-line-utils/readline/histsearch.c
similarity index 100%
rename from readline/histsearch.c
rename to cmd-line-utils/readline/histsearch.c
diff --git a/readline/input.c b/cmd-line-utils/readline/input.c
similarity index 100%
rename from readline/input.c
rename to cmd-line-utils/readline/input.c
diff --git a/readline/isearch.c b/cmd-line-utils/readline/isearch.c
similarity index 100%
rename from readline/isearch.c
rename to cmd-line-utils/readline/isearch.c
diff --git a/readline/keymaps.c b/cmd-line-utils/readline/keymaps.c
similarity index 100%
rename from readline/keymaps.c
rename to cmd-line-utils/readline/keymaps.c
diff --git a/readline/keymaps.h b/cmd-line-utils/readline/keymaps.h
similarity index 100%
rename from readline/keymaps.h
rename to cmd-line-utils/readline/keymaps.h
diff --git a/readline/kill.c b/cmd-line-utils/readline/kill.c
similarity index 100%
rename from readline/kill.c
rename to cmd-line-utils/readline/kill.c
diff --git a/readline/macro.c b/cmd-line-utils/readline/macro.c
similarity index 100%
rename from readline/macro.c
rename to cmd-line-utils/readline/macro.c
diff --git a/readline/mbutil.c b/cmd-line-utils/readline/mbutil.c
similarity index 100%
rename from readline/mbutil.c
rename to cmd-line-utils/readline/mbutil.c
diff --git a/readline/misc.c b/cmd-line-utils/readline/misc.c
similarity index 100%
rename from readline/misc.c
rename to cmd-line-utils/readline/misc.c
diff --git a/readline/nls.c b/cmd-line-utils/readline/nls.c
similarity index 100%
rename from readline/nls.c
rename to cmd-line-utils/readline/nls.c
diff --git a/readline/parens.c b/cmd-line-utils/readline/parens.c
similarity index 100%
rename from readline/parens.c
rename to cmd-line-utils/readline/parens.c
diff --git a/readline/posixdir.h b/cmd-line-utils/readline/posixdir.h
similarity index 100%
rename from readline/posixdir.h
rename to cmd-line-utils/readline/posixdir.h
diff --git a/readline/posixjmp.h b/cmd-line-utils/readline/posixjmp.h
similarity index 100%
rename from readline/posixjmp.h
rename to cmd-line-utils/readline/posixjmp.h
diff --git a/readline/posixstat.h b/cmd-line-utils/readline/posixstat.h
similarity index 100%
rename from readline/posixstat.h
rename to cmd-line-utils/readline/posixstat.h
diff --git a/readline/readline.c b/cmd-line-utils/readline/readline.c
similarity index 100%
rename from readline/readline.c
rename to cmd-line-utils/readline/readline.c
diff --git a/readline/readline.h b/cmd-line-utils/readline/readline.h
similarity index 100%
rename from readline/readline.h
rename to cmd-line-utils/readline/readline.h
diff --git a/readline/rlconf.h b/cmd-line-utils/readline/rlconf.h
similarity index 100%
rename from readline/rlconf.h
rename to cmd-line-utils/readline/rlconf.h
diff --git a/readline/rldefs.h b/cmd-line-utils/readline/rldefs.h
similarity index 100%
rename from readline/rldefs.h
rename to cmd-line-utils/readline/rldefs.h
diff --git a/readline/rlmbutil.h b/cmd-line-utils/readline/rlmbutil.h
similarity index 100%
rename from readline/rlmbutil.h
rename to cmd-line-utils/readline/rlmbutil.h
diff --git a/readline/rlprivate.h b/cmd-line-utils/readline/rlprivate.h
similarity index 100%
rename from readline/rlprivate.h
rename to cmd-line-utils/readline/rlprivate.h
diff --git a/readline/rlshell.h b/cmd-line-utils/readline/rlshell.h
similarity index 100%
rename from readline/rlshell.h
rename to cmd-line-utils/readline/rlshell.h
diff --git a/readline/rlstdc.h b/cmd-line-utils/readline/rlstdc.h
similarity index 100%
rename from readline/rlstdc.h
rename to cmd-line-utils/readline/rlstdc.h
diff --git a/readline/rltty.c b/cmd-line-utils/readline/rltty.c
similarity index 100%
rename from readline/rltty.c
rename to cmd-line-utils/readline/rltty.c
diff --git a/readline/rltty.h b/cmd-line-utils/readline/rltty.h
similarity index 100%
rename from readline/rltty.h
rename to cmd-line-utils/readline/rltty.h
diff --git a/readline/rltypedefs.h b/cmd-line-utils/readline/rltypedefs.h
similarity index 100%
rename from readline/rltypedefs.h
rename to cmd-line-utils/readline/rltypedefs.h
diff --git a/readline/rlwinsize.h b/cmd-line-utils/readline/rlwinsize.h
similarity index 100%
rename from readline/rlwinsize.h
rename to cmd-line-utils/readline/rlwinsize.h
diff --git a/readline/search.c b/cmd-line-utils/readline/search.c
similarity index 100%
rename from readline/search.c
rename to cmd-line-utils/readline/search.c
diff --git a/readline/shell.c b/cmd-line-utils/readline/shell.c
similarity index 100%
rename from readline/shell.c
rename to cmd-line-utils/readline/shell.c
diff --git a/readline/signals.c b/cmd-line-utils/readline/signals.c
similarity index 100%
rename from readline/signals.c
rename to cmd-line-utils/readline/signals.c
diff --git a/readline/tcap.h b/cmd-line-utils/readline/tcap.h
similarity index 100%
rename from readline/tcap.h
rename to cmd-line-utils/readline/tcap.h
diff --git a/readline/terminal.c b/cmd-line-utils/readline/terminal.c
similarity index 100%
rename from readline/terminal.c
rename to cmd-line-utils/readline/terminal.c
diff --git a/readline/text.c b/cmd-line-utils/readline/text.c
similarity index 100%
rename from readline/text.c
rename to cmd-line-utils/readline/text.c
diff --git a/readline/tilde.c b/cmd-line-utils/readline/tilde.c
similarity index 100%
rename from readline/tilde.c
rename to cmd-line-utils/readline/tilde.c
diff --git a/readline/tilde.h b/cmd-line-utils/readline/tilde.h
similarity index 100%
rename from readline/tilde.h
rename to cmd-line-utils/readline/tilde.h
diff --git a/readline/undo.c b/cmd-line-utils/readline/undo.c
similarity index 100%
rename from readline/undo.c
rename to cmd-line-utils/readline/undo.c
diff --git a/readline/util.c b/cmd-line-utils/readline/util.c
similarity index 100%
rename from readline/util.c
rename to cmd-line-utils/readline/util.c
diff --git a/readline/vi_keymap.c b/cmd-line-utils/readline/vi_keymap.c
similarity index 100%
rename from readline/vi_keymap.c
rename to cmd-line-utils/readline/vi_keymap.c
diff --git a/readline/vi_mode.c b/cmd-line-utils/readline/vi_mode.c
similarity index 100%
rename from readline/vi_mode.c
rename to cmd-line-utils/readline/vi_mode.c
diff --git a/readline/xmalloc.c b/cmd-line-utils/readline/xmalloc.c
similarity index 100%
rename from readline/xmalloc.c
rename to cmd-line-utils/readline/xmalloc.c
diff --git a/readline/xmalloc.h b/cmd-line-utils/readline/xmalloc.h
similarity index 100%
rename from readline/xmalloc.h
rename to cmd-line-utils/readline/xmalloc.h