Remove local copy of Metatags module
Remove local copy of Phone module
Re-organize local modules