SW structure change; SPI and RF2423 sources added