Added new battle system with green ships
Some refactoring