Mt. Kellett buildings c.1895 (photo and map)

This is a combination of the c.1895 photo and the1909 map.

I have tried to locate the buildings in photo and map by drawing red circles. This is just an experiment. I'm not really convinced especially with the Cameron Villas: I expected the larger building on the right to be No. 4 Cameron Villa, but in this constellation it would be No. 1 Cameron Villa.

Any better solutions are welcome.