GPII-88 Moving all functionality for building universal to our plugin