Repo/Library rename

Other optimizations