Changed oo-components structure