cleaning up package.xml and adding maintainers