Simplify definitions
Fix phoneNumber references
Add phone plugins.
Remove old files