Reorganise all the components