WEBCART-158 move vista logic to its on module