refactored Application namespace