Refactors to new strata structure.