ROBE-102 Structure refactoring.