Move SWITCH stuff into its own subfolder before we start sanitizing things