Introduced app namespace and refactor.