Conn 491

The regression suite is reorganized. Refer CONN-491