Merge "[Ravenwood] Move *_host classes into their corresponding package" into main