Changed to own namespace so versioning is possible