Reorganized lib