refactor app namespace