[mooshare] Modernize
[streamcloud] Modernize