Add images directory back, improve several scripts