Updated naming and cleanup in map fragment
Cleanup of packages and removing dead code in user info activity