Moved images. Removed some constants.