Reorganised @lightsoda's source files and mockups