re-organizing folders when saving