oops the rest of the moved templates