Merge "[Ravenwood] Cleanup RATR implementation and project structure" into main