changed folder structure and added geo location