folder refacoring