Move base image to its own directory