Changed folder struct