Merge "gbp-old ui folders structure changed, new ui components"