Refactoring and EXIF GeoTag support added