Reorganised the layers to be AREMI.