Updated sources to new format without location