Updated library namespacing