Added folder hierarchy