issue #4729: Move deprecated stuff to deprecated folder