Moving guava from src/lib/guava to src/lib/salad