Fix module and Add Demo App.