Switch to public matcha module