Previous commits not taking effect when downloaded via Cocoapods

The previously-merged fixes are not taking effect when using Cocoapods  - regardless of which tag or commit is targeted. This is because the previous merge was targeted in the wrong directory:

`libPhoneNumber-iOS/libPhoneNumber-iOS/`

..whereas the `.podspec` file points to this directory for its source:

`libPhoneNumber-iOS/libPhoneNumber/`

This PR repeats these recent fixes in the base directory.

Recommendations:
* To distribute this fix Cocoapods, a `0.7.4` tag must be created + associated updates to the `.podspec` file OR the `0.7.3` tag must be re-based to include these changes (probably not ideal, but perhaps appropriate since the intended fix of `0.7.3` was never actually distributed via Cocoapods)
* It's unclear to me (and possibly future contributors) which directory to work in - or why the code is duplicated in the first place. Also the naming is unclear and similar enough to confuse even you, the author, since you did not catch this mistake from my previous commit. Highly suggest either removing the duplicate code, or renaming directories to be much more clear.

Thank you! Let me know if I can help further.