110 files changed, 82 insertions, 78 deletions
diff --git a/.gitignore b/.gitignore
index 71b0a614..8b83dd3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,16 +13,19 @@
 *.sym
 .deps
 aclocal.m4
-ao_flight_test
+src/ao_flight_test
+src/ao_gps_test
 ao-teledongle.h
 ao-telemetrum.h
 ao-teleterra.h
 ao-tidongle.h
-aoload/aoload
-ccdump/ccdump
-ccmanual/ccmanual
-aoview/Makefile
-aoview/aoview
+ao-tools/ao-bitbang/ao-bitbang
+ao-tools/ao-dbg/ao-dbg
+ao-tools/ao-eeprom/ao-eeprom
+ao-tools/ao-load/ao-load
+ao-tools/ao-rawload/ao-rawload
+ao-view/Makefile
+ao-view/ao-view
 autom4te.cache
 config.*
 config.h
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-command.c b/ao-tools/ao-dbg/ao-dbg-command.c
index 4f803060..eab7bc68 100644
--- a/cctools/s51/s51-command.c
+++ b/ao-tools/ao-dbg/ao-dbg-command.c
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-#include "s51.h"
+#include "ao-dbg.h"
 
 static uint16_t start_address;
 
diff --git a/cctools/s51/s51-main.c b/ao-tools/ao-dbg/ao-dbg-main.c
index 4dbd4c60..72249a6b 100644
--- a/cctools/s51/s51-main.c
+++ b/ao-tools/ao-dbg/ao-dbg-main.c
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-#include "s51.h"
+#include "ao-dbg.h"
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/cctools/s51/s51-parse.c b/ao-tools/ao-dbg/ao-dbg-parse.c
index 170c979d..5db6c01c 100644
--- a/cctools/s51/s51-parse.c
+++ b/ao-tools/ao-dbg/ao-dbg-parse.c
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-#include "s51.h"
+#include "ao-dbg.h"
 
 static struct command_function functions[] = {
 	{ "help",   "?",  command_help,	"help",		"Print this list\n" },
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/s51.h b/ao-tools/ao-dbg/ao-dbg.h
index f4dcce66..f4dcce66 100644
--- a/cctools/s51/s51.h
+++ b/ao-tools/ao-dbg/ao-dbg.h
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/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