Reorganise build dirs