Updating folder heirarchy and layout