Further changes for folder hierarchy changes