Use a less fragile reference to the GPUImage code, fix some structure