Knew I was going to revert this:
Revert "MAJOR Overhaul for Telephony files. Most likely will revert this"

This reverts commit e068f87ec9a4552ead2e5fe37b7829957b48a7fb.