restruct + moved