Completely redo vendor setup
This is mainly to make things easier to change

Change-Id: Ibc2a6f35cc1eccf7829d46e56f31579b4d3ccbaa