Remove the last repetition of the Switch Tree markup, stop supporting custom templates, and merge the 2 template folders.