directory re-organization