altos: Rename 'core' to 'kernel'

core remains a bad name to use -- dirvish skips files (and
directories, it seems) with that name.

Signed-off-by: Keith Packard <keithp@keithp.com>

127 files changed, 60 insertions, 60 deletions

diff --git a/src/avr-demo/Makefile b/src/avr-demo/Makefile
index 6d9bfea2..e21ad047 100644
--- a/src/avr-demo/Makefile
+++ b/src/avr-demo/Makefile
@@ -2,7 +2,7 @@
 # AltOS build
 #
 #
-vpath % ..:../core:../product:../drivers:../avr
+vpath % ..:../kernel:../product:../drivers:../avr
 vpath make-altitude ..
 vpath make-kalman ..
 vpath kalman.5c ../kalman
@@ -46,7 +46,7 @@ PRODUCT=AvrDemo-v0.0
 MCU=atmega32u4
 PRODUCT_DEF=-DAVR_DEMO
 IDPRODUCT=0x000a
-CFLAGS = $(PRODUCT_DEF) -I. -I../avr -I../core -I..
+CFLAGS = $(PRODUCT_DEF) -I. -I../avr -I../kernel -I..
 CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -Os -mcall-prologues
 
 NICKLE=nickle
diff --git a/src/cc1111/Makefile.cc1111 b/src/cc1111/Makefile.cc1111
index 78b653b3..0ea30e1d 100644
--- a/src/cc1111/Makefile.cc1111
+++ b/src/cc1111/Makefile.cc1111
@@ -3,7 +3,7 @@ CC=$(SDCC)
 
 CFLAGS=--model-small --debug --opt-code-speed -DCODESIZE=$(CODESIZE)
 
-CFLAGS += $(PRODUCT_DEF) -I. -I.. -I../core -I../cc1111 -I../drivers -I../product
+CFLAGS += $(PRODUCT_DEF) -I. -I.. -I../kernel -I../cc1111 -I../drivers -I../product
 
 CODESIZE ?= 0x8000
 
diff --git a/src/core/altitude.h b/src/kernel/altitude.h
index a278bbc6..a278bbc6 100644
--- a/src/core/altitude.h
+++ b/src/kernel/altitude.h
diff --git a/src/core/ao.h b/src/kernel/ao.h
index 29ad2603..29ad2603 100644
--- a/src/core/ao.h
+++ b/src/kernel/ao.h
diff --git a/src/core/ao_adc.h b/src/kernel/ao_adc.h
index 373db1c4..373db1c4 100644
--- a/src/core/ao_adc.h
+++ b/src/kernel/ao_adc.h
diff --git a/src/core/ao_aes.h b/src/kernel/ao_aes.h
index c47bc2db..c47bc2db 100644
--- a/src/core/ao_aes.h
+++ b/src/kernel/ao_aes.h
diff --git a/src/core/ao_balloon.c b/src/kernel/ao_balloon.c
index 904a9c08..904a9c08 100644
--- a/src/core/ao_balloon.c
+++ b/src/kernel/ao_balloon.c
diff --git a/src/core/ao_beep.h b/src/kernel/ao_beep.h
index 55f61171..55f61171 100644
--- a/src/core/ao_beep.h
+++ b/src/kernel/ao_beep.h
diff --git a/src/core/ao_btm.h b/src/kernel/ao_btm.h
index 484e5d7f..484e5d7f 100644
--- a/src/core/ao_btm.h
+++ b/src/kernel/ao_btm.h
diff --git a/src/core/ao_cmd.c b/src/kernel/ao_cmd.c
index 4ebaa607..4ebaa607 100644
--- a/src/core/ao_cmd.c
+++ b/src/kernel/ao_cmd.c
diff --git a/src/core/ao_companion.h b/src/kernel/ao_companion.h
index 035325a3..035325a3 100644
--- a/src/core/ao_companion.h
+++ b/src/kernel/ao_companion.h
diff --git a/src/core/ao_config.c b/src/kernel/ao_config.c
index 4482f673..4482f673 100644
--- a/src/core/ao_config.c
+++ b/src/kernel/ao_config.c
diff --git a/src/core/ao_config.h b/src/kernel/ao_config.h
index e101af8e..e101af8e 100644
--- a/src/core/ao_config.h
+++ b/src/kernel/ao_config.h
diff --git a/src/core/ao_convert.c b/src/kernel/ao_convert.c
index aa9b5f48..aa9b5f48 100644
--- a/src/core/ao_convert.c
+++ b/src/kernel/ao_convert.c
diff --git a/src/core/ao_convert_pa.c b/src/kernel/ao_convert_pa.c
index fe6e0ef6..fe6e0ef6 100644
--- a/src/core/ao_convert_pa.c
+++ b/src/kernel/ao_convert_pa.c
diff --git a/src/core/ao_convert_pa_test.c b/src/kernel/ao_convert_pa_test.c
index 7d5b1922..7d5b1922 100644
--- a/src/core/ao_convert_pa_test.c
+++ b/src/kernel/ao_convert_pa_test.c
diff --git a/src/core/ao_convert_test.c b/src/kernel/ao_convert_test.c
index 87e76841..87e76841 100644
--- a/src/core/ao_convert_test.c
+++ b/src/kernel/ao_convert_test.c
diff --git a/src/core/ao_convert_volt.c b/src/kernel/ao_convert_volt.c
index 8556d423..8556d423 100644
--- a/src/core/ao_convert_volt.c
+++ b/src/kernel/ao_convert_volt.c
diff --git a/src/core/ao_data.c b/src/kernel/ao_data.c
index 6a3d02a1..6a3d02a1 100644
--- a/src/core/ao_data.c
+++ b/src/kernel/ao_data.c
diff --git a/src/core/ao_data.h b/src/kernel/ao_data.h
index c4b062fd..c4b062fd 100644
--- a/src/core/ao_data.h
+++ b/src/kernel/ao_data.h
diff --git a/src/core/ao_dbg.h b/src/kernel/ao_dbg.h
index 181e6ec2..181e6ec2 100644
--- a/src/core/ao_dbg.h
+++ b/src/kernel/ao_dbg.h
diff --git a/src/core/ao_debounce.c b/src/kernel/ao_debounce.c
index b9d67729..b9d67729 100644
--- a/src/core/ao_debounce.c
+++ b/src/kernel/ao_debounce.c
diff --git a/src/core/ao_debounce.h b/src/kernel/ao_debounce.h
index 19c620f5..19c620f5 100644
--- a/src/core/ao_debounce.h
+++ b/src/kernel/ao_debounce.h
diff --git a/src/core/ao_ee_fake.c b/src/kernel/ao_ee_fake.c
index 7fcfcab0..7fcfcab0 100644
--- a/src/core/ao_ee_fake.c
+++ b/src/kernel/ao_ee_fake.c
diff --git a/src/core/ao_eeprom.h b/src/kernel/ao_eeprom.h
index 915522bf..915522bf 100644
--- a/src/core/ao_eeprom.h
+++ b/src/kernel/ao_eeprom.h
diff --git a/src/core/ao_fec.h b/src/kernel/ao_fec.h
index 618756c1..618756c1 100644
--- a/src/core/ao_fec.h
+++ b/src/kernel/ao_fec.h
diff --git a/src/core/ao_fec_rx.c b/src/kernel/ao_fec_rx.c
index c4f5559a..c4f5559a 100644
--- a/src/core/ao_fec_rx.c
+++ b/src/kernel/ao_fec_rx.c
diff --git a/src/core/ao_fec_tx.c b/src/kernel/ao_fec_tx.c
index 4941d745..4941d745 100644
--- a/src/core/ao_fec_tx.c
+++ b/src/kernel/ao_fec_tx.c
diff --git a/src/core/ao_flight.c b/src/kernel/ao_flight.c
index 24099347..24099347 100644
--- a/src/core/ao_flight.c
+++ b/src/kernel/ao_flight.c
diff --git a/src/core/ao_flight.h b/src/kernel/ao_flight.h
index 01d21c11..01d21c11 100644
--- a/src/core/ao_flight.h
+++ b/src/kernel/ao_flight.h
diff --git a/src/core/ao_flight_nano.c b/src/kernel/ao_flight_nano.c
index 406d81ad..406d81ad 100644
--- a/src/core/ao_flight_nano.c
+++ b/src/kernel/ao_flight_nano.c
diff --git a/src/core/ao_freq.c b/src/kernel/ao_freq.c
index 12496f6f..12496f6f 100644
--- a/src/core/ao_freq.c
+++ b/src/kernel/ao_freq.c
diff --git a/src/core/ao_gps_print.c b/src/kernel/ao_gps_print.c
index 47c945d7..47c945d7 100644
--- a/src/core/ao_gps_print.c
+++ b/src/kernel/ao_gps_print.c
diff --git a/src/core/ao_gps_report.c b/src/kernel/ao_gps_report.c
index 07201ac2..07201ac2 100644
--- a/src/core/ao_gps_report.c
+++ b/src/kernel/ao_gps_report.c
diff --git a/src/core/ao_gps_report_mega.c b/src/kernel/ao_gps_report_mega.c
index 5e3c71bf..5e3c71bf 100644
--- a/src/core/ao_gps_report_mega.c
+++ b/src/kernel/ao_gps_report_mega.c
diff --git a/src/core/ao_gps_report_metrum.c b/src/kernel/ao_gps_report_metrum.c
index 696a833b..696a833b 100644
--- a/src/core/ao_gps_report_metrum.c
+++ b/src/kernel/ao_gps_report_metrum.c
diff --git a/src/core/ao_gps_show.c b/src/kernel/ao_gps_show.c
index 3a05e35a..3a05e35a 100644
--- a/src/core/ao_gps_show.c
+++ b/src/kernel/ao_gps_show.c
diff --git a/src/core/ao_host.h b/src/kernel/ao_host.h
index 6eb752c9..6eb752c9 100644
--- a/src/core/ao_host.h
+++ b/src/kernel/ao_host.h
diff --git a/src/core/ao_ignite.c b/src/kernel/ao_ignite.c
index 823d003c..823d003c 100644
--- a/src/core/ao_ignite.c
+++ b/src/kernel/ao_ignite.c
diff --git a/src/core/ao_int64.c b/src/kernel/ao_int64.c
index aa23dbe0..aa23dbe0 100644
--- a/src/core/ao_int64.c
+++ b/src/kernel/ao_int64.c
diff --git a/src/core/ao_int64.h b/src/kernel/ao_int64.h
index b16db58c..b16db58c 100644
--- a/src/core/ao_int64.h
+++ b/src/kernel/ao_int64.h
diff --git a/src/core/ao_kalman.c b/src/kernel/ao_kalman.c
index 9aea1f14..9aea1f14 100644
--- a/src/core/ao_kalman.c
+++ b/src/kernel/ao_kalman.c
diff --git a/src/core/ao_lcd.h b/src/kernel/ao_lcd.h
index f7e1391a..f7e1391a 100644
--- a/src/core/ao_lcd.h
+++ b/src/kernel/ao_lcd.h
diff --git a/src/core/ao_led.h b/src/kernel/ao_led.h
index d9a0914a..d9a0914a 100644
--- a/src/core/ao_led.h
+++ b/src/kernel/ao_led.h
diff --git a/src/core/ao_list.h b/src/kernel/ao_list.h
index 8a6fa4d9..8a6fa4d9 100644
--- a/src/core/ao_list.h
+++ b/src/kernel/ao_list.h
diff --git a/src/core/ao_log.c b/src/kernel/ao_log.c
index 20febefe..20febefe 100644
--- a/src/core/ao_log.c
+++ b/src/kernel/ao_log.c
diff --git a/src/core/ao_log.h b/src/kernel/ao_log.h
index 09f31188..09f31188 100644
--- a/src/core/ao_log.h
+++ b/src/kernel/ao_log.h
diff --git a/src/core/ao_log_big.c b/src/kernel/ao_log_big.c
index db01f46c..db01f46c 100644
--- a/src/core/ao_log_big.c
+++ b/src/kernel/ao_log_big.c
diff --git a/src/core/ao_log_mega.c b/src/kernel/ao_log_mega.c
index 768947d5..768947d5 100644
--- a/src/core/ao_log_mega.c
+++ b/src/kernel/ao_log_mega.c
diff --git a/src/core/ao_log_metrum.c b/src/kernel/ao_log_metrum.c
index 9b17adc2..9b17adc2 100644
--- a/src/core/ao_log_metrum.c
+++ b/src/kernel/ao_log_metrum.c
diff --git a/src/core/ao_log_micro.c b/src/kernel/ao_log_micro.c
index d665efb5..d665efb5 100644
--- a/src/core/ao_log_micro.c
+++ b/src/kernel/ao_log_micro.c
diff --git a/src/core/ao_log_micro.h b/src/kernel/ao_log_micro.h
index 976852ee..976852ee 100644
--- a/src/core/ao_log_micro.h
+++ b/src/kernel/ao_log_micro.h
diff --git a/src/core/ao_log_mini.c b/src/kernel/ao_log_mini.c
index 29e3bd9f..29e3bd9f 100644
--- a/src/core/ao_log_mini.c
+++ b/src/kernel/ao_log_mini.c
diff --git a/src/core/ao_log_single.c b/src/kernel/ao_log_single.c
index 3f6235a6..3f6235a6 100644
--- a/src/core/ao_log_single.c
+++ b/src/kernel/ao_log_single.c
diff --git a/src/core/ao_log_telem.c b/src/kernel/ao_log_telem.c
index 095aca37..095aca37 100644
--- a/src/core/ao_log_telem.c
+++ b/src/kernel/ao_log_telem.c
diff --git a/src/core/ao_log_telescience.c b/src/kernel/ao_log_telescience.c
index 002a10bd..002a10bd 100644
--- a/src/core/ao_log_telescience.c
+++ b/src/kernel/ao_log_telescience.c
diff --git a/src/core/ao_log_tiny.c b/src/kernel/ao_log_tiny.c
index 67767dc9..67767dc9 100644
--- a/src/core/ao_log_tiny.c
+++ b/src/kernel/ao_log_tiny.c
diff --git a/src/core/ao_microflight.c b/src/kernel/ao_microflight.c
index f680e400..f680e400 100644
--- a/src/core/ao_microflight.c
+++ b/src/kernel/ao_microflight.c
diff --git a/src/core/ao_microkalman.c b/src/kernel/ao_microkalman.c
index 0684ea2b..0684ea2b 100644
--- a/src/core/ao_microkalman.c
+++ b/src/kernel/ao_microkalman.c
diff --git a/src/core/ao_monitor.c b/src/kernel/ao_monitor.c
index 18f170b4..18f170b4 100644
--- a/src/core/ao_monitor.c
+++ b/src/kernel/ao_monitor.c
diff --git a/src/core/ao_mutex.c b/src/kernel/ao_mutex.c
index 952ff462..952ff462 100644
--- a/src/core/ao_mutex.c
+++ b/src/kernel/ao_mutex.c
diff --git a/src/core/ao_notask.c b/src/kernel/ao_notask.c
index 6f967e6d..6f967e6d 100644
--- a/src/core/ao_notask.c
+++ b/src/kernel/ao_notask.c
diff --git a/src/core/ao_notask.h b/src/kernel/ao_notask.h
index 6b6b5bb8..6b6b5bb8 100644
--- a/src/core/ao_notask.h
+++ b/src/kernel/ao_notask.h
diff --git a/src/core/ao_packet.h b/src/kernel/ao_packet.h
index b8426cf9..b8426cf9 100644
--- a/src/core/ao_packet.h
+++ b/src/kernel/ao_packet.h
diff --git a/src/core/ao_panic.c b/src/kernel/ao_panic.c
index c29cd8fe..c29cd8fe 100644
--- a/src/core/ao_panic.c
+++ b/src/kernel/ao_panic.c
diff --git a/src/core/ao_product.c b/src/kernel/ao_product.c
index b9327bac..b9327bac 100644
--- a/src/core/ao_product.c
+++ b/src/kernel/ao_product.c
diff --git a/src/core/ao_pyro.c b/src/kernel/ao_pyro.c
index e59f5bc4..e59f5bc4 100644
--- a/src/core/ao_pyro.c
+++ b/src/kernel/ao_pyro.c
diff --git a/src/core/ao_pyro.h b/src/kernel/ao_pyro.h
index 0c5642d6..0c5642d6 100644
--- a/src/core/ao_pyro.h
+++ b/src/kernel/ao_pyro.h
diff --git a/src/core/ao_quaternion.h b/src/kernel/ao_quaternion.h
index 044f1607..044f1607 100644
--- a/src/core/ao_quaternion.h
+++ b/src/kernel/ao_quaternion.h
diff --git a/src/core/ao_radio_cmac.c b/src/kernel/ao_radio_cmac.c
index bff848f6..bff848f6 100644
--- a/src/core/ao_radio_cmac.c
+++ b/src/kernel/ao_radio_cmac.c
diff --git a/src/core/ao_radio_cmac.h b/src/kernel/ao_radio_cmac.h
index e86f31e9..e86f31e9 100644
--- a/src/core/ao_radio_cmac.h
+++ b/src/kernel/ao_radio_cmac.h
diff --git a/src/core/ao_radio_cmac_cmd.c b/src/kernel/ao_radio_cmac_cmd.c
index 64410921..64410921 100644
--- a/src/core/ao_radio_cmac_cmd.c
+++ b/src/kernel/ao_radio_cmac_cmd.c
diff --git a/src/core/ao_radio_cmac_cmd.h b/src/kernel/ao_radio_cmac_cmd.h
index 6b8782de..6b8782de 100644
--- a/src/core/ao_radio_cmac_cmd.h
+++ b/src/kernel/ao_radio_cmac_cmd.h
diff --git a/src/core/ao_report.c b/src/kernel/ao_report.c
index 1104cd82..1104cd82 100644
--- a/src/core/ao_report.c
+++ b/src/kernel/ao_report.c
diff --git a/src/core/ao_report_micro.c b/src/kernel/ao_report_micro.c
index 0e8e287f..0e8e287f 100644
--- a/src/core/ao_report_micro.c
+++ b/src/kernel/ao_report_micro.c
diff --git a/src/core/ao_rssi.c b/src/kernel/ao_rssi.c
index 244a84fe..244a84fe 100644
--- a/src/core/ao_rssi.c
+++ b/src/kernel/ao_rssi.c
diff --git a/src/core/ao_sample.c b/src/kernel/ao_sample.c
index 34658951..34658951 100644
--- a/src/core/ao_sample.c
+++ b/src/kernel/ao_sample.c
diff --git a/src/core/ao_sample.h b/src/kernel/ao_sample.h
index 16d4c507..16d4c507 100644
--- a/src/core/ao_sample.h
+++ b/src/kernel/ao_sample.h
diff --git a/src/core/ao_sample_profile.c b/src/kernel/ao_sample_profile.c
index d3743d12..d3743d12 100644
--- a/src/core/ao_sample_profile.c
+++ b/src/kernel/ao_sample_profile.c
diff --git a/src/core/ao_sample_profile.h b/src/kernel/ao_sample_profile.h
index dbc29d3d..dbc29d3d 100644
--- a/src/core/ao_sample_profile.h
+++ b/src/kernel/ao_sample_profile.h
diff --git a/src/core/ao_send_packet.c b/src/kernel/ao_send_packet.c
index 66315d22..66315d22 100644
--- a/src/core/ao_send_packet.c
+++ b/src/kernel/ao_send_packet.c
diff --git a/src/core/ao_send_packet.h b/src/kernel/ao_send_packet.h
index 526f7b55..526f7b55 100644
--- a/src/core/ao_send_packet.h
+++ b/src/kernel/ao_send_packet.h
diff --git a/src/core/ao_serial.h b/src/kernel/ao_serial.h
index baf213c0..baf213c0 100644
--- a/src/core/ao_serial.h
+++ b/src/kernel/ao_serial.h
diff --git a/src/core/ao_sqrt.c b/src/kernel/ao_sqrt.c
index 3a550eaa..3a550eaa 100644
--- a/src/core/ao_sqrt.c
+++ b/src/kernel/ao_sqrt.c
diff --git a/src/core/ao_state.c b/src/kernel/ao_state.c
index ed197aa5..ed197aa5 100644
--- a/src/core/ao_state.c
+++ b/src/kernel/ao_state.c
diff --git a/src/core/ao_stdio.c b/src/kernel/ao_stdio.c
index 99118137..99118137 100644
--- a/src/core/ao_stdio.c
+++ b/src/kernel/ao_stdio.c
diff --git a/src/core/ao_storage.c b/src/kernel/ao_storage.c
index 6eddae7f..6eddae7f 100644
--- a/src/core/ao_storage.c
+++ b/src/kernel/ao_storage.c
diff --git a/src/core/ao_storage.h b/src/kernel/ao_storage.h
index 6cc6fcb7..6cc6fcb7 100644
--- a/src/core/ao_storage.h
+++ b/src/kernel/ao_storage.h
diff --git a/src/core/ao_task.c b/src/kernel/ao_task.c
index bafb4943..bafb4943 100644
--- a/src/core/ao_task.c
+++ b/src/kernel/ao_task.c
diff --git a/src/core/ao_task.h b/src/kernel/ao_task.h
index 9c56b480..9c56b480 100644
--- a/src/core/ao_task.h
+++ b/src/kernel/ao_task.h
diff --git a/src/core/ao_telem.h b/src/kernel/ao_telem.h
index 1a8da291..1a8da291 100644
--- a/src/core/ao_telem.h
+++ b/src/kernel/ao_telem.h
diff --git a/src/core/ao_telemetry.c b/src/kernel/ao_telemetry.c
index a1c19185..a1c19185 100644
--- a/src/core/ao_telemetry.c
+++ b/src/kernel/ao_telemetry.c
diff --git a/src/core/ao_telemetry.h b/src/kernel/ao_telemetry.h
index 237a35ab..237a35ab 100644
--- a/src/core/ao_telemetry.h
+++ b/src/kernel/ao_telemetry.h
diff --git a/src/core/ao_usb.h b/src/kernel/ao_usb.h
index 1ce4f82f..1ce4f82f 100644
--- a/src/core/ao_usb.h
+++ b/src/kernel/ao_usb.h
diff --git a/src/lpc/Makefile-lpc.defs b/src/lpc/Makefile-lpc.defs
index fecb9135..bccea5bc 100644
--- a/src/lpc/Makefile-lpc.defs
+++ b/src/lpc/Makefile-lpc.defs
@@ -4,7 +4,7 @@ endif
 
 include $(TOPDIR)/Makedefs
 
-vpath % $(TOPDIR)/lpc:$(TOPDIR)/product:$(TOPDIR)/drivers:$(TOPDIR)/core:$(TOPDIR)/util:$(TOPDIR)/kalman:$(TOPDIR/aes):$(TOPDIR):$(TOPDIR)/math
+vpath % $(TOPDIR)/lpc:$(TOPDIR)/product:$(TOPDIR)/drivers:$(TOPDIR)/kernel:$(TOPDIR)/util:$(TOPDIR)/kalman:$(TOPDIR/aes):$(TOPDIR):$(TOPDIR)/math
 vpath make-altitude $(TOPDIR)/util
 vpath make-kalman $(TOPDIR)/util
 vpath kalman.5c $(TOPDIR)/kalman
@@ -28,7 +28,7 @@ CC=$(ARM_CC)
 
 WARN_FLAGS=-Wall -Wextra -Werror
 
-AO_CFLAGS=-I. -I$(TOPDIR)/lpc -I$(TOPDIR)/core -I$(TOPDIR)/drivers -I$(TOPDIR)/product -I$(TOPDIR) -I$(TOPDIR)/math -I$(TOPDIR) $(PDCLIB_INCLUDES) 
+AO_CFLAGS=-I. -I$(TOPDIR)/lpc -I$(TOPDIR)/kernel -I$(TOPDIR)/drivers -I$(TOPDIR)/product -I$(TOPDIR) -I$(TOPDIR)/math -I$(TOPDIR) $(PDCLIB_INCLUDES) 
 LPC_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m0 -mthumb\
 	-ffreestanding -nostdlib $(AO_CFLAGS) $(WARN_FLAGS)
 
diff --git a/src/micropeak/Makefile b/src/micropeak/Makefile
index dcc32874..f4c57076 100644
--- a/src/micropeak/Makefile
+++ b/src/micropeak/Makefile
@@ -2,7 +2,7 @@
 # Tiny AltOS build
 #
 #
-vpath % ../attiny:../drivers:../core:../product:..
+vpath % ../attiny:../drivers:../kernel:../product:..
 vpath ao-make-product.5c ../util
 vpath make-altitude-pa ../util
 
@@ -47,7 +47,7 @@ INC=\
 IDPRODUCT=0
 PRODUCT=MicroPeak-v0.1
 PRODUCT_DEF=-DMICROPEAK
-CFLAGS = $(PRODUCT_DEF) -I. -I../attiny -I../core -I.. -I../drivers -I../product
+CFLAGS = $(PRODUCT_DEF) -I. -I../attiny -I../kernel -I.. -I../drivers -I../product
 CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -O2 -mcall-prologues -DATTINY
 
 NICKLE=nickle
diff --git a/src/nanopeak-v0.1/Makefile b/src/nanopeak-v0.1/Makefile
index 04eea902..d3779594 100644
--- a/src/nanopeak-v0.1/Makefile
+++ b/src/nanopeak-v0.1/Makefile
@@ -2,7 +2,7 @@
 # Tiny AltOS build
 #
 #
-vpath % ../attiny:../drivers:../core:../product:..
+vpath % ../attiny:../drivers:../kernel:../product:..
 vpath ao-make-product.5c ../util
 vpath make-altitude-pa ../util
 
@@ -47,7 +47,7 @@ INC=\
 IDPRODUCT=0
 PRODUCT=NanoPeak-v0.1
 PRODUCT_DEF=-DNANOPEAK
-CFLAGS = $(PRODUCT_DEF) -I. -I../attiny -I../core -I.. -I../drivers -I../product
+CFLAGS = $(PRODUCT_DEF) -I. -I../attiny -I../kernel -I.. -I../drivers -I../product
 CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -O2 -mcall-prologues -DATTINY
 
 NICKLE=nickle
diff --git a/src/product/Makefile.teledongle b/src/product/Makefile.teledongle
index da9bcba0..81151364 100644
--- a/src/product/Makefile.teledongle
+++ b/src/product/Makefile.teledongle
@@ -7,8 +7,8 @@
 # TD_VER, TD_DEF and include
 # this file
 
-vpath %.c ..:../core:../cc1111:../drivers:../product
-vpath %.h ..:../core:../cc1111:../drivers:../product
+vpath %.c ..:../kernel:../cc1111:../drivers:../product
+vpath %.h ..:../kernel:../cc1111:../drivers:../product
 vpath ao-make-product.5c ../util
 
 ifndef VERSION
diff --git a/src/product/Makefile.telelaunch b/src/product/Makefile.telelaunch
index a5e2eb7f..90fe7833 100644
--- a/src/product/Makefile.telelaunch
+++ b/src/product/Makefile.telelaunch
@@ -4,8 +4,8 @@
 # define TELELAUNCH_VER, TELELAUNCH_DEF
 # this file
 
-vpath %.c ..:../core:../cc1111:../drivers:../product
-vpath %.h ..:../core:../cc1111:../drivers:../product
+vpath %.c ..:../kernel:../cc1111:../drivers:../product
+vpath %.h ..:../kernel:../cc1111:../drivers:../product
 vpath ao-make-product.5c ../util
 
 ifndef VERSION
diff --git a/src/product/Makefile.telemetrum b/src/product/Makefile.telemetrum
index c740a483..dbbf57d8 100644
--- a/src/product/Makefile.telemetrum
+++ b/src/product/Makefile.telemetrum
@@ -7,8 +7,8 @@
 # TM_VER, TM_DEF, TM_INC and TM_SRC and include
 # this file
 
-vpath %.c .:..:../core:../cc1111:../drivers:../product
-vpath %.h .:..:../core:../cc1111:../drivers:../product
+vpath %.c .:..:../kernel:../cc1111:../drivers:../product
+vpath %.h .:..:../kernel:../cc1111:../drivers:../product
 vpath ao-make-product.5c ../util
 
 ifndef VERSION
diff --git a/src/product/Makefile.telemini b/src/product/Makefile.telemini
index 0884079e..ff8b9d56 100644
--- a/src/product/Makefile.telemini
+++ b/src/product/Makefile.telemini
@@ -4,8 +4,8 @@
 # Define TELEMINI_VER and TELEMINI_DEF and then
 # include this file
 
-vpath %.c ..:../core:../cc1111:../drivers:../product
-vpath %.h ..:../core:../cc1111:../drivers:../product
+vpath %.c ..:../kernel:../cc1111:../drivers:../product
+vpath %.h ..:../kernel:../cc1111:../drivers:../product
 vpath ao-make-product.5c ../util
 
 ifndef VERSION
diff --git a/src/product/Makefile.telenano b/src/product/Makefile.telenano
index c31989ee..d2fcb6d8 100644
--- a/src/product/Makefile.telenano
+++ b/src/product/Makefile.telenano
@@ -4,8 +4,8 @@
 # Define TELENANO_VER and TELENANO_DEF and then
 # include this file
 
-vpath %.c ..:../core:../cc1111:../drivers:../product
-vpath %.h ..:../core:../cc1111:../drivers:../product
+vpath %.c ..:../kernel:../cc1111:../drivers:../product
+vpath %.h ..:../kernel:../cc1111:../drivers:../product
 vpath ao-make-product.5c ../util
 
 ifndef VERSION
diff --git a/src/spiradio-v0.1/.sdcdbrc b/src/spiradio-v0.1/.sdcdbrc
index b9f6129c..2c77e32b 100644
--- a/src/spiradio-v0.1/.sdcdbrc
+++ b/src/spiradio-v0.1/.sdcdbrc
@@ -1,2 +1,2 @@
---directory=../cc1111:../product:../core:../drivers:.
+--directory=../cc1111:../product:../kernel:../drivers:.
 
diff --git a/src/spiradio-v0.1/Makefile b/src/spiradio-v0.1/Makefile
index e644bc49..cd7a9cde 100644
--- a/src/spiradio-v0.1/Makefile
+++ b/src/spiradio-v0.1/Makefile
@@ -5,8 +5,8 @@
 SPIRADIO_VER=0.1
 SPIRADIO_DEF=0_1
 
-vpath %.c ..:../core:../cc1111:../drivers:../product
-vpath %.h ..:../core:../cc1111:../drivers:../product
+vpath %.c ..:../kernel:../cc1111:../drivers:../product
+vpath %.h ..:../kernel:../cc1111:../drivers:../product
 vpath ao-make-product.5c ../util
 
 ifndef VERSION
diff --git a/src/stm-bringup/Makefile b/src/stm-bringup/Makefile
index 797df2d6..b0943e56 100644
--- a/src/stm-bringup/Makefile
+++ b/src/stm-bringup/Makefile
@@ -1,4 +1,4 @@
-vpath % ..:../core:../product:../drivers:../stm
+vpath % ..:../kernel:../product:../drivers:../stm
 vpath ao-make-product.5c ../util
 
 ifndef VERSION
diff --git a/src/stm/Makefile-flash.defs b/src/stm/Makefile-flash.defs
index 3890eff1..dde51a68 100644
--- a/src/stm/Makefile-flash.defs
+++ b/src/stm/Makefile-flash.defs
@@ -1,4 +1,4 @@
-vpath % $(TOPDIR)/stm:$(TOPDIR)/product:$(TOPDIR)/drivers:$(TOPDIR)/core:$(TOPDIR)/util:$(TOPDIR)
+vpath % $(TOPDIR)/stm:$(TOPDIR)/product:$(TOPDIR)/drivers:$(TOPDIR)/kernel:$(TOPDIR)/util:$(TOPDIR)
 vpath ao-make-product.5c $(TOPDIR)/util
 
 .SUFFIXES: .elf .ihx
@@ -14,7 +14,7 @@ include $(TOPDIR)/Makedefs
 CC=$(ARM_CC)
 LIBS=$(PDCLIB_LIBS_M3) -lgcc
 
-AO_CFLAGS=-I. -I$(TOPDIR)/stm -I$(TOPDIR)/core -I$(TOPDIR)/drivers -I$(TOPDIR)/product -I$(TOPDIR) $(PDCLIB_INCLUDES)
+AO_CFLAGS=-I. -I$(TOPDIR)/stm -I$(TOPDIR)/kernel -I$(TOPDIR)/drivers -I$(TOPDIR)/product -I$(TOPDIR) $(PDCLIB_INCLUDES)
 STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS) $(SAT_CFLAGS)
 
 LDFLAGS=-L$(TOPDIR)/stm -Wl,-Taltos-loader.ld
diff --git a/src/stm/Makefile.defs b/src/stm/Makefile.defs
index 42adfd09..c3d2707f 100644
--- a/src/stm/Makefile.defs
+++ b/src/stm/Makefile.defs
@@ -1,4 +1,4 @@
-vpath % ../stm:../product:../drivers:../core:../util:../kalman:../aes:../math:..
+vpath % ../stm:../product:../drivers:../kernel:../util:../kalman:../aes:../math:..
 vpath make-altitude ../util
 vpath make-kalman ../util
 vpath kalman.5c ../kalman
@@ -26,7 +26,7 @@ LIBS=$(PDCLIB_LIBS_M3) -lgcc
 
 WARN_FLAGS=-Wall -Wextra -Werror
 
-AO_CFLAGS=-I. -I../stm -I../core -I../drivers -I../math -I.. $(PDCLIB_INCLUDES)
+AO_CFLAGS=-I. -I../stm -I../kernel -I../drivers -I../math -I.. $(PDCLIB_INCLUDES)
 STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb \
 	-ffreestanding -nostdlib $(AO_CFLAGS) $(WARN_FLAGS)
 
diff --git a/src/teleballoon-v1.1/Makefile b/src/teleballoon-v1.1/Makefile
index 6ff076a9..c6f6345a 100644
--- a/src/teleballoon-v1.1/Makefile
+++ b/src/teleballoon-v1.1/Makefile
@@ -17,8 +17,8 @@ TELEBALLOON_SRC = \
 	ao_gps_skytraq.c \
 	ao_m25.c
 
-vpath %.c ..:../core:../cc1111:../drivers:../product:.
-vpath %.h ..:../core:../cc1111:../drivers:../product:.
+vpath %.c ..:../kernel:../cc1111:../drivers:../product:.
+vpath %.h ..:../kernel:../cc1111:../drivers:../product:.
 vpath ao-make-product.5c ../util
 
 ifndef VERSION
diff --git a/src/telebt-v1.0/.sdcdbrc b/src/telebt-v1.0/.sdcdbrc
index b9f6129c..2c77e32b 100644
--- a/src/telebt-v1.0/.sdcdbrc
+++ b/src/telebt-v1.0/.sdcdbrc
@@ -1,2 +1,2 @@
---directory=../cc1111:../product:../core:../drivers:.
+--directory=../cc1111:../product:../kernel:../drivers:.
 
diff --git a/src/telebt-v1.0/Makefile b/src/telebt-v1.0/Makefile
index 40853fc3..a7797499 100644
--- a/src/telebt-v1.0/Makefile
+++ b/src/telebt-v1.0/Makefile
@@ -5,8 +5,8 @@
 TELEBT_VER=1.0
 TELEBT_DEF=1_0
 
-vpath %.c ..:../core:../cc1111:../drivers:../product
-vpath %.h ..:../core:../cc1111:../drivers:../product
+vpath %.c ..:../kernel:../cc1111:../drivers:../product
+vpath %.h ..:../kernel:../cc1111:../drivers:../product
 vpath ao-make-product.5c ../util
 
 ifndef VERSION
diff --git a/src/telefire-v0.1/.sdcdbrc b/src/telefire-v0.1/.sdcdbrc
index b9f6129c..2c77e32b 100644
--- a/src/telefire-v0.1/.sdcdbrc
+++ b/src/telefire-v0.1/.sdcdbrc
@@ -1,2 +1,2 @@
---directory=../cc1111:../product:../core:../drivers:.
+--directory=../cc1111:../product:../kernel:../drivers:.
 
diff --git a/src/telefire-v0.1/Makefile b/src/telefire-v0.1/Makefile
index f9e11698..25267268 100644
--- a/src/telefire-v0.1/Makefile
+++ b/src/telefire-v0.1/Makefile
@@ -5,8 +5,8 @@
 TELEFIRE_VER=0.1
 TELEFIRE_DEF=0_1
 
-vpath %.c ..:../core:../cc1111:../drivers:../product
-vpath %.h ..:../core:../cc1111:../drivers:../product
+vpath %.c ..:../kernel:../cc1111:../drivers:../product
+vpath %.h ..:../kernel:../cc1111:../drivers:../product
 vpath ao-make-product.5c ../util
 
 ifndef VERSION
diff --git a/src/telefire-v0.2/.sdcdbrc b/src/telefire-v0.2/.sdcdbrc
index b9f6129c..2c77e32b 100644
--- a/src/telefire-v0.2/.sdcdbrc
+++ b/src/telefire-v0.2/.sdcdbrc
@@ -1,2 +1,2 @@
---directory=../cc1111:../product:../core:../drivers:.
+--directory=../cc1111:../product:../kernel:../drivers:.
 
diff --git a/src/telefire-v0.2/Makefile b/src/telefire-v0.2/Makefile
index a820990a..ad5065c1 100644
--- a/src/telefire-v0.2/Makefile
+++ b/src/telefire-v0.2/Makefile
@@ -5,8 +5,8 @@
 TELEFIRE_VER=0.2
 TELEFIRE_DEF=0_2
 
-vpath %.c ..:../core:../cc1111:../drivers:../product
-vpath %.h ..:../core:../cc1111:../drivers:../product
+vpath %.c ..:../kernel:../cc1111:../drivers:../product
+vpath %.h ..:../kernel:../cc1111:../drivers:../product
 vpath ao-make-product.5c ../util
 
 ifndef VERSION
diff --git a/src/telemetrum-v1.0/.sdcdbrc b/src/telemetrum-v1.0/.sdcdbrc
index fbe9a599..e9a51ea6 100644
--- a/src/telemetrum-v1.0/.sdcdbrc
+++ b/src/telemetrum-v1.0/.sdcdbrc
@@ -1 +1 @@
---directory=../cc1111:../product:../core:../drivers:.
+--directory=../cc1111:../product:../kernel:../drivers:.
diff --git a/src/telemetrum-v1.1/.sdcdbrc b/src/telemetrum-v1.1/.sdcdbrc
index fbe9a599..e9a51ea6 100644
--- a/src/telemetrum-v1.1/.sdcdbrc
+++ b/src/telemetrum-v1.1/.sdcdbrc
@@ -1 +1 @@
---directory=../cc1111:../product:../core:../drivers:.
+--directory=../cc1111:../product:../kernel:../drivers:.
diff --git a/src/telemini-v1.0/.sdcdbrc b/src/telemini-v1.0/.sdcdbrc
index b9f6129c..2c77e32b 100644
--- a/src/telemini-v1.0/.sdcdbrc
+++ b/src/telemini-v1.0/.sdcdbrc
@@ -1,2 +1,2 @@
---directory=../cc1111:../product:../core:../drivers:.
+--directory=../cc1111:../product:../kernel:../drivers:.
 
diff --git a/src/telemini-v2.0/.sdcdbrc b/src/telemini-v2.0/.sdcdbrc
index b9f6129c..2c77e32b 100644
--- a/src/telemini-v2.0/.sdcdbrc
+++ b/src/telemini-v2.0/.sdcdbrc
@@ -1,2 +1,2 @@
---directory=../cc1111:../product:../core:../drivers:.
+--directory=../cc1111:../product:../kernel:../drivers:.
 
diff --git a/src/telemini-v2.0/Makefile b/src/telemini-v2.0/Makefile
index fcac2c48..606b4f3b 100644
--- a/src/telemini-v2.0/Makefile
+++ b/src/telemini-v2.0/Makefile
@@ -5,8 +5,8 @@
 TELEMINI_VER=2.0
 TELEMINI_DEF=2_0
 
-vpath %.c ..:../core:../cc1111:../drivers:../product
-vpath %.h ..:../core:../cc1111:../drivers:../product
+vpath %.c ..:../kernel:../cc1111:../drivers:../product
+vpath %.h ..:../kernel:../cc1111:../drivers:../product
 vpath ao-make-product.5c ../util
 
 ifndef VERSION
diff --git a/src/telepyro-v0.1/Makefile b/src/telepyro-v0.1/Makefile
index 025b324a..dcac03dc 100644
--- a/src/telepyro-v0.1/Makefile
+++ b/src/telepyro-v0.1/Makefile
@@ -2,7 +2,7 @@
 # AltOS build
 #
 #
-vpath % .:..:../core:../product:../drivers:../avr
+vpath % .:..:../kernel:../product:../drivers:../avr
 vpath ao-make-product.5c ../util
 
 include ../avr/Makefile.defs
@@ -45,7 +45,7 @@ PRODUCT=TelePyro-v0.1
 MCU=atmega32u4
 PRODUCT_DEF=-DTELEPYRO
 IDPRODUCT=0x0011
-CFLAGS = $(PRODUCT_DEF) -I. -I../avr -I../core -I..
+CFLAGS = $(PRODUCT_DEF) -I. -I../avr -I../kernel -I..
 CFLAGS += -mmcu=$(MCU) -Wall -Wstrict-prototypes -O3 -mcall-prologues -DAVR
 
 NICKLE=nickle
diff --git a/src/telescience-pwm/Makefile b/src/telescience-pwm/Makefile
index de81b8d7..493bd480 100644
--- a/src/telescience-pwm/Makefile
+++ b/src/telescience-pwm/Makefile
@@ -2,7 +2,7 @@
 # AltOS build
 #
 #
-vpath % ..:../core:../product:../drivers:../avr
+vpath % ..:../kernel:../product:../drivers:../avr
 vpath ao-make-product.5c ../util
 
 include ../avr/Makefile.defs
@@ -57,7 +57,7 @@ PRODUCT=TeleScience-PWM
 MCU=atmega32u4
 PRODUCT_DEF=-DTELESCIENCE -DTELESCIENCE_PWM
 IDPRODUCT=0x0011
-CFLAGS = $(PRODUCT_DEF) -I. -I../avr -I../core -I..
+CFLAGS = $(PRODUCT_DEF) -I. -I../avr -I../kernel -I..
 CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -O3 -mcall-prologues -DAVR
 
 NICKLE=nickle
diff --git a/src/telescience-v0.1/Makefile b/src/telescience-v0.1/Makefile
index 6e4eb6de..c55c48e2 100644
--- a/src/telescience-v0.1/Makefile
+++ b/src/telescience-v0.1/Makefile
@@ -2,7 +2,7 @@
 # AltOS build
 #
 #
-vpath % ..:../core:../product:../drivers:../avr
+vpath % ..:../kernel:../product:../drivers:../avr
 vpath ao-make-product.5c ../util
 
 include ../avr/Makefile.defs
@@ -56,7 +56,7 @@ PRODUCT=TeleScience-v0.1
 MCU=atmega32u4
 PRODUCT_DEF=-DTELESCIENCE
 IDPRODUCT=0x0011
-CFLAGS = $(PRODUCT_DEF) -I. -I../avr -I../core -I..
+CFLAGS = $(PRODUCT_DEF) -I. -I../avr -I../kernel -I..
 CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -O3 -mcall-prologues -DAVR
 
 NICKLE=nickle
diff --git a/src/teleshield-v0.1/Makefile b/src/teleshield-v0.1/Makefile
index e8b262ef..f54488a2 100644
--- a/src/teleshield-v0.1/Makefile
+++ b/src/teleshield-v0.1/Makefile
@@ -17,8 +17,8 @@ TELESHIELD_SRC = \
 	ao_btm.c \
 	ao_spi.c
 
-vpath %.c ..:../core:../cc1111:../drivers:../product:.
-vpath %.h ..:../core:../cc1111:../drivers:../product:.
+vpath %.c ..:../kernel:../cc1111:../drivers:../product:.
+vpath %.h ..:../kernel:../cc1111:../drivers:../product:.
 vpath ao-make-product.5c ../util
 
 ifndef VERSION
diff --git a/src/teleterra-v0.2/.sdcdbrc b/src/teleterra-v0.2/.sdcdbrc
index fbe9a599..e9a51ea6 100644
--- a/src/teleterra-v0.2/.sdcdbrc
+++ b/src/teleterra-v0.2/.sdcdbrc
@@ -1 +1 @@
---directory=../cc1111:../product:../core:../drivers:.
+--directory=../cc1111:../product:../kernel:../drivers:.
diff --git a/src/teleterra-v0.2/Makefile b/src/teleterra-v0.2/Makefile
index 88637360..826c52e5 100644
--- a/src/teleterra-v0.2/Makefile
+++ b/src/teleterra-v0.2/Makefile
@@ -2,8 +2,8 @@
 # TeleTerra build file
 #
 
-vpath %.c ..:../core:../cc1111:../drivers:../product
-vpath %.h ..:../core:../cc1111:../drivers:../product
+vpath %.c ..:../kernel:../cc1111:../drivers:../product
+vpath %.h ..:../kernel:../cc1111:../drivers:../product
 vpath ao-make-product.5c ../util
 
 ifndef VERSION
diff --git a/src/test/Makefile b/src/test/Makefile
index c6025219..7cb86140 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -1,4 +1,4 @@
-vpath % ..:../core:../drivers:../util:../micropeak:../aes:../product
+vpath % ..:../kernel:../drivers:../util:../micropeak:../aes:../product
 
 PROGS=ao_flight_test ao_flight_test_baro ao_flight_test_accel ao_flight_test_noisy_accel ao_flight_test_mm \
 	ao_gps_test ao_gps_test_skytraq ao_gps_test_ublox ao_convert_test ao_convert_pa_test ao_fec_test \
@@ -9,7 +9,7 @@ INCS=ao_kalman.h ao_ms5607.h ao_log.h ao_data.h altitude-pa.h altitude.h ao_quat
 
 KALMAN=make-kalman 
 
-CFLAGS=-I.. -I. -I../core -I../drivers -I../micropeak -I../product -O0 -g -Wall
+CFLAGS=-I.. -I. -I../kernel -I../drivers -I../micropeak -I../product -O0 -g -Wall
 
 all: $(PROGS) ao_aprs_data.wav
 
@@ -52,7 +52,7 @@ ao_kalman.h: $(KALMAN)
 	(cd .. && make ao_kalman.h)
 
 ao_fec_test: ao_fec_test.c ao_fec_tx.c ao_fec_rx.c
-	cc $(CFLAGS) -DAO_FEC_DEBUG=1 -o $@ ao_fec_test.c ../core/ao_fec_tx.c ../core/ao_fec_rx.c -lm
+	cc $(CFLAGS) -DAO_FEC_DEBUG=1 -o $@ ao_fec_test.c ../kernel/ao_fec_tx.c ../kernel/ao_fec_rx.c -lm
 
 ao_aprs_test: ao_aprs_test.c ao_aprs.c
 	cc $(CFLAGS) -o $@ ao_aprs_test.c
diff --git a/src/tidongle/Makefile b/src/tidongle/Makefile
index b2ba537b..0e90d744 100644
--- a/src/tidongle/Makefile
+++ b/src/tidongle/Makefile
@@ -2,8 +2,8 @@
 # TIDongle build file
 #
 
-vpath %.c ..:../core:../cc1111:../drivers:../product
-vpath %.h ..:../core:../cc1111:../drivers:../product
+vpath %.c ..:../kernel:../cc1111:../drivers:../product
+vpath %.h ..:../kernel:../cc1111:../drivers:../product
 vpath ao-make-product.5c ../util
 
 ifndef VERSION