Refactored App to be more modular.