Refactoring and uv fix for wedge

lowres: -1.72%

Change-Id: I4c883097caac72fab8e01945454579891617145e
10 files changed