Merge "Restructure vr_ui"