Re-structure folder