Modified folder hierarchy