Uri's Suggestions

I changed the packing of each file as well as references to it.
Also made the demo work with XAP 10.0.1-ga.