Restruct folder