Re-structuring the working folders