following restructuring in dev tree