Added Application module.
Refactoring.