Added demo package, also fixed package.xmls a little.