refactored User features
Refactored Location features
Revert "Refactored Location features"

This reverts commit 3ef55e0152e9aed62ebe5251ad9b7da70afa1225.