Some quick sketches for you.
Pre WW2 and 39/40
1941 ~ 1942
I need to read the whole article in full but thats the jist. The number of guns goes up during the war for each Batterie. Just pulled it out of the Luftwaffe handbook.
Basically you got it right, four in a square, command in the centre, with the option to run the predictor right out to one side.