Merge "[Ravenwood] Move redirection classes out of f/b/r" into main