Move Core Location into framework folder
Refactored some of the image code in preparation for getting the images from the server