dir restructured and file renamed