Renamed to src/lib