One rod and shelf in a U-shape was definitely not the best layout, although very typical of a walk-in closet.
Close to done!
Clean and spacious, without clothes! The top shelf and rod is now about seven feet up, instead of closer to five and a half. The divided hanging area allowed us to have shelving on the back wall, and room for the safe on one side.
And the final result, filled and organized.
One more "after" photo.