components move: afterfixes