We gradually stopped swaddling our baby. At first, swaddle her with one arm out. You'll have to put something over her hand to stop the scratching, or some footed sleepers have sleeves that flip over the hands to prevent the scratching.
Then eventually let her have the other arm free, so she's only swaddled from the chest down. She'll still feel secure that way. Then she'll let you know when it's time to stop swaddling completely by wiggling out of the swaddle every time.
At first when you stop swaddling, she won't sleep as easily but it will get better. And then of course, she could get to a point where she needs more help falling asleep and staying asleep, and if that happens you might have to decide between attachment parenting and the Ferber method. (Ferber worked great for us after 3 rough nights).