application is locator
complete refactoring application