refactoring application/ui structure