Reorganise directory to cooperate with redports