MAJOR Overhaul for Telephony files. Most likely will revert this

Change-Id: I8ecf614b3a1b830e5643cf4faf65ce7f30018074