Starting to restructure for standardization.