Re-structuring the folders