Misc project org cleanup prior to IVR work

Change-Id: I66e5df034c5bbbd041c78dafdc9f33519d0133a5