unifying modules and updating demo app