Build fixes. Build scrips reorganized.