Reorganise and tidy up build

Reorganise into a single build. Each version only defined in one place.