Moving demo app to an optional feature.