Small map update

+ Small updates to maps code (merge failed before - serialize method was placed in the wrong model).
+ Updated phone number data creation - now a class instead of a string.
+ Removed unused files and folders.