Restructured all component getter / setter properties.