Changed structure of folders