Reorganise build