Revert "Revert "Trebuchet : Live folder fixes""

This reverts commit 31b878e3d78c1daa64668058d4b295aa217c81dd.