diff --git a/app/dialplan/resources/conf/dialplan/100_call-direction.xml b/app/dialplan/resources/switch/conf/dialplan/100_call-direction.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/100_call-direction.xml
rename to app/dialplan/resources/switch/conf/dialplan/100_call-direction.xml
diff --git a/app/dialplan/resources/conf/dialplan/150_recording.xml b/app/dialplan/resources/switch/conf/dialplan/150_recording.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/150_recording.xml
rename to app/dialplan/resources/switch/conf/dialplan/150_recording.xml
diff --git a/app/dialplan/resources/conf/dialplan/160_playback.xml b/app/dialplan/resources/switch/conf/dialplan/160_playback.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/160_playback.xml
rename to app/dialplan/resources/switch/conf/dialplan/160_playback.xml
diff --git a/app/dialplan/resources/conf/dialplan/200_playback.xml b/app/dialplan/resources/switch/conf/dialplan/200_playback.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/200_playback.xml
rename to app/dialplan/resources/switch/conf/dialplan/200_playback.xml
diff --git a/app/dialplan/resources/conf/dialplan/220_global-intercept.xml b/app/dialplan/resources/switch/conf/dialplan/220_global-intercept.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/220_global-intercept.xml
rename to app/dialplan/resources/switch/conf/dialplan/220_global-intercept.xml
diff --git a/app/dialplan/resources/conf/dialplan/230_group-intercept.xml b/app/dialplan/resources/switch/conf/dialplan/230_group-intercept.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/230_group-intercept.xml
rename to app/dialplan/resources/switch/conf/dialplan/230_group-intercept.xml
diff --git a/app/dialplan/resources/conf/dialplan/240_redial.xml b/app/dialplan/resources/switch/conf/dialplan/240_redial.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/240_redial.xml
rename to app/dialplan/resources/switch/conf/dialplan/240_redial.xml
diff --git a/app/dialplan/resources/conf/dialplan/245_page.xml b/app/dialplan/resources/switch/conf/dialplan/245_page.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/245_page.xml
rename to app/dialplan/resources/switch/conf/dialplan/245_page.xml
diff --git a/app/dialplan/resources/conf/dialplan/250_global.xml b/app/dialplan/resources/switch/conf/dialplan/250_global.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/250_global.xml
rename to app/dialplan/resources/switch/conf/dialplan/250_global.xml
diff --git a/app/dialplan/resources/conf/dialplan/260_eavesdrop.xml b/app/dialplan/resources/switch/conf/dialplan/260_eavesdrop.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/260_eavesdrop.xml
rename to app/dialplan/resources/switch/conf/dialplan/260_eavesdrop.xml
diff --git a/app/dialplan/resources/conf/dialplan/270_call_privacy.xml b/app/dialplan/resources/switch/conf/dialplan/270_call_privacy.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/270_call_privacy.xml
rename to app/dialplan/resources/switch/conf/dialplan/270_call_privacy.xml
diff --git a/app/dialplan/resources/conf/dialplan/280_call_return.xml b/app/dialplan/resources/switch/conf/dialplan/280_call_return.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/280_call_return.xml
rename to app/dialplan/resources/switch/conf/dialplan/280_call_return.xml
diff --git a/app/dialplan/resources/conf/dialplan/290_intercept-ext.xml b/app/dialplan/resources/switch/conf/dialplan/290_intercept-ext.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/290_intercept-ext.xml
rename to app/dialplan/resources/switch/conf/dialplan/290_intercept-ext.xml
diff --git a/app/dialplan/resources/conf/dialplan/300_extension-intercom.xml b/app/dialplan/resources/switch/conf/dialplan/300_extension-intercom.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/300_extension-intercom.xml
rename to app/dialplan/resources/switch/conf/dialplan/300_extension-intercom.xml
diff --git a/app/dialplan/resources/conf/dialplan/310_send_to_voicemail.xml b/app/dialplan/resources/switch/conf/dialplan/310_send_to_voicemail.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/310_send_to_voicemail.xml
rename to app/dialplan/resources/switch/conf/dialplan/310_send_to_voicemail.xml
diff --git a/app/dialplan/resources/conf/dialplan/320_vmain.xml b/app/dialplan/resources/switch/conf/dialplan/320_vmain.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/320_vmain.xml
rename to app/dialplan/resources/switch/conf/dialplan/320_vmain.xml
diff --git a/app/dialplan/resources/conf/dialplan/330_vmain_user.xml b/app/dialplan/resources/switch/conf/dialplan/330_vmain_user.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/330_vmain_user.xml
rename to app/dialplan/resources/switch/conf/dialplan/330_vmain_user.xml
diff --git a/app/dialplan/resources/conf/dialplan/340_delay_echo.xml b/app/dialplan/resources/switch/conf/dialplan/340_delay_echo.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/340_delay_echo.xml
rename to app/dialplan/resources/switch/conf/dialplan/340_delay_echo.xml
diff --git a/app/dialplan/resources/conf/dialplan/350_echo.xml b/app/dialplan/resources/switch/conf/dialplan/350_echo.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/350_echo.xml
rename to app/dialplan/resources/switch/conf/dialplan/350_echo.xml
diff --git a/app/dialplan/resources/conf/dialplan/360_milliwatt.xml b/app/dialplan/resources/switch/conf/dialplan/360_milliwatt.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/360_milliwatt.xml
rename to app/dialplan/resources/switch/conf/dialplan/360_milliwatt.xml
diff --git a/app/dialplan/resources/conf/dialplan/370_tone_stream.xml b/app/dialplan/resources/switch/conf/dialplan/370_tone_stream.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/370_tone_stream.xml
rename to app/dialplan/resources/switch/conf/dialplan/370_tone_stream.xml
diff --git a/app/dialplan/resources/conf/dialplan/380_hold_music.xml b/app/dialplan/resources/switch/conf/dialplan/380_hold_music.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/380_hold_music.xml
rename to app/dialplan/resources/switch/conf/dialplan/380_hold_music.xml
diff --git a/app/dialplan/resources/conf/dialplan/400_recordings.xml b/app/dialplan/resources/switch/conf/dialplan/400_recordings.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/400_recordings.xml
rename to app/dialplan/resources/switch/conf/dialplan/400_recordings.xml
diff --git a/app/dialplan/resources/conf/dialplan/410_freeswitch_conference.xml b/app/dialplan/resources/switch/conf/dialplan/410_freeswitch_conference.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/410_freeswitch_conference.xml
rename to app/dialplan/resources/switch/conf/dialplan/410_freeswitch_conference.xml
diff --git a/app/dialplan/resources/conf/dialplan/420_disa.xml b/app/dialplan/resources/switch/conf/dialplan/420_disa.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/420_disa.xml
rename to app/dialplan/resources/switch/conf/dialplan/420_disa.xml
diff --git a/app/dialplan/resources/conf/dialplan/430_directory.xml b/app/dialplan/resources/switch/conf/dialplan/430_directory.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/430_directory.xml
rename to app/dialplan/resources/switch/conf/dialplan/430_directory.xml
diff --git a/app/dialplan/resources/conf/dialplan/440_wake-up.xml b/app/dialplan/resources/switch/conf/dialplan/440_wake-up.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/440_wake-up.xml
rename to app/dialplan/resources/switch/conf/dialplan/440_wake-up.xml
diff --git a/app/dialplan/resources/conf/dialplan/450_park_in.xml b/app/dialplan/resources/switch/conf/dialplan/450_park_in.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/450_park_in.xml
rename to app/dialplan/resources/switch/conf/dialplan/450_park_in.xml
diff --git a/app/dialplan/resources/conf/dialplan/455_park_out.xml b/app/dialplan/resources/switch/conf/dialplan/455_park_out.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/455_park_out.xml
rename to app/dialplan/resources/switch/conf/dialplan/455_park_out.xml
diff --git a/app/dialplan/resources/conf/dialplan/460_park_slots.xml b/app/dialplan/resources/switch/conf/dialplan/460_park_slots.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/460_park_slots.xml
rename to app/dialplan/resources/switch/conf/dialplan/460_park_slots.xml
diff --git a/app/dialplan/resources/conf/dialplan/470_valet_park.xml b/app/dialplan/resources/switch/conf/dialplan/470_valet_park.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/470_valet_park.xml
rename to app/dialplan/resources/switch/conf/dialplan/470_valet_park.xml
diff --git a/app/dialplan/resources/conf/dialplan/480_operator.xml b/app/dialplan/resources/switch/conf/dialplan/480_operator.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/480_operator.xml
rename to app/dialplan/resources/switch/conf/dialplan/480_operator.xml
diff --git a/app/dialplan/resources/conf/dialplan/485_operator-forward.xml b/app/dialplan/resources/switch/conf/dialplan/485_operator-forward.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/485_operator-forward.xml
rename to app/dialplan/resources/switch/conf/dialplan/485_operator-forward.xml
diff --git a/app/dialplan/resources/conf/dialplan/490_do-not-disturb.xml b/app/dialplan/resources/switch/conf/dialplan/490_do-not-disturb.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/490_do-not-disturb.xml
rename to app/dialplan/resources/switch/conf/dialplan/490_do-not-disturb.xml
diff --git a/app/dialplan/resources/conf/dialplan/50_custom-variables.xml b/app/dialplan/resources/switch/conf/dialplan/50_custom-variables.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/50_custom-variables.xml
rename to app/dialplan/resources/switch/conf/dialplan/50_custom-variables.xml
diff --git a/app/dialplan/resources/conf/dialplan/999_local_extension.xml b/app/dialplan/resources/switch/conf/dialplan/999_local_extension.xml
similarity index 100%
rename from app/dialplan/resources/conf/dialplan/999_local_extension.xml
rename to app/dialplan/resources/switch/conf/dialplan/999_local_extension.xml