Split files up a bit. Add ImageMagick support.