Created separate boot app and refactoring