IVR files refactor