continuing restructuring
nightly commit