Refactored App class, namen conventions.