A bit of clean up work
Large re-org in preparation for EEPROM and comms paging work