Move stuff on public to lib.