Restructured demo, stable and trunk full version