Refactoring

Modular dependecy extension behavior was taked out from the demo
appliccation