Further work on new structure, Maroondah config