restructurate folders