Make the wbxml library better-organised.