moved to Vindaloo module