Reorganise everything