Refactor wedge generation

Change-Id: I2ec4f562e28a4673477e20186f9d6167b24b76b8
6 files changed