UI package reorganisation.