Change some issues from source folder to battle_solution folder
Change README file also because of issues refactoring