Updating folder heirarchy
Updating folder heirarchy and layout