Refactored app namespace