Added folders, moved scenes