Firmware reorganisation, plus started work on JPEGTest.