Moved Demo to its own package. Added hint to demo UI.