Reordered the demonstration sources.
Removed old xml.