There is a new feature to refactor stacks: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stack-refactoring.html
How I understand it, it's currently only possible over cloudformation CLI.