Odd that you should mention that. I married an ENFp. Before we married, I noticed that every drawer in her apartment was stuffed with stuff, packed to the point that no drawer could even be opened without pulling a muscle. She also collected decorative baskets, every one also filled to overflowing with flotsome and general clutter.
So, as a condition of marriage, I decreed that she could use any drawer or container for any purpose, but the container could be used only for a single type of thing (I know it sounds crazy, but bear with me). So if she wanted to keep a basket on the shelf, that was fine, and it could even be filled with a collection of anything she wanted, I wouldn't fuss, but it had to have a single purpose.
This has worked out very well. She still gets to have her stuff, but it stays a little organized and she can't keep everything. Anytime she falls off the wagon, I just empty the drawer, and she gets the message.