Moving watermark stripper test files about.
Experimenting with feature detection.