Move path to image folder to common definitions

Since it's used by both v1 and v2. Also, give it a better name.
More consistent comments