Reorganized lib/