Modify library to be namespaced