Reorganized spring imports in Library example