Updated library to use namespaces and composer