Scanner reorganized