Move from public to lib