Patch 6

This has two functions - 1) to make the images folder neater, and 2) to laugh in your face about the 5 file idea using 66 files.