moved to folders and added city locator