Changed folder hierarchy