Rationalise GST structure