Heh, I almost dealt with this yesterday when I cleaned up my room a tad. Everything was scattered on the floor and in order to clean up things better, I had to shuffle everything around until I got everything put back away, albeit imperfectly.

This is one of those situations where ADHD people need to keep going and find a home for the displaced items, even if it's back where it was before. In fact, I'd recommend putting everything back either where it was before, or close to it. Maybe just keep like things with like.

If you're ADHD, you're going to forget where you "reorganized" everything to and you'll end up tearing everything apart looking for that thing you put away yesterday.

It's not a perfect answer, but it's better than leaving everything on the floor...