Hard to tell from your pictures.
I've had to move/rearrange the LP and battery boxes on my last 2 trailers.
Home Depot and probably Lowes sell angle iron if you need some. Also 5/16 hex head self tapping screws will probably come in handy. You can make a new Battery box rack without welding if necessary.
Depends on your tools. A cut off grinder would be good for the angle iron but you can get 'er done with just a hack saw and drill and a few beers!
My advice is remove everything- put on your hitch brackets and then see where you need to put things back to fit it all together like a puzzle.
While you're at it spray or brush paint it all. Either rustoleum oil enamel or rustoleum painters touch 2X spray.
Post a picture when you get it done!