Updated SPI and function subfolder