Moved more demos into combined project.