Updated folder hierarchy