beautifying package.xml by removing stale comments
sorted include lists for better readability