109 files changed, 70 insertions, 1326 deletions

diff --git a/Makefile.am b/Makefile.am
index a619ae2b..2b76b5d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1 @@
-SUBDIRS=src aoview cctools utils
+SUBDIRS=src ao-view ao-tools ao-utils
diff --git a/ao-tools/Makefile.am b/ao-tools/Makefile.am
new file mode 100644
index 00000000..98b88f38
--- /dev/null
+++ b/ao-tools/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS=lib ao-rawload ao-dbg ao-bitbang ao-eeprom ao-load
diff --git a/ao-tools/ao-bitbang/Makefile.am b/ao-tools/ao-bitbang/Makefile.am
new file mode 100644
index 00000000..f094c7bd
--- /dev/null
+++ b/ao-tools/ao-bitbang/Makefile.am
@@ -0,0 +1,10 @@
+bin_PROGRAMS=ao-bitbang
+
+AM_CFLAGS=-I$(top_srcdir)/ao-tools/lib $(LIBUSB_CFLAGS)
+AO_BITBANG_LIBS=$(top_builddir)/ao-tools/lib/libao-tools.a
+
+ao_bitbang_DEPENDENCIES = $(AO_BITBANG_LIBS)
+
+ao_bitbang_LDADD=$(AO_BITBANG_LIBS) $(LIBUSB_LIBS)
+
+ao_bitbang_SOURCES = ao-bitbang.c
diff --git a/cctools/ccmanual/ccmanual.c b/ao-tools/ao-bitbang/ao-bitbang.c
index 7090c9a3..7090c9a3 100644
--- a/cctools/ccmanual/ccmanual.c
+++ b/ao-tools/ao-bitbang/ao-bitbang.c
diff --git a/cctools/s51/.gitignore b/ao-tools/ao-dbg/.gitignore
index cb909cf0..cb909cf0 100644
--- a/cctools/s51/.gitignore
+++ b/ao-tools/ao-dbg/.gitignore
diff --git a/ao-tools/ao-dbg/Makefile.am b/ao-tools/ao-dbg/Makefile.am
new file mode 100644
index 00000000..ad2cb280
--- /dev/null
+++ b/ao-tools/ao-dbg/Makefile.am
@@ -0,0 +1,12 @@
+bin_PROGRAMS=ao-dbg
+
+AM_CFLAGS=-I$(top_srcdir)/ao-tools/lib $(LIBUSB_CFLAGS)
+AO_DBG_LIBS=$(top_builddir)/ao-tools/lib/libao-tools.a
+
+man_MANS = ao-dbg.1
+
+ao_dbg_DEPENDENCIES = $(AO_DBG_LIBS)
+
+ao_dbg_LDADD=$(AO_DBG_LIBS) $(LIBUSB_LIBS)  -lreadline
+
+ao_dbg_SOURCES = ao-dbg-parse.c ao-dbg-command.c ao-dbg-main.c
diff --git a/cctools/s51/s51.1 b/ao-tools/ao-dbg/ao-dbg.1
index f2f59a52..f2f59a52 100644
--- a/cctools/s51/s51.1
+++ b/ao-tools/ao-dbg/ao-dbg.1
diff --git a/cctools/s51/commands b/ao-tools/ao-dbg/commands
index aba65cd0..aba65cd0 100644
--- a/cctools/s51/commands
+++ b/ao-tools/ao-dbg/commands
diff --git a/ao-tools/ao-eeprom/Makefile.am b/ao-tools/ao-eeprom/Makefile.am
new file mode 100644
index 00000000..587acee7
--- /dev/null
+++ b/ao-tools/ao-eeprom/Makefile.am
@@ -0,0 +1,10 @@
+bin_PROGRAMS=ao-eeprom
+
+AM_CFLAGS=-I$(top_srcdir)/ao-tools/lib $(LIBUSB_CFLAGS)
+AO_EEPROM_LIBS=$(top_builddir)/ao-tools/lib/libao-tools.a
+
+ao_eeprom_DEPENDENCIES = $(AO_EEPROM_LIBS)
+
+ao_eeprom_LDADD=$(AO_EEPROM_LIBS) $(LIBUSB_LIBS)
+
+ao_eeprom_SOURCES = ao-eeprom.c
diff --git a/cctools/ccdump/ccdump.c b/ao-tools/ao-eeprom/ao-eeprom.c
index 399732d9..399732d9 100644
--- a/cctools/ccdump/ccdump.c
+++ b/ao-tools/ao-eeprom/ao-eeprom.c
diff --git a/ao-tools/ao-load/Makefile.am b/ao-tools/ao-load/Makefile.am
new file mode 100644
index 00000000..8a8392af
--- /dev/null
+++ b/ao-tools/ao-load/Makefile.am
@@ -0,0 +1,10 @@
+bin_PROGRAMS=ao-load
+
+AM_CFLAGS=-I$(top_srcdir)/ao-tools/lib $(LIBUSB_CFLAGS)
+AO_LOAD_LIBS=$(top_builddir)/ao-tools/lib/libao-tools.a
+
+ao_load_DEPENDENCIES = $(AO_LOAD_LIBS)
+
+ao_load_LDADD=$(AO_LOAD_LIBS) $(LIBUSB_LIBS)
+
+ao_load_SOURCES = ao-load.c
diff --git a/cctools/aoload/aoload.c b/ao-tools/ao-load/ao-load.c
index b84a88a6..b84a88a6 100644
--- a/cctools/aoload/aoload.c
+++ b/ao-tools/ao-load/ao-load.c
diff --git a/cctools/ccload/.gitignore b/ao-tools/ao-rawload/.gitignore
index 3899747a..3899747a 100644
--- a/cctools/ccload/.gitignore
+++ b/ao-tools/ao-rawload/.gitignore
diff --git a/ao-tools/ao-rawload/Makefile.am b/ao-tools/ao-rawload/Makefile.am
new file mode 100644
index 00000000..24013a85
--- /dev/null
+++ b/ao-tools/ao-rawload/Makefile.am
@@ -0,0 +1,10 @@
+bin_PROGRAMS=ao-rawload
+
+AM_CFLAGS=-I$(top_srcdir)/ao-tools/lib $(LIBUSB_CFLAGS)
+AO_RAWLOAD_LIBS=$(top_builddir)/ao-tools/lib/libao-tools.a
+
+ao_rawload_DEPENDENCIES = $(AO_RAWLOAD_LIBS)
+
+ao_rawload_LDADD=$(AO_RAWLOAD_LIBS) $(LIBUSB_LIBS)
+
+ao_rawload_SOURCES = ao-rawload.c
diff --git a/cctools/ccload/ccload.c b/ao-tools/ao-rawload/ao-rawload.c
index 5f7708fd..5f7708fd 100644
--- a/cctools/ccload/ccload.c
+++ b/ao-tools/ao-rawload/ao-rawload.c
diff --git a/cctools/lib/Makefile.am b/ao-tools/lib/Makefile.am
index 251ef6e6..9584e216 100644
--- a/cctools/lib/Makefile.am
+++ b/ao-tools/lib/Makefile.am
@@ -1,8 +1,8 @@
-noinst_LIBRARIES = libcc.a
+noinst_LIBRARIES = libao-tools.a
 
 AM_CFLAGS=$(WARN_CFLAGS) $(LIBUSB_CFLAGS)
 
-libcc_a_SOURCES = \
+libao_tools_a_SOURCES = \
 	ccdbg-command.c \
 	ccdbg-debug.c \
 	ccdbg-debug.h \
diff --git a/cctools/lib/cc-bitbang.c b/ao-tools/lib/cc-bitbang.c
index a5d15739..a5d15739 100644
--- a/cctools/lib/cc-bitbang.c
+++ b/ao-tools/lib/cc-bitbang.c
diff --git a/cctools/lib/cc-bitbang.h b/ao-tools/lib/cc-bitbang.h
index 54b20e2c..54b20e2c 100644
--- a/cctools/lib/cc-bitbang.h
+++ b/ao-tools/lib/cc-bitbang.h
diff --git a/cctools/lib/cc-usb.c b/ao-tools/lib/cc-usb.c
index 81309983..81309983 100644
--- a/cctools/lib/cc-usb.c
+++ b/ao-tools/lib/cc-usb.c
diff --git a/cctools/lib/cc-usb.h b/ao-tools/lib/cc-usb.h
index d7acfbd2..d7acfbd2 100644
--- a/cctools/lib/cc-usb.h
+++ b/ao-tools/lib/cc-usb.h
diff --git a/cctools/lib/ccdbg-command.c b/ao-tools/lib/ccdbg-command.c
index a1002879..a1002879 100644
--- a/cctools/lib/ccdbg-command.c
+++ b/ao-tools/lib/ccdbg-command.c
diff --git a/cctools/lib/ccdbg-debug.c b/ao-tools/lib/ccdbg-debug.c
index 6eb4e0c5..6eb4e0c5 100644
--- a/cctools/lib/ccdbg-debug.c
+++ b/ao-tools/lib/ccdbg-debug.c
diff --git a/cctools/lib/ccdbg-debug.h b/ao-tools/lib/ccdbg-debug.h
index 0b5b44c1..0b5b44c1 100644
--- a/cctools/lib/ccdbg-debug.h
+++ b/ao-tools/lib/ccdbg-debug.h
diff --git a/cctools/lib/ccdbg-flash.c b/ao-tools/lib/ccdbg-flash.c
index 3e672985..3e672985 100644
--- a/cctools/lib/ccdbg-flash.c
+++ b/ao-tools/lib/ccdbg-flash.c
diff --git a/cctools/lib/ccdbg-hex.c b/ao-tools/lib/ccdbg-hex.c
index dfea9156..dfea9156 100644
--- a/cctools/lib/ccdbg-hex.c
+++ b/ao-tools/lib/ccdbg-hex.c
diff --git a/cctools/lib/ccdbg-io.c b/ao-tools/lib/ccdbg-io.c
index 9c6693cd..9c6693cd 100644
--- a/cctools/lib/ccdbg-io.c
+++ b/ao-tools/lib/ccdbg-io.c
diff --git a/cctools/lib/ccdbg-manual.c b/ao-tools/lib/ccdbg-manual.c
index 0e811b76..0e811b76 100644
--- a/cctools/lib/ccdbg-manual.c
+++ b/ao-tools/lib/ccdbg-manual.c
diff --git a/cctools/lib/ccdbg-memory.c b/ao-tools/lib/ccdbg-memory.c
index 554ac637..554ac637 100644
--- a/cctools/lib/ccdbg-memory.c
+++ b/ao-tools/lib/ccdbg-memory.c
diff --git a/cctools/lib/ccdbg-rom.c b/ao-tools/lib/ccdbg-rom.c
index 71bed220..71bed220 100644
--- a/cctools/lib/ccdbg-rom.c
+++ b/ao-tools/lib/ccdbg-rom.c
diff --git a/cctools/lib/ccdbg-state.c b/ao-tools/lib/ccdbg-state.c
index 9aca8d2e..9aca8d2e 100644
--- a/cctools/lib/ccdbg-state.c
+++ b/ao-tools/lib/ccdbg-state.c
diff --git a/cctools/lib/ccdbg.h b/ao-tools/lib/ccdbg.h
index 4a2e3b9f..4a2e3b9f 100644
--- a/cctools/lib/ccdbg.h
+++ b/ao-tools/lib/ccdbg.h
diff --git a/cctools/lib/cp-usb-async.c b/ao-tools/lib/cp-usb-async.c
index 6539394b..6539394b 100644
--- a/cctools/lib/cp-usb-async.c
+++ b/ao-tools/lib/cp-usb-async.c
diff --git a/cctools/lib/cp-usb-async.h b/ao-tools/lib/cp-usb-async.h
index 976a320e..976a320e 100644
--- a/cctools/lib/cp-usb-async.h
+++ b/ao-tools/lib/cp-usb-async.h
diff --git a/cctools/target/adc-serial/Makefile b/ao-tools/target/adc-serial/Makefile
index 9a8bf5c6..9a8bf5c6 100644
--- a/cctools/target/adc-serial/Makefile
+++ b/ao-tools/target/adc-serial/Makefile
diff --git a/cctools/target/adc-serial/adc_serial.c b/ao-tools/target/adc-serial/adc_serial.c
index 1f7b6880..1f7b6880 100644
--- a/cctools/target/adc-serial/adc_serial.c
+++ b/ao-tools/target/adc-serial/adc_serial.c
diff --git a/cctools/target/adc/Makefile b/ao-tools/target/adc/Makefile
index 54c1211a..54c1211a 100644
--- a/cctools/target/adc/Makefile
+++ b/ao-tools/target/adc/Makefile
diff --git a/cctools/target/adc/adc.c b/ao-tools/target/adc/adc.c
index 3a63a2c6..3a63a2c6 100644
--- a/cctools/target/adc/adc.c
+++ b/ao-tools/target/adc/adc.c
diff --git a/cctools/target/beep-timer/Makefile b/ao-tools/target/beep-timer/Makefile
index 008adbd5..008adbd5 100644
--- a/cctools/target/beep-timer/Makefile
+++ b/ao-tools/target/beep-timer/Makefile
diff --git a/cctools/target/beep-timer/beep_timer.c b/ao-tools/target/beep-timer/beep_timer.c
index b3fa8754..b3fa8754 100644
--- a/cctools/target/beep-timer/beep_timer.c
+++ b/ao-tools/target/beep-timer/beep_timer.c
diff --git a/cctools/target/beep/Makefile b/ao-tools/target/beep/Makefile
index 8f600b4a..8f600b4a 100644
--- a/cctools/target/beep/Makefile
+++ b/ao-tools/target/beep/Makefile
diff --git a/cctools/target/beep/beep.c b/ao-tools/target/beep/beep.c
index 09c915b7..09c915b7 100644
--- a/cctools/target/beep/beep.c
+++ b/ao-tools/target/beep/beep.c
diff --git a/cctools/target/blink/.gitignore b/ao-tools/target/blink/.gitignore
index 40f72de9..40f72de9 100644
--- a/cctools/target/blink/.gitignore
+++ b/ao-tools/target/blink/.gitignore
diff --git a/cctools/target/blink/Makefile b/ao-tools/target/blink/Makefile
index d0112e62..d0112e62 100644
--- a/cctools/target/blink/Makefile
+++ b/ao-tools/target/blink/Makefile
diff --git a/cctools/target/blink/blink.c b/ao-tools/target/blink/blink.c
index 907c82b8..907c82b8 100644
--- a/cctools/target/blink/blink.c
+++ b/ao-tools/target/blink/blink.c
diff --git a/cctools/target/dma/Makefile b/ao-tools/target/dma/Makefile
index 9cb3e327..9cb3e327 100644
--- a/cctools/target/dma/Makefile
+++ b/ao-tools/target/dma/Makefile
diff --git a/cctools/target/dma/dma.c b/ao-tools/target/dma/dma.c
index 1762b658..1762b658 100644
--- a/cctools/target/dma/dma.c
+++ b/ao-tools/target/dma/dma.c
diff --git a/cctools/target/ee/Makefile b/ao-tools/target/ee/Makefile
index 4c9abd1f..4c9abd1f 100644
--- a/cctools/target/ee/Makefile
+++ b/ao-tools/target/ee/Makefile
diff --git a/cctools/target/ee/ee.c b/ao-tools/target/ee/ee.c
index 9ea22cdc..9ea22cdc 100644
--- a/cctools/target/ee/ee.c
+++ b/ao-tools/target/ee/ee.c
diff --git a/cctools/target/isr.c b/ao-tools/target/isr.c
index ae4d04c5..ae4d04c5 100644
--- a/cctools/target/isr.c
+++ b/ao-tools/target/isr.c
diff --git a/cctools/target/radio/Makefile b/ao-tools/target/radio/Makefile
index 97706fef..97706fef 100644
--- a/cctools/target/radio/Makefile
+++ b/ao-tools/target/radio/Makefile
diff --git a/cctools/target/radio/init.c b/ao-tools/target/radio/init.c
index ea7c984c..ea7c984c 100644
--- a/cctools/target/radio/init.c
+++ b/ao-tools/target/radio/init.c
diff --git a/cctools/target/radio/radio.h b/ao-tools/target/radio/radio.h
index f68001e4..f68001e4 100644
--- a/cctools/target/radio/radio.h
+++ b/ao-tools/target/radio/radio.h
diff --git a/cctools/target/radio/recv.c b/ao-tools/target/radio/recv.c
index c50c3205..c50c3205 100644
--- a/cctools/target/radio/recv.c
+++ b/ao-tools/target/radio/recv.c
diff --git a/cctools/target/radio/xmit.c b/ao-tools/target/radio/xmit.c
index e80a0f8b..e80a0f8b 100644
--- a/cctools/target/radio/xmit.c
+++ b/ao-tools/target/radio/xmit.c
diff --git a/cctools/target/serial/Makefile b/ao-tools/target/serial/Makefile
index 3a1d81e8..3a1d81e8 100644
--- a/cctools/target/serial/Makefile
+++ b/ao-tools/target/serial/Makefile
diff --git a/cctools/target/serial/serial.c b/ao-tools/target/serial/serial.c
index 63f6c6de..63f6c6de 100644
--- a/cctools/target/serial/serial.c
+++ b/ao-tools/target/serial/serial.c
diff --git a/cctools/target/simple/Makefile b/ao-tools/target/simple/Makefile
index 70c0f888..70c0f888 100644
--- a/cctools/target/simple/Makefile
+++ b/ao-tools/target/simple/Makefile
diff --git a/cctools/target/simple/simple.c b/ao-tools/target/simple/simple.c
index b7ea1019..b7ea1019 100644
--- a/cctools/target/simple/simple.c
+++ b/ao-tools/target/simple/simple.c
diff --git a/cctools/target/timer/Makefile b/ao-tools/target/timer/Makefile
index 99e06b8d..99e06b8d 100644
--- a/cctools/target/timer/Makefile
+++ b/ao-tools/target/timer/Makefile
diff --git a/cctools/target/timer/cc1111.h b/ao-tools/target/timer/cc1111.h
index 76c95c27..76c95c27 100644
--- a/cctools/target/timer/cc1111.h
+++ b/ao-tools/target/timer/cc1111.h
diff --git a/cctools/target/timer/timer.c b/ao-tools/target/timer/timer.c
index ae75d0a8..ae75d0a8 100644
--- a/cctools/target/timer/timer.c
+++ b/ao-tools/target/timer/timer.c
diff --git a/cctools/tests/blink-tiny b/ao-tools/tests/blink-tiny
index fd075e57..fd075e57 100644
--- a/cctools/tests/blink-tiny
+++ b/ao-tools/tests/blink-tiny
diff --git a/cctools/tests/blink-tiny-ram b/ao-tools/tests/blink-tiny-ram
index 018716d5..018716d5 100644
--- a/cctools/tests/blink-tiny-ram
+++ b/ao-tools/tests/blink-tiny-ram
diff --git a/cctools/tests/chip_id b/ao-tools/tests/chip_id
index b3ecf314..b3ecf314 100644
--- a/cctools/tests/chip_id
+++ b/ao-tools/tests/chip_id
diff --git a/cctools/tests/debug_mode b/ao-tools/tests/debug_mode
index 2b5ec020..2b5ec020 100644
--- a/cctools/tests/debug_mode
+++ b/ao-tools/tests/debug_mode
diff --git a/cctools/tests/get_pc b/ao-tools/tests/get_pc
index 13bcba15..13bcba15 100644
--- a/cctools/tests/get_pc
+++ b/ao-tools/tests/get_pc
diff --git a/cctools/tests/get_status b/ao-tools/tests/get_status
index 3e67a2e0..3e67a2e0 100644
--- a/cctools/tests/get_status
+++ b/ao-tools/tests/get_status
diff --git a/cctools/tests/half_phase b/ao-tools/tests/half_phase
index 3ca4a303..3ca4a303 100644
--- a/cctools/tests/half_phase
+++ b/ao-tools/tests/half_phase
diff --git a/cctools/tests/in b/ao-tools/tests/in
index 93341e32..93341e32 100644
--- a/cctools/tests/in
+++ b/ao-tools/tests/in
diff --git a/cctools/tests/p1_1 b/ao-tools/tests/p1_1
index 08d8ab50..08d8ab50 100644
--- a/cctools/tests/p1_1
+++ b/ao-tools/tests/p1_1
diff --git a/cctools/tests/rd_config b/ao-tools/tests/rd_config
index e2d43f10..e2d43f10 100644
--- a/cctools/tests/rd_config
+++ b/ao-tools/tests/rd_config
diff --git a/cctools/tests/read_status b/ao-tools/tests/read_status
index 3ae46058..3ae46058 100644
--- a/cctools/tests/read_status
+++ b/ao-tools/tests/read_status
diff --git a/cctools/tests/reset b/ao-tools/tests/reset
index a32c8bec..a32c8bec 100644
--- a/cctools/tests/reset
+++ b/ao-tools/tests/reset
diff --git a/cctools/tests/wr_config b/ao-tools/tests/wr_config
index 1ee31623..1ee31623 100644
--- a/cctools/tests/wr_config
+++ b/ao-tools/tests/wr_config
diff --git a/ao-utils/Makefile.am b/ao-utils/Makefile.am
new file mode 100644
index 00000000..705ff4d5
--- /dev/null
+++ b/ao-utils/Makefile.am
@@ -0,0 +1 @@
+dist_bin_SCRIPTS = ao-ejection
diff --git a/utils/ejection b/ao-utils/ao-ejection
index 81eb83d0..81eb83d0 100755
--- a/utils/ejection
+++ b/ao-utils/ao-ejection
diff --git a/aoview/.gitignore b/ao-view/.gitignore
index 24fbc596..24fbc596 100644
--- a/aoview/.gitignore
+++ b/ao-view/.gitignore
diff --git a/aoview/Makefile.am b/ao-view/Makefile.am
index 00851b67..e0cd068c 100644
--- a/aoview/Makefile.am
+++ b/ao-view/Makefile.am
@@ -1,11 +1,12 @@
 VERSION=$(shell git describe)
+
 AM_CFLAGS=$(GNOME_CFLAGS) $(ALSA_CFLAGS) -I$(top_srcdir)/src -DAOVIEW_VERSION=\"$(VERSION)\" @FLITE_INCS@
 
-bin_PROGRAMS=aoview
+bin_PROGRAMS=ao-view
 
-aoview_LDADD=$(GNOME_LIBS) $(FLITE_LIBS) $(ALSA_LIBS)
+ao_view_LDADD=$(GNOME_LIBS) $(FLITE_LIBS) $(ALSA_LIBS)
 
-aoview_SOURCES = \
+ao_view_SOURCES = \
 	aoview_main.c \
 	aoview_dev.c \
 	aoview_dev_dialog.c \
diff --git a/aoview/aoview.glade b/ao-view/aoview.glade
index df08b83c..df08b83c 100644
--- a/aoview/aoview.glade
+++ b/ao-view/aoview.glade
diff --git a/aoview/aoview.h b/ao-view/aoview.h
index 62d0640b..62d0640b 100644
--- a/aoview/aoview.h
+++ b/ao-view/aoview.h
diff --git a/aoview/aoview_convert.c b/ao-view/aoview_convert.c
index 02416647..02416647 100644
--- a/aoview/aoview_convert.c
+++ b/ao-view/aoview_convert.c
diff --git a/aoview/aoview_dev.c b/ao-view/aoview_dev.c
index 9b8cc19e..9b8cc19e 100644
--- a/aoview/aoview_dev.c
+++ b/ao-view/aoview_dev.c
diff --git a/aoview/aoview_dev_dialog.c b/ao-view/aoview_dev_dialog.c
index 3f92085c..3f92085c 100644
--- a/aoview/aoview_dev_dialog.c
+++ b/ao-view/aoview_dev_dialog.c
diff --git a/aoview/aoview_eeprom.c b/ao-view/aoview_eeprom.c
index 34e2deed..34e2deed 100644
--- a/aoview/aoview_eeprom.c
+++ b/ao-view/aoview_eeprom.c
diff --git a/aoview/aoview_file.c b/ao-view/aoview_file.c
index 5288c2f7..5288c2f7 100644
--- a/aoview/aoview_file.c
+++ b/ao-view/aoview_file.c
diff --git a/aoview/aoview_flite.c b/ao-view/aoview_flite.c
index e1b75898..e1b75898 100644
--- a/aoview/aoview_flite.c
+++ b/ao-view/aoview_flite.c
diff --git a/aoview/aoview_label.c b/ao-view/aoview_label.c
index 24313626..24313626 100644
--- a/aoview/aoview_label.c
+++ b/ao-view/aoview_label.c
diff --git a/aoview/aoview_log.c b/ao-view/aoview_log.c
index 1b89c28c..1b89c28c 100644
--- a/aoview/aoview_log.c
+++ b/ao-view/aoview_log.c
diff --git a/aoview/aoview_main.c b/ao-view/aoview_main.c
index 36a82e0e..36a82e0e 100644
--- a/aoview/aoview_main.c
+++ b/ao-view/aoview_main.c
diff --git a/aoview/aoview_monitor.c b/ao-view/aoview_monitor.c
index 9265a199..9265a199 100644
--- a/aoview/aoview_monitor.c
+++ b/ao-view/aoview_monitor.c
diff --git a/aoview/aoview_replay.c b/ao-view/aoview_replay.c
index da7b5d6a..da7b5d6a 100644
--- a/aoview/aoview_replay.c
+++ b/ao-view/aoview_replay.c
diff --git a/aoview/aoview_serial.c b/ao-view/aoview_serial.c
index 29038b79..29038b79 100644
--- a/aoview/aoview_serial.c
+++ b/ao-view/aoview_serial.c
diff --git a/aoview/aoview_state.c b/ao-view/aoview_state.c
index 7efd33b0..7efd33b0 100644
--- a/aoview/aoview_state.c
+++ b/ao-view/aoview_state.c
diff --git a/aoview/aoview_table.c b/ao-view/aoview_table.c
index 93143009..93143009 100644
--- a/aoview/aoview_table.c
+++ b/ao-view/aoview_table.c
diff --git a/aoview/aoview_util.c b/ao-view/aoview_util.c
index 6ea62ac9..6ea62ac9 100644
--- a/aoview/aoview_util.c
+++ b/ao-view/aoview_util.c
diff --git a/aoview/aoview_voice.c b/ao-view/aoview_voice.c
index 24422df6..24422df6 100644
--- a/aoview/aoview_voice.c
+++ b/ao-view/aoview_voice.c
diff --git a/aoview/design b/ao-view/design
index 6ec2ea70..6ec2ea70 100644
--- a/aoview/design
+++ b/ao-view/design
diff --git a/cctools/Makefile.am b/cctools/Makefile.am
deleted file mode 100644
index 86f2fad5..00000000
--- a/cctools/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS=lib ccload s51 ccmanual ccdump aoload
diff --git a/cctools/aoload/Makefile.am b/cctools/aoload/Makefile.am
deleted file mode 100644
index 48fb89f3..00000000
--- a/cctools/aoload/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-bin_PROGRAMS=aoload
-
-AM_CFLAGS=-I$(top_srcdir)/cctools/lib $(LIBUSB_CFLAGS)
-AOLOAD_LIBS=$(top_builddir)/cctools/lib/libcc.a
-
-aoload_DEPENDENCIES = $(AOLOAD_LIBS)
-
-aoload_LDADD=$(AOLOAD_LIBS) $(LIBUSB_LIBS)
-
-aoload_SOURCES = aoload.c
diff --git a/cctools/ccdump/Makefile.am b/cctools/ccdump/Makefile.am
deleted file mode 100644
index 752eb407..00000000
--- a/cctools/ccdump/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-bin_PROGRAMS=ccdump
-
-AM_CFLAGS=-I$(top_srcdir)/cctools/lib $(LIBUSB_CFLAGS)
-CCDUMP_LIBS=$(top_builddir)/cctools/lib/libcc.a
-
-ccdump_DEPENDENCIES = $(CCDUMP_LIBS)
-
-ccdump_LDADD=$(CCDUMP_LIBS) $(LIBUSB_LIBS)
-
-ccdump_SOURCES = ccdump.c
diff --git a/cctools/ccload/Makefile.am b/cctools/ccload/Makefile.am
deleted file mode 100644
index b07e9b70..00000000
--- a/cctools/ccload/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-bin_PROGRAMS=ccload
-
-AM_CFLAGS=-I$(top_srcdir)/cctools/lib $(LIBUSB_CFLAGS)
-CCLOAD_LIBS=$(top_builddir)/cctools/lib/libcc.a
-
-ccload_DEPENDENCIES = $(CCLOAD_LIBS)
-
-ccload_LDADD=$(CCLOAD_LIBS) $(LIBUSB_LIBS)
-
-ccload_SOURCES = ccload.c
diff --git a/cctools/ccmanual/Makefile.am b/cctools/ccmanual/Makefile.am
deleted file mode 100644
index b0b33514..00000000
--- a/cctools/ccmanual/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-bin_PROGRAMS=ccmanual
-
-AM_CFLAGS=-I$(top_srcdir)/cctools/lib $(LIBUSB_CFLAGS)
-CCMANUAL_LIBS=$(top_builddir)/cctools/lib/libcc.a
-
-ccmanual_DEPENDENCIES = $(CCMANUAL_LIBS)
-
-ccmanual_LDADD=$(CCMANUAL_LIBS) $(LIBUSB_LIBS)
-
-ccmanual_SOURCES = ccmanual.c
diff --git a/cctools/s51/Makefile.am b/cctools/s51/Makefile.am
deleted file mode 100644
index 4b95b3f7..00000000
--- a/cctools/s51/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-bin_PROGRAMS=s51
-
-AM_CFLAGS=-I$(top_srcdir)/cctools/lib $(LIBUSB_CFLAGS)
-S51_LIBS=$(top_builddir)/cctools/lib/libcc.a -lreadline
-
-man_MANS = s51.1
-
-s51_DEPENDENCIES = $(S51_LIBS)
-
-s51_LDADD=$(S51_LIBS) $(LIBUSB_LIBS)
-
-s51_SOURCES = s51-parse.c s51-command.c s51-main.c
diff --git a/cctools/s51/s51-command.c b/cctools/s51/s51-command.c
deleted file mode 100644
index 4f803060..00000000
--- a/cctools/s51/s51-command.c
+++ /dev/null
@@ -1,654 +0,0 @@
-/*
- * Copyright © 2008 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-#include "s51.h"
-
-static uint16_t start_address;
-
-static enum command_result
-parse_int(char *value, int *result)
-{
-	char *endptr;
-
-	*result = strtol(value, &endptr, 0);
-	if (endptr == value)
-		return command_syntax;
-	return command_success;
-}
-
-static enum command_result
-parse_uint16(char *value, uint16_t *uint16)
-{
-	int	v;
-	enum command_result result;
-
-	result = parse_int(value, &v);
-	if (result != command_success)
-		return command_error;
-	if (v < 0 || v > 0xffff)
-		return command_error;
-	*uint16 = v;
-	return command_success;
-}
-
-static enum command_result
-parse_uint8(char *value, uint8_t *uint8)
-{
-	int	v;
-	enum command_result result;
-
-	result = parse_int(value, &v);
-	if (result != command_success)
-		return command_error;
-	if (v < 0 || v > 0xff)
-		return command_error;
-	*uint8 = v;
-	return command_success;
-}
-
-enum command_result
-command_quit (int argc, char **argv)
-{
-	ccdbg_reset(s51_dbg);
-	exit(0);
-	return command_error;
-}
-
-static void
-dump_bytes(uint8_t *memory, int length, uint16_t start, char *format)
-{
-	int group, i;
-
-	for (group = 0; group < length; group += 8) {
-		s51_printf(format, start + group);
-		for (i = group; i < length && i < group + 8; i++)
-			s51_printf("%02x ", memory[i]);
-		for (; i < group + 8; i++)
-			s51_printf("   ");
-		for (i = group; i < length && i < group + 8; i++) {
-			if (isascii(memory[i]) && isprint(memory[i]))
-				s51_printf("%c", memory[i]);
-			else
-				s51_printf(".");
-		}
-		s51_printf("\n");
-	}
-}
-
-enum command_result
-command_di (int argc, char **argv)
-{
-	uint16_t start, end;
-	uint8_t	memory[65536];
-	uint8_t status;
-	int length;
-
-	if (argc != 3)
-		return command_error;
-	if (parse_uint16(argv[1], &start) != command_success)
-		return command_error;
-	if (parse_uint16(argv[2], &end) != command_success)
-		return command_error;
-	length = (int) end - (int) start + 1;
-	status = ccdbg_read_memory(s51_dbg, start + 0xff00, memory, length);
-	dump_bytes(memory, length, start, "0x%02x ");
-	return command_success;
-}
-
-enum command_result
-command_ds (int argc, char **argv)
-{
-	uint8_t start, end;
-	uint8_t	memory[0x100];
-	uint8_t status;
-	int length;
-
-	if (argc != 3)
-		return command_error;
-	if (parse_uint8(argv[1], &start) != command_success)
-		return command_error;
-	if (parse_uint8(argv[2], &end) != command_success)
-		return command_error;
-	length = (int) end - (int) start + 1;
-	status = ccdbg_read_sfr(s51_dbg, start, memory, length);
-	dump_bytes(memory, length, start, "0x%02x ");
-	return command_success;
-}
-
-enum command_result
-command_dx (int argc, char **argv)
-{
-	uint16_t start, end;
-	uint8_t	memory[65536];
-	uint8_t status;
-	int length;
-
-	if (argc != 3)
-		return command_error;
-	if (parse_uint16(argv[1], &start) != command_success)
-		return command_error;
-	if (parse_uint16(argv[2], &end) != command_success)
-		return command_error;
-	length = (int) end - (int) start + 1;
-	status = ccdbg_read_memory(s51_dbg, start, memory, length);
-	dump_bytes(memory, length, start, "0x%04x ");
-	return command_success;
-}
-
-enum command_result
-command_set (int argc, char **argv)
-{
-	uint16_t address;
-	uint8_t *data;
-	int len = argc - 3;
-	int i;
-	enum command_result ret = command_success;
-
-	if (len < 0)
-		return command_error;
-	if (parse_uint16(argv[2], &address) != command_success)
-		return command_error;
-	if (len == 0)
-		return command_success;
-	data = malloc(len);
-	if (!data)
-		return command_error;
-	for (i = 0; i < len; i++)
-		if (parse_uint8(argv[i+3], &data[i]) != command_success)
-			return command_error;
-
-	if (strcmp(argv[1], "xram") == 0) {
-		ccdbg_write_memory(s51_dbg, address, data, len);
-	} else if (strcmp(argv[1], "iram") == 0) {
-		ccdbg_write_memory(s51_dbg, address + 0xff00, data, len);
-	} else if (strcmp(argv[1], "sfr") == 0) {
-		ccdbg_write_sfr(s51_dbg, (uint8_t) address, data, len);
-	} else
-		ret = command_error;
-	free(data);
-	return ret;
-}
-
-enum command_result
-command_dump (int argc, char **argv)
-{
-	if (argv[1]) {
-		if (strcmp(argv[1], "rom") == 0 ||
-		    strcmp(argv[1], "xram") == 0)
-			return command_dx(argc-1, argv+1);
-		if (strcmp(argv[1], "iram") == 0)
-			return command_di(argc-1, argv+1);
-		if (strcmp(argv[1], "sfr") == 0)
-			return command_ds(argc-1, argv+1);
-	}
-	return command_error;
-}
-
-enum command_result
-command_file (int argc, char **argv)
-{
-	struct hex_file *hex;
-	struct hex_image *image;
-	FILE *file;
-
-	if (argc != 2)
-		return command_error;
-	file = fopen (argv[1], "r");
-	if (!file)
-		return command_error;
-	hex = ccdbg_hex_file_read(file, argv[1]);
-	fclose(file);
-	if (!hex)
-		return command_error;
-	if (hex->nrecord == 0) {
-		ccdbg_hex_file_free(hex);
-		return command_error;
-	}
-	image = ccdbg_hex_image_create(hex);
-	ccdbg_hex_file_free(hex);
-	start_address = image->address;
-	ccdbg_set_rom(s51_dbg, image);
-	return command_success;
-}
-
-enum command_result
-command_pc (int argc, char **argv)
-{
-	uint16_t	pc;
-	if (argv[1]) {
-		enum command_result result;
-		result = parse_uint16(argv[1], &pc);
-		if (result != command_success)
-			return result;
-		ccdbg_set_pc(s51_dbg, pc);
-	} else {
-		pc = ccdbg_get_pc(s51_dbg);
-		s51_printf("   0x%04x 00\n", pc);
-	}
-	return command_success;
-}
-
-struct cc_break {
-	int		enabled;
-	int		temporary;
-	uint16_t	address;
-};
-
-#define CC_NUM_BREAKPOINTS 4
-
-static struct cc_break	breakpoints[CC_NUM_BREAKPOINTS];
-
-static void
-disable_breakpoint(int b)
-{
-	uint8_t status;
-
-	status = ccdbg_set_hw_brkpnt(s51_dbg, b, 0, breakpoints[b].address);
-	if (status != 0x00 && status != 0xff)
-		s51_printf("disable_breakpoint status 0x%02x\n", status);
-}
-
-static void
-enable_breakpoint(int b)
-{
-	uint8_t status;
-
-	status = ccdbg_set_hw_brkpnt(s51_dbg, b, 1, breakpoints[b].address);
-	if (status != 0xff)
-		s51_printf("enable_breakpoint status 0x%02x\n", status);
-}
-
-static void
-enable_breakpoints(void)
-{
-	int b;
-	for (b = 0; b < CC_NUM_BREAKPOINTS; b++)
-		if (breakpoints[b].enabled)
-			enable_breakpoint(b);
-}
-
-enum command_result
-set_breakpoint(uint16_t address, int temporary)
-{
-	int b;
-	uint8_t status;
-	for (b = 0; b < CC_NUM_BREAKPOINTS; b++) {
-		if (breakpoints[b].enabled == 0)
-			break;
-		if (breakpoints[b].address == address)
-			break;
-	}
-	if (b == CC_NUM_BREAKPOINTS) {
-		s51_printf("Error: too many breakpoints requested\n");
-		return command_success;
-	}
-	if (breakpoints[b].enabled == 0) {
-		breakpoints[b].address = address;
-		enable_breakpoint(b);
-	}
-	++breakpoints[b].enabled;
-	s51_printf("Breakpoint %d at 0x%04x\n", b, address);
-	breakpoints[b].temporary += temporary;
-	return command_success;
-}
-
-enum command_result
-clear_breakpoint(uint16_t address, int temporary)
-{
-	int b;
-	uint8_t status;
-
-	for (b = 0; b < CC_NUM_BREAKPOINTS; b++) {
-		if (breakpoints[b].enabled != 0 &&
-		    ((breakpoints[b].temporary != 0) == (temporary != 0)) &&
-		    breakpoints[b].address == address)
-			break;
-	}
-	if (b == CC_NUM_BREAKPOINTS) {
-		s51_printf("Error: no matching breakpoint found\n");
-		return command_success;
-	}
-	--breakpoints[b].enabled;
-	breakpoints[b].temporary -= temporary;
-	if (breakpoints[b].enabled == 0) {
-		disable_breakpoint(b);
-		breakpoints[b].address = -1;
-	}
-	return command_success;
-}
-
-
-int
-find_breakpoint(uint16_t address)
-{
-	int b;
-
-	for (b = 0; b < CC_NUM_BREAKPOINTS; b++)
-		if (breakpoints[b].enabled && breakpoints[b].address == address)
-			break;
-	if (b == CC_NUM_BREAKPOINTS)
-		return -1;
-	return b;
-}
-
-enum command_result
-command_break (int argc, char **argv)
-{
-	int b;
-	uint16_t address;
-	enum command_result result;
-
-	if (argc == 1) {
-		for (b = 0; b < CC_NUM_BREAKPOINTS; b++)
-			if (breakpoints[b].enabled)
-				s51_printf("Breakpoint %d 0x%04x\n",
-					b, breakpoints[b].address);
-		return command_success;
-	}
-	if (argc != 2)
-		return command_error;
-	result = parse_uint16(argv[1], &address);
-	if (result != command_success)
-		return result;
-
-	return set_breakpoint(address, 0);
-}
-
-enum command_result
-command_clear (int argc, char **argv)
-{
-	int b;
-	uint16_t address;
-	enum command_result result;
-
-	if (argc != 2)
-		return command_error;
-	result = parse_uint16(argv[1], &address);
-	if (result != command_success)
-		return result;
-	return clear_breakpoint(address, 0);
-}
-
-void
-cc_stopped(uint8_t status)
-{
-	uint16_t pc;
-	int b;
-	int code;
-	char *reason;
-
-	pc = ccdbg_get_pc(s51_dbg);
-	if (status & CC_STATUS_CPU_HALTED) {
-		if ((status & CC_STATUS_HALT_STATUS) != 0) {
-			pc = pc - 1;
-			code = 104;
-			reason = "Breakpoint";
-			b = find_breakpoint(pc);
-			if (b != -1 && breakpoints[b].temporary)
-				clear_breakpoint(pc, 1);
-			ccdbg_set_pc(s51_dbg, pc);
-		} else {
-			code = 105;
-			reason = "Interrupt";
-		}
-		s51_printf("Stop at 0x%04x: (%d) %s\n",
-			pc, code, reason);
-	}
-}
-
-uint8_t
-cc_step(uint16_t pc)
-{
-	int b;
-	uint8_t status;
-
-	b = find_breakpoint(pc);
-	if (b != -1)
-		disable_breakpoint(b);
-	status = ccdbg_step_instr(s51_dbg);
-	if (b != -1)
-		enable_breakpoint(b);
-	return status;
-}
-
-enum command_result
-command_run (int argc, char **argv)
-{
-	uint16_t start, end;
-	enum command_result result;
-	uint16_t pc;
-	uint8_t status;
-	int b;
-
-	if (argv[1]) {
-		result = parse_uint16(argv[1], &start);
-		if (result != command_success)
-			return result;
-		if (argv[2]) {
-			result = parse_uint16(argv[2], &end);
-			if (result != command_success)
-				return result;
-		}
-		if (start_address && start == 0) {
-			start = start_address;
-			s51_printf("Starting at 0x%04x\n", start);
-		}
-		ccdbg_set_pc(s51_dbg, start);
-	}
-	else
-		start = ccdbg_get_pc(s51_dbg);
-	s51_printf("Resume at 0x%04x\n", start);
-	pc = start;
-	b = find_breakpoint(pc);
-	if (b != -1) {
-		cc_step(pc);
-		pc = ccdbg_get_pc(s51_dbg);
-		if (find_breakpoint(pc) != -1) {
-			status = ccdbg_read_status(s51_dbg);
-			cc_stopped(status);
-			return command_success;
-		}
-	}
-	ccdbg_resume(s51_dbg);
-	result = cc_wait();
-	return result;
-}
-
-enum command_result
-command_next (int argc, char **argv)
-{
-	return command_step(argc, argv);
-}
-
-enum command_result
-command_step (int argc, char **argv)
-{
-	uint16_t pc;
-	uint8_t	opcode;
-	uint8_t a;
-
-	a = cc_step(ccdbg_get_pc(s51_dbg));
-	s51_printf(" ACC= 0x%02x\n", a);
-	pc = ccdbg_get_pc(s51_dbg);
-	ccdbg_read_memory(s51_dbg, pc, &opcode, 1);
-	s51_printf(" ? 0x%04x %02x\n", pc, opcode);
-	return command_success;
-}
-
-enum command_result
-command_load (int argc, char **argv)
-{
-	char *filename = argv[1];
-	FILE *file;
-	struct hex_file	*hex;
-	struct hex_image *image;
-
-	if (!filename)
-		return command_error;
-	file = fopen(filename, "r");
-	if (!file) {
-		perror(filename);
-		return command_error;
-	}
-	hex = ccdbg_hex_file_read(file, filename);
-	fclose(file);
-	if (!hex) {
-		return command_error;
-	}
-	image = ccdbg_hex_image_create(hex);
-	ccdbg_hex_file_free(hex);
-	if (!image) {
-		fprintf(stderr, "image create failed\n");
-		return command_error;
-	}
-	if (image->address >= 0xf000) {
-		printf("Loading %d bytes to RAM at 0x%04x\n",
-		       image->length, image->address);
-		ccdbg_write_hex_image(s51_dbg, image, 0);
-	} else {
-		fprintf(stderr, "Can only load to RAM\n");
-	}
-	ccdbg_hex_image_free(image);
-	return command_success;
-}
-
-enum command_result
-command_halt (int argc, char **argv)
-{
-	uint16_t	pc;
-	ccdbg_halt(s51_dbg);
-	pc = ccdbg_get_pc(s51_dbg);
-	s51_printf("Halted at 0x%04x\n", pc);
-	return command_success;
-}
-
-enum command_result
-command_stop (int argc, char **argv)
-{
-	return command_success;
-}
-
-enum command_result
-command_reset (int argc, char **argv)
-{
-	ccdbg_debug_mode(s51_dbg);
-	ccdbg_halt(s51_dbg);
-	enable_breakpoints();
-	return command_success;
-}
-
-enum command_result
-command_status(int argc, char **argv)
-{
-	uint8_t	status;
-
-	status = ccdbg_read_status(s51_dbg);
-	if ((status & CC_STATUS_CHIP_ERASE_DONE) == 0)
-		s51_printf("\tChip erase in progress\n");
-	if (status & CC_STATUS_PCON_IDLE)
-		s51_printf("\tCPU is idle (clock gated)\n");
-	if (status & CC_STATUS_CPU_HALTED)
-		s51_printf("\tCPU halted\n");
-	else
-		s51_printf("\tCPU running\n");
-	if ((status & CC_STATUS_POWER_MODE_0) == 0)
-		s51_printf("\tPower Mode 1-3 selected\n");
-	if (status & CC_STATUS_HALT_STATUS)
-		s51_printf("\tHalted by software or hw breakpoint\n");
-	else
-		s51_printf("\tHalted by debug command\n");
-	if (status & CC_STATUS_DEBUG_LOCKED)
-		s51_printf("\tDebug interface is locked\n");
-	if ((status & CC_STATUS_OSCILLATOR_STABLE) == 0)
-		s51_printf("\tOscillators are not stable\n");
-	if (status & CC_STATUS_STACK_OVERFLOW)
-		s51_printf("\tStack overflow\n");
-	return command_success;
-}
-
-static enum command_result
-info_breakpoints(int argc, char **argv)
-{
-	int b;
-	uint16_t address;
-	enum command_result result;
-
-	if (argc == 1) {
-		s51_printf("Num Type       Disp Hit   Cnt   Address  What\n");
-		for (b = 0; b < CC_NUM_BREAKPOINTS; b++)
-			if (breakpoints[b].enabled) {
-				s51_printf("%-3d fetch      %s 1     1     0x%04x   uc::disass() unimplemented\n",
-					   b,
-					   breakpoints[b].temporary ? "del " : "keep",
-					   breakpoints[b].address);
-			}
-		return command_success;
-	}
-
-}
-
-static enum command_result
-info_help(int argc, char **argv);
-
-static struct command_function infos[] = {
-	{ "breakpoints", "b", info_breakpoints, "[b]reakpoints",
-		"List current breakpoints\n" },
-	{ "help",   "?",  info_help,	"help",
-		"Print this list\n" },
-
-	{ NULL, NULL, NULL, NULL, NULL },
-};
-
-static enum command_result
-info_help(int argc, char **argv)
-{
-	return command_function_help(infos, argc, argv);
-}
-
-enum command_result
-command_info(int argc, char **argv)
-{
-	struct command_function *func;
-
-	if (argc < 2)
-		return command_error;
-	func = command_string_to_function(infos, argv[1]);
-	if (!func)
-		return command_syntax;
-	return (*func->func)(argc-1, argv+1);
-}
-
-enum command_result
-cc_wait(void)
-{
-	for(;;) {
-		uint8_t status;
-		status = ccdbg_read_status(s51_dbg);
-		if (status & CC_STATUS_CPU_HALTED) {
-			cc_stopped(status);
-			return command_success;
-		}
-		if (s51_interrupted || s51_check_input()) {
-
-			ccdbg_halt(s51_dbg);
-			status = ccdbg_read_status(s51_dbg);
-			cc_stopped(status);
-			return command_interrupt;
-		}
-	}
-}
diff --git a/cctools/s51/s51-main.c b/cctools/s51/s51-main.c
deleted file mode 100644
index 4dbd4c60..00000000
--- a/cctools/s51/s51-main.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright © 2008 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-#include "s51.h"
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <poll.h>
-
-static int s51_port = 0;
-static char *cpu = "8051";
-static double freq = 11059200;
-char *s51_prompt = "> ";
-struct ccdbg *s51_dbg;
-int s51_interrupted = 0;
-int s51_monitor = 0;
-
-static FILE *s51_input;
-static FILE *s51_output;
-
-static void
-usage(void)
-{
-	fprintf(stderr, "You're doing it wrong.\n");
-	exit(1);
-}
-
-void s51_sigint()
-{
-	s51_interrupted = 1;
-}
-
-int
-main(int argc, char **argv)
-{
-	int flags, opt;
-	char *endptr;
-	struct sigvec vec, ovec;
-
-	while ((opt = getopt(argc, argv, "PVvHhmt:X:c:r:Z:s:S:p:")) != -1) {
-		switch (opt) {
-		case 't':
-			cpu = optarg;
-			break;
-		case 'X':
-			freq = strtod(optarg, &endptr);
-			if (endptr == optarg)
-				usage();
-			if (endptr[0] != '\0') {
-				if (!strcmp(endptr, "k"))
-					freq *= 1000;
-				else if (!strcmp(endptr, "M") )
-					freq *= 1000000;
-				else
-					usage ();
-			}
-			break;
-		case 'c':
-			break;
-		case 'r':
-		case 'Z':
-			s51_port = strtol(optarg, &endptr, 0);
-			if (endptr == optarg || strlen(endptr) != 0)
-				usage();
-			break;
-		case 's':
-			break;
-		case 'S':
-			break;
-		case 'p':
-			s51_prompt = optarg;
-			break;
-		case 'P':
-			s51_prompt = NULL;
-			break;
-		case 'V':
-			break;
-		case 'v':
-			break;
-		case 'H':
-			exit (0);
-			break;
-		case 'h':
-			usage ();
-			break;
-		case 'm':
-			s51_monitor = 1;
-			break;
-		}
-	}
-	if (s51_port) {
-		int l, r, one = 1;
-		int s;
-		struct sockaddr_in in;
-
-		l = socket(AF_INET, SOCK_STREAM, 0);
-		if (l < 0) {
-			perror ("socket");
-			exit(1);
-		}
-		r = setsockopt(l, SOL_SOCKET, SO_REUSEADDR, &one, sizeof (int));
-		if (r) {
-			perror("setsockopt");
-			exit(1);
-		}
-		in.sin_family = AF_INET;
-		in.sin_port = htons(s51_port);
-		in.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-		r = bind(l, (struct sockaddr *) &in, sizeof (in));
-		if (r) {
-			perror("bind");
-			exit(1);
-		}
-		r = listen(l, 5);
-		if (r) {
-			perror("listen");
-			exit(1);
-		}
-		for (;;) {
-			struct sockaddr_in client_addr;
-			socklen_t client_len = sizeof (struct sockaddr_in);
-
-			s = accept(l, (struct sockaddr *)
-				   &client_addr, &client_len);
-			if (s < 0) {
-				perror("accept");
-				exit(1);
-			}
-			s51_input = fdopen(s, "r");
-			s51_output = fdopen(s, "w");
-			if (!s51_input || !s51_output) {
-				perror("fdopen");
-				exit(1);
-			}
-			vec.sv_handler = SIG_IGN;
-			vec.sv_mask = 0;
-			vec.sv_flags = 0;
-			sigvec(SIGINT, &vec, &ovec);
-			command_read();
-			sigvec(SIGINT, &ovec, NULL);
-			fclose(s51_input);
-			fclose(s51_output);
-		}
-	} else {
-		s51_input = stdin;
-		s51_output = stdout;
-		vec.sv_handler = s51_sigint;
-		vec.sv_mask = 0;
-		vec.sv_flags = 0;
-		sigvec(SIGINT, &vec, &ovec);
-		command_read();
-	}
-	exit(0);
-}
-
-void
-s51_printf(char *format, ...)
-{
-	va_list	ap;
-
-	va_start(ap, format);
-	vfprintf(s51_output, format, ap);
-	if (s51_monitor)
-		vfprintf(stdout, format, ap);
-	va_end(ap);
-}
-
-void
-s51_putc(int c)
-{
-	putc(c, s51_output);
-}
-
-#include <readline/readline.h>
-#include <readline/history.h>
-
-int
-s51_read_line(char *line, int len)
-{
-	int ret;
-	if (s51_output == stdout && s51_input == stdin && s51_prompt) {
-		char *r;
-
-		r = readline(s51_prompt);
-		if (r == NULL)
-			return 0;
-		strncpy (line, r, len);
-		line[len-1] = '\0';
-		add_history(r);
-		return 1;
-	} else {
-		if (s51_prompt)
-			s51_printf("%s", s51_prompt);
-		else
-			s51_putc('\0');
-		fflush(s51_output);
-		ret = fgets(line, len, s51_input) != NULL;
-		if (s51_monitor)
-			printf("> %s", line);
-		fflush(stdout);
-	}
-	return ret;
-}
-
-int
-s51_check_input(void)
-{
-	struct pollfd	input;
-	int r;
-	int c;
-
-	input.fd = fileno(s51_input);
-	input.events = POLLIN;
-	r = poll(&input, 1, 0);
-	if (r > 0) {
-		char line[256];
-		(void) s51_read_line(line, sizeof (line));
-		return 1;
-	}
-	return 0;
-}
diff --git a/cctools/s51/s51-parse.c b/cctools/s51/s51-parse.c
deleted file mode 100644
index 170c979d..00000000
--- a/cctools/s51/s51-parse.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright © 2008 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-#include "s51.h"
-
-static struct command_function functions[] = {
-	{ "help",   "?",  command_help,	"help",		"Print this list\n" },
-	{ "quit",   "q",  command_quit,	"[q]uit",	"Quit\n" },
-	{ "di",	    "di", command_di,	"di <start> <end>",
-		"Dump imem\n" },
-	{ "ds",	    "ds", command_ds,	"ds <start> <end>",
-		"Dump sprs\n" },
-	{ "dx",	    "dx", command_dx,	"dx <start> <end>",
-		"Dump xaddr\n" },
-	{ "set",    "t",  command_set,	"se[t] mem <prefix> <address> <data> ...",
-		"Set mem {xram|rom|iram|sfr}\n"
-		"set bit <addr>\n" },
-	{ "dump",   "d",  command_dump,	"[d]ump <prefix> <start> <end>",
-		"Dump {xram|rom|iram|sfr} <start> <end>\n" },
-	{ "file", "file", command_file, "file <filename>",
-		"Pretend to load executable from <filename>\n" },
-	{ "pc",	    "p",  command_pc, "[p]c [addr]",
-		"Get or set pc value\n" },
-	{ "break",  "b",  command_break,"[b]reak <addr>",
-		"Set break point\n" },
-	{ "clear",  "c",  command_clear,"[c]lear <addr>",
-		"Clear break point\n" },
-	{ "run",    "r",  command_run, "[r]un [start] [stop]",
-		"Run with optional start and temp breakpoint addresses\n" },
-	{ "go",     "g",  command_run, "[g]o [start] [stop]",
-		"Run with optional start and temp breakpoint addresses\n" },
-	{ "next",   "n",  command_next, "[n]ext",
-		"Step over one instruction, past any call\n" },
-	{ "step",   "s",  command_step, "[s]tep",
-		"Single step\n" },
-	{ "load",   "l",  command_load, "[l]oad <file>",
-		"Load a hex file into memory or flash" },
-	{ "halt",   "h",  command_halt, "[h]alt",
-		"Halt the processor\n" },
-	{ "reset","res",command_reset,	"[res]et",
-		"Reset the CPU\n" },
-	{ "status","status",command_status, "status",
-		"Display CC1111 debug status\n" },
-	{ "info",   "i",  command_info, "[i]info",
-		"Get information\n" },
-	{ "stop",  "stop", command_stop, "stop",
-		"Ignored\n" },
-	{ NULL, NULL, NULL, NULL, NULL },
-};
-
-#ifndef FALSE
-#define FALSE 0
-#define TRUE 1
-#endif
-
-static int
-string_to_int(char *s, int *v)
-{
-	char *endptr;
-
-	if (isdigit(s[0]) || s[0] == '-' || s[0] == '+') {
-		*v = strtol(s, &endptr, 0);
-		if (endptr == s)
-			return FALSE;
-	} else if (*s == '\'') {
-		s++;
-		if (*s == '\\') {
-			s++;
-			switch (*s) {
-			case 'n':
-				*v = '\n';
-				break;
-			case 't':
-				*v = '\t';
-				break;
-			default:
-				*v = (int) *s;
-				break;
-			}
-		} else
-			*v = (int) *s;
-		s++;
-		if (*s != '\'')
-			return FALSE;
-	}
-	else
-		return FALSE;
-    return TRUE;
-}
-
-struct command_function *
-command_string_to_function(struct command_function *functions, char *name)
-{
-	int i;
-	for (i = 0; functions[i].name; i++)
-		if (!strcmp(name, functions[i].name) ||
-		    !strcmp(name, functions[i].alias))
-			return &functions[i];
-	return NULL;
-}
-
-enum command_result
-command_function_help(struct command_function *functions, int argc, char **argv)
-{
-	int i;
-	struct command_function *func;
-
-	if (argc == 1) {
-		for (i = 0; functions[i].name; i++)
-			s51_printf("%-10s%s\n", functions[i].name,
-			       functions[i].usage);
-	} else {
-		for (i = 1; i < argc; i++) {
-			func = command_string_to_function(functions, argv[i]);
-			if (!func) {
-				s51_printf("%-10s unknown command\n", argv[i]);
-				return command_syntax;
-			}
-			s51_printf("%-10s %s\n%s", func->name,
-			       func->usage, func->help);
-		}
-	}
-	return command_debug;
-}
-
-static int
-command_split_into_words(char *line, char **argv)
-{
-	char quotechar;
-	int argc;
-
-	argc = 0;
-	while (*line) {
-		while (isspace(*line))
-			line++;
-		if (!*line)
-			break;
-		if (*line == '"') {
-			quotechar = *line++;
-			*argv++ = line;
-			argc++;
-			while (*line && *line != quotechar)
-				line++;
-			if (*line)
-				*line++ = '\0';
-		} else {
-			*argv++ = line;
-			argc++;
-			while (*line && !isspace(*line))
-				line++;
-			if (*line)
-				*line++ = '\0';
-		}
-	}
-	*argv = 0;
-	return argc;
-}
-
-enum command_result
-command_help(int argc, char **argv)
-{
-	return command_function_help(functions, argc, argv);
-}
-
-void
-command_syntax_error(int argc, char **argv)
-{
-	s51_printf("Syntax error in:");
-	while (*argv)
-		s51_printf(" %s", *argv++);
-	s51_printf("\n");
-}
-
-void
-command_read (void)
-{
-	int argc;
-	char line[1024];
-	char *argv[20];
-	enum command_result result;
-	struct command_function *func;
-
-	s51_dbg = ccdbg_open ();
-	if (!s51_dbg) {
-		perror("ccdbg_open");
-		exit(1);
-	}
-	ccdbg_debug_mode(s51_dbg);
-	ccdbg_halt(s51_dbg);
-	s51_printf("Welcome to the non-simulated processor\n");
-	for (;;) {
-		if (s51_read_line (line, sizeof line) == 0)
-			break;
-		s51_interrupted = 0;
-		argc = command_split_into_words(line, argv);
-		if (argc > 0) {
-			func = command_string_to_function(functions, argv[0]);
-			if (!func)
-				command_syntax_error(argc, argv);
-			else
-			{
-				result = (*func->func)(argc, argv);
-				if (s51_interrupted)
-					result = command_interrupt;
-				switch (result) {
-				case command_syntax:
-					command_syntax_error(argc, argv);
-					break;
-				case command_error:
-					s51_printf("Error\n");
-					break;
-				case command_success:
-					break;
-				case command_interrupt:
-					ccdbg_halt(s51_dbg);
-					s51_printf("Interrupted\n");
-					break;
-				default:
-					break;
-				}
-			}
-		}
-	}
-	ccdbg_close(s51_dbg);
-	s51_printf("...\n");
-}
diff --git a/cctools/s51/s51.h b/cctools/s51/s51.h
deleted file mode 100644
index f4dcce66..00000000
--- a/cctools/s51/s51.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright © 2008 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-#include <ccdbg.h>
-
-extern char *s51_prompt;
-extern struct ccdbg *s51_dbg;
-extern int s51_interrupted;
-extern int s51_monitor;
-
-enum command_result {
-	command_success, command_debug, command_syntax, command_interrupt, command_error,
-};
-
-struct command_function {
-	char			*name;
-	char			*alias;
-	enum command_result	(*func)(int argc, char **argv);
-	char			*usage;
-	char			*help;
-};
-
-struct command_function *
-command_string_to_function(struct command_function *functions, char *name);
-
-enum command_result
-command_function_help(struct command_function *functions, int argc, char **argv);
-
-void
-command_syntax_error(int argc, char **argv);
-
-enum command_result
-command_quit (int argc, char **argv);
-
-enum command_result
-command_help (int argc, char **argv);
-
-enum command_result
-command_stop (int argc, char **argv);
-
-enum command_result
-command_di (int argc, char **argv);
-
-enum command_result
-command_ds (int argc, char **argv);
-
-enum command_result
-command_dx (int argc, char **argv);
-
-enum command_result
-command_set (int argc, char **argv);
-
-enum command_result
-command_dump (int argc, char **argv);
-
-enum command_result
-command_file (int argc, char **argv);
-
-enum command_result
-command_pc (int argc, char **argv);
-
-enum command_result
-command_break (int argc, char **argv);
-
-enum command_result
-command_clear (int argc, char **argv);
-
-enum command_result
-command_run (int argc, char **argv);
-
-enum command_result
-command_next (int argc, char **argv);
-
-enum command_result
-command_step (int argc, char **argv);
-
-enum command_result
-command_load (int argc, char **argv);
-
-enum command_result
-command_halt (int argc, char **argv);
-
-enum command_result
-command_reset (int argc, char **argv);
-
-enum command_result
-command_status (int argc, char **argv);
-
-enum command_result
-command_info (int argc, char **argv);
-
-enum command_result
-cc_wait(void);
-
-void
-command_read (void);
-
-void
-s51_printf(char *format, ...);
-
-void
-s51_putc(int c);
-
-int
-s51_check_input(void);
-
-int
-s51_read_line(char *line, int len);
diff --git a/configure.ac b/configure.ac
index e3bc2df9..b52bb6e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,13 +73,13 @@ PKG_CHECK_MODULES([ALSA], [alsa])
 
 AC_OUTPUT([
 Makefile
-aoview/Makefile
-cctools/Makefile
-cctools/lib/Makefile
-cctools/ccload/Makefile
-cctools/s51/Makefile
-cctools/ccmanual/Makefile
-cctools/ccdump/Makefile
-cctools/aoload/Makefile
-utils/Makefile
+ao-view/Makefile
+ao-tools/Makefile
+ao-tools/lib/Makefile
+ao-tools/ao-rawload/Makefile
+ao-tools/ao-dbg/Makefile
+ao-tools/ao-bitbang/Makefile
+ao-tools/ao-eeprom/Makefile
+ao-tools/ao-load/Makefile
+ao-utils/Makefile
 ])
diff --git a/utils/Makefile.am b/utils/Makefile.am
deleted file mode 100644
index b0260c87..00000000
--- a/utils/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-dist_bin_SCRIPTS = ejection