Move images around.
Clean up unused code. Fixed references to images.