Structure re-organized to reflect various demos better