Some refactoring and changes

Merged ModularityApplicationObserver and
ModularityAsyncApplicationObserver into one observer.
Updated to 2.1