* Added code to manage folder creation