Location service refactor.
Merge pull request #32 from yanivgal/LocationServiceRefactor

Location service refactor.