Amit Shah may rejig his team before elections - Hindustan Times