templating (1), update public libs, renaming, etc